@sjsf/zod-validator 2.0.0-next.3 → 2.0.0-next.5
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 +2 -2
- package/dist/errors.d.ts +2 -2
- package/dist/errors.js +3 -2
- package/dist/errors.js.map +1 -1
- package/dist/validator.js +6 -6
- package/dist/validator.js.map +1 -1
- package/package.json +4 -4
package/README.md
CHANGED
|
@@ -3,12 +3,12 @@
|
|
|
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
5
|
- [Documentation](https://x0k.github.io/svelte-jsonschema-form/validators/zod/)
|
|
6
|
-
- [Playground](https://x0k.github.io/svelte-jsonschema-form/
|
|
6
|
+
- [Playground](https://x0k.github.io/svelte-jsonschema-form/playground2/)
|
|
7
7
|
|
|
8
8
|
## Installation
|
|
9
9
|
|
|
10
10
|
```shell
|
|
11
|
-
npm install @sjsf/zod-validator zod zod-to-json-schema json-schema-to-zod
|
|
11
|
+
npm install @sjsf/zod-validator@next zod zod-to-json-schema json-schema-to-zod
|
|
12
12
|
```
|
|
13
13
|
|
|
14
14
|
## Usage
|
package/dist/errors.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { type Config, type PathToIdOptions, type UiSchemaRoot, type ValidationError } from "@sjsf/form";
|
|
1
|
+
import { type Config, type PathToIdOptions, type Schema, type UiSchemaRoot, type ValidationError } from "@sjsf/form";
|
|
2
2
|
import type { z, ZodIssue } from "zod";
|
|
3
3
|
export interface ErrorsTransformerOptions extends PathToIdOptions {
|
|
4
4
|
uiSchema?: UiSchemaRoot;
|
|
5
5
|
}
|
|
6
|
-
export declare function createErrorsTransformer(options: ErrorsTransformerOptions): (result: z.SafeParseReturnType<any, any
|
|
6
|
+
export declare function createErrorsTransformer(options: ErrorsTransformerOptions): (result: z.SafeParseReturnType<any, any>, rootSchema: Schema) => ValidationError<ZodIssue>[];
|
|
7
7
|
export declare function transformFieldErrors(config: Config, result: z.SafeParseReturnType<any, any>): ValidationError<ZodIssue>[];
|
package/dist/errors.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { getUiSchemaByPath, pathToId, } from "@sjsf/form";
|
|
1
|
+
import { getRootSchemaTitleByPath, getUiSchemaByPath, pathToId, } from "@sjsf/form";
|
|
2
2
|
export function createErrorsTransformer(options) {
|
|
3
|
-
return (result) => {
|
|
3
|
+
return (result, rootSchema) => {
|
|
4
4
|
if (result.success) {
|
|
5
5
|
return [];
|
|
6
6
|
}
|
|
@@ -8,6 +8,7 @@ export function createErrorsTransformer(options) {
|
|
|
8
8
|
const instanceId = pathToId(issue.path, options);
|
|
9
9
|
const propertyTitle = getUiSchemaByPath(options.uiSchema, issue.path)?.["ui:options"]
|
|
10
10
|
?.title ??
|
|
11
|
+
getRootSchemaTitleByPath(rootSchema, issue.path) ??
|
|
11
12
|
issue.path[issue.path.length - 1] ??
|
|
12
13
|
instanceId;
|
|
13
14
|
return {
|
package/dist/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,QAAQ,
|
|
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,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACvC,OAAO;YACL,UAAU,EAAE,MAAM,CAAC,EAAE;YACrB,aAAa,EAAE,MAAM,CAAC,KAAK;YAC3B,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,KAAK,EAAE,KAAK;SACb,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/validator.js
CHANGED
|
@@ -54,19 +54,19 @@ export function createValidator({ createZodSchema, }) {
|
|
|
54
54
|
};
|
|
55
55
|
}
|
|
56
56
|
export function createFormValueValidator(options) {
|
|
57
|
+
const transform = createErrorsTransformer(options);
|
|
57
58
|
return {
|
|
58
|
-
validateFormValue(
|
|
59
|
-
|
|
60
|
-
return transform(options.zodSchema.safeParse(formValue));
|
|
59
|
+
validateFormValue(rootSchema, formValue) {
|
|
60
|
+
return transform(options.zodSchema.safeParse(formValue), rootSchema);
|
|
61
61
|
},
|
|
62
62
|
};
|
|
63
63
|
}
|
|
64
64
|
export function createAsyncFormValueValidator(options) {
|
|
65
|
+
const transform = createErrorsTransformer(options);
|
|
65
66
|
return {
|
|
66
|
-
async validateFormValueAsync(_signal,
|
|
67
|
-
const transform = createErrorsTransformer(options);
|
|
67
|
+
async validateFormValueAsync(_signal, rootSchema, formValue) {
|
|
68
68
|
const result = await options.zodSchema.safeParseAsync(formValue);
|
|
69
|
-
return transform(result);
|
|
69
|
+
return transform(result, rootSchema);
|
|
70
70
|
},
|
|
71
71
|
};
|
|
72
72
|
}
|
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,cAAc,GAAG,CAAC,OAAO,CAAC,CAAC;AACjC,MAAM,kBAAkB,GAAa,EAAE,CAAC;AAExC,MAAM,UAAU,aAAa,CAAC,MAAc;IAC1C,OAAO,IAAI,QAAQ,CAAC,GAAG,EAAE,UAAU,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,sBAAsB;IACpC,MAAM,KAAK,GAAG,IAAI,OAAO,EAAqB,CAAC;IAC/C,IAAI,cAAsB,CAAC;IAC3B,MAAM,OAAO,GAAG,WAAW,CAAoB,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAC/D,aAAa,CAAC,oBAAoB,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAC5D,CAAC;IACF,OAAO,CAAC,MAAc,EAAE,UAAkB,EAAE,EAAE;QAC5C,IAAI,cAAc,KAAK,UAAU,EAAE,CAAC;YAClC,cAAc,GAAG,UAAU,CAAC;YAC5B,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvB,CAAC;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC;IACzB,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,2BAA2B;IACzC,MAAM,KAAK,GAAG,IAAI,OAAO,EAAqB,CAAC;IAC/C,MAAM,aAAa,GAAG,IAAI,OAAO,EAAmB,CAAC;IACrD,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,MAAM,OAAO,GAAG,WAAW,CAAoB,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAC/D,aAAa,CAAC;QACZ,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,KAAK,EAAE,MAAM;SACd;QACD,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,kBAAkB;KAC3D,CAAC,CACH,CAAC;IACF,OAAO,CAAC,MAAc,EAAE,EAAE;QACxB,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC;QAC7B,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC9C,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;YACxB,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;YAC7C,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAChC,CAAC,CAAC;AACJ,CAAC;AAMD,MAAM,UAAU,eAAe,CAAC,EAC9B,eAAe,GACE;IACjB,OAAO;QACL,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS;YACnC,IAAI,OAAO,MAAM,KAAK,SAAS,EAAE,CAAC;gBAChC,OAAO,MAAM,CAAC;YAChB,CAAC;YACD,MAAM,SAAS,GAAG,eAAe,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;YACtD,OAAO,SAAS,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC;QAChD,CAAC;KACF,CAAC;AACJ,CAAC;AAMD,MAAM,UAAU,wBAAwB,CACtC,OAAkC;IAElC,
|
|
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.5",
|
|
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.
|
|
37
|
-
"zod": "^3.24.
|
|
36
|
+
"@sjsf/form": "^2.0.0-next.5",
|
|
37
|
+
"zod": "^3.24.0",
|
|
38
38
|
"json-schema-to-zod": "^2.6.0"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
41
|
"zod": "^3.24.2",
|
|
42
42
|
"json-schema-to-zod": "^2.6.0",
|
|
43
|
-
"@sjsf/form": "2.0.0-next.
|
|
43
|
+
"@sjsf/form": "2.0.0-next.5"
|
|
44
44
|
},
|
|
45
45
|
"scripts": {
|
|
46
46
|
"build": "tsc && publint",
|