remult 0.23.0-exp.12 → 0.23.0-exp.14

package/esm/index.d.ts

@@ -1,5 +1,5 @@
 import type { ClassType } from './classType';
-export { OmitEB, FieldsMetadata, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, QueryResult, QueryOptions, Repository, FindFirstOptions, ComparisonValueFilter, ValueFilter, IdFilter, ContainsStringValueFilter, EntityRef, SortSegments, Paginator, LiveQuery, LiveQueryChangeInfo, Subscribable, RefSubscriber, RefSubscriberBase, RelationOptions, RelationOptionsBase, ObjectMembersOnly, MembersToInclude, RepositoryRelations, EntityIdFields, } from './src/remult3/remult3';
+export { OmitEB, FieldsMetadata, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, QueryResult, QueryOptions, Repository, FindFirstOptions, ComparisonValueFilter, ValueFilter, IdFilter, ContainsStringValueFilter, EntityRef, SortSegments, Paginator, LiveQuery, LiveQueryChangeInfo, Subscribable, RefSubscriber, RefSubscriberBase, RelationOptions, RelationOptionsBase, ObjectMembersOnly, MembersToInclude, RepositoryRelations, EntityIdFields, ClassFieldDecorator as MemberDecorator, ClassFieldDecoratorContextStub, } from './src/remult3/remult3';
 export { EntityBase, ControllerBase, FieldType, getFields, ValueListFieldType, getValueList, ValueListFieldOptions, ValueListInfo, CaptionTransformer, } from './src/remult3/RepositoryImplementation';
 export { Entity } from './src/remult3/entity';
 export { getEntityRef } from './src/remult3/getEntityRef';

package/esm/remult-express.js

@@ -21,6 +21,6 @@ export function remultExpress(options) {
         getRemult: (req) => server.getRemult(req),
         openApiDoc: (options) => server.openApiDoc(options),
         withRemult: (req, res, next) => server.withRemult(req, res, next),
-        // [ ]- add with remult promise
+        // [ ] V1.5 add with remult promise
     });
 }

package/esm/remult-knex/index.js

@@ -7,6 +7,7 @@ import { getRepository, isAutoIncrement, } from '../src/remult3/RepositoryImplem
 import { Sort } from '../src/sort';
 import { ValueConverters } from '../src/valueConverters';
 import { resultCompoundIdFilter as resultCompoundIdFilter } from '../src/resultCompoundIdFilter';
+import { getRepositoryInternals } from '../src/remult3/repository-internals';
 export class KnexDataProvider {
     knex;
     constructor(knex) {
@@ -54,7 +55,7 @@ export class KnexDataProvider {
         const repo = getRepository(entity);
         var b = new FilterConsumerBridgeToKnexRequest(await dbNamesOf(repo.metadata));
         b._addWhere = false;
-        await (await repo.translateWhereToFilter(condition)).__applyToConsumer(b);
+        await (await getRepositoryInternals(repo).translateWhereToFilter(condition)).__applyToConsumer(b);
         let r = await b.resolveWhere();
         return (knex) => r.forEach((y) => y(knex));
     }

package/esm/remult-mongo.js

@@ -3,6 +3,7 @@ import { dbNamesOf } from './src/filter/filter-consumer-bridge-to-sql-request';
 import { remult as remultContext } from './src/remult-proxy';
 import { getRepository } from './src/remult3/RepositoryImplementation';
 import { resultCompoundIdFilter } from './src/resultCompoundIdFilter';
+import { getRepositoryInternals } from './src/remult3/repository-internals';
 export class MongoDataProvider {
     db;
     client;
@@ -50,7 +51,7 @@ export class MongoDataProvider {
         const repo = getRepository(entity);
         var b = new FilterConsumerBridgeToMongo(await dbNamesOf(repo.metadata));
         b._addWhere = false;
-        await (await repo.translateWhereToFilter(condition)).__applyToConsumer(b);
+        await (await getRepositoryInternals(repo).translateWhereToFilter(condition)).__applyToConsumer(b);
         let r = await b.resolveWhere();
         return r;
     }

package/esm/server/expressBridge.js

@@ -116,7 +116,7 @@ export class RemultServerImplementation {
         });
     }
     getEntities() {
-        //TODO - consider using entitiesMetaData - but it may require making it all awaitable
+        //TODO V2 - consider using entitiesMetaData - but it may require making it all awaitable
         var r = new Remult();
         return this.options.entities.map((x) => r.repo(x).metadata);
     }

package/esm/src/column.d.ts

@@ -1,5 +1,4 @@
-import type { idType } from './remult3/remult3';
-import type { RepositoryImplementation } from './remult3/RepositoryImplementation';
+import type { idType, Repository } from './remult3/remult3';
 export declare function makeTitle(name: string): string;
 export declare class LookupColumn<T> {
     private repository;
@@ -13,7 +12,7 @@ export declare class LookupColumn<T> {
     };
     set(item: T): void;
     id: idType<T>;
-    constructor(repository: RepositoryImplementation<T>, isReferenceRelation: any);
+    constructor(repository: Repository<T>, isReferenceRelation: any);
     get item(): T;
     waitLoad(): Promise<T>;
 }

package/esm/src/column.js

@@ -1,4 +1,5 @@
 import { getEntityRef } from './remult3/getEntityRef';
+import { getRepositoryInternals } from './remult3/repository-internals';
 export function makeTitle(name) {
     // insert a space before all caps
     return (name
@@ -26,14 +27,14 @@ export class LookupColumn {
     waitLoadOf(id) {
         if (id === undefined || id === null)
             return null;
-        return this.repository.getCachedByIdAsync(id, false);
+        return getRepositoryInternals(this.repository).getCachedByIdAsync(id, false);
     }
     get(id) {
         if (id === undefined || id === null)
             return null;
         if (this.isReferenceRelation && !this.storedItem)
             return undefined;
-        return this.repository.getCachedById(id, this.isReferenceRelation);
+        return getRepositoryInternals(this.repository).getCachedById(id, this.isReferenceRelation);
     }
     storedItem;
     set(item) {
@@ -44,7 +45,7 @@ export class LookupColumn {
             else {
                 let eo = getEntityRef(item, false);
                 if (eo && !this.isReferenceRelation) {
-                    this.repository.addToCache(item);
+                    getRepositoryInternals(this.repository).addToCache(item);
                     this.id = eo.getId();
                 }
                 else {

package/esm/src/data-providers/sql-database.js

@@ -5,6 +5,7 @@ import { remult as defaultRemult } from '../remult-proxy';
 import { getRepository } from '../remult3/RepositoryImplementation';
 import { Sort } from '../sort';
 import { ValueConverters } from '../valueConverters';
+import { getRepositoryInternals } from '../remult3/repository-internals';
 // @dynamic
 export class SqlDatabase {
     sql;
@@ -89,7 +90,7 @@ export class SqlDatabase {
         const r = getRepository(repo);
         var b = new FilterConsumerBridgeToSqlRequest(sqlCommand, await dbNamesOf(r.metadata));
         b._addWhere = false;
-        await (await r.translateWhereToFilter(condition)).__applyToConsumer(b);
+        await (await getRepositoryInternals(r).translateWhereToFilter(condition)).__applyToConsumer(b);
         return await b.resolveWhere();
     }
     /**

package/esm/src/entity.js

@@ -1,2 +1 @@
 export {};
-//[ ]  make lazy only on field and not in Field Options

package/esm/src/live-query/LiveQueryClient.js

@@ -1,5 +1,6 @@
 import { buildRestDataProvider } from '../buildRestDataProvider';
 import { RestDataProvider } from '../data-providers/rest-data-provider';
+import { getRepositoryInternals } from '../remult3/repository-internals';
 import { liveQueryKeepAliveRoute, LiveQuerySubscriber, } from './SubscriptionChannel';
 /* @internal*/
 export class LiveQueryClient {
@@ -79,7 +80,7 @@ export class LiveQueryClient {
         let onUnsubscribe = () => {
             alive = false;
         };
-        this.runPromise(repo
+        this.runPromise(getRepositoryInternals(repo)
             .buildEntityDataProviderFindOptions(options)
             .then((opts) => {
             if (!alive)

package/esm/src/live-query/SubscriptionChannel.js

@@ -1,6 +1,7 @@
 import { v4 as uuid } from 'uuid';
 import { Sort } from '../sort';
 import { remult as defaultRemult } from '../remult-proxy';
+import { getRepositoryInternals } from '../remult3/repository-internals';
 export const streamUrl = 'stream';
 //@internal
 export class LiveQuerySubscriber {
@@ -13,7 +14,7 @@ export class LiveQuerySubscriber {
     subscribeCode;
     unsubscribe = () => { };
     async setAllItems(result) {
-        const items = await this.repo.fromJsonArray(result, this.query.options);
+        const items = await getRepositoryInternals(this.repo).fromJsonArray(result, this.query.options);
         this.forListeners((listener) => {
             listener(() => {
                 return items;
@@ -54,7 +55,7 @@ export class LiveQuerySubscriber {
     async handle(messages) {
         {
             let x = messages.filter(({ type }) => type == 'add' || type == 'replace');
-            let loadedItems = await this.repo.fromJsonArray(x.map((m) => m.data.item), this.query.options);
+            let loadedItems = await getRepositoryInternals(this.repo).fromJsonArray(x.map((m) => m.data.item), this.query.options);
             for (let index = 0; index < x.length; index++) {
                 const element = x[index];
                 element.data.item = loadedItems[index];

package/esm/src/remult-proxy.js

@@ -1,3 +1,4 @@
+import { getInternalKey } from './remult3/repository-internals';
 let defaultRemult;
 function defaultFactory() {
     if (!defaultRemult) {
@@ -81,6 +82,11 @@ export class RemultProxy {
             get fields() {
                 return self.remultFactory().repo(...args).metadata.fields;
             },
+            [getInternalKey]() {
+                return self
+                    .remultFactory()
+                    .repo(...args)[getInternalKey]();
+            },
             relations: (args2) => self
                 .remultFactory()
                 .repo(...args)
@@ -138,10 +144,6 @@ export class RemultProxy {
                 .remultFactory()
                 .repo(...args)
                 .liveQuery(...args2),
-            //@ts-ignore
-            addToCache: (a) => self
-                .remultFactory()
-                .repo(...args).addToCache(a),
             get metadata() {
                 return self.remultFactory().repo(...args).metadata;
             },

package/esm/src/remult3/Fields.d.ts

@@ -1,31 +1,36 @@
 import type { ClassType } from '../../classType';
 import type { FieldOptions } from '../column-interfaces';
 import type { Remult } from '../context';
-import type { FindOptions, RelationOptions } from './remult3';
-import { type ClassFieldDecoratorContextStub } from './RepositoryImplementation';
+import type { FindOptions, RelationOptions, ClassFieldDecorator, ClassFieldDecoratorContextStub } from './remult3';
 export declare class Fields {
     /**
      * Stored as a JSON.stringify - to store as json use Fields.json
      */
-    static object<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, valueType | undefined>, c?: any) => void;
-    static json<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, valueType | undefined>, c?: any) => void;
-    static dateOnly<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, Date | undefined>, c?: any) => void;
-    static date<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, Date | undefined>, c?: any) => void;
-    static integer<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, number | undefined>, c?: any) => void;
-    static autoIncrement<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, number | undefined>, c?: any) => void;
-    static number<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, number | undefined>, c?: any) => void;
-    static createdAt<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, Date | undefined>, c?: any) => void;
-    static updatedAt<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, Date | undefined>, c?: any) => void;
-    static uuid<entityType = any>(...options: (FieldOptions<entityType, string> | ((options: FieldOptions<entityType, string>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, string | undefined>, c?: any) => void;
-    static cuid<entityType = any>(...options: (FieldOptions<entityType, string> | ((options: FieldOptions<entityType, string>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, string | undefined>, c?: any) => void;
-    static string<entityType = any>(...options: (StringFieldOptions<entityType> | ((options: StringFieldOptions<entityType>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, string | undefined>, c?: any) => void;
-    static boolean<entityType = any>(...options: (FieldOptions<entityType, boolean> | ((options: FieldOptions<entityType, boolean>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, boolean | undefined>, c?: any) => void;
+    static object<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, valueType | undefined>;
+    static json<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, valueType | undefined>;
+    static dateOnly<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, Date | undefined>;
+    static date<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, Date | undefined>;
+    static integer<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, number | undefined>;
+    static autoIncrement<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, number | undefined>;
+    static number<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, number | undefined>;
+    static createdAt<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, Date | undefined>;
+    static updatedAt<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, Date | undefined>;
+    static uuid<entityType = any>(...options: (FieldOptions<entityType, string> | ((options: FieldOptions<entityType, string>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, string | undefined>;
+    static cuid<entityType = any>(...options: (FieldOptions<entityType, string> | ((options: FieldOptions<entityType, string>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, string | undefined>;
+    static string<entityType = any>(...options: (StringFieldOptions<entityType> | ((options: StringFieldOptions<entityType>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, string | undefined>;
+    static boolean<entityType = any>(...options: (FieldOptions<entityType, boolean> | ((options: FieldOptions<entityType, boolean>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, boolean | undefined>;
 }
 export declare class Relations {
-    static toOne<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, options?: RelationOptions<entityType, toEntityType, entityType> | keyof entityType): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, toEntityType>, c?: any) => void;
-    static toMany<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, options?: (RelationOptions<entityType, toEntityType, toEntityType, FindOptions<toEntityType>> & {
-        fromEntityType?: ClassType<entityType>;
-    }) | keyof toEntityType): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, any>, c?: any) => void;
+    /** A to one relation with an automatically generated field */
+    static toOne<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, options?: FieldOptions<entityType, toEntityType> & Pick<RelationOptions<entityType, toEntityType, any, any>, 'defaultIncluded'>): ClassFieldDecorator<entityType, toEntityType | undefined>;
+    /** A to one relation with fields defined in the second parameter */
+    static toOne<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, fieldInMyEntity?: keyof entityType): ClassFieldDecorator<entityType, toEntityType | undefined>;
+    /** A to one relation with fields defined in the field/fields parameter */
+    static toOne<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, options: Omit<RelationOptions<entityType, toEntityType, entityType>, keyof Pick<RelationOptions<entityType, toEntityType, entityType>, 'field'>>): ClassFieldDecorator<entityType, toEntityType | undefined>;
+    /** A to one relation with fields defined in the field/fields parameter */
+    static toOne<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, options: Omit<RelationOptions<entityType, toEntityType, entityType>, keyof Pick<RelationOptions<entityType, toEntityType, entityType>, 'fields'>>): ClassFieldDecorator<entityType, toEntityType | undefined>;
+    static toMany<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, fieldInToEntity?: keyof toEntityType): ClassFieldDecorator<entityType, toEntityType[] | undefined>;
+    static toMany<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, options: RelationOptions<entityType, toEntityType, toEntityType, FindOptions<toEntityType>>): ClassFieldDecorator<entityType, toEntityType[] | undefined>;
 }
 /**Decorates fields that should be used as fields.
  * for more info see: [Field Types](https://remult.dev/docs/field-types.html)

package/esm/src/remult3/Fields.js

@@ -1,7 +1,7 @@
 import { createId } from '@paralleldrive/cuid2';
 import { v4 as uuid } from 'uuid';
 import { ValueConverters } from '../valueConverters';
-import { buildOptions, columnsOfType, } from './RepositoryImplementation';
+import { buildOptions, columnsOfType } from './RepositoryImplementation';
 import { relationInfoMember } from './relationInfoMember';
 export class Fields {
     /**
@@ -193,6 +193,3 @@ export function checkTarget(target) {
     if (!target)
         throw new Error("Set the 'experimentalDecorators:true' option in your 'tsconfig' or 'jsconfig' (target undefined)");
 }
-//[ ]  I think JY finds it confusing that the field options and relation options are together - but I still think it's good - not sure if it's a transition faze or not
-//[ ] I wish that when you define a toOne we automagically get the toMany on the other side! 😉
-//[ ] implement to many inference based on to one

package/esm/src/remult3/RepositoryImplementation.d.ts

@@ -10,12 +10,14 @@ import type { DataProvider, EntityDataProvider, EntityDataProviderFindOptions, E
 import type { Unsubscribe } from '../live-query/SubscriptionChannel';
 import type { columnInfo } from './columnInfo';
 import { RelationLoader } from './relation-loader';
+import { getInternalKey } from './repository-internals';
 export declare class RepositoryImplementation<entityType> implements Repository<entityType> {
     private entity;
     remult: Remult;
     private dataProvider;
     private _info;
     private defaultFindOptions?;
+    [getInternalKey](): this;
     createAfterFilter(orderBy: EntityOrderBy<entityType>, lastRow: entityType): Promise<EntityFilter<entityType>>;
     relations(item: entityType): RepositoryRelations<entityType>;
     private __edp;
@@ -252,17 +254,6 @@ export declare class ValueListInfo<T extends ValueListItem> implements ValueConv
 export declare function getValueList<T>(field: FieldRef<T>): T[];
 export declare function getValueList<T>(field: FieldMetadata<T>): T[];
 export declare function getValueList<T>(type: ClassType<T>): T[];
-export interface ClassFieldDecoratorContextStub<entityType, valueType> {
-    readonly access: {
-        set(object: entityType, value: valueType): void;
-    };
-    readonly name: string;
-}
-export interface ClassDecoratorContextStub<Class extends new (...args: any) => any = new (...args: any) => any> {
-    readonly kind: 'class';
-    readonly name: string | undefined;
-    addInitializer(initializer: (this: Class) => void): void;
-}
 export declare const storableMember: unique symbol;
 export declare function buildOptions<entityType = any, valueType = any>(options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[], remult: Remult): FieldOptions<entityType, valueType>;
 export declare function decorateColumnSettings<valueType>(settings: FieldOptions<any, valueType>, remult: Remult): FieldOptions<any, valueType>;

package/esm/src/remult3/RepositoryImplementation.js

@@ -11,6 +11,7 @@ import { entityMember, getEntityKey, getEntityRef, getEntitySettings, } from './
 import { __updateEntityBasedOnWhere } from './__updateEntityBasedOnWhere';
 import { getRelationInfo, relationInfoMember } from './relationInfoMember';
 import { RelationLoader } from './relation-loader';
+import { getInternalKey } from './repository-internals';
 //import  { remult } from "../remult-proxy";
 let classValidatorValidate = undefined;
 // import ("class-validator".toString())
@@ -36,6 +37,9 @@ export class RepositoryImplementation {
     dataProvider;
     _info;
     defaultFindOptions;
+    [getInternalKey]() {
+        return this;
+    }
     async createAfterFilter(orderBy, lastRow) {
         let values = new Map();
         for (const s of Sort.translateOrderByToSort(this.metadata, orderBy)
@@ -350,9 +354,12 @@ export class RepositoryImplementation {
             options.orderBy = this._info.entityInfo.defaultOrderBy;
         }
         opt.where = await this.translateWhereToFilter(options.where);
-        opt.orderBy = Sort.translateOrderByToSort(this.metadata, options.orderBy);
-        opt.limit = options.limit;
-        opt.page = options.page;
+        if (options.orderBy !== undefined)
+            opt.orderBy = Sort.translateOrderByToSort(this.metadata, options.orderBy);
+        if (options.limit !== undefined)
+            opt.limit = options.limit;
+        if (options.page !== undefined)
+            opt.page = options.page;
         return opt;
     }
     async fromJsonArray(jsonItems, loadOptions) {
@@ -473,9 +480,14 @@ export class RepositoryImplementation {
                     findOptions[key] = source[key];
             }
         }
-        if (rel.type === 'toMany' && !options.field && !options.fields) {
+        function buildError(what) {
+            return Error(`Error for relation: "${field.key}" to "${otherRepo.metadata.key}": ` +
+                what);
+        }
+        let hasFields = () => options.field || options.fields;
+        if (rel.type === 'toMany' && !hasFields()) {
             for (const fieldInOtherRepo of otherRepo.fields.toArray()) {
-                if (!options.field && !options.fields) {
+                if (!hasFields()) {
                     const reverseRel = getRelationInfo(fieldInOtherRepo.options);
                     const relOp = fieldInOtherRepo.options;
                     if (reverseRel)
@@ -497,17 +509,25 @@ export class RepositoryImplementation {
                                     }
                                     options = { ...options, fields };
                                 }
-                                else
-                                    throw Error(`Could not infer fields for the "toMany" relation named:${fieldInOtherRepo.key}. Please specify field/fields`);
                             }
                 }
             }
+            if (!hasFields())
+                throw buildError(`No matching field found on target. Please specify field/fields`);
+        }
+        function requireField(field, meta) {
+            const result = meta.fields.find(field);
+            if (!result)
+                throw buildError(`Field "${field}" was not found in "${meta.key}".`);
+            return result;
         }
         if (options.field) {
             if (rel.type === 'toOne') {
+                requireField(options.field, this.metadata);
                 where.push(otherRepo.metadata.idMetadata.getIdFilter(row[options.field]));
             }
             else {
+                requireField(options.field, otherRepo.metadata);
                 where.push({
                     [options.field]: this.metadata.idMetadata.getId(row),
                 });
@@ -516,13 +536,15 @@ export class RepositoryImplementation {
         else if (options.fields) {
             for (const key in options.fields) {
                 if (Object.prototype.hasOwnProperty.call(options.fields, key)) {
+                    requireField(options.fields[key], this.metadata);
+                    requireField(key, otherRepo.metadata);
                     where.push({ [key]: row[options.fields[key]] });
                 }
             }
         }
         else if (rel.type === 'toOne' || rel.type === 'reference') {
             let val = rel.type === 'reference'
-                ? getEntityRef(row).fields.find(field.key).getId()
+                ? getEntityRef(row).fields.find(requireField(field.key, this.metadata)).getId()
                 : row[field.key];
             if (val === null)
                 returnNull = true;
@@ -1308,7 +1330,7 @@ export class rowHelperImplementation extends rowHelperBase {
     }
     async calcServerExpression() {
         if (isBackend())
-            //[ ] should be changed to be based on data provider
+            //y2 should be changed to be based on data provider - consider naming
             for (const col of this.info.columnsInfo) {
                 if (col.serverExpression) {
                     this.instance[col.key] = await col.serverExpression(this.instance);

package/esm/src/remult3/entity.d.ts

@@ -1,6 +1,6 @@
 import type { Remult } from '../context';
 import type { EntityOptions } from '../entity';
-import type { ClassDecoratorContextStub } from './RepositoryImplementation';
+import type { ClassDecoratorContextStub } from './remult3';
 /**Decorates classes that should be used as entities.
  * Receives a key and an array of EntityOptions.
  * @example

package/esm/src/remult3/entity.js

@@ -1,6 +1,5 @@
 import { allEntities, setControllerSettings } from '../context';
 import { entityInfo, entityInfo_key, getEntitySettings } from './getEntityRef';
-//[ ] YONI - in Typescript 5 I do get the name of the class, what would we like to change because of that?
 /**Decorates classes that should be used as entities.
  * Receives a key and an array of EntityOptions.
  * @example

package/esm/src/remult3/remult3.d.ts

@@ -422,7 +422,7 @@ export type RelationOptions<fromEntity, toEntity, matchIdEntity, optionsType ext
 export type RelationOptionsBase<fromEntity, toEntity, optionsType extends LoadOptions<toEntity> = LoadOptions<toEntity>> = {
     findOptions?: optionsType | ((entity: fromEntity) => optionsType);
     defaultIncluded?: boolean;
-} & FieldOptions<fromEntity, toEntity>;
+} & Pick<FieldOptions, 'caption'>;
 export type ObjectMembersOnly<T> = {
     [K in keyof Pick<T, {
         [K in keyof T]: T[K] extends object | undefined | null ? T[K] extends Date | undefined | null ? never : K : never;
@@ -439,3 +439,15 @@ export type RepositoryRelations<entityType> = {
 export declare type EntityIdFields<entityType> = {
     [Properties in keyof Partial<OmitEB<entityType>>]?: true;
 };
+export interface ClassFieldDecoratorContextStub<entityType, valueType> {
+    readonly access: {
+        set(object: entityType, value: valueType): void;
+    };
+    readonly name: string;
+}
+export interface ClassDecoratorContextStub<Class extends new (...args: any) => any = new (...args: any) => any> {
+    readonly kind: 'class';
+    readonly name: string | undefined;
+    addInitializer(initializer: (this: Class) => void): void;
+}
+export type ClassFieldDecorator<entityType, valueType> = (target: any, context: string | ClassFieldDecoratorContextStub<entityType, valueType | undefined>, c?: any) => void;

package/esm/src/remult3/repository-internals.d.ts

@@ -0,0 +1,14 @@
+import type { EntityDataProviderFindOptions } from '../data-interfaces';
+import type { Filter } from '../filter/filter-interfaces';
+import type { EntityFilter, EntityOrderBy, FindOptions, LoadOptions, Repository } from './remult3';
+export interface RepositoryInternal<entityType> {
+    createAfterFilter(orderBy: EntityOrderBy<entityType>, lastRow: entityType): Promise<EntityFilter<entityType>>;
+    fromJsonArray(jsonItems: any[], loadOptions: LoadOptions<entityType>): Promise<entityType[]>;
+    buildEntityDataProviderFindOptions(options: FindOptions<entityType>): Promise<EntityDataProviderFindOptions>;
+    translateWhereToFilter(where: EntityFilter<entityType>): Promise<Filter>;
+    getCachedById(id: any, doNotLoadIfNotFound: boolean): entityType;
+    getCachedByIdAsync(id: any, doNotLoadIfNotFound: boolean): Promise<entityType>;
+    addToCache(item: entityType): any;
+}
+export declare function getRepositoryInternals<entityType>(repo: Repository<entityType>): RepositoryInternal<entityType>;
+export declare const getInternalKey = "getInternal";

package/esm/src/remult3/repository-internals.js

@@ -0,0 +1,7 @@
+export function getRepositoryInternals(repo) {
+    const x = repo;
+    if (typeof x[getInternalKey] === 'function')
+        return x[getInternalKey]();
+    throw Error('Error getting repository internal from ' + repo);
+}
+export const getInternalKey = 'getInternal';

package/index.d.ts

@@ -1,5 +1,5 @@
 import type { ClassType } from './classType';
-export { OmitEB, FieldsMetadata, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, QueryResult, QueryOptions, Repository, FindFirstOptions, ComparisonValueFilter, ValueFilter, IdFilter, ContainsStringValueFilter, EntityRef, SortSegments, Paginator, LiveQuery, LiveQueryChangeInfo, Subscribable, RefSubscriber, RefSubscriberBase, RelationOptions, RelationOptionsBase, ObjectMembersOnly, MembersToInclude, RepositoryRelations, EntityIdFields, } from './src/remult3/remult3';
+export { OmitEB, FieldsMetadata, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, QueryResult, QueryOptions, Repository, FindFirstOptions, ComparisonValueFilter, ValueFilter, IdFilter, ContainsStringValueFilter, EntityRef, SortSegments, Paginator, LiveQuery, LiveQueryChangeInfo, Subscribable, RefSubscriber, RefSubscriberBase, RelationOptions, RelationOptionsBase, ObjectMembersOnly, MembersToInclude, RepositoryRelations, EntityIdFields, ClassFieldDecorator as MemberDecorator, ClassFieldDecoratorContextStub, } from './src/remult3/remult3';
 export { EntityBase, ControllerBase, FieldType, getFields, ValueListFieldType, getValueList, ValueListFieldOptions, ValueListInfo, CaptionTransformer, } from './src/remult3/RepositoryImplementation';
 export { Entity } from './src/remult3/entity';
 export { getEntityRef } from './src/remult3/getEntityRef';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.23.0-exp.12",
+    "version": "0.23.0-exp.14",
     "description": "A CRUD framework for full-stack TypeScript",
     "types": "index.d.ts",
     "module": "esm/index.js",

package/remult-express.js

@@ -28,7 +28,7 @@ function remultExpress(options) {
         getRemult: function (req) { return server.getRemult(req); },
         openApiDoc: function (options) { return server.openApiDoc(options); },
         withRemult: function (req, res, next) { return server.withRemult(req, res, next); },
-        // [ ]- add with remult promise
+        // [ ] V1.5 add with remult promise
     });
 }
 exports.remultExpress = remultExpress;

package/remult-knex/index.js

@@ -11,6 +11,7 @@ var RepositoryImplementation_1 = require("../src/remult3/RepositoryImplementatio
 var sort_1 = require("../src/sort");
 var valueConverters_1 = require("../src/valueConverters");
 var resultCompoundIdFilter_1 = require("../src/resultCompoundIdFilter");
+var repository_internals_1 = require("../src/remult3/repository-internals");
 var KnexDataProvider = /** @class */ (function () {
     function KnexDataProvider(knex) {
         this.knex = knex;
@@ -91,7 +92,7 @@ var KnexDataProvider = /** @class */ (function () {
                     case 1:
                         b = new (_a.apply(FilterConsumerBridgeToKnexRequest, [void 0, _b.sent()]))();
                         b._addWhere = false;
-                        return [4 /*yield*/, repo.translateWhereToFilter(condition)];
+                        return [4 /*yield*/, (0, repository_internals_1.getRepositoryInternals)(repo).translateWhereToFilter(condition)];
                     case 2: return [4 /*yield*/, (_b.sent()).__applyToConsumer(b)];
                     case 3:
                         _b.sent();

package/remult-mongo.js

@@ -7,6 +7,7 @@ var filter_consumer_bridge_to_sql_request_1 = require("./src/filter/filter-consu
 var remult_proxy_1 = require("./src/remult-proxy");
 var RepositoryImplementation_1 = require("./src/remult3/RepositoryImplementation");
 var resultCompoundIdFilter_1 = require("./src/resultCompoundIdFilter");
+var repository_internals_1 = require("./src/remult3/repository-internals");
 var MongoDataProvider = /** @class */ (function () {
     function MongoDataProvider(db, client, options) {
         this.db = db;
@@ -80,7 +81,7 @@ var MongoDataProvider = /** @class */ (function () {
                     case 1:
                         b = new (_a.apply(FilterConsumerBridgeToMongo, [void 0, _b.sent()]))();
                         b._addWhere = false;
-                        return [4 /*yield*/, repo.translateWhereToFilter(condition)];
+                        return [4 /*yield*/, (0, repository_internals_1.getRepositoryInternals)(repo).translateWhereToFilter(condition)];
                     case 2: return [4 /*yield*/, (_b.sent()).__applyToConsumer(b)];
                     case 3:
                         _b.sent();

package/server/expressBridge.js

@@ -255,7 +255,7 @@ var RemultServerImplementation = /** @class */ (function () {
         });
     };
     RemultServerImplementation.prototype.getEntities = function () {
-        //TODO - consider using entitiesMetaData - but it may require making it all awaitable
+        //TODO V2 - consider using entitiesMetaData - but it may require making it all awaitable
         var r = new context_1.Remult();
         return this.options.entities.map(function (x) { return r.repo(x).metadata; });
     };

package/src/column.d.ts

@@ -1,5 +1,4 @@
-import type { idType } from './remult3/remult3';
-import type { RepositoryImplementation } from './remult3/RepositoryImplementation';
+import type { idType, Repository } from './remult3/remult3';
 export declare function makeTitle(name: string): string;
 export declare class LookupColumn<T> {
     private repository;
@@ -13,7 +12,7 @@ export declare class LookupColumn<T> {
     };
     set(item: T): void;
     id: idType<T>;
-    constructor(repository: RepositoryImplementation<T>, isReferenceRelation: any);
+    constructor(repository: Repository<T>, isReferenceRelation: any);
     get item(): T;
     waitLoad(): Promise<T>;
 }

package/src/column.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LookupColumn = exports.makeTitle = void 0;
 var tslib_1 = require("tslib");
 var getEntityRef_1 = require("./remult3/getEntityRef");
+var repository_internals_1 = require("./remult3/repository-internals");
 function makeTitle(name) {
     // insert a space before all caps
     return (name
@@ -33,14 +34,14 @@ var LookupColumn = /** @class */ (function () {
     LookupColumn.prototype.waitLoadOf = function (id) {
         if (id === undefined || id === null)
             return null;
-        return this.repository.getCachedByIdAsync(id, false);
+        return (0, repository_internals_1.getRepositoryInternals)(this.repository).getCachedByIdAsync(id, false);
     };
     LookupColumn.prototype.get = function (id) {
         if (id === undefined || id === null)
             return null;
         if (this.isReferenceRelation && !this.storedItem)
             return undefined;
-        return this.repository.getCachedById(id, this.isReferenceRelation);
+        return (0, repository_internals_1.getRepositoryInternals)(this.repository).getCachedById(id, this.isReferenceRelation);
     };
     LookupColumn.prototype.set = function (item) {
         this.storedItem = undefined;
@@ -50,7 +51,7 @@ var LookupColumn = /** @class */ (function () {
             else {
                 var eo = (0, getEntityRef_1.getEntityRef)(item, false);
                 if (eo && !this.isReferenceRelation) {
-                    this.repository.addToCache(item);
+                    (0, repository_internals_1.getRepositoryInternals)(this.repository).addToCache(item);
                     this.id = eo.getId();
                 }
                 else {

package/src/data-providers/sql-database.js

@@ -9,6 +9,7 @@ var remult_proxy_1 = require("../remult-proxy");
 var RepositoryImplementation_1 = require("../remult3/RepositoryImplementation");
 var sort_1 = require("../sort");
 var valueConverters_1 = require("../valueConverters");
+var repository_internals_1 = require("../remult3/repository-internals");
 // @dynamic
 var SqlDatabase = /** @class */ (function () {
     function SqlDatabase(sql) {
@@ -159,7 +160,7 @@ var SqlDatabase = /** @class */ (function () {
                     case 1:
                         b = new (_a.apply(filter_consumer_bridge_to_sql_request_1.FilterConsumerBridgeToSqlRequest, _b.concat([_c.sent()])))();
                         b._addWhere = false;
-                        return [4 /*yield*/, r.translateWhereToFilter(condition)];
+                        return [4 /*yield*/, (0, repository_internals_1.getRepositoryInternals)(r).translateWhereToFilter(condition)];
                     case 2: return [4 /*yield*/, (_c.sent()).__applyToConsumer(b)];
                     case 3:
                         _c.sent();

package/src/entity.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//[ ]  make lazy only on field and not in Field Options

package/src/live-query/LiveQueryClient.js

@@ -4,6 +4,7 @@ exports.LiveQueryClient = void 0;
 var tslib_1 = require("tslib");
 var buildRestDataProvider_1 = require("../buildRestDataProvider");
 var rest_data_provider_1 = require("../data-providers/rest-data-provider");
+var repository_internals_1 = require("../remult3/repository-internals");
 var SubscriptionChannel_1 = require("./SubscriptionChannel");
 /* @internal*/
 var LiveQueryClient = /** @class */ (function () {
@@ -100,7 +101,7 @@ var LiveQueryClient = /** @class */ (function () {
         var onUnsubscribe = function () {
             alive = false;
         };
-        this.runPromise(repo
+        this.runPromise((0, repository_internals_1.getRepositoryInternals)(repo)
             .buildEntityDataProviderFindOptions(options)
             .then(function (opts) {
             if (!alive)

package/src/live-query/SubscriptionChannel.js

@@ -5,6 +5,7 @@ var tslib_1 = require("tslib");
 var uuid_1 = require("uuid");
 var sort_1 = require("../sort");
 var remult_proxy_1 = require("../remult-proxy");
+var repository_internals_1 = require("../remult3/repository-internals");
 exports.streamUrl = 'stream';
 //@internal
 var LiveQuerySubscriber = /** @class */ (function () {
@@ -27,7 +28,7 @@ var LiveQuerySubscriber = /** @class */ (function () {
             var items;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.repo.fromJsonArray(result, this.query.options)];
+                    case 0: return [4 /*yield*/, (0, repository_internals_1.getRepositoryInternals)(this.repo).fromJsonArray(result, this.query.options)];
                     case 1:
                         items = _a.sent();
                         this.forListeners(function (listener) {
@@ -97,7 +98,7 @@ var LiveQuerySubscriber = /** @class */ (function () {
                             var type = _a.type;
                             return type == 'add' || type == 'replace';
                         });
-                        return [4 /*yield*/, this.repo.fromJsonArray(x.map(function (m) { return m.data.item; }), this.query.options)];
+                        return [4 /*yield*/, (0, repository_internals_1.getRepositoryInternals)(this.repo).fromJsonArray(x.map(function (m) { return m.data.item; }), this.query.options)];
                     case 1:
                         loadedItems = _a.sent();
                         for (index = 0; index < x.length; index++) {

package/src/remult-proxy.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.remult = exports.RemultProxy = void 0;
 var tslib_1 = require("tslib");
+var repository_internals_1 = require("./remult3/repository-internals");
 var defaultRemult;
 function defaultFactory() {
     if (!defaultRemult) {
@@ -18,6 +19,7 @@ var RemultProxy = /** @class */ (function () {
         this.repoCache = new Map();
         //@ts-ignore
         this.repo = function () {
+            var _a;
             var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {
                 args[_i] = arguments[_i];
@@ -30,24 +32,31 @@ var RemultProxy = /** @class */ (function () {
             var result = entityCache.get(args[1]);
             if (result)
                 return result;
-            result = {
-                get fields() {
+            result = (_a = {
+                    get fields() {
+                        var _a;
+                        return (_a = self.remultFactory()).repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).metadata.fields;
+                    }
+                },
+                _a[repository_internals_1.getInternalKey] = function () {
                     var _a;
-                    return (_a = self.remultFactory()).repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).metadata.fields;
+                    return (_a = self
+                        .remultFactory())
+                        .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false))[repository_internals_1.getInternalKey]();
                 },
-                relations: function (args2) {
+                _a.relations = function (args2) {
                     var _a;
                     return (_a = self
                         .remultFactory())
                         .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).relations(args2);
                 },
-                validate: function (a, b) {
+                _a.validate = function (a, b) {
                     var _a;
                     return (_a = self
                         .remultFactory())
                         .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).validate(a, b);
                 },
-                addEventListener: function () {
+                _a.addEventListener = function () {
                     var _a, _b;
                     var args2 = [];
                     for (var _i = 0; _i < arguments.length; _i++) {
@@ -58,7 +67,7 @@ var RemultProxy = /** @class */ (function () {
                         .repo.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(args), false)))
                         .addEventListener.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args2), false));
                 },
-                count: function () {
+                _a.count = function () {
                     var _a, _b;
                     var args2 = [];
                     for (var _i = 0; _i < arguments.length; _i++) {
@@ -69,7 +78,7 @@ var RemultProxy = /** @class */ (function () {
                         .repo.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(args), false)))
                         .count.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args2), false));
                 },
-                create: function () {
+                _a.create = function () {
                     var _a, _b;
                     var args2 = [];
                     for (var _i = 0; _i < arguments.length; _i++) {
@@ -80,13 +89,13 @@ var RemultProxy = /** @class */ (function () {
                         .repo.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(args), false)))
                         .create.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args2), false));
                 },
-                delete: function (args2) {
+                _a.delete = function (args2) {
                     var _a;
                     return (_a = self
                         .remultFactory())
                         .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).delete(args2);
                 },
-                find: function () {
+                _a.find = function () {
                     var _a, _b;
                     var args2 = [];
                     for (var _i = 0; _i < arguments.length; _i++) {
@@ -97,7 +106,7 @@ var RemultProxy = /** @class */ (function () {
                         .repo.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(args), false)))
                         .find.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args2), false));
                 },
-                findFirst: function () {
+                _a.findFirst = function () {
                     var _a, _b;
                     var args2 = [];
                     for (var _i = 0; _i < arguments.length; _i++) {
@@ -108,26 +117,26 @@ var RemultProxy = /** @class */ (function () {
                         .repo.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(args), false)))
                         .findFirst.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args2), false));
                 },
-                findId: function (a, b) {
+                _a.findId = function (a, b) {
                     var _a;
                     return (_a = self
                         .remultFactory())
                         .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).findId(a, b);
                 },
                 //@ts-ignore
-                toJson: function (json) {
+                _a.toJson = function (json) {
                     var _a;
                     return (_a = self
                         .remultFactory())
                         .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).toJson(json);
                 },
-                fromJson: function (item, isNew) {
+                _a.fromJson = function (item, isNew) {
                     var _a;
                     return (_a = self
                         .remultFactory())
                         .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).fromJson(item, isNew);
                 },
-                getEntityRef: function () {
+                _a.getEntityRef = function () {
                     var _a, _b;
                     var args2 = [];
                     for (var _i = 0; _i < arguments.length; _i++) {
@@ -138,13 +147,13 @@ var RemultProxy = /** @class */ (function () {
                         .repo.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(args), false)))
                         .getEntityRef.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args2), false));
                 },
-                insert: function (args2) {
+                _a.insert = function (args2) {
                     var _a;
                     return (_a = self
                         .remultFactory())
                         .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).insert(args2);
                 },
-                liveQuery: function () {
+                _a.liveQuery = function () {
                     var _a, _b;
                     var args2 = [];
                     for (var _i = 0; _i < arguments.length; _i++) {
@@ -155,18 +164,15 @@ var RemultProxy = /** @class */ (function () {
                         .repo.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(args), false)))
                         .liveQuery.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args2), false));
                 },
-                //@ts-ignore
-                addToCache: function (a) {
-                    var _a;
-                    return (_a = self
-                        .remultFactory())
-                        .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).addToCache(a);
-                },
-                get metadata() {
-                    var _a;
-                    return (_a = self.remultFactory()).repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).metadata;
-                },
-                query: function () {
+                Object.defineProperty(_a, "metadata", {
+                    get: function () {
+                        var _a;
+                        return (_a = self.remultFactory()).repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).metadata;
+                    },
+                    enumerable: false,
+                    configurable: true
+                }),
+                _a.query = function () {
                     var _a, _b;
                     var args2 = [];
                     for (var _i = 0; _i < arguments.length; _i++) {
@@ -177,19 +183,19 @@ var RemultProxy = /** @class */ (function () {
                         .repo.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(args), false)))
                         .query.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args2), false));
                 },
-                save: function (args2) {
+                _a.save = function (args2) {
                     var _a;
                     return (_a = self
                         .remultFactory())
                         .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).save(args2);
                 },
-                update: function (a, b) {
+                _a.update = function (a, b) {
                     var _a;
                     return (_a = self
                         .remultFactory())
                         .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).update(a, b);
                 },
-            };
+                _a);
             entityCache.set(args[1], result);
             return result;
         };

package/src/remult3/Fields.d.ts

@@ -1,31 +1,36 @@
 import type { ClassType } from '../../classType';
 import type { FieldOptions } from '../column-interfaces';
 import type { Remult } from '../context';
-import type { FindOptions, RelationOptions } from './remult3';
-import { type ClassFieldDecoratorContextStub } from './RepositoryImplementation';
+import type { FindOptions, RelationOptions, ClassFieldDecorator, ClassFieldDecoratorContextStub } from './remult3';
 export declare class Fields {
     /**
      * Stored as a JSON.stringify - to store as json use Fields.json
      */
-    static object<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, valueType | undefined>, c?: any) => void;
-    static json<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, valueType | undefined>, c?: any) => void;
-    static dateOnly<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, Date | undefined>, c?: any) => void;
-    static date<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, Date | undefined>, c?: any) => void;
-    static integer<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, number | undefined>, c?: any) => void;
-    static autoIncrement<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, number | undefined>, c?: any) => void;
-    static number<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, number | undefined>, c?: any) => void;
-    static createdAt<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, Date | undefined>, c?: any) => void;
-    static updatedAt<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, Date | undefined>, c?: any) => void;
-    static uuid<entityType = any>(...options: (FieldOptions<entityType, string> | ((options: FieldOptions<entityType, string>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, string | undefined>, c?: any) => void;
-    static cuid<entityType = any>(...options: (FieldOptions<entityType, string> | ((options: FieldOptions<entityType, string>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, string | undefined>, c?: any) => void;
-    static string<entityType = any>(...options: (StringFieldOptions<entityType> | ((options: StringFieldOptions<entityType>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, string | undefined>, c?: any) => void;
-    static boolean<entityType = any>(...options: (FieldOptions<entityType, boolean> | ((options: FieldOptions<entityType, boolean>, remult: Remult) => void))[]): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, boolean | undefined>, c?: any) => void;
+    static object<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, valueType | undefined>;
+    static json<entityType = any, valueType = any>(...options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, valueType | undefined>;
+    static dateOnly<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, Date | undefined>;
+    static date<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, Date | undefined>;
+    static integer<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, number | undefined>;
+    static autoIncrement<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, number | undefined>;
+    static number<entityType = any>(...options: (FieldOptions<entityType, Number> | ((options: FieldOptions<entityType, Number>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, number | undefined>;
+    static createdAt<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, Date | undefined>;
+    static updatedAt<entityType = any>(...options: (FieldOptions<entityType, Date> | ((options: FieldOptions<entityType, Date>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, Date | undefined>;
+    static uuid<entityType = any>(...options: (FieldOptions<entityType, string> | ((options: FieldOptions<entityType, string>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, string | undefined>;
+    static cuid<entityType = any>(...options: (FieldOptions<entityType, string> | ((options: FieldOptions<entityType, string>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, string | undefined>;
+    static string<entityType = any>(...options: (StringFieldOptions<entityType> | ((options: StringFieldOptions<entityType>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, string | undefined>;
+    static boolean<entityType = any>(...options: (FieldOptions<entityType, boolean> | ((options: FieldOptions<entityType, boolean>, remult: Remult) => void))[]): ClassFieldDecorator<entityType, boolean | undefined>;
 }
 export declare class Relations {
-    static toOne<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, options?: RelationOptions<entityType, toEntityType, entityType> | keyof entityType): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, toEntityType>, c?: any) => void;
-    static toMany<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, options?: (RelationOptions<entityType, toEntityType, toEntityType, FindOptions<toEntityType>> & {
-        fromEntityType?: ClassType<entityType>;
-    }) | keyof toEntityType): (target: any, context: string | ClassFieldDecoratorContextStub<entityType, any>, c?: any) => void;
+    /** A to one relation with an automatically generated field */
+    static toOne<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, options?: FieldOptions<entityType, toEntityType> & Pick<RelationOptions<entityType, toEntityType, any, any>, 'defaultIncluded'>): ClassFieldDecorator<entityType, toEntityType | undefined>;
+    /** A to one relation with fields defined in the second parameter */
+    static toOne<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, fieldInMyEntity?: keyof entityType): ClassFieldDecorator<entityType, toEntityType | undefined>;
+    /** A to one relation with fields defined in the field/fields parameter */
+    static toOne<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, options: Omit<RelationOptions<entityType, toEntityType, entityType>, keyof Pick<RelationOptions<entityType, toEntityType, entityType>, 'field'>>): ClassFieldDecorator<entityType, toEntityType | undefined>;
+    /** A to one relation with fields defined in the field/fields parameter */
+    static toOne<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, options: Omit<RelationOptions<entityType, toEntityType, entityType>, keyof Pick<RelationOptions<entityType, toEntityType, entityType>, 'fields'>>): ClassFieldDecorator<entityType, toEntityType | undefined>;
+    static toMany<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, fieldInToEntity?: keyof toEntityType): ClassFieldDecorator<entityType, toEntityType[] | undefined>;
+    static toMany<entityType, toEntityType>(toEntityType: () => ClassType<toEntityType>, options: RelationOptions<entityType, toEntityType, toEntityType, FindOptions<toEntityType>>): ClassFieldDecorator<entityType, toEntityType[] | undefined>;
 }
 /**Decorates fields that should be used as fields.
  * for more info see: [Field Types](https://remult.dev/docs/field-types.html)

package/src/remult3/Fields.js

@@ -257,6 +257,3 @@ function checkTarget(target) {
         throw new Error("Set the 'experimentalDecorators:true' option in your 'tsconfig' or 'jsconfig' (target undefined)");
 }
 exports.checkTarget = checkTarget;
-//[ ]  I think JY finds it confusing that the field options and relation options are together - but I still think it's good - not sure if it's a transition faze or not
-//[ ] I wish that when you define a toOne we automagically get the toMany on the other side! 😉
-//[ ] implement to many inference based on to one

package/src/remult3/RepositoryImplementation.d.ts

@@ -10,12 +10,14 @@ import type { DataProvider, EntityDataProvider, EntityDataProviderFindOptions, E
 import type { Unsubscribe } from '../live-query/SubscriptionChannel';
 import type { columnInfo } from './columnInfo';
 import { RelationLoader } from './relation-loader';
+import { getInternalKey } from './repository-internals';
 export declare class RepositoryImplementation<entityType> implements Repository<entityType> {
     private entity;
     remult: Remult;
     private dataProvider;
     private _info;
     private defaultFindOptions?;
+    [getInternalKey](): this;
     createAfterFilter(orderBy: EntityOrderBy<entityType>, lastRow: entityType): Promise<EntityFilter<entityType>>;
     relations(item: entityType): RepositoryRelations<entityType>;
     private __edp;
@@ -252,17 +254,6 @@ export declare class ValueListInfo<T extends ValueListItem> implements ValueConv
 export declare function getValueList<T>(field: FieldRef<T>): T[];
 export declare function getValueList<T>(field: FieldMetadata<T>): T[];
 export declare function getValueList<T>(type: ClassType<T>): T[];
-export interface ClassFieldDecoratorContextStub<entityType, valueType> {
-    readonly access: {
-        set(object: entityType, value: valueType): void;
-    };
-    readonly name: string;
-}
-export interface ClassDecoratorContextStub<Class extends new (...args: any) => any = new (...args: any) => any> {
-    readonly kind: 'class';
-    readonly name: string | undefined;
-    addInitializer(initializer: (this: Class) => void): void;
-}
 export declare const storableMember: unique symbol;
 export declare function buildOptions<entityType = any, valueType = any>(options: (FieldOptions<entityType, valueType> | ((options: FieldOptions<entityType, valueType>, remult: Remult) => void))[], remult: Remult): FieldOptions<entityType, valueType>;
 export declare function decorateColumnSettings<valueType>(settings: FieldOptions<any, valueType>, remult: Remult): FieldOptions<any, valueType>;

package/src/remult3/RepositoryImplementation.js

@@ -15,6 +15,7 @@ var getEntityRef_1 = require("./getEntityRef");
 var __updateEntityBasedOnWhere_1 = require("./__updateEntityBasedOnWhere");
 var relationInfoMember_1 = require("./relationInfoMember");
 var relation_loader_1 = require("./relation-loader");
+var repository_internals_1 = require("./repository-internals");
 //import  { remult } from "../remult-proxy";
 var classValidatorValidate = undefined;
 // import ("class-validator".toString())
@@ -44,6 +45,9 @@ var RepositoryImplementation = /** @class */ (function () {
         this.idCache = new Map();
         this.cache = new Map();
     }
+    RepositoryImplementation.prototype[repository_internals_1.getInternalKey] = function () {
+        return this;
+    };
     RepositoryImplementation.prototype.createAfterFilter = function (orderBy, lastRow) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var values, _a, _b, s, existingVal, r, equalToColumn, _c, _d, s, f, equalToColumn_1, equalToColumn_1_1, c;
@@ -546,9 +550,12 @@ var RepositoryImplementation = /** @class */ (function () {
                         return [4 /*yield*/, this.translateWhereToFilter(options.where)];
                     case 1:
                         _a.where = _b.sent();
-                        opt.orderBy = sort_1.Sort.translateOrderByToSort(this.metadata, options.orderBy);
-                        opt.limit = options.limit;
-                        opt.page = options.page;
+                        if (options.orderBy !== undefined)
+                            opt.orderBy = sort_1.Sort.translateOrderByToSort(this.metadata, options.orderBy);
+                        if (options.limit !== undefined)
+                            opt.limit = options.limit;
+                        if (options.page !== undefined)
+                            opt.page = options.page;
                         return [2 /*return*/, opt];
                 }
             });
@@ -816,11 +823,16 @@ var RepositoryImplementation = /** @class */ (function () {
             }
             finally { if (e_13) throw e_13.error; }
         }
-        if (rel.type === 'toMany' && !options.field && !options.fields) {
+        function buildError(what) {
+            return Error("Error for relation: \"".concat(field.key, "\" to \"").concat(otherRepo.metadata.key, "\": ") +
+                what);
+        }
+        var hasFields = function () { return options.field || options.fields; };
+        if (rel.type === 'toMany' && !hasFields()) {
             try {
                 for (var _h = tslib_1.__values(otherRepo.fields.toArray()), _j = _h.next(); !_j.done; _j = _h.next()) {
                     var fieldInOtherRepo = _j.value;
-                    if (!options.field && !options.fields) {
+                    if (!hasFields()) {
                         var reverseRel = (0, relationInfoMember_1.getRelationInfo)(fieldInOtherRepo.options);
                         var relOp = fieldInOtherRepo.options;
                         if (reverseRel)
@@ -842,8 +854,6 @@ var RepositoryImplementation = /** @class */ (function () {
                                         }
                                         options = tslib_1.__assign(tslib_1.__assign({}, options), { fields: fields });
                                     }
-                                    else
-                                        throw Error("Could not infer fields for the \"toMany\" relation named:".concat(fieldInOtherRepo.key, ". Please specify field/fields"));
                                 }
                     }
                 }
@@ -855,12 +865,22 @@ var RepositoryImplementation = /** @class */ (function () {
                 }
                 finally { if (e_15) throw e_15.error; }
             }
+            if (!hasFields())
+                throw buildError("No matching field found on target. Please specify field/fields");
+        }
+        function requireField(field, meta) {
+            var result = meta.fields.find(field);
+            if (!result)
+                throw buildError("Field \"".concat(field, "\" was not found in \"").concat(meta.key, "\"."));
+            return result;
         }
         if (options.field) {
             if (rel.type === 'toOne') {
+                requireField(options.field, this.metadata);
                 where.push(otherRepo.metadata.idMetadata.getIdFilter(row[options.field]));
             }
             else {
+                requireField(options.field, otherRepo.metadata);
                 where.push((_d = {},
                     _d[options.field] = this.metadata.idMetadata.getId(row),
                     _d));
@@ -869,13 +889,15 @@ var RepositoryImplementation = /** @class */ (function () {
         else if (options.fields) {
             for (var key in options.fields) {
                 if (Object.prototype.hasOwnProperty.call(options.fields, key)) {
+                    requireField(options.fields[key], this.metadata);
+                    requireField(key, otherRepo.metadata);
                     where.push((_e = {}, _e[key] = row[options.fields[key]], _e));
                 }
             }
         }
         else if (rel.type === 'toOne' || rel.type === 'reference') {
             var val = rel.type === 'reference'
-                ? (0, getEntityRef_1.getEntityRef)(row).fields.find(field.key).getId()
+                ? (0, getEntityRef_1.getEntityRef)(row).fields.find(requireField(field.key, this.metadata)).getId()
                 : row[field.key];
             if (val === null)
                 returnNull = true;

package/src/remult3/entity.d.ts

@@ -1,6 +1,6 @@
 import type { Remult } from '../context';
 import type { EntityOptions } from '../entity';
-import type { ClassDecoratorContextStub } from './RepositoryImplementation';
+import type { ClassDecoratorContextStub } from './remult3';
 /**Decorates classes that should be used as entities.
  * Receives a key and an array of EntityOptions.
  * @example

package/src/remult3/entity.js

@@ -4,7 +4,6 @@ exports.Entity = void 0;
 var tslib_1 = require("tslib");
 var context_1 = require("../context");
 var getEntityRef_1 = require("./getEntityRef");
-//[ ] YONI - in Typescript 5 I do get the name of the class, what would we like to change because of that?
 /**Decorates classes that should be used as entities.
  * Receives a key and an array of EntityOptions.
  * @example

package/src/remult3/remult3.d.ts

@@ -422,7 +422,7 @@ export type RelationOptions<fromEntity, toEntity, matchIdEntity, optionsType ext
 export type RelationOptionsBase<fromEntity, toEntity, optionsType extends LoadOptions<toEntity> = LoadOptions<toEntity>> = {
     findOptions?: optionsType | ((entity: fromEntity) => optionsType);
     defaultIncluded?: boolean;
-} & FieldOptions<fromEntity, toEntity>;
+} & Pick<FieldOptions, 'caption'>;
 export type ObjectMembersOnly<T> = {
     [K in keyof Pick<T, {
         [K in keyof T]: T[K] extends object | undefined | null ? T[K] extends Date | undefined | null ? never : K : never;
@@ -439,3 +439,15 @@ export type RepositoryRelations<entityType> = {
 export declare type EntityIdFields<entityType> = {
     [Properties in keyof Partial<OmitEB<entityType>>]?: true;
 };
+export interface ClassFieldDecoratorContextStub<entityType, valueType> {
+    readonly access: {
+        set(object: entityType, value: valueType): void;
+    };
+    readonly name: string;
+}
+export interface ClassDecoratorContextStub<Class extends new (...args: any) => any = new (...args: any) => any> {
+    readonly kind: 'class';
+    readonly name: string | undefined;
+    addInitializer(initializer: (this: Class) => void): void;
+}
+export type ClassFieldDecorator<entityType, valueType> = (target: any, context: string | ClassFieldDecoratorContextStub<entityType, valueType | undefined>, c?: any) => void;

package/src/remult3/repository-internals.d.ts

@@ -0,0 +1,14 @@
+import type { EntityDataProviderFindOptions } from '../data-interfaces';
+import type { Filter } from '../filter/filter-interfaces';
+import type { EntityFilter, EntityOrderBy, FindOptions, LoadOptions, Repository } from './remult3';
+export interface RepositoryInternal<entityType> {
+    createAfterFilter(orderBy: EntityOrderBy<entityType>, lastRow: entityType): Promise<EntityFilter<entityType>>;
+    fromJsonArray(jsonItems: any[], loadOptions: LoadOptions<entityType>): Promise<entityType[]>;
+    buildEntityDataProviderFindOptions(options: FindOptions<entityType>): Promise<EntityDataProviderFindOptions>;
+    translateWhereToFilter(where: EntityFilter<entityType>): Promise<Filter>;
+    getCachedById(id: any, doNotLoadIfNotFound: boolean): entityType;
+    getCachedByIdAsync(id: any, doNotLoadIfNotFound: boolean): Promise<entityType>;
+    addToCache(item: entityType): any;
+}
+export declare function getRepositoryInternals<entityType>(repo: Repository<entityType>): RepositoryInternal<entityType>;
+export declare const getInternalKey = "getInternal";

package/src/remult3/repository-internals.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getInternalKey = exports.getRepositoryInternals = void 0;
+function getRepositoryInternals(repo) {
+    var x = repo;
+    if (typeof x[exports.getInternalKey] === 'function')
+        return x[exports.getInternalKey]();
+    throw Error('Error getting repository internal from ' + repo);
+}
+exports.getRepositoryInternals = getRepositoryInternals;
+exports.getInternalKey = 'getInternal';