@travetto/model-query 5.0.14 → 5.0.15

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 ArcSine Technologies
+Copyright (c) 2020 ArcSine Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model-query",
-  "version": "5.0.14",
+  "version": "5.0.15",
   "description": "Datastore abstraction for advanced query support.",
   "keywords": [
     "datastore",
@@ -26,12 +26,12 @@
     "directory": "module/model-query"
   },
   "dependencies": {
-    "@travetto/di": "^5.0.13",
-    "@travetto/model": "^5.0.14",
-    "@travetto/schema": "^5.0.13"
+    "@travetto/di": "^5.0.14",
+    "@travetto/model": "^5.0.15",
+    "@travetto/schema": "^5.0.14"
   },
   "peerDependencies": {
-    "@travetto/test": "^5.0.15"
+    "@travetto/test": "^5.0.16"
   },
   "peerDependenciesMeta": {
     "@travetto/test": {

package/src/internal/service/query.ts

@@ -31,8 +31,18 @@ export class ModelQueryUtil {
     if (res.length === 1 || res.length > 1 && !failOnMany) {
       return res[0]!;
     }
-    const requestedId = ((where && 'id' in where && typeof where.id === 'string') ? where.id : undefined) ?? 'unknown';
-    throw res.length === 0 ? new NotFoundError(cls, requestedId, { where }) : new AppError(`Invalid number of results for find by id: ${res.length}`, { category: 'data' });
+    const requestedId = ((where && 'id' in where && typeof where.id === 'string') ? where.id : undefined);
+    if (res.length === 0) {
+      if (requestedId) {
+        throw new NotFoundError(cls, requestedId);
+      } else {
+        const err = new NotFoundError(cls, 'unknown');
+        err.message = 'No results found for query';
+        throw err;
+      }
+    } else {
+      throw new AppError(`Invalid number of results: ${res.length}`, { category: 'data' });
+    }
   }
 
   /**

package/support/test/query.ts

@@ -54,13 +54,7 @@ export abstract class ModelQuerySuite extends BaseModelSuite<ModelQuerySupport &
 
     await assert.rejects(() => service.queryOne(Person, { where: { gender: 'm' } }), /Invalid number of results/);
     await assert.rejects(() => service.queryOne(Person, { where: { gender: 'z' } }), NotFoundError);
-    await assert.rejects(() => service.queryOne(Person, { where: { gender: 'z' } }), /unknown/);
-    assert.deepStrictEqual(
-      (await service.queryOne(Person, { where: { gender: 'z' } }).catch(e => e)).details.where,
-      {
-        gender: 'z'
-      }
-    );
+    await assert.rejects(() => service.queryOne(Person, { where: { gender: 'z' } }), /No results found for query/);
     await assert.rejects(() => service.queryOne(Person, { where: { id: 'orange' } }), NotFoundError);
     await assert.rejects(() => service.queryOne(Person, { where: { id: 'orange' } }), /orange/);
   }