remult 0.14.33 → 0.14.34

package/esm/remult-fresh.d.ts

@@ -1,7 +1,7 @@
 import { RemultServerOptions, RemultServer } from "./server/expressBridge";
 export declare function remultFresh(options: RemultServerOptions, response: FreshResponse): RemultFresh;
 export interface RemultFresh extends RemultServer {
-    freshHandler(req: FreshRequest, ctx: FreshContext): Promise<FreshResponse>;
+    freshHandler(req: FreshRequest, ctx: FreshContext): Promise<any>;
 }
 export interface FreshRequest {
     url: string;

package/esm/remult-fresh.js

@@ -1,7 +1,6 @@
 import { buildRemultServer } from "./server/expressBridge";
 export function remultFresh(options, response) {
     const server = buildRemultServer(options);
-    const orig = server.handle;
     return Object.assign(server, {
         freshHandler: async (req, ctx) => {
             const theReq = {
@@ -16,7 +15,7 @@ export function remultFresh(options, response) {
                     break;
             }
             let init = {};
-            const res = await orig(theReq);
+            const res = await server.handle(theReq);
             if (res) {
                 init.status = res.statusCode;
                 if (res.data) {

package/esm/server/JsonEntityFileStorage.d.ts

@@ -1,7 +1,10 @@
-import { JsonEntityStorage } from '../index';
+import { JsonDataProvider, JsonEntityStorage } from '../index';
 export declare class JsonEntityFileStorage implements JsonEntityStorage {
     private folderPath;
     getItem(entityDbName: string): string;
     setItem(entityDbName: string, json: string): void;
     constructor(folderPath: string);
 }
+export declare class JsonFileDataProvider extends JsonDataProvider {
+    constructor(folderPath: string);
+}

package/esm/server/JsonEntityFileStorage.js

@@ -1,5 +1,6 @@
 import * as path from 'path';
 import * as fs from 'fs';
+import { JsonDataProvider } from '../index';
 export class JsonEntityFileStorage {
     constructor(folderPath) {
         this.folderPath = folderPath;
@@ -18,3 +19,6 @@ export class JsonEntityFileStorage {
         return fs.writeFileSync(path.join(this.folderPath, entityDbName) + '.json', json);
     }
 }
+export class JsonFileDataProvider extends JsonDataProvider {
+    constructor(folderPath) { super(new JsonEntityFileStorage(folderPath)); }
+}

package/esm/server/expressBridge.js

@@ -1,10 +1,8 @@
 import { __decorate, __metadata } from "tslib";
-import { JsonEntityFileStorage } from './JsonEntityFileStorage';
 import { Action, actionInfo, classBackendMethodsArray, serverActionField } from '../src/server-action';
 import { DataApi, serializeError } from '../src/data-api';
 import { allEntities, Remult } from '../src/context';
 import { Entity, Fields, getEntityKey } from '../src/remult3';
-import { JsonDataProvider } from '../src/data-providers/json-data-provider';
 import { IdEntity } from '../src/id-entity';
 export function buildRemultServer(options) {
     if (!options) {
@@ -23,10 +21,10 @@ export function buildRemultServer(options) {
     }
     else
         dataProvider = Promise.resolve(options.dataProvider);
-    dataProvider = dataProvider.then(dp => {
+    dataProvider = dataProvider.then(async (dp) => {
         if (dp)
             return dp;
-        return new JsonDataProvider(new JsonEntityFileStorage('./db'));
+        return new (await import('./JsonEntityFileStorage')).JsonFileDataProvider('./db');
     });
     if (options.initApi) {
         dataProvider = dataProvider.then(async (dp) => {

package/esm/server/index.d.ts

@@ -1,2 +1,2 @@
-export { JsonEntityFileStorage } from './JsonEntityFileStorage';
 export { queuedJobInfo, QueueStorage, GenericRequest, GenericRequestHandler, GenericResponse, GenericRouter, buildRemultServer, RemultServerOptions, SpecificRoute, RemultServer } from './expressBridge';
+export { JsonEntityFileStorage, JsonFileDataProvider } from './JsonEntityFileStorage';

package/esm/server/index.js

@@ -1,2 +1,2 @@
-export { JsonEntityFileStorage } from './JsonEntityFileStorage';
 export { buildRemultServer } from './expressBridge';
+export { JsonEntityFileStorage, JsonFileDataProvider } from './JsonEntityFileStorage';

package/esm/src/backend-tests/test-http-server.backend-spec.js

@@ -1,18 +1,22 @@
 import { __decorate, __metadata } from "tslib";
 import axios from 'axios';
+import { remultFresh } from '../../remult-fresh';
 import { HttpProviderBridgeToRestDataProviderHttpProvider, Remult } from '../context';
+import { InMemoryDataProvider } from '../data-providers/in-memory-database';
 import { Entity, Fields } from '../remult3';
 import { Action, BackendMethod } from '../server-action';
+import { Categories } from '../tests/remult-3-entities';
 Remult.apiBaseUrl = 'http://localhost:3003/api';
 let path = Remult.apiBaseUrl + '/tasks';
 const environments = [
-    ["next", 3000],
-    ["nest", 3001],
-    ["koa", 3002],
-    ["fastify", 3003],
-    ["express", 3004],
-    ["generic server", 3005],
-    ["optine", 3006],
+// ["next", 3000],
+// ["nest", 3001],
+// ["koa", 3002],
+// ["fastify", 3003],
+// ["express", 3004],
+// ["generic server", 3005],
+// ["optine", 3006],
+// ["fresh", 8000]
 ];
 function test(name, test) {
     for (const [env, port] of environments) {
@@ -92,6 +96,32 @@ test("test regular api call", async () => {
     let result = await axios.get(Remult.apiBaseUrl + "/test");
     expect(result.data.result).toBe(3);
 });
+class FreshResponseTest {
+    constructor(body, init) {
+        this.body = body;
+        this.init = init;
+    }
+    static json(data, init) {
+        return new this(data, init);
+    }
+}
+fit("test fresh", async () => {
+    const api = remultFresh({ entities: [Categories],
+        dataProvider: new InMemoryDataProvider(),
+        rootPath: '/api' }, FreshResponseTest);
+    const r = await api.freshHandler({
+        url: '/api/Categories',
+        json() {
+            return undefined;
+        },
+        method: "get"
+    }, {
+        next() {
+            return undefined;
+        },
+    });
+    expect(r.body).toEqual([]);
+});
 let Task = class Task {
     constructor() {
         this.title = '';

package/package.json

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

package/remult-fresh.d.ts

@@ -1,7 +1,7 @@
 import { RemultServerOptions, RemultServer } from "./server/expressBridge";
 export declare function remultFresh(options: RemultServerOptions, response: FreshResponse): RemultFresh;
 export interface RemultFresh extends RemultServer {
-    freshHandler(req: FreshRequest, ctx: FreshContext): Promise<FreshResponse>;
+    freshHandler(req: FreshRequest, ctx: FreshContext): Promise<any>;
 }
 export interface FreshRequest {
     url: string;

package/remult-fresh.js

@@ -6,7 +6,6 @@ var expressBridge_1 = require("./server/expressBridge");
 function remultFresh(options, response) {
     var _this = this;
     var server = expressBridge_1.buildRemultServer(options);
-    var orig = server.handle;
     return Object.assign(server, {
         freshHandler: function (req, ctx) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             var theReq, _a, _b, init, res;
@@ -32,7 +31,7 @@ function remultFresh(options, response) {
                         return [3 /*break*/, 3];
                     case 3:
                         init = {};
-                        return [4 /*yield*/, orig(theReq)];
+                        return [4 /*yield*/, server.handle(theReq)];
                     case 4:
                         res = _c.sent();
                         if (res) {

package/server/JsonEntityFileStorage.d.ts

@@ -1,7 +1,10 @@
-import { JsonEntityStorage } from '../index';
+import { JsonDataProvider, JsonEntityStorage } from '../index';
 export declare class JsonEntityFileStorage implements JsonEntityStorage {
     private folderPath;
     getItem(entityDbName: string): string;
     setItem(entityDbName: string, json: string): void;
     constructor(folderPath: string);
 }
+export declare class JsonFileDataProvider extends JsonDataProvider {
+    constructor(folderPath: string);
+}

package/server/JsonEntityFileStorage.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JsonEntityFileStorage = void 0;
+exports.JsonFileDataProvider = exports.JsonEntityFileStorage = void 0;
+var tslib_1 = require("tslib");
 var path = require("path");
 var fs = require("fs");
+var index_1 = require("../index");
 var JsonEntityFileStorage = /** @class */ (function () {
     function JsonEntityFileStorage(folderPath) {
         this.folderPath = folderPath;
@@ -23,3 +25,11 @@ var JsonEntityFileStorage = /** @class */ (function () {
     return JsonEntityFileStorage;
 }());
 exports.JsonEntityFileStorage = JsonEntityFileStorage;
+var JsonFileDataProvider = /** @class */ (function (_super) {
+    tslib_1.__extends(JsonFileDataProvider, _super);
+    function JsonFileDataProvider(folderPath) {
+        return _super.call(this, new JsonEntityFileStorage(folderPath)) || this;
+    }
+    return JsonFileDataProvider;
+}(index_1.JsonDataProvider));
+exports.JsonFileDataProvider = JsonFileDataProvider;

package/server/expressBridge.js

@@ -2,12 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JobsInQueueEntity = exports.EntityQueueStorage = exports.buildRemultServer = void 0;
 var tslib_1 = require("tslib");
-var JsonEntityFileStorage_1 = require("./JsonEntityFileStorage");
 var server_action_1 = require("../src/server-action");
 var data_api_1 = require("../src/data-api");
 var context_1 = require("../src/context");
 var remult3_1 = require("../src/remult3");
-var json_data_provider_1 = require("../src/data-providers/json-data-provider");
 var id_entity_1 = require("../src/id-entity");
 function buildRemultServer(options) {
     var _this = this;
@@ -27,11 +25,17 @@ function buildRemultServer(options) {
     }
     else
         dataProvider = Promise.resolve(options.dataProvider);
-    dataProvider = dataProvider.then(function (dp) {
-        if (dp)
-            return dp;
-        return new json_data_provider_1.JsonDataProvider(new JsonEntityFileStorage_1.JsonEntityFileStorage('./db'));
-    });
+    dataProvider = dataProvider.then(function (dp) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (dp)
+                        return [2 /*return*/, dp];
+                    return [4 /*yield*/, Promise.resolve().then(function () { return require('./JsonEntityFileStorage'); })];
+                case 1: return [2 /*return*/, new (_a.sent()).JsonFileDataProvider('./db')];
+            }
+        });
+    }); });
     if (options.initApi) {
         dataProvider = dataProvider.then(function (dp) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             var remult;

package/server/index.d.ts

@@ -1,2 +1,2 @@
-export { JsonEntityFileStorage } from './JsonEntityFileStorage';
 export { queuedJobInfo, QueueStorage, GenericRequest, GenericRequestHandler, GenericResponse, GenericRouter, buildRemultServer, RemultServerOptions, SpecificRoute, RemultServer } from './expressBridge';
+export { JsonEntityFileStorage, JsonFileDataProvider } from './JsonEntityFileStorage';

package/server/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildRemultServer = exports.JsonEntityFileStorage = void 0;
-var JsonEntityFileStorage_1 = require("./JsonEntityFileStorage");
-Object.defineProperty(exports, "JsonEntityFileStorage", { enumerable: true, get: function () { return JsonEntityFileStorage_1.JsonEntityFileStorage; } });
+exports.JsonFileDataProvider = exports.JsonEntityFileStorage = exports.buildRemultServer = void 0;
 var expressBridge_1 = require("./expressBridge");
 Object.defineProperty(exports, "buildRemultServer", { enumerable: true, get: function () { return expressBridge_1.buildRemultServer; } });
+var JsonEntityFileStorage_1 = require("./JsonEntityFileStorage");
+Object.defineProperty(exports, "JsonEntityFileStorage", { enumerable: true, get: function () { return JsonEntityFileStorage_1.JsonEntityFileStorage; } });
+Object.defineProperty(exports, "JsonFileDataProvider", { enumerable: true, get: function () { return JsonEntityFileStorage_1.JsonFileDataProvider; } });

package/src/backend-tests/test-http-server.backend-spec.js

@@ -3,19 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Task = void 0;
 var tslib_1 = require("tslib");
 var axios_1 = require("axios");
+var remult_fresh_1 = require("../../remult-fresh");
 var context_1 = require("../context");
+var in_memory_database_1 = require("../data-providers/in-memory-database");
 var remult3_1 = require("../remult3");
 var server_action_1 = require("../server-action");
+var remult_3_entities_1 = require("../tests/remult-3-entities");
 context_1.Remult.apiBaseUrl = 'http://localhost:3003/api';
 var path = context_1.Remult.apiBaseUrl + '/tasks';
 var environments = [
-    ["next", 3000],
-    ["nest", 3001],
-    ["koa", 3002],
-    ["fastify", 3003],
-    ["express", 3004],
-    ["generic server", 3005],
-    ["optine", 3006],
+// ["next", 3000],
+// ["nest", 3001],
+// ["koa", 3002],
+// ["fastify", 3003],
+// ["express", 3004],
+// ["generic server", 3005],
+// ["optine", 3006],
+// ["fresh", 8000]
 ];
 function test(name, test) {
     var e_1, _a;
@@ -209,6 +213,42 @@ test("test regular api call", function () { return tslib_1.__awaiter(void 0, voi
         }
     });
 }); });
+var FreshResponseTest = /** @class */ (function () {
+    function FreshResponseTest(body, init) {
+        this.body = body;
+        this.init = init;
+    }
+    FreshResponseTest.json = function (data, init) {
+        return new this(data, init);
+    };
+    return FreshResponseTest;
+}());
+fit("test fresh", function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+    var api, r;
+    return tslib_1.__generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                api = remult_fresh_1.remultFresh({ entities: [remult_3_entities_1.Categories],
+                    dataProvider: new in_memory_database_1.InMemoryDataProvider(),
+                    rootPath: '/api' }, FreshResponseTest);
+                return [4 /*yield*/, api.freshHandler({
+                        url: '/api/Categories',
+                        json: function () {
+                            return undefined;
+                        },
+                        method: "get"
+                    }, {
+                        next: function () {
+                            return undefined;
+                        },
+                    })];
+            case 1:
+                r = _a.sent();
+                expect(r.body).toEqual([]);
+                return [2 /*return*/];
+        }
+    });
+}); });
 var Task = /** @class */ (function () {
     function Task() {
         this.title = '';