remult 0.26.9 → 0.26.11-next.0

package/esm/remult-sqlite-core.js

@@ -22,7 +22,7 @@ export class SqliteCoreDataProvider {
                 builder.addSql(await self.getCreateTableSql(entity));
             },
             addColumn: async (entity, field) => {
-                let e = await dbNamesOf(entity);
+                let e = await dbNamesOf(entity, this.wrapIdentifier);
                 let sql = `alter table ${e.$entityName} add column ${self.addColumnSqlSyntax(field, e.$dbNameOf(field))}`;
                 builder.addSql(sql);
             },
@@ -46,7 +46,7 @@ export class SqliteCoreDataProvider {
         }
     }
     async dropTable(entity) {
-        let e = await dbNamesOf(entity);
+        let e = await dbNamesOf(entity, this.wrapIdentifier);
         let sql = 'drop  table if exists ' + e.$entityName;
         if (SqlDatabase.LogToConsole)
             console.info(sql);
@@ -78,7 +78,7 @@ export class SqliteCoreDataProvider {
     supportsJsonColumnType;
     async getCreateTableSql(entity) {
         let result = '';
-        let e = await dbNamesOf(entity);
+        let e = await dbNamesOf(entity, this.wrapIdentifier);
         for (const x of entity.fields) {
             if (!shouldNotCreateField(x, e) || isAutoIncrement(x)) {
                 if (result.length != 0)
@@ -101,6 +101,7 @@ export class SqliteCoreDataProvider {
         return sql;
     }
     wrapIdentifier(name) {
-        return name;
+        //return name
+        return '`' + name + '`';
     }
 }

package/esm/src/remult3/RepositoryImplementation.js

@@ -226,7 +226,7 @@ export class RepositoryImplementation {
                     refs.push(ref);
                     raw.push(await ref.buildDtoForInsert());
                 }
-                return Promise.all((await this._edp.insertMany(raw)).map((item, i) => refs[i].processInsertResponseDto(item)));
+                return promiseAll(await this._edp.insertMany(raw), (item, i) => refs[i].processInsertResponseDto(item));
             }
             else {
                 let r = [];
@@ -354,7 +354,7 @@ export class RepositoryImplementation {
     }
     async save(entity) {
         if (Array.isArray(entity)) {
-            return Promise.all(entity.map((x) => this.save(x)));
+            return promiseAll(entity, (x) => this.save(x));
         }
         else {
             let ref = getEntityRef(entity, false);
@@ -476,7 +476,7 @@ export class RepositoryImplementation {
                 repo._addToCache(r);
             }
         }
-        let result = await Promise.all(rawRows.map(async (r) => await this._mapRawDataToResult(r, loadFields)));
+        let result = await promiseAll(rawRows, async (r) => await this._mapRawDataToResult(r, loadFields));
         for (const col of this.metadata.fields) {
             let rel = getRelationFieldInfo(col);
             let incl = col.options
@@ -972,7 +972,7 @@ class rowHelperBase {
     }
     lookups = new Map();
     async waitLoad() {
-        await Promise.all([...this.lookups.values()].map((x) => x.waitLoad()));
+        await promiseAll([...this.lookups.values()], (x) => x.waitLoad());
     }
     errors;
     __assertValidity() {
@@ -1144,7 +1144,7 @@ class rowHelperBase {
                     }
                 }
         }
-        await Promise.all([...this.fields].map((x) => x.load()));
+        await promiseAll([...this.fields], (x) => x.load());
     }
 }
 export class rowHelperImplementation extends rowHelperBase {
@@ -2398,3 +2398,11 @@ export function getRepository(entity) {
     }
     return entity;
 }
+async function promiseAll(array, mapToPromise) {
+    const result = [];
+    for (let index = 0; index < array.length; index++) {
+        const element = array[index];
+        result.push(await mapToPromise(element, index));
+    }
+    return result;
+}

package/esm/src/remult3/remult3.js

@@ -1,8 +1,16 @@
 export {};
 //y2 - soft-delete-discussion https://discord.com/channels/975754286384418847/1230386433093533698/1230386433093533698
 //y1 - In the esm version of our tutorial - the imports are automatically .ts and not .js in react and not in vue
+/*y1 - The retry on server error is too wide (error 500, basically any server error) 50 retries is annoying
+  - vite doesn't say proxy error, so we can't listen to that to know that we are in dev
+  - Our SSE has it's own separate retry every 500 ms that is also problematic
+  - when using concurrently - on any server error - the terminal is flooded by the error messages
 //y1 - consider id to also support keyof (id:['company','index']) - had problem with | (keyof Partial<entityType>)[] & `entity`
 //y2 - readonly key: keyof MembersOnly<entityType> & string
+//y1 TODO - In the esm version of our tutorial - the imports are automatically .ts and not .js in react and not in vue
+//y1 TODO - consider id to also support keyof (id:['company','index']) - had problem with | (keyof Partial<entityType>)[] & `entity`
+//y1 TODO -  readonly key: keyof MembersOnly<entityType> & string
+
 //y1 - talk about insert / update / delete with relations
 /*
   repo(Order).insert({},{
@@ -25,7 +33,6 @@ export {};
 //p1 - reconsider key typing to be keyof & string
 //p1 - article on displayValue including it's definition for entities that is used in relations
 //p2 -fix remult admin not to load the html into memory until used
-//y2 - JY suggestion of having generate as part of the ensure schema - not sure
 //y2 - currently for string fields we default for 255 in knex (which is their default) why not just use text (varchar max) - and only use exact length when one is provided?
 //p2 - create foreign key constraints in user code - https://codesandbox.io/p/devbox/fk-validator-tdshcs
 //p2 - admin url1 - pocketbase use /_ for the admin //{allowed?:Allowed,url?:string} also checkout the admin* as it should probably be something else and didn't work in hono

package/esm/src/sort.js

@@ -1,4 +1,3 @@
-import { CompoundIdField } from './CompoundIdField.js';
 import { getRelationFieldInfo } from './remult3/relationInfoMember.js';
 /**
  * The `Sort` class is used to describe sorting criteria for queries. It is mainly used internally,
@@ -140,17 +139,12 @@ export class Sort {
             entityMetadata.options.defaultOrderBy)
             orderBy = Sort.translateOrderByToSort(entityMetadata, entityMetadata.options.defaultOrderBy);
         if (!orderBy)
-            orderBy = new Sort({ field: entityMetadata.idMetadata.field });
-        if (entityMetadata.idMetadata.field instanceof CompoundIdField) {
-            for (const field of entityMetadata.idMetadata.field.fields) {
-                if (!orderBy.Segments.find((x) => x.field == field)) {
-                    orderBy.Segments.push({ field: field });
-                }
+            orderBy = new Sort();
+        for (const field of entityMetadata.idMetadata.fields) {
+            if (!orderBy.Segments.find((x) => x.field == field)) {
+                orderBy.Segments.push({ field: field });
             }
         }
-        else if (!orderBy.Segments.find((x) => x.field == entityMetadata.idMetadata.field)) {
-            orderBy.Segments.push({ field: entityMetadata.idMetadata.field });
-        }
         return orderBy;
     }
     /**

package/package.json

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

package/remult-sqlite-core.d.ts

@@ -18,5 +18,5 @@ export declare class SqliteCoreDataProvider implements SqlImplementation, CanBui
     createTableIfNotExist(entity: EntityMetadata<any>): Promise<void>;
     supportsJsonColumnType?: boolean;
     private getCreateTableSql;
-    wrapIdentifier?(name: string): string;
+    wrapIdentifier(name: string): string;
 }

package/remult-sqlite-core.js

@@ -36,7 +36,7 @@ var SqliteCoreDataProvider = /** @class */ (function () {
                 var e, sql;
                 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, this.wrapIdentifier)];
                         case 1:
                             e = _a.sent();
                             sql = "alter table ".concat(e.$entityName, " add column ").concat(self.addColumnSqlSyntax(field, e.$dbNameOf(field)));
@@ -117,7 +117,7 @@ var SqliteCoreDataProvider = /** @class */ (function () {
             var e, sql;
             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, this.wrapIdentifier)];
                     case 1:
                         e = _a.sent();
                         sql = 'drop  table if exists ' + e.$entityName;
@@ -174,7 +174,7 @@ var SqliteCoreDataProvider = /** @class */ (function () {
                 switch (_d.label) {
                     case 0:
                         result = '';
-                        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, this.wrapIdentifier)];
                     case 1:
                         e = _d.sent();
                         try {
@@ -212,7 +212,8 @@ var SqliteCoreDataProvider = /** @class */ (function () {
         });
     };
     SqliteCoreDataProvider.prototype.wrapIdentifier = function (name) {
-        return name;
+        //return name
+        return '`' + name + '`';
     };
     return SqliteCoreDataProvider;
 }());

package/src/remult3/RepositoryImplementation.js

@@ -280,20 +280,20 @@ var RepositoryImplementation = /** @class */ (function () {
     };
     RepositoryImplementation.prototype.insert = function (entity) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var refs_1, raw, entity_1, entity_1_1, item, ref, _a, _b, e_4_1, _c, _d, r, entity_2, entity_2_1, item, _e, _f, e_5_1, ref;
-            var e_4, _g, e_5, _h;
-            return tslib_1.__generator(this, function (_j) {
-                switch (_j.label) {
+            var refs_1, raw, entity_1, entity_1_1, item, ref, _a, _b, e_4_1, _c, r, entity_2, entity_2_1, item, _d, _e, e_5_1, ref;
+            var e_4, _f, e_5, _g;
+            return tslib_1.__generator(this, function (_h) {
+                switch (_h.label) {
                     case 0:
                         if (!Array.isArray(entity)) return [3 /*break*/, 23];
                         if (!this._dataProvider.isProxy) return [3 /*break*/, 13];
                         refs_1 = [];
                         raw = [];
-                        _j.label = 1;
+                        _h.label = 1;
                     case 1:
-                        _j.trys.push([1, 9, 10, 11]);
+                        _h.trys.push([1, 9, 10, 11]);
                         entity_1 = tslib_1.__values(entity), entity_1_1 = entity_1.next();
-                        _j.label = 2;
+                        _h.label = 2;
                     case 2:
                         if (!!entity_1_1.done) return [3 /*break*/, 8];
                         item = entity_1_1.value;
@@ -304,59 +304,59 @@ var RepositoryImplementation = /** @class */ (function () {
                         return [3 /*break*/, 5];
                     case 3: return [4 /*yield*/, this.getEntityRef(this.create(item))];
                     case 4:
-                        ref = (_j.sent());
-                        _j.label = 5;
+                        ref = (_h.sent());
+                        _h.label = 5;
                     case 5:
                         refs_1.push(ref);
                         _b = (_a = raw).push;
                         return [4 /*yield*/, ref.buildDtoForInsert()];
                     case 6:
-                        _b.apply(_a, [_j.sent()]);
-                        _j.label = 7;
+                        _b.apply(_a, [_h.sent()]);
+                        _h.label = 7;
                     case 7:
                         entity_1_1 = entity_1.next();
                         return [3 /*break*/, 2];
                     case 8: return [3 /*break*/, 11];
                     case 9:
-                        e_4_1 = _j.sent();
+                        e_4_1 = _h.sent();
                         e_4 = { error: e_4_1 };
                         return [3 /*break*/, 11];
                     case 10:
                         try {
-                            if (entity_1_1 && !entity_1_1.done && (_g = entity_1.return)) _g.call(entity_1);
+                            if (entity_1_1 && !entity_1_1.done && (_f = entity_1.return)) _f.call(entity_1);
                         }
                         finally { if (e_4) throw e_4.error; }
                         return [7 /*endfinally*/];
                     case 11:
-                        _d = (_c = Promise).all;
+                        _c = promiseAll;
                         return [4 /*yield*/, this._edp.insertMany(raw)];
-                    case 12: return [2 /*return*/, _d.apply(_c, [(_j.sent()).map(function (item, i) { return refs_1[i].processInsertResponseDto(item); })])];
+                    case 12: return [2 /*return*/, _c.apply(void 0, [_h.sent(), function (item, i) { return refs_1[i].processInsertResponseDto(item); }])];
                     case 13:
                         r = [];
-                        _j.label = 14;
+                        _h.label = 14;
                     case 14:
-                        _j.trys.push([14, 19, 20, 21]);
+                        _h.trys.push([14, 19, 20, 21]);
                         entity_2 = tslib_1.__values(entity), entity_2_1 = entity_2.next();
-                        _j.label = 15;
+                        _h.label = 15;
                     case 15:
                         if (!!entity_2_1.done) return [3 /*break*/, 18];
                         item = entity_2_1.value;
-                        _f = (_e = r).push;
+                        _e = (_d = r).push;
                         return [4 /*yield*/, this.insert(item)];
                     case 16:
-                        _f.apply(_e, [_j.sent()]);
-                        _j.label = 17;
+                        _e.apply(_d, [_h.sent()]);
+                        _h.label = 17;
                     case 17:
                         entity_2_1 = entity_2.next();
                         return [3 /*break*/, 15];
                     case 18: return [3 /*break*/, 21];
                     case 19:
-                        e_5_1 = _j.sent();
+                        e_5_1 = _h.sent();
                         e_5 = { error: e_5_1 };
                         return [3 /*break*/, 21];
                     case 20:
                         try {
-                            if (entity_2_1 && !entity_2_1.done && (_h = entity_2.return)) _h.call(entity_2);
+                            if (entity_2_1 && !entity_2_1.done && (_g = entity_2.return)) _g.call(entity_2);
                         }
                         finally { if (e_5) throw e_5.error; }
                         return [7 /*endfinally*/];
@@ -368,9 +368,9 @@ var RepositoryImplementation = /** @class */ (function () {
                         if (!ref.isNew())
                             throw 'Item is not new';
                         return [4 /*yield*/, ref.save()];
-                    case 24: return [2 /*return*/, _j.sent()];
+                    case 24: return [2 /*return*/, _h.sent()];
                     case 25: return [4 /*yield*/, this.getEntityRef(this.create(entity)).save()];
-                    case 26: return [2 /*return*/, _j.sent()];
+                    case 26: return [2 /*return*/, _h.sent()];
                     case 27: return [2 /*return*/];
                 }
             });
@@ -589,7 +589,7 @@ var RepositoryImplementation = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         if (!Array.isArray(entity)) return [3 /*break*/, 1];
-                        return [2 /*return*/, Promise.all(entity.map(function (x) { return _this.save(x); }))];
+                        return [2 /*return*/, promiseAll(entity, function (x) { return _this.save(x); })];
                     case 1:
                         ref = (0, getEntityRef_js_1.getEntityRef)(entity, false);
                         if (!ref) return [3 /*break*/, 3];
@@ -836,12 +836,12 @@ var RepositoryImplementation = /** @class */ (function () {
                         }
                         finally { if (e_10) throw e_10.error; }
                         return [7 /*endfinally*/];
-                    case 8: return [4 /*yield*/, Promise.all(rawRows.map(function (r) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+                    case 8: return [4 /*yield*/, promiseAll(rawRows, function (r) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0: return [4 /*yield*/, this._mapRawDataToResult(r, loadFields)];
                                 case 1: return [2 /*return*/, _a.sent()];
                             }
-                        }); }); }))];
+                        }); }); })];
                     case 9:
                         result = _j.sent();
                         _loop_1 = function (col) {
@@ -1613,7 +1613,7 @@ var rowHelperBase = /** @class */ (function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, Promise.all(tslib_1.__spreadArray([], tslib_1.__read(this.lookups.values()), false).map(function (x) { return x.waitLoad(); }))];
+                    case 0: return [4 /*yield*/, promiseAll(tslib_1.__spreadArray([], tslib_1.__read(this.lookups.values()), false), function (x) { return x.waitLoad(); })];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -1886,7 +1886,7 @@ var rowHelperBase = /** @class */ (function () {
                             }
                             finally { if (e_29) throw e_29.error; }
                         }
-                        return [4 /*yield*/, Promise.all(tslib_1.__spreadArray([], tslib_1.__read(this.fields), false).map(function (x) { return x.load(); }))];
+                        return [4 /*yield*/, promiseAll(tslib_1.__spreadArray([], tslib_1.__read(this.fields), false), function (x) { return x.load(); })];
                     case 1:
                         _d.sent();
                         return [2 /*return*/];
@@ -3853,3 +3853,28 @@ function getRepository(entity) {
     return entity;
 }
 exports.getRepository = getRepository;
+function promiseAll(array, mapToPromise) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var result, index, element, _a, _b;
+        return tslib_1.__generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    result = [];
+                    index = 0;
+                    _c.label = 1;
+                case 1:
+                    if (!(index < array.length)) return [3 /*break*/, 4];
+                    element = array[index];
+                    _b = (_a = result).push;
+                    return [4 /*yield*/, mapToPromise(element, index)];
+                case 2:
+                    _b.apply(_a, [_c.sent()]);
+                    _c.label = 3;
+                case 3:
+                    index++;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/, result];
+            }
+        });
+    });
+}

package/src/remult3/remult3.js

@@ -2,8 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 //y2 - soft-delete-discussion https://discord.com/channels/975754286384418847/1230386433093533698/1230386433093533698
 //y1 - In the esm version of our tutorial - the imports are automatically .ts and not .js in react and not in vue
+/*y1 - The retry on server error is too wide (error 500, basically any server error) 50 retries is annoying
+  - vite doesn't say proxy error, so we can't listen to that to know that we are in dev
+  - Our SSE has it's own separate retry every 500 ms that is also problematic
+  - when using concurrently - on any server error - the terminal is flooded by the error messages
 //y1 - consider id to also support keyof (id:['company','index']) - had problem with | (keyof Partial<entityType>)[] & `entity`
 //y2 - readonly key: keyof MembersOnly<entityType> & string
+//y1 TODO - In the esm version of our tutorial - the imports are automatically .ts and not .js in react and not in vue
+//y1 TODO - consider id to also support keyof (id:['company','index']) - had problem with | (keyof Partial<entityType>)[] & `entity`
+//y1 TODO -  readonly key: keyof MembersOnly<entityType> & string
+
 //y1 - talk about insert / update / delete with relations
 /*
   repo(Order).insert({},{
@@ -26,7 +34,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 //p1 - reconsider key typing to be keyof & string
 //p1 - article on displayValue including it's definition for entities that is used in relations
 //p2 -fix remult admin not to load the html into memory until used
-//y2 - JY suggestion of having generate as part of the ensure schema - not sure
 //y2 - currently for string fields we default for 255 in knex (which is their default) why not just use text (varchar max) - and only use exact length when one is provided?
 //p2 - create foreign key constraints in user code - https://codesandbox.io/p/devbox/fk-validator-tdshcs
 //p2 - admin url1 - pocketbase use /_ for the admin //{allowed?:Allowed,url?:string} also checkout the admin* as it should probably be something else and didn't work in hono

package/src/sort.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Sort = void 0;
 var tslib_1 = require("tslib");
-var CompoundIdField_js_1 = require("./CompoundIdField.js");
 var relationInfoMember_js_1 = require("./remult3/relationInfoMember.js");
 /**
  * The `Sort` class is used to describe sorting criteria for queries. It is mainly used internally,
@@ -169,29 +168,24 @@ var Sort = /** @class */ (function () {
             entityMetadata.options.defaultOrderBy)
             orderBy = Sort.translateOrderByToSort(entityMetadata, entityMetadata.options.defaultOrderBy);
         if (!orderBy)
-            orderBy = new Sort({ field: entityMetadata.idMetadata.field });
-        if (entityMetadata.idMetadata.field instanceof CompoundIdField_js_1.CompoundIdField) {
-            var _loop_2 = function (field) {
-                if (!orderBy.Segments.find(function (x) { return x.field == field; })) {
-                    orderBy.Segments.push({ field: field });
-                }
-            };
-            try {
-                for (var _b = tslib_1.__values(entityMetadata.idMetadata.field.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var field = _c.value;
-                    _loop_2(field);
-                }
+            orderBy = new Sort();
+        var _loop_2 = function (field) {
+            if (!orderBy.Segments.find(function (x) { return x.field == field; })) {
+                orderBy.Segments.push({ field: field });
             }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                }
-                finally { if (e_3) throw e_3.error; }
+        };
+        try {
+            for (var _b = tslib_1.__values(entityMetadata.idMetadata.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var field = _c.value;
+                _loop_2(field);
             }
         }
-        else if (!orderBy.Segments.find(function (x) { return x.field == entityMetadata.idMetadata.field; })) {
-            orderBy.Segments.push({ field: entityMetadata.idMetadata.field });
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_3) throw e_3.error; }
         }
         return orderBy;
     };