ts-procedures 8.6.0 → 9.1.0

package/build/schema/adapter.test.js

@@ -0,0 +1,53 @@
+import { describe, expect, test } from 'vitest';
+import { Type } from 'typebox';
+import { extractJsonSchema } from './adapter.js';
+import { typeboxAdapter } from './typebox.js';
+describe('extractJsonSchema()', () => {
+    const typebox = Type.Object({ name: Type.String() });
+    test('it extracts TypeBox json-schema', () => {
+        expect(extractJsonSchema(typebox, [typeboxAdapter])).toMatchObject({
+            type: 'object',
+            properties: { name: { type: 'string' } },
+            required: ['name'],
+        });
+    });
+    test('it returns undefined when no adapter recognizes the value', () => {
+        expect(extractJsonSchema({ type: 'object' }, [typeboxAdapter])).toBeUndefined();
+        expect(extractJsonSchema('string value', [typeboxAdapter])).toBeUndefined();
+        expect(extractJsonSchema(null, [typeboxAdapter])).toBeUndefined();
+        expect(extractJsonSchema(undefined, [typeboxAdapter])).toBeUndefined();
+    });
+    test('it returns undefined when the adapter list is empty', () => {
+        expect(extractJsonSchema(typebox, [])).toBeUndefined();
+    });
+    test('it runs the adapter chain in order — first match wins', () => {
+        const everything = {
+            name: 'everything',
+            detect: () => true,
+            toJsonSchema: () => ({ type: 'string' }),
+        };
+        // typeboxAdapter first: TypeBox schema goes through identity conversion
+        expect(extractJsonSchema(typebox, [typeboxAdapter, everything])).toBe(typebox);
+        // everything first: it claims the value before typeboxAdapter sees it
+        expect(extractJsonSchema(typebox, [everything, typeboxAdapter])).toEqual({ type: 'string' });
+    });
+    test('it supports custom adapters for non-TypeBox schema objects', () => {
+        class FakeZodType {
+            jsonSchema;
+            constructor(jsonSchema) {
+                this.jsonSchema = jsonSchema;
+            }
+        }
+        const fakeZodAdapter = {
+            name: 'fake-zod',
+            detect: (s) => s instanceof FakeZodType,
+            toJsonSchema: (s) => s.jsonSchema,
+        };
+        const schema = new FakeZodType({ type: 'object', properties: { id: { type: 'number' } } });
+        expect(extractJsonSchema(schema, [typeboxAdapter, fakeZodAdapter])).toEqual({
+            type: 'object',
+            properties: { id: { type: 'number' } },
+        });
+    });
+});
+//# sourceMappingURL=adapter.test.js.map

package/build/schema/adapter.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"adapter.test.js","sourceRoot":"","sources":["../../src/schema/adapter.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAEhD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAE7C,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAEpD,IAAI,CAAC,iCAAiC,EAAE,GAAG,EAAE;QAC3C,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;YACjE,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;YACxC,QAAQ,EAAE,CAAC,MAAM,CAAC;SACnB,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACrE,MAAM,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,CAAA;QAC/E,MAAM,CAAC,iBAAiB,CAAC,cAAc,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,CAAA;QAC3E,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,CAAA;QACjE,MAAM,CAAC,iBAAiB,CAAC,SAAS,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,CAAA;IACxE,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,qDAAqD,EAAE,GAAG,EAAE;QAC/D,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,CAAA;IACxD,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,uDAAuD,EAAE,GAAG,EAAE;QACjE,MAAM,UAAU,GAAkB;YAChC,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI;YAClB,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SACzC,CAAA;QAED,wEAAwE;QACxE,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC9E,sEAAsE;QACtE,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAA;IAC9F,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,4DAA4D,EAAE,GAAG,EAAE;QACtE,MAAM,WAAW;YACM;YAArB,YAAqB,UAA+B;gBAA/B,eAAU,GAAV,UAAU,CAAqB;YAAG,CAAC;SACzD;QACD,MAAM,cAAc,GAAkB;YACpC,IAAI,EAAE,UAAU;YAChB,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,YAAY,WAAW;YACvC,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE,CAAE,CAAiB,CAAC,UAAU;SACnD,CAAA;QAED,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAA;QAC1F,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC1E,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;SACvC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/build/schema/compile.d.ts

@@ -0,0 +1,37 @@
+import * as AJV from 'ajv';
+import type { TJSONSchema } from './json-schema.js';
+export type TSchemaValidationError = AJV.ErrorObject;
+/**
+ * A compiled validator. Returns `{}` on success, `{ errors }` on failure —
+ * the same shape AJV-based validators have carried since v1, and the shape
+ * every registration's `config.validation.*` function exposes.
+ */
+export type Validate = (value?: any) => {
+    errors?: TSchemaValidationError[];
+};
+/** Compiles a JSON Schema into a {@link Validate} function. */
+export type ValidatorCompiler = (jsonSchema: TJSONSchema) => Validate;
+/**
+ * `Procedures({ validation })` shape:
+ * - omitted — validate with the default AJV configuration
+ * - `false` — skip per-call validation entirely (schemas/validators are still
+ *   computed at registration time so bad schemas fail fast)
+ * - `{ ajv }` — custom AJV options merged over the defaults, or a fully
+ *   configured `Ajv` instance to use as-is
+ */
+export type ValidationOptions = false | {
+    ajv?: AJV.Ajv | AJV.Options;
+};
+/**
+ * Default AJV configuration — unchanged from every prior major version:
+ * report all errors, coerce primitive types, strip unknown properties.
+ */
+export declare const DEFAULT_AJV_OPTIONS: AJV.Options;
+/**
+ * Creates a {@link ValidatorCompiler} backed by AJV. Each `Procedures()`
+ * factory owns one compiler, so AJV configuration is per-factory instead of
+ * a module-level singleton.
+ */
+export declare function createValidatorCompiler(options?: {
+    ajv?: AJV.Ajv | AJV.Options;
+}): ValidatorCompiler;

package/build/schema/compile.js

@@ -0,0 +1,38 @@
+import { default as addFormats } from 'ajv-formats';
+import * as AJV from 'ajv';
+/**
+ * Default AJV configuration — unchanged from every prior major version:
+ * report all errors, coerce primitive types, strip unknown properties.
+ */
+export const DEFAULT_AJV_OPTIONS = {
+    allErrors: true,
+    coerceTypes: true,
+    removeAdditional: true,
+};
+function isAjvInstance(value) {
+    return typeof value?.compile === 'function';
+}
+/**
+ * Creates a {@link ValidatorCompiler} backed by AJV. Each `Procedures()`
+ * factory owns one compiler, so AJV configuration is per-factory instead of
+ * a module-level singleton.
+ */
+export function createValidatorCompiler(options) {
+    const ajv = isAjvInstance(options?.ajv)
+        ? options.ajv
+        : // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-expect-error ajv-formats' types lag behind ajv's
+            addFormats(new AJV.Ajv({ ...DEFAULT_AJV_OPTIONS, ...options?.ajv }));
+    return function compile(jsonSchema) {
+        const validator = ajv.compile(jsonSchema);
+        return (value) => {
+            const valid = validator(value);
+            if (!valid) {
+                const errors = validator.errors;
+                return { errors: errors?.length ? [...errors] : undefined };
+            }
+            return {};
+        };
+    };
+}
+//# sourceMappingURL=compile.js.map

package/build/schema/compile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compile.js","sourceRoot":"","sources":["../../src/schema/compile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,aAAa,CAAA;AACnD,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAyB1B;;;GAGG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAgB;IAC9C,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,gBAAgB,EAAE,IAAI;CACvB,CAAA;AAED,SAAS,aAAa,CAAC,KAAwC;IAC7D,OAAO,OAAQ,KAA2C,EAAE,OAAO,KAAK,UAAU,CAAA;AACpF,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,OAAyC;IAC/E,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,EAAE,GAAG,CAAC;QACrC,CAAC,CAAC,OAAO,CAAC,GAAG;QACb,CAAC,CAAC,6DAA6D;YAC7D,uDAAuD;YACtD,UAAU,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,mBAAmB,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,CAAC,CAAa,CAAA;IAErF,OAAO,SAAS,OAAO,CAAC,UAAuB;QAC7C,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;QACzC,OAAO,CAAC,KAAW,EAAE,EAAE;YACrB,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,CAAA;YAC9B,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAA;gBAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAA;YAC7D,CAAC;YACD,OAAO,EAAE,CAAA;QACX,CAAC,CAAA;IACH,CAAC,CAAA;AACH,CAAC"}

package/build/schema/compile.test.js

@@ -0,0 +1,78 @@
+import { describe, expect, test } from 'vitest';
+import { Type } from 'typebox';
+import * as AJV from 'ajv';
+import { createValidatorCompiler, DEFAULT_AJV_OPTIONS } from './compile.js';
+describe('createValidatorCompiler', () => {
+    describe('default configuration', () => {
+        const compile = createValidatorCompiler();
+        test('validator returns {} on success', () => {
+            const validate = compile(Type.Object({ name: Type.String(), age: Type.Number() }));
+            const result = validate({ name: 'John', age: 30 });
+            expect(result).toEqual({});
+            expect(result.errors).toBeUndefined();
+        });
+        test('validator returns { errors } on failure', () => {
+            const validate = compile(Type.Object({ name: Type.String() }));
+            const result = validate({});
+            expect(result.errors).toBeDefined();
+            expect(result.errors?.[0]?.message).toMatch(/must have required property 'name'/);
+        });
+        test('allErrors: reports every failure, not just the first', () => {
+            const validate = compile(Type.Object({ name: Type.String(), age: Type.Number() }));
+            const result = validate({ name: { nested: '' }, age: 'not-a-number' });
+            expect(result.errors?.length).toEqual(2);
+        });
+        test('coerceTypes: coerces primitive types in place', () => {
+            const validate = compile(Type.Object({ age: Type.Number() }));
+            const value = { age: '30' };
+            expect(validate(value).errors).toBeUndefined();
+            expect(value.age).toBe(30);
+        });
+        test('removeAdditional: strips unknown properties in place', () => {
+            const validate = compile(Type.Object({ name: Type.String() }, { additionalProperties: false }));
+            const value = { name: 'John', extra: 'gone' };
+            expect(validate(value).errors).toBeUndefined();
+            expect(value).toEqual({ name: 'John' });
+        });
+        test('ajv-formats is wired in (format keywords validate)', () => {
+            const validate = compile(Type.Object({ email: Type.String({ format: 'email' }) }));
+            expect(validate({ email: 'john@example.com' }).errors).toBeUndefined();
+            expect(validate({ email: 'not-an-email' }).errors).toBeDefined();
+        });
+        test('compile throws on an invalid JSON schema', () => {
+            expect(() => compile({ type: 'invalid-schema-type' })).toThrow();
+        });
+        test('DEFAULT_AJV_OPTIONS matches the documented v8 behavior', () => {
+            expect(DEFAULT_AJV_OPTIONS).toEqual({
+                allErrors: true,
+                coerceTypes: true,
+                removeAdditional: true,
+            });
+        });
+    });
+    describe('custom AJV options merge over the defaults', () => {
+        test('coerceTypes: false disables coercion while keeping other defaults', () => {
+            const compile = createValidatorCompiler({ ajv: { coerceTypes: false } });
+            const validate = compile(Type.Object({ age: Type.Number(), name: Type.String() }));
+            // No coercion: a string is no longer accepted for a number
+            expect(validate({ age: '30', name: 'John' }).errors).toBeDefined();
+            expect(validate({ age: 30, name: 'John' }).errors).toBeUndefined();
+            // allErrors default still applies (both bad fields reported)
+            expect(validate({ age: 'x', name: 42 }).errors?.length).toEqual(2);
+        });
+    });
+    describe('preconfigured Ajv instance', () => {
+        test('uses the instance as-is (no default options applied)', () => {
+            const ajv = new AJV.Ajv(); // no coerceTypes, no allErrors, no formats
+            const compile = createValidatorCompiler({ ajv });
+            const validate = compile(Type.Object({ age: Type.Number(), name: Type.String() }));
+            // No coercion from the default config
+            expect(validate({ age: '30', name: 'John' }).errors).toBeDefined();
+            // No allErrors: only the first failure is reported
+            expect(validate({ age: 'x', name: 42 }).errors?.length).toEqual(1);
+            // Valid input still passes
+            expect(validate({ age: 30, name: 'John' }).errors).toBeUndefined();
+        });
+    });
+});
+//# sourceMappingURL=compile.test.js.map

package/build/schema/compile.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compile.test.js","sourceRoot":"","sources":["../../src/schema/compile.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAC9B,OAAO,KAAK,GAAG,MAAM,KAAK,CAAA;AAC1B,OAAO,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAE3E,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACvC,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;QACrC,MAAM,OAAO,GAAG,uBAAuB,EAAE,CAAA;QAEzC,IAAI,CAAC,iCAAiC,EAAE,GAAG,EAAE;YAC3C,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAA;YAClF,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;YAClD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;YAC1B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAA;QACvC,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,yCAAyC,EAAE,GAAG,EAAE;YACnD,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAA;YAC9D,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAA;YAC3B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAA;YACnC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,oCAAoC,CAAC,CAAA;QACnF,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,sDAAsD,EAAE,GAAG,EAAE;YAChE,MAAM,QAAQ,GAAG,OAAO,CACtB,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CACzD,CAAA;YACD,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,CAAA;YACtE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QAC1C,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,+CAA+C,EAAE,GAAG,EAAE;YACzD,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAA;YAC7D,MAAM,KAAK,GAA4B,EAAE,GAAG,EAAE,IAAI,EAAE,CAAA;YACpD,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAA;YAC9C,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC5B,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,sDAAsD,EAAE,GAAG,EAAE;YAChE,MAAM,QAAQ,GAAG,OAAO,CACtB,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAAC,CACtE,CAAA;YACD,MAAM,KAAK,GAA4B,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,CAAA;YACtE,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAA;YAC9C,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAA;QACzC,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,oDAAoD,EAAE,GAAG,EAAE;YAC9D,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;YAClF,MAAM,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAA;YACtE,MAAM,CAAC,QAAQ,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAA;QAClE,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,0CAA0C,EAAE,GAAG,EAAE;YACpD,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,CAAA;QAClE,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,wDAAwD,EAAE,GAAG,EAAE;YAClE,MAAM,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC;gBAClC,SAAS,EAAE,IAAI;gBACf,WAAW,EAAE,IAAI;gBACjB,gBAAgB,EAAE,IAAI;aACvB,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,4CAA4C,EAAE,GAAG,EAAE;QAC1D,IAAI,CAAC,mEAAmE,EAAE,GAAG,EAAE;YAC7E,MAAM,OAAO,GAAG,uBAAuB,CAAC,EAAE,GAAG,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;YACxE,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAA;YAElF,2DAA2D;YAC3D,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAA;YAClE,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAA;YAElE,6DAA6D;YAC7D,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QACpE,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;QAC1C,IAAI,CAAC,sDAAsD,EAAE,GAAG,EAAE;YAChE,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA,CAAC,2CAA2C;YACrE,MAAM,OAAO,GAAG,uBAAuB,CAAC,EAAE,GAAG,EAAE,CAAC,CAAA;YAChD,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAA;YAElF,sCAAsC;YACtC,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAA;YAClE,mDAAmD;YACnD,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;YAClE,2BAA2B;YAC3B,MAAM,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAA;QACpE,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/build/schema/compute-schema.d.ts

@@ -1,43 +1,53 @@
-import type { TSchemaValidationError } from './parser.js';
-import type { TJSONSchema } from './types.js';
-import type { DefinitionInfo } from '../stack-utils.js';
-/**
- * This function is used to compute the JSON schema and validation functions
- * for a given schema.
- *
- * @param name The name of the procedure
- * @param schema Procedure schema
- * @param definitionInfo Optional definition info for error reporting
- */
-export declare function computeSchema<TParamsSchemaType, TReturnTypeSchemaType, TYieldTypeSchemaType = unknown>(name: string, schema?: {
-    params?: TParamsSchemaType;
-    returnType?: TReturnTypeSchemaType;
-    yieldType?: TYieldTypeSchemaType;
+import type { DefinitionInfo } from '../core/definition-site.js';
+import type { SchemaAdapter } from './adapter.js';
+import type { TJSONSchema } from './json-schema.js';
+import type { TSchemaValidationError, Validate, ValidatorCompiler } from './compile.js';
+export type ComputedJsonSchema = {
+    params?: TJSONSchema;
+    returnType?: TJSONSchema;
+    yieldType?: TJSONSchema;
+    req?: Record<string, TJSONSchema>;
+    res?: {
+        body?: TJSONSchema;
+        headers?: TJSONSchema;
+    };
+};
+export type ComputedValidations = {
+    params?: Validate;
+    yield?: Validate;
+    req?: Record<string, Validate>;
+};
+export type ComputedSchema = {
+    jsonSchema: ComputedJsonSchema;
+    validations: ComputedValidations;
+};
+export type ComputeSchemaInput = {
+    params?: unknown;
+    returnType?: unknown;
+    yieldType?: unknown;
     req?: Record<string, unknown>;
     res?: {
         body?: unknown;
         headers?: unknown;
     };
-}, definitionInfo?: DefinitionInfo): {
-    jsonSchema: {
-        params?: TJSONSchema;
-        returnType?: TJSONSchema;
-        yieldType?: TJSONSchema;
-        req?: Record<string, TJSONSchema>;
-        res?: {
-            body?: TJSONSchema;
-            headers?: TJSONSchema;
-        };
-    };
-    validations: {
-        params?: (params?: any) => {
-            errors?: TSchemaValidationError[];
-        };
-        yield?: (value?: any) => {
-            errors?: TSchemaValidationError[];
-        };
-        req?: Record<string, (value?: any) => {
-            errors?: TSchemaValidationError[];
-        }>;
-    };
 };
+/**
+ * Computes JSON Schema and validators for a procedure's schema config.
+ *
+ * Channels:
+ * - `params` (RPC input) — validated
+ * - `yieldType` (stream output) — validated only when `validateYields: true`
+ * - `returnType` — documentation/codegen only, never validated
+ * - `req.{pathParams,query,body,headers}` (HTTP input) — each independently validated
+ * - `res.{body,headers}` (HTTP output) — documentation/codegen only
+ *
+ * Guards:
+ * - `schema.params` and `schema.req` are mutually exclusive (RPC vs HTTP)
+ * - `schema.input` (removed in v8) gets a migration error
+ */
+export declare function computeSchema(name: string, schema: ComputeSchemaInput | undefined, options: {
+    adapters: readonly SchemaAdapter[];
+    compile: ValidatorCompiler;
+    definitionInfo?: DefinitionInfo;
+}): ComputedSchema;
+export type { TSchemaValidationError };

package/build/schema/compute-schema.js

@@ -1,16 +1,52 @@
-import { schemaParser } from './parser.js';
-import { ProcedureRegistrationError } from '../errors.js';
+import { ProcedureRegistrationError } from '../core/errors.js';
+import { extractJsonSchema } from './adapter.js';
+function fail(ctx, channel, detail) {
+    throw new ProcedureRegistrationError(ctx.name, `Error parsing schema for ${ctx.name} - ${channel}: ${detail}`, ctx.definitionInfo);
+}
+/**
+ * Extracts JSON Schema for one channel via the adapter chain. Throws a
+ * `ProcedureRegistrationError` naming the channel when no adapter recognizes
+ * the value or the adapter itself throws.
+ */
+function extractChannel(ctx, channel, raw) {
+    let extracted;
+    try {
+        extracted = extractJsonSchema(raw, ctx.adapters);
+    }
+    catch (e) {
+        fail(ctx, channel, `Error extracting json schema ${channel} - ${e.message}`);
+    }
+    if (!extracted) {
+        const known = ctx.adapters.map((a) => a.name).join(', ');
+        fail(ctx, channel, `Error extracting json schema ${channel} - it might be empty or not recognized by any schema adapter (registered: ${known})`);
+    }
+    return extracted;
+}
+/** Extracts and compiles one validated channel. */
+function compileChannel(ctx, channel, raw) {
+    const jsonSchema = extractChannel(ctx, channel, raw);
+    try {
+        return { jsonSchema, validate: ctx.compile(jsonSchema) };
+    }
+    catch (e) {
+        fail(ctx, channel, `Error compiling ${channel} for validator - ${e.message}`);
+    }
+}
 /**
- * This function is used to compute the JSON schema and validation functions
- * for a given schema.
+ * Computes JSON Schema and validators for a procedure's schema config.
  *
- * @param name The name of the procedure
- * @param schema Procedure schema
- * @param definitionInfo Optional definition info for error reporting
+ * Channels:
+ * - `params` (RPC input) — validated
+ * - `yieldType` (stream output) — validated only when `validateYields: true`
+ * - `returnType` — documentation/codegen only, never validated
+ * - `req.{pathParams,query,body,headers}` (HTTP input) — each independently validated
+ * - `res.{body,headers}` (HTTP output) — documentation/codegen only
+ *
+ * Guards:
+ * - `schema.params` and `schema.req` are mutually exclusive (RPC vs HTTP)
+ * - `schema.input` (removed in v8) gets a migration error
  */
-export function computeSchema(name, schema, 
-// Used for error stack trace details
-definitionInfo) {
+export function computeSchema(name, schema, options) {
     const jsonSchema = {
         params: undefined,
         returnType: undefined,
@@ -19,28 +55,49 @@ definitionInfo) {
         res: undefined,
     };
     const validations = {};
+    if (!schema)
+        return { jsonSchema, validations };
+    const ctx = { name, ...options };
     // Migration guard: schema.input was removed in v8
-    if (schema && 'input' in schema && schema.input !== undefined) {
-        throw new ProcedureRegistrationError(name, `schema.input was removed in v8. Use CreateHttp / CreateHttpStream for per-channel HTTP validation. Procedure: "${name}".`, definitionInfo);
+    if ('input' in schema && schema.input !== undefined) {
+        throw new ProcedureRegistrationError(name, `schema.input was removed in v8. Use CreateHttp / CreateHttpStream for per-channel HTTP validation. Procedure: "${name}".`, options.definitionInfo);
     }
     // Mutual exclusivity: params and req cannot both be defined
-    if (schema?.params && schema?.req) {
-        throw new ProcedureRegistrationError(name, `schema.params and schema.req are mutually exclusive for procedure "${name}". Use schema.params for RPC procedures or schema.req for HTTP procedures.`, definitionInfo);
-    }
-    if (schema) {
-        const { jsonSchema: { params, returnType, yieldType, req, res }, validation, } = schemaParser(schema, (errors) => {
-            throw new ProcedureRegistrationError(name, `Error parsing schema for ${name} - ${Object.entries(errors)
-                .map(([key, error]) => `${key}: ${error}`)
-                .join(', ')}`, definitionInfo);
-        });
-        jsonSchema.params = params;
-        jsonSchema.returnType = returnType;
-        jsonSchema.yieldType = yieldType;
-        jsonSchema.req = req;
-        jsonSchema.res = res;
-        validations.params = validation.params;
-        validations.yield = validation.yield;
-        validations.req = validation.req;
+    if (schema.params && schema.req) {
+        throw new ProcedureRegistrationError(name, `schema.params and schema.req are mutually exclusive for procedure "${name}". Use schema.params for RPC procedures or schema.req for HTTP procedures.`, options.definitionInfo);
+    }
+    if (schema.params) {
+        const { jsonSchema: extracted, validate } = compileChannel(ctx, 'schema.params', schema.params);
+        jsonSchema.params = extracted;
+        validations.params = validate;
+    }
+    if (schema.returnType) {
+        jsonSchema.returnType = extractChannel(ctx, 'schema.returnType', schema.returnType);
+    }
+    if (schema.yieldType) {
+        const { jsonSchema: extracted, validate } = compileChannel(ctx, 'schema.yieldType', schema.yieldType);
+        jsonSchema.yieldType = extracted;
+        validations.yield = validate;
+    }
+    if (schema.req) {
+        jsonSchema.req = {};
+        validations.req = {};
+        for (const [channelName, channelSchema] of Object.entries(schema.req)) {
+            if (!channelSchema)
+                continue;
+            const { jsonSchema: extracted, validate } = compileChannel(ctx, `schema.req.${channelName}`, channelSchema);
+            jsonSchema.req[channelName] = extracted;
+            validations.req[channelName] = validate;
+        }
+    }
+    if (schema.res) {
+        jsonSchema.res = {};
+        if (schema.res.body) {
+            jsonSchema.res.body = extractChannel(ctx, 'schema.res.body', schema.res.body);
+        }
+        if (schema.res.headers) {
+            jsonSchema.res.headers = extractChannel(ctx, 'schema.res.headers', schema.res.headers);
+        }
     }
     return { jsonSchema, validations };
 }

package/build/schema/compute-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"compute-schema.js","sourceRoot":"","sources":["../../src/schema/compute-schema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,0BAA0B,EAAE,MAAM,cAAc,CAAA;AAIzD;;;;;;;GAOG;AACH,MAAM,UAAU,aAAa,CAC3B,IAAY,EACZ,MAMC;AACD,qCAAqC;AACrC,cAA+B;IAe/B,MAAM,UAAU,GAMZ;QACF,MAAM,EAAE,SAAS;QACjB,UAAU,EAAE,SAAS;QACrB,SAAS,EAAE,SAAS;QACpB,GAAG,EAAE,SAAS;QACd,GAAG,EAAE,SAAS;KACf,CAAA;IAED,MAAM,WAAW,GAIb,EAAE,CAAA;IAEN,kDAAkD;IAClD,IAAI,MAAM,IAAI,OAAO,IAAI,MAAM,IAAK,MAAc,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QACvE,MAAM,IAAI,0BAA0B,CAClC,IAAI,EACJ,kHAAkH,IAAI,IAAI,EAC1H,cAAc,CACf,CAAA;IACH,CAAC;IAED,4DAA4D;IAC5D,IAAI,MAAM,EAAE,MAAM,IAAI,MAAM,EAAE,GAAG,EAAE,CAAC;QAClC,MAAM,IAAI,0BAA0B,CAClC,IAAI,EACJ,sEAAsE,IAAI,4EAA4E,EACtJ,cAAc,CACf,CAAA;IACH,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,EACJ,UAAU,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,EAAE,EACvD,UAAU,GACX,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE;YAClC,MAAM,IAAI,0BAA0B,CAClC,IAAI,EACJ,4BAA4B,IAAI,MAAM,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;iBACzD,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,KAAK,KAAK,EAAE,CAAC;iBACzC,IAAI,CAAC,IAAI,CAAC,EAAE,EACf,cAAc,CACf,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,UAAU,CAAC,MAAM,GAAG,MAAM,CAAA;QAC1B,UAAU,CAAC,UAAU,GAAG,UAAU,CAAA;QAClC,UAAU,CAAC,SAAS,GAAG,SAAS,CAAA;QAChC,UAAU,CAAC,GAAG,GAAG,GAAG,CAAA;QACpB,UAAU,CAAC,GAAG,GAAG,GAAG,CAAA;QACpB,WAAW,CAAC,MAAM,GAAG,UAAU,CAAC,MAAM,CAAA;QACtC,WAAW,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAA;QACpC,WAAW,CAAC,GAAG,GAAG,UAAU,CAAC,GAAG,CAAA;IAClC,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,CAAA;AACpC,CAAC"}
+{"version":3,"file":"compute-schema.js","sourceRoot":"","sources":["../../src/schema/compute-schema.ts"],"names":[],"mappings":"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"}