shelving 1.93.0 → 1.93.1

package/error/AssertionError.d.ts

@@ -2,8 +2,11 @@
  * Thrown if the program receives a value it didn't expect.
  *
  * @param message Message that explains why the thing happened.
- * @param ...received One or more additional details that appears in a ` (received X, Y, Z)` part of the message.
+ * @param received The value that made the assertion fail.
+ * @param expected The value that made the assertion fail.
  */
 export declare class AssertionError extends Error {
-    constructor(message?: string, ...received: unknown[]);
+    readonly received: unknown;
+    readonly expected: unknown;
+    constructor(message?: string, ...receivedExpected: readonly [received?: unknown, expected?: unknown]);
 }

package/error/AssertionError.js

@@ -1,13 +1,20 @@
-import { debug } from "../util/debug.js";
+import { debug, indent } from "../util/debug.js";
 /**
  * Thrown if the program receives a value it didn't expect.
  *
  * @param message Message that explains why the thing happened.
- * @param ...received One or more additional details that appears in a ` (received X, Y, Z)` part of the message.
+ * @param received The value that made the assertion fail.
+ * @param expected The value that made the assertion fail.
  */
 export class AssertionError extends Error {
-    constructor(message = "Failed assertion", ...received) {
-        super(received.length ? `${message} (received ${received.map(debug).join(", ")})` : message);
+    constructor(message = "Failed assertion", ...receivedExpected) {
+        super(receivedExpected.length >= 2 //
+            ? `${message}\nReceived:${indent(debug(receivedExpected[0]))}\nExpected:${indent(debug(receivedExpected[0]))}`
+            : receivedExpected.length >= 1
+                ? `${message}\nReceived:${indent(debug(receivedExpected[0]))}`
+                : message);
+        this.received = receivedExpected[0];
+        this.expected = receivedExpected[1];
     }
 }
 AssertionError.prototype.name = "AssertionError";

package/feedback/Feedbacks.js

@@ -1,3 +1,4 @@
+import { indent } from "../util/debug.js";
 import { getProp } from "../util/object.js";
 import { mapDictionary } from "../util/transform.js";
 import { Feedback } from "./Feedback.js";
@@ -8,7 +9,8 @@ export class Feedbacks extends Feedback {
         return mapDictionary(this.feedbacks, getProp, "message");
     }
     constructor(feedbacks, value) {
-        super("Invalid format", value);
+        super(`${Object.entries(feedbacks).map(_mapMessages).join("\n")}`, value);
         this.feedbacks = feedbacks;
     }
 }
+const _mapMessages = ([name, { message }]) => `${name}:${indent(message)}`;

package/package.json

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

package/util/assert.d.ts

@@ -1,5 +1,5 @@
 /** Assert a boolean condition is true. */
-export declare function assert(condition: unknown, ...received: unknown[]): asserts condition;
+export declare function assert(condition: unknown, ...receivedExpected: [received?: unknown, expected?: unknown]): asserts condition;
 /** Assert two values are equal. */
 export declare function assertEqual<T>(left: T | unknown, right: T): asserts left is T;
 /** Assert two values are equal. */

package/util/assert.js

@@ -1,8 +1,8 @@
 import { AssertionError } from "../error/AssertionError.js";
 /** Assert a boolean condition is true. */
-export function assert(condition, ...received) {
+export function assert(condition, ...receivedExpected) {
     if (!condition)
-        throw new AssertionError(`Must assert`, ...received);
+        throw new AssertionError(`Must assert`, ...receivedExpected);
 }
 /** Assert two values are equal. */
 export function assertEqual(left, right) {

package/util/debug.d.ts

@@ -14,3 +14,5 @@ export declare function debugSet(value: ImmutableSet, depth?: number): string;
 export declare function debugMap(value: ImmutableMap, depth?: number): string;
 /** Debug an object. */
 export declare function debugObject(value: object, depth?: number): string;
+/** If a string is multiline, push it onto the next line and prepend a tab to each line.. */
+export declare function indent(str: string): string;

package/util/debug.js

@@ -75,3 +75,8 @@ export function debugObject(value, depth = 1) {
         : "";
     return `${name ? `${name} ` : ""}${entries ? `{\n\t${entries}\n}` : "{}"}`;
 }
+/** If a string is multiline, push it onto the next line and prepend a tab to each line.. */
+export function indent(str) {
+    const lines = str.split("\n");
+    return lines.length > 1 ? `\n${lines.join("\n\t")}` : ` ${str}`;
+}