remult 0.18.1-exp.6 → 0.18.1-exp.8

package/esm/server/expressBridge.d.ts

@@ -84,11 +84,6 @@ export interface queuedJobInfo {
     setResult(result: any): void;
     setProgress(progress: number): void;
 }
-export interface ApiActionResponse {
-    error(error: any): void;
-    success(result: any): void;
-    progress(progress: number): void;
-}
 export interface QueueStorage {
     createJob(url: string, userId: string): Promise<string>;
     getJobInfo(queuedJobId: string): Promise<queuedJobInfo>;

package/esm/server/expressBridge.js

@@ -617,7 +617,11 @@ class inProcessQueueHandler {
         this.actions.get(url)(body, req, {
             error: error => job.setErrorResult(serializeError(error)),
             success: result => job.setResult(result),
-            progress: progress => job.setProgress(progress)
+            progress: progress => job.setProgress(progress),
+            created: () => { throw Error("Created response not expected for queue"); },
+            deleted: () => { throw Error("deleted response not expected for queue"); },
+            notFound: () => { throw Error("notFound response not expected for queue"); },
+            forbidden: () => job.setErrorResult("Forbidden")
         });
         return id;
     }

package/esm/src/filter/filter-interfaces.d.ts

@@ -6,7 +6,7 @@ export declare class Filter {
     constructor(apply?: (add: FilterConsumer) => void);
     __applyToConsumer(add: FilterConsumer): void;
     static resolve<entityType>(filter: EntityFilter<entityType> | (() => EntityFilter<entityType> | Promise<EntityFilter<entityType>>)): Promise<EntityFilter<entityType>>;
-    static createCustom<entityType>(rawFilterTranslator: (unused: any, r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): (() => EntityFilter<entityType>) & rawFilterInfo<entityType>;
+    static createCustom<entityType>(rawFilterTranslator: (unused: never, r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): (() => EntityFilter<entityType>) & rawFilterInfo<entityType>;
     static createCustom<entityType, argsType>(rawFilterTranslator: (args: argsType, r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): ((y: argsType) => EntityFilter<entityType>) & rawFilterInfo<entityType>;
     static fromEntityFilter<T>(entity: EntityMetadata<T>, whereItem: EntityFilter<T>): Filter;
     toJson(): any;

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

@@ -178,7 +178,6 @@ export declare class columnDefsImpl implements FieldMetadata {
     private settings;
     private entityDefs;
     constructor(settings: FieldOptions, entityDefs: EntityFullInfo<any>, remult: Remult);
-    private _workingOnDbName;
     getDbName(): Promise<string>;
     options: FieldOptions<any, any>;
     target: ClassType<any>;

package/esm/src/remult3/RepositoryImplementation.js

@@ -1163,7 +1163,6 @@ export class columnDefsImpl {
     constructor(settings, entityDefs, remult) {
         this.settings = settings;
         this.entityDefs = entityDefs;
-        this._workingOnDbName = false;
         this.options = this.settings;
         this.target = this.settings.target;
         this.valueConverter = this.settings.valueConverter;
@@ -1180,9 +1179,6 @@ export class columnDefsImpl {
         this.caption = buildCaption(settings.caption, settings.key, remult);
     }
     async getDbName() {
-        if (this._workingOnDbName)
-            return "Recursive getDbName call for field '" + this.key + "'. ";
-        this._workingOnDbName = true;
         try {
             if (this.settings.sqlExpression) {
                 let result;
@@ -1198,7 +1194,6 @@ export class columnDefsImpl {
             return this.settings.dbName;
         }
         finally {
-            this._workingOnDbName = false;
         }
     }
     get dbName() {
@@ -1413,7 +1408,7 @@ export function ValueListFieldType(...options) {
     return (type) => {
         FieldType(o => {
             o.valueConverter = ValueListInfo.get(type),
-                o.displayValue = (item, val) => val.caption;
+                o.displayValue = (item, val) => val?.caption;
         }, ...options)(type);
     };
 }

package/esm/src/shared-tests/db-tests.db-tests.js

@@ -538,7 +538,7 @@ let testFilter = class testFilter {
         this.c = '';
     }
 };
-testFilter.search = Filter.createCustom((remult, str) => ({
+testFilter.search = Filter.createCustom((str, remult) => ({
     $and: [{
             $or: [
                 { a: 'a' },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.18.1-exp.6",
+    "version": "0.18.1-exp.8",
     "description": "A CRUD framework for full-stack TypeScript",
     "main": "index.js",
     "types": "index.d.ts",

package/server/expressBridge.d.ts

@@ -84,11 +84,6 @@ export interface queuedJobInfo {
     setResult(result: any): void;
     setProgress(progress: number): void;
 }
-export interface ApiActionResponse {
-    error(error: any): void;
-    success(result: any): void;
-    progress(progress: number): void;
-}
 export interface QueueStorage {
     createJob(url: string, userId: string): Promise<string>;
     getJobInfo(queuedJobId: string): Promise<queuedJobInfo>;

package/server/expressBridge.js

@@ -790,7 +790,11 @@ var inProcessQueueHandler = /** @class */ (function () {
                         this.actions.get(url)(body, req, {
                             error: function (error) { return job.setErrorResult(data_api_1.serializeError(error)); },
                             success: function (result) { return job.setResult(result); },
-                            progress: function (progress) { return job.setProgress(progress); }
+                            progress: function (progress) { return job.setProgress(progress); },
+                            created: function () { throw Error("Created response not expected for queue"); },
+                            deleted: function () { throw Error("deleted response not expected for queue"); },
+                            notFound: function () { throw Error("notFound response not expected for queue"); },
+                            forbidden: function () { return job.setErrorResult("Forbidden"); }
                         });
                         return [2 /*return*/, id];
                 }

package/src/filter/filter-interfaces.d.ts

@@ -6,7 +6,7 @@ export declare class Filter {
     constructor(apply?: (add: FilterConsumer) => void);
     __applyToConsumer(add: FilterConsumer): void;
     static resolve<entityType>(filter: EntityFilter<entityType> | (() => EntityFilter<entityType> | Promise<EntityFilter<entityType>>)): Promise<EntityFilter<entityType>>;
-    static createCustom<entityType>(rawFilterTranslator: (unused: any, r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): (() => EntityFilter<entityType>) & rawFilterInfo<entityType>;
+    static createCustom<entityType>(rawFilterTranslator: (unused: never, r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): (() => EntityFilter<entityType>) & rawFilterInfo<entityType>;
     static createCustom<entityType, argsType>(rawFilterTranslator: (args: argsType, r: Remult) => EntityFilter<entityType> | Promise<EntityFilter<entityType>>, key?: string): ((y: argsType) => EntityFilter<entityType>) & rawFilterInfo<entityType>;
     static fromEntityFilter<T>(entity: EntityMetadata<T>, whereItem: EntityFilter<T>): Filter;
     toJson(): any;

package/src/remult3/RepositoryImplementation.d.ts

@@ -178,7 +178,6 @@ export declare class columnDefsImpl implements FieldMetadata {
     private settings;
     private entityDefs;
     constructor(settings: FieldOptions, entityDefs: EntityFullInfo<any>, remult: Remult);
-    private _workingOnDbName;
     getDbName(): Promise<string>;
     options: FieldOptions<any, any>;
     target: ClassType<any>;

package/src/remult3/RepositoryImplementation.js

@@ -2084,7 +2084,6 @@ var columnDefsImpl = /** @class */ (function () {
     function columnDefsImpl(settings, entityDefs, remult) {
         this.settings = settings;
         this.entityDefs = entityDefs;
-        this._workingOnDbName = false;
         this.options = this.settings;
         this.target = this.settings.target;
         this.valueConverter = this.settings.valueConverter;
@@ -2106,31 +2105,24 @@ var columnDefsImpl = /** @class */ (function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (this._workingOnDbName)
-                            return [2 /*return*/, "Recursive getDbName call for field '" + this.key + "'. "];
-                        this._workingOnDbName = true;
-                        _a.label = 1;
-                    case 1:
-                        _a.trys.push([1, , 6, 7]);
-                        if (!this.settings.sqlExpression) return [3 /*break*/, 5];
+                        _a.trys.push([0, , 5, 6]);
+                        if (!this.settings.sqlExpression) return [3 /*break*/, 4];
                         result = void 0;
-                        if (!(typeof this.settings.sqlExpression === "function")) return [3 /*break*/, 3];
+                        if (!(typeof this.settings.sqlExpression === "function")) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.settings.sqlExpression(this.entityDefs)];
-                    case 2:
+                    case 1:
                         result = _a.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
+                        return [3 /*break*/, 3];
+                    case 2:
                         result = this.settings.sqlExpression;
-                        _a.label = 4;
-                    case 4:
+                        _a.label = 3;
+                    case 3:
                         if (!result)
                             return [2 /*return*/, this.settings.dbName];
                         return [2 /*return*/, result];
-                    case 5: return [2 /*return*/, this.settings.dbName];
-                    case 6:
-                        this._workingOnDbName = false;
-                        return [7 /*endfinally*/];
-                    case 7: return [2 /*return*/];
+                    case 4: return [2 /*return*/, this.settings.dbName];
+                    case 5: return [7 /*endfinally*/];
+                    case 6: return [2 /*return*/];
                 }
             });
         });
@@ -2456,7 +2448,7 @@ function ValueListFieldType() {
     return function (type) {
         FieldType.apply(void 0, tslib_1.__spread([function (o) {
                 o.valueConverter = ValueListInfo.get(type),
-                    o.displayValue = function (item, val) { return val.caption; };
+                    o.displayValue = function (item, val) { return val === null || val === void 0 ? void 0 : val.caption; };
             }], options))(type);
     };
 }

package/src/shared-tests/db-tests.db-tests.js

@@ -1367,7 +1367,7 @@ var testFilter = /** @class */ (function () {
         this.b = '';
         this.c = '';
     }
-    testFilter.search = filter_interfaces_1.Filter.createCustom(function (remult, str) { return ({
+    testFilter.search = filter_interfaces_1.Filter.createCustom(function (str, remult) { return ({
         $and: [{
                 $or: [
                     { a: 'a' },