Release 0.13.17

caseywebdev · caseywebdev · commit 80b78c0cb39f · 2025-03-05T10:47:46.000-06:00
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pave",
   "type": "module",
-  "version": "0.13.16",
+  "version": "0.13.17",
   "author": "Casey Foster <c@sey.me>",
   "license": "MIT",
   "repository": {
diff --git a/src/create-client.js b/src/create-client.js
@@ -30,7 +30,7 @@ export const createClient = ({ cache, execute, getKey, transformQuery }) => {
   else if (transformQuery === null) transformQuery = noopTransform;
   /** @type {Set<Watcher>} */
   const watchers = new Set();
-  /** @type {Record<string, never>} */
+  /** @type {{ [K: keyof any]: never }} */
   let currentUpdate;
 
   const client = {
diff --git a/src/execute.js b/src/execute.js
@@ -15,7 +15,7 @@ const { isArray } = Array;
  *   object?: any;
  *   path?: string[];
  *   query: Query;
- *   schema: Schema;
+ *   schema: Schema<string, {}, any>;
  *   type: Type;
  *   value?: any;
  * }} options
@@ -34,7 +34,7 @@ export const execute = async ({
 
   /**
    * @param {Parameters<typeof throwPaveError>[0]} code
-   * @param {Record<string, any>} [extra]
+   * @param {{ [K: string]: any }} [extra]
    */
   const fail = (code, extra) =>
     throwPaveError(code, {
diff --git a/src/get-query-cost.js b/src/get-query-cost.js
@@ -10,7 +10,7 @@ const { isArray } = Array;
  *   context?: Context;
  *   path?: string[];
  *   query: Query;
- *   schema: Schema;
+ *   schema: Schema<string, {}, any>;
  *   type: Type;
  * }} options
  */
diff --git a/src/index.js b/src/index.js
@@ -1,6 +1,6 @@
 /**
  * @template [T=any] Default is `any`
- * @typedef {{ _?: string; $?: any; _type?: Record<keyof any, never> }
+ * @typedef {{ _?: string; $?: any; _type?: { [K in keyof any]: never } }
  *   | { [K: string]: Query<T> }} Query
  */
 
@@ -16,8 +16,7 @@
 
 /**
  * @template {string} [TypeName=never] Default is `never`
- * @template {Record<string, any>} [Extensions=Record<never, never>] Default is
- *   `Record<never, never>`
+ * @template {{ [K: string]: any }} [Extensions={}] Default is `{}`
  * @template [Context=unknown] Default is `unknown`
  * @template [Input=unknown] Default is `unknown`
  * @template [Object=unknown] Default is `unknown`
@@ -53,7 +52,7 @@
  *                 object: Object;
  *                 path: string[];
  *                 query: Query;
- *                 schema: Schema;
+ *                 schema: Schema<TypeName, Extensions, Context>;
  *                 type: Type;
  *                 value: Value;
  *               }) => any)
@@ -70,7 +69,7 @@
  *             object: Object;
  *             path: string[];
  *             query: Query;
- *             schema: Schema;
+ *             schema: Schema<TypeName, Extensions, Context>;
  *             type: Type;
  *             value: Value;
  *           }) => number);
@@ -81,7 +80,7 @@
  *         object: Object;
  *         path: string[];
  *         query: Query;
- *         schema: Schema;
+ *         schema: Schema<TypeName, Extensions, Context>;
  *         type: Type;
  *         value: ResolvedValue;
  *       }) => any;
@@ -91,14 +90,12 @@
  */
 
 /**
- * @template {string} [TypeName=never] Default is `never`
- * @template {Record<string, any>} [Extensions=Record<never, never>] Default is
- *   `Record<never, never>`
- * @template [Context=unknown] Default is `unknown`
- * @typedef {Record<
- *   TypeName,
- *   Type<TypeName, Extensions, Context, any, any, any, any>
- * >} Schema
+ * @template {string} TypeName
+ * @template {{ [K: string]: any }} Extensions
+ * @template Context
+ * @typedef {{
+ *   [K in TypeName]: Type<TypeName, Extensions, Context, any, any, any, any>;
+ * }} Schema
  */
 
 export { Context } from '#src/context.js';
diff --git a/src/validate-query.js b/src/validate-query.js
@@ -13,7 +13,7 @@ const skipInput = {};
  *   context?: any;
  *   path?: string[];
  *   query: Query;
- *   schema: Schema;
+ *   schema: Schema<string, {}, any>;
  *   type: Type;
  * }} options
  * @returns {Query}
diff --git a/src/validate-schema.js b/src/validate-schema.js
@@ -7,7 +7,12 @@ const { Set } = globalThis;
 
 const { isArray } = Array;
 
-/** @param {{ extensions?: { [K: string]: any }; schema: Schema }} options */
+/**
+ * @param {{
+ *   extensions?: { [K: string]: any };
+ *   schema: Schema<string, {}, any>;
+ * }} options
+ */
 export const validateSchema = ({ extensions, schema }) => {
   const positiveNumber = {
     resolve: ({ value }) => {
diff --git a/src/validate-value.js b/src/validate-value.js
@@ -12,7 +12,7 @@ const { isArray } = Array;
  *   object?: any;
  *   path?: string[];
  *   query?: Query;
- *   schema: Schema;
+ *   schema: Schema<string, {}, any>;
  *   type: Type;
  *   value?: any;
  * }} options
diff --git a/types/execute.d.ts b/types/execute.d.ts
@@ -3,7 +3,7 @@ export function execute({ context, object, path, query, schema, type, value }: {
     object?: any;
     path?: string[];
     query: Query;
-    schema: Schema;
+    schema: Schema<string, {}, any>;
     type: Type;
     value?: any;
 }): Promise<any>;
diff --git a/types/get-query-cost.d.ts b/types/get-query-cost.d.ts
@@ -2,7 +2,7 @@ export function getQueryCost<Context = any>({ context, path, query, schema, type
     context?: Context;
     path?: string[];
     query: Query;
-    schema: Schema;
+    schema: Schema<string, {}, any>;
     type: Type;
 }): any;
 import type { Query } from '#src/index.js';
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -12,13 +12,15 @@ export { validateValue } from "#src/validate-value.js";
 export type Query<T = any> = {
     _?: string;
     $?: any;
-    _type?: Record<keyof any, never>;
+    _type?: { [K in keyof any]: never; };
 } | {
     [K: string]: Query<T>;
 };
 export type Recursive<T> = T | RecursiveArray<T>;
 export type RecursiveArray<T> = Recursive<T>[];
-export type Type<TypeName extends string = never, Extensions extends Record<string, any> = Record<never, never>, Context = unknown, Input = unknown, Object = unknown, Value = unknown, ResolvedValue = {}> = Recursive<TypeName | (({
+export type Type<TypeName extends string = never, Extensions extends {
+    [K: string]: any;
+} = {}, Context = unknown, Input = unknown, Object = unknown, Value = unknown, ResolvedValue = {}> = Recursive<TypeName | (({
     optional: Type<TypeName, Extensions, Context>;
 } | {
     nullable: Type<TypeName, Extensions, Context>;
@@ -46,7 +48,7 @@ export type Type<TypeName extends string = never, Extensions extends Record<stri
         object: Object;
         path: string[];
         query: Query;
-        schema: Schema;
+        schema: Schema<TypeName, Extensions, Context>;
         type: Type;
         value: Value;
     }) => any) | {} | null;
@@ -58,7 +60,7 @@ export type Type<TypeName extends string = never, Extensions extends Record<stri
         object: Object;
         path: string[];
         query: Query;
-        schema: Schema;
+        schema: Schema<TypeName, Extensions, Context>;
         type: Type;
         value: Value;
     }) => number);
@@ -69,9 +71,11 @@ export type Type<TypeName extends string = never, Extensions extends Record<stri
         object: Object;
         path: string[];
         query: Query;
-        schema: Schema;
+        schema: Schema<TypeName, Extensions, Context>;
         type: Type;
         value: ResolvedValue;
     }) => any;
 } & Extensions & object)>;
-export type Schema<TypeName extends string = never, Extensions extends Record<string, any> = Record<never, never>, Context = unknown> = Record<TypeName, Type<TypeName, Extensions, Context, any, any, any, any>>;
+export type Schema<TypeName extends string, Extensions extends {
+    [K: string]: any;
+}, Context> = { [K in TypeName]: Type<TypeName, Extensions, Context, any, any, any, any>; };
diff --git a/types/validate-query.d.ts b/types/validate-query.d.ts
@@ -2,7 +2,7 @@ export function validateQuery({ context, path, query, schema, type }: {
     context?: any;
     path?: string[];
     query: Query;
-    schema: Schema;
+    schema: Schema<string, {}, any>;
     type: Type;
 }): Query;
 import type { Query } from '#src/index.js';
diff --git a/types/validate-schema.d.ts b/types/validate-schema.d.ts
@@ -2,6 +2,6 @@ export function validateSchema({ extensions, schema }: {
     extensions?: {
         [K: string]: any;
     };
-    schema: Schema;
+    schema: Schema<string, {}, any>;
 }): any;
 import type { Schema } from '#src/index.js';
diff --git a/types/validate-value.d.ts b/types/validate-value.d.ts
@@ -3,7 +3,7 @@ export function validateValue({ context, object, path, query, schema, type, valu
     object?: any;
     path?: string[];
     query?: Query;
-    schema: Schema;
+    schema: Schema<string, {}, any>;
     type: Type;
     value?: any;
 }): any;

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "pave",`
`3`	`3`	`"type": "module",`
`4`		`- "version": "0.13.16",`
	`4`	`+ "version": "0.13.17",`
`5`	`5`	`"author": "Casey Foster <c@sey.me>",`
`6`	`6`	`"license": "MIT",`
`7`	`7`	`"repository": {`