remult 0.10.13 → 0.11.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.10.13",
+    "version": "0.11.3",
     "description": "remult core lib",
     "homepage": "https://remult.dev/",
     "repository": {

package/postgres/postgres-data-provider.d.ts

@@ -22,9 +22,9 @@ export declare function verifyStructureOfAllEntities(db: SqlDatabase, remult: Re
 export declare class PostgresSchemaBuilder {
     private pool;
     verifyStructureOfAllEntities(remult: Remult): Promise<void>;
-    createIfNotExist(e: EntityMetadata): Promise<void>;
-    addColumnIfNotExist<T extends EntityMetadata>(e: T, c: ((e: T) => FieldMetadata)): Promise<void>;
-    verifyAllColumns<T extends EntityMetadata>(e: T): Promise<void>;
+    createIfNotExist(entity: EntityMetadata): Promise<void>;
+    addColumnIfNotExist<T extends EntityMetadata>(entity: T, c: ((e: T) => FieldMetadata)): Promise<void>;
+    verifyAllColumns<T extends EntityMetadata>(entity: T): Promise<void>;
     additionalWhere: string;
     constructor(pool: SqlDatabase, schema?: string);
 }

package/postgres/postgres-data-provider.js

@@ -5,8 +5,8 @@ var tslib_1 = require("tslib");
 var __1 = require("../");
 var pg_1 = require("pg");
 var context_1 = require("../src/context");
-var sql_database_1 = require("../src/data-providers/sql-database");
 var postgresColumnSyntax_1 = require("./postgresColumnSyntax");
+var filter_consumer_bridge_to_sql_request_1 = require("../src/filter/filter-consumer-bridge-to-sql-request");
 var PostgresDataProvider = /** @class */ (function () {
     function PostgresDataProvider(pool) {
         this.pool = pool;
@@ -113,55 +113,54 @@ var PostgresSchemaBuilder = /** @class */ (function () {
     }
     PostgresSchemaBuilder.prototype.verifyStructureOfAllEntities = function (remult) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var allEntities_1, allEntities_1_1, entity, metadata, err_2, _a, _b, _c, e_1_1;
-            var e_1, _d;
-            return tslib_1.__generator(this, function (_e) {
-                switch (_e.label) {
+            var allEntities_1, allEntities_1_1, entityClass, entity, e, err_2, e_1_1;
+            var e_1, _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         console.log("start verify structure");
-                        _e.label = 1;
+                        _b.label = 1;
                     case 1:
-                        _e.trys.push([1, 12, 13, 14]);
+                        _b.trys.push([1, 12, 13, 14]);
                         allEntities_1 = tslib_1.__values(context_1.allEntities), allEntities_1_1 = allEntities_1.next();
-                        _e.label = 2;
+                        _b.label = 2;
                     case 2:
                         if (!!allEntities_1_1.done) return [3 /*break*/, 11];
-                        entity = allEntities_1_1.value;
-                        metadata = remult.repo(entity).metadata;
-                        _e.label = 3;
+                        entityClass = allEntities_1_1.value;
+                        entity = remult.repo(entityClass).metadata;
+                        return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.getDbNameProvider(entity)];
                     case 3:
-                        _e.trys.push([3, 8, , 10]);
-                        if (!!metadata.options.sqlExpression) return [3 /*break*/, 7];
-                        return [4 /*yield*/, metadata.getDbName()];
+                        e = _b.sent();
+                        _b.label = 4;
                     case 4:
-                        if (!((_e.sent()).toLowerCase().indexOf('from ') < 0)) return [3 /*break*/, 7];
-                        return [4 /*yield*/, this.createIfNotExist(metadata)];
+                        _b.trys.push([4, 9, , 10]);
+                        if (!!entity.options.sqlExpression) return [3 /*break*/, 8];
+                        return [4 /*yield*/, e.entityName];
                     case 5:
-                        _e.sent();
-                        return [4 /*yield*/, this.verifyAllColumns(metadata)];
+                        if (!((_b.sent()).toLowerCase().indexOf('from ') < 0)) return [3 /*break*/, 8];
+                        return [4 /*yield*/, this.createIfNotExist(entity)];
                     case 6:
-                        _e.sent();
-                        _e.label = 7;
-                    case 7: return [3 /*break*/, 10];
-                    case 8:
-                        err_2 = _e.sent();
-                        _b = (_a = console).log;
-                        _c = "failed verify structore of ";
-                        return [4 /*yield*/, metadata.getDbName()];
+                        _b.sent();
+                        return [4 /*yield*/, this.verifyAllColumns(entity)];
+                    case 7:
+                        _b.sent();
+                        _b.label = 8;
+                    case 8: return [3 /*break*/, 10];
                     case 9:
-                        _b.apply(_a, [_c + (_e.sent()) + " ", err_2]);
+                        err_2 = _b.sent();
+                        console.log("failed verify structure of " + e.entityName + " ", err_2);
                         return [3 /*break*/, 10];
                     case 10:
                         allEntities_1_1 = allEntities_1.next();
                         return [3 /*break*/, 2];
                     case 11: return [3 /*break*/, 14];
                     case 12:
-                        e_1_1 = _e.sent();
+                        e_1_1 = _b.sent();
                         e_1 = { error: e_1_1 };
                         return [3 /*break*/, 14];
                     case 13:
                         try {
-                            if (allEntities_1_1 && !allEntities_1_1.done && (_d = allEntities_1.return)) _d.call(allEntities_1);
+                            if (allEntities_1_1 && !allEntities_1_1.done && (_a = allEntities_1.return)) _a.call(allEntities_1);
                         }
                         finally { if (e_1) throw e_1.error; }
                         return [7 /*endfinally*/];
@@ -170,207 +169,154 @@ var PostgresSchemaBuilder = /** @class */ (function () {
             });
         });
     };
-    PostgresSchemaBuilder.prototype.createIfNotExist = function (e) {
+    PostgresSchemaBuilder.prototype.createIfNotExist = function (entity) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var c, _a, _b, _c, _d, _e;
+            var c, e;
             var _this = this;
-            return tslib_1.__generator(this, function (_f) {
-                switch (_f.label) {
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         c = this.pool.createCommand();
-                        _b = (_a = c).execute;
-                        _c = "select 1 from information_Schema.tables where table_name=";
-                        _e = (_d = c).addParameterAndReturnSqlToken;
-                        return [4 /*yield*/, e.getDbName()];
-                    case 1: return [4 /*yield*/, _b.apply(_a, [_c + _e.apply(_d, [(_f.sent()).toLowerCase()]) + this.additionalWhere]).then(function (r) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                            var result, _a, _b, x, _c, _d, _e, _f, e_2_1, sql, _g;
-                            var e_2, _h;
-                            return tslib_1.__generator(this, function (_j) {
-                                switch (_j.label) {
-                                    case 0:
-                                        if (!(r.rows.length == 0)) return [3 /*break*/, 14];
-                                        result = '';
-                                        _j.label = 1;
-                                    case 1:
-                                        _j.trys.push([1, 9, 10, 11]);
-                                        _a = tslib_1.__values(e.fields), _b = _a.next();
-                                        _j.label = 2;
-                                    case 2:
-                                        if (!!_b.done) return [3 /*break*/, 8];
-                                        x = _b.value;
-                                        return [4 /*yield*/, sql_database_1.isDbReadonly(x)];
-                                    case 3:
-                                        if (!(!(_j.sent()) || x == e.idMetadata.field && e.options.dbAutoIncrementId)) return [3 /*break*/, 7];
-                                        if (result.length != 0)
-                                            result += ',';
-                                        result += '\r\n  ';
-                                        if (!(x == e.idMetadata.field && e.options.dbAutoIncrementId)) return [3 /*break*/, 5];
-                                        _c = result;
-                                        return [4 /*yield*/, x.getDbName()];
-                                    case 4:
-                                        result = _c + ((_j.sent()) + ' serial');
-                                        return [3 /*break*/, 7];
-                                    case 5:
-                                        _d = result;
-                                        _e = postgresColumnSyntax_1.postgresColumnSyntax;
-                                        _f = [x];
-                                        return [4 /*yield*/, x.getDbName()];
-                                    case 6:
-                                        result = _d + _e.apply(void 0, _f.concat([_j.sent()]));
-                                        if (x == e.idMetadata.field)
-                                            result += ' primary key';
-                                        _j.label = 7;
-                                    case 7:
-                                        _b = _a.next();
-                                        return [3 /*break*/, 2];
-                                    case 8: return [3 /*break*/, 11];
-                                    case 9:
-                                        e_2_1 = _j.sent();
-                                        e_2 = { error: e_2_1 };
-                                        return [3 /*break*/, 11];
-                                    case 10:
-                                        try {
-                                            if (_b && !_b.done && (_h = _a.return)) _h.call(_a);
-                                        }
-                                        finally { if (e_2) throw e_2.error; }
-                                        return [7 /*endfinally*/];
-                                    case 11:
-                                        _g = 'create table ';
-                                        return [4 /*yield*/, e.getDbName()];
-                                    case 12:
-                                        sql = _g + (_j.sent()) + ' (' + result + '\r\n)';
-                                        //console.log(sql);
-                                        return [4 /*yield*/, this.pool.execute(sql)];
-                                    case 13:
-                                        //console.log(sql);
-                                        _j.sent();
-                                        _j.label = 14;
-                                    case 14: return [2 /*return*/];
-                                }
-                            });
-                        }); })];
+                        return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.getDbNameProvider(entity)];
+                    case 1:
+                        e = _a.sent();
+                        return [4 /*yield*/, c.execute("select 1 from information_Schema.tables where table_name=" + c.addParameterAndReturnSqlToken((e.entityName).toLowerCase()) + this.additionalWhere).then(function (r) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                var result, _a, _b, x, sql;
+                                var e_2, _c;
+                                return tslib_1.__generator(this, function (_d) {
+                                    switch (_d.label) {
+                                        case 0:
+                                            if (!(r.rows.length == 0)) return [3 /*break*/, 2];
+                                            result = '';
+                                            try {
+                                                for (_a = tslib_1.__values(entity.fields), _b = _a.next(); !_b.done; _b = _a.next()) {
+                                                    x = _b.value;
+                                                    if (!e.isDbReadonly(x) || x == entity.idMetadata.field && entity.options.dbAutoIncrementId) {
+                                                        if (result.length != 0)
+                                                            result += ',';
+                                                        result += '\r\n  ';
+                                                        if (x == entity.idMetadata.field && entity.options.dbAutoIncrementId)
+                                                            result += e.nameOf(x) + ' serial';
+                                                        else {
+                                                            result += postgresColumnSyntax_1.postgresColumnSyntax(x, e.nameOf(x));
+                                                            if (x == entity.idMetadata.field)
+                                                                result += ' primary key';
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                                            finally {
+                                                try {
+                                                    if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                                                }
+                                                finally { if (e_2) throw e_2.error; }
+                                            }
+                                            sql = 'create table ' + e.entityName + ' (' + result + '\r\n)';
+                                            //console.log(sql);
+                                            return [4 /*yield*/, this.pool.execute(sql)];
+                                        case 1:
+                                            //console.log(sql);
+                                            _d.sent();
+                                            _d.label = 2;
+                                        case 2: return [2 /*return*/];
+                                    }
+                                });
+                            }); })];
                     case 2:
-                        _f.sent();
+                        _a.sent();
                         return [2 /*return*/];
                 }
             });
         });
     };
-    PostgresSchemaBuilder.prototype.addColumnIfNotExist = function (e, c) {
+    PostgresSchemaBuilder.prototype.addColumnIfNotExist = function (entity, c) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var cmd, _a, _b, _c, _d, _e, _f, _g, _h, sql, _j, _k, _l, _m, err_3;
-            return tslib_1.__generator(this, function (_o) {
-                switch (_o.label) {
-                    case 0: return [4 /*yield*/, sql_database_1.isDbReadonly(c(e))];
+            var e, cmd, colName, sql, err_3;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.getDbNameProvider(entity)];
                     case 1:
-                        if (_o.sent())
+                        e = _a.sent();
+                        if (e.isDbReadonly(c(entity)))
                             return [2 /*return*/];
-                        _o.label = 2;
+                        _a.label = 2;
                     case 2:
-                        _o.trys.push([2, 10, , 11]);
+                        _a.trys.push([2, 6, , 7]);
                         cmd = this.pool.createCommand();
-                        _b = (_a = cmd).execute;
-                        _c = "select 1   \n        FROM information_schema.columns \n        WHERE table_name=";
-                        _e = (_d = cmd).addParameterAndReturnSqlToken;
-                        return [4 /*yield*/, e.getDbName()];
+                        colName = e.nameOf(c(entity));
+                        return [4 /*yield*/, cmd.execute("select 1   \n        FROM information_schema.columns \n        WHERE table_name=" + cmd.addParameterAndReturnSqlToken((e.entityName).toLocaleLowerCase()) + " and column_name=" + cmd.addParameterAndReturnSqlToken((colName).toLocaleLowerCase()) + this.additionalWhere)];
                     case 3:
-                        _f = _c + _e.apply(_d, [(_o.sent()).toLocaleLowerCase()]) + " and column_name=";
-                        _h = (_g = cmd).addParameterAndReturnSqlToken;
-                        return [4 /*yield*/, c(e).getDbName()];
-                    case 4: return [4 /*yield*/, _b.apply(_a, [_f + _h.apply(_g, [(_o.sent()).toLocaleLowerCase()]) + this.additionalWhere])];
-                    case 5:
-                        if (!((_o.sent()).rows.length == 0)) return [3 /*break*/, 9];
-                        _j = "alter table ";
-                        return [4 /*yield*/, e.getDbName()];
-                    case 6:
-                        _k = _j + (_o.sent()) + " add column ";
-                        _l = postgresColumnSyntax_1.postgresColumnSyntax;
-                        _m = [c(e)];
-                        return [4 /*yield*/, c(e).getDbName()];
-                    case 7:
-                        sql = _k + _l.apply(void 0, _m.concat([_o.sent()]));
+                        if (!((_a.sent()).rows.length == 0)) return [3 /*break*/, 5];
+                        sql = "alter table " + e.entityName + " add column " + postgresColumnSyntax_1.postgresColumnSyntax(c(entity), colName);
                         //console.log(sql);
                         return [4 /*yield*/, this.pool.execute(sql)];
-                    case 8:
+                    case 4:
                         //console.log(sql);
-                        _o.sent();
-                        _o.label = 9;
-                    case 9: return [3 /*break*/, 11];
-                    case 10:
-                        err_3 = _o.sent();
+                        _a.sent();
+                        _a.label = 5;
+                    case 5: return [3 /*break*/, 7];
+                    case 6:
+                        err_3 = _a.sent();
                         console.log(err_3);
-                        return [3 /*break*/, 11];
-                    case 11: return [2 /*return*/];
+                        return [3 /*break*/, 7];
+                    case 7: return [2 /*return*/];
                 }
             });
         });
     };
-    PostgresSchemaBuilder.prototype.verifyAllColumns = function (e) {
+    PostgresSchemaBuilder.prototype.verifyAllColumns = function (entity) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var cmd, cols, _a, _b, _c, _d, _e, _f, _g, col, _h, _j, sql, _k, _l, _m, _o, e_3_1, err_4;
-            var e_3, _p;
-            return tslib_1.__generator(this, function (_q) {
-                switch (_q.label) {
+            var cmd, e, cols, _a, _b, col, sql, e_3_1, err_4;
+            var e_3, _c;
+            return tslib_1.__generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        _q.trys.push([0, 15, , 16]);
+                        _d.trys.push([0, 11, , 12]);
                         cmd = this.pool.createCommand();
-                        _b = (_a = cmd).execute;
-                        _c = "select column_name   \n        FROM information_schema.columns \n        WHERE table_name=";
-                        _e = (_d = cmd).addParameterAndReturnSqlToken;
-                        return [4 /*yield*/, e.getDbName()];
-                    case 1: return [4 /*yield*/, _b.apply(_a, [_c + _e.apply(_d, [(_q.sent()).toLocaleLowerCase()]) + " " + this.additionalWhere])];
+                        return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.getDbNameProvider(entity)];
+                    case 1:
+                        e = _d.sent();
+                        return [4 /*yield*/, cmd.execute("select column_name   \n        FROM information_schema.columns \n        WHERE table_name=" + cmd.addParameterAndReturnSqlToken((e.entityName).toLocaleLowerCase()) + " " + this.additionalWhere)];
                     case 2:
-                        cols = (_q.sent()).rows.map(function (x) { return x.column_name; });
-                        _q.label = 3;
+                        cols = (_d.sent()).rows.map(function (x) { return x.column_name; });
+                        _d.label = 3;
                     case 3:
-                        _q.trys.push([3, 12, 13, 14]);
-                        _f = tslib_1.__values(e.fields), _g = _f.next();
-                        _q.label = 4;
+                        _d.trys.push([3, 8, 9, 10]);
+                        _a = tslib_1.__values(entity.fields), _b = _a.next();
+                        _d.label = 4;
                     case 4:
-                        if (!!_g.done) return [3 /*break*/, 11];
-                        col = _g.value;
-                        return [4 /*yield*/, sql_database_1.isDbReadonly(col)];
-                    case 5:
-                        if (!!(_q.sent())) return [3 /*break*/, 10];
-                        _j = (_h = cols).includes;
-                        return [4 /*yield*/, col.getDbName()];
-                    case 6:
-                        if (!!_j.apply(_h, [(_q.sent()).toLocaleLowerCase()])) return [3 /*break*/, 10];
-                        _k = "alter table ";
-                        return [4 /*yield*/, e.getDbName()];
-                    case 7:
-                        _l = _k + (_q.sent()) + " add column ";
-                        _m = postgresColumnSyntax_1.postgresColumnSyntax;
-                        _o = [col];
-                        return [4 /*yield*/, col.getDbName()];
-                    case 8:
-                        sql = _l + _m.apply(void 0, _o.concat([_q.sent()]));
+                        if (!!_b.done) return [3 /*break*/, 7];
+                        col = _b.value;
+                        if (!!e.isDbReadonly(col)) return [3 /*break*/, 6];
+                        if (!!cols.includes(e.nameOf(col).toLocaleLowerCase())) return [3 /*break*/, 6];
+                        sql = "alter table " + e.entityName + " add column " + postgresColumnSyntax_1.postgresColumnSyntax(col, e.nameOf(col));
                         //console.log(sql);
                         return [4 /*yield*/, this.pool.execute(sql)];
-                    case 9:
+                    case 5:
                         //console.log(sql);
-                        _q.sent();
-                        _q.label = 10;
-                    case 10:
-                        _g = _f.next();
+                        _d.sent();
+                        _d.label = 6;
+                    case 6:
+                        _b = _a.next();
                         return [3 /*break*/, 4];
-                    case 11: return [3 /*break*/, 14];
-                    case 12:
-                        e_3_1 = _q.sent();
+                    case 7: return [3 /*break*/, 10];
+                    case 8:
+                        e_3_1 = _d.sent();
                         e_3 = { error: e_3_1 };
-                        return [3 /*break*/, 14];
-                    case 13:
+                        return [3 /*break*/, 10];
+                    case 9:
                         try {
-                            if (_g && !_g.done && (_p = _f.return)) _p.call(_f);
+                            if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
                         finally { if (e_3) throw e_3.error; }
                         return [7 /*endfinally*/];
-                    case 14: return [3 /*break*/, 16];
-                    case 15:
-                        err_4 = _q.sent();
+                    case 10: return [3 /*break*/, 12];
+                    case 11:
+                        err_4 = _d.sent();
                         console.log(err_4);
-                        return [3 /*break*/, 16];
-                    case 16: return [2 /*return*/];
+                        return [3 /*break*/, 12];
+                    case 12: return [2 /*return*/];
                 }
             });
         });

package/remult-knex/index.d.ts

@@ -1,7 +1,7 @@
 import { DataProvider, EntityDataProvider, EntityMetadata, FieldMetadata, Filter, Remult } from "..";
 import { Knex } from 'knex';
 import { FilterConsumer } from "../src/filter/filter-interfaces";
-import { CustomSqlFilterObject } from "../src/filter/filter-consumer-bridge-to-sql-request";
+import { CustomSqlFilterObject, dbNameProvider } from "../src/filter/filter-consumer-bridge-to-sql-request";
 export declare class KnexDataProvider implements DataProvider {
     knex: Knex;
     constructor(knex: Knex);
@@ -10,11 +10,12 @@ export declare class KnexDataProvider implements DataProvider {
     supportsCustomFilter?: boolean;
 }
 export declare class FilterConsumerBridgeToKnexRequest implements FilterConsumer {
+    private nameProvider;
     _addWhere: boolean;
     promises: Promise<void>[];
     result: ((builder: Knex.QueryBuilder) => void)[];
     resolveWhere(): Promise<((builder: Knex.QueryBuilder<any, any>) => void)[]>;
-    constructor();
+    constructor(nameProvider: dbNameProvider);
     custom(key: string, customItem: any): void;
     or(orElements: Filter[]): void;
     isNull(col: FieldMetadata): void;
@@ -33,9 +34,9 @@ export declare class FilterConsumerBridgeToKnexRequest implements FilterConsumer
 export declare class KnexSchemaBuilder {
     private knex;
     verifyStructureOfAllEntities(remult: Remult): Promise<void>;
-    createIfNotExist(e: EntityMetadata): Promise<void>;
-    addColumnIfNotExist<T extends EntityMetadata>(e: T, c: ((e: T) => FieldMetadata)): Promise<void>;
-    verifyAllColumns<T extends EntityMetadata>(e: T): Promise<void>;
+    createIfNotExist(entity: EntityMetadata): Promise<void>;
+    addColumnIfNotExist<T extends EntityMetadata>(entity: T, c: ((e: T) => FieldMetadata)): Promise<void>;
+    verifyAllColumns<T extends EntityMetadata>(entity: T): Promise<void>;
     additionalWhere: string;
     constructor(knex: Knex);
 }