@effect-app/vue 0.20.4 → 0.21.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 +14 -0
- package/_cjs/form.cjs +5 -1
- package/_cjs/form.cjs.map +1 -1
- package/_src/form.ts +12 -12
- package/dist/form.js +8 -4
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# @effect-app/vue
|
|
2
2
|
|
|
3
|
+
## 0.21.0
|
|
4
|
+
|
|
5
|
+
### Minor Changes
|
|
6
|
+
|
|
7
|
+
- d01ada27: Improve validation error display
|
|
8
|
+
|
|
9
|
+
### Patch Changes
|
|
10
|
+
|
|
11
|
+
- Updated dependencies [00d34a69]
|
|
12
|
+
- Updated dependencies [d01ada27]
|
|
13
|
+
- @effect-app/schema@0.21.0
|
|
14
|
+
- @effect-app/vue@0.21.0
|
|
15
|
+
- @effect-app/prelude@0.22.5
|
|
16
|
+
|
|
3
17
|
## 0.20.4
|
|
4
18
|
|
|
5
19
|
### Patch Changes
|
package/_cjs/form.cjs
CHANGED
|
@@ -33,9 +33,13 @@ function buildFieldInfo(propOrSchema, fieldKey) {
|
|
|
33
33
|
const metadata = (0, _schema.getMetadataFromSchemaOrProp)(propOrSchema);
|
|
34
34
|
const schema = (0, _schema.isSchema)(propOrSchema) ? propOrSchema : propOrSchema._schema;
|
|
35
35
|
const parse = _schema.Parser.for(schema);
|
|
36
|
+
function renderError(e) {
|
|
37
|
+
const err = (0, _schema.drawError)(e);
|
|
38
|
+
return `The entered value is not a valid ${(0, _vue.capitalize)(fieldKey.toString())} (${err.slice(err.indexOf("expected"))})`;
|
|
39
|
+
}
|
|
36
40
|
const info = {
|
|
37
41
|
type: "text",
|
|
38
|
-
rules: [v => !metadata.required || v !== "" || "The field cannot be empty", v => v === "" || metadata.minLength === undefined || v.length >= metadata.minLength || `The field requires at least ${metadata.minLength} characters`, v => v === "" || metadata.maxLength === undefined || v.length <= metadata.maxLength || `The field cannot have more than ${metadata.maxLength} characters`, v => tsplus_module_4.pipe(parse(v === "" ? null : v), _schema.These.result, _ => tsplus_module_3.match(_,
|
|
42
|
+
rules: [v => !metadata.required || v !== "" || "The field cannot be empty", v => v === "" || metadata.minLength === undefined || v.length >= metadata.minLength || `The field requires at least ${metadata.minLength} characters`, v => v === "" || metadata.maxLength === undefined || v.length <= metadata.maxLength || `The field cannot have more than ${metadata.maxLength} characters`, v => tsplus_module_4.pipe(parse(v === "" ? null : v), _schema.These.result, _ => tsplus_module_3.match(_, renderError, ([_, optErr]) => tsplus_module_2.isSome(optErr) ? renderError(optErr.value) : true))],
|
|
39
43
|
metadata
|
|
40
44
|
};
|
|
41
45
|
return info;
|
package/_cjs/form.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form.cjs","names":["_schema","require","_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","convertOut","trim","buildFieldInfoFromProps","props","tsplus_module_1","RecordKeys","object$","reduce","prev","cur","buildFieldInfo","f","Symbol","PhantomTypeParameter","propOrSchema","fieldKey","metadata","getMetadataFromSchemaOrProp","schema","isSchema","parse","Parser","for","info","type","rules","required","minLength","undefined","length","maxLength","tsplus_module_4","pipe","These","result","_","tsplus_module_3","match","
|
|
1
|
+
{"version":3,"file":"form.cjs","names":["_schema","require","_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","convertOut","trim","buildFieldInfoFromProps","props","tsplus_module_1","RecordKeys","object$","reduce","prev","cur","buildFieldInfo","f","Symbol","PhantomTypeParameter","propOrSchema","fieldKey","metadata","getMetadataFromSchemaOrProp","schema","isSchema","parse","Parser","for","renderError","e","err","drawError","capitalize","toString","slice","indexOf","info","type","rules","required","minLength","undefined","length","maxLength","tsplus_module_4","pipe","These","result","_","tsplus_module_3","match","optErr","tsplus_module_2","isSome","value"],"sources":["../_src/form.ts"],"sourcesContent":[null],"mappings":"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"}
|
package/_src/form.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { getMetadataFromSchemaOrProp, isSchema, Parser, These } from "@effect-app/prelude/schema"
|
|
1
|
+
import { drawError, getMetadataFromSchemaOrProp, isSchema, Parser, These } from "@effect-app/prelude/schema"
|
|
2
2
|
import type {
|
|
3
3
|
AnyProperty,
|
|
4
4
|
EncodedOf,
|
|
@@ -67,6 +67,15 @@ function buildFieldInfo(
|
|
|
67
67
|
const schema = isSchema(propOrSchema) ? propOrSchema : propOrSchema._schema
|
|
68
68
|
const parse = Parser.for(schema)
|
|
69
69
|
|
|
70
|
+
function renderError(e: any) {
|
|
71
|
+
const err = drawError(e)
|
|
72
|
+
return `The entered value is not a valid ${
|
|
73
|
+
capitalize(
|
|
74
|
+
fieldKey.toString()
|
|
75
|
+
)
|
|
76
|
+
} (${err.slice(err.indexOf("expected"))})`
|
|
77
|
+
}
|
|
78
|
+
|
|
70
79
|
const info = {
|
|
71
80
|
type: "text", // TODO: various types
|
|
72
81
|
rules: [
|
|
@@ -87,19 +96,10 @@ function buildFieldInfo(
|
|
|
87
96
|
These.result,
|
|
88
97
|
_ =>
|
|
89
98
|
_.match(
|
|
90
|
-
|
|
91
|
-
`The entered value is not a valid ${
|
|
92
|
-
capitalize(
|
|
93
|
-
fieldKey.toString()
|
|
94
|
-
)
|
|
95
|
-
}`,
|
|
99
|
+
renderError,
|
|
96
100
|
([_, optErr]) =>
|
|
97
101
|
optErr.isSome()
|
|
98
|
-
?
|
|
99
|
-
capitalize(
|
|
100
|
-
fieldKey.toString()
|
|
101
|
-
)
|
|
102
|
-
}`
|
|
102
|
+
? renderError(optErr.value)
|
|
103
103
|
: true
|
|
104
104
|
)
|
|
105
105
|
)
|
package/dist/form.js
CHANGED
|
@@ -2,7 +2,7 @@ import * as tsplus_module_1 from "@effect-app/prelude/utils";
|
|
|
2
2
|
import * as tsplus_module_2 from "@effect/data/Option";
|
|
3
3
|
import * as tsplus_module_3 from "@effect/data/Either";
|
|
4
4
|
import * as tsplus_module_4 from "@effect-app/core/Function";
|
|
5
|
-
import { getMetadataFromSchemaOrProp, isSchema, Parser, These } from "@effect-app/prelude/schema";
|
|
5
|
+
import { drawError, getMetadataFromSchemaOrProp, isSchema, Parser, These } from "@effect-app/prelude/schema";
|
|
6
6
|
import { capitalize } from "vue";
|
|
7
7
|
export function convertIn(v) {
|
|
8
8
|
return v === null ? "" : v;
|
|
@@ -24,6 +24,10 @@ function buildFieldInfo(propOrSchema, fieldKey) {
|
|
|
24
24
|
const metadata = getMetadataFromSchemaOrProp(propOrSchema);
|
|
25
25
|
const schema = isSchema(propOrSchema) ? propOrSchema : propOrSchema._schema;
|
|
26
26
|
const parse = Parser.for(schema);
|
|
27
|
+
function renderError(e) {
|
|
28
|
+
const err = drawError(e);
|
|
29
|
+
return `The entered value is not a valid ${capitalize(fieldKey.toString())} (${err.slice(err.indexOf("expected"))})`;
|
|
30
|
+
}
|
|
27
31
|
const info = {
|
|
28
32
|
type: "text",
|
|
29
33
|
rules: [
|
|
@@ -36,12 +40,12 @@ function buildFieldInfo(propOrSchema, fieldKey) {
|
|
|
36
40
|
metadata.maxLength === undefined ||
|
|
37
41
|
v.length <= metadata.maxLength ||
|
|
38
42
|
`The field cannot have more than ${metadata.maxLength} characters`,
|
|
39
|
-
(v) => tsplus_module_4.pipe(parse(v === "" ? null : v), These.result, _ => tsplus_module_3.match(_,
|
|
40
|
-
?
|
|
43
|
+
(v) => tsplus_module_4.pipe(parse(v === "" ? null : v), These.result, _ => tsplus_module_3.match(_, renderError, ([_, optErr]) => tsplus_module_2.isSome(optErr)
|
|
44
|
+
? renderError(optErr.value)
|
|
41
45
|
: true))
|
|
42
46
|
],
|
|
43
47
|
metadata
|
|
44
48
|
};
|
|
45
49
|
return info;
|
|
46
50
|
}
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
51
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvZm9ybS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSwyQkFBMkIsRUFBRSxRQUFRLEVBQUUsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLDRCQUE0QixDQUFBO0FBUzVHLE9BQU8sRUFBRSxVQUFVLEVBQUUsTUFBTSxLQUFLLENBQUE7QUFFaEMsTUFBTSxVQUFVLFNBQVMsQ0FBQyxDQUFnQjtJQUN4QyxPQUFPLENBQUMsS0FBSyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFBO0FBQzVCLENBQUM7QUFFRCxNQUFNLFVBQVUsVUFBVSxDQUFDLENBQVMsRUFBRSxHQUErQjtJQUNuRSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFBO0lBQ1osT0FBTyxHQUFHLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtBQUNqQyxDQUFDO0FBRUQsTUFBTSxVQUFVLHVCQUF1QixDQUNyQyxLQUFZO0lBRVosT0FBTyxtREFBQSxLQUFLLEdBQVMsTUFBTSxDQUN6QixDQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsRUFBRTtRQUNaLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxjQUFjLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBZ0IsRUFBRSxHQUFHLENBQUMsQ0FBQTtRQUMxRCxPQUFPLElBQUksQ0FBQTtJQUNiLENBQUMsRUFDRCxFQUtDLENBQ0YsQ0FBQTtBQUNILENBQUM7QUFRRCxNQUFNLENBQUMsR0FBRyxNQUFNLEVBQUUsQ0FBQTtBQUNsQixNQUFlLG9CQUFvQjtDQU9sQztBQVVELFNBQVMsY0FBYyxDQUNyQixZQUFxQyxFQUNyQyxRQUFxQjtJQUVyQixNQUFNLFFBQVEsR0FBRywyQkFBMkIsQ0FBQyxZQUFZLENBQUMsQ0FBQTtJQUMxRCxNQUFNLE1BQU0sR0FBRyxRQUFRLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLE9BQU8sQ0FBQTtJQUMzRSxNQUFNLEtBQUssR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0lBRWhDLFNBQVMsV0FBVyxDQUFDLENBQU07UUFDekIsTUFBTSxHQUFHLEdBQUcsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQ3hCLE9BQU8sb0NBQ0wsVUFBVSxDQUNSLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FFdkIsS0FBSyxHQUFHLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUMsR0FBRyxDQUFBO0lBQzVDLENBQUM7SUFFRCxNQUFNLElBQUksR0FBRztRQUNYLElBQUksRUFBRSxNQUFNO1FBQ1osS0FBSyxFQUFFO1lBQ0wsQ0FBQyxDQUFTLEVBQUUsRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLFFBQVEsSUFBSSxDQUFDLEtBQUssRUFBRSxJQUFJLDJCQUEyQjtZQUM1RSxDQUFDLENBQVMsRUFBRSxFQUFFLENBQ1osQ0FBQyxLQUFLLEVBQUU7Z0JBQ1IsUUFBUSxDQUFDLFNBQVMsS0FBSyxTQUFTO2dCQUNoQyxDQUFDLENBQUMsTUFBTSxJQUFJLFFBQVEsQ0FBQyxTQUFTO2dCQUM5QiwrQkFBK0IsUUFBUSxDQUFDLFNBQVMsYUFBYTtZQUNoRSxDQUFDLENBQVMsRUFBRSxFQUFFLENBQ1osQ0FBQyxLQUFLLEVBQUU7Z0JBQ1IsUUFBUSxDQUFDLFNBQVMsS0FBSyxTQUFTO2dCQUNoQyxDQUFDLENBQUMsTUFBTSxJQUFJLFFBQVEsQ0FBQyxTQUFTO2dCQUM5QixtQ0FBbUMsUUFBUSxDQUFDLFNBQVMsYUFBYTtZQUNwRSxDQUFDLENBQVUsRUFBRSxFQUFFLENBQ2IsZ0JBQUEsSUFBSSxDQUNGLEtBQUssQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUMxQixLQUFLLENBQUMsTUFBTSxFQUNaLENBQUMsQ0FBQyxFQUFFLENBQ0Ysc0JBQUEsQ0FBQyxFQUNDLFdBQVcsRUFDWCxDQUFDLENBQUMsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxFQUFFLEVBQUUsQ0FDZCx1QkFBQSxNQUFNLENBQVM7Z0JBQ2IsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDO2dCQUMzQixDQUFDLENBQUMsSUFBSSxDQUNYLENBQ0o7U0FDSjtRQUNELFFBQVE7S0FDVCxDQUFBO0lBRUQsT0FBTyxJQUFXLENBQUE7QUFDcEIsQ0FBQyJ9
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/vue",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.21.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
@@ -10,10 +10,10 @@
|
|
|
10
10
|
"query-string": "^8.1.0",
|
|
11
11
|
"swrv": "^1.0.3",
|
|
12
12
|
"vue": "^3.2.47",
|
|
13
|
-
"@effect-app/
|
|
14
|
-
"@effect-app/vue": "0.20.4",
|
|
13
|
+
"@effect-app/vue": "0.21.0",
|
|
15
14
|
"@effect-app/core": "0.29.1",
|
|
16
|
-
"@effect-app/
|
|
15
|
+
"@effect-app/prelude": "0.22.5",
|
|
16
|
+
"@effect-app/schema": "0.21.0"
|
|
17
17
|
},
|
|
18
18
|
"devDependencies": {
|
|
19
19
|
"@rollup/pluginutils": "^5.0.2",
|