shelving 1.145.0 → 1.145.2

package/api/Endpoint.js

@@ -42,7 +42,9 @@ export class Endpoint {
         // Validate the payload against this endpoint's payload type.
         const payload = this.payload.validate(unsafePayload);
         // Call the callback with the validated payload to get the result.
-        return getResponse(await callback(payload, request));
+        const result = await callback(payload, request);
+        // Convert the result to a `Response` object.
+        return getResponse(result);
     }
     /** Convert to string, e.g. `GET /user/{id}` */
     toString() {

package/api/util.js

@@ -1,7 +1,7 @@
 import { NotFoundError, RequestError } from "../error/RequestError.js";
-import { isData } from "../util/data.js";
 import { getDictionary } from "../util/dictionary.js";
 import { getRequestContent } from "../util/http.js";
+import { isPlainObject } from "../util/object.js";
 import { matchTemplate } from "../util/template.js";
 import { getURL } from "../util/url.js";
 /**
@@ -44,9 +44,9 @@ async function handleEndpoint(endpoint, callback, params, request) {
     // Extract a data object from the request body and validate it against the endpoint's payload type.
     const content = await getRequestContent(request, handleEndpoints);
     // If content is undefined, it means the request has no body, so params are the only payload.
-    // If the content is a data object merge if with the params.
-    // If the content is not a data object (e.g. string, number, array), set a single `content` property and merge it with the params.
-    const payload = content === undefined ? params : isData(content) ? { ...content, ...params } : { content, ...params };
+    // - If the content is a plain object, merge if with the params.
+    // - If the content is anything else (e.g. string, number, array), set it as a single `content` property.
+    const payload = content === undefined ? params : isPlainObject(content) ? { ...content, ...params } : { content, ...params };
     // Call `endpoint.handle()` with the payload and request.
     return endpoint.handle(callback, payload, request);
 }

package/package.json

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

package/react/index.d.ts

@@ -1,8 +1,9 @@
 export * from "./createCacheContext.js";
 export * from "./createDataContext.js";
-export * from "./useProps.js";
-export * from "./useMap.js";
+export * from "./useInstance.js";
 export * from "./useLazy.js";
+export * from "./useMap.js";
+export * from "./useProps.js";
 export * from "./useReduce.js";
 export * from "./useSequence.js";
 export * from "./useStore.js";

package/react/index.js

@@ -1,8 +1,9 @@
 export * from "./createCacheContext.js";
 export * from "./createDataContext.js";
-export * from "./useProps.js";
-export * from "./useMap.js";
+export * from "./useInstance.js";
 export * from "./useLazy.js";
+export * from "./useMap.js";
+export * from "./useProps.js";
 export * from "./useReduce.js";
 export * from "./useSequence.js";
 export * from "./useStore.js";

package/util/ansi.d.ts

@@ -1,21 +1,12 @@
-export declare const ANSI_TEXT_DEFAULT = "\u001B[39m";
-export declare const ANSI_TEXT_BLACK = "\u001B[30m";
-export declare const ANSI_TEXT_RED = "\u001B[31m";
-export declare const ANSI_TEXT_GREEN = "\u001B[32m";
-export declare const ANSI_TEXT_YELLOW = "\u001B[33m";
-export declare const ANSI_TEXT_BLUE = "\u001B[34m";
-export declare const ANSI_TEXT_MAGENTA = "\u001B[35m";
-export declare const ANSI_TEXT_CYAN = "\u001B[36m";
-export declare const ANSI_TEXT_WHITE = "\u001B[37m";
-export declare const ANSI_FILL_DEFAULT = "\u001B[49m";
-export declare const ANSI_FILL_BLACK = "\u001B[40m";
-export declare const ANSI_FILL_RED = "\u001B[41m";
-export declare const ANSI_FILL_GREEN = "\u001B[42m";
-export declare const ANSI_FILL_YELLOW = "\u001B[43m";
-export declare const ANSI_FILL_BLUE = "\u001B[44m";
-export declare const ANSI_FILL_MAGENTA = "\u001B[45m";
-export declare const ANSI_FILL_CYAN = "\u001B[46m";
-export declare const ANSI_FILL_WHITE = "\u001B[47m";
+export declare const ANSI_DEFAULT = "\u001B[39m";
+export declare const ANSI_BLACK = "\u001B[30m";
+export declare const ANSI_RED = "\u001B[31m";
+export declare const ANSI_GREEN = "\u001B[32m";
+export declare const ANSI_YELLOW = "\u001B[33m";
+export declare const ANSI_BLUE = "\u001B[34m";
+export declare const ANSI_MAGENTA = "\u001B[35m";
+export declare const ANSI_CYAN = "\u001B[36m";
+export declare const ANSI_WHITE = "\u001B[37m";
 export declare const ANSI_BOLD = "\u001B[1m";
 export declare const ANSI_ITALIC = "\u001B[3m";
 export declare const ANSI_UNDERLINE = "\u001B[4m";

package/util/ansi.js

@@ -1,23 +1,13 @@
-// Foreground colors.
-export const ANSI_TEXT_DEFAULT = "\x1b[39m";
-export const ANSI_TEXT_BLACK = "\x1b[30m";
-export const ANSI_TEXT_RED = "\x1b[31m";
-export const ANSI_TEXT_GREEN = "\x1b[32m";
-export const ANSI_TEXT_YELLOW = "\x1b[33m";
-export const ANSI_TEXT_BLUE = "\x1b[34m";
-export const ANSI_TEXT_MAGENTA = "\x1b[35m";
-export const ANSI_TEXT_CYAN = "\x1b[36m";
-export const ANSI_TEXT_WHITE = "\x1b[37m";
-// Background colors.
-export const ANSI_FILL_DEFAULT = "\x1b[49m";
-export const ANSI_FILL_BLACK = "\x1b[40m";
-export const ANSI_FILL_RED = "\x1b[41m";
-export const ANSI_FILL_GREEN = "\x1b[42m";
-export const ANSI_FILL_YELLOW = "\x1b[43m";
-export const ANSI_FILL_BLUE = "\x1b[44m";
-export const ANSI_FILL_MAGENTA = "\x1b[45m";
-export const ANSI_FILL_CYAN = "\x1b[46m";
-export const ANSI_FILL_WHITE = "\x1b[47m";
+// Colors.
+export const ANSI_DEFAULT = "\x1b[39m";
+export const ANSI_BLACK = "\x1b[30m";
+export const ANSI_RED = "\x1b[31m";
+export const ANSI_GREEN = "\x1b[32m";
+export const ANSI_YELLOW = "\x1b[33m";
+export const ANSI_BLUE = "\x1b[34m";
+export const ANSI_MAGENTA = "\x1b[35m";
+export const ANSI_CYAN = "\x1b[36m";
+export const ANSI_WHITE = "\x1b[37m";
 // Styles.
 export const ANSI_BOLD = "\x1b[1m";
 export const ANSI_ITALIC = "\x1b[3m";