@livequery/mongoose 2.0.50 → 2.0.51

package/build/src/MongooseDatasource.js

@@ -1,6 +1,5 @@
 import { Cursor } from './Cursor.js';
 import { MongoQuery } from "./MongoQuery.js";
-import mongoose from 'mongoose';
 import { ObjectId } from 'bson';
 import { SmartCache } from './SmartCache.js';
 import { Subject } from 'rxjs/internal/Subject';
@@ -142,10 +141,10 @@ export class MongooseDatasource extends Subject {
         return {
             ...obj,
             ...[...fields].reduce((p, c) => {
-                if (obj[c] && typeof obj[c] == 'string' && mongoose.Types.ObjectId.isValid(obj[c])) {
+                if (obj[c] && typeof obj[c] == 'string' && ObjectId.isValid(obj[c])) {
                     return {
                         ...p,
-                        [c]: new mongoose.Types.ObjectId(obj[c])
+                        [c]: ObjectId.createFromHexString(obj[c])
                     };
                 }
                 return p;
@@ -155,8 +154,8 @@ export class MongooseDatasource extends Subject {
     async normalizeRef(req, schema) {
         const fields = await this.#schemas.get(schema, async () => {
             return new Set(Object.entries(schema.paths).filter(([k, v]) => {
-                return (v.instance == 'Array' ? v.getEmbeddedSchemaType().instance : v.instance) == 'ObjectID';
-            }).map(([k, v]) => k));
+                return (v.instance == 'Array' ? v.getEmbeddedSchemaType().instance : v.instance) == 'ObjectId';
+            }).map(([k]) => k));
         });
         if (fields.size == 0)
             return req;

package/package.json

@@ -6,7 +6,7 @@
     "repository": {
         "url": "git@github.com:livequery/mongoose.git"
     },
-    "version": "2.0.50",
+    "version": "2.0.51",
     "description": "Mongoose datasource mapping for @livequery ecosystem",
     "main": "./build/src/index.js",
     "types": "./build/src/index.d.ts",