remult 2.7.34 → 3.0.0-next.2

package/src/filter/filter-consumer-bridge-to-sql-request.js

@@ -6,13 +6,12 @@ exports.shouldNotCreateField = shouldNotCreateField;
 exports.shouldCreateEntity = shouldCreateEntity;
 exports.dbNamesOf = dbNamesOf;
 exports.dbNamesOfWithForceSqlExpression = dbNamesOfWithForceSqlExpression;
-exports.entityDbName = entityDbName;
-exports.fieldDbName = fieldDbName;
 var tslib_1 = require("tslib");
 var sql_database_js_1 = require("../data-providers/sql-database.js");
 var remult_proxy_js_1 = require("../remult-proxy.js");
 var RepositoryImplementation_js_1 = require("../remult3/RepositoryImplementation.js");
-var relationInfoMember_js_1 = require("../remult3/relationInfoMember.js");
+var entityDbName_js_1 = require("./entityDbName.js");
+var fieldDbName_js_1 = require("./fieldDbName.js");
 var FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
     function FilterConsumerBridgeToSqlRequest(r, nameProvider) {
         this.r = r;
@@ -379,7 +378,7 @@ function internalDbNamesOf(repo_1, wrapIdentifierOrOptions_1) {
                     if (!options.wrapIdentifier)
                         options.wrapIdentifier = function (x) { return x; };
                     _c = {};
-                    return [4 /*yield*/, entityDbName(meta, options.wrapIdentifier)];
+                    return [4 /*yield*/, (0, entityDbName_js_1.entityDbName)(meta, options.wrapIdentifier)];
                 case 1:
                     result = (_c.$entityName = _e.sent(),
                         _c.toString = function () { return result.$entityName; },
@@ -401,7 +400,7 @@ function internalDbNamesOf(repo_1, wrapIdentifierOrOptions_1) {
                 case 3:
                     if (!!_b.done) return [3 /*break*/, 6];
                     field = _b.value;
-                    return [4 /*yield*/, fieldDbName(field, meta, options.wrapIdentifier, forceSqlExpression)];
+                    return [4 /*yield*/, (0, fieldDbName_js_1.fieldDbName)(field, meta, options.wrapIdentifier, forceSqlExpression)];
                 case 4:
                     r = _e.sent();
                     if (!field.options.sqlExpression)
@@ -432,84 +431,3 @@ function internalDbNamesOf(repo_1, wrapIdentifierOrOptions_1) {
         });
     });
 }
-function entityDbName(metadata_1) {
-    return tslib_1.__awaiter(this, arguments, void 0, function (metadata, wrapIdentifier) {
-        var prev;
-        if (wrapIdentifier === void 0) { wrapIdentifier = function (x) { return x; }; }
-        return tslib_1.__generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (!metadata.options.sqlExpression) return [3 /*break*/, 5];
-                    if (!(typeof metadata.options.sqlExpression === 'string')) return [3 /*break*/, 1];
-                    return [2 /*return*/, metadata.options.sqlExpression];
-                case 1:
-                    if (!(typeof metadata.options.sqlExpression === 'function')) return [3 /*break*/, 5];
-                    prev = metadata.options.sqlExpression;
-                    _a.label = 2;
-                case 2:
-                    _a.trys.push([2, , 4, 5]);
-                    metadata.options.sqlExpression =
-                        "recursive sqlExpression call for entity '" + metadata.key + "'. ";
-                    return [4 /*yield*/, prev(metadata)];
-                case 3: return [2 /*return*/, _a.sent()];
-                case 4:
-                    metadata.options.sqlExpression = prev;
-                    return [7 /*endfinally*/];
-                case 5: return [2 /*return*/, wrapIdentifier(metadata.dbName)];
-            }
-        });
-    });
-}
-var sqlExpressionInProgressKey = Symbol.for("sqlExpressionInProgressKey");
-function fieldDbName(f_1, meta_1) {
-    return tslib_1.__awaiter(this, arguments, void 0, function (f, meta, wrapIdentifier, forceSqlExpression) {
-        var result_1, rel, field, fInfo;
-        if (wrapIdentifier === void 0) { wrapIdentifier = function (x) { return x; }; }
-        if (forceSqlExpression === void 0) { forceSqlExpression = false; }
-        return tslib_1.__generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    _a.trys.push([0, , 8, 9]);
-                    if (!f.options.sqlExpression) return [3 /*break*/, 7];
-                    if (!(typeof f.options.sqlExpression === 'function')) return [3 /*break*/, 5];
-                    if (f[sqlExpressionInProgressKey] && !forceSqlExpression) {
-                        return [2 /*return*/, "recursive sqlExpression call for field '" + f.key + "'. \0"];
-                    }
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, , 3, 4]);
-                    ;
-                    f[sqlExpressionInProgressKey] = true;
-                    return [4 /*yield*/, f.options.sqlExpression(meta)];
-                case 2:
-                    result_1 = _a.sent();
-                    if (!result_1.includes('\0'))
-                        f.options.sqlExpression = function () { return result_1; };
-                    return [3 /*break*/, 4];
-                case 3:
-                    delete f[sqlExpressionInProgressKey];
-                    return [7 /*endfinally*/];
-                case 4: return [3 /*break*/, 6];
-                case 5:
-                    result_1 = f.options.sqlExpression;
-                    _a.label = 6;
-                case 6:
-                    if (!result_1)
-                        return [2 /*return*/, f.dbName];
-                    return [2 /*return*/, result_1];
-                case 7:
-                    rel = (0, relationInfoMember_js_1.getRelationFieldInfo)(f);
-                    field = (rel === null || rel === void 0 ? void 0 : rel.type) === 'toOne' &&
-                        f.options.field;
-                    if (field) {
-                        fInfo = meta.fields.find(field);
-                        if (fInfo)
-                            return [2 /*return*/, fieldDbName(fInfo, meta, wrapIdentifier, forceSqlExpression)];
-                    }
-                    return [2 /*return*/, wrapIdentifier(f.dbName)];
-                case 8: return [7 /*endfinally*/];
-                case 9: return [2 /*return*/];
-            }
-        });
-    });
-}

package/src/remult3/RepositoryImplementation.js

@@ -30,7 +30,8 @@ var __updateEntityBasedOnWhere_js_1 = require("./__updateEntityBasedOnWhere.js")
 var relationInfoMember_js_1 = require("./relationInfoMember.js");
 var relation_loader_js_1 = require("./relation-loader.js");
 var repository_internals_js_1 = require("./repository-internals.js");
-var filter_consumer_bridge_to_sql_request_js_1 = require("../filter/filter-consumer-bridge-to-sql-request.js");
+var entityDbName_js_1 = require("../filter/entityDbName.js");
+var fieldDbName_js_1 = require("../filter/fieldDbName.js");
 var remult_static_js_1 = require("../remult-static.js");
 var validators_js_1 = require("../validators.js");
 var addValidator_js_1 = require("./addValidator.js");
@@ -3433,7 +3434,7 @@ var columnDefsImpl = /** @class */ (function () {
     columnDefsImpl.prototype.getDbName = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, (0, filter_consumer_bridge_to_sql_request_js_1.fieldDbName)(this, this.entityDefs)];
+                return [2 /*return*/, (0, fieldDbName_js_1.fieldDbName)(this, this.entityDefs)];
             });
         });
     };
@@ -3624,7 +3625,7 @@ var EntityFullInfo = /** @class */ (function () {
         return this.remult.repo(this.entityType).getEntityRef(tslib_1.__assign({}, item));
     };
     EntityFullInfo.prototype.getDbName = function () {
-        return (0, filter_consumer_bridge_to_sql_request_js_1.entityDbName)(this);
+        return (0, entityDbName_js_1.entityDbName)(this);
     };
     return EntityFullInfo;
 }());

package/src/validators.js

@@ -8,7 +8,7 @@ exports.createValueValidatorWithArgs = createValueValidatorWithArgs;
 exports.createValidatorWithArgs = createValidatorWithArgs;
 exports.getEnumValues = getEnumValues;
 var tslib_1 = require("tslib");
-var internals_js_1 = require("../internals.js");
+var relationInfoMember_js_1 = require("../src/remult3/relationInfoMember.js");
 /**
  * Class containing various field validators.
  */
@@ -24,7 +24,7 @@ var Validators = /** @class */ (function () {
         return tslib_1.__generator(_a, function (_b) {
             return [2 /*return*/, !e.valueIsNull() &&
                     e.value !== '' &&
-                    (e.value !== undefined || (0, internals_js_1.getRelationFieldInfo)(e.metadata) !== undefined)];
+                    (e.value !== undefined || (0, relationInfoMember_js_1.getRelationFieldInfo)(e.metadata) !== undefined)];
         });
     }); }, 'Should not be empty');
     /**