remult 0.25.5 → 0.25.6-exp.0

package/esm/remult-knex/index.js

@@ -19,6 +19,7 @@ export class KnexDataProvider {
             throw 'the data provider is not an KnexDataProvider';
         return r.knex;
     }
+    wrapIdentifier = (x) => this.knex.ref(x) + '';
     getEntityDataProvider(entity) {
         if (!supportsJsonLoadingAndSaving(this.knex))
             for (const f of entity.fields.toArray()) {
@@ -64,7 +65,7 @@ export class KnexDataProvider {
     }
     static async filterToRaw(entity, condition) {
         const repo = getRepository(entity);
-        var b = new FilterConsumerBridgeToKnexRequest(await dbNamesOf(repo.metadata));
+        var b = new FilterConsumerBridgeToKnexRequest(await dbNamesOf(repo.metadata, (x) => x));
         b._addWhere = false;
         await (await getRepositoryInternals(repo).translateWhereToFilter(condition)).__applyToConsumer(b);
         let r = await b.resolveWhere();
@@ -150,7 +151,7 @@ class KnexEntityDataProvider {
         });
     }
     async init() {
-        const r = (await dbNamesOf(this.entity));
+        const r = (await dbNamesOf(this.entity, (x) => x));
         return {
             $dbNameOf: (f) => {
                 let fm = f;
@@ -347,7 +348,7 @@ export class KnexSchemaBuilder {
     }
     async ensureSchema(entities) {
         for (const entity of entities) {
-            let e = await dbNamesOf(entity);
+            let e = await dbNamesOf(entity, (x) => x);
             try {
                 if (!entity.options.sqlExpression) {
                     if (e.$entityName.toLowerCase().indexOf('from ') < 0) {
@@ -363,7 +364,7 @@ export class KnexSchemaBuilder {
         }
     }
     async createIfNotExist(entity) {
-        const e = await dbNamesOf(entity);
+        const e = await dbNamesOf(entity, (x) => x);
         if (!(await this.knex.schema.hasTable(e.$entityName))) {
             let cols = new Map();
             for (const f of entity.fields) {
@@ -388,7 +389,7 @@ export class KnexSchemaBuilder {
         }
     }
     async addColumnIfNotExist(entity, c) {
-        let e = await dbNamesOf(entity);
+        let e = await dbNamesOf(entity, (x) => x);
         if (shouldNotCreateField(c(entity), e))
             return;
         let col = c(entity);
@@ -400,7 +401,7 @@ export class KnexSchemaBuilder {
         }
     }
     async verifyAllColumns(entity) {
-        let e = await dbNamesOf(entity);
+        let e = await dbNamesOf(entity, (x) => x);
         try {
             for (const col of entity.fields.toArray()) {
                 if (!shouldNotCreateField(col, e)) {

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

@@ -1,4 +1,5 @@
 import { SqlDatabase } from '../data-providers/sql-database.js';
+import { remult } from '../remult-proxy.js';
 import { getEntityMetadata } from '../remult3/RepositoryImplementation.js';
 import { getRelationFieldInfo } from '../remult3/relationInfoMember.js';
 export class FilterConsumerBridgeToSqlRequest {
@@ -158,8 +159,13 @@ export function shouldNotCreateField(field, dbNames) {
     return (field.isServerExpression ||
         (field.options.sqlExpression && field.dbName != dbNames.$dbNameOf(field)));
 }
-export async function dbNamesOf(repo, wrapIdentifier = (x) => x) {
+export async function dbNamesOf(repo, wrapIdentifier) {
     var meta = getEntityMetadata(repo);
+    if (!wrapIdentifier) {
+        wrapIdentifier = remult.dataProvider.wrapIdentifier;
+    }
+    if (!wrapIdentifier)
+        wrapIdentifier = (x) => x;
     const result = {
         $entityName: await entityDbName(meta, wrapIdentifier),
         toString: () => result.$entityName,
@@ -192,7 +198,15 @@ export async function fieldDbName(f, meta, wrapIdentifier = (x) => x) {
         if (f.options.sqlExpression) {
             let result;
             if (typeof f.options.sqlExpression === 'function') {
-                result = await f.options.sqlExpression(meta);
+                const prev = f.options.sqlExpression;
+                try {
+                    f.options.sqlExpression =
+                        "recursive sqlExpression call for field '" + f.key + "'. ";
+                    result = await prev(meta);
+                }
+                finally {
+                    f.options.sqlExpression = prev;
+                }
             }
             else
                 result = f.options.sqlExpression;

package/esm/src/remult3/remult3.js

@@ -112,6 +112,7 @@ remult.apiClient.url='localhost:3007/api
 //y2 - should enforce integer - currently we probably round / truncate it
 //p1 - adjust react tutorial to esm
 //p1 - write docs on with remult - and usage in init api
+//p1 - document value converter - including field type in the db
 /*y1 - discuss sql stuff:
      https://discord.com/channels/975754286384418847/975754286384418852/1198997156678357043
      https://codesandbox.io/p/devbox/demo-sql-expression-forked-f94p6m?file=%2Fsrc%2Findex.ts%3A21%2C3-21%2C12&workspaceId=c0f7eccf-c151-423b-ac8e-0f0f3e1ad350
@@ -119,3 +120,5 @@ remult.apiClient.url='localhost:3007/api
 
 
 */
+//p1 - make dbNames of have a default wrapIdentifier based on the current data provider
+//p1 - prevent circular in sql expression

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.25.5",
+    "version": "0.25.6-exp.0",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev",
     "repository": {

package/remult-knex/index.d.ts

@@ -4,10 +4,12 @@ import type { FieldMetadata } from '../src/column-interfaces.js';
 import type { DataProvider, EntityDataProvider } from '../src/data-interfaces.js';
 import type { EntityFilter, EntityMetadata } from '../src/remult3/remult3.js';
 import type { RepositoryOverloads } from '../src/remult3/RepositoryImplementation.js';
-export declare class KnexDataProvider implements DataProvider {
+import type { HasWrapIdentifier } from '../src/sql-command.js';
+export declare class KnexDataProvider implements DataProvider, HasWrapIdentifier {
     knex: Knex;
     constructor(knex: Knex);
     static getDb(remult?: Remult): Knex<any, any[]>;
+    wrapIdentifier: (name: string) => string;
     getEntityDataProvider(entity: EntityMetadata<any>): EntityDataProvider;
     transaction(action: (dataProvider: DataProvider) => Promise<void>): Promise<void>;
     static rawFilter(build: CustomKnexFilterBuilderFunction): EntityFilter<any>;

package/remult-knex/index.js

@@ -14,7 +14,9 @@ var repository_internals_js_1 = require("../src/remult3/repository-internals.js"
 var remult_static_js_1 = require("../src/remult-static.js");
 var KnexDataProvider = /** @class */ (function () {
     function KnexDataProvider(knex) {
+        var _this = this;
         this.knex = knex;
+        this.wrapIdentifier = function (x) { return _this.knex.ref(x) + ''; };
     }
     KnexDataProvider.getDb = function (remult) {
         var r = (remult || remult_proxy_js_1.remult).dataProvider;
@@ -106,7 +108,7 @@ var KnexDataProvider = /** @class */ (function () {
                     case 0:
                         repo = (0, RepositoryImplementation_js_1.getRepository)(entity);
                         _a = FilterConsumerBridgeToKnexRequest.bind;
-                        return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(repo.metadata)];
+                        return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(repo.metadata, function (x) { return x; })];
                     case 1:
                         b = new (_a.apply(FilterConsumerBridgeToKnexRequest, [void 0, _b.sent()]))();
                         b._addWhere = false;
@@ -255,7 +257,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(this.entity)];
+                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(this.entity, function (x) { return x; })];
                     case 1:
                         r = (_a.sent());
                         return [2 /*return*/, {
@@ -679,7 +681,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
                     case 1:
                         if (!!entities_1_1.done) return [3 /*break*/, 9];
                         entity = entities_1_1.value;
-                        return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(entity)];
+                        return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(entity, function (x) { return x; })];
                     case 2:
                         e = _b.sent();
                         _b.label = 3;
@@ -725,7 +727,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
             var _this = this;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
-                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(entity)];
+                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(entity, function (x) { return x; })];
                     case 1:
                         e = _d.sent();
                         return [4 /*yield*/, this.knex.schema.hasTable(e.$entityName)];
@@ -786,7 +788,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(entity)];
+                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(entity, function (x) { return x; })];
                     case 1:
                         e = _a.sent();
                         if ((0, filter_consumer_bridge_to_sql_request_js_1.shouldNotCreateField)(c(entity), e))
@@ -813,7 +815,7 @@ var KnexSchemaBuilder = /** @class */ (function () {
             var e_11, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
-                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(entity)];
+                    case 0: return [4 /*yield*/, (0, filter_consumer_bridge_to_sql_request_js_1.dbNamesOf)(entity, function (x) { return x; })];
                     case 1:
                         e = _d.sent();
                         _d.label = 2;

package/src/data-providers/sql-database.d.ts

@@ -1,10 +1,10 @@
 import type { DataProvider, EntityDataProvider } from '../data-interfaces.js';
-import type { SqlCommand, SqlCommandWithParameters, SqlImplementation, SqlResult } from '../sql-command.js';
+import type { HasWrapIdentifier, SqlCommand, SqlCommandWithParameters, SqlImplementation, SqlResult } from '../sql-command.js';
 import type { Remult } from '../context.js';
 import type { CustomSqlFilterBuilderFunction, EntityDbNamesBase } from '../filter/filter-consumer-bridge-to-sql-request.js';
 import type { EntityFilter, EntityMetadata } from '../remult3/remult3.js';
 import type { RepositoryOverloads } from '../remult3/RepositoryImplementation.js';
-export declare class SqlDatabase implements DataProvider {
+export declare class SqlDatabase implements DataProvider, HasWrapIdentifier {
     private sql;
     static getDb(remult?: Remult): SqlDatabase;
     createCommand(): SqlCommand;

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fieldDbName = exports.entityDbName = exports.dbNamesOf = exports.shouldNotCreateField = exports.isDbReadonly = exports.CustomSqlFilterBuilder = exports.FilterConsumerBridgeToSqlRequest = void 0;
 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 FilterConsumerBridgeToSqlRequest = /** @class */ (function () {
@@ -269,7 +270,6 @@ function shouldNotCreateField(field, dbNames) {
 }
 exports.shouldNotCreateField = shouldNotCreateField;
 function dbNamesOf(repo, wrapIdentifier) {
-    if (wrapIdentifier === void 0) { wrapIdentifier = function (x) { return x; }; }
     return tslib_1.__awaiter(this, void 0, void 0, function () {
         var meta, result, _a, _b, field, _c, _d, e_3_1;
         var _e, e_3, _f;
@@ -277,6 +277,11 @@ function dbNamesOf(repo, wrapIdentifier) {
             switch (_g.label) {
                 case 0:
                     meta = (0, RepositoryImplementation_js_1.getEntityMetadata)(repo);
+                    if (!wrapIdentifier) {
+                        wrapIdentifier = remult_proxy_js_1.remult.dataProvider.wrapIdentifier;
+                    }
+                    if (!wrapIdentifier)
+                        wrapIdentifier = function (x) { return x; };
                     _e = {};
                     return [4 /*yield*/, entityDbName(meta, wrapIdentifier)];
                 case 1:
@@ -347,26 +352,36 @@ exports.entityDbName = entityDbName;
 function fieldDbName(f, meta, wrapIdentifier) {
     if (wrapIdentifier === void 0) { wrapIdentifier = function (x) { return x; }; }
     return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var result, rel, field, fInfo;
+        var result, prev, rel, field, fInfo;
         return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    _a.trys.push([0, , 5, 6]);
-                    if (!f.options.sqlExpression) return [3 /*break*/, 4];
+                    _a.trys.push([0, , 8, 9]);
+                    if (!f.options.sqlExpression) return [3 /*break*/, 7];
                     result = void 0;
-                    if (!(typeof f.options.sqlExpression === 'function')) return [3 /*break*/, 2];
-                    return [4 /*yield*/, f.options.sqlExpression(meta)];
+                    if (!(typeof f.options.sqlExpression === 'function')) return [3 /*break*/, 5];
+                    prev = f.options.sqlExpression;
+                    _a.label = 1;
                 case 1:
-                    result = _a.sent();
-                    return [3 /*break*/, 3];
+                    _a.trys.push([1, , 3, 4]);
+                    f.options.sqlExpression =
+                        "recursive sqlExpression call for field '" + f.key + "'. ";
+                    return [4 /*yield*/, prev(meta)];
                 case 2:
-                    result = f.options.sqlExpression;
-                    _a.label = 3;
+                    result = _a.sent();
+                    return [3 /*break*/, 4];
                 case 3:
+                    f.options.sqlExpression = prev;
+                    return [7 /*endfinally*/];
+                case 4: return [3 /*break*/, 6];
+                case 5:
+                    result = f.options.sqlExpression;
+                    _a.label = 6;
+                case 6:
                     if (!result)
                         return [2 /*return*/, f.dbName];
                     return [2 /*return*/, result];
-                case 4:
+                case 7:
                     rel = (0, relationInfoMember_js_1.getRelationFieldInfo)(f);
                     field = (rel === null || rel === void 0 ? void 0 : rel.type) === 'toOne' &&
                         f.options.field;
@@ -376,8 +391,8 @@ function fieldDbName(f, meta, wrapIdentifier) {
                             return [2 /*return*/, fieldDbName(fInfo, meta, wrapIdentifier)];
                     }
                     return [2 /*return*/, wrapIdentifier(f.dbName)];
-                case 5: return [7 /*endfinally*/];
-                case 6: return [2 /*return*/];
+                case 8: return [7 /*endfinally*/];
+                case 9: return [2 /*return*/];
             }
         });
     });

package/src/remult3/remult3.js

@@ -113,6 +113,7 @@ remult.apiClient.url='localhost:3007/api
 //y2 - should enforce integer - currently we probably round / truncate it
 //p1 - adjust react tutorial to esm
 //p1 - write docs on with remult - and usage in init api
+//p1 - document value converter - including field type in the db
 /*y1 - discuss sql stuff:
      https://discord.com/channels/975754286384418847/975754286384418852/1198997156678357043
      https://codesandbox.io/p/devbox/demo-sql-expression-forked-f94p6m?file=%2Fsrc%2Findex.ts%3A21%2C3-21%2C12&workspaceId=c0f7eccf-c151-423b-ac8e-0f0f3e1ad350
@@ -120,3 +121,5 @@ remult.apiClient.url='localhost:3007/api
 
 
 */
+//p1 - make dbNames of have a default wrapIdentifier based on the current data provider
+//p1 - prevent circular in sql expression

package/src/sql-command.d.ts

@@ -1,14 +1,16 @@
 import type { EntityMetadata } from './remult3/remult3.js';
-export interface SqlImplementation {
+export interface SqlImplementation extends HasWrapIdentifier {
     getLimitSqlSyntax(limit: number, offset: number): any;
     createCommand(): SqlCommand;
     transaction(action: (sql: SqlImplementation) => Promise<void>): Promise<void>;
     entityIsUsedForTheFirstTime(entity: EntityMetadata): Promise<void>;
     ensureSchema?(entities: EntityMetadata[]): Promise<void>;
     supportsJsonColumnType?: boolean;
-    wrapIdentifier?(name: string): string;
     afterMutation?: VoidFunction;
 }
+export interface HasWrapIdentifier {
+    wrapIdentifier?(name: string): string;
+}
 export interface SqlCommand extends SqlCommandWithParameters {
     execute(sql: string): Promise<SqlResult>;
 }