@orion-js/mongodb 3.3.7 → 3.3.9

package/lib/createCollection/generateId.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const helpers_1 = require("@orion-js/helpers");
 const bson_1 = require("bson");
 const getIdGenerator = (options) => {
-    if (options.idGeneration === 'random') {
-        const prefix = options.idPrefix || '';
-        const random = (0, helpers_1.generateId)();
-        return () => `${prefix}${random}`;
+    if (options.idPrefix || options.idGeneration === 'random') {
+        return () => {
+            const prefix = options.idPrefix || '';
+            const random = (0, helpers_1.generateId)();
+            return `${prefix}${random}`;
+        };
     }
     return () => {
         const id = new bson_1.ObjectID();

package/lib/createCollection/generateId.test.js

@@ -55,3 +55,30 @@ it('generates a ids with a prefix', async () => {
     await Tests.updateOne({ _id: 'pref_123' }, { $set: { name: 'Nicolás' } });
     expect(userId).toMatch(/^pref_/);
 });
+it('generates a ids with a distinct type', async () => {
+    let Schema = class Schema {
+    };
+    __decorate([
+        (0, typed_model_1.Prop)(),
+        __metadata("design:type", String)
+    ], Schema.prototype, "_id", void 0);
+    __decorate([
+        (0, typed_model_1.Prop)(),
+        __metadata("design:type", String)
+    ], Schema.prototype, "name", void 0);
+    Schema = __decorate([
+        (0, typed_model_1.TypedSchema)()
+    ], Schema);
+    const Tests = (0, index_1.default)({
+        name: (0, helpers_1.generateId)(),
+        schema: Schema
+    });
+    const userId = await Tests.insertOne({
+        name: 'Nico'
+    });
+    await Tests.findOne(userId);
+    // This should throw an error
+    // await Tests.findOne(anId)
+    const anId = '123';
+    await Tests.findOne(anId);
+});

package/lib/types/index.d.ts

@@ -111,7 +111,7 @@ export interface CreateCollectionOptions<ModelClass extends ModelClassBase = Mod
      */
     idGeneration?: 'mongo' | 'random';
     /**
-     * ID prefix. Only used if idGeneration is random. Recommended for type checking
+     * ID prefix. idGeneration will be forced to random. Recommended for type checking
      */
     idPrefix?: ModelClass['_id'];
 }
@@ -166,4 +166,7 @@ export interface Collection<ModelClass extends ModelClassBase = ModelClassBase>
     createIndexesPromise: Promise<string[]>;
     connectionPromise: Promise<MongoDB.MongoClient>;
 }
+export declare type DistinctDocumentId<DistinctId extends string> = string & {
+    __TYPE__: `DistinctDocumentId<${DistinctId}>`;
+};
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/mongodb",
-  "version": "3.3.7",
+  "version": "3.3.9",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -20,11 +20,11 @@
     "@orion-js/env": "^3.3.6",
     "@orion-js/helpers": "^3.3.6",
     "@orion-js/logger": "^3.3.6",
-    "@orion-js/models": "^3.3.6",
-    "@orion-js/resolvers": "^3.3.6",
-    "@orion-js/schema": "^3.3.6",
+    "@orion-js/models": "^3.3.9",
+    "@orion-js/resolvers": "^3.3.9",
+    "@orion-js/schema": "^3.3.9",
     "@orion-js/services": "^3.3.6",
-    "@orion-js/typed-model": "^3.3.6",
+    "@orion-js/typed-model": "^3.3.9",
     "dataloader": "2.1.0",
     "dot-object": "2.1.4",
     "mongodb": "4.5.0"
@@ -41,5 +41,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "96be819f20c79ca01714dfc0c33a7dd38b78915e"
+  "gitHead": "c9591d61fe15eb98c6b6d5c3773afab11c412e42"
 }