remult 3.4.0 → 3.4.1

package/esm/src/remult-proxy.js

@@ -124,10 +124,10 @@ export class RemultProxy {
                 .remultFactory()
                 .repo(...args)
                 .updateMany(...args2),
-            find: (options) => self
+            find: (...args2) => self
                 .remultFactory()
                 .repo(...args)
-                .find(options),
+                .find(...args2),
             groupBy: (...args2) => self
                 .remultFactory()
                 .repo(...args)
@@ -138,14 +138,14 @@ export class RemultProxy {
                 .repo(...args)
                 //@ts-ignore
                 .aggregate(...args2),
-            findFirst: (where, options) => self
+            findFirst: (...args2) => self
                 .remultFactory()
                 .repo(...args)
-                .findFirst(where, options),
-            findOne: (options) => self
+                .findFirst(...args2),
+            findOne: (...args2) => self
                 .remultFactory()
                 .repo(...args)
-                .findOne(options),
+                .findOne(...args2),
             findId: (a, b) => self
                 .remultFactory()
                 .repo(...args)

package/esm/src/remult3/RepositoryImplementation.js

@@ -41,18 +41,6 @@ let classValidatorValidate = undefined;
 //     })
 //     .catch(() => {
 //     });
-// Assigning a `toOne` also writes its `field`/`fields`, which would wipe the FK of a row whose
-// target is missing.
-function setMissingRelationToNull(row, key) {
-    const ref = getEntityRef(row);
-    ref._skipRelationFieldSync = true;
-    try {
-        row[key] = null;
-    }
-    finally {
-        ref._skipRelationFieldSync = false;
-    }
-}
 export class RepositoryImplementation {
     _entity;
     _remult;
@@ -744,12 +732,10 @@ export class RepositoryImplementation {
                     for (const row of result) {
                         let { findOptions, returnNull, returnUndefined } = this._findOptionsBasedOnRelation(rel, col, incl, row, otherRepo);
                         const colKey = col.key;
-                        if (returnNull || returnUndefined) {
-                            if (rel.type === 'toMany')
-                                row[colKey] = (returnNull ? null : undefined);
-                            else
-                                setMissingRelationToNull(row, colKey);
-                        }
+                        if (returnNull)
+                            row[colKey] = null;
+                        else if (returnUndefined)
+                            row[colKey] = undefined;
                         else {
                             const entityType = rel.toEntity;
                             const toRepo = otherRepo;
@@ -760,12 +746,14 @@ export class RepositoryImplementation {
                                 metadata: toRepo.metadata,
                             }, findOptions)
                                 .then((result) => {
-                                if (rel.type === 'toMany')
-                                    row[colKey] = result;
-                                else if (result.length == 0)
-                                    setMissingRelationToNull(row, colKey);
-                                else
-                                    row[colKey] = result[0];
+                                if (result.length == 0 && rel.type == 'toOne')
+                                    return;
+                                row[colKey] =
+                                    rel.type !== 'toMany'
+                                        ? result.length == 0
+                                            ? null
+                                            : result[0]
+                                        : result;
                             });
                         }
                     }
@@ -1201,7 +1189,7 @@ class rowHelperBase {
                         },
                         set: (newVal) => {
                             val = newVal;
-                            if (newVal === undefined || this._skipRelationFieldSync)
+                            if (newVal === undefined)
                                 return;
                             const op = col.options;
                             if (op.field) {
@@ -1226,7 +1214,6 @@ class rowHelperBase {
             }
         }
     }
-    _skipRelationFieldSync = false;
     _subscribers;
     subscribe(listener) {
         this.initSubscribers();
@@ -1685,9 +1672,7 @@ export class rowHelperImplementation extends rowHelperBase {
                         await listener.saved?.(this.instance, true);
                     }
             }
-            this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [
-                { id: this.getId(), oldId: this.getOriginalId(), deleted: false },
-            ]);
+            this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }]);
             this.saveOriginalData();
             this._isNew = false;
             return this.instance;

package/index.d.ts

@@ -2,7 +2,7 @@ import type { ClassType } from './classType.js';
 import type { DataProvider } from './src/data-interfaces.js';
 export { ArrayEntityDataProvider } from './src/data-providers/array-entity-data-provider.js';
 export type { ClassType } from './classType.js';
-export type { ValidateFieldEvent, MembersOnly, NumericKeys, FieldsMetadata, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, FindOptionsBase, QueryResult, QueryOptions, UpsertOptions, Repository, GroupByOptions, GroupByResult, FindFirstOptions, ComparisonValueFilter, ValueFilter, IdFilter, ContainsStringValueFilter, EntityRef, SortSegments, Paginator, LiveQuery, LiveQueryChangeInfo, Subscribable, RefSubscriber, RefSubscriberBase, RelationOptions, ObjectMembersOnly, MembersToInclude, Loaded, RepositoryRelations, EntityIdFields, EntitySelectFields, InsertOrUpdateOptions, ClassFieldDecorator, ClassFieldDecoratorContextStub, //n1 consider removing in ts5
+export type { ValidateFieldEvent, MembersOnly, NumericKeys, FieldsMetadata, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, FindOptionsBase, QueryResult, QueryOptions, UpsertOptions, Repository, GroupByOptions, GroupByResult, FindFirstOptions, ComparisonValueFilter, ValueFilter, IdFilter, ContainsStringValueFilter, EntityRef, SortSegments, Paginator, LiveQuery, LiveQueryChangeInfo, Subscribable, RefSubscriber, RefSubscriberBase, RelationOptions, ObjectMembersOnly, MembersToInclude, RepositoryRelations, EntityIdFields, EntitySelectFields, InsertOrUpdateOptions, ClassFieldDecorator, ClassFieldDecoratorContextStub, //n1 consider removing in ts5
 LifecycleEvent, FieldsRefBase, FieldsRefForEntityBase, RepositoryRelationsForEntityBase, ControllerRefForControllerBase, ControllerRefBase, ControllerRef, EntityRefForEntityBase, IdMetadata, FindFirstOptionsBase, } from './src/remult3/remult3.js';
 export { standardSchema } from './src/standard-schema/index.js';
 export { EntityBase, ControllerBase, FieldType, getFields, ValueListFieldType, getValueList, ValueListInfo, } from './src/remult3/RepositoryImplementation.js';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "3.4.0",
+    "version": "3.4.1",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev",
     "repository": {

package/src/remult-proxy.js

@@ -112,11 +112,16 @@ var RemultProxy = /** @class */ (function () {
                         .repo.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(args), false)))
                         .updateMany.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args2), false));
                 },
-                _a.find = function (options) {
-                    var _a;
-                    return (_a = self
+                _a.find = function () {
+                    var _a, _b;
+                    var args2 = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        args2[_i] = arguments[_i];
+                    }
+                    return (_a = (_b = self
                         .remultFactory())
-                        .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).find(options);
+                        .repo.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(args), false)))
+                        .find.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args2), false));
                 },
                 _a.groupBy = function () {
                     var _a, _b;
@@ -140,17 +145,27 @@ var RemultProxy = /** @class */ (function () {
                         .repo.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(args), false)))
                         .aggregate.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args2), false));
                 },
-                _a.findFirst = function (where, options) {
-                    var _a;
-                    return (_a = self
+                _a.findFirst = function () {
+                    var _a, _b;
+                    var args2 = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        args2[_i] = arguments[_i];
+                    }
+                    return (_a = (_b = self
                         .remultFactory())
-                        .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).findFirst(where, options);
+                        .repo.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(args), false)))
+                        .findFirst.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args2), false));
                 },
-                _a.findOne = function (options) {
-                    var _a;
-                    return (_a = self
+                _a.findOne = function () {
+                    var _a, _b;
+                    var args2 = [];
+                    for (var _i = 0; _i < arguments.length; _i++) {
+                        args2[_i] = arguments[_i];
+                    }
+                    return (_a = (_b = self
                         .remultFactory())
-                        .repo.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args), false)).findOne(options);
+                        .repo.apply(_b, tslib_1.__spreadArray([], tslib_1.__read(args), false)))
+                        .findOne.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(args2), false));
                 },
                 _a.findId = function (a, b) {
                     var _a;

package/src/remult3/RepositoryImplementation.d.ts

@@ -106,7 +106,6 @@ declare abstract class rowHelperBase<T> {
      * must not be serialized by {@link toApiJson}. */
     _fieldsExcludedBySelect?: Set<string>;
     constructor(fieldsMetadata: FieldMetadata[], instance: T, remult: Remult, isNewRow: boolean, excludeRelationMembers?: Set<string>);
-    _skipRelationFieldSync: boolean;
     _subscribers?: SubscribableImp;
     subscribe(listener: RefSubscriber): Unsubscribe;
     _isLoading: boolean;

package/src/remult3/RepositoryImplementation.js

@@ -57,18 +57,6 @@ var classValidatorValidate = undefined;
 //     })
 //     .catch(() => {
 //     });
-// Assigning a `toOne` also writes its `field`/`fields`, which would wipe the FK of a row whose
-// target is missing.
-function setMissingRelationToNull(row, key) {
-    var ref = (0, getEntityRef_js_1.getEntityRef)(row);
-    ref._skipRelationFieldSync = true;
-    try {
-        row[key] = null;
-    }
-    finally {
-        ref._skipRelationFieldSync = false;
-    }
-}
 var RepositoryImplementation = /** @class */ (function () {
     function RepositoryImplementation(_entity, _remult, _dataProvider, _info, _defaultFindOptions) {
         this._entity = _entity;
@@ -1239,12 +1227,10 @@ var RepositoryImplementation = /** @class */ (function () {
                     var _loop_2 = function (row) {
                         var _e = this_1._findOptionsBasedOnRelation(rel, col, incl, row, otherRepo), findOptions = _e.findOptions, returnNull = _e.returnNull, returnUndefined = _e.returnUndefined;
                         var colKey = col.key;
-                        if (returnNull || returnUndefined) {
-                            if (rel.type === 'toMany')
-                                row[colKey] = (returnNull ? null : undefined);
-                            else
-                                setMissingRelationToNull(row, colKey);
-                        }
+                        if (returnNull)
+                            row[colKey] = null;
+                        else if (returnUndefined)
+                            row[colKey] = undefined;
                         else {
                             var entityType = rel.toEntity;
                             var toRepo_1 = otherRepo;
@@ -1259,12 +1245,14 @@ var RepositoryImplementation = /** @class */ (function () {
                                 metadata: toRepo_1.metadata,
                             }, findOptions)
                                 .then(function (result) {
-                                if (rel.type === 'toMany')
-                                    row[colKey] = result;
-                                else if (result.length == 0)
-                                    setMissingRelationToNull(row, colKey);
-                                else
-                                    row[colKey] = result[0];
+                                if (result.length == 0 && rel.type == 'toOne')
+                                    return;
+                                row[colKey] =
+                                    rel.type !== 'toMany'
+                                        ? result.length == 0
+                                            ? null
+                                            : result[0]
+                                        : result;
                             });
                         }
                     };
@@ -1908,7 +1896,6 @@ var rowHelperBase = /** @class */ (function () {
         this.instance = instance;
         this.remult = remult;
         this.isNewRow = isNewRow;
-        this._skipRelationFieldSync = false;
         this._isLoading = false;
         this.lookups = new Map();
         this.originalValues = {};
@@ -1968,7 +1955,7 @@ var rowHelperBase = /** @class */ (function () {
                         },
                         set: function (newVal) {
                             val_1 = newVal;
-                            if (newVal === undefined || _this._skipRelationFieldSync)
+                            if (newVal === undefined)
                                 return;
                             var op = col.options;
                             if (op.field) {
@@ -2819,9 +2806,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
                         finally { if (e_41) throw e_41.error; }
                         return [7 /*endfinally*/];
                     case 12:
-                        this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [
-                            { id: this.getId(), oldId: this.getOriginalId(), deleted: false },
-                        ]);
+                        this.repo._remult.liveQueryPublisher.itemChanged(this.repo.metadata.key, [{ id: this.getId(), oldId: this.getOriginalId(), deleted: false }]);
                         this.saveOriginalData();
                         this._isNew = false;
                         return [2 /*return*/, this.instance];

package/src/remult3/remult3.d.ts

@@ -395,10 +395,6 @@ export type GroupByResult<entityType, groupByFields extends (keyof entityType)[]
 };
 /** used to perform CRUD operations on an `entityType` */
 export interface Repository<entityType> {
-    /** returns an array based on the provided options. Included relations drop their `?`, see {@link Loaded} */
-    find<const include extends MembersToInclude<entityType>>(options: FindOptions<entityType> & {
-        include: include;
-    }): Promise<Loaded<entityType, include>[]>;
     /** returns an array based on the provided options */
     find(options?: FindOptions<entityType>): Promise<entityType[]>;
     /** Using the same options as the {@link find} method, but subscribing to entity changes.
@@ -414,9 +410,6 @@ export interface Repository<entityType> {
      * @example
      * await taskRepo.findFirst({ completed:false },{ createIfNotFound: true })
      *      */
-    findFirst<const include extends MembersToInclude<entityType>>(where: EntityFilter<entityType> | undefined, options: FindFirstOptions<entityType> & {
-        include: include;
-    }): Promise<Loaded<entityType, include> | undefined>;
     findFirst(where?: EntityFilter<entityType>, options?: FindFirstOptions<entityType>): Promise<entityType | undefined>;
     /** returns the first item that matchers the `where` condition
      * @example
@@ -424,14 +417,8 @@ export interface Repository<entityType> {
      * @example
      * await taskRepo.findFirst({ where:{ completed:false }, createIfNotFound: true })
      *      */
-    findOne<const include extends MembersToInclude<entityType>>(options: FindFirstOptions<entityType> & {
-        include: include;
-    }): Promise<Loaded<entityType, include> | undefined>;
     findOne(options?: FindFirstOptions<entityType>): Promise<entityType | undefined>;
     /** returns the items that matches the id. If id is undefined | null, returns null */
-    findId<const include extends MembersToInclude<entityType>>(id: idType<entityType>, options: FindFirstOptionsBase<entityType> & {
-        include: include;
-    }): Promise<Loaded<entityType, include> | undefined | null>;
     findId(id: idType<entityType>, options?: FindFirstOptionsBase<entityType>): Promise<entityType | undefined | null>;
     /**
      * Performs an aggregation on the repository's entity type based on the specified options.
@@ -1196,29 +1183,6 @@ export type ObjectMembersOnly<T> = MembersOnly<{
 export type MembersToInclude<T> = {
     [K in keyof ObjectMembersOnly<T>]?: boolean | (NonNullable<T[K]> extends Array<any> ? FindOptions<NonNullable<T[K]>[number]> : FindFirstOptions<NonNullable<T[K]>>);
 };
-type LoadedTarget<target, include> = include extends {
-    include: infer nested;
-} ? Loaded<target, nested> : target;
-type LoadedRelation<value, include> = NonNullable<value> extends (infer target)[] ? LoadedTarget<target, include>[] : null extends value ? LoadedTarget<NonNullable<value>, include> | null : LoadedTarget<NonNullable<value>, include>;
-type LoadedKeys<entityType, include> = {
-    [K in keyof include & keyof entityType]-?: [include[K]] extends [
-        true | object
-    ] ? K : never;
-}[keyof include & keyof entityType];
-/**
- * The entity type `find` returns for a given `include`.
- * Included relations drop their `?`, and nested `include`s work the same way.
- * A relation declared `| null` stays nullable.
- * A relation included with `false` or a widened `boolean` keeps its declared type.
- * An included relation whose target row is missing loads as `null`.
- * Declare it `| null` when that can happen, e.g. an optional FK or a target a `backendPrefilter` can hide.
- * @example
- * const tasks = await repo(Task).find({ include: { category: true } })
- * tasks[0].category.name // `category` is loaded, no `?.` needed
- */
-export type Loaded<entityType, include> = 0 extends 1 & (entityType | include) ? entityType : [LoadedKeys<entityType, include>] extends [never] ? entityType : Omit<entityType, LoadedKeys<entityType, include>> & {
-    [K in LoadedKeys<entityType, include>]-?: LoadedRelation<Exclude<entityType[K], undefined>, include[K]>;
-};
 export type RepositoryRelations<entityType> = {
     [K in keyof ObjectMembersOnly<entityType>]-?: NonNullable<entityType[K]> extends Array<infer R> ? Repository<R> : entityType[K] extends infer R ? {
         findOne: (options?: FindOptionsBase<R>) => Promise<R>;
@@ -1265,4 +1229,3 @@ export declare const flags: {
     /** Version poll while SSE is stale */
     liveQueryPollWhenStaleMs: number;
 };
-export {};