gruber 0.9.1 → 0.9.2

package/CHANGELOG.md

@@ -9,6 +9,16 @@ This file documents notable changes to the project
 
 ## next
 
+**fixes**
+
+- `Terminator#waitForSignals` no longer exits the process
+
+**unstable**
+
+- Add `Structure.record`
+
+## 0.9.1
+
 **features**
 
 - Add `Structure.nullable`

package/config/structure.d.ts

@@ -178,6 +178,24 @@ export declare class Structure<T> {
      * ```
      */
     static tuple<const T extends Structure<any>[]>(types: T): Structure<InferObject<T>>;
+    /**
+     * @unstable
+     *
+     * Creates a Structure for objects that map a key to a common type of value
+     *
+     * ```js
+     * Structure.record(Structure.string(), Structure.number())
+     * Structure.record(
+     *   Structure.string(),
+     *   Structure.object({ name: Structure.string() })
+     * )
+     * Structure.record(
+     *   Structure.enum(["name", "address", "emailAddress"]),
+     *   Structure.string()
+     * )
+     * ```
+     */
+    static record<K extends string, V>(keyStruct: Structure<K>, valueStruct: Structure<V>): Structure<Record<K, V>>;
     /**
      * Define a Structure to validate the value is `null`
      *

package/config/structure.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"structure.d.ts","sourceRoot":"","sources":["structure.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"structure.d.ts","sourceRoot":"","sources":["structure.ts"],"names":[],"mappings":"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"}

package/config/structure.js

@@ -411,6 +411,51 @@ export class Structure {
             return output;
         });
     }
+    /**
+     * @unstable
+     *
+     * Creates a Structure for objects that map a key to a common type of value
+     *
+     * ```js
+     * Structure.record(Structure.string(), Structure.number())
+     * Structure.record(
+     *   Structure.string(),
+     *   Structure.object({ name: Structure.string() })
+     * )
+     * Structure.record(
+     *   Structure.enum(["name", "address", "emailAddress"]),
+     *   Structure.string()
+     * )
+     * ```
+     */
+    static record(keyStruct, valueStruct) {
+        const schema = {
+            type: "object",
+        };
+        return new Structure(schema, (value, context) => {
+            if (typeof value !== "object")
+                throw new Error("Not an object");
+            const output = {};
+            const errors = [];
+            for (const entry of Object.entries(value)) {
+                try {
+                    const ctx = _nestContext(context, entry[0]);
+                    output[keyStruct.process(entry[0], ctx)] = valueStruct.process(entry[1], ctx);
+                }
+                catch (error) {
+                    errors.push(error);
+                }
+            }
+            if (errors.length > 0) {
+                throw new Structure.Error("Invalid record", context.path, errors);
+            }
+            for (const key in output) {
+                if (output[key] === undefined)
+                    delete output[key];
+            }
+            return output;
+        });
+    }
     /**
      * Define a Structure to validate the value is `null`
      *

package/config/structure.test.js

@@ -589,6 +589,44 @@ describe("Structure", () => {
 		});
 	});
 
+	describe("record", () => {
+		it("allows matching key-value pairs", () => {
+			const struct = Structure.record(Structure.string(), Structure.number());
+			const value = struct.process({ age: 42 });
+			assertEquals(value, { age: 42 });
+		});
+		it("allows enum keys", () => {
+			const struct = Structure.record(
+				Structure.enum(["name", "pet"]),
+				Structure.string(),
+			);
+			const value = struct.process({ name: "Geoff T" });
+			assertEquals(value, { name: "Geoff T" });
+		});
+		it("blocks invalid keys", () => {
+			const struct = Structure.record(
+				Structure.literal("name"),
+				Structure.string(),
+			);
+
+			assertThrows(
+				() => struct.process({ pet: "Hugo" }),
+				(error) => error instanceof Structure.Error,
+			);
+		});
+		it("blocks invalid values", () => {
+			const struct = Structure.record(
+				Structure.literal("name"),
+				Structure.string(),
+			);
+
+			assertThrows(
+				() => struct.process({ name: 119 }),
+				(error) => error instanceof Structure.Error,
+			);
+		});
+	});
+
 	describe("null", () => {
 		const struct = Structure.null();
 

package/config/structure.ts

@@ -465,6 +465,57 @@ export class Structure<T> {
 		});
 	}
 
+	/**
+	 * @unstable
+	 *
+	 * Creates a Structure for objects that map a key to a common type of value
+	 *
+	 * ```js
+	 * Structure.record(Structure.string(), Structure.number())
+	 * Structure.record(
+	 *   Structure.string(),
+	 *   Structure.object({ name: Structure.string() })
+	 * )
+	 * Structure.record(
+	 *   Structure.enum(["name", "address", "emailAddress"]),
+	 *   Structure.string()
+	 * )
+	 * ```
+	 */
+	static record<K extends string, V>(
+		keyStruct: Structure<K>,
+		valueStruct: Structure<V>,
+	): Structure<Record<K, V>> {
+		const schema = {
+			type: "object",
+		};
+		return new Structure<Record<K, V>>(schema, (value, context) => {
+			if (typeof value !== "object") throw new Error("Not an object");
+
+			const output: any = {};
+			const errors: any[] = [];
+			for (const entry of Object.entries(value as any)) {
+				try {
+					const ctx = _nestContext(context, entry[0]);
+					output[keyStruct.process(entry[0], ctx)] = valueStruct.process(
+						entry[1],
+						ctx,
+					);
+				} catch (error) {
+					errors.push(error as Error);
+				}
+			}
+			if (errors.length > 0) {
+				throw new Structure.Error("Invalid record", context.path, errors);
+			}
+			for (const key in output) {
+				if (output[key] === undefined) delete output[key];
+			}
+
+			return output;
+		});
+	}
+
 	/**
 	 * Define a Structure to validate the value is `null`
 	 *

package/core/terminator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terminator.d.ts","sourceRoot":"","sources":["terminator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,iBAAiB;IACjC,+FAA+F;IAC/F,OAAO,EAAE,MAAM,CAAC;IAEhB,qCAAqC;IACrC,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB,4DAA4D;IAC5D,cAAc,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAErE,oEAAoE;IACpE,WAAW,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;CAC3D;AAED,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,aAAa,CAAC;AAExD,MAAM,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC;AAK7C;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,UAAU;IACtB,KAAK,EAAE,eAAe,CAAa;IACnC,OAAO,EAAE,iBAAiB,CAAC;IAC3B,MAAM,EAAE,YAAY,CAAC;gBAET,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,YAAY;IAK5D;;;;;;;;OAQG;IACH,KAAK,CAAC,KAAK,EAAE,gBAAgB;IAM7B;;;;;;;;;;OAUG;IACG,SAAS,CAAC,KAAK,EAAE,gBAAgB;IAevC;;;;;;;;;OASG;IACH,WAAW,IAAI,QAAQ;IAOvB;;;;;;;;;;;;;OAaG;IACG,cAAc;CAGpB"}
+{"version":3,"file":"terminator.d.ts","sourceRoot":"","sources":["terminator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,iBAAiB;IACjC,+FAA+F;IAC/F,OAAO,EAAE,MAAM,CAAC;IAEhB,qCAAqC;IACrC,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB,4DAA4D;IAC5D,cAAc,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAErE,oEAAoE;IACpE,WAAW,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,IAAI,CAAC;CAC3D;AAED,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,aAAa,CAAC;AAExD,MAAM,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC;AAK7C;;;;;;;;;;;;;;;GAeG;AACH,qBAAa,UAAU;IACtB,KAAK,EAAE,eAAe,CAAa;IACnC,OAAO,EAAE,iBAAiB,CAAC;IAC3B,MAAM,EAAE,YAAY,CAAC;gBAET,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,YAAY;IAK5D;;;;;;;;OAQG;IACH,KAAK,CAAC,KAAK,EAAE,gBAAgB;IAM7B;;;;;;;;;;OAUG;IACG,SAAS,CAAC,KAAK,EAAE,gBAAgB;IAevC;;;;;;;;;OASG;IACH,WAAW,IAAI,QAAQ;IAOvB;;;;;;;;;;;;;OAaG;IACG,cAAc;CAWpB"}

package/core/terminator.js

@@ -93,6 +93,12 @@ export class Terminator {
      * ```
      */
     async waitForSignals() {
-        await new Promise((resolve) => this.start(resolve));
+        await new Promise((resolve) => {
+            this.options.startListeners(this.options.signals, () => resolve());
+        });
+        this.state = "terminating";
+        await new Promise((resolve) => {
+            this.timers.setTimeout(resolve, this.options.timeout);
+        });
     }
 }

package/core/terminator.ts

@@ -135,6 +135,14 @@ export class Terminator {
 	 * ```
 	 */
 	async waitForSignals() {
-		await new Promise<void>((resolve) => this.start(resolve));
+		await new Promise<void>((resolve) => {
+			this.options.startListeners(this.options.signals, () => resolve());
+		});
+
+		this.state = "terminating";
+
+		await new Promise<void>((resolve) => {
+			this.timers.setTimeout(resolve, this.options.timeout);
+		});
 	}
 }

package/package.json

@@ -20,5 +20,5 @@
       "import": "./*.js"
     }
   },
-  "version": "0.9.1"
+  "version": "0.9.2"
 }