@travetto/model-mongo 8.0.0-alpha.13 → 8.0.0-alpha.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-mongo",
-  "version": "8.0.0-alpha.13",
+  "version": "8.0.0-alpha.15",
   "type": "module",
   "description": "Mongo backing for the travetto model module.",
   "keywords": [
@@ -26,14 +26,14 @@
     "directory": "module/model-mongo"
   },
   "dependencies": {
-    "@travetto/config": "^8.0.0-alpha.12",
-    "@travetto/model": "^8.0.0-alpha.12",
-    "@travetto/model-indexed": "^8.0.0-alpha.13",
-    "@travetto/model-query": "^8.0.0-alpha.12",
+    "@travetto/config": "^8.0.0-alpha.13",
+    "@travetto/model": "^8.0.0-alpha.13",
+    "@travetto/model-indexed": "^8.0.0-alpha.15",
+    "@travetto/model-query": "^8.0.0-alpha.14",
     "mongodb": "^7.1.1"
   },
   "peerDependencies": {
-    "@travetto/cli": "^8.0.0-alpha.17"
+    "@travetto/cli": "^8.0.0-alpha.18"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/internal/util.ts

@@ -190,7 +190,7 @@ export class MongoUtil {
         (acc, field) => ({ ...acc, ...flattenKeys(castTo(field)) }),
         castTo<Record<string, -1 | 0 | 1>>({}));
 
-      return [out, { name, unique: idx.type === 'query:unique', }];
+      return [out, { name, unique: !!idx.unique }];
     } else if (isModelIndexedIndex(idx)) {
       const filter = Object.fromEntries([
         ...idx.keyTemplate.map(({ path }) => [path.join('.'), 1]),

package/src/service.ts

@@ -4,6 +4,7 @@ import {
   type ObjectId, type RootFilterOperators, type Filter,
   type WithId as MongoWithId,
   type FindCursor,
+  MongoServerError,
 } from 'mongodb';
 
 import {
@@ -38,6 +39,9 @@ type BlobRaw = GridFSFile & { metadata?: BinaryMetadata };
 
 type MongoTextSearch = RootFilterOperators<unknown>['$text'];
 
+const isDuplicateKeyError = (error: unknown): boolean =>
+  error instanceof MongoServerError && error.message.includes('duplicate key error');
+
 export const ModelBlobNamespace = '__blobs';
 
 /**
@@ -249,11 +253,15 @@ export class MongoModelService implements
     const id = this.preUpdate(cleaned);
 
     const store = await this.getStore(cls);
-    const result = await store.insertOne(castTo(cleaned));
-    if (!result.insertedId) {
-      throw new ExistsError(cls, id);
+    try {
+      const result = await store.insertOne(castTo(cleaned));
+      if (!result.insertedId) {
+        throw new ExistsError(cls, id);
+      }
+      return this.postUpdate(cleaned, id);
+    } catch (error) {
+      throw isDuplicateKeyError(error) ? new ExistsError(cls, id) : error;
     }
-    return this.postUpdate(cleaned, id);
   }
 
   async update<T extends ModelType>(cls: Class<T>, item: T): Promise<T> {
@@ -279,11 +287,7 @@ export class MongoModelService implements
         { upsert: true }
       );
     } catch (error) {
-      if (error instanceof Error && error.message.includes('duplicate key error')) {
-        throw new ExistsError(cls, id);
-      } else {
-        throw error;
-      }
+      throw isDuplicateKeyError(error) ? new ExistsError(cls, id) : error;
     }
     return this.postUpdate(cleaned, id);
   }