Release 0.13.24

caseywebdev · caseywebdev · commit 55d8d32e3917 · 2025-03-07T13:42:17.000-06:00
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pave",
   "type": "module",
-  "version": "0.13.23",
+  "version": "0.13.24",
   "author": "Casey Foster <c@sey.me>",
   "license": "MIT",
   "repository": {
diff --git a/src/execute.js b/src/execute.js
@@ -17,7 +17,7 @@ const { isArray } = Array;
  *   path?: string[];
  *   query: Query;
  *   schema: S;
- *   type: Type<S>;
+ *   type: Type<S, any, any, any, any>;
  *   value?: any;
  * }} options
  */
diff --git a/src/execute.test.js b/src/execute.test.js
@@ -1,5 +1,3 @@
-/** @import {Type} from '#src/index.js' */
-
 import { strict as assert } from 'node:assert';
 
 import { Context } from '#src/context.js';
diff --git a/src/get-query-cost.js b/src/get-query-cost.js
@@ -1,4 +1,4 @@
-/** @import {Query, Schema, SchemaContext, Type} from '#src/index.js'; */
+/** @import {Schema, Query, SchemaContext, Type} from '#src/index.js'; */
 
 import { isObject } from '#src/is-object.js';
 
@@ -11,15 +11,15 @@ const { isArray } = Array;
  *   path?: string[];
  *   query: Query;
  *   schema: S;
- *   type: Type<S>;
+ *   type: Type<S, any, any, any, any>;
  * }} options
  */
 export const getQueryCost = ({ context, path = [], query, schema, type }) => {
   let cost = 0;
   while (true) {
     if (!type) return cost;
 
-    if (isArray(type)) type = /** @type {Type<S>} */ ({ object: type });
+    if (isArray(type)) type = { object: type };
 
     let nextType;
     if (!isObject(type)) nextType = schema[type];
diff --git a/src/index.js b/src/index.js
@@ -15,7 +15,7 @@
  */
 
 /**
- * @template {string} [TypeName=never] Default is `never`
+ * @template {string} [TypeName=''] Default is `''`
  * @template [Context=unknown] Default is `unknown`
  * @template {{ [K: string]: any }} [Extensions={}] Default is `{}`
  * @typedef {{
@@ -53,17 +53,24 @@
  * @typedef {Recursive<
  *   | SchemaTypeName<S>
  *   | ((
- *       | { optional: Type<S> }
- *       | { nullable: Type<S> }
- *       | { arrayOf: Type<S>; minLength?: number; maxLength?: number }
+ *       | { optional: Type<S, any, any, any, any> }
+ *       | { nullable: Type<S, any, any, any, any> }
  *       | {
- *           oneOf: { [K: string]: Type<S> };
+ *           arrayOf: Type<S, any, any, any, any>;
+ *           minLength?: number;
+ *           maxLength?: number;
+ *         }
+ *       | {
+ *           oneOf: { [K: string]: Type<S, any, any, any, any> };
  *           resolveType: (value: {}) => string;
  *         }
- *       | { object: { [K: string]: Type<S> }; defaultType?: Type<S> }
  *       | {
- *           input?: Type<S>;
- *           type?: Type<S>;
+ *           object: { [K: string]: Type<S, any, any, any, any> };
+ *           defaultType?: Type<S, any, any, any, any>;
+ *         }
+ *       | {
+ *           input?: Type<S, any, any, any, any>;
+ *           type?: Type<S, any, any, any, any>;
  *           typeInput?: any;
  *           resolve?:
  *             | ((options: {
@@ -73,7 +80,7 @@
  *                 path: string[];
  *                 query: Query;
  *                 schema: S;
- *                 type: Type<S>;
+ *                 type: Type<S, any, any, any, any>;
  *                 value: Value;
  *               }) => any)
  *             | {}
@@ -90,7 +97,7 @@
  *             path: string[];
  *             query: Query;
  *             schema: S;
- *             type: Type<S>;
+ *             type: Type<S, any, any, any, any>;
  *             value: Value;
  *           }) => number);
  *       defaultValue?: any;
@@ -101,7 +108,7 @@
  *         path: string[];
  *         query: Query;
  *         schema: S;
- *         type: Type<S>;
+ *         type: Type<S, any, any, any, any>;
  *         value: ResolvedValue;
  *       }) => any;
  *     } & SchemaExtensions<S>)
diff --git a/src/validate-query.js b/src/validate-query.js
@@ -1,4 +1,4 @@
-/** @import {Query, Schema, Type} from '#src/index.js'; */
+/** @import {Schema, Query, Type} from '#src/index.js'; */
 
 import { isObject } from '#src/is-object.js';
 import { throwPaveError } from '#src/throw-pave-error.js';
@@ -15,7 +15,7 @@ const skipInput = {};
  *   path?: string[];
  *   query: Query;
  *   schema: S;
- *   type: Type<S>;
+ *   type: Type<S, any, any, any, any>;
  * }} options
  * @returns {Query}
  */
diff --git a/src/validate-value.js b/src/validate-value.js
@@ -1,4 +1,4 @@
-/** @import {Query, Schema, Type} from '#src/index.js'; */
+/** @import {Schema, Query, Type} from '#src/index.js'; */
 
 import { Context } from '#src/context.js';
 import { isObject } from '#src/is-object.js';
@@ -14,7 +14,7 @@ const { isArray } = Array;
  *   path?: string[];
  *   query?: Query;
  *   schema: S;
- *   type: Type<S>;
+ *   type: Type<S, any, any, any, any>;
  *   value?: any;
  * }} options
  */
diff --git a/types/execute.d.ts b/types/execute.d.ts
@@ -4,7 +4,7 @@ export function execute<S extends Schema<any, any, any>>({ context, object, path
     path?: string[];
     query: Query;
     schema: S;
-    type: Type<S>;
+    type: Type<S, any, any, any, any>;
     value?: any;
 }): Promise<any>;
 import type { Schema } from '#types/index.js';
diff --git a/types/get-query-cost.d.ts b/types/get-query-cost.d.ts
@@ -3,7 +3,7 @@ export function getQueryCost<S extends Schema<any, any, any>>({ context, path, q
     path?: string[];
     query: Query;
     schema: S;
-    type: Type<S>;
+    type: Type<S, any, any, any, any>;
 }): any;
 import type { Schema } from '#types/index.js';
 import type { SchemaContext } from '#types/index.js';
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -18,33 +18,33 @@ export type Query<T = any> = {
 };
 export type Recursive<T> = T | RecursiveArray<T>;
 export type RecursiveArray<T> = Recursive<T>[];
-export type Schema<TypeName extends string = never, Context = unknown, Extensions extends {
+export type Schema<TypeName extends string = "", Context = unknown, Extensions extends {
     [K: string]: any;
 } = {}> = { [K in TypeName]: Type<Schema<TypeName, Context, Extensions>, any, any, any, any>; };
 export type SchemaTypeName<S extends Schema<any, any, any>> = S extends Schema<infer TypeName, infer _, infer __> ? TypeName : never;
 export type SchemaContext<S extends Schema<any, any, any>> = S extends Schema<infer _, infer Context, infer __> ? Context : never;
 export type SchemaExtensions<S extends Schema<any, any, any>> = S extends Schema<infer _, infer __, infer Extensions> ? Extensions : never;
-export type Type<S extends Schema<any, any, any> = Schema<never, unknown, {}>, Input = unknown, Object = unknown, Value = unknown, ResolvedValue = {}> = Recursive<SchemaTypeName<S> | (({
-    optional: Type<S>;
+export type Type<S extends Schema<any, any, any> = Schema<"", unknown, {}>, Input = unknown, Object = unknown, Value = unknown, ResolvedValue = {}> = Recursive<SchemaTypeName<S> | (({
+    optional: Type<S, any, any, any, any>;
 } | {
-    nullable: Type<S>;
+    nullable: Type<S, any, any, any, any>;
 } | {
-    arrayOf: Type<S>;
+    arrayOf: Type<S, any, any, any, any>;
     minLength?: number;
     maxLength?: number;
 } | {
     oneOf: {
-        [K: string]: Type<S>;
+        [K: string]: Type<S, any, any, any, any>;
     };
     resolveType: (value: {}) => string;
 } | {
     object: {
-        [K: string]: Type<S>;
+        [K: string]: Type<S, any, any, any, any>;
     };
-    defaultType?: Type<S>;
+    defaultType?: Type<S, any, any, any, any>;
 } | {
-    input?: Type<S>;
-    type?: Type<S>;
+    input?: Type<S, any, any, any, any>;
+    type?: Type<S, any, any, any, any>;
     typeInput?: any;
     resolve?: ((options: {
         context: SchemaContext<S>;
@@ -53,7 +53,7 @@ export type Type<S extends Schema<any, any, any> = Schema<never, unknown, {}>, I
         path: string[];
         query: Query;
         schema: S;
-        type: Type<S>;
+        type: Type<S, any, any, any, any>;
         value: Value;
     }) => any) | {} | null;
 }) & {
@@ -65,7 +65,7 @@ export type Type<S extends Schema<any, any, any> = Schema<never, unknown, {}>, I
         path: string[];
         query: Query;
         schema: S;
-        type: Type<S>;
+        type: Type<S, any, any, any, any>;
         value: Value;
     }) => number);
     defaultValue?: any;
@@ -76,7 +76,7 @@ export type Type<S extends Schema<any, any, any> = Schema<never, unknown, {}>, I
         path: string[];
         query: Query;
         schema: S;
-        type: Type<S>;
+        type: Type<S, any, any, any, any>;
         value: ResolvedValue;
     }) => any;
 } & SchemaExtensions<S>)>;
diff --git a/types/validate-query.d.ts b/types/validate-query.d.ts
@@ -3,7 +3,7 @@ export function validateQuery<S extends Schema<any, any, any>>({ context, path,
     path?: string[];
     query: Query;
     schema: S;
-    type: Type<S>;
+    type: Type<S, any, any, any, any>;
 }): Query;
 import type { Schema } from '#types/index.js';
 import type { Query } from '#types/index.js';
diff --git a/types/validate-value.d.ts b/types/validate-value.d.ts
@@ -4,7 +4,7 @@ export function validateValue<S extends Schema<any, any, any>>({ context, object
     path?: string[];
     query?: Query;
     schema: S;
-    type: Type<S>;
+    type: Type<S, any, any, any, any>;
     value?: any;
 }): any;
 import type { Schema } from '#types/index.js';

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.23",`
	`4`	`+ "version": "0.13.24",`
`5`	`5`	`"author": "Casey Foster <c@sey.me>",`
`6`	`6`	`"license": "MIT",`
`7`	`7`	`"repository": {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-/** @import {Type} from '#src/index.js' */`
`2`		`-`
`3`	`1`	`import { strict as assert } from 'node:assert';`
`4`	`2`
`5`	`3`	`import { Context } from '#src/context.js';`