zod-compiler 1.20.0 → 1.22.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +90 -58
- package/dist/cli/commands/check.d.ts.map +1 -1
- package/dist/cli/commands/check.js +8 -1
- package/dist/cli/commands/check.js.map +1 -1
- package/dist/cli/emitter.d.ts.map +1 -1
- package/dist/cli/emitter.js +8 -1
- package/dist/cli/emitter.js.map +1 -1
- package/dist/core/codegen/context.d.ts +6 -3
- package/dist/core/codegen/context.d.ts.map +1 -1
- package/dist/core/codegen/context.js +25 -9
- package/dist/core/codegen/context.js.map +1 -1
- package/dist/core/codegen/issue-decls.d.ts +45 -0
- package/dist/core/codegen/issue-decls.d.ts.map +1 -1
- package/dist/core/codegen/issue-decls.js +53 -0
- package/dist/core/codegen/issue-decls.js.map +1 -1
- package/dist/core/codegen/schemas/array.d.ts.map +1 -1
- package/dist/core/codegen/schemas/array.js +9 -3
- package/dist/core/codegen/schemas/array.js.map +1 -1
- package/dist/core/codegen/schemas/effect.d.ts +20 -2
- package/dist/core/codegen/schemas/effect.d.ts.map +1 -1
- package/dist/core/codegen/schemas/effect.js +47 -3
- package/dist/core/codegen/schemas/effect.js.map +1 -1
- package/dist/core/codegen/schemas/number.d.ts.map +1 -1
- package/dist/core/codegen/schemas/number.js +9 -3
- package/dist/core/codegen/schemas/number.js.map +1 -1
- package/dist/core/codegen/schemas/object.d.ts.map +1 -1
- package/dist/core/codegen/schemas/object.js +65 -6
- package/dist/core/codegen/schemas/object.js.map +1 -1
- package/dist/core/codegen/schemas/string.d.ts.map +1 -1
- package/dist/core/codegen/schemas/string.js +9 -3
- package/dist/core/codegen/schemas/string.js.map +1 -1
- package/dist/core/extract/checks.d.ts +14 -1
- package/dist/core/extract/checks.d.ts.map +1 -1
- package/dist/core/extract/checks.js +39 -2
- package/dist/core/extract/checks.js.map +1 -1
- package/dist/core/extract/effects.d.ts +23 -0
- package/dist/core/extract/effects.d.ts.map +1 -1
- package/dist/core/extract/effects.js +19 -0
- package/dist/core/extract/effects.js.map +1 -1
- package/dist/core/extract/extractors/array.d.ts.map +1 -1
- package/dist/core/extract/extractors/array.js +9 -3
- package/dist/core/extract/extractors/array.js.map +1 -1
- package/dist/core/extract/extractors/number.d.ts.map +1 -1
- package/dist/core/extract/extractors/number.js +3 -2
- package/dist/core/extract/extractors/number.js.map +1 -1
- package/dist/core/extract/extractors/object.d.ts.map +1 -1
- package/dist/core/extract/extractors/object.js +14 -11
- package/dist/core/extract/extractors/object.js.map +1 -1
- package/dist/core/extract/extractors/pipe.d.ts.map +1 -1
- package/dist/core/extract/extractors/pipe.js +15 -1
- package/dist/core/extract/extractors/pipe.js.map +1 -1
- package/dist/core/extract/extractors/string.d.ts.map +1 -1
- package/dist/core/extract/extractors/string.js +3 -2
- package/dist/core/extract/extractors/string.js.map +1 -1
- package/dist/core/extract/types.d.ts +6 -0
- package/dist/core/extract/types.d.ts.map +1 -1
- package/dist/core/iife.d.ts +8 -2
- package/dist/core/iife.d.ts.map +1 -1
- package/dist/core/iife.js +8 -2
- package/dist/core/iife.js.map +1 -1
- package/dist/core/types.d.ts +37 -4
- package/dist/core/types.d.ts.map +1 -1
- package/dist/unplugin/virtual.d.ts.map +1 -1
- package/dist/unplugin/virtual.js +3 -1
- package/dist/unplugin/virtual.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"issue-decls.js","sourceRoot":"","sources":["../../../src/core/codegen/issue-decls.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,MAAM,UAAU,GACd,uJAAuJ,CAAC;AAE1J,MAAM,gBAAgB,GACpB,oKAAoK,CAAC;AAEvK,MAAM,UAAU,GACd,qJAAqJ,CAAC;AAExJ,MAAM,gBAAgB,GACpB,kKAAkK,CAAC;AAErK,MAAM,UAAU,GACd,kIAAkI,CAAC;AAErI,MAAM,UAAU,GACd,wKAAwK,CAAC;AAE3K,MAAM,UAAU,GACd,2IAA2I,CAAC;AAE9I,MAAM,UAAU,GACd,mIAAmI,CAAC;AAEtI,6DAA6D;AAC7D,MAAM,CAAC,MAAM,WAAW,GAAqC;IAC3D,MAAM,EAAE,UAAU;IAClB,OAAO,EAAE,gBAAgB;IACzB,MAAM,EAAE,UAAU;IAClB,OAAO,EAAE,gBAAgB;IACzB,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,UAAU;CACnB,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,WAAW,GACtB,yWAAyW,CAAC;AAE5W;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,gDAAgD,CAAC;AAE5E,0EAA0E;AAC1E,MAAM,CAAC,MAAM,oBAAoB,GAAqC;IACpE,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;
|
|
1
|
+
{"version":3,"file":"issue-decls.js","sourceRoot":"","sources":["../../../src/core/codegen/issue-decls.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,MAAM,UAAU,GACd,uJAAuJ,CAAC;AAE1J,MAAM,gBAAgB,GACpB,oKAAoK,CAAC;AAEvK,MAAM,UAAU,GACd,qJAAqJ,CAAC;AAExJ,MAAM,gBAAgB,GACpB,kKAAkK,CAAC;AAErK,MAAM,UAAU,GACd,kIAAkI,CAAC;AAErI,MAAM,UAAU,GACd,wKAAwK,CAAC;AAE3K,MAAM,UAAU,GACd,2IAA2I,CAAC;AAE9I,MAAM,UAAU,GACd,mIAAmI,CAAC;AAEtI,6DAA6D;AAC7D,MAAM,CAAC,MAAM,WAAW,GAAqC;IAC3D,MAAM,EAAE,UAAU;IAClB,OAAO,EAAE,gBAAgB;IACzB,MAAM,EAAE,UAAU;IAClB,OAAO,EAAE,gBAAgB;IACzB,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,UAAU;IAClB,MAAM,EAAE,UAAU;CACnB,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,WAAW,GACtB,yWAAyW,CAAC;AAE5W;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,gDAAgD,CAAC;AAE5E;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,aAAa,GACxB,kEAAkE;IAClE,2CAA2C,CAAC;AAE9C;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,cAAc,GACzB,qCAAqC;IACrC,0EAA0E,CAAC;AAE7E;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,UAAU,GACrB,oEAAoE;IACpE,4DAA4D;IAC5D,2DAA2D;IAC3D,sCAAsC;IACtC,uEAAuE,CAAC;AAE1E,0EAA0E;AAC1E,MAAM,CAAC,MAAM,oBAAoB,GAAqC;IACpE,OAAO,EAAE,WAAW;IACpB,OAAO,EAAE,WAAW;IACpB,MAAM,EAAE,UAAU;IAClB,QAAQ,EAAE,aAAa;CACxB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"array.d.ts","sourceRoot":"","sources":["../../../../src/core/codegen/schemas/array.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAW,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAMtD,wBAAgB,SAAS,CAAC,EAAE,EAAE,QAAQ,GAAG;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,EAAE,OAAO,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"array.d.ts","sourceRoot":"","sources":["../../../../src/core/codegen/schemas/array.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAW,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAMtD,wBAAgB,SAAS,CAAC,EAAE,EAAE,QAAQ,GAAG;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,EAAE,CAAC,EAAE,OAAO,GAAG,MAAM,CAyD9E;AAED,wBAAgB,SAAS,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CA2ChE"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { checkPriority,
|
|
1
|
+
import { checkPriority, emitEffectCallable, extendPath, hasMutation } from "../context.js";
|
|
2
2
|
import { emit } from "../emit.js";
|
|
3
3
|
import { invalidType, tooBig, tooSmall } from "../emit-issue.js";
|
|
4
|
-
import { refineCheck } from "./effect.js";
|
|
4
|
+
import { refineCheck, superRefineCheck, superRefineFastTest } from "./effect.js";
|
|
5
5
|
export function slowArray(ir, g) {
|
|
6
6
|
let code = emit `
|
|
7
7
|
if(!Array.isArray(${g.input})){
|
|
@@ -48,6 +48,9 @@ export function slowArray(ir, g) {
|
|
|
48
48
|
case "refine_effect":
|
|
49
49
|
code += refineCheck(check, g.input, g);
|
|
50
50
|
break;
|
|
51
|
+
case "super_refine_effect":
|
|
52
|
+
code += superRefineCheck(check, g.input, g);
|
|
53
|
+
break;
|
|
51
54
|
}
|
|
52
55
|
}
|
|
53
56
|
code += `}`;
|
|
@@ -85,7 +88,10 @@ export function fastArray(ir, g) {
|
|
|
85
88
|
// Refine effect checks (appended last — run after cheap checks short-circuit)
|
|
86
89
|
for (const check of ir.checks) {
|
|
87
90
|
if (check.kind === "refine_effect") {
|
|
88
|
-
parts.push(`${
|
|
91
|
+
parts.push(`${emitEffectCallable(g.ctx, check)}(${x})`);
|
|
92
|
+
}
|
|
93
|
+
else if (check.kind === "super_refine_effect") {
|
|
94
|
+
parts.push(superRefineFastTest(check, x, g));
|
|
89
95
|
}
|
|
90
96
|
}
|
|
91
97
|
return parts.join("&&");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"array.js","sourceRoot":"","sources":["../../../../src/core/codegen/schemas/array.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"array.js","sourceRoot":"","sources":["../../../../src/core/codegen/schemas/array.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { RefineEffectCheckIR, TransformEffectIR } from "../../types.js";
|
|
2
|
-
import type { SlowGen } from "../context.js";
|
|
1
|
+
import type { RefineEffectCheckIR, SuperRefineEffectCheckIR, TransformEffectIR } from "../../types.js";
|
|
2
|
+
import type { FastGen, SlowGen } from "../context.js";
|
|
3
3
|
/**
|
|
4
4
|
* Generate code for a TransformEffectIR node.
|
|
5
5
|
* Validates the inner schema, then applies the transform function and writes back the result.
|
|
@@ -14,4 +14,22 @@ export declare function slowEffect(ir: TransformEffectIR, g: SlowGen): string;
|
|
|
14
14
|
* @param g - SlowGen context (provides path, issues)
|
|
15
15
|
*/
|
|
16
16
|
export declare function refineCheck(check: RefineEffectCheckIR, expr: string, g: SlowGen): string;
|
|
17
|
+
/**
|
|
18
|
+
* Fast-path test for a SuperRefineEffectCheckIR: a boolean term reporting that
|
|
19
|
+
* the callback added no issue and left the value alone (see ZC_SR_OK_DECL).
|
|
20
|
+
*/
|
|
21
|
+
export declare function superRefineFastTest(check: SuperRefineEffectCheckIR, expr: string, g: FastGen): string;
|
|
22
|
+
/**
|
|
23
|
+
* Generate code for a SuperRefineEffectCheckIR: call the payload-taking
|
|
24
|
+
* callback with a synthesized `{ value, issues }` and merge what it collected.
|
|
25
|
+
* zod's own wrapper installs `addIssue` and normalizes the result, so the
|
|
26
|
+
* issues are zod's — the helper only reprojects them onto this node's path and
|
|
27
|
+
* strips the internal bookkeeping zod deletes before they become visible.
|
|
28
|
+
*
|
|
29
|
+
* The payload's `value` is writable public API, so it is written back to the
|
|
30
|
+
* output slot the way an overwrite effect is. This walk is always the eager one
|
|
31
|
+
* (the node reports as mutating, see hasMutation), so the write-back lands on
|
|
32
|
+
* every parse that reaches it — not only on failures.
|
|
33
|
+
*/
|
|
34
|
+
export declare function superRefineCheck(check: SuperRefineEffectCheckIR, expr: string, g: SlowGen): string;
|
|
17
35
|
//# sourceMappingURL=effect.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"effect.d.ts","sourceRoot":"","sources":["../../../../src/core/codegen/schemas/effect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"effect.d.ts","sourceRoot":"","sources":["../../../../src/core/codegen/schemas/effect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,mBAAmB,EACnB,wBAAwB,EACxB,iBAAiB,EAClB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAUtD;;;GAGG;AACH,wBAAgB,UAAU,CAAC,EAAE,EAAE,iBAAiB,EAAE,CAAC,EAAE,OAAO,GAAG,MAAM,CAgBpE;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,GAAG,MAAM,CAmBxF;AAaD;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,wBAAwB,EAC/B,IAAI,EAAE,MAAM,EACZ,CAAC,EAAE,OAAO,GACT,MAAM,CAIR;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,wBAAwB,EAC/B,IAAI,EAAE,MAAM,EACZ,CAAC,EAAE,OAAO,GACT,MAAM,CAUR"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { emitEffectCallable, emitRuntimeHelper, extendStaticPath, extendStaticPathIndex, } from "../context.js";
|
|
2
2
|
import { emit } from "../emit.js";
|
|
3
|
+
import { ZC_SR_DECL, ZC_SR_OK_DECL, ZC_SR_RUN_DECL } from "../issue-decls.js";
|
|
3
4
|
/**
|
|
4
5
|
* Generate code for a TransformEffectIR node.
|
|
5
6
|
* Validates the inner schema, then applies the transform function and writes back the result.
|
|
@@ -16,7 +17,7 @@ export function slowEffect(ir, g) {
|
|
|
16
17
|
var ${beforeVar}=${g.issues}.length;
|
|
17
18
|
${innerCode}
|
|
18
19
|
if(${g.issues}.length===${beforeVar}){
|
|
19
|
-
${g.output}=${
|
|
20
|
+
${g.output}=${emitEffectCallable(g.ctx, ir)}(${g.output});
|
|
20
21
|
}${abortBranch}
|
|
21
22
|
`}\n`;
|
|
22
23
|
}
|
|
@@ -39,8 +40,51 @@ export function refineCheck(check, expr, g) {
|
|
|
39
40
|
? extendStaticPathIndex(acc, segment)
|
|
40
41
|
: extendStaticPath(acc, segment), g.path);
|
|
41
42
|
return emit `
|
|
42
|
-
if(!${
|
|
43
|
+
if(!${emitEffectCallable(g.ctx, check)}(${expr})){
|
|
43
44
|
${g.issues}.push({code:"custom",path:${path}${messageProp},input:${expr}});
|
|
44
45
|
}`;
|
|
45
46
|
}
|
|
47
|
+
/**
|
|
48
|
+
* Declare the shared invoker both superRefine helpers call. It is module-local
|
|
49
|
+
* rather than an imported helper (lean mode declares it in the runtime module
|
|
50
|
+
* beside them), so inline mode must place it in the preamble itself.
|
|
51
|
+
*/
|
|
52
|
+
function emitSuperRefineRunner(ctx) {
|
|
53
|
+
if (ctx.mode !== "lean" && !ctx.preamble.includes(ZC_SR_RUN_DECL)) {
|
|
54
|
+
ctx.preamble.push(ZC_SR_RUN_DECL);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* Fast-path test for a SuperRefineEffectCheckIR: a boolean term reporting that
|
|
59
|
+
* the callback added no issue and left the value alone (see ZC_SR_OK_DECL).
|
|
60
|
+
*/
|
|
61
|
+
export function superRefineFastTest(check, expr, g) {
|
|
62
|
+
emitSuperRefineRunner(g.ctx);
|
|
63
|
+
const ok = emitRuntimeHelper(g.ctx, "__zcSrOk", ZC_SR_OK_DECL);
|
|
64
|
+
return `${ok}(${emitEffectCallable(g.ctx, check)},${expr})`;
|
|
65
|
+
}
|
|
66
|
+
/**
|
|
67
|
+
* Generate code for a SuperRefineEffectCheckIR: call the payload-taking
|
|
68
|
+
* callback with a synthesized `{ value, issues }` and merge what it collected.
|
|
69
|
+
* zod's own wrapper installs `addIssue` and normalizes the result, so the
|
|
70
|
+
* issues are zod's — the helper only reprojects them onto this node's path and
|
|
71
|
+
* strips the internal bookkeeping zod deletes before they become visible.
|
|
72
|
+
*
|
|
73
|
+
* The payload's `value` is writable public API, so it is written back to the
|
|
74
|
+
* output slot the way an overwrite effect is. This walk is always the eager one
|
|
75
|
+
* (the node reports as mutating, see hasMutation), so the write-back lands on
|
|
76
|
+
* every parse that reaches it — not only on failures.
|
|
77
|
+
*/
|
|
78
|
+
export function superRefineCheck(check, expr, g) {
|
|
79
|
+
emitSuperRefineRunner(g.ctx);
|
|
80
|
+
const helper = emitRuntimeHelper(g.ctx, "__zcSr", ZC_SR_DECL);
|
|
81
|
+
const fn = emitEffectCallable(g.ctx, check);
|
|
82
|
+
const p = g.temp("sp");
|
|
83
|
+
let code = `var ${p}=${helper}(${fn},${expr},${g.path},${g.issues});${g.output}=${p}.value;`;
|
|
84
|
+
// Inside a union option, an aborting issue must mark the option aborted so
|
|
85
|
+
// pruning matches zod (see ZC_SR_DECL); elsewhere the flag is unobserved.
|
|
86
|
+
if (g.aborted)
|
|
87
|
+
code += `if(${p}.aborted){${g.aborted}=true;}`;
|
|
88
|
+
return code;
|
|
89
|
+
}
|
|
46
90
|
//# sourceMappingURL=effect.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"effect.js","sourceRoot":"","sources":["../../../../src/core/codegen/schemas/effect.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"effect.js","sourceRoot":"","sources":["../../../../src/core/codegen/schemas/effect.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"number.d.ts","sourceRoot":"","sources":["../../../../src/core/codegen/schemas/number.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAOtD,wBAAgB,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"number.d.ts","sourceRoot":"","sources":["../../../../src/core/codegen/schemas/number.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAOtD,wBAAgB,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,GAAG,MAAM,CAmH3D;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAiFlE"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { checkPriority,
|
|
1
|
+
import { checkPriority, emitEffectCallable, emitRuntimeHelper } from "../context.js";
|
|
2
2
|
import { emit } from "../emit.js";
|
|
3
3
|
import { invalidType, tooBig, tooSmall } from "../emit-issue.js";
|
|
4
4
|
import { ZC_FSR_DECL } from "../issue-decls.js";
|
|
5
|
-
import { refineCheck } from "./effect.js";
|
|
5
|
+
import { refineCheck, superRefineCheck, superRefineFastTest } from "./effect.js";
|
|
6
6
|
export function slowNumber(ir, g) {
|
|
7
7
|
let code = "";
|
|
8
8
|
if (ir.coerce) {
|
|
@@ -112,6 +112,9 @@ export function slowNumber(ir, g) {
|
|
|
112
112
|
case "refine_effect":
|
|
113
113
|
code += refineCheck(check, g.input, g);
|
|
114
114
|
break;
|
|
115
|
+
case "super_refine_effect":
|
|
116
|
+
code += superRefineCheck(check, g.input, g);
|
|
117
|
+
break;
|
|
115
118
|
}
|
|
116
119
|
}
|
|
117
120
|
code += `}`;
|
|
@@ -188,7 +191,10 @@ export function fastNumber(ir, g) {
|
|
|
188
191
|
// Refine effect checks (appended last — run after cheap checks short-circuit)
|
|
189
192
|
for (const check of ir.checks) {
|
|
190
193
|
if (check.kind === "refine_effect") {
|
|
191
|
-
parts.push(`${
|
|
194
|
+
parts.push(`${emitEffectCallable(g.ctx, check)}(${x})`);
|
|
195
|
+
}
|
|
196
|
+
else if (check.kind === "super_refine_effect") {
|
|
197
|
+
parts.push(superRefineFastTest(check, x, g));
|
|
192
198
|
}
|
|
193
199
|
}
|
|
194
200
|
return parts.join("&&");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"number.js","sourceRoot":"","sources":["../../../../src/core/codegen/schemas/number.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"number.js","sourceRoot":"","sources":["../../../../src/core/codegen/schemas/number.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACrF,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEjF,MAAM,UAAU,UAAU,CAAC,EAAY,EAAE,CAAU;IACjD,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;QACd,IAAI,IAAI,IAAI,CAAA,OAAO,CAAC,CAAC,MAAM,WAAW,CAAC,CAAC,KAAK,eAAe,CAAC;IAC/D,CAAC;IACD,IAAI,IAAI,IAAI,CAAA;gBACE,CAAC,CAAC,KAAK;QACf,WAAW,CAAC,CAAC,EAAE,QAAQ,CAAC;4BACJ,CAAC,CAAC,KAAK;QAC3B,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC;gCAC7B,CAAC,CAAC,KAAK;QAC/B,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,qBAAqB,EAAE,CAAC;MAC5D,CAAC;IAEL,IAAI,EAAE,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,IAAI,IAAI,OAAO,CAAC;QAChB,sEAAsE;QACtE,yEAAyE;QACzE,sEAAsE;QACtE,KAAK,MAAM,KAAK,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;YAC9B,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;gBACnB,KAAK,cAAc;oBACjB,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;wBACpB,IAAI,IAAI,IAAI,CAAA;mBACL,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK;kBACvB,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;gBACtE,CAAC;oBACP,CAAC;yBAAM,CAAC;wBACN,IAAI,IAAI,IAAI,CAAA;mBACL,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK;kBACxB,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;gBACvE,CAAC;oBACP,CAAC;oBACD,MAAM;gBACR,KAAK,WAAW;oBACd,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;wBACpB,IAAI,IAAI,IAAI,CAAA;mBACL,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK;kBACvB,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;gBACpE,CAAC;oBACP,CAAC;yBAAM,CAAC;wBACN,IAAI,IAAI,IAAI,CAAA;mBACL,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,KAAK;kBACxB,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;gBACrE,CAAC;oBACP,CAAC;oBACD,MAAM;gBACR,KAAK,eAAe,CAAC,CAAC,CAAC;oBACrB,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;oBAC9B,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;wBAC/B,8DAA8D;wBAC9D,2DAA2D;wBAC3D,2CAA2C;wBAC3C,MAAM,IAAI,GAAG,wDAAwD,CAAC;wBACtE,MAAM,OAAO,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;wBACnF,IAAI,IAAI,IAAI,CAAA;qCACa,CAAC,CAAC,KAAK;kBAC1B,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,kBAAkB,EAAE,OAAO,EAAE,CAAC;yBACtD,CAAC,CAAC,KAAK;kBACd,CAAC,CAAC,MAAM,kEAAkE,IAAI,kBAAkB,OAAO,UAAU,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,IAAI;yBAChI,CAAC,CAAC,KAAK;kBACd,CAAC,CAAC,MAAM,+DAA+D,IAAI,kBAAkB,OAAO,UAAU,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,IAAI;gBACtI,CAAC;oBACP,CAAC;yBAAM,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;wBACpC,IAAI,IAAI,IAAI,CAAA;qCACa,CAAC,CAAC,KAAK;kBAC1B,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,CAAC;yBACpD,CAAC,CAAC,KAAK;kBACd,QAAQ,CAAC,CAAC,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC;yBAC9C,CAAC,CAAC,KAAK;kBACd,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC;gBACpD,CAAC;oBACP,CAAC;yBAAM,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;wBACrC,IAAI,IAAI,IAAI,CAAA;qCACa,CAAC,CAAC,KAAK;kBAC1B,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,iBAAiB,EAAE,OAAO,EAAE,CAAC;yBACrD,CAAC,CAAC,KAAK;kBACd,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC;yBACpC,CAAC,CAAC,KAAK;kBACd,MAAM,CAAC,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC;gBACpD,CAAC;oBACP,CAAC;yBAAM,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;wBACtC,IAAI,IAAI,IAAI,CAAA;mBACL,CAAC,CAAC,KAAK;kBACR,QAAQ,CAAC,CAAC,EAAE,yBAAyB,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC;yBAC5D,CAAC,CAAC,KAAK;kBACd,MAAM,CAAC,CAAC,EAAE,wBAAwB,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC;gBAClE,CAAC;oBACP,CAAC;oBACD,sGAAsG;oBACtG,MAAM;gBACR,CAAC;gBACD,KAAK,aAAa,CAAC,CAAC,CAAC;oBACnB,MAAM,OAAO,GACX,KAAK,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACjF,+DAA+D;oBAC/D,MAAM,GAAG,GAAG,iBAAiB,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;oBAC7D,IAAI,IAAI,IAAI,CAAA;iBACL,GAAG,IAAI,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK;gBAC9B,CAAC,CAAC,MAAM,yCAAyC,KAAK,CAAC,KAAK,mBAAmB,OAAO,UAAU,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC,IAAI;cACxH,CAAC;oBACL,MAAM;gBACR,CAAC;gBACD,KAAK,eAAe;oBAClB,IAAI,IAAI,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;oBACvC,MAAM;gBACR,KAAK,qBAAqB;oBACxB,IAAI,IAAI,gBAAgB,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;oBAC5C,MAAM;YACV,CAAC;QACH,CAAC;QACD,IAAI,IAAI,GAAG,CAAC;IACd,CAAC;IAED,OAAO,GAAG,IAAI,IAAI,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,EAAY,EAAE,CAAU;IACjD,IAAI,EAAE,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAE3B,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC;IAClB,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAgB,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC;IAEjF,2EAA2E;IAC3E,kEAAkE;IAClE,4EAA4E;IAC5E,yEAAyE;IACzE,uEAAuE;IACvE,yEAAyE;IACzE,iBAAiB;IACjB,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC;IAC5F,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAC/B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,IAAI,CAAC,CAAC,CAAC,MAAM,KAAK,OAAO,IAAI,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC,CACrF,CAAC;IACF,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,aAAa,EAAE,CAAC;QAClB,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACvC,CAAC;SAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACvB,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/C,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,eAAe;gBAClB,QAAQ,KAAK,CAAC,MAAM,EAAE,CAAC;oBACrB,KAAK,SAAS;wBACZ,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC;wBACzC,MAAM;oBACR,KAAK,OAAO;wBACV,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;wBAC9B,MAAM;oBACR,KAAK,QAAQ;wBACX,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;wBAC/D,MAAM;oBACR,KAAK,SAAS;wBACZ,8DAA8D;wBAC9D,8DAA8D;wBAC9D,wDAAwD;wBACxD,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,2BAA2B,EAAE,GAAG,CAAC,0BAA0B,CAAC,CAAC;wBAC5E,MAAM;oBACR,KAAK,SAAS;wBACZ,uCAAuC;wBACvC,MAAM;gBACV,CAAC;gBACD,MAAM;YACR,KAAK,cAAc;gBACjB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC7E,MAAM;YACR,KAAK,WAAW;gBACd,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC7E,MAAM;YACR,KAAK,aAAa,CAAC,CAAC,CAAC;gBACnB,MAAM,GAAG,GAAG,iBAAiB,CAAC,CAAC,CAAC,GAAG,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;gBAC7D,KAAK,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,KAAK,CAAC,KAAK,OAAO,CAAC,CAAC;gBAC9C,MAAM;YACR,CAAC;YACD,KAAK,YAAY,CAAC;YAClB,KAAK,YAAY,CAAC;YAClB,KAAK,eAAe,CAAC;YACrB,KAAK,eAAe,CAAC;YACrB,KAAK,UAAU,CAAC;YAChB,KAAK,aAAa,CAAC;YACnB,KAAK,WAAW;gBACd,iEAAiE;gBACjE,MAAM;QACV,CAAC;IACH,CAAC;IAED,8EAA8E;IAC9E,KAAK,MAAM,KAAK,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;QAC9B,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YACnC,KAAK,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1D,CAAC;aAAM,IAAI,KAAK,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;YAChD,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../../../../src/core/codegen/schemas/object.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../../../../src/core/codegen/schemas/object.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAetD,wBAAgB,UAAU,CAAC,EAAE,EAAE,QAAQ,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,EAAE,CAAC,EAAE,OAAO,GAAG,MAAM,CAkKhF;AAqFD,wBAAgB,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAiBlE"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { emitEffectCallable, escapeString, extendPath, extendStaticPath, hasMutation, keyMembershipTest, rejectsUndefined, } from "../context.js";
|
|
2
2
|
import { emit } from "../emit.js";
|
|
3
3
|
import { invalidType, unrecognizedKeys } from "../emit-issue.js";
|
|
4
4
|
import { orderByRuntimeCost } from "../fast-size.js";
|
|
5
|
-
import { refineCheck } from "./effect.js";
|
|
5
|
+
import { refineCheck, superRefineCheck, superRefineFastTest } from "./effect.js";
|
|
6
6
|
export function slowObject(ir, g) {
|
|
7
7
|
let code = emit `
|
|
8
8
|
if(typeof ${g.input}!=="object"||${g.input}===null||Array.isArray(${g.input})){
|
|
@@ -12,7 +12,9 @@ export function slowObject(ir, g) {
|
|
|
12
12
|
// the declared keys, so it always writes back. Otherwise clone only when a
|
|
13
13
|
// property mutates the value.
|
|
14
14
|
const strip = ir.stripUnknownKeys === true;
|
|
15
|
-
const needsClone = strip ||
|
|
15
|
+
const needsClone = strip ||
|
|
16
|
+
(ir.catchall !== undefined && hasMutation(ir.catchall)) ||
|
|
17
|
+
Object.values(ir.properties).some(hasMutation);
|
|
16
18
|
const objVar = g.temp("o");
|
|
17
19
|
if (!strip) {
|
|
18
20
|
// Spread, not Object.assign: V8's CloneObjectIC makes `{...x}` ~25% faster
|
|
@@ -104,6 +106,39 @@ export function slowObject(ir, g) {
|
|
|
104
106
|
${unrecognizedKeys(g, ukVar)}
|
|
105
107
|
}`;
|
|
106
108
|
}
|
|
109
|
+
// .catchall(schema): validate every key NOT in the shape, mirroring zod's
|
|
110
|
+
// handleCatchall — same bare for-in over the ORIGINAL input as the strict
|
|
111
|
+
// pass (inherited enumerable keys count, no hasOwnProperty guard), each
|
|
112
|
+
// issue reported at the key. Runs after the properties, as zod does.
|
|
113
|
+
//
|
|
114
|
+
// The key's slot is BOTH the input and the output, exactly as a shape
|
|
115
|
+
// property's is: a value-rewriting catchall (coerce, .trim(), a default)
|
|
116
|
+
// writes through the same expression it later re-reads, so splitting them
|
|
117
|
+
// makes the rewrite invisible to its own checks.
|
|
118
|
+
//
|
|
119
|
+
// When the catchall mutates, objVar is a clone, and each unknown key is
|
|
120
|
+
// copied into it before validation — which also reproduces zod, whose fresh
|
|
121
|
+
// output object gains an OWN key for every for-in key it saw, inherited ones
|
|
122
|
+
// included. A non-mutating catchall writes nothing, so objVar is the input
|
|
123
|
+
// and the object stays pass-through by reference.
|
|
124
|
+
if (ir.catchall) {
|
|
125
|
+
const keys = Object.keys(ir.properties);
|
|
126
|
+
const kVar = g.temp("ck");
|
|
127
|
+
const test = keyMembershipTest(g.ctx, keys, kVar);
|
|
128
|
+
const slot = `${objVar}[${kVar}]`;
|
|
129
|
+
const seed = needsClone ? `${slot}=${g.input}[${kVar}];` : "";
|
|
130
|
+
code += emit `
|
|
131
|
+
for(var ${kVar} in ${g.input}){
|
|
132
|
+
if(!(${test})){
|
|
133
|
+
${seed}
|
|
134
|
+
${g.visit(ir.catchall, {
|
|
135
|
+
input: slot,
|
|
136
|
+
output: slot,
|
|
137
|
+
path: extendPath(g.path, kVar),
|
|
138
|
+
})}
|
|
139
|
+
}
|
|
140
|
+
}`;
|
|
141
|
+
}
|
|
107
142
|
if (needsClone) {
|
|
108
143
|
code += `${g.output}=${objVar};`;
|
|
109
144
|
}
|
|
@@ -111,8 +146,12 @@ export function slowObject(ir, g) {
|
|
|
111
146
|
// property already failed (see refineMark).
|
|
112
147
|
if (ir.checks && ir.checks.length > 0) {
|
|
113
148
|
let refines = "";
|
|
114
|
-
for (const check of ir.checks)
|
|
115
|
-
refines +=
|
|
149
|
+
for (const check of ir.checks) {
|
|
150
|
+
refines +=
|
|
151
|
+
check.kind === "super_refine_effect"
|
|
152
|
+
? superRefineCheck(check, objVar, g)
|
|
153
|
+
: refineCheck(check, objVar, g);
|
|
154
|
+
}
|
|
116
155
|
code += `if(${g.issues}.length===${refineMark}){${refines}}`;
|
|
117
156
|
}
|
|
118
157
|
code += `}\n`;
|
|
@@ -164,11 +203,31 @@ function fastObjectBody(ir, g, skipKey) {
|
|
|
164
203
|
g.ctx.preamble.push(`function ${fnName}(o){for(var k in o){if(!(${test}))return false;}return true;}`);
|
|
165
204
|
parts.push(`${fnName}(${x})`);
|
|
166
205
|
}
|
|
206
|
+
// .catchall(schema): same hosted for-in as strict, but each unrecognized key
|
|
207
|
+
// is checked against the catchall rather than rejected outright. The value is
|
|
208
|
+
// hoisted into a local for the same reason fastRecord does it — repeated
|
|
209
|
+
// `o[k]` computed loads are not eliminated across check boundaries.
|
|
210
|
+
if (ir.catchall) {
|
|
211
|
+
const kv = g.temp("cak");
|
|
212
|
+
const vv = g.temp("cav");
|
|
213
|
+
const valCheck = g.scoped(vv).visit(ir.catchall, { input: vv });
|
|
214
|
+
if (valCheck === null)
|
|
215
|
+
return null;
|
|
216
|
+
if (valCheck !== "true") {
|
|
217
|
+
const fnName = g.temp("co");
|
|
218
|
+
const test = keyMembershipTest(g.ctx, Object.keys(ir.properties), kv);
|
|
219
|
+
g.ctx.preamble.push(`function ${fnName}(o){var ${kv},${vv};for(${kv} in o){if(!(${test})){${vv}=o[${kv}];if(!(${valCheck}))return false;}}return true;}`);
|
|
220
|
+
parts.push(`${fnName}(${x})`);
|
|
221
|
+
}
|
|
222
|
+
}
|
|
167
223
|
// Object-level refine effects (appended last — run after property checks short-circuit)
|
|
168
224
|
if (ir.checks) {
|
|
169
225
|
for (const check of ir.checks) {
|
|
170
226
|
if (check.kind === "refine_effect") {
|
|
171
|
-
parts.push(`${
|
|
227
|
+
parts.push(`${emitEffectCallable(g.ctx, check)}(${x})`);
|
|
228
|
+
}
|
|
229
|
+
else if (check.kind === "super_refine_effect") {
|
|
230
|
+
parts.push(superRefineFastTest(check, x, g));
|
|
172
231
|
}
|
|
173
232
|
}
|
|
174
233
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../../src/core/codegen/schemas/object.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"object.js","sourceRoot":"","sources":["../../../../src/core/codegen/schemas/object.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"string.d.ts","sourceRoot":"","sources":["../../../../src/core/codegen/schemas/string.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA8B,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAmEtD,wBAAgB,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"string.d.ts","sourceRoot":"","sources":["../../../../src/core/codegen/schemas/string.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA8B,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAmEtD,wBAAgB,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,GAAG,MAAM,CAgH3D;AAED,wBAAgB,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CA+ElE"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { checkPriority,
|
|
1
|
+
import { checkPriority, emitEffectCallable, emitEffectFn, emitRegexSourceString, escapeString, } from "../context.js";
|
|
2
2
|
import { emit } from "../emit.js";
|
|
3
3
|
import { invalidFormat, invalidType, tooBig, tooSmall } from "../emit-issue.js";
|
|
4
4
|
import { EMAIL_REGEX_SOURCE, lookupFastRegexSource, UUID_REGEX_SOURCE, } from "../well-known-regex.js";
|
|
5
|
-
import { refineCheck } from "./effect.js";
|
|
5
|
+
import { refineCheck, superRefineCheck, superRefineFastTest } from "./effect.js";
|
|
6
6
|
/** `re.lastIndex=0;` reset statement for stateful (g/y-flagged) regexes. */
|
|
7
7
|
function lastIndexReset(regexVar, flags) {
|
|
8
8
|
return flags && /[gy]/.test(flags) ? `${regexVar}.lastIndex=0;` : "";
|
|
@@ -107,6 +107,9 @@ export function slowString(ir, g) {
|
|
|
107
107
|
case "refine_effect":
|
|
108
108
|
code += refineCheck(check, g.input, g);
|
|
109
109
|
break;
|
|
110
|
+
case "super_refine_effect":
|
|
111
|
+
code += superRefineCheck(check, g.input, g);
|
|
112
|
+
break;
|
|
110
113
|
case "overwrite_effect":
|
|
111
114
|
// $ZodCheckOverwrite: value = tx(value). Later checks read the
|
|
112
115
|
// rewritten value because input aliases the output location.
|
|
@@ -231,7 +234,10 @@ export function fastString(ir, g) {
|
|
|
231
234
|
// Refine effect checks (appended last — run after cheap checks short-circuit)
|
|
232
235
|
for (const check of ir.checks) {
|
|
233
236
|
if (check.kind === "refine_effect") {
|
|
234
|
-
parts.push(`${
|
|
237
|
+
parts.push(`${emitEffectCallable(g.ctx, check)}(${x})`);
|
|
238
|
+
}
|
|
239
|
+
else if (check.kind === "super_refine_effect") {
|
|
240
|
+
parts.push(superRefineFastTest(check, x, g));
|
|
235
241
|
}
|
|
236
242
|
}
|
|
237
243
|
return parts.join("&&");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"string.js","sourceRoot":"","sources":["../../../../src/core/codegen/schemas/string.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,YAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"string.js","sourceRoot":"","sources":["../../../../src/core/codegen/schemas/string.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,kBAAkB,EAClB,YAAY,EACZ,qBAAqB,EACrB,YAAY,GACb,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAChF,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EACrB,iBAAiB,GAClB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEjF,4EAA4E;AAC5E,SAAS,cAAc,CAAC,QAAgB,EAAE,KAAyB;IACjE,OAAO,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC;AACvE,CAAC;AAED;;;;GAIG;AACH,SAAS,YAAY,CAAC,KAAwB,EAAE,CAAU;IACxD,MAAM,UAAU,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,MAAM,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3B,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACnB,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;QAChE,KAAK,IAAI,IAAI,CAAA;QACT,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,aAAa,CAAC;YACnC,EAAE,SAAS,MAAM;UACnB,aAAa,CAAC,CAAC,EAAE,KAAK,EAAE;YACxB,KAAK,EAAE,mCAAmC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YACxE,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC;QACF,CAAC;IACP,CAAC;IACD,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACnB,MAAM,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC;QACjE,MAAM,SAAS,GAAG,IAAI,MAAM,2BAA2B,MAAM,yBAAyB,MAAM,YAAY,CAAC;QACzG,KAAK,IAAI,IAAI,CAAA;QACT,cAAc,CAAC,EAAE,EAAE,KAAK,CAAC,aAAa,CAAC;YACnC,EAAE,SAAS,SAAS;UACtB,aAAa,CAAC,CAAC,EAAE,KAAK,EAAE;YACxB,KAAK,EAAE,mCAAmC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YACxE,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC;QACF,CAAC;IACP,CAAC;IACD,4EAA4E;IAC5E,KAAK,IAAI,GAAG,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,MAAM,OAAO,CAAC,CAAC,CAAC,UAAU,GAAG,CAAC;IAC3E,OAAO,IAAI,CAAA;UACH,UAAU,IAAI,CAAC,CAAC,KAAK;UACrB,MAAM;UACN,MAAM,YAAY,UAAU;SAC7B,MAAM;QACP,aAAa,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;;QAEnD,KAAK;MACP,CAAC;AACP,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,EAAY,EAAE,CAAU;IACjD,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;QACd,IAAI,IAAI,IAAI,CAAA,OAAO,CAAC,CAAC,MAAM,WAAW,CAAC,CAAC,KAAK,eAAe,CAAC;IAC/D,CAAC;IACD,IAAI,IAAI,IAAI,CAAA;gBACE,CAAC,CAAC,KAAK;QACf,WAAW,CAAC,CAAC,EAAE,QAAQ,CAAC;MAC1B,CAAC;IAEL,IAAI,EAAE,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,IAAI,IAAI,OAAO,CAAC;QAChB,sEAAsE;QACtE,2DAA2D;QAC3D,KAAK,MAAM,KAAK,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;YAC9B,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;gBACnB,KAAK,YAAY;oBACf,IAAI,IAAI,IAAI,CAAA;iBACL,CAAC,CAAC,KAAK,WAAW,KAAK,CAAC,OAAO;gBAChC,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;cACxE,CAAC;oBACL,MAAM;gBACR,KAAK,YAAY;oBACf,IAAI,IAAI,IAAI,CAAA;iBACL,CAAC,CAAC,KAAK,WAAW,KAAK,CAAC,OAAO;gBAChC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;cACtE,CAAC;oBACL,MAAM;gBACR,KAAK,eAAe;oBAClB,IAAI,IAAI,IAAI,CAAA;iBACL,CAAC,CAAC,KAAK,WAAW,KAAK,CAAC,MAAM;gBAC/B,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;uBAC3E,CAAC,CAAC,KAAK,WAAW,KAAK,CAAC,MAAM;gBACrC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;cAClF,CAAC;oBACL,MAAM;gBACR,KAAK,UAAU;oBACb,IAAI,IAAI,IAAI,CAAA;kBACJ,CAAC,CAAC,KAAK,aAAa,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE;gBAC7G,aAAa,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,KAAK,EAAE,YAAY,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;cAC7G,CAAC;oBACL,MAAM;gBACR,KAAK,aAAa;oBAChB,IAAI,IAAI,IAAI,CAAA;kBACJ,CAAC,CAAC,KAAK,eAAe,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC;gBAClD,aAAa,CAAC,CAAC,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,UAAU,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;cAC5G,CAAC;oBACL,MAAM;gBACR,KAAK,WAAW;oBACd,IAAI,IAAI,IAAI,CAAA;kBACJ,CAAC,CAAC,KAAK,aAAa,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC;gBAChD,aAAa,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,KAAK,EAAE,UAAU,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;cAC1G,CAAC;oBACL,MAAM;gBACR,KAAK,eAAe;oBAClB,IAAI,IAAI,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;oBACvC,MAAM;gBACR,KAAK,qBAAqB;oBACxB,IAAI,IAAI,gBAAgB,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;oBAC5C,MAAM;gBACR,KAAK,kBAAkB;oBACrB,+DAA+D;oBAC/D,6DAA6D;oBAC7D,IAAI,IAAI,IAAI,CAAA,GAAG,CAAC,CAAC,MAAM,IAAI,YAAY,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC;oBAC5E,MAAM;gBACR,KAAK,eAAe,CAAC,CAAC,CAAC;oBACrB,IAAI,QAAgB,CAAC;oBACrB,IAAI,OAAe,CAAC;oBACpB,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;wBAC3B,IAAI,IAAI,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;wBAC/B,SAAS;oBACX,CAAC;oBACD,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;wBAC7B,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,kBAAkB,CAAC;wBAC9C,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;oBAC3D,CAAC;yBAAM,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;wBACrD,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;wBACxB,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;oBACzD,CAAC;yBAAM,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;wBACnC,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,iBAAiB,CAAC;wBAC7C,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;oBAC1D,CAAC;yBAAM,CAAC;wBACN,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;4BAClB,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;4BACxB,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;wBACzD,CAAC;6BAAM,CAAC;4BACN,2DAA2D;4BAC3D,yCAAyC;4BACzC,SAAS;wBACX,CAAC;oBACH,CAAC;oBACD,qEAAqE;oBACrE,sEAAsE;oBACtE,gEAAgE;oBAChE,mEAAmE;oBACnE,MAAM,SAAS,GAAG,CAAC,KAAK,CAAC,YAAY,IAAI,qBAAqB,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC;oBACjF,MAAM,WAAW,GAAG,SAAS;wBAC3B,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC;wBACvC,CAAC,CAAC,GAAG,QAAQ,aAAa,CAAC;oBAC7B,IAAI,IAAI,IAAI,CAAA;cACR,cAAc,CAAC,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC;kBACxC,QAAQ,SAAS,CAAC,CAAC,KAAK;gBAC1B,aAAa,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,WAAW,WAAW,kBAAkB,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;cACrI,CAAC;oBACL,MAAM;gBACR,CAAC;YACH,CAAC;QACH,CAAC;QACD,IAAI,IAAI,GAAG,CAAC;IACd,CAAC;IAED,OAAO,GAAG,IAAI,IAAI,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,EAAY,EAAE,CAAU;IACjD,IAAI,EAAE,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAC3B,oEAAoE;IACpE,kDAAkD;IAClD,IAAI,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,kBAAkB,CAAC;QAAE,OAAO,IAAI,CAAC;IAEtE,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC;IAClB,MAAM,KAAK,GAAa,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAC7B,CAAC,CAAC,EAAgB,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,IAAI,CAAC,CAAC,IAAI,KAAK,kBAAkB,CACjF,CAAC;IAEF,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;QAC/C,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,YAAY;gBACf,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC5C,MAAM;YACR,KAAK,YAAY;gBACf,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC5C,MAAM;YACR,KAAK,eAAe;gBAClB,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC5C,MAAM;YACR,KAAK,UAAU;gBACb,KAAK,CAAC,IAAI,CACR,KAAK,CAAC,QAAQ,KAAK,SAAS;oBAC1B,CAAC,CAAC,GAAG,CAAC,aAAa,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,QAAQ,GAAG;oBACpE,CAAC,CAAC,GAAG,CAAC,aAAa,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CACrD,CAAC;gBACF,MAAM;YACR,KAAK,aAAa;gBAChB,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC7D,MAAM;YACR,KAAK,WAAW;gBACd,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC3D,MAAM;YACR,KAAK,eAAe,CAAC,CAAC,CAAC;gBACrB,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;oBAC3B,iEAAiE;oBACjE,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,IAAI,OAAe,CAAC;gBACpB,IAAI,MAAc,CAAC;gBACnB,IAAI,KAAK,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;oBAC7B,MAAM,GAAG,OAAO,CAAC;oBACjB,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,kBAAkB,CAAC;gBAChD,CAAC;qBAAM,IAAI,KAAK,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;oBACnC,MAAM,GAAG,MAAM,CAAC;oBAChB,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,iBAAiB,CAAC;gBAC/C,CAAC;qBAAM,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;oBACzB,MAAM,GAAG,IAAI,CAAC;oBACd,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;gBAC1B,CAAC;qBAAM,CAAC;oBACN,6DAA6D;oBAC7D,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;gBACvD,sEAAsE;gBACtE,wCAAwC;gBACxC,KAAK,CAAC,IAAI,CACR,KAAK,CAAC,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC;oBACnD,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,SAAS,CAAC,IAAI;oBACxC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CACtB,CAAC;gBACF,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;IAED,8EAA8E;IAC9E,KAAK,MAAM,KAAK,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC;QAC9B,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YACnC,KAAK,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC1D,CAAC;aAAM,IAAI,KAAK,CAAC,IAAI,KAAK,qBAAqB,EAAE,CAAC;YAChD,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC"}
|
|
@@ -8,6 +8,17 @@ import type { ExtractorContext, ZodCheckDef, ZodCheckSchema } from "./types.js";
|
|
|
8
8
|
* before" — when the extraction is not collecting refs.
|
|
9
9
|
*/
|
|
10
10
|
export declare function refineRefRegistrar(ctx: ExtractorContext, checks: ZodCheckSchema[]): ((index: number) => number | undefined) | undefined;
|
|
11
|
+
/**
|
|
12
|
+
* Register the payload-taking callback of check `index` (`superRefine`) as an
|
|
13
|
+
* `__rf[N]` reference, pointing at zod's own wrapper
|
|
14
|
+
* (`<schema>._zod.def.checks[i]._zod.check`).
|
|
15
|
+
*
|
|
16
|
+
* Only the LAST check on a node qualifies: an issue carrying
|
|
17
|
+
* `fatal`/`continue:false` aborts zod's remaining chain, and compiled output
|
|
18
|
+
* runs every check unconditionally — with nothing following, there is nothing
|
|
19
|
+
* left to abort, so the two agree.
|
|
20
|
+
*/
|
|
21
|
+
export declare function payloadCheckRef(ctx: ExtractorContext, checks: ZodCheckSchema[], index: number): number | undefined;
|
|
11
22
|
/**
|
|
12
23
|
* True when a check can't be compiled because of runtime modifiers:
|
|
13
24
|
* a user-supplied `when` predicate, or `abort: true` (which stops later
|
|
@@ -23,7 +34,9 @@ export declare function extractChecks(checks: ZodCheckSchema[],
|
|
|
23
34
|
* that know their schema's access path; omitted by callers that do not, which
|
|
24
35
|
* simply keeps the old fall-back-to-zod behavior.
|
|
25
36
|
*/
|
|
26
|
-
refineRef?: (index: number) => number | undefined
|
|
37
|
+
refineRef?: (index: number) => number | undefined,
|
|
38
|
+
/** Registers a payload-taking callback (superRefine); see payloadCheckRef. */
|
|
39
|
+
payloadRefFor?: (index: number) => number | undefined): {
|
|
27
40
|
checkIRs: CheckOrEffectIR[];
|
|
28
41
|
hasFallback: boolean;
|
|
29
42
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checks.d.ts","sourceRoot":"","sources":["../../../src/core/extract/checks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAqB,MAAM,aAAa,CAAC;AAEtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEhF;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,gBAAgB,EACrB,MAAM,EAAE,cAAc,EAAE,GACvB,CAAC,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC,GAAG,SAAS,CASrD;AAuCD;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO,CAElE;AAED,wBAAgB,aAAa,CAC3B,MAAM,EAAE,cAAc,EAAE;AACxB;;;;;;GAMG;AACH,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"checks.d.ts","sourceRoot":"","sources":["../../../src/core/extract/checks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAqB,MAAM,aAAa,CAAC;AAEtE,OAAO,KAAK,EAAE,gBAAgB,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEhF;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,gBAAgB,EACrB,MAAM,EAAE,cAAc,EAAE,GACvB,CAAC,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC,GAAG,SAAS,CASrD;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,gBAAgB,EACrB,MAAM,EAAE,cAAc,EAAE,EACxB,KAAK,EAAE,MAAM,GACZ,MAAM,GAAG,SAAS,CAUpB;AAuCD;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO,CAElE;AAED,wBAAgB,aAAa,CAC3B,MAAM,EAAE,cAAc,EAAE;AACxB;;;;;;GAMG;AACH,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS;AACjD,8EAA8E;AAC9E,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,GACpD;IACD,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC5B,WAAW,EAAE,OAAO,CAAC;CACtB,CAuKA;AAaD,MAAM,MAAM,eAAe,GACvB;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACnC;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC;AAExB;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,eAAe,CAqDnE"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isReferenceablePredicate, tryCompileEffect } from "./effects.js";
|
|
1
|
+
import { isPayloadCheck, isReferenceablePredicate, tryCompileEffect } from "./effects.js";
|
|
2
2
|
/**
|
|
3
3
|
* Build the `refineRef` registrar for {@link extractChecks} from an extractor's
|
|
4
4
|
* context: it appends a {@link RefEntry} pointing at the check's own predicate
|
|
@@ -18,6 +18,29 @@ export function refineRefRegistrar(ctx, checks) {
|
|
|
18
18
|
return refs.length - 1;
|
|
19
19
|
};
|
|
20
20
|
}
|
|
21
|
+
/**
|
|
22
|
+
* Register the payload-taking callback of check `index` (`superRefine`) as an
|
|
23
|
+
* `__rf[N]` reference, pointing at zod's own wrapper
|
|
24
|
+
* (`<schema>._zod.def.checks[i]._zod.check`).
|
|
25
|
+
*
|
|
26
|
+
* Only the LAST check on a node qualifies: an issue carrying
|
|
27
|
+
* `fatal`/`continue:false` aborts zod's remaining chain, and compiled output
|
|
28
|
+
* runs every check unconditionally — with nothing following, there is nothing
|
|
29
|
+
* left to abort, so the two agree.
|
|
30
|
+
*/
|
|
31
|
+
export function payloadCheckRef(ctx, checks, index) {
|
|
32
|
+
if (index !== checks.length - 1)
|
|
33
|
+
return undefined;
|
|
34
|
+
const check = checks[index];
|
|
35
|
+
const refs = ctx.refs;
|
|
36
|
+
if (!refs || !check || !isPayloadCheck(check))
|
|
37
|
+
return undefined;
|
|
38
|
+
refs.push({
|
|
39
|
+
schema: check._zod.check,
|
|
40
|
+
accessPath: `${ctx.path}._zod.def.checks[${index}]._zod.check`,
|
|
41
|
+
});
|
|
42
|
+
return refs.length - 1;
|
|
43
|
+
}
|
|
21
44
|
/**
|
|
22
45
|
* String formats the codegen can validate without a regex pattern.
|
|
23
46
|
* Everything else without a pattern (e.g. z.jwt(), which validates
|
|
@@ -68,7 +91,9 @@ export function extractChecks(checks,
|
|
|
68
91
|
* that know their schema's access path; omitted by callers that do not, which
|
|
69
92
|
* simply keeps the old fall-back-to-zod behavior.
|
|
70
93
|
*/
|
|
71
|
-
refineRef
|
|
94
|
+
refineRef,
|
|
95
|
+
/** Registers a payload-taking callback (superRefine); see payloadCheckRef. */
|
|
96
|
+
payloadRefFor) {
|
|
72
97
|
const checkIRs = [];
|
|
73
98
|
let hasFallback = false;
|
|
74
99
|
for (const [index, check] of checks.entries()) {
|
|
@@ -187,6 +212,18 @@ refineRef) {
|
|
|
187
212
|
break;
|
|
188
213
|
}
|
|
189
214
|
case "custom": {
|
|
215
|
+
// superRefine / raw .check(): the callback collects issues from zod's
|
|
216
|
+
// payload rather than returning a verdict, so it is referenced and
|
|
217
|
+
// called with a synthesized payload (see SuperRefineEffectCheckIR).
|
|
218
|
+
if (isPayloadCheck(check)) {
|
|
219
|
+
const payloadRef = payloadRefFor?.(index);
|
|
220
|
+
if (payloadRef === undefined) {
|
|
221
|
+
hasFallback = true;
|
|
222
|
+
break;
|
|
223
|
+
}
|
|
224
|
+
checkIRs.push({ kind: "super_refine_effect", refIndex: payloadRef });
|
|
225
|
+
break;
|
|
226
|
+
}
|
|
190
227
|
// `.refine(fn, { path })` reports the issue against a member of the
|
|
191
228
|
// refined value; anything but plain string/number segments is a shape
|
|
192
229
|
// the generated path expression cannot reproduce.
|