@sjsf/zod-validator 2.0.0-next.8 → 2.0.0-next.9
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 +1 -1
- package/dist/errors.js +10 -8
- package/dist/errors.js.map +1 -1
- package/dist/validator.js +3 -21
- package/dist/validator.js.map +1 -1
- package/package.json +4 -4
package/README.md
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
The [zod](https://github.com/colinhacks/zod) based validator for [svelte-jsonschema-form](https://github.com/x0k/svelte-jsonschema-form).
|
|
4
4
|
|
|
5
|
-
- [Documentation](https://x0k.github.io/svelte-jsonschema-form/validators/zod/)
|
|
5
|
+
- [Documentation](https://x0k.github.io/svelte-jsonschema-form/v2/validators/zod/)
|
|
6
6
|
- [Playground](https://x0k.github.io/svelte-jsonschema-form/playground2/)
|
|
7
7
|
|
|
8
8
|
## Installation
|
package/dist/errors.js
CHANGED
|
@@ -20,17 +20,19 @@ export function createErrorsTransformer(options) {
|
|
|
20
20
|
});
|
|
21
21
|
};
|
|
22
22
|
}
|
|
23
|
+
function omitInvalidTypeIssues(issue) {
|
|
24
|
+
return issue.code !== "invalid_type";
|
|
25
|
+
}
|
|
23
26
|
export function transformFieldErrors(config, result) {
|
|
24
27
|
if (result.success) {
|
|
25
28
|
return [];
|
|
26
29
|
}
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
});
|
|
30
|
+
const { issues } = result.error;
|
|
31
|
+
return (config.required ? issues : issues.filter(omitInvalidTypeIssues)).map((issue) => ({
|
|
32
|
+
instanceId: config.id,
|
|
33
|
+
propertyTitle: config.title,
|
|
34
|
+
message: issue.message,
|
|
35
|
+
error: issue,
|
|
36
|
+
}));
|
|
35
37
|
}
|
|
36
38
|
//# sourceMappingURL=errors.js.map
|
package/dist/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EACjB,QAAQ,GAMT,MAAM,YAAY,CAAC;AAOpB,MAAM,UAAU,uBAAuB,CAAC,OAAiC;IACvE,OAAO,CACL,MAAuC,EACvC,UAAkB,EACW,EAAE;QAC/B,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACvC,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACjD,MAAM,aAAa,GACjB,iBAAiB,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC;gBAC7D,EAAE,KAAK;gBACT,wBAAwB,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC;gBAChD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;gBACjC,UAAU,CAAC;YACb,OAAO;gBACL,UAAU;gBACV,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC;gBACpC,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,KAAK,EAAE,KAAK;aACb,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,MAAc,EACd,MAAuC;IAEvC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EACjB,QAAQ,GAMT,MAAM,YAAY,CAAC;AAOpB,MAAM,UAAU,uBAAuB,CAAC,OAAiC;IACvE,OAAO,CACL,MAAuC,EACvC,UAAkB,EACW,EAAE;QAC/B,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACvC,MAAM,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACjD,MAAM,aAAa,GACjB,iBAAiB,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC;gBAC7D,EAAE,KAAK;gBACT,wBAAwB,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC;gBAChD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;gBACjC,UAAU,CAAC;YACb,OAAO;gBACL,UAAU;gBACV,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC;gBACpC,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,KAAK,EAAE,KAAK;aACb,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAiB;IAC9C,OAAO,KAAK,CAAC,IAAI,KAAK,cAAc,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,MAAc,EACd,MAAuC;IAEvC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC;IAChC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,CAAC,GAAG,CAC1E,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACV,UAAU,EAAE,MAAM,CAAC,EAAE;QACrB,aAAa,EAAE,MAAM,CAAC,KAAK;QAC3B,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,KAAK,EAAE,KAAK;KACb,CAAC,CACH,CAAC;AACJ,CAAC"}
|
package/dist/validator.js
CHANGED
|
@@ -4,8 +4,6 @@ import { resolveAllReferences, } from "@sjsf/form/core";
|
|
|
4
4
|
import {} from "@sjsf/form";
|
|
5
5
|
import { jsonSchemaToZod } from "json-schema-to-zod";
|
|
6
6
|
import { createErrorsTransformer, transformFieldErrors, } from "./errors.js";
|
|
7
|
-
const FIELD_REQUIRED = ["field"];
|
|
8
|
-
const FIELD_NOT_REQUIRED = [];
|
|
9
7
|
export function evalZodSchema(schema) {
|
|
10
8
|
return new Function("z", `return ${jsonSchemaToZod(schema)}`)(z);
|
|
11
9
|
}
|
|
@@ -23,24 +21,8 @@ export function createZodSchemaFactory() {
|
|
|
23
21
|
}
|
|
24
22
|
export function createFieldZodSchemaFactory() {
|
|
25
23
|
const cache = new WeakMap();
|
|
26
|
-
const
|
|
27
|
-
|
|
28
|
-
const factory = weakMemoize(cache, (schema) => evalZodSchema({
|
|
29
|
-
type: "object",
|
|
30
|
-
properties: {
|
|
31
|
-
field: schema,
|
|
32
|
-
},
|
|
33
|
-
required: isRequired ? FIELD_REQUIRED : FIELD_NOT_REQUIRED,
|
|
34
|
-
}));
|
|
35
|
-
return (config) => {
|
|
36
|
-
isRequired = config.required;
|
|
37
|
-
const prev = requiredCache.get(config.schema);
|
|
38
|
-
if (prev !== isRequired) {
|
|
39
|
-
requiredCache.set(config.schema, isRequired);
|
|
40
|
-
cache.delete(config.schema);
|
|
41
|
-
}
|
|
42
|
-
return factory(config.schema);
|
|
43
|
-
};
|
|
24
|
+
const factory = weakMemoize(cache, evalZodSchema);
|
|
25
|
+
return (config) => factory(config.schema);
|
|
44
26
|
}
|
|
45
27
|
export function createValidator({ createZodSchema, }) {
|
|
46
28
|
return {
|
|
@@ -74,7 +56,7 @@ export function createFieldValueValidator({ createFieldZodSchema, }) {
|
|
|
74
56
|
return {
|
|
75
57
|
validateFieldValue(config, fieldValue) {
|
|
76
58
|
const schema = createFieldZodSchema(config);
|
|
77
|
-
const result = schema.safeParse(
|
|
59
|
+
const result = schema.safeParse(fieldValue);
|
|
78
60
|
return transformFieldErrors(config, result);
|
|
79
61
|
},
|
|
80
62
|
};
|
package/dist/validator.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAiC,MAAM,KAAK,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EACL,oBAAoB,GAGrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAMN,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EACL,uBAAuB,EACvB,oBAAoB,GAErB,MAAM,aAAa,CAAC;AAErB,MAAM,
|
|
1
|
+
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sjsf/zod-validator",
|
|
3
|
-
"version": "2.0.0-next.
|
|
3
|
+
"version": "2.0.0-next.9",
|
|
4
4
|
"description": "The zod based validator for svelte-jsonschema-form",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"keywords": [
|
|
@@ -33,14 +33,14 @@
|
|
|
33
33
|
}
|
|
34
34
|
},
|
|
35
35
|
"peerDependencies": {
|
|
36
|
-
"@sjsf/form": "^2.0.0-next.
|
|
36
|
+
"@sjsf/form": "^2.0.0-next.9",
|
|
37
37
|
"zod": "^3.24.0",
|
|
38
38
|
"json-schema-to-zod": "^2.6.0"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
|
-
"zod": "^3.24.
|
|
41
|
+
"zod": "^3.24.3",
|
|
42
42
|
"json-schema-to-zod": "^2.6.1",
|
|
43
|
-
"@sjsf/form": "2.0.0-next.
|
|
43
|
+
"@sjsf/form": "2.0.0-next.9"
|
|
44
44
|
},
|
|
45
45
|
"scripts": {
|
|
46
46
|
"build": "tsc && publint",
|