remult 0.21.1 → 0.22.1

package/postgres/schema-builder.js

@@ -11,29 +11,32 @@ function postgresColumnSyntax(x, dbName) {
     var result = dbName;
     if (x.valueType == Number) {
         if (!x.valueConverter.fieldTypeInDb)
-            result += " numeric" + (x.allowNull ? "" : " default 0 not null");
+            result += ' numeric' + (x.allowNull ? '' : ' default 0 not null');
         else
-            result += " " + x.valueConverter.fieldTypeInDb + (x.allowNull ? "" : " default 0 not null");
+            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";
+                result += ' date';
             else
-                result += " timestamp";
+                result += ' timestamp';
         else
-            result += " " + x.valueConverter.fieldTypeInDb;
+            result += ' ' + x.valueConverter.fieldTypeInDb;
     }
     else if (x.valueType == Boolean)
-        result += " boolean" + (x.allowNull ? "" : " default false not null");
+        result += ' boolean' + (x.allowNull ? '' : ' default false not null');
     else if (x.valueConverter.fieldTypeInDb) {
-        result += " " + x.valueConverter.fieldTypeInDb;
+        result += ' ' + x.valueConverter.fieldTypeInDb;
         if (!x.allowNull && x.valueConverter.fieldTypeInDb == 'integer') {
-            result += " default 0 not null";
+            result += ' default 0 not null';
         }
     }
     else
-        result += " varchar" + (x.allowNull ? "" : " default '' not null");
+        result += ' varchar' + (x.allowNull ? '' : " default '' not null");
     return result;
 }
 exports.postgresColumnSyntax = postgresColumnSyntax;
@@ -53,7 +56,7 @@ var PostgresSchemaBuilder = /** @class */ (function () {
         this.pool = pool;
         this.additionalWhere = '';
         if (schema) {
-            this.additionalWhere = ' and table_schema=\'' + schema + '\'';
+            this.additionalWhere = " and table_schema='" + schema + "'";
         }
     }
     PostgresSchemaBuilder.prototype.verifyStructureOfAllEntities = function (remult) {
@@ -64,7 +67,7 @@ var PostgresSchemaBuilder = /** @class */ (function () {
                 switch (_d.label) {
                     case 0:
                         if (!remult) {
-                            remult = remult_proxy_1.RemultProxy.defaultRemult;
+                            remult = remult_proxy_1.remult;
                         }
                         completed = new Set();
                         entities = [];
@@ -138,7 +141,7 @@ var PostgresSchemaBuilder = /** @class */ (function () {
                     case 6: return [3 /*break*/, 8];
                     case 7:
                         err_1 = _b.sent();
-                        console.error("failed verify structure of " + e.$entityName + " ", err_1);
+                        console.error('failed verify structure of ' + e.$entityName + ' ', err_1);
                         return [3 /*break*/, 8];
                     case 8:
                         entities_1_1 = entities_1.next();
@@ -170,7 +173,11 @@ var PostgresSchemaBuilder = /** @class */ (function () {
                         return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.dbNamesOf(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 () {
+                        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_3, _c;
                                 return tslib_1.__generator(this, function (_d) {
@@ -235,7 +242,7 @@ var PostgresSchemaBuilder = /** @class */ (function () {
                         _a.trys.push([2, 6, , 7]);
                         cmd = this.pool.createCommand();
                         colName = e.$dbNameOf(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)];
+                        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:
                         if (!((_a.sent()).rows.length == 0)) return [3 /*break*/, 5];
                         sql = "alter table " + e.$entityName + " add column " + postgresColumnSyntax(c(entity), colName);
@@ -267,7 +274,7 @@ var PostgresSchemaBuilder = /** @class */ (function () {
                         return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.dbNamesOf(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)];
+                        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 = (_d.sent()).rows.map(function (x) { return x.column_name.toLocaleLowerCase(); });
                         _d.label = 3;

package/remult-express.js

@@ -21,7 +21,7 @@ function remultExpress(options) {
         buildGenericRequestInfo: function (req) { return req; },
         getRequestBody: function (req) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
             return [2 /*return*/, req.body];
-        }); }); }
+        }); }); },
     });
     server.registerRouter(app);
     return Object.assign(app, {

package/remult-fastify.js

@@ -23,12 +23,12 @@ function remultFastify(options) {
                 },
                 writeHead: function (status, headers) {
                     res.raw.writeHead(status, headers);
-                }
+                },
             };
             Object.assign(req, {
                 on: function (event, listener) {
                     req.raw.on(event, listener);
-                }
+                },
             });
             handler(req, myRes, function () { });
         };
@@ -53,10 +53,12 @@ function remultFastify(options) {
                         get: function (handler) {
                             instance.get(path, fastifyHandler(handler));
                             return r;
-                        }, post: function (handler) {
+                        },
+                        post: function (handler) {
                             instance.post(path, fastifyHandler(handler));
                             return r;
-                        }, put: function (handler) {
+                        },
+                        put: function (handler) {
                             instance.put(path, fastifyHandler(handler));
                             return r;
                         },
@@ -71,9 +73,7 @@ function remultFastify(options) {
     return Object.assign(pluginFunction, {
         getRemult: function (x) { return api.getRemult(x); },
         openApiDoc: function (x) { return api.openApiDoc(x); },
-        withRemult: function (req, what) {
-            return api.withRemultPromise(req, what);
-        },
+        withRemult: function (req, what) { return api.withRemultPromise(req, what); },
     });
 }
 exports.remultFastify = remultFastify;

package/remult-fresh.d.ts

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

package/remult-fresh.js

@@ -7,7 +7,7 @@ function remultFresh(options, response) {
     var _this = this;
     var server = expressBridge_1.createRemultServerCore(options, {
         buildGenericRequestInfo: function (r) { return r; },
-        getRequestBody: function (req) { return req.json(); }
+        getRequestBody: function (req) { return req.json(); },
     });
     return {
         getRemult: function (r) { return server.getRemult(r); },
@@ -32,7 +32,6 @@ function remultFresh(options, response) {
                         else {
                             return [2 /*return*/, ctx.next()];
                         }
-                        ;
                         return [2 /*return*/];
                 }
             });
@@ -40,5 +39,3 @@ function remultFresh(options, response) {
     };
 }
 exports.remultFresh = remultFresh;
-;
-;

package/remult-knex/index.d.ts

@@ -1,6 +1,6 @@
 import type { Knex } from 'knex';
-import { Remult } from "../src/context";
-import { EntityFilter, EntityMetadata, RepositoryOverloads } from "../src/remult3";
+import { Remult } from '../src/context';
+import { EntityFilter, EntityMetadata, RepositoryOverloads } from '../src/remult3';
 import { DataProvider, EntityDataProvider } from '../src/data-interfaces';
 import { FieldMetadata } from '../src/column-interfaces';
 export declare class KnexDataProvider implements DataProvider {
@@ -11,7 +11,7 @@ export declare class KnexDataProvider implements DataProvider {
     transaction(action: (dataProvider: DataProvider) => Promise<void>): Promise<void>;
     static rawFilter(build: CustomKnexFilterBuilderFunction): EntityFilter<any>;
     static filterToRaw<entityType>(entity: RepositoryOverloads<entityType>, condition: EntityFilter<entityType>): Promise<(knex: any) => void>;
-    supportsRawFilter?: boolean;
+    isProxy?: boolean;
     ensureSchema(entities: EntityMetadata<any>[]): Promise<void>;
 }
 export declare type CustomKnexFilterBuilderFunction = () => Promise<(builder: Knex.QueryBuilder) => void>;
@@ -20,7 +20,7 @@ export declare class KnexSchemaBuilder {
     verifyStructureOfAllEntities(remult?: Remult): Promise<void>;
     ensureSchema(entities: EntityMetadata<any>[]): Promise<void>;
     createIfNotExist(entity: EntityMetadata): Promise<void>;
-    addColumnIfNotExist<T extends EntityMetadata>(entity: T, c: ((e: T) => FieldMetadata)): 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);

package/remult-knex/index.js

@@ -17,7 +17,7 @@ var KnexDataProvider = /** @class */ (function () {
     KnexDataProvider.getDb = function (remult) {
         var r = (remult || remult_proxy_1.remult).dataProvider;
         if (!r.knex)
-            throw "the data provider is not an KnexDataProvider";
+            throw 'the data provider is not an KnexDataProvider';
         return r.knex;
     };
     KnexDataProvider.prototype.getEntityDataProvider = function (entity) {
@@ -26,7 +26,7 @@ var KnexDataProvider = /** @class */ (function () {
             try {
                 for (var _b = tslib_1.__values(entity.fields.toArray()), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var f = _c.value;
-                    if (f.valueConverter.fieldTypeInDb === "json") {
+                    if (f.valueConverter.fieldTypeInDb === 'json') {
                         //@ts-ignore
                         f.valueConverter = tslib_1.__assign(tslib_1.__assign({}, f.valueConverter), { toDb: valueConverters_1.ValueConverters.JsonString.toDb, fromDb: valueConverters_1.ValueConverters.JsonString.fromDb });
                     }
@@ -74,7 +74,7 @@ var KnexDataProvider = /** @class */ (function () {
         var _a;
         return _a = {},
             _a[filter_interfaces_1.customDatabaseFilterToken] = {
-                buildKnex: build
+                buildKnex: build,
             },
             _a;
     };
@@ -90,7 +90,7 @@ var KnexDataProvider = /** @class */ (function () {
                     case 1:
                         b = new (_a.apply(FilterConsumerBridgeToKnexRequest, [void 0, _b.sent()]))();
                         b._addWhere = false;
-                        return [4 /*yield*/, (repo.translateWhereToFilter(condition))];
+                        return [4 /*yield*/, repo.translateWhereToFilter(condition)];
                     case 2: return [4 /*yield*/, (_b.sent()).__applyToConsumer(b)];
                     case 3:
                         _b.sent();
@@ -139,9 +139,10 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 2:
                         r = _a.sent();
                         return [4 /*yield*/, this.knex(e.$entityName)
-                                .count().where(function (b) { return r.forEach(function (w) { return w(b); }); })];
+                                .count()
+                                .where(function (b) { return r.forEach(function (w) { return w(b); }); })];
                     case 3:
-                        result = (_a.sent());
+                        result = _a.sent();
                         row = result[0];
                         for (key in row) {
                             if (Object.prototype.hasOwnProperty.call(row, key)) {
@@ -199,7 +200,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         if (options.orderBy) {
                             query = query.orderBy(options.orderBy.Segments.map(function (s) { return ({
                                 column: e.$dbNameOf(s.field),
-                                order: s.isDescending ? "desc" : "asc"
+                                order: s.isDescending ? 'desc' : 'asc',
                             }); }));
                         }
                         if (options.limit) {
@@ -219,7 +220,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                                         result[field.key] = field.valueConverter.fromDb(y[m]);
                                     }
                                     catch (err) {
-                                        throw new Error("Failed to load from db:" + field.key + "\r\n" + err);
+                                        throw new Error('Failed to load from db:' + field.key + '\r\n' + err);
                                     }
                                 }
                                 return result;
@@ -233,7 +234,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, filter_consumer_bridge_to_sql_request_1.dbNamesOf(this.entity)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 1: return [2 /*return*/, (_a.sent())];
                 }
             });
         });
@@ -289,10 +290,14 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 10: return [4 /*yield*/, f.resolveWhere()];
                     case 11:
                         where = _d.sent();
-                        return [4 /*yield*/, this.knex(e.$entityName).update(updateObject).where(function (b) { return where.forEach(function (w) { return w(b); }); })];
+                        return [4 /*yield*/, this.knex(e.$entityName)
+                                .update(updateObject)
+                                .where(function (b) { return where.forEach(function (w) { return w(b); }); })];
                     case 12:
                         _d.sent();
-                        return [2 /*return*/, this.find({ where: filter_interfaces_1.Filter.fromEntityFilter(this.entity, resultFilter) }).then(function (y) { return y[0]; })];
+                        return [2 /*return*/, this.find({
+                                where: filter_interfaces_1.Filter.fromEntityFilter(this.entity, resultFilter),
+                            }).then(function (y) { return y[0]; })];
                 }
             });
         });
@@ -310,7 +315,9 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [4 /*yield*/, f.resolveWhere()];
                     case 2:
                         where = _a.sent();
-                        return [4 /*yield*/, this.knex(e.$entityName).delete().where(function (b) { return where.forEach(function (w) { return w(b); }); })];
+                        return [4 /*yield*/, this.knex(e.$entityName)
+                                .delete()
+                                .where(function (b) { return where.forEach(function (w) { return w(b); }); })];
                     case 3:
                         _a.sent();
                         return [2 /*return*/];
@@ -380,7 +387,9 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         newId_1 = result[0].id;
                         _d.label = 14;
                     case 14:
-                        resultFilter = new filter_interfaces_1.Filter(function (x) { return x.isEqualTo(_this.entity.idMetadata.field, newId_1); });
+                        resultFilter = new filter_interfaces_1.Filter(function (x) {
+                            return x.isEqualTo(_this.entity.idMetadata.field, newId_1);
+                        });
                         return [3 /*break*/, 17];
                     case 15: return [4 /*yield*/, insert];
                     case 16:
@@ -445,7 +454,7 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
         });
     };
     FilterConsumerBridgeToKnexRequest.prototype.custom = function (key, customItem) {
-        throw new Error("Custom filter should be translated before it gets here");
+        throw new Error('Custom filter should be translated before it gets here');
     };
     FilterConsumerBridgeToKnexRequest.prototype.or = function (orElements) {
         var _this = this;
@@ -533,35 +542,41 @@ var FilterConsumerBridgeToKnexRequest = /** @class */ (function () {
         });
     };
     FilterConsumerBridgeToKnexRequest.prototype.isEqualTo = function (col, val) {
-        this.add(col, val, "=");
+        this.add(col, val, '=');
     };
     FilterConsumerBridgeToKnexRequest.prototype.isDifferentFrom = function (col, val) {
-        this.add(col, val, "<>");
+        this.add(col, val, '<>');
     };
     FilterConsumerBridgeToKnexRequest.prototype.isGreaterOrEqualTo = function (col, val) {
-        this.add(col, val, ">=");
+        this.add(col, val, '>=');
     };
     FilterConsumerBridgeToKnexRequest.prototype.isGreaterThan = function (col, val) {
-        this.add(col, val, ">");
+        this.add(col, val, '>');
     };
     FilterConsumerBridgeToKnexRequest.prototype.isLessOrEqualTo = function (col, val) {
-        this.add(col, val, "<=");
+        this.add(col, val, '<=');
     };
     FilterConsumerBridgeToKnexRequest.prototype.isLessThan = function (col, val) {
-        this.add(col, val, "<");
+        this.add(col, val, '<');
     };
     FilterConsumerBridgeToKnexRequest.prototype.containsCaseInsensitive = function (col, val) {
         var _this = this;
-        this.result.push(function (b) { return b.whereRaw('lower (' + b.client.ref(_this.nameProvider.$dbNameOf(col)) + ") like lower ('%" + val.replace(/'/g, '\'\'') + "%')"); });
-        this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/];
-            });
-        }); })());
+        this.result.push(function (b) {
+            return b.whereRaw('lower (' +
+                b.client.ref(_this.nameProvider.$dbNameOf(col)) +
+                ") like lower ('%" +
+                val.replace(/'/g, "''") +
+                "%')");
+        });
+        this.promises.push((function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+            return [2 /*return*/];
+        }); }); })());
     };
     FilterConsumerBridgeToKnexRequest.prototype.add = function (col, val, operator) {
         var _this = this;
-        this.result.push(function (b) { return b.where(_this.nameProvider.$dbNameOf(col), operator, translateValueAndHandleArrayAndHandleArray(col, val)); });
+        this.result.push(function (b) {
+            return b.where(_this.nameProvider.$dbNameOf(col), operator, translateValueAndHandleArrayAndHandleArray(col, val));
+        });
     };
     FilterConsumerBridgeToKnexRequest.prototype.databaseCustom = function (databaseCustom) {
         var _this = this;
@@ -593,7 +608,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
             var entities;
             return tslib_1.__generator(this, function (_a) {
                 if (!remult)
-                    remult = remult_proxy_1.RemultProxy.defaultRemult;
+                    remult = remult_proxy_1.remult;
                 entities = context_1.allEntities.map(function (x) { return remult.repo(x).metadata; });
                 this.ensureSchema(entities);
                 return [2 /*return*/];
@@ -631,7 +646,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
                     case 6: return [3 /*break*/, 8];
                     case 7:
                         err_2 = _b.sent();
-                        console.error("failed ensure schema of " + e.$entityName + " ", err_2);
+                        console.error('failed ensure schema of ' + e.$entityName + ' ', err_2);
                         return [3 /*break*/, 8];
                     case 8:
                         entities_1_1 = entities_1.next();
@@ -671,7 +686,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
                                 f = _b.value;
                                 cols_1.set(f, {
                                     name: e.$dbNameOf(f),
-                                    readonly: filter_consumer_bridge_to_sql_request_1.isDbReadonly(f, e)
+                                    readonly: filter_consumer_bridge_to_sql_request_1.isDbReadonly(f, e),
                                 });
                             }
                         }
@@ -810,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')))
         return false;
     return true;
 }
@@ -823,7 +838,7 @@ function buildColumn(x, dbName, b, supportsJson) {
                 c.defaultTo(0).notNullable();
             }
         }
-        else if (x.valueConverter.fieldTypeInDb == "integer") {
+        else if (x.valueConverter.fieldTypeInDb == 'integer') {
             var c = b.integer(dbName);
             if (!x.allowNull) {
                 c.defaultTo(0).notNullable();
@@ -838,7 +853,7 @@ function buildColumn(x, dbName, b, supportsJson) {
                 b.date(dbName);
             else
                 b.dateTime(dbName);
-        else if (x.valueConverter.fieldTypeInDb == "date")
+        else if (x.valueConverter.fieldTypeInDb == 'date')
             b.date(dbName);
         else
             b.specificType(dbName, x.valueConverter.fieldTypeInDb);
@@ -849,13 +864,13 @@ function buildColumn(x, dbName, b, supportsJson) {
             c.defaultTo(false).notNullable();
     }
     else if (x.valueConverter.fieldTypeInDb) {
-        if (x.valueConverter.fieldTypeInDb == "integer") {
+        if (x.valueConverter.fieldTypeInDb == 'integer') {
             var c = b.integer(dbName);
             if (!x.allowNull) {
                 c.defaultTo(0).notNullable();
             }
         }
-        else if (x.valueConverter.fieldTypeInDb == "json")
+        else if (x.valueConverter.fieldTypeInDb == 'json')
             if (supportsJson)
                 b.json(dbName);
             else