remult 0.22.10 → 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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.22.10",
+    "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);
+}