@sjsf/zod-validator 1.7.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/LICENSE +7 -0
- package/README.md +38 -0
- package/dist/augmentation.d.ts +11 -0
- package/dist/augmentation.d.ts.map +1 -0
- package/dist/augmentation.js +26 -0
- package/dist/augmentation.js.map +1 -0
- package/dist/factory.d.ts +6 -0
- package/dist/factory.d.ts.map +1 -0
- package/dist/factory.js +8 -0
- package/dist/factory.js.map +1 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +3 -0
- package/dist/index.js.map +1 -0
- package/dist/shared.d.ts +5 -0
- package/dist/shared.d.ts.map +1 -0
- package/dist/shared.js +23 -0
- package/dist/shared.js.map +1 -0
- package/dist/validator.d.ts +33 -0
- package/dist/validator.d.ts.map +1 -0
- package/dist/validator.js +105 -0
- package/dist/validator.js.map +1 -0
- package/package.json +53 -0
package/LICENSE
ADDED
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
Copyright (c) 2024 Roman Krasilnikov
|
|
2
|
+
|
|
3
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
|
4
|
+
|
|
5
|
+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
|
6
|
+
|
|
7
|
+
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
package/README.md
ADDED
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
# @sjsf/zod-validator
|
|
2
|
+
|
|
3
|
+
The [zod](https://github.com/colinhacks/zod) based validator for [svelte-jsonschema-form](https://github.com/x0k/svelte-jsonschema-form).
|
|
4
|
+
|
|
5
|
+
- [Documentation](https://x0k.github.io/svelte-jsonschema-form/validators/zod/)
|
|
6
|
+
- [Playground](https://x0k.github.io/svelte-jsonschema-form/playground/)
|
|
7
|
+
|
|
8
|
+
## Installation
|
|
9
|
+
|
|
10
|
+
```shell
|
|
11
|
+
npm install @sjsf/zod-validator zod zod-to-json-schema json-schema-to-zod
|
|
12
|
+
```
|
|
13
|
+
|
|
14
|
+
## Usage
|
|
15
|
+
|
|
16
|
+
```typescript
|
|
17
|
+
import { useForm2, type Schema } from '@sjsf/form'
|
|
18
|
+
import { createValidator } from "@sjsf/zod-validator";
|
|
19
|
+
import { zodToJsonSchema } from "zod-to-json-schema";
|
|
20
|
+
import { z } from "zod";
|
|
21
|
+
|
|
22
|
+
const schema = z.object({
|
|
23
|
+
/* your schema */
|
|
24
|
+
});
|
|
25
|
+
|
|
26
|
+
const validator = createValidator({
|
|
27
|
+
schema,
|
|
28
|
+
});
|
|
29
|
+
|
|
30
|
+
const form = useForm2({
|
|
31
|
+
schema: zodToJsonSchema(schema) as Schema,
|
|
32
|
+
validator
|
|
33
|
+
})
|
|
34
|
+
```
|
|
35
|
+
|
|
36
|
+
## License
|
|
37
|
+
|
|
38
|
+
MIT
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { type FormValidator2, type UiSchemaRoot } from "@sjsf/form";
|
|
2
|
+
import type { ZodIssue, ZodSchema } from "zod";
|
|
3
|
+
export interface ZodOptions {
|
|
4
|
+
async?: boolean;
|
|
5
|
+
schema: ZodSchema;
|
|
6
|
+
uiSchema?: UiSchemaRoot;
|
|
7
|
+
idPrefix?: string;
|
|
8
|
+
idSeparator?: string;
|
|
9
|
+
}
|
|
10
|
+
export declare function withZod<E>(validator: FormValidator2<E>, { schema: zodSchema, uiSchema, idPrefix, idSeparator, async, }: ZodOptions): FormValidator2<E | ZodIssue>;
|
|
11
|
+
//# sourceMappingURL=augmentation.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"augmentation.d.ts","sourceRoot":"","sources":["../src/augmentation.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,YAAY,EAGlB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAI/C,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,SAAS,CAAC;IAClB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,OAAO,CAAC,CAAC,EACvB,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,EAC5B,EACE,MAAM,EAAE,SAAS,EACjB,QAAa,EACb,QAA4B,EAC5B,WAAkC,EAClC,KAAa,GACd,EAAE,UAAU,GACZ,cAAc,CAAC,CAAC,GAAG,QAAQ,CAAC,CAuB9B"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { DEFAULT_ID_PREFIX, DEFAULT_ID_SEPARATOR, } from "@sjsf/form";
|
|
2
|
+
import { makeFormDataValidationResultTransformer } from "./shared.js";
|
|
3
|
+
export function withZod(validator, { schema: zodSchema, uiSchema = {}, idPrefix = DEFAULT_ID_PREFIX, idSeparator = DEFAULT_ID_SEPARATOR, async = false, }) {
|
|
4
|
+
const transformFormDataValidationResult = makeFormDataValidationResultTransformer(idPrefix, idSeparator, uiSchema);
|
|
5
|
+
return {
|
|
6
|
+
isValid(schema, rootSchema, formData) {
|
|
7
|
+
return validator.isValid(schema, rootSchema, formData);
|
|
8
|
+
},
|
|
9
|
+
validateFieldData(field, fieldData, signal) {
|
|
10
|
+
return validator.validateFieldData(field, fieldData, signal);
|
|
11
|
+
},
|
|
12
|
+
reset() {
|
|
13
|
+
validator.reset();
|
|
14
|
+
},
|
|
15
|
+
validateFormData(_rootSchema, formData) {
|
|
16
|
+
if (async) {
|
|
17
|
+
return zodSchema
|
|
18
|
+
.safeParseAsync(formData)
|
|
19
|
+
.then(transformFormDataValidationResult);
|
|
20
|
+
}
|
|
21
|
+
const result = zodSchema.safeParse(formData);
|
|
22
|
+
return transformFormDataValidationResult(result);
|
|
23
|
+
},
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=augmentation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"augmentation.js","sourceRoot":"","sources":["../src/augmentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,uCAAuC,EAAE,MAAM,aAAa,CAAC;AAUtE,MAAM,UAAU,OAAO,CACrB,SAA4B,EAC5B,EACE,MAAM,EAAE,SAAS,EACjB,QAAQ,GAAG,EAAE,EACb,QAAQ,GAAG,iBAAiB,EAC5B,WAAW,GAAG,oBAAoB,EAClC,KAAK,GAAG,KAAK,GACF;IAEb,MAAM,iCAAiC,GACrC,uCAAuC,CAAC,QAAQ,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;IAC3E,OAAO;QACL,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ;YAClC,OAAO,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QACzD,CAAC;QACD,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM;YACxC,OAAO,SAAS,CAAC,iBAAiB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC/D,CAAC;QACD,KAAK;YACH,SAAS,CAAC,KAAK,EAAE,CAAC;QACpB,CAAC;QACD,gBAAgB,CAAC,WAAW,EAAE,QAAQ;YACpC,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO,SAAS;qBACb,cAAc,CAAC,QAAQ,CAAC;qBACxB,IAAI,CAAC,iCAAiC,CAAC,CAAC;YAC7C,CAAC;YACD,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAC7C,OAAO,iCAAiC,CAAC,MAAM,CAAC,CAAC;QACnD,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { Validator, type ValidatorOptions } from "./validator.js";
|
|
2
|
+
export type ValidatorFactoryOptions<Async extends boolean> = Omit<ValidatorOptions<Async>, "async"> & {
|
|
3
|
+
async?: Async;
|
|
4
|
+
};
|
|
5
|
+
export declare function createValidator<Async extends boolean = false>(options: ValidatorFactoryOptions<Async>): Validator<false | Async>;
|
|
6
|
+
//# sourceMappingURL=factory.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAElE,MAAM,MAAM,uBAAuB,CAAC,KAAK,SAAS,OAAO,IAAI,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,GAAG;IACpG,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,CAAA;AAED,wBAAgB,eAAe,CAAC,KAAK,SAAS,OAAO,GAAG,KAAK,EAAE,OAAO,EAAE,uBAAuB,CAAC,KAAK,CAAC,4BAKrG"}
|
package/dist/factory.js
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAyB,MAAM,gBAAgB,CAAC;AAMlE,MAAM,UAAU,eAAe,CAAgC,OAAuC;IACpG,OAAO,IAAI,SAAS,CAAC;QACnB,GAAG,OAAO;QACV,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,KAAK;KAC9B,CAAC,CAAC;AACL,CAAC"}
|
package/dist/index.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,cAAc,CAAA"}
|
package/dist/index.js
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,cAAc,CAAA"}
|
package/dist/shared.d.ts
ADDED
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { type FieldErrors, type UiSchemaRoot, type ValidationError } from "@sjsf/form";
|
|
2
|
+
import type { z, ZodIssue } from "zod";
|
|
3
|
+
export declare const NO_ERRORS: FieldErrors<ZodIssue>;
|
|
4
|
+
export declare function makeFormDataValidationResultTransformer(idPrefix: string, idSeparator: string, uiSchema: UiSchemaRoot): (result: z.SafeParseReturnType<any, any>) => ValidationError<ZodIssue>[];
|
|
5
|
+
//# sourceMappingURL=shared.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../src/shared.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,eAAe,EACrB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAEvC,eAAO,MAAM,SAAS,EAAE,WAAW,CAAC,QAAQ,CAAM,CAAC;AAEnD,wBAAgB,uCAAuC,CACrD,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,YAAY,YAGZ,CAAC,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,KACtC,eAAe,CAAC,QAAQ,CAAC,EAAE,CAkB/B"}
|
package/dist/shared.js
ADDED
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { getValueByPath } from "@sjsf/form/lib/object";
|
|
2
|
+
import { pathToId, } from "@sjsf/form";
|
|
3
|
+
export const NO_ERRORS = [];
|
|
4
|
+
export function makeFormDataValidationResultTransformer(idPrefix, idSeparator, uiSchema) {
|
|
5
|
+
return (result) => {
|
|
6
|
+
if (result.success) {
|
|
7
|
+
return NO_ERRORS;
|
|
8
|
+
}
|
|
9
|
+
return result.error.issues.map((issue) => {
|
|
10
|
+
const instanceId = pathToId(idPrefix, idSeparator, issue.path);
|
|
11
|
+
const propertyTitle = getValueByPath(uiSchema, issue.path)?.["ui:options"]?.title ??
|
|
12
|
+
issue.path[issue.path.length - 1] ??
|
|
13
|
+
instanceId;
|
|
14
|
+
return {
|
|
15
|
+
instanceId,
|
|
16
|
+
propertyTitle,
|
|
17
|
+
message: issue.message,
|
|
18
|
+
error: issue,
|
|
19
|
+
};
|
|
20
|
+
});
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
//# sourceMappingURL=shared.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../src/shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EACL,QAAQ,GAIT,MAAM,YAAY,CAAC;AAGpB,MAAM,CAAC,MAAM,SAAS,GAA0B,EAAE,CAAC;AAEnD,MAAM,UAAU,uCAAuC,CACrD,QAAgB,EAChB,WAAmB,EACnB,QAAsB;IAEtB,OAAO,CACL,MAAuC,EACV,EAAE;QAC/B,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACvC,MAAM,UAAU,GAAG,QAAQ,CAAC,QAAQ,EAAE,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC/D,MAAM,aAAa,GACjB,cAAc,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,KAAK;gBAC3D,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;gBACjC,UAAU,CAAC;YACb,OAAO;gBACL,UAAU;gBACV,aAAa;gBACb,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,KAAK,EAAE,KAAK;aACb,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { type SchemaDefinition } from "@sjsf/form/core";
|
|
2
|
+
import { type Config, type FormValidator2, type Schema, type SchemaValue, type UiSchemaRoot, type ValidationError } from "@sjsf/form";
|
|
3
|
+
import { z, type ZodIssue, type ZodSchema } from "zod";
|
|
4
|
+
export declare function evalZodSchema(schema: Schema): any;
|
|
5
|
+
export declare function makeZodSchemaFactory(): (schema: Schema, rootSchema: Schema) => z.ZodType<any, z.ZodTypeDef, any>;
|
|
6
|
+
export declare function makeFieldZodSchemaFactory(): (config: Config) => z.ZodType<any, z.ZodTypeDef, any>;
|
|
7
|
+
export interface ValidatorOptions<Async extends boolean> {
|
|
8
|
+
async: Async;
|
|
9
|
+
schema: ZodSchema;
|
|
10
|
+
uiSchema?: UiSchemaRoot;
|
|
11
|
+
idPrefix?: string;
|
|
12
|
+
idSeparator?: string;
|
|
13
|
+
zodSchemaFactory?: (schema: Schema, rootSchema: Schema) => ZodSchema;
|
|
14
|
+
fieldZodSchemaFactory?: (config: Config) => ZodSchema;
|
|
15
|
+
}
|
|
16
|
+
export type ValidationResult<Async extends boolean> = Async extends true ? Promise<ValidationError<ZodIssue>[]> : ValidationError<ZodIssue>[];
|
|
17
|
+
export declare class Validator<Async extends boolean> implements FormValidator2<ZodIssue> {
|
|
18
|
+
protected readonly async: Async;
|
|
19
|
+
protected readonly zodSchema: ZodSchema;
|
|
20
|
+
protected readonly uiSchema: UiSchemaRoot;
|
|
21
|
+
protected readonly idPrefix: string;
|
|
22
|
+
protected readonly idSeparator: string;
|
|
23
|
+
protected readonly zodSchemaFactory: (schema: Schema, rootSchema: Schema) => ZodSchema;
|
|
24
|
+
protected readonly fieldZodSchemaFactory: (config: Config) => ZodSchema;
|
|
25
|
+
protected readonly transformFormDataValidationResult: (result: z.SafeParseReturnType<any, any>) => ValidationError<ZodIssue>[];
|
|
26
|
+
constructor({ async, schema, uiSchema, idPrefix, idSeparator, zodSchemaFactory, fieldZodSchemaFactory, }: ValidatorOptions<Async>);
|
|
27
|
+
validateFieldData(config: Config, fieldData: SchemaValue | undefined): ValidationResult<Async>;
|
|
28
|
+
isValid(schema: SchemaDefinition, rootSchema: Schema, formData: SchemaValue | undefined): boolean;
|
|
29
|
+
reset(): void;
|
|
30
|
+
validateFormData(_rootSchema: Schema, formData: SchemaValue | undefined): ValidationResult<Async>;
|
|
31
|
+
protected transformFieldDataValidationResult: (result: z.SafeParseReturnType<any, any>, config: Config) => ValidationError<ZodIssue>[];
|
|
32
|
+
}
|
|
33
|
+
//# sourceMappingURL=validator.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAwB,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAGL,KAAK,MAAM,EACX,KAAK,cAAc,EACnB,KAAK,MAAM,EACX,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,eAAe,EACrB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,CAAC,EAAE,KAAK,QAAQ,EAAE,KAAK,SAAS,EAAE,MAAM,KAAK,CAAC;AASvD,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,OAE3C;AAED,wBAAgB,oBAAoB,aAMlB,MAAM,cAAc,MAAM,uCAO3C;AAED,wBAAgB,yBAAyB,aAavB,MAAM,uCASvB;AAED,MAAM,WAAW,gBAAgB,CAAC,KAAK,SAAS,OAAO;IACrD,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,SAAS,CAAC;IAClB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,SAAS,CAAC;IACrE,qBAAqB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,SAAS,CAAC;CACvD;AAED,MAAM,MAAM,gBAAgB,CAAC,KAAK,SAAS,OAAO,IAAI,KAAK,SAAS,IAAI,GACpE,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC,GACpC,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC;AAEhC,qBAAa,SAAS,CAAC,KAAK,SAAS,OAAO,CAC1C,YAAW,cAAc,CAAC,QAAQ,CAAC;IAEnC,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IACxC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC;IAC1C,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IACpC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IACvC,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CACnC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,KACf,SAAS,CAAC;IACf,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,SAAS,CAAC;IACxE,SAAS,CAAC,QAAQ,CAAC,iCAAiC,EAAE,CACpD,MAAM,EAAE,CAAC,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,KACpC,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACrB,EACV,KAAK,EACL,MAAM,EACN,QAAa,EACb,QAA4B,EAC5B,WAAkC,EAClC,gBAAyC,EACzC,qBAAmD,GACpD,EAAE,gBAAgB,CAAC,KAAK,CAAC;IAY1B,iBAAiB,CACf,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,WAAW,GAAG,SAAS,GACjC,gBAAgB,CAAC,KAAK,CAAC;IAa1B,OAAO,CACL,MAAM,EAAE,gBAAgB,EACxB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,WAAW,GAAG,SAAS,GAChC,OAAO;IASV,KAAK,IAAI,IAAI;IAEb,gBAAgB,CACd,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,WAAW,GAAG,SAAS,GAChC,gBAAgB,CAAC,KAAK,CAAC;IAY1B,SAAS,CAAC,kCAAkC,WAClC,CAAC,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,UAC/B,MAAM,KACb,eAAe,CAAC,QAAQ,CAAC,EAAE,CAY5B;CACH"}
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
import { resolveAllReferences } from "@sjsf/form/core";
|
|
2
|
+
import { DEFAULT_ID_PREFIX, DEFAULT_ID_SEPARATOR, } from "@sjsf/form";
|
|
3
|
+
import { z } from "zod";
|
|
4
|
+
import { jsonSchemaToZod } from "json-schema-to-zod";
|
|
5
|
+
import { weakMemoize } from "@sjsf/form/lib/memoize";
|
|
6
|
+
import { makeFormDataValidationResultTransformer, NO_ERRORS } from './shared.js';
|
|
7
|
+
const FIELD_REQUIRED = ["field"];
|
|
8
|
+
const FIELD_NOT_REQUIRED = [];
|
|
9
|
+
export function evalZodSchema(schema) {
|
|
10
|
+
return new Function("z", `return ${jsonSchemaToZod(schema)}`)(z);
|
|
11
|
+
}
|
|
12
|
+
export function makeZodSchemaFactory() {
|
|
13
|
+
const cache = new WeakMap();
|
|
14
|
+
let lastRootSchema;
|
|
15
|
+
const factory = weakMemoize(cache, (schema) => evalZodSchema(resolveAllReferences(schema, lastRootSchema)));
|
|
16
|
+
return (schema, rootSchema) => {
|
|
17
|
+
if (lastRootSchema !== rootSchema) {
|
|
18
|
+
lastRootSchema = rootSchema;
|
|
19
|
+
cache.delete(schema);
|
|
20
|
+
}
|
|
21
|
+
return factory(schema);
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
export function makeFieldZodSchemaFactory() {
|
|
25
|
+
const cache = new WeakMap();
|
|
26
|
+
const requiredCache = new WeakMap();
|
|
27
|
+
let isRequired = false;
|
|
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
|
+
};
|
|
44
|
+
}
|
|
45
|
+
export class Validator {
|
|
46
|
+
async;
|
|
47
|
+
zodSchema;
|
|
48
|
+
uiSchema;
|
|
49
|
+
idPrefix;
|
|
50
|
+
idSeparator;
|
|
51
|
+
zodSchemaFactory;
|
|
52
|
+
fieldZodSchemaFactory;
|
|
53
|
+
transformFormDataValidationResult;
|
|
54
|
+
constructor({ async, schema, uiSchema = {}, idPrefix = DEFAULT_ID_PREFIX, idSeparator = DEFAULT_ID_SEPARATOR, zodSchemaFactory = makeZodSchemaFactory(), fieldZodSchemaFactory = makeFieldZodSchemaFactory(), }) {
|
|
55
|
+
this.async = async;
|
|
56
|
+
this.zodSchema = schema;
|
|
57
|
+
this.uiSchema = uiSchema;
|
|
58
|
+
this.idPrefix = idPrefix;
|
|
59
|
+
this.idSeparator = idSeparator;
|
|
60
|
+
this.zodSchemaFactory = zodSchemaFactory;
|
|
61
|
+
this.fieldZodSchemaFactory = fieldZodSchemaFactory;
|
|
62
|
+
this.transformFormDataValidationResult =
|
|
63
|
+
makeFormDataValidationResultTransformer(idPrefix, idSeparator, uiSchema);
|
|
64
|
+
}
|
|
65
|
+
validateFieldData(config, fieldData) {
|
|
66
|
+
const instanceId = config.idSchema.$id;
|
|
67
|
+
if (instanceId === this.idPrefix) {
|
|
68
|
+
return this.validateFormData(config.schema, fieldData);
|
|
69
|
+
}
|
|
70
|
+
const schema = this.fieldZodSchemaFactory(config);
|
|
71
|
+
const result = schema.safeParse({ field: fieldData });
|
|
72
|
+
const transformed = this.transformFieldDataValidationResult(result, config);
|
|
73
|
+
return (this.async ? Promise.resolve(transformed) : transformed);
|
|
74
|
+
}
|
|
75
|
+
isValid(schema, rootSchema, formData) {
|
|
76
|
+
if (typeof schema === "boolean") {
|
|
77
|
+
return schema;
|
|
78
|
+
}
|
|
79
|
+
const zodSchema = this.zodSchemaFactory(schema, rootSchema);
|
|
80
|
+
const result = zodSchema.safeParse(formData);
|
|
81
|
+
return result.success;
|
|
82
|
+
}
|
|
83
|
+
reset() { }
|
|
84
|
+
validateFormData(_rootSchema, formData) {
|
|
85
|
+
return (this.async
|
|
86
|
+
? this.zodSchema
|
|
87
|
+
.safeParseAsync(formData)
|
|
88
|
+
.then(this.transformFormDataValidationResult)
|
|
89
|
+
: this.transformFormDataValidationResult(this.zodSchema.safeParse(formData)));
|
|
90
|
+
}
|
|
91
|
+
transformFieldDataValidationResult = (result, config) => {
|
|
92
|
+
if (result.success) {
|
|
93
|
+
return NO_ERRORS;
|
|
94
|
+
}
|
|
95
|
+
return result.error.issues.map((issue) => {
|
|
96
|
+
return {
|
|
97
|
+
instanceId: config.idSchema.$id,
|
|
98
|
+
propertyTitle: config.title,
|
|
99
|
+
message: issue.message,
|
|
100
|
+
error: issue,
|
|
101
|
+
};
|
|
102
|
+
});
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
//# sourceMappingURL=validator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../src/validator.ts"],"names":[],"mappings":"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"}
|
package/package.json
ADDED
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "@sjsf/zod-validator",
|
|
3
|
+
"version": "1.7.0",
|
|
4
|
+
"description": "The zod based validator for svelte-jsonschema-form",
|
|
5
|
+
"license": "MIT",
|
|
6
|
+
"keywords": [
|
|
7
|
+
"validator",
|
|
8
|
+
"jsonschema",
|
|
9
|
+
"zod"
|
|
10
|
+
],
|
|
11
|
+
"type": "module",
|
|
12
|
+
"files": [
|
|
13
|
+
"dist",
|
|
14
|
+
"!dist/**/*.test.*",
|
|
15
|
+
"!dist/**/*.spec.*"
|
|
16
|
+
],
|
|
17
|
+
"publishConfig": {
|
|
18
|
+
"provenance": true
|
|
19
|
+
},
|
|
20
|
+
"repository": {
|
|
21
|
+
"type": "git",
|
|
22
|
+
"url": "git+https://github.com/x0k/svelte-jsonschema-form.git",
|
|
23
|
+
"directory": "packages/zod-validator"
|
|
24
|
+
},
|
|
25
|
+
"bugs": "https://github.com/x0k/svelte-jsonschema-form/issues",
|
|
26
|
+
"homepage": "https://x0k.github.io/svelte-jsonschema-form/",
|
|
27
|
+
"types": "dist/index.d.ts",
|
|
28
|
+
"main": "dist/index.js",
|
|
29
|
+
"exports": {
|
|
30
|
+
".": {
|
|
31
|
+
"types": "./dist/index.d.ts",
|
|
32
|
+
"svelte": "./dist/index.js"
|
|
33
|
+
},
|
|
34
|
+
"./augmentation": {
|
|
35
|
+
"types": "./dist/augmentation.d.ts",
|
|
36
|
+
"svelte": "./dist/augmentation.js"
|
|
37
|
+
}
|
|
38
|
+
},
|
|
39
|
+
"peerDependencies": {
|
|
40
|
+
"@sjsf/form": "^1.7.0",
|
|
41
|
+
"zod": "^3.23.0",
|
|
42
|
+
"json-schema-to-zod": "^2.0.0"
|
|
43
|
+
},
|
|
44
|
+
"devDependencies": {
|
|
45
|
+
"zod": "^3.23.8",
|
|
46
|
+
"json-schema-to-zod": "^2.4.1",
|
|
47
|
+
"@sjsf/form": "1.7.0"
|
|
48
|
+
},
|
|
49
|
+
"scripts": {
|
|
50
|
+
"build": "tsc && publint",
|
|
51
|
+
"dev": "tsc --watch"
|
|
52
|
+
}
|
|
53
|
+
}
|