remult 0.14.33 → 0.15.0

package/package.json

@@ -1,64 +1,65 @@
-{
-    "name": "remult",
-    "version": "0.14.33",
-    "description": "A CRUD framework for full-stack TypeScript",
-    "main": "index.js",
-    "types": "index.d.ts",
-    "module": "esm/index.js",
-    "homepage": "https://remult.dev/",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/remult/remult"
-    },
-    "license": "MIT",
-    "author": {
-        "name": "Noam Honig"
-    },
-    "dependencies": {
-        "uuid": "^8.3.2",
-        "reflect-metadata": "^0.1.13",
-        "tslib": "^2.3.1"
-    },
-    "exports": {
-        ".": {
-            "require": "./index.js",
-            "import": "./esm/index.js"
-        },
-        "./remult-express": {
-            "require": "./remult-express.js",
-            "import": "./esm/remult-express.js"
-        },
-        "./server": {
-            "require": "./server/index.js",
-            "import": "./esm/server/index.js"
-        },
-        "./remult-fastify": {
-            "require": "./remult-fastify.js",
-            "import": "./esm/remult-fastify.js"
-        },
-        "./remult-fresh": {
-            "require": "./remult-fresh.js",
-            "import": "./esm/remult-fresh.js"
-        },
-        "./postgres": {
-            "require": "./postgres/index.js",
-            "import": "./esm/postgres/index.js"
-        },
-        "./postgres/schema-builder": {
-            "require": "./postgres/schema-builder.js",
-            "import": "./esm/postgres/schema-builder.js"
-        },
-        "./remult-knex": {
-            "require": "./remult-knex/index.js",
-            "import": "./esm/remult-knex/index.js"
-        },
-        "./remult-mongo": {
-            "require": "./remult-mongo.js",
-            "import": "./esm/remult-mongo.js"
-        },
-        "./graphql": {
-            "require": "./graphql.js",
-            "import": "./esm/graphql.js"
-        }
-    }
-}
+{
+  "name": "remult",
+  "version": "0.15.0",
+  "description": "A CRUD framework for full-stack TypeScript",
+  "main": "index.js",
+  "types": "index.d.ts",
+  "module": "esm/index.js",
+  "homepage": "https://remult.dev/",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/remult/remult.git",
+    "directory": "projects/core"
+  },
+  "license": "MIT",
+  "author": {
+    "name": "Noam Honig"
+  },
+  "dependencies": {
+    "uuid": "^8.3.2",
+    "reflect-metadata": "^0.1.13",
+    "tslib": "^2.3.1"
+  },
+  "exports": {
+    ".": {
+      "require": "./index.js",
+      "import": "./esm/index.js"
+    },
+    "./remult-express": {
+      "require": "./remult-express.js",
+      "import": "./esm/remult-express.js"
+    },
+    "./server": {
+      "require": "./server/index.js",
+      "import": "./esm/server/index.js"
+    },
+    "./remult-fastify": {
+      "require": "./remult-fastify.js",
+      "import": "./esm/remult-fastify.js"
+    },
+    "./remult-fresh": {
+      "require": "./remult-fresh.js",
+      "import": "./esm/remult-fresh.js"
+    },
+    "./postgres": {
+      "require": "./postgres/index.js",
+      "import": "./esm/postgres/index.js"
+    },
+    "./postgres/schema-builder": {
+      "require": "./postgres/schema-builder.js",
+      "import": "./esm/postgres/schema-builder.js"
+    },
+    "./remult-knex": {
+      "require": "./remult-knex/index.js",
+      "import": "./esm/remult-knex/index.js"
+    },
+    "./remult-mongo": {
+      "require": "./remult-mongo.js",
+      "import": "./esm/remult-mongo.js"
+    },
+    "./graphql": {
+      "require": "./graphql.js",
+      "import": "./esm/graphql.js"
+    }
+  }
+}

package/postgres/postgresColumnSyntax.d.ts

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

package/postgres/postgresColumnSyntax.js

@@ -0,0 +1,34 @@
+"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-express.js

@@ -15,7 +15,7 @@ function remultExpress(options) {
         app.use(express.json({ limit: options.bodySizeLimit }));
         app.use(express.urlencoded({ extended: true, limit: options.bodySizeLimit }));
     }
-    var server = expressBridge_1.buildRemultServer(options);
+    var server = expressBridge_1.createRemultServer(options);
     server.registerRouter(app);
     return Object.assign(app, {
         getRemult: function (req) { return server.getRemult(req); },

package/remult-fastify.js

@@ -23,7 +23,7 @@ function remultFastify(options) {
         };
         return response;
     }
-    var api = expressBridge_1.buildRemultServer(options);
+    var api = expressBridge_1.createRemultServer(options);
     var pluginFunction = function (instance, op) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
         var fastifyRouter;
         return tslib_1.__generator(this, function (_a) {

package/remult-fresh.d.ts

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

package/remult-fresh.js

@@ -5,10 +5,11 @@ var tslib_1 = require("tslib");
 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 server = expressBridge_1.createRemultServer(options);
+    return {
+        getRemult: function (r) { return server.getRemult(r); },
+        openApiDoc: function (x) { return server.openApiDoc(x); },
+        handle: function (req, ctx) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             var theReq, _a, _b, init, res;
             return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
@@ -32,7 +33,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) {
@@ -51,7 +52,7 @@ function remultFresh(options, response) {
                 }
             });
         }); }
-    });
+    };
 }
 exports.remultFresh = remultFresh;
 ;

package/remult-middleware.d.ts

@@ -0,0 +1,2 @@
+import { RemultMiddlewareOptions } from './server/expressBridge';
+export declare function remultMiddleware(options?: RemultMiddlewareOptions): import("./server/expressBridge").RemultExpressBridge;

package/remult-middleware.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.remultMiddleware = void 0;
+var expressBridge_1 = require("./server/expressBridge");
+function remultMiddleware(options) {
+    var m = new middleware();
+    var app = Object.assign(function (req, res, next) { return m.handleRequest(req, res, next); }, {
+        route: function (path) { return m.route(path); }
+    });
+    return expressBridge_1.remultMiddlewareBase(app, options);
+}
+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.handleRequest = function (req, res, next) {
+        var lowerPath = req.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 = req.path.lastIndexOf('/');
+        if (idPosition >= 0) {
+            lowerPath = req.path.substring(0, idPosition) + '/:id';
+            m = this.map.get(lowerPath);
+            if (m) {
+                var h = m.get(req.method.toLowerCase());
+                if (h) {
+                    req.params.id = req.path.substring(idPosition + 1);
+                    h(req, res, next);
+                    return;
+                }
+            }
+        }
+        next();
+    };
+    return middleware;
+}());

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.d.ts

@@ -20,7 +20,7 @@ export declare type RemultServerOptions = {
     controllers?: ClassType<any>[];
     rootPath?: string;
 };
-export declare function buildRemultServer(options: RemultServerOptions): RemultServer;
+export declare function createRemultServer(options?: RemultServerOptions): RemultServer;
 export declare type GenericRequestHandler = (req: GenericRequest, res: GenericResponse, next: VoidFunction) => void;
 export interface ServerHandleResponse {
     data?: any;

package/server/expressBridge.js

@@ -1,15 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JobsInQueueEntity = exports.EntityQueueStorage = exports.buildRemultServer = void 0;
+exports.JobsInQueueEntity = exports.EntityQueueStorage = exports.createRemultServer = 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) {
+function createRemultServer(options) {
     var _this = this;
     if (!options) {
         options = {};
@@ -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;
@@ -63,7 +67,7 @@ function buildRemultServer(options) {
     var bridge = new RemultServerImplementation(new inProcessQueueHandler(options.queueStorage), options, dataProvider);
     return bridge;
 }
-exports.buildRemultServer = buildRemultServer;
+exports.createRemultServer = createRemultServer;
 ;
 var RemultServerImplementation = /** @class */ (function () {
     function RemultServerImplementation(queue, options, dataProvider) {

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 { queuedJobInfo, QueueStorage, GenericRequest, GenericRequestHandler, GenericResponse, GenericRouter, createRemultServer, 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;
+exports.JsonFileDataProvider = exports.JsonEntityFileStorage = exports.createRemultServer = void 0;
+var expressBridge_1 = require("./expressBridge");
+Object.defineProperty(exports, "createRemultServer", { enumerable: true, get: function () { return expressBridge_1.createRemultServer; } });
 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, "buildRemultServer", { enumerable: true, get: function () { return expressBridge_1.buildRemultServer; } });
+Object.defineProperty(exports, "JsonFileDataProvider", { enumerable: true, get: function () { return JsonEntityFileStorage_1.JsonFileDataProvider; } });

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

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

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

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerActionsOnServer = void 0;
+var tslib_1 = require("tslib");
+var server_action_1 = require("../src/server-action");
+function registerActionsOnServer(area, controllers) {
+    var e_1, _a, e_2, _b;
+    var addAction = function (a) {
+        var x = a[server_action_1.serverActionField];
+        if (!x) {
+            throw 'failed to set server action, did you forget the BackendMethod Decorator?';
+        }
+        area.addAction(x);
+    };
+    server_action_1.actionInfo.runningOnServer = true;
+    if (controllers && controllers.length > 0) {
+        try {
+            for (var controllers_1 = tslib_1.__values(controllers), controllers_1_1 = controllers_1.next(); !controllers_1_1.done; controllers_1_1 = controllers_1.next()) {
+                var c = controllers_1_1.value;
+                var z = c[server_action_1.classBackendMethodsArray];
+                if (z)
+                    try {
+                        for (var z_1 = (e_2 = void 0, tslib_1.__values(z)), z_1_1 = z_1.next(); !z_1_1.done; z_1_1 = z_1.next()) {
+                            var a = z_1_1.value;
+                            addAction(a);
+                        }
+                    }
+                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                    finally {
+                        try {
+                            if (z_1_1 && !z_1_1.done && (_b = z_1.return)) _b.call(z_1);
+                        }
+                        finally { if (e_2) throw e_2.error; }
+                    }
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (controllers_1_1 && !controllers_1_1.done && (_a = controllers_1.return)) _a.call(controllers_1);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+    }
+    else
+        server_action_1.actionInfo.allActions.forEach(function (a) {
+            addAction(a);
+        });
+}
+exports.registerActionsOnServer = registerActionsOnServer;

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

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

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

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerEntitiesOnServer = void 0;
+var remult3_1 = require("../src/remult3");
+var context_1 = require("../src/context");
+var data_api_1 = require("../src/data-api");
+function registerEntitiesOnServer(area, entities) {
+    if (!entities)
+        entities = context_1.allEntities;
+    //add Api Entries
+    entities.forEach(function (e) {
+        var key = remult3_1.getEntityKey(e);
+        if (key != undefined)
+            area.add(key, function (c) {
+                return new data_api_1.DataApi(c.repo(e), c);
+            });
+    });
+}
+exports.registerEntitiesOnServer = registerEntitiesOnServer;

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;
+}());
+it("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.handle({
+                        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/valueConverters.d.ts

@@ -0,0 +1,12 @@
+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>;
+}