remult 0.20.0 → 0.20.1-exp.1

package/SseSubscriptionServer.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { GenericResponse } from './server/index';
 import { Remult } from './src/context';
 import { SubscriptionServer } from './src/live-query/SubscriptionServer';
@@ -14,6 +15,7 @@ export interface ResponseRequiredForSSE {
 export declare class clientConnection {
     response: GenericResponse & ResponseRequiredForSSE;
     channels: Record<string, boolean>;
+    timeOutRef: NodeJS.Timeout;
     close(): void;
     closed: boolean;
     write(eventData: string, eventType?: string): void;

package/SseSubscriptionServer.js

@@ -118,6 +118,8 @@ var clientConnection = /** @class */ (function () {
         this.sendLiveMessage();
     }
     clientConnection.prototype.close = function () {
+        if (this.timeOutRef)
+            clearTimeout(this.timeOutRef);
         this.closed = true;
     };
     clientConnection.prototype.write = function (eventData, eventType) {
@@ -134,7 +136,7 @@ var clientConnection = /** @class */ (function () {
         if (this.closed)
             return;
         this.write("", "keep-alive");
-        setTimeout(function () {
+        this.timeOutRef = setTimeout(function () {
             _this.sendLiveMessage();
         }, 45000);
     };

package/esm/SseSubscriptionServer.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { GenericResponse } from './server/index';
 import { Remult } from './src/context';
 import { SubscriptionServer } from './src/live-query/SubscriptionServer';
@@ -14,6 +15,7 @@ export interface ResponseRequiredForSSE {
 export declare class clientConnection {
     response: GenericResponse & ResponseRequiredForSSE;
     channels: Record<string, boolean>;
+    timeOutRef: NodeJS.Timeout;
     close(): void;
     closed: boolean;
     write(eventData: string, eventType?: string): void;

package/esm/SseSubscriptionServer.js

@@ -81,6 +81,8 @@ export class clientConnection {
         this.sendLiveMessage();
     }
     close() {
+        if (this.timeOutRef)
+            clearTimeout(this.timeOutRef);
         this.closed = true;
     }
     write(eventData, eventType = "message") {
@@ -95,7 +97,7 @@ export class clientConnection {
         if (this.closed)
             return;
         this.write("", "keep-alive");
-        setTimeout(() => {
+        this.timeOutRef = setTimeout(() => {
             this.sendLiveMessage();
         }, 45000);
     }

package/esm/server/expressBridge.js

@@ -740,7 +740,7 @@ export class EntityQueueStorage {
         return this.sync = this.sync.then(() => what());
     }
     async getJobInfo(queuedJobId) {
-        let q = await this.repo.findId(queuedJobId);
+        let q = await this.repo.findId(queuedJobId, { useCache: false });
         let lastProgress = undefined;
         return {
             userId: q.userId,

package/esm/src/data-providers/rest-data-provider.js

@@ -23,10 +23,13 @@ export class RestDataProvider {
 }
 //@internal
 export function findOptionsToJson(options, meta) {
-    return {
+    const r = {
         ...options,
         where: Filter.entityFilterToJson(meta, options.where),
     };
+    if (options.load)
+        r.load = options.load(meta.fields).map(y => y.key);
+    return r;
 }
 //@internal
 export function findOptionsFromJson(json, meta) {
@@ -40,6 +43,9 @@ export function findOptionsFromJson(json, meta) {
                 r[key] = json[key];
         }
     }
+    if (json.load) {
+        r.load = (z) => json.load.map(y => z.find(y));
+    }
     return r;
 }
 export class RestEntityDataProvider {

package/package.json

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

package/server/expressBridge.js

@@ -1099,7 +1099,7 @@ var EntityQueueStorage = /** @class */ (function () {
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.repo.findId(queuedJobId)];
+                    case 0: return [4 /*yield*/, this.repo.findId(queuedJobId, { useCache: false })];
                     case 1:
                         q = _a.sent();
                         lastProgress = undefined;

package/src/data-providers/rest-data-provider.js

@@ -35,7 +35,10 @@ var RestDataProvider = /** @class */ (function () {
 exports.RestDataProvider = RestDataProvider;
 //@internal
 function findOptionsToJson(options, meta) {
-    return tslib_1.__assign(tslib_1.__assign({}, options), { where: filter_interfaces_1.Filter.entityFilterToJson(meta, options.where) });
+    var r = tslib_1.__assign(tslib_1.__assign({}, options), { where: filter_interfaces_1.Filter.entityFilterToJson(meta, options.where) });
+    if (options.load)
+        r.load = options.load(meta.fields).map(function (y) { return y.key; });
+    return r;
 }
 exports.findOptionsToJson = findOptionsToJson;
 //@internal
@@ -61,6 +64,9 @@ function findOptionsFromJson(json, meta) {
         }
         finally { if (e_1) throw e_1.error; }
     }
+    if (json.load) {
+        r.load = function (z) { return json.load.map(function (y) { return z.find(y); }); };
+    }
     return r;
 }
 exports.findOptionsFromJson = findOptionsFromJson;