remult 0.14.31 → 0.14.34

package/server/index.d.ts

@@ -1,4 +1,2 @@
-export { JsonEntityFileStorage } from './JsonEntityFileStorage';
-export { SiteArea, queuedJobInfo, QueueStorage } from './expressBridge';
-export { registerEntitiesOnServer } from './register-entities-on-server';
-export { registerActionsOnServer } from './register-actions-on-server';
+export { queuedJobInfo, QueueStorage, GenericRequest, GenericRequestHandler, GenericResponse, GenericRouter, buildRemultServer, RemultServerOptions, SpecificRoute, RemultServer } from './expressBridge';
+export { JsonEntityFileStorage, JsonFileDataProvider } from './JsonEntityFileStorage';

package/server/index.js

@@ -1,11 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerActionsOnServer = exports.registerEntitiesOnServer = exports.SiteArea = exports.JsonEntityFileStorage = void 0;
+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; } });
-var expressBridge_1 = require("./expressBridge");
-Object.defineProperty(exports, "SiteArea", { enumerable: true, get: function () { return expressBridge_1.SiteArea; } });
-var register_entities_on_server_1 = require("./register-entities-on-server");
-Object.defineProperty(exports, "registerEntitiesOnServer", { enumerable: true, get: function () { return register_entities_on_server_1.registerEntitiesOnServer; } });
-var register_actions_on_server_1 = require("./register-actions-on-server");
-Object.defineProperty(exports, "registerActionsOnServer", { enumerable: true, get: function () { return register_actions_on_server_1.registerActionsOnServer; } });
+Object.defineProperty(exports, "JsonFileDataProvider", { enumerable: true, get: function () { return JsonEntityFileStorage_1.JsonFileDataProvider; } });

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

@@ -3,9 +3,12 @@ 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 = [
@@ -14,9 +17,9 @@ var environments = [
 // ["koa", 3002],
 // ["fastify", 3003],
 // ["express", 3004],
-// ["middleware", 3005],
+// ["generic server", 3005],
 // ["optine", 3006],
-// ["fresh", 8000],
+// ["fresh", 8000]
 ];
 function test(name, test) {
     var e_1, _a;
@@ -210,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 = '';

package/esm/remult-middleware.d.ts

@@ -1,10 +0,0 @@
-import { GenericRequest, GenericMiddleware, GenericResponse, GenericRouter, buildRemultServer, RemultServerOptions, SpecificRoute, RemultServer } from './server/expressBridge';
-export declare function remultMiddleware(options?: RemultServerOptions): RemultMiddleware;
-export interface RemultMiddleware extends GenericMiddleware, RemultServer {
-    handle(req: GenericRequest, gRes?: GenericResponse): Promise<MiddlewareResponse>;
-}
-export interface MiddlewareResponse {
-    data?: any;
-    statusCode?: number;
-}
-export { GenericRequest, GenericMiddleware as GenericRequestHandler, GenericResponse, GenericRouter, buildRemultServer, RemultServerOptions as RemultMiddlewareOptions, SpecificRoute, RemultServer };

package/esm/remult-middleware.js

@@ -1,117 +0,0 @@
-import { buildRemultServer } from './server/expressBridge';
-export function remultMiddleware(options) {
-    const m = new middleware();
-    const server = buildRemultServer(m, options);
-    return Object.assign((req, res, next) => m.handleRequest(req, res, next), {
-        getRemult: (req) => server.getRemult(req),
-        openApiDoc: (options) => server.openApiDoc(options),
-        addArea: x => server.addArea(x),
-        handle: (req, res) => m.handle(req, res)
-    });
-}
-class middleware {
-    constructor() {
-        this.map = new Map();
-    }
-    route(path) {
-        //consider using:
-        //* https://raw.githubusercontent.com/cmorten/opine/main/src/utils/pathToRegex.ts
-        //* https://github.com/pillarjs/path-to-regexp
-        let r = path.toLowerCase();
-        let m = new Map();
-        this.map.set(r, m);
-        const route = {
-            get: (h) => {
-                m.set("get", h);
-                return route;
-            },
-            put: (h) => {
-                m.set("put", h);
-                return route;
-            },
-            post: (h) => {
-                m.set("post", h);
-                return route;
-            },
-            delete: (h) => {
-                m.set("delete", h);
-                return route;
-            }
-        };
-        return route;
-    }
-    async handle(req, gRes) {
-        return new Promise(res => {
-            const response = new class {
-                json(data) {
-                    if (gRes !== undefined)
-                        gRes.json(data);
-                    res({ statusCode: this.statusCode, data });
-                }
-                status(statusCode) {
-                    if (gRes !== undefined)
-                        gRes.status(statusCode);
-                    this.statusCode = statusCode;
-                    return this;
-                }
-                end() {
-                    if (gRes !== undefined)
-                        gRes.end();
-                    res({
-                        statusCode: this.statusCode
-                    });
-                }
-            };
-            this.handleRequest(req, response, () => res(undefined));
-        });
-    }
-    handleRequest(req, res, next) {
-        let theUrl = req.url;
-        if (theUrl.startsWith('/')) //next sends a partial url '/api/tasks' and not the full url
-            theUrl = 'http://stam' + theUrl;
-        const url = new URL(theUrl);
-        const path = url.pathname;
-        if (!req.query) {
-            let query = {};
-            url.searchParams.forEach((val, key) => {
-                let current = query[key];
-                if (!current) {
-                    query[key] = val;
-                    return;
-                }
-                if (Array.isArray(current)) {
-                    current.push(val);
-                    return;
-                }
-                query[key] = [current, val];
-            });
-            req.query = query;
-        }
-        let lowerPath = path.toLowerCase();
-        let m = this.map.get(lowerPath);
-        if (m) {
-            let h = m.get(req.method.toLowerCase());
-            if (h) {
-                h(req, res, next);
-                return;
-            }
-        }
-        let idPosition = path.lastIndexOf('/');
-        if (idPosition >= 0) {
-            lowerPath = path.substring(0, idPosition) + '/:id';
-            m = this.map.get(lowerPath);
-            if (m) {
-                let h = m.get(req.method.toLowerCase());
-                if (h) {
-                    if (!req.params)
-                        req.params = {};
-                    req.params.id = path.substring(idPosition + 1);
-                    h(req, res, next);
-                    return;
-                }
-            }
-        }
-        next();
-    }
-}
-export { buildRemultServer };

package/esm/server/register-actions-on-server.d.ts

@@ -1,3 +0,0 @@
-import { SiteArea } from "./expressBridge";
-import { ClassType } from "../classType";
-export declare function registerActionsOnServer(area: SiteArea, controllers?: ClassType<any>[]): void;

package/esm/server/register-actions-on-server.js

@@ -1,24 +0,0 @@
-import { serverActionField, actionInfo, classBackendMethodsArray } from '../src/server-action';
-export function registerActionsOnServer(area, controllers) {
-    var addAction = (a) => {
-        let x = a[serverActionField];
-        if (!x) {
-            throw 'failed to set server action, did you forget the BackendMethod Decorator?';
-        }
-        area.addAction(x);
-    };
-    actionInfo.runningOnServer = true;
-    if (controllers && controllers.length > 0) {
-        for (const c of controllers) {
-            let z = c[classBackendMethodsArray];
-            if (z)
-                for (const a of z) {
-                    addAction(a);
-                }
-        }
-    }
-    else
-        actionInfo.allActions.forEach((a) => {
-            addAction(a);
-        });
-}

package/esm/server/register-entities-on-server.d.ts

@@ -1,3 +0,0 @@
-import { SiteArea } from "./expressBridge";
-import { ClassType } from "../classType";
-export declare function registerEntitiesOnServer(area: SiteArea, entities?: ClassType<any>[]): void;

package/esm/server/register-entities-on-server.js

@@ -1,15 +0,0 @@
-import { getEntityKey } from "../src/remult3";
-import { allEntities } from "../src/context";
-import { DataApi } from "../src/data-api";
-export function registerEntitiesOnServer(area, entities) {
-    if (!entities)
-        entities = allEntities;
-    //add Api Entries
-    entities.forEach(e => {
-        let key = getEntityKey(e);
-        if (key != undefined)
-            area.add(key, c => {
-                return new DataApi(c.repo(e), c);
-            });
-    });
-}

package/esm/valueConverters.d.ts

@@ -1,12 +0,0 @@
-import { ValueConverter } from "./src/column-interfaces";
-export declare class ValueConverters {
-    static readonly Date: ValueConverter<Date>;
-    static readonly DateOnly: ValueConverter<Date>;
-    static readonly DateOnlyString: ValueConverter<Date>;
-    static readonly Boolean: ValueConverter<Boolean>;
-    static readonly Number: ValueConverter<number>;
-    static readonly Integer: ValueConverter<number>;
-    static readonly Default: ValueConverter<any>;
-    static readonly JsonString: ValueConverter<any>;
-    static readonly JsonValue: ValueConverter<any>;
-}

package/esm/valueConverters.js

@@ -1,169 +0,0 @@
-import { InputTypes } from "./inputTypes";
-export class ValueConverters {
-}
-ValueConverters.Date = {
-    toJson: (val) => {
-        if (!val)
-            return '';
-        if (typeof (val) === "string")
-            val = new Date(val);
-        if (val instanceof Date) {
-            return val.toISOString();
-        }
-        else {
-            console.log("ToJsonError", val);
-            throw new Error("Expected date but got val");
-        }
-    },
-    fromJson: (val) => {
-        if (val == undefined)
-            return undefined;
-        if (val == '')
-            return undefined;
-        if (val.startsWith('0000-00-00'))
-            return undefined;
-        return new Date(Date.parse(val));
-    },
-    toDb: x => x,
-    fromDb: x => x,
-    fromInput: x => ValueConverters.Date.fromJson(x),
-    toInput: x => ValueConverters.Date.toJson(x),
-    displayValue: (val) => {
-        if (!val)
-            return '';
-        return val.toLocaleString();
-    }
-};
-ValueConverters.DateOnly = {
-    fromInput: x => ValueConverters.DateOnly.fromJson(x),
-    toInput: x => ValueConverters.DateOnly.toJson(x),
-    toJson: (val) => {
-        var d = val;
-        if (typeof d === "string" || typeof (d) === "number")
-            d = new Date(d);
-        if (!d || d == null)
-            return null;
-        if (d.getHours() == 0)
-            return new Date(d.valueOf() - d.getTimezoneOffset() * 60000).toISOString().substring(0, 10);
-        else
-            return d.toISOString().substring(0, 10);
-    },
-    fromJson: (value) => {
-        if (!value || value == '' || value == '0000-00-00')
-            return null;
-        let d = new Date(Date.parse(value));
-        d.setMinutes(d.getMinutes() + d.getTimezoneOffset());
-        return d;
-    },
-    inputType: InputTypes.date,
-    toDb: (val) => {
-        if (!val)
-            return null;
-        return ValueConverters.DateOnly.fromJson(ValueConverters.DateOnly.toJson(val));
-    } //when using date storage,  the database expects and returns a date local and every where else we reflect on date iso
-    ,
-    fromDb: (val) => {
-        var d = val;
-        if (!d)
-            return null;
-        return val;
-    },
-    fieldTypeInDb: 'date',
-    displayValue: (value) => {
-        if (!value)
-            return '';
-        return value.toLocaleDateString(undefined);
-    }
-};
-ValueConverters.DateOnlyString = {
-    ...ValueConverters.DateOnly,
-    toDb: (d) => {
-        let val = ValueConverters.DateOnly.toJson(d);
-        if (!val)
-            return undefined;
-        return val.replace(/-/g, '');
-    },
-    fromDb: (val) => {
-        if (val === null)
-            return null;
-        if (!val)
-            return undefined;
-        return new Date(val.substring(0, 4) + '-' + val.substring(4, 6) + '-' + val.substring(6, 8));
-    }
-};
-ValueConverters.Boolean = {
-    toDb: (val) => val,
-    inputType: InputTypes.checkbox,
-    fromDb: (value) => {
-        return ValueConverters.Boolean.fromJson(value);
-    },
-    fromJson: value => {
-        if (typeof value === "boolean")
-            return value;
-        if (value !== undefined && value !== null) {
-            return value.toString().trim().toLowerCase() == 'true';
-        }
-        return value;
-    },
-    toJson: x => x,
-    fromInput: x => ValueConverters.Boolean.fromJson(x),
-    toInput: x => ValueConverters.Boolean.toJson(x)
-};
-ValueConverters.Number = {
-    fromDb: value => {
-        if (value === null)
-            return null;
-        if (value !== undefined)
-            return +value;
-        return undefined;
-    },
-    toDb: value => value,
-    fromJson: value => ValueConverters.Number.fromDb(value),
-    toJson: value => ValueConverters.Number.toDb(value),
-    fromInput: (x, type) => {
-        let r = +x;
-        if (!x)
-            return undefined;
-        return r;
-    },
-    toInput: (x, type) => {
-        return x?.toString();
-    },
-    inputType: InputTypes.number
-};
-ValueConverters.Integer = {
-    ...ValueConverters.Number,
-    toJson: value => {
-        let val = ValueConverters.Number.toDb(value);
-        if (!val)
-            return val;
-        return +(+val).toFixed(0);
-    },
-    toDb: value => ValueConverters.Integer.toJson(value),
-    fieldTypeInDb: 'integer'
-};
-ValueConverters.Default = {
-    fromJson: x => x,
-    toJson: x => x,
-    fromDb: x => ValueConverters.JsonString.fromDb(x),
-    toDb: x => ValueConverters.JsonString.toDb(x),
-    fromInput: x => ValueConverters.Default.fromJson(x),
-    toInput: x => ValueConverters.Default.toJson(x)
-};
-ValueConverters.JsonString = {
-    fromJson: x => x,
-    toJson: x => x,
-    fromDb: x => x == null ? null : x ? JSON.parse(ValueConverters.JsonString.fromJson(x)) : undefined,
-    toDb: x => x !== undefined ? x === null ? null : JSON.stringify(ValueConverters.JsonString.toJson(x)) : undefined,
-    fromInput: x => ValueConverters.JsonString.fromJson(x),
-    toInput: x => ValueConverters.JsonString.toJson(x)
-};
-ValueConverters.JsonValue = {
-    fromJson: x => x,
-    toJson: x => x,
-    fromDb: x => x,
-    toDb: x => x,
-    fromInput: x => ValueConverters.JsonString.fromJson(x),
-    toInput: x => ValueConverters.JsonString.toJson(x),
-    fieldTypeInDb: 'json'
-};

package/postgres/postgresColumnSyntax.d.ts

@@ -1,2 +0,0 @@
-import { FieldMetadata } from '../src/column-interfaces';
-export declare function postgresColumnSyntax(x: FieldMetadata, dbName: string): string;

package/postgres/postgresColumnSyntax.js

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.postgresColumnSyntax = void 0;
-var valueConverters_1 = require("../valueConverters");
-function postgresColumnSyntax(x, dbName) {
-    var result = dbName;
-    if (x.valueType == Number) {
-        if (!x.valueConverter.fieldTypeInDb)
-            result += " numeric" + (x.allowNull ? "" : " default 0 not null");
-        else
-            result += " " + x.valueConverter.fieldTypeInDb + (x.allowNull ? "" : " default 0 not null");
-    }
-    else if (x.valueType == Date) {
-        if (!x.valueConverter.fieldTypeInDb)
-            if (x.valueConverter == valueConverters_1.ValueConverters.DateOnly)
-                result += " date";
-            else
-                result += " timestamp";
-        else
-            result += " " + x.valueConverter.fieldTypeInDb;
-    }
-    else if (x.valueType == Boolean)
-        result += " boolean" + (x.allowNull ? "" : " default false not null");
-    else if (x.valueConverter.fieldTypeInDb) {
-        result += " " + x.valueConverter.fieldTypeInDb;
-        if (!x.allowNull && x.valueConverter.fieldTypeInDb == 'integer') {
-            result += " default 0 not null";
-        }
-    }
-    else
-        result += " varchar" + (x.allowNull ? "" : " default '' not null");
-    return result;
-}
-exports.postgresColumnSyntax = postgresColumnSyntax;

package/remult-middleware.d.ts

@@ -1,10 +0,0 @@
-import { GenericRequest, GenericMiddleware, GenericResponse, GenericRouter, buildRemultServer, RemultServerOptions, SpecificRoute, RemultServer } from './server/expressBridge';
-export declare function remultMiddleware(options?: RemultServerOptions): RemultMiddleware;
-export interface RemultMiddleware extends GenericMiddleware, RemultServer {
-    handle(req: GenericRequest, gRes?: GenericResponse): Promise<MiddlewareResponse>;
-}
-export interface MiddlewareResponse {
-    data?: any;
-    statusCode?: number;
-}
-export { GenericRequest, GenericMiddleware as GenericRequestHandler, GenericResponse, GenericRouter, buildRemultServer, RemultServerOptions as RemultMiddlewareOptions, SpecificRoute, RemultServer };

package/remult-middleware.js

@@ -1,131 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildRemultServer = exports.remultMiddleware = void 0;
-var tslib_1 = require("tslib");
-var expressBridge_1 = require("./server/expressBridge");
-Object.defineProperty(exports, "buildRemultServer", { enumerable: true, get: function () { return expressBridge_1.buildRemultServer; } });
-function remultMiddleware(options) {
-    var m = new middleware();
-    var server = expressBridge_1.buildRemultServer(m, options);
-    return Object.assign(function (req, res, next) { return m.handleRequest(req, res, next); }, {
-        getRemult: function (req) { return server.getRemult(req); },
-        openApiDoc: function (options) { return server.openApiDoc(options); },
-        addArea: function (x) { return server.addArea(x); },
-        handle: function (req, res) { return m.handle(req, res); }
-    });
-}
-exports.remultMiddleware = remultMiddleware;
-var middleware = /** @class */ (function () {
-    function middleware() {
-        this.map = new Map();
-    }
-    middleware.prototype.route = function (path) {
-        //consider using:
-        //* https://raw.githubusercontent.com/cmorten/opine/main/src/utils/pathToRegex.ts
-        //* https://github.com/pillarjs/path-to-regexp
-        var r = path.toLowerCase();
-        var m = new Map();
-        this.map.set(r, m);
-        var route = {
-            get: function (h) {
-                m.set("get", h);
-                return route;
-            },
-            put: function (h) {
-                m.set("put", h);
-                return route;
-            },
-            post: function (h) {
-                m.set("post", h);
-                return route;
-            },
-            delete: function (h) {
-                m.set("delete", h);
-                return route;
-            }
-        };
-        return route;
-    };
-    middleware.prototype.handle = function (req, gRes) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, new Promise(function (res) {
-                        var response = new /** @class */ (function () {
-                            function class_1() {
-                            }
-                            class_1.prototype.json = function (data) {
-                                if (gRes !== undefined)
-                                    gRes.json(data);
-                                res({ statusCode: this.statusCode, data: data });
-                            };
-                            class_1.prototype.status = function (statusCode) {
-                                if (gRes !== undefined)
-                                    gRes.status(statusCode);
-                                this.statusCode = statusCode;
-                                return this;
-                            };
-                            class_1.prototype.end = function () {
-                                if (gRes !== undefined)
-                                    gRes.end();
-                                res({
-                                    statusCode: this.statusCode
-                                });
-                            };
-                            return class_1;
-                        }());
-                        _this.handleRequest(req, response, function () { return res(undefined); });
-                    })];
-            });
-        });
-    };
-    middleware.prototype.handleRequest = function (req, res, next) {
-        var theUrl = req.url;
-        if (theUrl.startsWith('/')) //next sends a partial url '/api/tasks' and not the full url
-            theUrl = 'http://stam' + theUrl;
-        var url = new URL(theUrl);
-        var path = url.pathname;
-        if (!req.query) {
-            var query_1 = {};
-            url.searchParams.forEach(function (val, key) {
-                var current = query_1[key];
-                if (!current) {
-                    query_1[key] = val;
-                    return;
-                }
-                if (Array.isArray(current)) {
-                    current.push(val);
-                    return;
-                }
-                query_1[key] = [current, val];
-            });
-            req.query = query_1;
-        }
-        var lowerPath = path.toLowerCase();
-        var m = this.map.get(lowerPath);
-        if (m) {
-            var h = m.get(req.method.toLowerCase());
-            if (h) {
-                h(req, res, next);
-                return;
-            }
-        }
-        var idPosition = path.lastIndexOf('/');
-        if (idPosition >= 0) {
-            lowerPath = path.substring(0, idPosition) + '/:id';
-            m = this.map.get(lowerPath);
-            if (m) {
-                var h = m.get(req.method.toLowerCase());
-                if (h) {
-                    if (!req.params)
-                        req.params = {};
-                    req.params.id = path.substring(idPosition + 1);
-                    h(req, res, next);
-                    return;
-                }
-            }
-        }
-        next();
-    };
-    return middleware;
-}());

package/server/register-actions-on-server.d.ts

@@ -1,3 +0,0 @@
-import { SiteArea } from "./expressBridge";
-import { ClassType } from "../classType";
-export declare function registerActionsOnServer(area: SiteArea, controllers?: ClassType<any>[]): void;