remult 0.22.1 → 0.22.3

package/esm/graphql.js

@@ -208,16 +208,16 @@ export function remultGraphql(options) {
                 {
                     key: 'limit',
                     value: 'Int',
-                    comment: `
-For **page by page** pagination.
-Limit the number of result. 
+                    comment: `
+For **page by page** pagination.
+Limit the number of result. 
 _Side note: \`Math.ceil(totalCount / limit)\` to determine how many pages there are._`,
                 },
                 {
                     key: 'page',
                     value: 'Int',
-                    comment: `
-For **page by page** pagination.
+                    comment: `
+For **page by page** pagination.
 Select a dedicated page.`,
                 },
                 {
@@ -235,26 +235,26 @@ Select a dedicated page.`,
                 queryArgsConnection.push({
                     key: 'first',
                     value: 'Int',
-                    comment: `
-        For **forward cursor** pagination
+                    comment: `
+        For **forward cursor** pagination
         Takes the \`first\`: \`n\` elements from the list.`,
                 }, {
                     key: 'after',
                     value: 'String',
-                    comment: `
-        For **forward cursor** pagination
+                    comment: `
+        For **forward cursor** pagination
         \`after\` this \`cursor\`.`,
                 }, {
                     key: 'last',
                     value: 'Int',
-                    comment: `
-        For **backward cursor** pagination
+                    comment: `
+        For **backward cursor** pagination
         Takes the \`last\`: \`n\` elements from the list.`,
                 }, {
                     key: 'before',
                     value: 'String',
-                    comment: `
-        For **backward cursor** pagination
+                    comment: `
+        For **backward cursor** pagination
         \`before\` this \`cursor\`.`,
                 });
             }
@@ -668,7 +668,7 @@ Select a dedicated page.`,
                 : ``;
             return `${type}${orderByStr}${whereTypeStr}${whereTypeSubFieldsStr}`;
         })
-            .join(`\n\n`)}
+            .join(`\n\n`)}
 `,
     };
 }
@@ -690,12 +690,12 @@ function blockFormat(obj) {
     if (obj.data.length === 0) {
         return ``;
     }
-    const str = `${obj.prefix} {
-  ${obj.data.join('\n  ')}
+    const str = `${obj.prefix} {
+  ${obj.data.join('\n  ')}
 }`;
-    let commentsStr = `"""
-${obj.comment}
-"""
+    let commentsStr = `"""
+${obj.comment}
+"""
 `;
     if (_removeComments) {
         commentsStr = ``;
@@ -706,16 +706,16 @@ function argsFormat(args) {
     if (args) {
         return `(${args
             .map((arg) => {
-            let strComment = `
-    """
-    ${arg.comment}
-    """
+            let strComment = `
+    """
+    ${arg.comment}
+    """
 `;
             if (_removeComments || !arg.comment) {
                 strComment = ``;
             }
             if (strComment) {
-                return `${strComment}    ${arg.key}: ${arg.value}
+                return `${strComment}    ${arg.key}: ${arg.value}
   `;
             }
             return `${arg.key}: ${arg.value}`;
@@ -726,9 +726,9 @@ function argsFormat(args) {
 }
 function fieldFormat(field) {
     // First, the comment
-    let strComment = `"""
-  ${field.comment}
-  """
+    let strComment = `"""
+  ${field.comment}
+  """
 `;
     if (_removeComments || !field.comment) {
         strComment = ``;

package/esm/postgres/schema-builder.js

@@ -116,8 +116,8 @@ export class PostgresSchemaBuilder {
         try {
             let cmd = this.pool.createCommand();
             const colName = e.$dbNameOf(c(entity));
-            if ((await cmd.execute(`select 1   
-        FROM information_schema.columns 
+            if ((await cmd.execute(`select 1   
+        FROM information_schema.columns 
         WHERE table_name=${cmd.addParameterAndReturnSqlToken(e.$entityName.toLocaleLowerCase())} and column_name=${cmd.addParameterAndReturnSqlToken(colName.toLocaleLowerCase())}` + this.additionalWhere)).rows.length == 0) {
                 let sql = `alter table ${e.$entityName} add column ${postgresColumnSyntax(c(entity), colName)}`;
                 if (PostgresSchemaBuilder.logToConsole)
@@ -133,8 +133,8 @@ export class PostgresSchemaBuilder {
         try {
             let cmd = this.pool.createCommand();
             let e = await dbNamesOf(entity);
-            let cols = (await cmd.execute(`select column_name   
-        FROM information_schema.columns 
+            let cols = (await cmd.execute(`select column_name   
+        FROM information_schema.columns 
         WHERE table_name=${cmd.addParameterAndReturnSqlToken(e.$entityName.toLocaleLowerCase())} ` + this.additionalWhere)).rows.map((x) => x.column_name.toLocaleLowerCase());
             for (const col of entity.fields) {
                 if (!isDbReadonly(col, e)) {

package/esm/remult-knex/index.js

@@ -192,7 +192,7 @@ class KnexEntityDataProvider {
         let insert = this.knex(e.$entityName).insert(insertObject);
         if (isAutoIncrement(this.entity.idMetadata.field)) {
             let newId;
-            if (this.knex.client.config.client === 'mysql2') {
+            if (this.knex.client.config.client === 'mysql2' || this.knex.client.config.client === 'mysql') {
                 let result = await insert;
                 newId = result[0];
             }
@@ -380,7 +380,7 @@ export class KnexSchemaBuilder {
 KnexSchemaBuilder.logToConsole = true;
 function supportsJson(knex) {
     const client = knex.client.config.client;
-    if (client?.includes('sqlite3') || client?.includes('mssql'))
+    if (client?.includes('sqlite3') || client?.includes('mssql') || client?.includes('mysql'))
         return false;
     return true;
 }

package/esm/remult-mongo.js

@@ -59,7 +59,7 @@ class MongoEntityDataProvider {
         this.entity = entity;
         this.session = session;
     }
-    translateFromJson(row, nameProvider) {
+    translateFromDb(row, nameProvider) {
         let result = {};
         for (const col of this.entity.fields) {
             let val = row[nameProvider.$dbNameOf(col)];
@@ -69,7 +69,7 @@ class MongoEntityDataProvider {
         }
         return result;
     }
-    translateToJson(row, nameProvider) {
+    translateToDb(row, nameProvider) {
         let result = {};
         for (const col of this.entity.fields) {
             let val = col.valueConverter.toDb(row[col.key]);
@@ -109,7 +109,7 @@ class MongoEntityDataProvider {
         }
         return await Promise.all(await collection
             .find(where, op)
-            .map((x) => this.translateFromJson(x, e))
+            .map((x) => this.translateFromDb(x, e))
             .toArray());
     }
     async update(id, data) {
@@ -129,7 +129,7 @@ class MongoEntityDataProvider {
         for (const f of this.entity.fields) {
             if (!f.dbReadOnly && !f.isServerExpression) {
                 if (keys.includes(f.key)) {
-                    newR[f.key] = f.valueConverter.toJson(data[f.key]);
+                    newR[f.key] = f.valueConverter.toDb(data[f.key]);
                 }
             }
         }
@@ -148,10 +148,10 @@ class MongoEntityDataProvider {
     }
     async insert(data) {
         let { collection, e } = await this.collection();
-        let r = await collection.insertOne(await this.translateToJson(data, e), {
+        let r = await collection.insertOne(await this.translateToDb(data, e), {
             session: this.session,
         });
-        return await this.translateFromJson(await collection.findOne({ _id: r.insertedId }, { session: this.session }), e);
+        return await this.translateFromDb(await collection.findOne({ _id: r.insertedId }, { session: this.session }), e);
     }
     async collection() {
         const e = await dbNamesOf(this.entity);

package/esm/src/backend-tests/backend-database-test-setup.backend-spec.js

@@ -64,6 +64,16 @@ export const mySqlTest = addDatabaseToTest(testKnexSqlImpl(Knex.default({
         database: 'test',
     },
 }), 'mysql2'));
+addDatabaseToTest(testKnexSqlImpl(Knex.default({
+    client: 'mysql',
+    connection: {
+        user: 'root',
+        password: 'MASTERKEY',
+        host: '127.0.0.1',
+        database: 'test',
+        port: 3307
+    },
+}), 'mysql'));
 let pg = createPostgresConnection();
 export function testPostgresImplementation(key, what, focus = false) {
     itWithFocus(key + ' - postgres', async () => {
@@ -199,4 +209,24 @@ testMongoNoTrans('transactions mongo no trans', async ({ db, createEntity }) =>
     }
     expect(await x.count()).toBe(1);
 }, false);
+testMongoNoTrans('test Dates', async ({ createEntity }) => {
+    const c = class {
+    };
+    describeClass(c, Entity('test_dates_on_mongo'), {
+        id: Fields.integer(),
+        date: Fields.date(),
+    });
+    const r = await createEntity(c);
+    let x = await r.insert({ id: 1, date: new Date(1976, 5, 16) });
+    const client = new MongoClient('mongodb://localhost:27017/local');
+    await client.connect();
+    const mongoDb = client.db('test');
+    expect((await mongoDb.collection(await r.metadata.getDbName()).findOne())
+        .date instanceof Date).toBe(true);
+    x.date = new Date(1978, 2, 15);
+    await r.save(x);
+    expect((await mongoDb.collection(await r.metadata.getDbName()).findOne())
+        .date instanceof Date).toBe(true);
+    //let z = await r.save({ ...x, date: new Date(1978, 2, 15) })
+}, false);
 import '../shared-tests';

package/esm/src/id-entity.d.ts

@@ -0,0 +1,4 @@
+import { EntityBase } from './remult3';
+export declare class IdEntity extends EntityBase {
+    id: string;
+}

package/esm/src/id-entity.js

@@ -0,0 +1,8 @@
+import { __decorate, __metadata } from "tslib";
+import { EntityBase, Fields } from './remult3';
+export class IdEntity extends EntityBase {
+}
+__decorate([
+    Fields.uuid(),
+    __metadata("design:type", String)
+], IdEntity.prototype, "id", void 0);

package/esm/src/remult3/RepositoryImplementation.js

@@ -1834,11 +1834,13 @@ export function decorateColumnSettings(settings, remult) {
                             isIdNumeric =
                                 remult.repo(settings.valueType).metadata.idMetadata.field
                                     .valueType === Number;
-                            for (const key of [
-                                'fieldTypeInDb',
-                            ]) {
-                                //@ts-ignore
-                                target[key] = ValueConverters.Integer[key];
+                            if (isIdNumeric) {
+                                for (const key of [
+                                    'fieldTypeInDb',
+                                ]) {
+                                    //@ts-ignore
+                                    target[key] = ValueConverters.Integer[key];
+                                }
                             }
                         }
                     }

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

@@ -1082,3 +1082,38 @@ testAll('test relation to number id', async ({ createEntity }) => {
     expect(await taskRepo.count({ category: cat[1] })).toBe(1);
     expect(await taskRepo.count({ category: { $id: cat[0].id } })).toBe(2);
 }, false, { exclude: [TestDbs.mongo, TestDbs.mongoNoTrans] });
+testAll('test relation to string id', async ({ createEntity }) => {
+    const category = class {
+        constructor() {
+            this.id = '';
+            this.name = '';
+        }
+    };
+    describeClass(category, Entity('rel_ID_string_categories', { allowApiCrud: true }), {
+        id: Fields.cuid(),
+        name: Fields.string(),
+    });
+    const task = class {
+        constructor() {
+            this.id = 0;
+            this.title = '';
+        }
+    };
+    describeClass(task, Entity('rel_ID_string_task', { allowApiCrud: true }), {
+        id: Fields.autoIncrement(),
+        title: Fields.string(),
+        category: Field(() => category),
+    });
+    const catRepo = await createEntity(category);
+    const taskRepo = await createEntity(task);
+    const cat = await catRepo.insert([{ name: 'cat0' }, { name: 'cat1' }]);
+    await taskRepo.insert([
+        { title: 't1', category: cat[0] },
+        { title: 't2', category: cat[0] },
+        { title: 't3', category: cat[1] },
+    ]);
+    expect(taskRepo.fields.category.valueConverter.fieldTypeInDb).toBeUndefined();
+    expect(await taskRepo.count({ category: cat[0] })).toBe(2);
+    expect(await taskRepo.count({ category: cat[1] })).toBe(1);
+    expect(await taskRepo.count({ category: { $id: cat[0].id } })).toBe(2);
+}, false, { exclude: [TestDbs.mongo, TestDbs.mongoNoTrans] });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.22.1",
+    "version": "0.22.3",
     "description": "A CRUD framework for full-stack TypeScript",
     "types": "index.d.ts",
     "module": "esm/index.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-knex/index.js

@@ -375,7 +375,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 10:
                         insert = this.knex(e.$entityName).insert(insertObject);
                         if (!remult3_1.isAutoIncrement(this.entity.idMetadata.field)) return [3 /*break*/, 15];
-                        if (!(this.knex.client.config.client === 'mysql2')) return [3 /*break*/, 12];
+                        if (!(this.knex.client.config.client === 'mysql2' || this.knex.client.config.client === 'mysql')) return [3 /*break*/, 12];
                         return [4 /*yield*/, insert];
                     case 11:
                         result = _d.sent();
@@ -825,7 +825,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
 exports.KnexSchemaBuilder = KnexSchemaBuilder;
 function supportsJson(knex) {
     var client = knex.client.config.client;
-    if ((client === null || client === void 0 ? void 0 : client.includes('sqlite3')) || (client === null || client === void 0 ? void 0 : client.includes('mssql')))
+    if ((client === null || client === void 0 ? void 0 : client.includes('sqlite3')) || (client === null || client === void 0 ? void 0 : client.includes('mssql')) || (client === null || client === void 0 ? void 0 : client.includes('mysql')))
         return false;
     return true;
 }

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/remult-mongo.js

@@ -101,7 +101,7 @@ var MongoEntityDataProvider = /** @class */ (function () {
         this.entity = entity;
         this.session = session;
     }
-    MongoEntityDataProvider.prototype.translateFromJson = function (row, nameProvider) {
+    MongoEntityDataProvider.prototype.translateFromDb = function (row, nameProvider) {
         var e_1, _a;
         var result = {};
         try {
@@ -122,7 +122,7 @@ var MongoEntityDataProvider = /** @class */ (function () {
         }
         return result;
     };
-    MongoEntityDataProvider.prototype.translateToJson = function (row, nameProvider) {
+    MongoEntityDataProvider.prototype.translateToDb = function (row, nameProvider) {
         var e_2, _a;
         var result = {};
         try {
@@ -206,7 +206,7 @@ var MongoEntityDataProvider = /** @class */ (function () {
                         _e = (_d = Promise).all;
                         return [4 /*yield*/, collection
                                 .find(where, op)
-                                .map(function (x) { return _this.translateFromJson(x, e); })
+                                .map(function (x) { return _this.translateFromDb(x, e); })
                                 .toArray()];
                     case 3: return [4 /*yield*/, _e.apply(_d, [_g.sent()])];
                     case 4: return [2 /*return*/, _g.sent()];
@@ -250,7 +250,7 @@ var MongoEntityDataProvider = /** @class */ (function () {
                                 f_1 = _e.value;
                                 if (!f_1.dbReadOnly && !f_1.isServerExpression) {
                                     if (keys.includes(f_1.key)) {
-                                        newR[f_1.key] = f_1.valueConverter.toJson(data[f_1.key]);
+                                        newR[f_1.key] = f_1.valueConverter.toDb(data[f_1.key]);
                                     }
                                 }
                             }
@@ -305,13 +305,13 @@ var MongoEntityDataProvider = /** @class */ (function () {
                     case 1:
                         _a = _e.sent(), collection = _a.collection, e = _a.e;
                         _c = (_b = collection).insertOne;
-                        return [4 /*yield*/, this.translateToJson(data, e)];
+                        return [4 /*yield*/, this.translateToDb(data, e)];
                     case 2: return [4 /*yield*/, _c.apply(_b, [_e.sent(), {
                                 session: this.session,
                             }])];
                     case 3:
                         r = _e.sent();
-                        _d = this.translateFromJson;
+                        _d = this.translateFromDb;
                         return [4 /*yield*/, collection.findOne({ _id: r.insertedId }, { session: this.session })];
                     case 4: return [4 /*yield*/, _d.apply(this, [_e.sent(), e])];
                     case 5: return [2 /*return*/, _e.sent()];

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;