remult 0.16.0-exp.14 → 0.16.0-exp.17

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

@@ -25,4 +25,4 @@ export declare function createPostgresConnection(options?: {
     configuration?: "heroku" | PoolConfig;
     autoCreateTables?: boolean;
 }): Promise<SqlDatabase>;
-export declare function preparePostgresQueueStorage(sql: SqlDatabase): Promise<import("../server/expressBridge").EntityQueueStorage>;
+export declare function preparePostgresQueueStorage(sql: SqlDatabase): Promise<import("../server/expressBridge.js").EntityQueueStorage>;

package/esm/postgres/postgres-data-provider.js

@@ -1,7 +1,8 @@
-import { Pool } from 'pg';
+import * as pg from 'pg';
 import { Remult } from '../src/context.js';
 import { PostgresSchemaBuilder, verifyStructureOfAllEntities } from './schema-builder.js';
 import { SqlDatabase } from '../src/data-providers/sql-database.js';
+const { Pool } = pg;
 export class PostgresDataProvider {
     pool;
     async entityIsUsedForTheFirstTime(entity) {
@@ -93,9 +94,9 @@ export async function createPostgresConnection(options) {
 export async function preparePostgresQueueStorage(sql) {
     let c = new Remult();
     c.dataProvider = (sql);
-    let JobsInQueueEntity = (await import('../server/expressBridge')).JobsInQueueEntity;
+    let JobsInQueueEntity = (await import('../server/expressBridge.js')).JobsInQueueEntity;
     let e = c.repo(JobsInQueueEntity);
     await new PostgresSchemaBuilder(sql).createIfNotExist(e.metadata);
     await new PostgresSchemaBuilder(sql).verifyAllColumns(e.metadata);
-    return new (await import('../server/expressBridge')).EntityQueueStorage(c.repo(JobsInQueueEntity));
+    return new (await import('../server/expressBridge.js')).EntityQueueStorage(c.repo(JobsInQueueEntity));
 }

package/esm/remult-mongo.d.ts

@@ -1,5 +1,5 @@
 import { MongoClient, Db } from 'mongodb';
-import { DataProvider, EntityDataProvider, EntityMetadata } from '.';
+import { DataProvider, EntityDataProvider, EntityMetadata } from './index.js';
 export declare class MongoDataProvider implements DataProvider {
     private db;
     private client;

package/esm/remult-mongo.js

@@ -1,4 +1,4 @@
-import { CompoundIdField, Filter } from '.';
+import { CompoundIdField, Filter } from './index.js';
 import { getDbNameProvider } from './src/filter/filter-consumer-bridge-to-sql-request.js';
 export class MongoDataProvider {
     db;

package/esm/server/expressBridge.js

@@ -29,7 +29,7 @@ export function createRemultServer(options) {
     dataProvider = dataProvider.then(async (dp) => {
         if (dp)
             return dp;
-        return new (await import('./JsonEntityFileStorage')).JsonFileDataProvider('./db');
+        return new (await import('./JsonEntityFileStorage.js')).JsonFileDataProvider('./db');
     });
     if (options.initApi) {
         dataProvider = dataProvider.then(async (dp) => {

package/esm/src/remult3/RepositoryImplementation.js

@@ -1157,13 +1157,6 @@ export class columnDefsImpl {
     constructor(settings, entityDefs, remult) {
         this.settings = settings;
         this.entityDefs = entityDefs;
-        if (settings.serverExpression)
-            this.isServerExpression = true;
-        if (typeof (this.settings.allowApiUpdate) === "boolean")
-            this.readonly = this.settings.allowApiUpdate;
-        if (!this.inputType)
-            this.inputType = this.valueConverter.inputType;
-        this.caption = buildCaption(settings.caption, settings.key, remult);
         this.options = this.settings;
         this.target = this.settings.target;
         this.valueConverter = this.settings.valueConverter;
@@ -1171,6 +1164,13 @@ export class columnDefsImpl {
         this.inputType = this.settings.inputType;
         this.key = this.settings.key;
         this.valueType = this.settings.valueType;
+        if (settings.serverExpression)
+            this.isServerExpression = true;
+        if (typeof (this.settings.allowApiUpdate) === "boolean")
+            this.readonly = this.settings.allowApiUpdate;
+        if (!this.inputType)
+            this.inputType = this.valueConverter.inputType;
+        this.caption = buildCaption(settings.caption, settings.key, remult);
     }
     dbNamePromise;
     getDbName() {
@@ -1233,6 +1233,7 @@ class EntityFullInfo {
         this.remult = remult;
         this.entityType = entityType;
         this.key = key;
+        this.options = this.entityInfo;
         if (this.options.allowApiCrud !== undefined) {
             if (this.options.allowApiDelete === undefined)
                 this.options.allowApiDelete = this.options.allowApiCrud;
@@ -1242,7 +1243,6 @@ class EntityFullInfo {
                 this.options.allowApiUpdate = this.options.allowApiCrud;
             if (this.options.allowApiRead === undefined)
                 this.options.allowApiRead = this.options.allowApiCrud;
-            this.options = this.entityInfo;
         }
         if (this.options.allowApiRead === undefined)
             this.options.allowApiRead = true;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.16.0-exp.14",
+    "version": "0.16.0-exp.17",
     "description": "A CRUD framework for full-stack TypeScript",
     "main": "index.js",
     "types": "index.d.ts",

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

@@ -25,4 +25,4 @@ export declare function createPostgresConnection(options?: {
     configuration?: "heroku" | PoolConfig;
     autoCreateTables?: boolean;
 }): Promise<SqlDatabase>;
-export declare function preparePostgresQueueStorage(sql: SqlDatabase): Promise<import("../server/expressBridge").EntityQueueStorage>;
+export declare function preparePostgresQueueStorage(sql: SqlDatabase): Promise<import("../server/expressBridge.js").EntityQueueStorage>;

package/postgres/postgres-data-provider.js

@@ -2,10 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.preparePostgresQueueStorage = exports.createPostgresConnection = exports.PostgresDataProvider = void 0;
 var tslib_1 = require("tslib");
-var pg_1 = require("pg");
+var pg = require("pg");
 var context_js_1 = require("../src/context.js");
 var schema_builder_js_1 = require("./schema-builder.js");
 var sql_database_js_1 = require("../src/data-providers/sql-database.js");
+var Pool = pg.Pool;
 var PostgresDataProvider = /** @class */ (function () {
     function PostgresDataProvider(pool) {
         this.pool = pool;
@@ -118,7 +119,7 @@ function createPostgresConnection(options) {
                     if (!config.connectionString && options.connectionString) {
                         config.connectionString = options.connectionString;
                     }
-                    db = new sql_database_js_1.SqlDatabase(new PostgresDataProvider(new pg_1.Pool(config)));
+                    db = new sql_database_js_1.SqlDatabase(new PostgresDataProvider(new Pool(config)));
                     remult = new context_js_1.Remult();
                     remult.dataProvider = (db);
                     if (!(options.autoCreateTables === undefined || options.autoCreateTables)) return [3 /*break*/, 2];
@@ -140,7 +141,7 @@ function preparePostgresQueueStorage(sql) {
                 case 0:
                     c = new context_js_1.Remult();
                     c.dataProvider = (sql);
-                    return [4 /*yield*/, Promise.resolve().then(function () { return require('../server/expressBridge'); })];
+                    return [4 /*yield*/, Promise.resolve().then(function () { return require('../server/expressBridge.js'); })];
                 case 1:
                     JobsInQueueEntity = (_a.sent()).JobsInQueueEntity;
                     e = c.repo(JobsInQueueEntity);
@@ -150,7 +151,7 @@ function preparePostgresQueueStorage(sql) {
                     return [4 /*yield*/, new schema_builder_js_1.PostgresSchemaBuilder(sql).verifyAllColumns(e.metadata)];
                 case 3:
                     _a.sent();
-                    return [4 /*yield*/, Promise.resolve().then(function () { return require('../server/expressBridge'); })];
+                    return [4 /*yield*/, Promise.resolve().then(function () { return require('../server/expressBridge.js'); })];
                 case 4: return [2 /*return*/, new (_a.sent()).EntityQueueStorage(c.repo(JobsInQueueEntity))];
             }
         });

package/remult-mongo.d.ts

@@ -1,5 +1,5 @@
 import { MongoClient, Db } from 'mongodb';
-import { DataProvider, EntityDataProvider, EntityMetadata } from '.';
+import { DataProvider, EntityDataProvider, EntityMetadata } from './index.js';
 export declare class MongoDataProvider implements DataProvider {
     private db;
     private client;

package/remult-mongo.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoDataProvider = void 0;
 var tslib_1 = require("tslib");
-var _1 = require(".");
+var index_js_1 = require("./index.js");
 var filter_consumer_bridge_to_sql_request_js_1 = require("./src/filter/filter-consumer-bridge-to-sql-request.js");
 var MongoDataProvider = /** @class */ (function () {
     function MongoDataProvider(db, client) {
@@ -172,14 +172,14 @@ var MongoEntityDataProvider = /** @class */ (function () {
                     case 1:
                         _a = _k.sent(), collection = _a.collection, e = _a.e;
                         f = new FilterConsumerBridgeToMongo(e);
-                        _1.Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(id)).__applyToConsumer(f);
+                        index_js_1.Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(id)).__applyToConsumer(f);
                         resultFilter = this.entity.idMetadata.getIdFilter(id);
                         if (data.id != undefined)
                             resultFilter = this.entity.idMetadata.getIdFilter(data.id);
                         try {
                             for (_b = tslib_1.__values(this.entity.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
                                 x = _c.value;
-                                if (x instanceof _1.CompoundIdField) {
+                                if (x instanceof index_js_1.CompoundIdField) {
                                     resultFilter = x.resultIdFilter(id, data);
                                 }
                             }
@@ -217,7 +217,7 @@ var MongoEntityDataProvider = /** @class */ (function () {
                             }])];
                     case 3:
                         r = _k.sent();
-                        return [2 /*return*/, this.find({ where: _1.Filter.fromEntityFilter(this.entity, resultFilter) }).then(function (y) { return y[0]; })];
+                        return [2 /*return*/, this.find({ where: index_js_1.Filter.fromEntityFilter(this.entity, resultFilter) }).then(function (y) { return y[0]; })];
                 }
             });
         });
@@ -231,7 +231,7 @@ var MongoEntityDataProvider = /** @class */ (function () {
                     case 1:
                         _a = _d.sent(), e = _a.e, collection = _a.collection;
                         f = new FilterConsumerBridgeToMongo(e);
-                        _1.Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(id)).__applyToConsumer(f);
+                        index_js_1.Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(id)).__applyToConsumer(f);
                         _c = (_b = collection).deleteOne;
                         return [4 /*yield*/, f.resolveWhere()];
                     case 2:

package/server/expressBridge.js

@@ -36,7 +36,7 @@ function createRemultServer(options) {
                 case 0:
                     if (dp)
                         return [2 /*return*/, dp];
-                    return [4 /*yield*/, Promise.resolve().then(function () { return require('./JsonEntityFileStorage'); })];
+                    return [4 /*yield*/, Promise.resolve().then(function () { return require('./JsonEntityFileStorage.js'); })];
                 case 1: return [2 /*return*/, new (_a.sent()).JsonFileDataProvider('./db')];
             }
         });

package/src/remult3/RepositoryImplementation.js

@@ -2035,13 +2035,6 @@ var columnDefsImpl = /** @class */ (function () {
     function columnDefsImpl(settings, entityDefs, remult) {
         this.settings = settings;
         this.entityDefs = entityDefs;
-        if (settings.serverExpression)
-            this.isServerExpression = true;
-        if (typeof (this.settings.allowApiUpdate) === "boolean")
-            this.readonly = this.settings.allowApiUpdate;
-        if (!this.inputType)
-            this.inputType = this.valueConverter.inputType;
-        this.caption = buildCaption(settings.caption, settings.key, remult);
         this.options = this.settings;
         this.target = this.settings.target;
         this.valueConverter = this.settings.valueConverter;
@@ -2049,6 +2042,13 @@ var columnDefsImpl = /** @class */ (function () {
         this.inputType = this.settings.inputType;
         this.key = this.settings.key;
         this.valueType = this.settings.valueType;
+        if (settings.serverExpression)
+            this.isServerExpression = true;
+        if (typeof (this.settings.allowApiUpdate) === "boolean")
+            this.readonly = this.settings.allowApiUpdate;
+        if (!this.inputType)
+            this.inputType = this.valueConverter.inputType;
+        this.caption = buildCaption(settings.caption, settings.key, remult);
     }
     columnDefsImpl.prototype.getDbName = function () {
         var _this = this;
@@ -2142,6 +2142,7 @@ var EntityFullInfo = /** @class */ (function () {
                         _b;
             }
         };
+        this.options = this.entityInfo;
         if (this.options.allowApiCrud !== undefined) {
             if (this.options.allowApiDelete === undefined)
                 this.options.allowApiDelete = this.options.allowApiCrud;
@@ -2151,7 +2152,6 @@ var EntityFullInfo = /** @class */ (function () {
                 this.options.allowApiUpdate = this.options.allowApiCrud;
             if (this.options.allowApiRead === undefined)
                 this.options.allowApiRead = this.options.allowApiCrud;
-            this.options = this.entityInfo;
         }
         if (this.options.allowApiRead === undefined)
             this.options.allowApiRead = true;