shelving 1.116.1 → 1.116.2

package/db/ConvenienceProvider.js

@@ -1,16 +1,23 @@
 import { getItemAdd, getItemDelete, getItemSet, getItemUpdate, getQueryDelete, getQuerySet, getQueryUpdate, writeAsyncProviderChange, writeAsyncProviderChanges, writeProviderChange, writeProviderChanges } from "../change/Change.js";
-import { getFirstItem, getOptionalFirstItem } from "../util/array.js";
-import { getRequired } from "../util/optional.js";
+import { RequiredError } from "../error/RequiredError.js";
+import { getOptionalFirstItem } from "../util/array.js";
+import {} from "../util/optional.js";
 import { AsyncThroughProvider, ThroughProvider } from "./ThroughProvider.js";
 export class ConvenienceProvider extends ThroughProvider {
     requireItem(collection, id) {
-        return getRequired(this.getItem(collection, id));
+        const item = this.getItem(collection, id);
+        if (!item)
+            throw new RequiredError(`Item must exist in "${collection}"`, id);
+        return item;
     }
     getFirst(collection, query) {
         return getOptionalFirstItem(this.getQuery(collection, { ...query, $limit: 1 }));
     }
     requireFirst(collection, query) {
-        return getFirstItem(this.getQuery(collection, { ...query, $limit: 1 }));
+        const first = this.getFirst(collection, query);
+        if (!first)
+            throw new RequiredError(`First item must exist in "${collection}"`, query);
+        return first;
     }
     getItemAdd(collection, data) {
         return getItemAdd(this, collection, data);
@@ -42,13 +49,19 @@ export class ConvenienceProvider extends ThroughProvider {
 }
 export class AsyncConvenienceProvider extends AsyncThroughProvider {
     async requireItem(collection, id) {
-        return getRequired(await this.getItem(collection, id));
+        const item = await this.getItem(collection, id);
+        if (!item)
+            throw new RequiredError(`Item must exist in "${collection}"`, id);
+        return item;
     }
     async getFirst(collection, query) {
         return getOptionalFirstItem(await this.getQuery(collection, { ...query, $limit: 1 }));
     }
     async requireFirst(collection, query) {
-        return getFirstItem(await this.getQuery(collection, { ...query, $limit: 1 }));
+        const first = await this.getFirst(collection, query);
+        if (!first)
+            throw new RequiredError(`First item must exist in "${collection}"`, query);
+        return first;
     }
     getItemAdd(collection, data) {
         return getItemAdd(this, collection, data);

package/package.json

@@ -11,7 +11,7 @@
 		"state-management",
 		"query-builder"
 	],
-	"version": "1.116.1",
+	"version": "1.116.2",
 	"repository": "https://github.com/dhoulb/shelving",
 	"author": "Dave Houlbrooke <dave@shax.com>",
 	"license": "0BSD",

package/store/PathStore.js

@@ -7,11 +7,11 @@ export class PathStore extends Store {
     }
     /** Based on the current store path, is a path active? */
     isActive(path) {
-        return isPathActive(path, this.value);
+        return isPathActive(this.value, path);
     }
     /** Based on the current store path, is a path proud (i.e. a child of the current store path)? */
     isProud(path) {
-        return isPathProud(path, this.value);
+        return isPathProud(this.value, path);
     }
     /** Get an absolute path from a path relative to the current store path. */
     getPath(path) {