remult 0.22.9-exp.0 → 0.23.0-exp.2

package/esm/remult-knex/index.js

@@ -86,6 +86,7 @@ class KnexEntityDataProvider {
                 return +element;
             }
         }
+        throw Error("couldn't find count member");
     }
     async find(options) {
         const e = await this.init();

package/esm/remult-mongo.d.ts

@@ -4,7 +4,7 @@ import type { RepositoryOverloads } from './src/remult3/RepositoryImplementation
 export declare class MongoDataProvider implements DataProvider {
     private db;
     private client;
-    constructor(db: Db, client: MongoClient, options?: {
+    constructor(db: Db, client: MongoClient | undefined, options?: {
         session?: ClientSession;
         disableTransactions?: boolean;
     });

package/esm/remult-mongo.js

@@ -10,7 +10,7 @@ export class MongoDataProvider {
         this.db = db;
         this.client = client;
         this.session = options?.session;
-        this.disableTransactions = options?.disableTransactions;
+        this.disableTransactions = Boolean(options?.disableTransactions);
     }
     session;
     disableTransactions = false;
@@ -28,6 +28,8 @@ export class MongoDataProvider {
             await action(this);
         }
         else {
+            if (!this.client)
+                throw new Error("Can't use transactions within transactions");
             let session = await this.client.startSession();
             session.startTransaction();
             const db = this.client.db(this.db.databaseName);
@@ -198,7 +200,7 @@ class FilterConsumerBridgeToMongo {
                 f._addWhere = false;
                 element.__applyToConsumer(f);
                 let where = await f.resolveWhere();
-                if (where?.$and?.length > 0) {
+                if (where?.$and?.length) {
                     result.push(where);
                 }
                 else

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

@@ -13,7 +13,7 @@ export class LiveQuerySubscriber {
     subscribeCode;
     unsubscribe = () => { };
     async setAllItems(result) {
-        const items = await this.repo.fromJsonArray(result, this.query.options.load);
+        const items = await this.repo.fromJsonArray(result, this.query.options);
         this.forListeners((listener) => {
             listener((x) => {
                 return items;
@@ -54,7 +54,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.load);
+            let loadedItems = await 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/remult3/RepositoryImplementation.d.ts

@@ -3,7 +3,7 @@ import { LookupColumn } from '../column';
 import type { FieldMetadata, FieldOptions, ValueConverter, ValueListItem } from '../column-interfaces';
 import { Remult } from '../context';
 import type { EntityOptions } from '../entity';
-import type { ControllerRef, EntityFilter, EntityMetadata, EntityOrderBy, EntityRef, FieldRef, FieldsMetadata, FieldsRef, FindFirstOptions, FindFirstOptionsBase, FindOptions, IdMetadata, LiveQuery, OmitEB, QueryOptions, QueryResult, Repository, RepositoryRelations, Subscribable } from './remult3';
+import type { ControllerRef, EntityFilter, EntityMetadata, EntityOrderBy, EntityRef, FieldRef, FieldsMetadata, FieldsRef, FindFirstOptions, FindFirstOptionsBase, FindOptions, IdMetadata, LiveQuery, LoadOptions, OmitEB, QueryOptions, QueryResult, Repository, RepositoryRelations, Subscribable } from './remult3';
 import type { RefSubscriber } from './remult3';
 import type { entityEventListener } from '../__EntityValueProvider';
 import type { DataProvider, EntityDataProvider, EntityDataProviderFindOptions, ErrorInfo } from '../data-interfaces';
@@ -53,7 +53,7 @@ export declare class RepositoryImplementation<entityType> implements Repository<
     rawFind(options: FindOptions<entityType>, skipOrderByAndLimit: boolean, loader: RelationLoader): Promise<Awaited<entityType>[]>;
     find(options: FindOptions<entityType>, skipOrderByAndLimit?: boolean): Promise<entityType[]>;
     buildEntityDataProviderFindOptions(options: FindOptions<entityType>): Promise<EntityDataProviderFindOptions>;
-    fromJsonArray(jsonItems: any[], load?: (entity: FieldsMetadata<entityType>) => FieldMetadata[]): Promise<Awaited<entityType>[]>;
+    fromJsonArray(jsonItems: any[], loadOptions: LoadOptions<entityType>): Promise<Awaited<entityType>[]>;
     private loadManyToOneForManyRows;
     private mapRawDataToResult;
     toJson(item: entityType | entityType[] | Promise<entityType> | Promise<entityType[]>): any;

package/esm/src/remult3/RepositoryImplementation.js

@@ -80,7 +80,15 @@ export class RepositoryImplementation {
                     throw Error(key + ' is not a relation');
                 let repo = this.remult.repo(rel.toType());
                 let { findOptions } = this.findOptionsBasedOnRelation(rel, field, undefined, item, repo);
-                return new RepositoryImplementation(repo.entity, repo.remult, repo.dataProvider, repo._info, findOptions);
+                const toRepo = new RepositoryImplementation(repo.entity, repo.remult, repo.dataProvider, repo._info, findOptions);
+                if (rel.type === 'toMany')
+                    return toRepo;
+                else
+                    return {
+                        findOne: (options) => {
+                            return toRepo.findFirst({}, options);
+                        },
+                    };
             },
         });
     }
@@ -326,7 +334,7 @@ export class RepositoryImplementation {
             delete opt.limit;
         }
         const rawRows = await this.edp.find(opt);
-        let result = await this.loadManyToOneForManyRows(rawRows, options.load, options.include, loader);
+        let result = await this.loadManyToOneForManyRows(rawRows, options, loader);
         return result;
     }
     async find(options, skipOrderByAndLimit = false) {
@@ -347,20 +355,22 @@ export class RepositoryImplementation {
         opt.page = options.page;
         return opt;
     }
-    async fromJsonArray(jsonItems, load) {
+    async fromJsonArray(jsonItems, loadOptions) {
         const loader = new RelationLoader();
-        return this.loadManyToOneForManyRows(jsonItems.map((row) => {
+        const result = await this.loadManyToOneForManyRows(jsonItems.map((row) => {
             let result = {};
             for (const col of this.metadata.fields.toArray()) {
                 result[col.key] = col.valueConverter.fromJson(row[col.key]);
             }
             return result;
-        }), load, undefined, loader);
+        }), loadOptions, loader);
+        await loader.resolveAll();
+        return result;
     }
-    async loadManyToOneForManyRows(rawRows, load, include, loader) {
+    async loadManyToOneForManyRows(rawRows, loadOptions, loader) {
         let loadFields = undefined;
-        if (load)
-            loadFields = load(this.metadata.fields);
+        if (loadOptions?.load)
+            loadFields = loadOptions.load(this.metadata.fields);
         for (const col of this.metadata.fields) {
             let ei = getEntitySettings(col.valueType, false);
             if (ei) {
@@ -371,8 +381,8 @@ export class RepositoryImplementation {
                         : !col.options.lazy;
                     if (loadFields !== undefined)
                         load = loadFields.includes(col);
-                    if (include)
-                        load = include[col.key];
+                    if (loadOptions.include)
+                        load = loadOptions.include[col.key];
                     if (load) {
                         let repo = this.remult.repo(col.valueType);
                         let toLoad = [];
@@ -407,8 +417,8 @@ export class RepositoryImplementation {
             let rel = getRelationInfo(col.options);
             let incl = col.options
                 .defaultIncluded;
-            if (include) {
-                incl = include?.[col.key];
+            if (loadOptions?.include) {
+                incl = loadOptions.include[col.key];
             }
             if (rel && incl) {
                 const otherRepo = this.remult.repo(rel.toType());
@@ -1340,7 +1350,18 @@ export class FieldRefImplementation {
     }
     async load() {
         let lu = this.rowBase.lookups.get(this.metadata.key);
-        if (lu) {
+        let rel = getRelationInfo(this.metadata.options);
+        if (rel) {
+            if (rel.type === 'toMany') {
+                return (this.container[this.metadata.key] = await this.helper.repository
+                    .relations(this.container)[this.metadata.key].find());
+            }
+            else {
+                return (this.container[this.metadata.key] = await this.helper.repository
+                    .relations(this.container)[this.metadata.key].findOne());
+            }
+        }
+        else if (lu) {
             if (this.valueChanged()) {
                 await lu.waitLoadOf(this.rawOriginalValue());
             }

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

@@ -414,7 +414,7 @@ export type RelationOptionsBase<fromEntity, toEntity, optionsType extends LoadOp
 } & FieldOptions<fromEntity, toEntity>;
 export type ObjectMembersOnly<T> = {
     [K in keyof Pick<T, {
-        [K in keyof T]: T[K] extends object ? T[K] extends Date ? never : K : never;
+        [K in keyof T]: T[K] extends object | undefined | null ? T[K] extends Date | undefined | null ? never : K : never;
     }[keyof T]>]: T[K];
 };
 export type MembersToInclude<T> = {

package/esm/src/remult3/remult3.js

@@ -1,5 +1 @@
 export {};
-//[ ] - implement find One
-//[ ] - for active record, implement waitLoad
-//[ ] - replace lookup Column with strategy for reference vs lazy
-//[ ] - test with live query

package/esm/src/resultCompoundIdFilter.d.ts

@@ -1,3 +1,3 @@
 import type { CompoundIdField } from './CompoundIdField';
 import { Filter } from './filter/filter-interfaces';
-export declare function resultCompoundIdFilter(idField: CompoundIdField, id: string, data: any): Filter;
+export declare function resultCompoundIdFilter(idField: CompoundIdField, id: string | undefined, data: any): Filter;

package/package.json

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

package/remult-knex/index.js

@@ -151,7 +151,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                                 return [2 /*return*/, +element];
                             }
                         }
-                        return [2 /*return*/];
+                        throw Error("couldn't find count member");
                 }
             });
         });

package/remult-mongo.d.ts

@@ -4,7 +4,7 @@ import type { RepositoryOverloads } from './src/remult3/RepositoryImplementation
 export declare class MongoDataProvider implements DataProvider {
     private db;
     private client;
-    constructor(db: Db, client: MongoClient, options?: {
+    constructor(db: Db, client: MongoClient | undefined, options?: {
         session?: ClientSession;
         disableTransactions?: boolean;
     });

package/remult-mongo.js

@@ -13,7 +13,7 @@ var MongoDataProvider = /** @class */ (function () {
         this.client = client;
         this.disableTransactions = false;
         this.session = options === null || options === void 0 ? void 0 : options.session;
-        this.disableTransactions = options === null || options === void 0 ? void 0 : options.disableTransactions;
+        this.disableTransactions = Boolean(options === null || options === void 0 ? void 0 : options.disableTransactions);
     }
     MongoDataProvider.getDb = function (remult) {
         var r = (remult || remult_proxy_1.remult).dataProvider;
@@ -35,7 +35,10 @@ var MongoDataProvider = /** @class */ (function () {
                     case 1:
                         _a.sent();
                         return [3 /*break*/, 11];
-                    case 2: return [4 /*yield*/, this.client.startSession()];
+                    case 2:
+                        if (!this.client)
+                            throw new Error("Can't use transactions within transactions");
+                        return [4 /*yield*/, this.client.startSession()];
                     case 3:
                         session = _a.sent();
                         session.startTransaction();
@@ -417,7 +420,7 @@ var FilterConsumerBridgeToMongo = /** @class */ (function () {
                         return [4 /*yield*/, f.resolveWhere()];
                     case 3:
                         where = _c.sent();
-                        if (((_b = where === null || where === void 0 ? void 0 : where.$and) === null || _b === void 0 ? void 0 : _b.length) > 0) {
+                        if ((_b = where === null || where === void 0 ? void 0 : where.$and) === null || _b === void 0 ? void 0 : _b.length) {
                             result.push(where);
                         }
                         else

package/src/live-query/SubscriptionChannel.js

@@ -27,7 +27,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.load)];
+                    case 0: return [4 /*yield*/, this.repo.fromJsonArray(result, this.query.options)];
                     case 1:
                         items = _a.sent();
                         this.forListeners(function (listener) {
@@ -97,7 +97,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.load)];
+                        return [4 /*yield*/, 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/remult3/RepositoryImplementation.d.ts

@@ -3,7 +3,7 @@ import { LookupColumn } from '../column';
 import type { FieldMetadata, FieldOptions, ValueConverter, ValueListItem } from '../column-interfaces';
 import { Remult } from '../context';
 import type { EntityOptions } from '../entity';
-import type { ControllerRef, EntityFilter, EntityMetadata, EntityOrderBy, EntityRef, FieldRef, FieldsMetadata, FieldsRef, FindFirstOptions, FindFirstOptionsBase, FindOptions, IdMetadata, LiveQuery, OmitEB, QueryOptions, QueryResult, Repository, RepositoryRelations, Subscribable } from './remult3';
+import type { ControllerRef, EntityFilter, EntityMetadata, EntityOrderBy, EntityRef, FieldRef, FieldsMetadata, FieldsRef, FindFirstOptions, FindFirstOptionsBase, FindOptions, IdMetadata, LiveQuery, LoadOptions, OmitEB, QueryOptions, QueryResult, Repository, RepositoryRelations, Subscribable } from './remult3';
 import type { RefSubscriber } from './remult3';
 import type { entityEventListener } from '../__EntityValueProvider';
 import type { DataProvider, EntityDataProvider, EntityDataProviderFindOptions, ErrorInfo } from '../data-interfaces';
@@ -53,7 +53,7 @@ export declare class RepositoryImplementation<entityType> implements Repository<
     rawFind(options: FindOptions<entityType>, skipOrderByAndLimit: boolean, loader: RelationLoader): Promise<Awaited<entityType>[]>;
     find(options: FindOptions<entityType>, skipOrderByAndLimit?: boolean): Promise<entityType[]>;
     buildEntityDataProviderFindOptions(options: FindOptions<entityType>): Promise<EntityDataProviderFindOptions>;
-    fromJsonArray(jsonItems: any[], load?: (entity: FieldsMetadata<entityType>) => FieldMetadata[]): Promise<Awaited<entityType>[]>;
+    fromJsonArray(jsonItems: any[], loadOptions: LoadOptions<entityType>): Promise<Awaited<entityType>[]>;
     private loadManyToOneForManyRows;
     private mapRawDataToResult;
     toJson(item: entityType | entityType[] | Promise<entityType> | Promise<entityType[]>): any;

package/src/remult3/RepositoryImplementation.js

@@ -125,7 +125,15 @@ var RepositoryImplementation = /** @class */ (function () {
                     throw Error(key + ' is not a relation');
                 var repo = _this.remult.repo(rel.toType());
                 var findOptions = _this.findOptionsBasedOnRelation(rel, field, undefined, item, repo).findOptions;
-                return new RepositoryImplementation(repo.entity, repo.remult, repo.dataProvider, repo._info, findOptions);
+                var toRepo = new RepositoryImplementation(repo.entity, repo.remult, repo.dataProvider, repo._info, findOptions);
+                if (rel.type === 'toMany')
+                    return toRepo;
+                else
+                    return {
+                        findOne: function (options) {
+                            return toRepo.findFirst({}, options);
+                        },
+                    };
             },
         });
     };
@@ -496,7 +504,7 @@ var RepositoryImplementation = /** @class */ (function () {
                         return [4 /*yield*/, this.edp.find(opt)];
                     case 2:
                         rawRows = _a.sent();
-                        return [4 /*yield*/, this.loadManyToOneForManyRows(rawRows, options.load, options.include, loader)];
+                        return [4 /*yield*/, this.loadManyToOneForManyRows(rawRows, options, loader)];
                     case 3:
                         result = _a.sent();
                         return [2 /*return*/, result];
@@ -546,34 +554,43 @@ var RepositoryImplementation = /** @class */ (function () {
             });
         });
     };
-    RepositoryImplementation.prototype.fromJsonArray = function (jsonItems, load) {
+    RepositoryImplementation.prototype.fromJsonArray = function (jsonItems, loadOptions) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var loader;
+            var loader, result;
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
-                loader = new relation_loader_1.RelationLoader();
-                return [2 /*return*/, this.loadManyToOneForManyRows(jsonItems.map(function (row) {
-                        var e_7, _a;
-                        var result = {};
-                        try {
-                            for (var _b = tslib_1.__values(_this.metadata.fields.toArray()), _c = _b.next(); !_c.done; _c = _b.next()) {
-                                var col = _c.value;
-                                result[col.key] = col.valueConverter.fromJson(row[col.key]);
-                            }
-                        }
-                        catch (e_7_1) { e_7 = { error: e_7_1 }; }
-                        finally {
-                            try {
-                                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                            }
-                            finally { if (e_7) throw e_7.error; }
-                        }
-                        return result;
-                    }), load, undefined, loader)];
+                switch (_a.label) {
+                    case 0:
+                        loader = new relation_loader_1.RelationLoader();
+                        return [4 /*yield*/, this.loadManyToOneForManyRows(jsonItems.map(function (row) {
+                                var e_7, _a;
+                                var result = {};
+                                try {
+                                    for (var _b = tslib_1.__values(_this.metadata.fields.toArray()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                                        var col = _c.value;
+                                        result[col.key] = col.valueConverter.fromJson(row[col.key]);
+                                    }
+                                }
+                                catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                                finally {
+                                    try {
+                                        if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                                    }
+                                    finally { if (e_7) throw e_7.error; }
+                                }
+                                return result;
+                            }), loadOptions, loader)];
+                    case 1:
+                        result = _a.sent();
+                        return [4 /*yield*/, loader.resolveAll()];
+                    case 2:
+                        _a.sent();
+                        return [2 /*return*/, result];
+                }
             });
         });
     };
-    RepositoryImplementation.prototype.loadManyToOneForManyRows = function (rawRows, load, include, loader) {
+    RepositoryImplementation.prototype.loadManyToOneForManyRows = function (rawRows, loadOptions, loader) {
         var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             function loadManyToOne(repo, toLoad) {
@@ -603,15 +620,15 @@ var RepositoryImplementation = /** @class */ (function () {
                     });
                 });
             }
-            var loadFields, _c, _d, col, ei, isRelation, load_1, repo, toLoad, rawRows_1, rawRows_1_1, r, val, rel, e_8_1, result, _loop_1, this_1, _e, _f, col;
+            var loadFields, _c, _d, col, ei, isRelation, load, repo, toLoad, rawRows_1, rawRows_1_1, r, val, rel, e_8_1, result, _loop_1, this_1, _e, _f, col;
             var e_8, _g, e_9, _h, e_10, _j;
             var _this = this;
             return tslib_1.__generator(this, function (_k) {
                 switch (_k.label) {
                     case 0:
                         loadFields = undefined;
-                        if (load)
-                            loadFields = load(this.metadata.fields);
+                        if (loadOptions === null || loadOptions === void 0 ? void 0 : loadOptions.load)
+                            loadFields = loadOptions.load(this.metadata.fields);
                         _k.label = 1;
                     case 1:
                         _k.trys.push([1, 8, 9, 10]);
@@ -624,14 +641,14 @@ var RepositoryImplementation = /** @class */ (function () {
                         if (!ei) return [3 /*break*/, 5];
                         isRelation = (_a = col.options) === null || _a === void 0 ? void 0 : _a[relationInfoMember_1.relationInfoMember];
                         if (!!isRelation) return [3 /*break*/, 4];
-                        load_1 = isRelation
+                        load = isRelation
                             ? (_b = col.options) === null || _b === void 0 ? void 0 : _b.defaultIncluded
                             : !col.options.lazy;
                         if (loadFields !== undefined)
-                            load_1 = loadFields.includes(col);
-                        if (include)
-                            load_1 = include[col.key];
-                        if (!load_1) return [3 /*break*/, 4];
+                            load = loadFields.includes(col);
+                        if (loadOptions.include)
+                            load = loadOptions.include[col.key];
+                        if (!load) return [3 /*break*/, 4];
                         repo = this.remult.repo(col.valueType);
                         toLoad = [];
                         try {
@@ -692,8 +709,8 @@ var RepositoryImplementation = /** @class */ (function () {
                             var rel = (0, relationInfoMember_1.getRelationInfo)(col.options);
                             var incl = col.options
                                 .defaultIncluded;
-                            if (include) {
-                                incl = include === null || include === void 0 ? void 0 : include[col.key];
+                            if (loadOptions === null || loadOptions === void 0 ? void 0 : loadOptions.include) {
+                                incl = loadOptions.include[col.key];
                             }
                             if (rel && incl) {
                                 var otherRepo = this_1.remult.repo(rel.toType());
@@ -2331,20 +2348,36 @@ var FieldRefImplementation = /** @class */ (function () {
     };
     FieldRefImplementation.prototype.load = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var lu;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
+            var lu, rel, _a, _b, _c, _d;
+            return tslib_1.__generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         lu = this.rowBase.lookups.get(this.metadata.key);
-                        if (!lu) return [3 /*break*/, 4];
-                        if (!this.valueChanged()) return [3 /*break*/, 2];
+                        rel = (0, relationInfoMember_1.getRelationInfo)(this.metadata.options);
+                        if (!rel) return [3 /*break*/, 5];
+                        if (!(rel.type === 'toMany')) return [3 /*break*/, 2];
+                        _a = this.container;
+                        _b = this.metadata.key;
+                        return [4 /*yield*/, this.helper.repository
+                                .relations(this.container)[this.metadata.key].find()];
+                    case 1: return [2 /*return*/, (_a[_b] = _e.sent())];
+                    case 2:
+                        _c = this.container;
+                        _d = this.metadata.key;
+                        return [4 /*yield*/, this.helper.repository
+                                .relations(this.container)[this.metadata.key].findOne()];
+                    case 3: return [2 /*return*/, (_c[_d] = _e.sent())];
+                    case 4: return [3 /*break*/, 9];
+                    case 5:
+                        if (!lu) return [3 /*break*/, 9];
+                        if (!this.valueChanged()) return [3 /*break*/, 7];
                         return [4 /*yield*/, lu.waitLoadOf(this.rawOriginalValue())];
-                    case 1:
-                        _a.sent();
-                        _a.label = 2;
-                    case 2: return [4 /*yield*/, lu.waitLoad()];
-                    case 3: return [2 /*return*/, _a.sent()];
-                    case 4: return [2 /*return*/, this.value];
+                    case 6:
+                        _e.sent();
+                        _e.label = 7;
+                    case 7: return [4 /*yield*/, lu.waitLoad()];
+                    case 8: return [2 /*return*/, _e.sent()];
+                    case 9: return [2 /*return*/, this.value];
                 }
             });
         });

package/src/remult3/remult3.d.ts

@@ -414,7 +414,7 @@ export type RelationOptionsBase<fromEntity, toEntity, optionsType extends LoadOp
 } & FieldOptions<fromEntity, toEntity>;
 export type ObjectMembersOnly<T> = {
     [K in keyof Pick<T, {
-        [K in keyof T]: T[K] extends object ? T[K] extends Date ? never : K : never;
+        [K in keyof T]: T[K] extends object | undefined | null ? T[K] extends Date | undefined | null ? never : K : never;
     }[keyof T]>]: T[K];
 };
 export type MembersToInclude<T> = {

package/src/remult3/remult3.js

@@ -1,6 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//[ ] - implement find One
-//[ ] - for active record, implement waitLoad
-//[ ] - replace lookup Column with strategy for reference vs lazy
-//[ ] - test with live query

package/src/resultCompoundIdFilter.d.ts

@@ -1,3 +1,3 @@
 import type { CompoundIdField } from './CompoundIdField';
 import { Filter } from './filter/filter-interfaces';
-export declare function resultCompoundIdFilter(idField: CompoundIdField, id: string, data: any): Filter;
+export declare function resultCompoundIdFilter(idField: CompoundIdField, id: string | undefined, data: any): Filter;