remult 0.22.11-exp2.0 → 0.22.11

package/esm/remult-mongo.d.ts

@@ -1,4 +1,4 @@
-import type { ClientSession, Db, MongoClient } from 'mongodb';
+import { type ClientSession, type Db, type MongoClient } from 'mongodb';
 import type { DataProvider, EntityDataProvider, EntityFilter, EntityMetadata, Remult } from '.';
 import type { RepositoryOverloads } from './src/remult3/RepositoryImplementation';
 export declare class MongoDataProvider implements DataProvider {

package/esm/remult-mongo.js

@@ -1,3 +1,4 @@
+import { ObjectId, } from 'mongodb';
 import { CompoundIdField, Filter } from '.';
 import { dbNamesOf } from './src/filter/filter-consumer-bridge-to-sql-request';
 import { remult as remultContext } from './src/remult-proxy';
@@ -72,14 +73,14 @@ class MongoEntityDataProvider {
             let val = row[nameProvider.$dbNameOf(col)];
             if (isNull(val))
                 val = null;
-            result[col.key] = col.valueConverter.fromDb(val);
+            result[col.key] = fromDb(col, val);
         }
         return result;
     }
     translateToDb(row, nameProvider) {
         let result = {};
         for (const col of this.entity.fields) {
-            let val = col.valueConverter.toDb(row[col.key]);
+            let val = toDb(col, row[col.key]);
             if (val === null)
                 val = NULL;
             result[nameProvider.$dbNameOf(col)] = val;
@@ -218,7 +219,7 @@ class FilterConsumerBridgeToMongo {
     isIn(col, val) {
         this.result.push(() => ({
             [this.nameProvider.$dbNameOf(col)]: {
-                $in: val.map((x) => col.valueConverter.toDb(x)),
+                $in: val.map((x) => toDb(col, x)),
             },
         }));
     }
@@ -250,7 +251,7 @@ class FilterConsumerBridgeToMongo {
     add(col, val, operator) {
         this.result.push(() => ({
             [this.nameProvider.$dbNameOf(col)]: {
-                [operator]: isNull(val) ? val : col.valueConverter.toDb(val),
+                [operator]: isNull(val) ? val : toDb(col, val),
             },
         }));
     }
@@ -267,3 +268,13 @@ class FilterConsumerBridgeToMongo {
         //   })());
     }
 }
+function toDb(col, val) {
+    if (col.valueConverter.fieldTypeInDb == 'dbid')
+        return val ? new ObjectId(val) : val === null ? null : undefined;
+    return col.valueConverter.toDb(val);
+}
+function fromDb(col, val) {
+    if (col.valueConverter.fieldTypeInDb == 'dbid')
+        return val ? val.toHexString() : val === null ? null : undefined;
+    return col.valueConverter.fromDb(val);
+}

package/esm/server/JsonEntityFileStorage.d.ts

@@ -2,8 +2,8 @@ import type { JsonEntityStorage } from '../index';
 import { JsonDataProvider } from '../index';
 export declare class JsonEntityFileStorage implements JsonEntityStorage {
     private folderPath;
-    getItem(entityDbName: string): Promise<string>;
-    setItem(entityDbName: string, json: string): Promise<void>;
+    getItem(entityDbName: string): string;
+    setItem(entityDbName: string, json: string): void;
     constructor(folderPath: string);
 }
 export declare class JsonFileDataProvider extends JsonDataProvider {

package/esm/server/JsonEntityFileStorage.js

@@ -1,18 +1,16 @@
+import * as fs from 'fs';
+import * as path from 'path';
 import { JsonDataProvider } from '../index';
 export class JsonEntityFileStorage {
     folderPath;
-    async getItem(entityDbName) {
-        const path = await import('path');
-        const fs = await import('fs');
+    getItem(entityDbName) {
         let fn = path.join(this.folderPath, entityDbName) + '.json';
         if (fs.existsSync(fn)) {
             return fs.readFileSync(fn).toString();
         }
         return undefined;
     }
-    async setItem(entityDbName, json) {
-        const path = await import('path');
-        const fs = await import('fs');
+    setItem(entityDbName, json) {
         if (!fs.existsSync(this.folderPath)) {
             fs.mkdirSync(this.folderPath);
         }

package/esm/src/data-providers/json-data-provider.d.ts

@@ -1,8 +1,8 @@
 import type { DataProvider, EntityDataProvider } from '../data-interfaces';
 import type { EntityMetadata } from '../remult3/remult3';
 export interface JsonEntityStorage {
-    getItem(entityDbName: string): Promise<string | null>;
-    setItem(entityDbName: string, json: string): Promise<void>;
+    getItem(entityDbName: string): string | null;
+    setItem(entityDbName: string, json: string): any;
 }
 export declare class JsonDataProvider implements DataProvider {
     private storage;

package/esm/src/data-providers/json-data-provider.js

@@ -21,11 +21,11 @@ class JsonEntityDataProvider {
     async loadEntityData(what) {
         let data = [];
         let dbName = await this.entity.getDbName();
-        let s = await this.helper.getItem(dbName);
+        let s = this.helper.getItem(dbName);
         if (s)
             data = JSON.parse(s);
         let dp = new ArrayEntityDataProvider(this.entity, data);
-        return what(dp, async () => await this.helper.setItem(dbName, JSON.stringify(data, undefined, 2)));
+        return what(dp, () => this.helper.setItem(dbName, JSON.stringify(data, undefined, 2)));
     }
     p = Promise.resolve();
     find(options) {
@@ -35,20 +35,20 @@ class JsonEntityDataProvider {
         return (this.p = this.p.then(() => this.loadEntityData((dp, save) => dp.count(where))));
     }
     update(id, data) {
-        return (this.p = this.p.then(() => this.loadEntityData((dp, save) => dp.update(id, data).then(async (x) => {
-            await save();
+        return (this.p = this.p.then(() => this.loadEntityData((dp, save) => dp.update(id, data).then((x) => {
+            save();
             return x;
         }))));
     }
     delete(id) {
-        return (this.p = this.p.then(() => this.loadEntityData((dp, save) => dp.delete(id).then(async (x) => {
-            await save();
+        return (this.p = this.p.then(() => this.loadEntityData((dp, save) => dp.delete(id).then((x) => {
+            save();
             return x;
         }))));
     }
     async insert(data) {
-        return (this.p = this.p.then(() => this.loadEntityData((dp, save) => dp.insert(data).then(async (x) => {
-            await save();
+        return (this.p = this.p.then(() => this.loadEntityData((dp, save) => dp.insert(data).then((x) => {
+            save();
             return x;
         }))));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.22.11-exp2.0",
+    "version": "0.22.11",
     "description": "A CRUD framework for full-stack TypeScript",
     "types": "index.d.ts",
     "module": "esm/index.js",

package/remult-mongo.d.ts

@@ -1,4 +1,4 @@
-import type { ClientSession, Db, MongoClient } from 'mongodb';
+import { type ClientSession, type Db, type MongoClient } from 'mongodb';
 import type { DataProvider, EntityDataProvider, EntityFilter, EntityMetadata, Remult } from '.';
 import type { RepositoryOverloads } from './src/remult3/RepositoryImplementation';
 export declare class MongoDataProvider implements DataProvider {

package/remult-mongo.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoDataProvider = void 0;
 var tslib_1 = require("tslib");
+var mongodb_1 = require("mongodb");
 var _1 = require(".");
 var filter_consumer_bridge_to_sql_request_1 = require("./src/filter/filter-consumer-bridge-to-sql-request");
 var remult_proxy_1 = require("./src/remult-proxy");
@@ -111,7 +112,7 @@ var MongoEntityDataProvider = /** @class */ (function () {
                 var val = row[nameProvider.$dbNameOf(col)];
                 if (isNull(val))
                     val = null;
-                result[col.key] = col.valueConverter.fromDb(val);
+                result[col.key] = fromDb(col, val);
             }
         }
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
@@ -129,7 +130,7 @@ var MongoEntityDataProvider = /** @class */ (function () {
         try {
             for (var _b = tslib_1.__values(this.entity.fields), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var col = _c.value;
-                var val = col.valueConverter.toDb(row[col.key]);
+                var val = toDb(col, row[col.key]);
                 if (val === null)
                     val = NULL;
                 result[nameProvider.$dbNameOf(col)] = val;
@@ -458,7 +459,7 @@ var FilterConsumerBridgeToMongo = /** @class */ (function () {
             var _a;
             return (_a = {},
                 _a[_this.nameProvider.$dbNameOf(col)] = {
-                    $in: val.map(function (x) { return col.valueConverter.toDb(x); }),
+                    $in: val.map(function (x) { return toDb(col, x); }),
                 },
                 _a);
         });
@@ -494,7 +495,7 @@ var FilterConsumerBridgeToMongo = /** @class */ (function () {
             var _a, _b;
             return (_a = {},
                 _a[_this.nameProvider.$dbNameOf(col)] = (_b = {},
-                    _b[operator] = isNull(val) ? val : col.valueConverter.toDb(val),
+                    _b[operator] = isNull(val) ? val : toDb(col, val),
                     _b),
                 _a);
         });
@@ -513,3 +514,13 @@ var FilterConsumerBridgeToMongo = /** @class */ (function () {
     };
     return FilterConsumerBridgeToMongo;
 }());
+function toDb(col, val) {
+    if (col.valueConverter.fieldTypeInDb == 'dbid')
+        return val ? new mongodb_1.ObjectId(val) : val === null ? null : undefined;
+    return col.valueConverter.toDb(val);
+}
+function fromDb(col, val) {
+    if (col.valueConverter.fieldTypeInDb == 'dbid')
+        return val ? val.toHexString() : val === null ? null : undefined;
+    return col.valueConverter.fromDb(val);
+}

package/server/JsonEntityFileStorage.d.ts

@@ -2,8 +2,8 @@ import type { JsonEntityStorage } from '../index';
 import { JsonDataProvider } from '../index';
 export declare class JsonEntityFileStorage implements JsonEntityStorage {
     private folderPath;
-    getItem(entityDbName: string): Promise<string>;
-    setItem(entityDbName: string, json: string): Promise<void>;
+    getItem(entityDbName: string): string;
+    setItem(entityDbName: string, json: string): void;
     constructor(folderPath: string);
 }
 export declare class JsonFileDataProvider extends JsonDataProvider {

package/server/JsonEntityFileStorage.js

@@ -2,49 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonFileDataProvider = exports.JsonEntityFileStorage = void 0;
 var tslib_1 = require("tslib");
+var fs = tslib_1.__importStar(require("fs"));
+var path = tslib_1.__importStar(require("path"));
 var index_1 = require("../index");
 var JsonEntityFileStorage = /** @class */ (function () {
     function JsonEntityFileStorage(folderPath) {
         this.folderPath = folderPath;
     }
     JsonEntityFileStorage.prototype.getItem = function (entityDbName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var path, fs, fn;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, Promise.resolve().then(function () { return tslib_1.__importStar(require('path')); })];
-                    case 1:
-                        path = _a.sent();
-                        return [4 /*yield*/, Promise.resolve().then(function () { return tslib_1.__importStar(require('fs')); })];
-                    case 2:
-                        fs = _a.sent();
-                        fn = path.join(this.folderPath, entityDbName) + '.json';
-                        if (fs.existsSync(fn)) {
-                            return [2 /*return*/, fs.readFileSync(fn).toString()];
-                        }
-                        return [2 /*return*/, undefined];
-                }
-            });
-        });
+        var fn = path.join(this.folderPath, entityDbName) + '.json';
+        if (fs.existsSync(fn)) {
+            return fs.readFileSync(fn).toString();
+        }
+        return undefined;
     };
     JsonEntityFileStorage.prototype.setItem = function (entityDbName, json) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var path, fs;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, Promise.resolve().then(function () { return tslib_1.__importStar(require('path')); })];
-                    case 1:
-                        path = _a.sent();
-                        return [4 /*yield*/, Promise.resolve().then(function () { return tslib_1.__importStar(require('fs')); })];
-                    case 2:
-                        fs = _a.sent();
-                        if (!fs.existsSync(this.folderPath)) {
-                            fs.mkdirSync(this.folderPath);
-                        }
-                        return [2 /*return*/, fs.writeFileSync(path.join(this.folderPath, entityDbName) + '.json', json)];
-                }
-            });
-        });
+        if (!fs.existsSync(this.folderPath)) {
+            fs.mkdirSync(this.folderPath);
+        }
+        return fs.writeFileSync(path.join(this.folderPath, entityDbName) + '.json', json);
     };
     return JsonEntityFileStorage;
 }());

package/src/data-providers/json-data-provider.d.ts

@@ -1,8 +1,8 @@
 import type { DataProvider, EntityDataProvider } from '../data-interfaces';
 import type { EntityMetadata } from '../remult3/remult3';
 export interface JsonEntityStorage {
-    getItem(entityDbName: string): Promise<string | null>;
-    setItem(entityDbName: string, json: string): Promise<void>;
+    getItem(entityDbName: string): string | null;
+    setItem(entityDbName: string, json: string): any;
 }
 export declare class JsonDataProvider implements DataProvider {
     private storage;

package/src/data-providers/json-data-provider.js

@@ -42,18 +42,13 @@ var JsonEntityDataProvider = /** @class */ (function () {
                         return [4 /*yield*/, this.entity.getDbName()];
                     case 1:
                         dbName = _a.sent();
-                        return [4 /*yield*/, this.helper.getItem(dbName)];
-                    case 2:
-                        s = _a.sent();
+                        s = this.helper.getItem(dbName);
                         if (s)
                             data = JSON.parse(s);
                         dp = new array_entity_data_provider_1.ArrayEntityDataProvider(this.entity, data);
-                        return [2 /*return*/, what(dp, 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*/, this.helper.setItem(dbName, JSON.stringify(data, undefined, 2))];
-                                    case 1: return [2 /*return*/, _a.sent()];
-                                }
-                            }); }); })];
+                        return [2 /*return*/, what(dp, function () {
+                                return _this.helper.setItem(dbName, JSON.stringify(data, undefined, 2));
+                            })];
                 }
             });
         });
@@ -74,16 +69,10 @@ var JsonEntityDataProvider = /** @class */ (function () {
         var _this = this;
         return (this.p = this.p.then(function () {
             return _this.loadEntityData(function (dp, save) {
-                return dp.update(id, data).then(function (x) { 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*/, save()];
-                            case 1:
-                                _a.sent();
-                                return [2 /*return*/, x];
-                        }
-                    });
-                }); });
+                return dp.update(id, data).then(function (x) {
+                    save();
+                    return x;
+                });
             });
         }));
     };
@@ -91,16 +80,10 @@ var JsonEntityDataProvider = /** @class */ (function () {
         var _this = this;
         return (this.p = this.p.then(function () {
             return _this.loadEntityData(function (dp, save) {
-                return dp.delete(id).then(function (x) { 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*/, save()];
-                            case 1:
-                                _a.sent();
-                                return [2 /*return*/, x];
-                        }
-                    });
-                }); });
+                return dp.delete(id).then(function (x) {
+                    save();
+                    return x;
+                });
             });
         }));
     };
@@ -110,16 +93,10 @@ var JsonEntityDataProvider = /** @class */ (function () {
             return tslib_1.__generator(this, function (_a) {
                 return [2 /*return*/, (this.p = this.p.then(function () {
                         return _this.loadEntityData(function (dp, save) {
-                            return dp.insert(data).then(function (x) { 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*/, save()];
-                                        case 1:
-                                            _a.sent();
-                                            return [2 /*return*/, x];
-                                    }
-                                });
-                            }); });
+                            return dp.insert(data).then(function (x) {
+                                save();
+                                return x;
+                            });
                         });
                     }))];
             });