remult 0.14.4 → 0.14.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.14.4",
+    "version": "0.14.7",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev/",
     "repository": {
@@ -11,10 +11,6 @@
     "author": {
         "name": "Noam Honig"
     },
-    "exports": {
-        ".": "./index.js",
-        "./remult-middleware": "./remult-middleware.js"
-    },
     "dependencies": {
         "uuid": "^8.3.2",
         "reflect-metadata": "^0.1.13",

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

@@ -1,6 +1,9 @@
-import { SqlDatabase, SqlCommand, SqlImplementation, EntityMetadata, FieldMetadata } from '../';
 import { PoolConfig, QueryResult } from 'pg';
 import { Remult } from '../src/context';
+import { EntityMetadata } from '../src/remult3';
+import { SqlCommand, SqlImplementation } from '../src/sql-command';
+import { SqlDatabase } from '../src/data-providers/sql-database';
+import { FieldMetadata } from '../src/column-interfaces';
 export interface PostgresPool extends PostgresCommandSource {
     connect(): Promise<PostgresClient>;
 }

package/postgres/postgres-data-provider.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPostgresConnection = exports.preparePostgresQueueStorage = exports.PostgresSchemaBuilder = exports.verifyStructureOfAllEntities = exports.PostgresDataProvider = void 0;
 var tslib_1 = require("tslib");
-var __1 = require("../");
 var pg_1 = require("pg");
 var context_1 = require("../src/context");
 var postgresColumnSyntax_1 = require("./postgresColumnSyntax");
 var filter_consumer_bridge_to_sql_request_1 = require("../src/filter/filter-consumer-bridge-to-sql-request");
 var remult3_1 = require("../src/remult3");
+var sql_database_1 = require("../src/data-providers/sql-database");
 var PostgresDataProvider = /** @class */ (function () {
     function PostgresDataProvider(pool) {
         this.pool = pool;
@@ -377,7 +377,7 @@ function createPostgresConnection(options) {
                     if (!config.connectionString && options.connectionString) {
                         config.connectionString = options.connectionString;
                     }
-                    db = new __1.SqlDatabase(new PostgresDataProvider(new pg_1.Pool(config)));
+                    db = new sql_database_1.SqlDatabase(new PostgresDataProvider(new pg_1.Pool(config)));
                     remult = new context_1.Remult();
                     remult.setDataProvider(db);
                     if (!(options.autoCreateTables === undefined || options.autoCreateTables)) return [3 /*break*/, 2];

package/postgres/postgresColumnSyntax.d.ts

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

package/remult-knex/index.d.ts

@@ -1,7 +1,10 @@
-import { DataProvider, EntityDataProvider, EntityFilter, EntityMetadata, FieldMetadata, Filter, Remult } from "..";
 import { Knex } from 'knex';
-import { FilterConsumer } from "../src/filter/filter-interfaces";
+import { Filter, FilterConsumer } from "../src/filter/filter-interfaces";
 import { dbNameProvider } from "../src/filter/filter-consumer-bridge-to-sql-request";
+import { Remult } from "../src/context";
+import { EntityFilter, EntityMetadata } from "../src/remult3";
+import { DataProvider, EntityDataProvider } from '../src/data-interfaces';
+import { FieldMetadata } from '../src/column-interfaces';
 export declare class KnexDataProvider implements DataProvider {
     knex: Knex;
     constructor(knex: Knex);

package/remult-knex/index.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createKnexDataProvider = exports.buildColumn = exports.KnexSchemaBuilder = exports.FilterConsumerBridgeToKnexRequest = exports.KnexDataProvider = void 0;
 var tslib_1 = require("tslib");
-var __1 = require("..");
 var knex_1 = require("knex");
 var filter_interfaces_1 = require("../src/filter/filter-interfaces");
 var filter_consumer_bridge_to_sql_request_1 = require("../src/filter/filter-consumer-bridge-to-sql-request");
 var context_1 = require("../src/context");
 var remult3_1 = require("../src/remult3");
 var valueConverters_1 = require("../valueConverters");
+var column_1 = require("../src/column");
 var KnexDataProvider = /** @class */ (function () {
     function KnexDataProvider(knex) {
         this.knex = knex;
@@ -181,7 +181,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 1:
                         e = _d.sent();
                         f = new FilterConsumerBridgeToKnexRequest(e);
-                        __1.Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(id)).__applyToConsumer(f);
+                        filter_interfaces_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);
@@ -225,7 +225,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         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: __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]; })];
                 }
             });
         });
@@ -239,7 +239,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 1:
                         e = _a.sent();
                         f = new FilterConsumerBridgeToKnexRequest(e);
-                        __1.Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(id)).__applyToConsumer(f);
+                        filter_interfaces_1.Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(id)).__applyToConsumer(f);
                         return [4 /*yield*/, f.resolveWhere()];
                     case 2:
                         where = _a.sent();
@@ -261,10 +261,10 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.init()];
                     case 1:
                         e = _d.sent();
-                        if (this.entity.idMetadata.field instanceof __1.CompoundIdField)
+                        if (this.entity.idMetadata.field instanceof column_1.CompoundIdField)
                             resultFilter = this.entity.idMetadata.field.resultIdFilter(undefined, data);
                         else
-                            resultFilter = __1.Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(data[this.entity.idMetadata.field.key]));
+                            resultFilter = filter_interfaces_1.Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(data[this.entity.idMetadata.field.key]));
                         insertObject = {};
                         _d.label = 2;
                     case 2:
@@ -305,7 +305,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 11:
                         result = _d.sent();
                         newId_1 = result[0].id;
-                        resultFilter = new __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*/, 14];
                     case 12: return [4 /*yield*/, insert];
                     case 13:
@@ -789,7 +789,7 @@ function createKnexDataProvider(config, autoCreateTables) {
                     k = knex_1.default(config);
                     result = new KnexDataProvider(k);
                     if (!autoCreateTables) return [3 /*break*/, 2];
-                    return [4 /*yield*/, new KnexSchemaBuilder(k).verifyStructureOfAllEntities(new __1.Remult(result))];
+                    return [4 /*yield*/, new KnexSchemaBuilder(k).verifyStructureOfAllEntities(new context_1.Remult(result))];
                 case 1:
                     _a.sent();
                     _a.label = 2;

package/remult-middleware.js

@@ -62,7 +62,6 @@ var middleware = /** @class */ (function () {
                 }
             }
         }
-        console.log(req.path);
         next();
     };
     return middleware;

package/server/expressBridge.d.ts

@@ -1,8 +1,10 @@
-import { DataProvider, Remult, IdEntity, Repository } from '../';
 import { queuedJobInfoResponse } from '../src/server-action';
+import { DataProvider } from '../src/data-interfaces';
 import { DataApi, DataApiRequest, DataApiResponse } from '../src/data-api';
-import { AllowedForInstance } from '../src/context';
+import { AllowedForInstance, Remult } from '../src/context';
 import { ClassType } from '../classType';
+import { Repository } from '../src/remult3';
+import { IdEntity } from '../src/id-entity';
 export declare type RemultMiddlewareOptions = {
     /** Sets a database connection for Remult.
      *

package/server/expressBridge.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JobsInQueueEntity = exports.EntityQueueStorage = exports.ExpressRequestBridgeToDataApiRequest = exports.SiteArea = exports.remultMiddlewareBase = void 0;
 var tslib_1 = require("tslib");
-var __1 = require("../");
 var register_actions_on_server_1 = require("./register-actions-on-server");
 var register_entities_on_server_1 = require("./register-entities-on-server");
 var JsonEntityFileStorage_1 = require("./JsonEntityFileStorage");
@@ -10,6 +9,8 @@ var server_action_1 = require("../src/server-action");
 var data_api_1 = require("../src/data-api");
 var context_1 = require("../src/context");
 var remult3_1 = require("../src/remult3");
+var json_data_provider_1 = require("../src/data-providers/json-data-provider");
+var id_entity_1 = require("../src/id-entity");
 function remultMiddlewareBase(app, options) {
     var _this = this;
     if (!options) {
@@ -31,7 +32,7 @@ function remultMiddlewareBase(app, options) {
     dataProvider = dataProvider.then(function (dp) {
         if (dp)
             return dp;
-        return new __1.JsonDataProvider(new JsonEntityFileStorage_1.JsonEntityFileStorage('./db'));
+        return new json_data_provider_1.JsonDataProvider(new JsonEntityFileStorage_1.JsonEntityFileStorage('./db'));
     });
     if (options.initApi) {
         dataProvider = dataProvider.then(function (dp) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
@@ -39,7 +40,7 @@ function remultMiddlewareBase(app, options) {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        remult = new __1.Remult(dp);
+                        remult = new context_1.Remult(dp);
                         return [4 /*yield*/, options.initApi(remult)];
                     case 1:
                         _a.sent();
@@ -52,7 +53,7 @@ function remultMiddlewareBase(app, options) {
     if (options.logApiEndPoints !== undefined)
         bridge.logApiEndPoints = options.logApiEndPoints;
     if (options.rootPath === undefined)
-        options.rootPath = __1.Remult.apiBaseUrl;
+        options.rootPath = context_1.Remult.apiBaseUrl;
     var apiArea = bridge.addArea(options.rootPath);
     if (!options.disableAutoApi) {
         var actions = [];
@@ -82,7 +83,7 @@ var ExpressBridge = /** @class */ (function () {
     }
     ExpressBridge.prototype.openApiDoc = function (options) {
         var e_1, _a, e_2, _b;
-        var r = new __1.Remult();
+        var r = new context_1.Remult();
         if (!options.version)
             options.version = "1.0.0";
         var spec = {
@@ -446,7 +447,7 @@ var SiteArea = /** @class */ (function () {
                     case 0:
                         myReq = new ExpressRequestBridgeToDataApiRequest(req);
                         myRes = new ExpressResponseBridgeToDataApiResponse(res, req);
-                        remult = new __1.Remult();
+                        remult = new context_1.Remult();
                         _b = (_a = remult).setDataProvider;
                         return [4 /*yield*/, this.bridge.dataProvider];
                     case 1:
@@ -811,43 +812,43 @@ var JobsInQueueEntity = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     tslib_1.__decorate([
-        __1.Fields.string(),
+        remult3_1.Fields.string(),
         tslib_1.__metadata("design:type", String)
     ], JobsInQueueEntity.prototype, "userId", void 0);
     tslib_1.__decorate([
-        __1.Fields.string(),
+        remult3_1.Fields.string(),
         tslib_1.__metadata("design:type", String)
     ], JobsInQueueEntity.prototype, "url", void 0);
     tslib_1.__decorate([
-        __1.Fields.date(),
+        remult3_1.Fields.date(),
         tslib_1.__metadata("design:type", Date)
     ], JobsInQueueEntity.prototype, "submitTime", void 0);
     tslib_1.__decorate([
-        __1.Fields.date(),
+        remult3_1.Fields.date(),
         tslib_1.__metadata("design:type", Date)
     ], JobsInQueueEntity.prototype, "doneTime", void 0);
     tslib_1.__decorate([
-        __1.Fields.string(),
+        remult3_1.Fields.string(),
         tslib_1.__metadata("design:type", String)
     ], JobsInQueueEntity.prototype, "result", void 0);
     tslib_1.__decorate([
-        __1.Fields.boolean(),
+        remult3_1.Fields.boolean(),
         tslib_1.__metadata("design:type", Boolean)
     ], JobsInQueueEntity.prototype, "done", void 0);
     tslib_1.__decorate([
-        __1.Fields.boolean(),
+        remult3_1.Fields.boolean(),
         tslib_1.__metadata("design:type", Boolean)
     ], JobsInQueueEntity.prototype, "error", void 0);
     tslib_1.__decorate([
-        __1.Fields.number(),
+        remult3_1.Fields.number(),
         tslib_1.__metadata("design:type", Number)
     ], JobsInQueueEntity.prototype, "progress", void 0);
     JobsInQueueEntity = tslib_1.__decorate([
-        __1.Entity(undefined, {
+        remult3_1.Entity(undefined, {
             dbName: 'jobsInQueue'
         })
     ], JobsInQueueEntity);
     return JobsInQueueEntity;
-}(__1.IdEntity));
+}(id_entity_1.IdEntity));
 exports.JobsInQueueEntity = JobsInQueueEntity;
 context_1.allEntities.splice(context_1.allEntities.indexOf(JobsInQueueEntity), 1);

package/src/backend-tests/my-test.backend-spec.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-var __1 = require("../..");
 var remult_knex_1 = require("../../remult-knex");
 var dotenv_1 = require("dotenv");
 var backend_database_test_setup_backend_spec_1 = require("./backend-database-test-setup.backend-spec");
 var entityWithValidations_1 = require("../shared-tests/entityWithValidations");
+var sql_database_1 = require("../data-providers/sql-database");
 dotenv_1.config();
 backend_database_test_setup_backend_spec_1.testPostgresImplementation("sql filter", function (_a) {
     var createEntity = _a.createEntity;
@@ -18,7 +18,7 @@ backend_database_test_setup_backend_spec_1.testPostgresImplementation("sql filte
                     s = _c.sent();
                     _b = expect;
                     return [4 /*yield*/, s.find({
-                            where: __1.SqlDatabase.customFilter(function (build) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+                            where: sql_database_1.SqlDatabase.customFilter(function (build) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
                                 return tslib_1.__generator(this, function (_a) {
                                     build.sql = s.metadata.fields.myId.options.dbName + ' in (1,3)';
                                     return [2 /*return*/];
@@ -45,7 +45,7 @@ backend_database_test_setup_backend_spec_1.testPostgresImplementation("sql filte
                     return [4 /*yield*/, s.find({
                             where: {
                                 $or: [
-                                    __1.SqlDatabase.customFilter(function (build) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+                                    sql_database_1.SqlDatabase.customFilter(function (build) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
                                         return tslib_1.__generator(this, function (_a) {
                                             build.sql = s.metadata.fields.myId.options.dbName + ' in (1,3)';
                                             return [2 /*return*/];

package/src/filter/filter-consumer-bridge-to-sql-request.d.ts

@@ -1,7 +1,7 @@
 import { SqlCommand } from "../sql-command";
 import { Filter, FilterConsumer } from './filter-interfaces';
 import { FieldMetadata } from "../column-interfaces";
-import { EntityMetadata } from "../..";
+import { EntityMetadata } from "../remult3/remult3";
 export declare class FilterConsumerBridgeToSqlRequest implements FilterConsumer {
     private r;
     private nameProvider;

package/src/validators.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Validators = void 0;
 var tslib_1 = require("tslib");
-var __1 = require("..");
+var context_1 = require("./context");
 var Validators = /** @class */ (function () {
     function Validators() {
     }
@@ -45,7 +45,7 @@ var Validators = /** @class */ (function () {
         if (message === void 0) { message = undefined; }
         return tslib_1.__awaiter(void 0, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
-                if (__1.isBackend())
+                if (context_1.isBackend())
                     return [2 /*return*/, Validators.unique(entity, col, message)];
                 return [2 /*return*/];
             });