@effect-app/vue 0.45.1 → 0.46.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/CHANGELOG.md +22 -0
- package/_cjs/form.cjs +3 -3
- package/_cjs/form.cjs.map +1 -1
- package/_src/form.ts +16 -15
- package/dist/form.d.ts +1 -1
- package/dist/form.d.ts.map +1 -1
- package/dist/form.js +5 -5
- package/package.json +5 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
# @effect-app/vue
|
|
2
2
|
|
|
3
|
+
## 0.46.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- Update packages
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- Updated dependencies
|
|
12
|
+
- @effect-app/core@0.53.0
|
|
13
|
+
- @effect-app/prelude@0.53.0
|
|
14
|
+
- @effect-app/schema@0.47.0
|
|
15
|
+
- @effect-app/vue@0.46.0
|
|
16
|
+
|
|
17
|
+
## 0.45.2
|
|
18
|
+
|
|
19
|
+
### Patch Changes
|
|
20
|
+
|
|
21
|
+
- Enhance validation
|
|
22
|
+
- Updated dependencies
|
|
23
|
+
- @effect-app/vue@0.45.2
|
|
24
|
+
|
|
3
25
|
## 0.45.1
|
|
4
26
|
|
|
5
27
|
### Patch Changes
|
package/_cjs/form.cjs
CHANGED
|
@@ -49,10 +49,10 @@ function buildFieldInfo(propOrSchema, fieldKey) {
|
|
|
49
49
|
const schema = (0, _schema.isSchema)(propOrSchema) ? propOrSchema : propOrSchema._schema;
|
|
50
50
|
const parse = _schema.Parser.for(schema);
|
|
51
51
|
const nullable = tsplus_module_2.Schema.findAnnotation(schema, tsplus_module_2.Schema.nullableIdentifier);
|
|
52
|
-
function renderError(e) {
|
|
52
|
+
function renderError(e, v) {
|
|
53
53
|
const err = (0, _schema.drawError)(e);
|
|
54
54
|
const custom = customSchemaErrors.value.get(schema) ?? (nullable?.self ? customSchemaErrors.value.get(nullable.self) : undefined);
|
|
55
|
-
return custom ? custom(err, e) : translate.value({
|
|
55
|
+
return custom ? custom(err, e, v) : translate.value({
|
|
56
56
|
defaultMessage: "The entered value is not a valid {type}: {message}",
|
|
57
57
|
id: "validation.not_a_valid"
|
|
58
58
|
}, {
|
|
@@ -88,7 +88,7 @@ function buildFieldInfo(propOrSchema, fieldKey) {
|
|
|
88
88
|
isExclusive: metadata.maximumExclusive,
|
|
89
89
|
maximum: metadata.maximum
|
|
90
90
|
})];
|
|
91
|
-
const parseRule = tsplus_module_5.
|
|
91
|
+
const parseRule = v => tsplus_module_5.pipe(parse(v), _schema.These.result, _ => tsplus_module_4.match(_, _ => renderError(_, v), ([_, optErr]) => tsplus_module_3.isSome(optErr) ? renderError(optErr.value, v) : true));
|
|
92
92
|
const rules = [...(metadata.type === "text" ? stringRules : numberRules), parseRule];
|
|
93
93
|
const info = {
|
|
94
94
|
type: metadata.type,
|
package/_cjs/form.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form.cjs","names":["_schema","require","_intl","_vue","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","_interopRequireWildcard","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","convertIn","v","type","convertOutInt","trim","c","parseFloat","parseInt","convertOut","buildFieldInfoFromProps","props","tsplus_module_1","RecordKeys","object$","reduce","prev","cur","buildFieldInfo","f","Symbol","PhantomTypeParameter","defaultIntl","createIntl","locale","translate","ref","formatMessage","bind","exports","customSchemaErrors","Map","propOrSchema","fieldKey","metadata","getMetadataFromSchemaOrProp","schema","isSchema","parse","Parser","for","nullable","tsplus_module_2","Schema","findAnnotation","nullableIdentifier","renderError","e","err","drawError","custom","value","self","undefined","defaultMessage","id","capitalize","toString","String","message","slice","indexOf","stringRules","minLength","length","maxLength","numberRules","minimum","minimumExclusive","isExclusive","maximum","maximumExclusive","parseRule","tsplus_module_5","
|
|
1
|
+
{"version":3,"file":"form.cjs","names":["_schema","require","_intl","_vue","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","_interopRequireWildcard","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","convertIn","v","type","convertOutInt","trim","c","parseFloat","parseInt","convertOut","buildFieldInfoFromProps","props","tsplus_module_1","RecordKeys","object$","reduce","prev","cur","buildFieldInfo","f","Symbol","PhantomTypeParameter","defaultIntl","createIntl","locale","translate","ref","formatMessage","bind","exports","customSchemaErrors","Map","propOrSchema","fieldKey","metadata","getMetadataFromSchemaOrProp","schema","isSchema","parse","Parser","for","nullable","tsplus_module_2","Schema","findAnnotation","nullableIdentifier","renderError","e","err","drawError","custom","value","self","undefined","defaultMessage","id","capitalize","toString","String","message","slice","indexOf","stringRules","minLength","length","maxLength","numberRules","minimum","minimumExclusive","isExclusive","maximum","maximumExclusive","parseRule","tsplus_module_5","pipe","These","result","_","tsplus_module_4","match","optErr","tsplus_module_3","isSome","rules","info","required","converted","r","res"],"sources":["../_src/form.ts"],"sourcesContent":[null],"mappings":"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"}
|
package/_src/form.ts
CHANGED
|
@@ -67,7 +67,7 @@ type GetSchemaFromProp<T> = T extends Property<infer S, any, any, any> ? S
|
|
|
67
67
|
|
|
68
68
|
const defaultIntl = createIntl({ locale: "en" })
|
|
69
69
|
export const translate = ref<IntlFormatters["formatMessage"]>(defaultIntl.formatMessage.bind(defaultIntl))
|
|
70
|
-
export const customSchemaErrors = ref<Map<SchemaAny, (message: string, e: unknown) => string>>(new Map())
|
|
70
|
+
export const customSchemaErrors = ref<Map<SchemaAny, (message: string, e: unknown, v: unknown) => string>>(new Map())
|
|
71
71
|
|
|
72
72
|
function buildFieldInfo(
|
|
73
73
|
propOrSchema: AnyProperty | SchemaAny,
|
|
@@ -79,11 +79,11 @@ function buildFieldInfo(
|
|
|
79
79
|
|
|
80
80
|
const nullable = Schema.findAnnotation(schema, Schema.nullableIdentifier)
|
|
81
81
|
|
|
82
|
-
function renderError(e: any) {
|
|
82
|
+
function renderError(e: any, v: unknown) {
|
|
83
83
|
const err = drawError(e)
|
|
84
84
|
const custom = customSchemaErrors.value.get(schema)
|
|
85
85
|
?? (nullable?.self ? customSchemaErrors.value.get(nullable.self) : undefined)
|
|
86
|
-
return custom ? custom(err, e) : translate.value(
|
|
86
|
+
return custom ? custom(err, e, v) : translate.value(
|
|
87
87
|
{ defaultMessage: "The entered value is not a valid {type}: {message}", id: "validation.not_a_valid" },
|
|
88
88
|
{
|
|
89
89
|
type: translate.value({
|
|
@@ -139,18 +139,19 @@ function buildFieldInfo(
|
|
|
139
139
|
}, { isExclusive: metadata.maximumExclusive, maximum: metadata.maximum })
|
|
140
140
|
]
|
|
141
141
|
|
|
142
|
-
const parseRule =
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
_
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
optErr
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
142
|
+
const parseRule = (v: unknown) =>
|
|
143
|
+
pipe(
|
|
144
|
+
parse(v),
|
|
145
|
+
These.result,
|
|
146
|
+
(_) =>
|
|
147
|
+
_.match(
|
|
148
|
+
(_) => renderError(_, v),
|
|
149
|
+
([_, optErr]) =>
|
|
150
|
+
optErr.isSome()
|
|
151
|
+
? renderError(optErr.value, v)
|
|
152
|
+
: true
|
|
153
|
+
)
|
|
154
|
+
)
|
|
154
155
|
|
|
155
156
|
type UnknownRule = (v: unknown) => boolean | string
|
|
156
157
|
const rules: UnknownRule[] = [
|
package/dist/form.d.ts
CHANGED
|
@@ -27,6 +27,6 @@ export declare const translate: import("vue").Ref<{
|
|
|
27
27
|
(descriptor: import("@formatjs/intl").MessageDescriptor, values?: Record<string, import("intl-messageformat").PrimitiveType | import("intl-messageformat").FormatXMLElementFn<string, string>> | undefined, opts?: import("intl-messageformat").Options | undefined): string;
|
|
28
28
|
<T extends unknown>(descriptor: import("@formatjs/intl").MessageDescriptor, values?: Record<string, import("intl-messageformat").PrimitiveType | T | import("intl-messageformat").FormatXMLElementFn<T>> | undefined, opts?: import("intl-messageformat").Options | undefined): string | T | (string | T)[];
|
|
29
29
|
}>;
|
|
30
|
-
export declare const customSchemaErrors: import("vue").Ref<Map<SchemaAny, (message: string, e: unknown) => string>>;
|
|
30
|
+
export declare const customSchemaErrors: import("vue").Ref<Map<SchemaAny, (message: string, e: unknown, v: unknown) => string>>;
|
|
31
31
|
export {};
|
|
32
32
|
//# sourceMappingURL=form.d.ts.map
|
package/dist/form.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../_src/form.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,SAAS,EACT,mBAAmB,EACnB,QAAQ,EACR,cAAc,EACd,SAAS,EACV,MAAM,4BAA4B,CAAA;AAInC,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,UAE1E;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,0BAIvE;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI,KAAK,IAAI,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,QAEtG;AAED,wBAAgB,uBAAuB,CAAC,KAAK,SAAS,cAAc,EAClE,KAAK,EAAE,KAAK,gIAcb;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,QAAA,MAAM,CAAC,eAAW,CAAA;AAClB,uBAAe,oBAAoB,CACjC,UAAU,SAAS,MAAM,GAAG,EAC5B,gBAAgB;IAEhB,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE;QAC7B,QAAQ,EAAE,KAAK,IAAI,UAAU,GAAG,CAAC,CAAC,EAAE,gBAAgB,KAAK,gBAAgB;KAC1E,CAAA;CACF;AACD,MAAM,WAAW,SAAS,CAAC,GAAG,EAAE,IAAI,CAAE,SAAQ,oBAAoB,CAAC,OAAO,CAAC,EAAE;IAAE,EAAE,EAAE,GAAG,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,CAAC;IAClG,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,GAAG,MAAM,CAAC,EAAE,CAAA;IAC1C,QAAQ,EAAE,aAAa,CAAA;IACvB,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,CAAA;CAC/B;AAED,KAAK,iBAAiB,CAAC,CAAC,IAAI,CAAC,SAAS,QAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,GACtE,KAAK,CAAA;AAGT,eAAO,MAAM,SAAS;;;EAAoF,CAAA;AAC1G,eAAO,MAAM,kBAAkB,6CAAgC,MAAM,KAAK,OAAO,KAAK,MAAM,EAAa,CAAA"}
|
|
1
|
+
{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../_src/form.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAEV,SAAS,EACT,mBAAmB,EACnB,QAAQ,EACR,cAAc,EACd,SAAS,EACV,MAAM,4BAA4B,CAAA;AAInC,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,UAE1E;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,0BAIvE;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,GAAG,IAAI,KAAK,IAAI,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,QAEtG;AAED,wBAAgB,uBAAuB,CAAC,KAAK,SAAS,cAAc,EAClE,KAAK,EAAE,KAAK,gIAcb;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,QAAA,MAAM,CAAC,eAAW,CAAA;AAClB,uBAAe,oBAAoB,CACjC,UAAU,SAAS,MAAM,GAAG,EAC5B,gBAAgB;IAEhB,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE;QAC7B,QAAQ,EAAE,KAAK,IAAI,UAAU,GAAG,CAAC,CAAC,EAAE,gBAAgB,KAAK,gBAAgB;KAC1E,CAAA;CACF;AACD,MAAM,WAAW,SAAS,CAAC,GAAG,EAAE,IAAI,CAAE,SAAQ,oBAAoB,CAAC,OAAO,CAAC,EAAE;IAAE,EAAE,EAAE,GAAG,CAAC;IAAC,GAAG,EAAE,IAAI,CAAA;CAAE,CAAC;IAClG,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,GAAG,MAAM,CAAC,EAAE,CAAA;IAC1C,QAAQ,EAAE,aAAa,CAAA;IACvB,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,CAAA;CAC/B;AAED,KAAK,iBAAiB,CAAC,CAAC,IAAI,CAAC,SAAS,QAAQ,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,CAAC,GACtE,KAAK,CAAA;AAGT,eAAO,MAAM,SAAS;;;EAAoF,CAAA;AAC1G,eAAO,MAAM,kBAAkB,6CAAgC,MAAM,KAAK,OAAO,KAAK,OAAO,KAAK,MAAM,EAAa,CAAA"}
|
package/dist/form.js
CHANGED
|
@@ -34,11 +34,11 @@ function buildFieldInfo(propOrSchema, fieldKey) {
|
|
|
34
34
|
const schema = isSchema(propOrSchema) ? propOrSchema : propOrSchema._schema;
|
|
35
35
|
const parse = Parser.for(schema);
|
|
36
36
|
const nullable = tsplus_module_2.Schema.findAnnotation(schema, tsplus_module_2.Schema.nullableIdentifier);
|
|
37
|
-
function renderError(e) {
|
|
37
|
+
function renderError(e, v) {
|
|
38
38
|
const err = drawError(e);
|
|
39
39
|
const custom = customSchemaErrors.value.get(schema)
|
|
40
40
|
?? (nullable?.self ? customSchemaErrors.value.get(nullable.self) : undefined);
|
|
41
|
-
return custom ? custom(err, e) : translate.value({ defaultMessage: "The entered value is not a valid {type}: {message}", id: "validation.not_a_valid" }, {
|
|
41
|
+
return custom ? custom(err, e, v) : translate.value({ defaultMessage: "The entered value is not a valid {type}: {message}", id: "validation.not_a_valid" }, {
|
|
42
42
|
type: translate.value({
|
|
43
43
|
defaultMessage: capitalize(fieldKey.toString()),
|
|
44
44
|
id: `fieldNames.${String(fieldKey)}`
|
|
@@ -84,8 +84,8 @@ function buildFieldInfo(propOrSchema, fieldKey) {
|
|
|
84
84
|
id: "validation.number.max"
|
|
85
85
|
}, { isExclusive: metadata.maximumExclusive, maximum: metadata.maximum })
|
|
86
86
|
];
|
|
87
|
-
const parseRule = tsplus_module_5.
|
|
88
|
-
? renderError(optErr.value)
|
|
87
|
+
const parseRule = (v) => tsplus_module_5.pipe(parse(v), These.result, (_) => tsplus_module_4.match(_, (_) => renderError(_, v), ([_, optErr]) => tsplus_module_3.isSome(optErr)
|
|
88
|
+
? renderError(optErr.value, v)
|
|
89
89
|
: true));
|
|
90
90
|
const rules = [
|
|
91
91
|
...(metadata.type === "text"
|
|
@@ -114,4 +114,4 @@ function buildFieldInfo(propOrSchema, fieldKey) {
|
|
|
114
114
|
};
|
|
115
115
|
return info;
|
|
116
116
|
}
|
|
117
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
117
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvZm9ybS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsMkJBQTJCLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQTtBQVM1RyxPQUFPLEVBQUUsVUFBVSxFQUF1QixNQUFNLGdCQUFnQixDQUFBO0FBQ2hFLE9BQU8sRUFBRSxVQUFVLEVBQUUsR0FBRyxFQUFFLE1BQU0sS0FBSyxDQUFBO0FBRXJDLE1BQU0sVUFBVSxTQUFTLENBQUMsQ0FBZ0IsRUFBRSxJQUErQjtJQUN6RSxPQUFPLENBQUMsS0FBSyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFBO0FBQ3ZELENBQUM7QUFFRCxNQUFNLFVBQVUsYUFBYSxDQUFDLENBQVMsRUFBRSxJQUErQjtJQUN0RSxDQUFDLEdBQUcsQ0FBQyxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUE7SUFDNUIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssT0FBTyxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxLQUFLLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQy9GLE9BQU8sQ0FBQyxDQUFBO0FBQ1YsQ0FBQztBQUVELE1BQU0sVUFBVSxVQUFVLENBQUMsQ0FBUyxFQUFFLEdBQWdDLEVBQUUsSUFBK0I7SUFDckcs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
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/vue",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.46.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
@@ -11,10 +11,10 @@
|
|
|
11
11
|
"query-string": "^8.1.0",
|
|
12
12
|
"swrv": "^1.0.3",
|
|
13
13
|
"vue": "^3.2.47",
|
|
14
|
-
"@effect-app/
|
|
15
|
-
"@effect-app/core": "0.
|
|
16
|
-
"@effect-app/
|
|
17
|
-
"@effect-app/
|
|
14
|
+
"@effect-app/prelude": "0.53.0",
|
|
15
|
+
"@effect-app/core": "0.53.0",
|
|
16
|
+
"@effect-app/schema": "0.47.0",
|
|
17
|
+
"@effect-app/vue": "0.46.0"
|
|
18
18
|
},
|
|
19
19
|
"devDependencies": {
|
|
20
20
|
"@rollup/pluginutils": "^5.0.2",
|