@effect-app/vue 0.87.0-next.4 → 0.87.0-next.40
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 +320 -0
- package/_cjs/form.cjs +180 -0
- package/_cjs/form.cjs.map +1 -0
- package/_cjs/hooks.cjs +9 -3
- package/_cjs/hooks.cjs.map +1 -1
- package/_src/{form.ts.bak → form.ts} +100 -47
- package/_src/hooks.ts +18 -8
- package/_src/routeParams.ts +1 -1
- package/dist/form.d.ts +52 -0
- package/dist/form.d.ts.map +1 -0
- package/dist/form.js +184 -0
- package/dist/hooks.d.ts +8 -7
- package/dist/hooks.d.ts.map +1 -1
- package/dist/hooks.js +12 -4
- package/dist/routeParams.d.ts +1 -1
- package/dist/routeParams.d.ts.map +1 -1
- package/package.json +19 -9
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,325 @@
|
|
|
1
1
|
# @effect-app/vue
|
|
2
2
|
|
|
3
|
+
## 0.87.0-next.40
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies [b46e30d]
|
|
8
|
+
- @effect-app/prelude@0.107.0-next.34
|
|
9
|
+
- @effect-app/vue@0.87.0-next.40
|
|
10
|
+
|
|
11
|
+
## 0.87.0-next.39
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- Updated dependencies [c57bb66]
|
|
16
|
+
- @effect-app/schema@0.150.0-next.21
|
|
17
|
+
- @effect-app/prelude@0.107.0-next.33
|
|
18
|
+
- @effect-app/vue@0.87.0-next.39
|
|
19
|
+
|
|
20
|
+
## 0.87.0-next.38
|
|
21
|
+
|
|
22
|
+
### Patch Changes
|
|
23
|
+
|
|
24
|
+
- ce46673: update packages
|
|
25
|
+
- Updated dependencies [735dea9]
|
|
26
|
+
- Updated dependencies [ce46673]
|
|
27
|
+
- @effect-app/prelude@0.107.0-next.32
|
|
28
|
+
- @effect-app/vue@0.87.0-next.38
|
|
29
|
+
|
|
30
|
+
## 0.87.0-next.37
|
|
31
|
+
|
|
32
|
+
### Patch Changes
|
|
33
|
+
|
|
34
|
+
- Updated dependencies [21482c6]
|
|
35
|
+
- @effect-app/prelude@0.107.0-next.31
|
|
36
|
+
- @effect-app/vue@0.87.0-next.37
|
|
37
|
+
|
|
38
|
+
## 0.87.0-next.36
|
|
39
|
+
|
|
40
|
+
### Patch Changes
|
|
41
|
+
|
|
42
|
+
- Updated dependencies [eab24be]
|
|
43
|
+
- @effect-app/prelude@0.107.0-next.30
|
|
44
|
+
- @effect-app/vue@0.87.0-next.36
|
|
45
|
+
|
|
46
|
+
## 0.87.0-next.35
|
|
47
|
+
|
|
48
|
+
### Patch Changes
|
|
49
|
+
|
|
50
|
+
- Updated dependencies [def06a7]
|
|
51
|
+
- @effect-app/prelude@0.107.0-next.29
|
|
52
|
+
- @effect-app/vue@0.87.0-next.35
|
|
53
|
+
|
|
54
|
+
## 0.87.0-next.34
|
|
55
|
+
|
|
56
|
+
### Patch Changes
|
|
57
|
+
|
|
58
|
+
- Updated dependencies [eb31797]
|
|
59
|
+
- @effect-app/prelude@0.107.0-next.28
|
|
60
|
+
- @effect-app/vue@0.87.0-next.34
|
|
61
|
+
|
|
62
|
+
## 0.87.0-next.33
|
|
63
|
+
|
|
64
|
+
### Patch Changes
|
|
65
|
+
|
|
66
|
+
- Updated dependencies [65696a6]
|
|
67
|
+
- @effect-app/prelude@0.107.0-next.27
|
|
68
|
+
- @effect-app/vue@0.87.0-next.33
|
|
69
|
+
|
|
70
|
+
## 0.87.0-next.32
|
|
71
|
+
|
|
72
|
+
### Patch Changes
|
|
73
|
+
|
|
74
|
+
- Updated dependencies [777162f]
|
|
75
|
+
- @effect-app/prelude@0.107.0-next.26
|
|
76
|
+
- @effect-app/schema@0.150.0-next.20
|
|
77
|
+
- @effect-app/vue@0.87.0-next.32
|
|
78
|
+
|
|
79
|
+
## 0.87.0-next.31
|
|
80
|
+
|
|
81
|
+
### Patch Changes
|
|
82
|
+
|
|
83
|
+
- Updated dependencies [0776693]
|
|
84
|
+
- @effect-app/prelude@0.107.0-next.25
|
|
85
|
+
- @effect-app/vue@0.87.0-next.31
|
|
86
|
+
|
|
87
|
+
## 0.87.0-next.30
|
|
88
|
+
|
|
89
|
+
### Patch Changes
|
|
90
|
+
|
|
91
|
+
- c96bc2f: f
|
|
92
|
+
- Updated dependencies [c96bc2f]
|
|
93
|
+
- @effect-app/vue@0.87.0-next.30
|
|
94
|
+
|
|
95
|
+
## 0.87.0-next.29
|
|
96
|
+
|
|
97
|
+
### Patch Changes
|
|
98
|
+
|
|
99
|
+
- 68eaf52: form and client fixes
|
|
100
|
+
- Updated dependencies [68eaf52]
|
|
101
|
+
- @effect-app/prelude@0.107.0-next.24
|
|
102
|
+
- @effect-app/vue@0.87.0-next.29
|
|
103
|
+
|
|
104
|
+
## 0.87.0-next.28
|
|
105
|
+
|
|
106
|
+
### Patch Changes
|
|
107
|
+
|
|
108
|
+
- Updated dependencies [ca927a5]
|
|
109
|
+
- @effect-app/schema@0.150.0-next.19
|
|
110
|
+
- @effect-app/prelude@0.107.0-next.23
|
|
111
|
+
- @effect-app/vue@0.87.0-next.28
|
|
112
|
+
|
|
113
|
+
## 0.87.0-next.27
|
|
114
|
+
|
|
115
|
+
### Patch Changes
|
|
116
|
+
|
|
117
|
+
- Updated dependencies [5f62f5a]
|
|
118
|
+
- @effect-app/prelude@0.107.0-next.22
|
|
119
|
+
- @effect-app/schema@0.150.0-next.18
|
|
120
|
+
- @effect-app/vue@0.87.0-next.27
|
|
121
|
+
|
|
122
|
+
## 0.87.0-next.26
|
|
123
|
+
|
|
124
|
+
### Patch Changes
|
|
125
|
+
|
|
126
|
+
- Updated dependencies [53d4b3e]
|
|
127
|
+
- @effect-app/schema@0.150.0-next.17
|
|
128
|
+
- @effect-app/prelude@0.107.0-next.21
|
|
129
|
+
- @effect-app/vue@0.87.0-next.26
|
|
130
|
+
|
|
131
|
+
## 0.87.0-next.25
|
|
132
|
+
|
|
133
|
+
### Patch Changes
|
|
134
|
+
|
|
135
|
+
- Updated dependencies [63d4549]
|
|
136
|
+
- @effect-app/schema@0.150.0-next.16
|
|
137
|
+
- @effect-app/prelude@0.107.0-next.20
|
|
138
|
+
- @effect-app/vue@0.87.0-next.25
|
|
139
|
+
|
|
140
|
+
## 0.87.0-next.24
|
|
141
|
+
|
|
142
|
+
### Patch Changes
|
|
143
|
+
|
|
144
|
+
- b19ce70: S
|
|
145
|
+
- Updated dependencies [b19ce70]
|
|
146
|
+
- @effect-app/prelude@0.107.0-next.19
|
|
147
|
+
- @effect-app/vue@0.87.0-next.24
|
|
148
|
+
|
|
149
|
+
## 0.87.0-next.23
|
|
150
|
+
|
|
151
|
+
### Patch Changes
|
|
152
|
+
|
|
153
|
+
- Updated dependencies [92ff6b9]
|
|
154
|
+
- @effect-app/prelude@0.107.0-next.18
|
|
155
|
+
- @effect-app/schema@0.150.0-next.15
|
|
156
|
+
- @effect-app/vue@0.87.0-next.23
|
|
157
|
+
|
|
158
|
+
## 0.87.0-next.22
|
|
159
|
+
|
|
160
|
+
### Patch Changes
|
|
161
|
+
|
|
162
|
+
- 15e7b7a: d
|
|
163
|
+
- Updated dependencies [15e7b7a]
|
|
164
|
+
- @effect-app/vue@0.87.0-next.22
|
|
165
|
+
|
|
166
|
+
## 0.87.0-next.21
|
|
167
|
+
|
|
168
|
+
### Patch Changes
|
|
169
|
+
|
|
170
|
+
- Updated dependencies [c234016]
|
|
171
|
+
- @effect-app/schema@0.150.0-next.14
|
|
172
|
+
- @effect-app/prelude@0.107.0-next.17
|
|
173
|
+
- @effect-app/vue@0.87.0-next.21
|
|
174
|
+
|
|
175
|
+
## 0.87.0-next.20
|
|
176
|
+
|
|
177
|
+
### Patch Changes
|
|
178
|
+
|
|
179
|
+
- 5d53b26: fix exclusive min/max
|
|
180
|
+
- Updated dependencies [5d53b26]
|
|
181
|
+
- @effect-app/schema@0.150.0-next.13
|
|
182
|
+
- @effect-app/vue@0.87.0-next.20
|
|
183
|
+
- @effect-app/prelude@0.107.0-next.16
|
|
184
|
+
|
|
185
|
+
## 0.87.0-next.19
|
|
186
|
+
|
|
187
|
+
### Patch Changes
|
|
188
|
+
|
|
189
|
+
- fd785c2: improve error
|
|
190
|
+
- Updated dependencies [fd785c2]
|
|
191
|
+
- @effect-app/vue@0.87.0-next.19
|
|
192
|
+
|
|
193
|
+
## 0.87.0-next.18
|
|
194
|
+
|
|
195
|
+
### Patch Changes
|
|
196
|
+
|
|
197
|
+
- 99310c3: fix error message
|
|
198
|
+
- Updated dependencies [99310c3]
|
|
199
|
+
- @effect-app/vue@0.87.0-next.18
|
|
200
|
+
|
|
201
|
+
## 0.87.0-next.17
|
|
202
|
+
|
|
203
|
+
### Patch Changes
|
|
204
|
+
|
|
205
|
+
- Updated dependencies [147bc14]
|
|
206
|
+
- @effect-app/schema@0.150.0-next.12
|
|
207
|
+
- @effect-app/prelude@0.107.0-next.15
|
|
208
|
+
- @effect-app/vue@0.87.0-next.17
|
|
209
|
+
|
|
210
|
+
## 0.87.0-next.16
|
|
211
|
+
|
|
212
|
+
### Patch Changes
|
|
213
|
+
|
|
214
|
+
- 660d57a: upd
|
|
215
|
+
- Updated dependencies [660d57a]
|
|
216
|
+
- @effect-app/schema@0.150.0-next.11
|
|
217
|
+
- @effect-app/vue@0.87.0-next.16
|
|
218
|
+
- @effect-app/prelude@0.107.0-next.14
|
|
219
|
+
|
|
220
|
+
## 0.87.0-next.15
|
|
221
|
+
|
|
222
|
+
### Patch Changes
|
|
223
|
+
|
|
224
|
+
- 5f76678: reimplement vue form
|
|
225
|
+
- Updated dependencies [5f76678]
|
|
226
|
+
- @effect-app/vue@0.87.0-next.15
|
|
227
|
+
|
|
228
|
+
## 0.87.0-next.14
|
|
229
|
+
|
|
230
|
+
### Patch Changes
|
|
231
|
+
|
|
232
|
+
- 20076e0: update
|
|
233
|
+
- Updated dependencies [20076e0]
|
|
234
|
+
- @effect-app/prelude@0.107.0-next.13
|
|
235
|
+
- @effect-app/schema@0.150.0-next.10
|
|
236
|
+
- @effect-app/vue@0.87.0-next.14
|
|
237
|
+
|
|
238
|
+
## 0.87.0-next.13
|
|
239
|
+
|
|
240
|
+
### Patch Changes
|
|
241
|
+
|
|
242
|
+
- Updated dependencies
|
|
243
|
+
- @effect-app/core@0.97.0-next.4
|
|
244
|
+
- @effect-app/prelude@0.107.0-next.12
|
|
245
|
+
- @effect-app/schema@0.150.0-next.9
|
|
246
|
+
- @effect-app/vue@0.87.0-next.13
|
|
247
|
+
|
|
248
|
+
## 0.87.0-next.12
|
|
249
|
+
|
|
250
|
+
### Patch Changes
|
|
251
|
+
|
|
252
|
+
- ac35466: use schema fork
|
|
253
|
+
- Updated dependencies [ac35466]
|
|
254
|
+
- @effect-app/prelude@0.107.0-next.11
|
|
255
|
+
- @effect-app/schema@0.150.0-next.8
|
|
256
|
+
- @effect-app/vue@0.87.0-next.12
|
|
257
|
+
|
|
258
|
+
## 0.87.0-next.11
|
|
259
|
+
|
|
260
|
+
### Patch Changes
|
|
261
|
+
|
|
262
|
+
- Updated dependencies [4f8ade3]
|
|
263
|
+
- @effect-app/core@0.97.0-next.3
|
|
264
|
+
- @effect-app/prelude@0.107.0-next.10
|
|
265
|
+
- @effect-app/schema@0.150.0-next.7
|
|
266
|
+
- @effect-app/vue@0.87.0-next.11
|
|
267
|
+
|
|
268
|
+
## 0.87.0-next.10
|
|
269
|
+
|
|
270
|
+
### Patch Changes
|
|
271
|
+
|
|
272
|
+
- Updated dependencies [8897586]
|
|
273
|
+
- @effect-app/schema@0.150.0-next.6
|
|
274
|
+
- @effect-app/prelude@0.107.0-next.9
|
|
275
|
+
- @effect-app/vue@0.87.0-next.10
|
|
276
|
+
|
|
277
|
+
## 0.87.0-next.9
|
|
278
|
+
|
|
279
|
+
### Patch Changes
|
|
280
|
+
|
|
281
|
+
- c550ee5: updates
|
|
282
|
+
- Updated dependencies [c550ee5]
|
|
283
|
+
- @effect-app/prelude@0.107.0-next.8
|
|
284
|
+
- @effect-app/schema@0.150.0-next.5
|
|
285
|
+
- @effect-app/core@0.97.0-next.2
|
|
286
|
+
- @effect-app/vue@0.87.0-next.9
|
|
287
|
+
|
|
288
|
+
## 0.87.0-next.8
|
|
289
|
+
|
|
290
|
+
### Patch Changes
|
|
291
|
+
|
|
292
|
+
- Updated dependencies [82b3ca0]
|
|
293
|
+
- @effect-app/prelude@0.107.0-next.7
|
|
294
|
+
- @effect-app/vue@0.87.0-next.8
|
|
295
|
+
|
|
296
|
+
## 0.87.0-next.7
|
|
297
|
+
|
|
298
|
+
### Patch Changes
|
|
299
|
+
|
|
300
|
+
- Updated dependencies [ace7afb]
|
|
301
|
+
- @effect-app/schema@0.150.0-next.4
|
|
302
|
+
- @effect-app/prelude@0.107.0-next.6
|
|
303
|
+
- @effect-app/vue@0.87.0-next.7
|
|
304
|
+
|
|
305
|
+
## 0.87.0-next.6
|
|
306
|
+
|
|
307
|
+
### Patch Changes
|
|
308
|
+
|
|
309
|
+
- 3320864: cleanup schema ext
|
|
310
|
+
- Updated dependencies [3320864]
|
|
311
|
+
- @effect-app/prelude@0.107.0-next.5
|
|
312
|
+
- @effect-app/schema@0.150.0-next.3
|
|
313
|
+
- @effect-app/vue@0.87.0-next.6
|
|
314
|
+
|
|
315
|
+
## 0.87.0-next.5
|
|
316
|
+
|
|
317
|
+
### Patch Changes
|
|
318
|
+
|
|
319
|
+
- 52da734: mini form
|
|
320
|
+
- Updated dependencies [52da734]
|
|
321
|
+
- @effect-app/vue@0.87.0-next.5
|
|
322
|
+
|
|
3
323
|
## 0.87.0-next.4
|
|
4
324
|
|
|
5
325
|
### Patch Changes
|
package/_cjs/form.cjs
ADDED
|
@@ -0,0 +1,180 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.buildFieldInfoFromFields = buildFieldInfoFromFields;
|
|
7
|
+
exports.buildFormFromSchema = void 0;
|
|
8
|
+
exports.convertIn = convertIn;
|
|
9
|
+
exports.convertOut = convertOut;
|
|
10
|
+
exports.convertOutInt = convertOutInt;
|
|
11
|
+
exports.customSchemaErrors = void 0;
|
|
12
|
+
exports.getMetadataFromSchema = getMetadataFromSchema;
|
|
13
|
+
exports.translate = void 0;
|
|
14
|
+
var tsplus_module_1 = _interopRequireWildcard(require("@effect/schema/Parser"));
|
|
15
|
+
var tsplus_module_2 = _interopRequireWildcard(require("effect/Either"));
|
|
16
|
+
var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/core/Function"));
|
|
17
|
+
var _schema = require("@effect-app/schema");
|
|
18
|
+
var _intl = require("@formatjs/intl");
|
|
19
|
+
var _vue = require("vue");
|
|
20
|
+
var JSONSchema = _interopRequireWildcard(require("@effect/schema/JSONSchema"));
|
|
21
|
+
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
22
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
23
|
+
function convertIn(v, type) {
|
|
24
|
+
return v === null ? "" : type === "text" ? v : `${v}`;
|
|
25
|
+
}
|
|
26
|
+
function convertOutInt(v, type) {
|
|
27
|
+
v = v == null ? v : v.trim();
|
|
28
|
+
const c = v === "" ? null : type === "float" ? parseFloat(v) : type === "int" ? parseInt(v) : v;
|
|
29
|
+
return c;
|
|
30
|
+
}
|
|
31
|
+
function convertOut(v, set, type) {
|
|
32
|
+
return set(convertOutInt(v, type));
|
|
33
|
+
}
|
|
34
|
+
function buildFieldInfoFromFields(fields) {
|
|
35
|
+
let ast = fields.ast;
|
|
36
|
+
// todo: or look at from?
|
|
37
|
+
if (_schema.AST.isTransform(ast)) {
|
|
38
|
+
if (_schema.AST.isDeclaration(ast.to)) {
|
|
39
|
+
ast = ast.to.type;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
if (!_schema.AST.isTypeLiteral(ast)) throw new Error("not a struct type");
|
|
43
|
+
return ast.propertySignatures.reduce((prev, cur) => {
|
|
44
|
+
;
|
|
45
|
+
prev[cur.name] = buildFieldInfo(cur);
|
|
46
|
+
return prev;
|
|
47
|
+
}, {});
|
|
48
|
+
}
|
|
49
|
+
const f = Symbol();
|
|
50
|
+
class PhantomTypeParameter {}
|
|
51
|
+
// type GetSchemaFromProp<T> = T extends Field<infer S, any, any, any> ? S
|
|
52
|
+
// : never
|
|
53
|
+
const defaultIntl = (0, _intl.createIntl)({
|
|
54
|
+
locale: "en"
|
|
55
|
+
});
|
|
56
|
+
const translate = exports.translate = (0, _vue.ref)(defaultIntl.formatMessage.bind(defaultIntl));
|
|
57
|
+
const customSchemaErrors = exports.customSchemaErrors = (0, _vue.ref)(new Map());
|
|
58
|
+
function buildFieldInfo(property) {
|
|
59
|
+
const propertyKey = property.name;
|
|
60
|
+
const schema = _schema.S.make(property.type);
|
|
61
|
+
const metadata = getMetadataFromSchema(property.type); // TODO
|
|
62
|
+
const parse = tsplus_module_1.parseEither(schema);
|
|
63
|
+
const nullable = _schema.AST.isUnion(property.type) && property.type.types.includes(_schema.S.null.ast);
|
|
64
|
+
const realSelf = nullable && _schema.AST.isUnion(property.type) ? property.type.types.filter(_ => _ !== _schema.S.null.ast)[0] : property.type;
|
|
65
|
+
function renderError(e, v) {
|
|
66
|
+
const err = e.toString();
|
|
67
|
+
const custom = customSchemaErrors.value.get(realSelf);
|
|
68
|
+
return custom ? custom(err, e, v) : translate.value({
|
|
69
|
+
defaultMessage: "The entered value is not a valid {type}: {message}",
|
|
70
|
+
id: "validation.not_a_valid"
|
|
71
|
+
}, {
|
|
72
|
+
type: translate.value({
|
|
73
|
+
defaultMessage: (0, _vue.capitalize)(propertyKey.toString()),
|
|
74
|
+
id: `fieldNames.${String(propertyKey)}`
|
|
75
|
+
}),
|
|
76
|
+
message: metadata.description ? "expected " + metadata.description : err.slice(err.indexOf("Expected")) // TODO: this is not translated.
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
const stringRules = [v => v === null || metadata.minLength === undefined || v.length >= metadata.minLength || translate.value({
|
|
80
|
+
defaultMessage: "The field requires at least {minLength} characters",
|
|
81
|
+
id: "validation.string.minLength"
|
|
82
|
+
}, {
|
|
83
|
+
minLength: metadata.minLength
|
|
84
|
+
}), v => v === null || metadata.maxLength === undefined || v.length <= metadata.maxLength || translate.value({
|
|
85
|
+
defaultMessage: "The field cannot have more than {maxLength} characters",
|
|
86
|
+
id: "validation.string.maxLength"
|
|
87
|
+
}, {
|
|
88
|
+
maxLength: metadata.maxLength
|
|
89
|
+
})];
|
|
90
|
+
const numberRules = [v => v === null || metadata.minimum === undefined && metadata.exclusiveMinimum === undefined || metadata.exclusiveMinimum !== undefined && v > metadata.exclusiveMinimum || metadata.minimum !== undefined && v >= metadata.minimum || translate.value({
|
|
91
|
+
defaultMessage: "The value should be {isExclusive, select, true {larger than} other {at least}} {minimum}",
|
|
92
|
+
id: "validation.number.min"
|
|
93
|
+
}, {
|
|
94
|
+
isExclusive: metadata.exclusiveMinimum !== undefined,
|
|
95
|
+
minimum: metadata.exclusiveMinimum ?? metadata.minimum
|
|
96
|
+
}), v => v === null || metadata.maximum === undefined && metadata.exclusiveMaximum === undefined || metadata.exclusiveMaximum !== undefined && v < metadata.exclusiveMaximum || metadata.maximum !== undefined && v <= metadata.maximum || translate.value({
|
|
97
|
+
defaultMessage: "The value should be {isExclusive, select, true {smaller than} other {at most}} {maximum}",
|
|
98
|
+
id: "validation.number.max"
|
|
99
|
+
}, {
|
|
100
|
+
isExclusive: metadata.exclusiveMaximum !== undefined,
|
|
101
|
+
maximum: metadata.exclusiveMaximum ?? metadata.maximum
|
|
102
|
+
})];
|
|
103
|
+
const parseRule = v => tsplus_module_3.pipe(parse(v), _ => tsplus_module_2.match(_, {
|
|
104
|
+
onLeft: _ => renderError(_, v),
|
|
105
|
+
onRight: () => true
|
|
106
|
+
}));
|
|
107
|
+
const rules = [...(metadata.type === "text" ? stringRules : numberRules), parseRule];
|
|
108
|
+
const info = {
|
|
109
|
+
type: metadata.type,
|
|
110
|
+
rules: [v => !metadata.required || v !== "" || translate.value({
|
|
111
|
+
defaultMessage: "The field cannot be empty",
|
|
112
|
+
id: "validation.empty"
|
|
113
|
+
}), v => {
|
|
114
|
+
const converted = convertOutInt(v, metadata.type);
|
|
115
|
+
for (const r of rules) {
|
|
116
|
+
const res = r(converted);
|
|
117
|
+
if (res !== true) {
|
|
118
|
+
return res;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
return true;
|
|
122
|
+
}],
|
|
123
|
+
metadata
|
|
124
|
+
};
|
|
125
|
+
return info;
|
|
126
|
+
}
|
|
127
|
+
const buildFormFromSchema = (s, state, onSubmit) => {
|
|
128
|
+
const fields = buildFieldInfoFromFields(s);
|
|
129
|
+
const parse = tsplus_module_1.parseSync(s);
|
|
130
|
+
const isDirty = (0, _vue.ref)(false);
|
|
131
|
+
const isValid = (0, _vue.ref)(true);
|
|
132
|
+
const submit1 = onSubmit => async e => {
|
|
133
|
+
const r = await e;
|
|
134
|
+
if (!r.valid) return;
|
|
135
|
+
return onSubmit(parse(state.value));
|
|
136
|
+
};
|
|
137
|
+
const submit = submit1(onSubmit);
|
|
138
|
+
(0, _vue.watch)(state, v => {
|
|
139
|
+
// TODO: do better
|
|
140
|
+
isDirty.value = JSON.stringify(v) !== JSON.stringify(state.value);
|
|
141
|
+
}, {
|
|
142
|
+
deep: true
|
|
143
|
+
});
|
|
144
|
+
const submitFromState = () => submit(Promise.resolve({
|
|
145
|
+
valid: isValid.value
|
|
146
|
+
}));
|
|
147
|
+
return {
|
|
148
|
+
fields,
|
|
149
|
+
submit,
|
|
150
|
+
submitFromState,
|
|
151
|
+
isDirty,
|
|
152
|
+
isValid
|
|
153
|
+
};
|
|
154
|
+
};
|
|
155
|
+
exports.buildFormFromSchema = buildFormFromSchema;
|
|
156
|
+
function getMetadataFromSchema(ast) {
|
|
157
|
+
const nullable = _schema.AST.isUnion(ast) && ast.types.includes(_schema.S.null.ast);
|
|
158
|
+
const realSelf = nullable && _schema.AST.isUnion(ast) ? ast.types.filter(_ => _ !== _schema.S.null.ast)[0] : ast;
|
|
159
|
+
let jschema;
|
|
160
|
+
try {
|
|
161
|
+
jschema = JSONSchema.to(_schema.S.make(realSelf));
|
|
162
|
+
} catch (err) {
|
|
163
|
+
jschema = {};
|
|
164
|
+
console.warn("error getting jsonschema from ", err, ast);
|
|
165
|
+
}
|
|
166
|
+
const isNumber = jschema.type === "number" || jschema.type === "integer";
|
|
167
|
+
const isInt = jschema.type === "integer";
|
|
168
|
+
return {
|
|
169
|
+
type: isInt ? "int" : isNumber ? "float" : "text",
|
|
170
|
+
minimum: jschema.minimum,
|
|
171
|
+
exclusiveMinimum: jschema.exclusiveMinimum,
|
|
172
|
+
maximum: jschema.maximum,
|
|
173
|
+
exclusiveMaximum: jschema.exclusiveMaximum,
|
|
174
|
+
minLength: jschema.minLength,
|
|
175
|
+
maxLength: jschema.maxLength,
|
|
176
|
+
description: jschema.description,
|
|
177
|
+
required: !nullable
|
|
178
|
+
};
|
|
179
|
+
}
|
|
180
|
+
//# sourceMappingURL=form.cjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"form.cjs","names":["_schema","require","_intl","_vue","JSONSchema","_interopRequireWildcard","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","convertIn","v","type","convertOutInt","trim","c","parseFloat","parseInt","convertOut","buildFieldInfoFromFields","fields","ast","AST","isTransform","isDeclaration","to","isTypeLiteral","Error","propertySignatures","reduce","prev","cur","name","buildFieldInfo","f","Symbol","PhantomTypeParameter","defaultIntl","createIntl","locale","translate","exports","ref","formatMessage","bind","customSchemaErrors","Map","property","propertyKey","schema","S","make","metadata","getMetadataFromSchema","parse","tsplus_module_1","parseEither","nullable","isUnion","types","includes","null","realSelf","filter","_","renderError","err","toString","custom","value","defaultMessage","id","capitalize","String","message","description","slice","indexOf","stringRules","minLength","undefined","length","maxLength","numberRules","minimum","exclusiveMinimum","isExclusive","maximum","exclusiveMaximum","parseRule","tsplus_module_3","pipe","tsplus_module_2","match","onLeft","onRight","rules","info","required","converted","res","buildFormFromSchema","s","state","onSubmit","parseSync","isDirty","isValid","submit1","valid","submit","watch","JSON","stringify","deep","submitFromState","Promise","resolve","jschema","console","warn","isNumber","isInt"],"sources":["../_src/form.ts"],"sourcesContent":[null],"mappings":"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"}
|
package/_cjs/hooks.cjs
CHANGED
|
@@ -73,10 +73,16 @@ function useSafeQueryWithArg(self, arg, config) {
|
|
|
73
73
|
return useSafeQueryWithArg_(self, self.mapPath, arg, config);
|
|
74
74
|
}
|
|
75
75
|
function useSafeQuery(self, config) {
|
|
76
|
-
return useSafeQuery_(self.mapPath, self, config);
|
|
76
|
+
return useSafeQuery_(self.mapPath, () => self, config);
|
|
77
77
|
}
|
|
78
78
|
function useSafeQueryWithArg_(self, mapPath, arg, config) {
|
|
79
|
-
|
|
79
|
+
const arr = arg;
|
|
80
|
+
const r = typeof arr === "function" ? {
|
|
81
|
+
get value() {
|
|
82
|
+
return arr();
|
|
83
|
+
}
|
|
84
|
+
} : (0, _vue.ref)(arg);
|
|
85
|
+
return useSafeQuery_((0, _vue.computed)(() => mapPath(r.value)), () => self(r.value), config);
|
|
80
86
|
}
|
|
81
87
|
function useSafeQuery_(key, self, config) {
|
|
82
88
|
// const [result, latestSuccess, execute] = make(self)
|
|
@@ -107,7 +113,7 @@ function useSafeQuery_(key, self, config) {
|
|
|
107
113
|
// })
|
|
108
114
|
// }
|
|
109
115
|
// const swr = useSWRV<A, E>(key, () => execWithInterruption().then(_ => _?.body as any)) // Effect.runPromise(self.provide(Layers))
|
|
110
|
-
const swr = useSWRV(key, () => _internal.run.value(self).then(_ => _.body), config);
|
|
116
|
+
const swr = useSWRV(key, () => _internal.run.value(self()).then(_ => _.body), config);
|
|
111
117
|
const result = (0, _vue.computed)(() => swrToQuery({
|
|
112
118
|
data: swr.data.value,
|
|
113
119
|
error: swr.error.value,
|
package/_cjs/hooks.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hooks.cjs","names":["swrv","_interopRequireWildcard","require","_vue","_internal","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","useSWRV","mutate","exports","swrToQuery","error","isValidating","tsplus_module_1","Refreshing","fail","data","Done","undefined","succeed","Loading","Initial","useMutate","self","fn","run","value","then","_","body","mapPath","useMutateWithArg","arg","useSafeQueryWithArg","config","useSafeQueryWithArg_","useSafeQuery","useSafeQuery_","key","swr","result","
|
|
1
|
+
{"version":3,"file":"hooks.cjs","names":["swrv","_interopRequireWildcard","require","_vue","_internal","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","useSWRV","mutate","exports","swrToQuery","error","isValidating","tsplus_module_1","Refreshing","fail","data","Done","undefined","succeed","Loading","Initial","useMutate","self","fn","run","value","then","_","body","mapPath","useMutateWithArg","arg","useSafeQueryWithArg","config","useSafeQueryWithArg_","useSafeQuery","useSafeQuery_","arr","ref","computed","key","swr","result","latestSuccess","tsplus_module_2","isSuccess","tsplus_module_3","isRight","current","right","tsplus_module_4","isSome","previous","tsplus_module_5","tuple","useSafeQueryLegacy","execute","make","sem","tsplus_module_6","unsafeMakeSemaphore","withPermit","withPermits","fib","runNew","tap","fork","newFiber","sync","ex","flatMap","suspend","zipRight","tsplus_module_7","interrupt","pipe","await","exec","catch","err","JSON","stringify","includes","shallowRef","isInitializing","queryResult","map","hasValue","useMutation","state","_tag","handleExit","exit","tsplus_module_8","tsplus_module_9","failureOption","cause","left","died","dieOption","tsplus_module_10","getOrUndefined","interrupted","interruptOption","InterruptedException","Error","fst","snd","effect","abortSignal","f","cancel","addEventListener","console","join"],"sources":["../_src/hooks.ts"],"sourcesContent":[null],"mappings":"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"}
|