@effect-app/vue 0.87.0-next.1 → 0.87.0-next.10
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 +82 -0
- package/_cjs/form.cjs +32 -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 +220 -0
- package/_src/hooks.ts +18 -8
- package/_src/routeParams.ts +1 -1
- package/dist/form.d.ts +30 -0
- package/dist/form.d.ts.map +1 -0
- package/dist/form.js +22 -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 +15 -5
- package/_src/form.ts.bak +0 -224
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,87 @@
|
|
|
1
1
|
# @effect-app/vue
|
|
2
2
|
|
|
3
|
+
## 0.87.0-next.10
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies [8897586]
|
|
8
|
+
- @effect-app/schema@0.150.0-next.6
|
|
9
|
+
- @effect-app/prelude@0.107.0-next.9
|
|
10
|
+
- @effect-app/vue@0.87.0-next.10
|
|
11
|
+
|
|
12
|
+
## 0.87.0-next.9
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- c550ee5: updates
|
|
17
|
+
- Updated dependencies [c550ee5]
|
|
18
|
+
- @effect-app/prelude@0.107.0-next.8
|
|
19
|
+
- @effect-app/schema@0.150.0-next.5
|
|
20
|
+
- @effect-app/core@0.97.0-next.2
|
|
21
|
+
- @effect-app/vue@0.87.0-next.9
|
|
22
|
+
|
|
23
|
+
## 0.87.0-next.8
|
|
24
|
+
|
|
25
|
+
### Patch Changes
|
|
26
|
+
|
|
27
|
+
- Updated dependencies [82b3ca0]
|
|
28
|
+
- @effect-app/prelude@0.107.0-next.7
|
|
29
|
+
- @effect-app/vue@0.87.0-next.8
|
|
30
|
+
|
|
31
|
+
## 0.87.0-next.7
|
|
32
|
+
|
|
33
|
+
### Patch Changes
|
|
34
|
+
|
|
35
|
+
- Updated dependencies [ace7afb]
|
|
36
|
+
- @effect-app/schema@0.150.0-next.4
|
|
37
|
+
- @effect-app/prelude@0.107.0-next.6
|
|
38
|
+
- @effect-app/vue@0.87.0-next.7
|
|
39
|
+
|
|
40
|
+
## 0.87.0-next.6
|
|
41
|
+
|
|
42
|
+
### Patch Changes
|
|
43
|
+
|
|
44
|
+
- 3320864: cleanup schema ext
|
|
45
|
+
- Updated dependencies [3320864]
|
|
46
|
+
- @effect-app/prelude@0.107.0-next.5
|
|
47
|
+
- @effect-app/schema@0.150.0-next.3
|
|
48
|
+
- @effect-app/vue@0.87.0-next.6
|
|
49
|
+
|
|
50
|
+
## 0.87.0-next.5
|
|
51
|
+
|
|
52
|
+
### Patch Changes
|
|
53
|
+
|
|
54
|
+
- 52da734: mini form
|
|
55
|
+
- Updated dependencies [52da734]
|
|
56
|
+
- @effect-app/vue@0.87.0-next.5
|
|
57
|
+
|
|
58
|
+
## 0.87.0-next.4
|
|
59
|
+
|
|
60
|
+
### Patch Changes
|
|
61
|
+
|
|
62
|
+
- Updated dependencies [fde3e90]
|
|
63
|
+
- @effect-app/schema@0.150.0-next.2
|
|
64
|
+
- @effect-app/core@0.97.0-next.1
|
|
65
|
+
- @effect-app/prelude@0.107.0-next.4
|
|
66
|
+
- @effect-app/vue@0.87.0-next.4
|
|
67
|
+
|
|
68
|
+
## 0.87.0-next.3
|
|
69
|
+
|
|
70
|
+
### Patch Changes
|
|
71
|
+
|
|
72
|
+
- Updated dependencies [3d9e1ab]
|
|
73
|
+
- Updated dependencies [47d0151]
|
|
74
|
+
- @effect-app/prelude@0.107.0-next.3
|
|
75
|
+
- @effect-app/vue@0.87.0-next.3
|
|
76
|
+
|
|
77
|
+
## 0.87.0-next.2
|
|
78
|
+
|
|
79
|
+
### Patch Changes
|
|
80
|
+
|
|
81
|
+
- Updated dependencies [c3de47e]
|
|
82
|
+
- @effect-app/prelude@0.107.0-next.2
|
|
83
|
+
- @effect-app/vue@0.87.0-next.2
|
|
84
|
+
|
|
3
85
|
## 0.87.0-next.1
|
|
4
86
|
|
|
5
87
|
### Patch Changes
|
package/_cjs/form.cjs
ADDED
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.convertIn = convertIn;
|
|
7
|
+
exports.convertOut = convertOut;
|
|
8
|
+
exports.convertOutInt = convertOutInt;
|
|
9
|
+
exports.translate = exports.customSchemaErrors = void 0;
|
|
10
|
+
var _intl = require("@formatjs/intl");
|
|
11
|
+
var _vue = require("vue");
|
|
12
|
+
function convertIn(v, type) {
|
|
13
|
+
return v === null ? "" : type === "text" ? v : `${v}`;
|
|
14
|
+
}
|
|
15
|
+
function convertOutInt(v, type) {
|
|
16
|
+
v = v == null ? v : v.trim();
|
|
17
|
+
const c = v === "" ? null : type === "float" ? parseFloat(v) : type === "int" ? parseInt(v) : v;
|
|
18
|
+
return c;
|
|
19
|
+
}
|
|
20
|
+
function convertOut(v, set, type) {
|
|
21
|
+
return set(convertOutInt(v, type));
|
|
22
|
+
}
|
|
23
|
+
const f = Symbol();
|
|
24
|
+
class PhantomTypeParameter {}
|
|
25
|
+
// type GetSchemaFromProp<T> = T extends Field<infer S, any, any, any> ? S
|
|
26
|
+
// : never
|
|
27
|
+
const defaultIntl = (0, _intl.createIntl)({
|
|
28
|
+
locale: "en"
|
|
29
|
+
});
|
|
30
|
+
const translate = exports.translate = (0, _vue.ref)(defaultIntl.formatMessage.bind(defaultIntl));
|
|
31
|
+
const customSchemaErrors = exports.customSchemaErrors = (0, _vue.ref)(new Map());
|
|
32
|
+
//# sourceMappingURL=form.cjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"form.cjs","names":["_intl","require","_vue","convertIn","v","type","convertOutInt","trim","c","parseFloat","parseInt","convertOut","set","f","Symbol","PhantomTypeParameter","defaultIntl","createIntl","locale","translate","exports","ref","formatMessage","bind","customSchemaErrors","Map"],"sources":["../_src/form.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;AACA,IAAAA,KAAA,GAAAC,OAAA;AACA,IAAAC,IAAA,GAAAD,OAAA;AAEM,SAAUE,SAASA,CAACC,CAAgB,EAAEC,IAA+B;EACzE,OAAOD,CAAC,KAAK,IAAI,GAAG,EAAE,GAAGC,IAAI,KAAK,MAAM,GAAGD,CAAC,GAAG,GAAGA,CAAC,EAAE;AACvD;AAEM,SAAUE,aAAaA,CAACF,CAAS,EAAEC,IAA+B;EACtED,CAAC,GAAGA,CAAC,IAAI,IAAI,GAAGA,CAAC,GAAGA,CAAC,CAACG,IAAI,EAAE;EAC5B,MAAMC,CAAC,GAAGJ,CAAC,KAAK,EAAE,GAAG,IAAI,GAAGC,IAAI,KAAK,OAAO,GAAGI,UAAU,CAACL,CAAC,CAAC,GAAGC,IAAI,KAAK,KAAK,GAAGK,QAAQ,CAACN,CAAC,CAAC,GAAGA,CAAC;EAC/F,OAAOI,CAAC;AACV;AAEM,SAAUG,UAAUA,CAACP,CAAS,EAAEQ,GAAgC,EAAEP,IAA+B;EACrG,OAAOO,GAAG,CAACN,aAAa,CAACF,CAAC,EAAEC,IAAI,CAAC,CAAC;AACpC;AAyBA,MAAMQ,CAAC,GAAGC,MAAM,EAAE;AAClB,MAAeC,oBAAoB;AAcnC;AACA;AAEA,MAAMC,WAAW,GAAG,IAAAC,gBAAU,EAAC;EAAEC,MAAM,EAAE;AAAI,CAAE,CAAC;AACzC,MAAMC,SAAS,GAAAC,OAAA,CAAAD,SAAA,GAAG,IAAAE,QAAG,EAAkCL,WAAW,CAACM,aAAa,CAACC,IAAI,CAACP,WAAW,CAAC,CAAC;AACnG,MAAMQ,kBAAkB,GAAAJ,OAAA,CAAAI,kBAAA,GAAG,IAAAH,QAAG,EACnC,IAAII,GAAG,EAAE,CACV"}
|
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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"}
|
package/_src/form.ts
ADDED
|
@@ -0,0 +1,220 @@
|
|
|
1
|
+
import type { Schema } from "@effect-app/schema"
|
|
2
|
+
import { createIntl, type IntlFormatters } from "@formatjs/intl"
|
|
3
|
+
import { ref } from "vue"
|
|
4
|
+
|
|
5
|
+
export function convertIn(v: string | null, type?: "text" | "float" | "int") {
|
|
6
|
+
return v === null ? "" : type === "text" ? v : `${v}`
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
export function convertOutInt(v: string, type?: "text" | "float" | "int") {
|
|
10
|
+
v = v == null ? v : v.trim()
|
|
11
|
+
const c = v === "" ? null : type === "float" ? parseFloat(v) : type === "int" ? parseInt(v) : v
|
|
12
|
+
return c
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
export function convertOut(v: string, set: (v: unknown | null) => void, type?: "text" | "float" | "int") {
|
|
16
|
+
return set(convertOutInt(v, type))
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
// export function buildFieldInfoFromFields<Fields extends StructFields>(
|
|
20
|
+
// fields: Fields
|
|
21
|
+
// ) {
|
|
22
|
+
// return fields.$$.keys.reduce(
|
|
23
|
+
// (prev, cur) => {
|
|
24
|
+
// prev[cur] = buildFieldInfo(fields[cur] as AnyField, cur)
|
|
25
|
+
// return prev
|
|
26
|
+
// },
|
|
27
|
+
// {} as {
|
|
28
|
+
// [K in keyof Fields]: FieldInfo<
|
|
29
|
+
// Schema.From<GetSchemaFromProp<Fields[K]>>,
|
|
30
|
+
// Schema.To<GetSchemaFromProp<Fields[K]>>
|
|
31
|
+
// >
|
|
32
|
+
// }
|
|
33
|
+
// )
|
|
34
|
+
// }
|
|
35
|
+
|
|
36
|
+
export interface FieldMetadata {
|
|
37
|
+
minLength: number | undefined
|
|
38
|
+
maxLength: number | undefined
|
|
39
|
+
required: boolean
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
const f = Symbol()
|
|
43
|
+
abstract class PhantomTypeParameter<
|
|
44
|
+
Identifier extends keyof any,
|
|
45
|
+
InstantiatedType
|
|
46
|
+
> {
|
|
47
|
+
protected abstract readonly _: {
|
|
48
|
+
readonly [NameP in Identifier]: (_: InstantiatedType) => InstantiatedType
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
export interface FieldInfo<Tin, Tout> extends PhantomTypeParameter<typeof f, { in: Tin; out: Tout }> {
|
|
52
|
+
rules: ((v: string) => boolean | string)[]
|
|
53
|
+
metadata: FieldMetadata
|
|
54
|
+
type: "text" | "float" | "int" // todo; multi-line vs single line text
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
// type GetSchemaFromProp<T> = T extends Field<infer S, any, any, any> ? S
|
|
58
|
+
// : never
|
|
59
|
+
|
|
60
|
+
const defaultIntl = createIntl({ locale: "en" })
|
|
61
|
+
export const translate = ref<IntlFormatters["formatMessage"]>(defaultIntl.formatMessage.bind(defaultIntl))
|
|
62
|
+
export const customSchemaErrors = ref<Map<Schema<any, any>, (message: string, e: unknown, v: unknown) => string>>(
|
|
63
|
+
new Map()
|
|
64
|
+
)
|
|
65
|
+
|
|
66
|
+
// function buildFieldInfo(
|
|
67
|
+
// propOrSchema: Schema<any, any>,
|
|
68
|
+
// fieldKey: PropertyKey
|
|
69
|
+
// ): FieldInfo<any, any> {
|
|
70
|
+
// const metadata = getMetadataFromSchemaOrProp(propOrSchema) // TODO
|
|
71
|
+
// const schema = propOrSchema
|
|
72
|
+
// const parse = schema.parseEither
|
|
73
|
+
|
|
74
|
+
// const nullable = AST.isUnion(schema.ast) && schema.ast.types.includes(Schema2.null.ast)
|
|
75
|
+
|
|
76
|
+
// function renderError(e: any, v: unknown) {
|
|
77
|
+
// const err = drawError(e)
|
|
78
|
+
// const custom = customSchemaErrors.value.get(schema)
|
|
79
|
+
// ?? (nullable?.self ? customSchemaErrors.value.get(nullable.self) : undefined)
|
|
80
|
+
// return custom ? custom(err, e, v) : translate.value(
|
|
81
|
+
// { defaultMessage: "The entered value is not a valid {type}: {message}", id: "validation.not_a_valid" },
|
|
82
|
+
// {
|
|
83
|
+
// type: translate.value({
|
|
84
|
+
// defaultMessage: capitalize(fieldKey.toString()),
|
|
85
|
+
// id: `fieldNames.${String(fieldKey)}`
|
|
86
|
+
// }),
|
|
87
|
+
// message: err.slice(err.indexOf("expected")) // TODO: this is not translated.
|
|
88
|
+
// }
|
|
89
|
+
// )
|
|
90
|
+
// }
|
|
91
|
+
|
|
92
|
+
// const stringRules = [
|
|
93
|
+
// (v: string | null) =>
|
|
94
|
+
// v === null
|
|
95
|
+
// || metadata.minLength === undefined
|
|
96
|
+
// || v.length >= metadata.minLength
|
|
97
|
+
// || translate.value({
|
|
98
|
+
// defaultMessage: "The field requires at least {minLength} characters",
|
|
99
|
+
// id: "validation.string.minLength"
|
|
100
|
+
// }, {
|
|
101
|
+
// minLength: metadata.minLength
|
|
102
|
+
// }),
|
|
103
|
+
// (v: string | null) =>
|
|
104
|
+
// v === null
|
|
105
|
+
// || metadata.maxLength === undefined
|
|
106
|
+
// || v.length <= metadata.maxLength
|
|
107
|
+
// || translate.value({
|
|
108
|
+
// defaultMessage: "The field cannot have more than {maxLength} characters",
|
|
109
|
+
// id: "validation.string.maxLength"
|
|
110
|
+
// }, {
|
|
111
|
+
// maxLength: metadata.maxLength
|
|
112
|
+
// })
|
|
113
|
+
// ]
|
|
114
|
+
|
|
115
|
+
// const numberRules = [
|
|
116
|
+
// (v: number | null) =>
|
|
117
|
+
// v === null
|
|
118
|
+
// || metadata.minimum === undefined
|
|
119
|
+
// || metadata.minimumExclusive && v > metadata.minimum
|
|
120
|
+
// || !metadata.minimumExclusive && v >= metadata.minimum
|
|
121
|
+
// || translate.value({
|
|
122
|
+
// defaultMessage: "The value should be {isExclusive, select, true {larger than} other {at least}} {minimum}",
|
|
123
|
+
// id: "validation.number.min"
|
|
124
|
+
// }, { isExclusive: metadata.minimumExclusive, minimum: metadata.minimum }),
|
|
125
|
+
// (v: number | null) =>
|
|
126
|
+
// v === null
|
|
127
|
+
// || metadata.maximum === undefined
|
|
128
|
+
// || metadata.maximumExclusive && v < metadata.maximum
|
|
129
|
+
// || !metadata.maximumExclusive && v <= metadata.maximum
|
|
130
|
+
// || translate.value({
|
|
131
|
+
// defaultMessage: "The value should be {isExclusive, select, true {smaller than} other {at most}} {maximum}",
|
|
132
|
+
// id: "validation.number.max"
|
|
133
|
+
// }, { isExclusive: metadata.maximumExclusive, maximum: metadata.maximum })
|
|
134
|
+
// ]
|
|
135
|
+
|
|
136
|
+
// const parseRule = (v: unknown) =>
|
|
137
|
+
// pipe(
|
|
138
|
+
// parse(v),
|
|
139
|
+
// (_) =>
|
|
140
|
+
// _.match(
|
|
141
|
+
// {
|
|
142
|
+
// onLeft: (_) => renderError(_, v),
|
|
143
|
+
// onRight: ([_, optErr]) =>
|
|
144
|
+
// optErr.isSome()
|
|
145
|
+
// ? renderError(optErr.value, v)
|
|
146
|
+
// : true
|
|
147
|
+
// }
|
|
148
|
+
// )
|
|
149
|
+
// )
|
|
150
|
+
|
|
151
|
+
// type UnknownRule = (v: unknown) => boolean | string
|
|
152
|
+
// const rules: UnknownRule[] = [
|
|
153
|
+
// ...(metadata.type === "text"
|
|
154
|
+
// ? stringRules
|
|
155
|
+
// : numberRules) as UnknownRule[],
|
|
156
|
+
// parseRule as UnknownRule
|
|
157
|
+
// ]
|
|
158
|
+
|
|
159
|
+
// const info = {
|
|
160
|
+
// type: metadata.type,
|
|
161
|
+
// rules: [
|
|
162
|
+
// (v: string) =>
|
|
163
|
+
// !metadata.required
|
|
164
|
+
// || v !== ""
|
|
165
|
+
// || translate.value({ defaultMessage: "The field cannot be empty", id: "validation.empty" }),
|
|
166
|
+
// (v: string) => {
|
|
167
|
+
// const converted = convertOutInt(v, metadata.type)
|
|
168
|
+
|
|
169
|
+
// for (const r of rules) {
|
|
170
|
+
// const res = r(converted)
|
|
171
|
+
// if (res !== true) {
|
|
172
|
+
// return res
|
|
173
|
+
// }
|
|
174
|
+
// }
|
|
175
|
+
|
|
176
|
+
// return true
|
|
177
|
+
// }
|
|
178
|
+
// ],
|
|
179
|
+
// metadata
|
|
180
|
+
// }
|
|
181
|
+
|
|
182
|
+
// return info as any
|
|
183
|
+
// }
|
|
184
|
+
|
|
185
|
+
// export const buildFormFromSchema = <
|
|
186
|
+
// Fields extends StructFields,
|
|
187
|
+
// OnSubmitA
|
|
188
|
+
// >(
|
|
189
|
+
// s: Schema<
|
|
190
|
+
// Simplify<FromStruct<Fields>>,
|
|
191
|
+
// Simplify<ToStruct<Fields>>
|
|
192
|
+
// >,
|
|
193
|
+
// state: Ref<FromStruct<Fields>>,
|
|
194
|
+
// onSubmit: (a: ToStruct<Fields>) => Promise<OnSubmitA>
|
|
195
|
+
// ) => {
|
|
196
|
+
// const fields = buildFieldInfoFromFields(s.Api.fields)
|
|
197
|
+
// const parse = s.parseSync
|
|
198
|
+
// const isDirty = ref(false)
|
|
199
|
+
// const isValid = ref(true)
|
|
200
|
+
|
|
201
|
+
// const submit1 = <A>(onSubmit: (a: To) => Promise<A>) => async <T extends Promise<{ valid: boolean }>>(e: T) => {
|
|
202
|
+
// const r = await e
|
|
203
|
+
// if (!r.valid) return
|
|
204
|
+
// return onSubmit(parse(state.value))
|
|
205
|
+
// }
|
|
206
|
+
// const submit = submit1(onSubmit)
|
|
207
|
+
|
|
208
|
+
// watch(
|
|
209
|
+
// state,
|
|
210
|
+
// (v) => {
|
|
211
|
+
// // TODO: do better
|
|
212
|
+
// isDirty.value = JSON.stringify(v) !== JSON.stringify(state.value)
|
|
213
|
+
// },
|
|
214
|
+
// { deep: true }
|
|
215
|
+
// )
|
|
216
|
+
|
|
217
|
+
// const submitFromState = () => submit(Promise.resolve({ valid: isValid.value }))
|
|
218
|
+
|
|
219
|
+
// return { fields, submit, submitFromState, isDirty, isValid }
|
|
220
|
+
// }
|
package/_src/hooks.ts
CHANGED
|
@@ -3,7 +3,7 @@ import type { ApiConfig, FetchResponse } from "@effect-app/prelude/client"
|
|
|
3
3
|
import { InterruptedException } from "effect/Cause"
|
|
4
4
|
import * as swrv from "swrv"
|
|
5
5
|
import type { fetcherFn, IKey, IResponse } from "swrv/dist/types.js"
|
|
6
|
-
import type { Ref } from "vue"
|
|
6
|
+
import type { ComputedRef, Ref } from "vue"
|
|
7
7
|
import { computed, ref, shallowRef } from "vue"
|
|
8
8
|
import { run } from "./internal.js"
|
|
9
9
|
|
|
@@ -64,10 +64,12 @@ export function useMutateWithArg<Arg, E, A>(
|
|
|
64
64
|
return (arg: Arg) => mutate(self.mapPath(arg), fn(arg))
|
|
65
65
|
}
|
|
66
66
|
|
|
67
|
+
export type WatchSource<T = any> = Ref<T> | ComputedRef<T> | (() => T)
|
|
68
|
+
|
|
67
69
|
// TODO: same trick with mutations/actions
|
|
68
70
|
export function useSafeQueryWithArg<Arg, E, A>(
|
|
69
71
|
self: ((arg: Arg) => Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>>) & { mapPath: (arg: Arg) => string },
|
|
70
|
-
arg: Arg
|
|
72
|
+
arg: Arg | WatchSource<Arg>,
|
|
71
73
|
config?: swrv.IConfig<A, fetcherFn<A>> | undefined
|
|
72
74
|
) {
|
|
73
75
|
return useSafeQueryWithArg_(self, self.mapPath, arg, config)
|
|
@@ -77,21 +79,29 @@ export function useSafeQuery<E, A>(
|
|
|
77
79
|
self: Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>> & { mapPath: string },
|
|
78
80
|
config?: swrv.IConfig<A, fetcherFn<A>> | undefined
|
|
79
81
|
) {
|
|
80
|
-
return useSafeQuery_(self.mapPath, self, config)
|
|
82
|
+
return useSafeQuery_(self.mapPath, () => self, config)
|
|
81
83
|
}
|
|
82
84
|
|
|
83
85
|
export function useSafeQueryWithArg_<Arg, E, A>(
|
|
84
86
|
self: (arg: Arg) => Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>>,
|
|
85
87
|
mapPath: (arg: Arg) => string,
|
|
86
|
-
arg: Arg
|
|
88
|
+
arg: Arg | WatchSource<Arg>,
|
|
87
89
|
config?: swrv.IConfig<A, fetcherFn<A>> | undefined
|
|
88
90
|
) {
|
|
89
|
-
|
|
91
|
+
const arr = arg
|
|
92
|
+
const r: { value: Arg } = typeof arr === "function"
|
|
93
|
+
? {
|
|
94
|
+
get value() {
|
|
95
|
+
return (arr as any)()
|
|
96
|
+
}
|
|
97
|
+
} as any
|
|
98
|
+
: ref(arg)
|
|
99
|
+
return useSafeQuery_(computed(() => mapPath(r.value)), () => self(r.value), config)
|
|
90
100
|
}
|
|
91
101
|
|
|
92
102
|
export function useSafeQuery_<E, A>(
|
|
93
|
-
key: string
|
|
94
|
-
self: Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>>,
|
|
103
|
+
key: string | WatchSource<string>,
|
|
104
|
+
self: () => Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>>,
|
|
95
105
|
config?: swrv.IConfig<A, fetcherFn<A>> | undefined
|
|
96
106
|
) {
|
|
97
107
|
// const [result, latestSuccess, execute] = make(self)
|
|
@@ -125,7 +135,7 @@ export function useSafeQuery_<E, A>(
|
|
|
125
135
|
// }
|
|
126
136
|
|
|
127
137
|
// const swr = useSWRV<A, E>(key, () => execWithInterruption().then(_ => _?.body as any)) // Effect.runPromise(self.provide(Layers))
|
|
128
|
-
const swr = useSWRV<A, E>(key, () => run.value(self).then((_) => _.body), config)
|
|
138
|
+
const swr = useSWRV<A, E>(key, () => run.value(self()).then((_) => _.body), config)
|
|
129
139
|
const result = computed(() =>
|
|
130
140
|
swrToQuery({ data: swr.data.value, error: swr.error.value, isValidating: swr.isValidating.value })
|
|
131
141
|
) // ref<QueryResult<E, A>>()
|
package/_src/routeParams.ts
CHANGED
package/dist/form.d.ts
ADDED
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import type { Schema } from "@effect-app/schema";
|
|
2
|
+
export declare function convertIn(v: string | null, type?: "text" | "float" | "int"): string;
|
|
3
|
+
export declare function convertOutInt(v: string, type?: "text" | "float" | "int"): string | number | null;
|
|
4
|
+
export declare function convertOut(v: string, set: (v: unknown | null) => void, type?: "text" | "float" | "int"): void;
|
|
5
|
+
export interface FieldMetadata {
|
|
6
|
+
minLength: number | undefined;
|
|
7
|
+
maxLength: number | undefined;
|
|
8
|
+
required: boolean;
|
|
9
|
+
}
|
|
10
|
+
declare const f: unique symbol;
|
|
11
|
+
declare abstract class PhantomTypeParameter<Identifier extends keyof any, InstantiatedType> {
|
|
12
|
+
protected abstract readonly _: {
|
|
13
|
+
readonly [NameP in Identifier]: (_: InstantiatedType) => InstantiatedType;
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
export interface FieldInfo<Tin, Tout> extends PhantomTypeParameter<typeof f, {
|
|
17
|
+
in: Tin;
|
|
18
|
+
out: Tout;
|
|
19
|
+
}> {
|
|
20
|
+
rules: ((v: string) => boolean | string)[];
|
|
21
|
+
metadata: FieldMetadata;
|
|
22
|
+
type: "text" | "float" | "int";
|
|
23
|
+
}
|
|
24
|
+
export declare const translate: import("vue").Ref<{
|
|
25
|
+
(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;
|
|
26
|
+
<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)[];
|
|
27
|
+
}>;
|
|
28
|
+
export declare const customSchemaErrors: import("vue").Ref<Map<Schema<any, any>, (message: string, e: unknown, v: unknown) => string>>;
|
|
29
|
+
export {};
|
|
30
|
+
//# sourceMappingURL=form.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../_src/form.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAIhD,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;AAmBD,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;AAMD,eAAO,MAAM,SAAS;;;EAAoF,CAAA;AAC1G,eAAO,MAAM,kBAAkB,oDAAuC,MAAM,KAAK,OAAO,KAAK,OAAO,KAAK,MAAM,EAE9G,CAAA"}
|
package/dist/form.js
ADDED
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { createIntl } from "@formatjs/intl";
|
|
2
|
+
import { ref } from "vue";
|
|
3
|
+
export function convertIn(v, type) {
|
|
4
|
+
return v === null ? "" : type === "text" ? v : `${v}`;
|
|
5
|
+
}
|
|
6
|
+
export function convertOutInt(v, type) {
|
|
7
|
+
v = v == null ? v : v.trim();
|
|
8
|
+
const c = v === "" ? null : type === "float" ? parseFloat(v) : type === "int" ? parseInt(v) : v;
|
|
9
|
+
return c;
|
|
10
|
+
}
|
|
11
|
+
export function convertOut(v, set, type) {
|
|
12
|
+
return set(convertOutInt(v, type));
|
|
13
|
+
}
|
|
14
|
+
const f = Symbol();
|
|
15
|
+
class PhantomTypeParameter {
|
|
16
|
+
}
|
|
17
|
+
// type GetSchemaFromProp<T> = T extends Field<infer S, any, any, any> ? S
|
|
18
|
+
// : never
|
|
19
|
+
const defaultIntl = createIntl({ locale: "en" });
|
|
20
|
+
export const translate = ref(defaultIntl.formatMessage.bind(defaultIntl));
|
|
21
|
+
export const customSchemaErrors = ref(new Map());
|
|
22
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL19zcmMvZm9ybS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsVUFBVSxFQUF1QixNQUFNLGdCQUFnQixDQUFBO0FBQ2hFLE9BQU8sRUFBRSxHQUFHLEVBQUUsTUFBTSxLQUFLLENBQUE7QUFFekIsTUFBTSxVQUFVLFNBQVMsQ0FBQyxDQUFnQixFQUFFLElBQStCO0lBQ3pFLE9BQU8sQ0FBQyxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUE7QUFDdkQsQ0FBQztBQUVELE1BQU0sVUFBVSxhQUFhLENBQUMsQ0FBUyxFQUFFLElBQStCO0lBQ3RFLENBQUMsR0FBRyxDQUFDLElBQUksSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtJQUM1QixNQUFNLENBQUMsR0FBRyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxPQUFPLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLEtBQUssQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDL0YsT0FBTyxDQUFDLENBQUE7QUFDVixDQUFDO0FBRUQsTUFBTSxVQUFVLFVBQVUsQ0FBQyxDQUFTLEVBQUUsR0FBZ0MsRUFBRSxJQUErQjtJQUNyRyxPQUFPLEdBQUcsQ0FBQyxhQUFhLENBQUMsQ0FBQyxFQUFFLElBQUksQ0FBQyxDQUFDLENBQUE7QUFDcEMsQ0FBQztBQXlCRCxNQUFNLENBQUMsR0FBRyxNQUFNLEVBQUUsQ0FBQTtBQUNsQixNQUFlLG9CQUFvQjtDQU9sQztBQU9ELDBFQUEwRTtBQUMxRSxZQUFZO0FBRVosTUFBTSxXQUFXLEdBQUcsVUFBVSxDQUFDLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUE7QUFDaEQsTUFBTSxDQUFDLE1BQU0sU0FBUyxHQUFHLEdBQUcsQ0FBa0MsV0FBVyxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQTtBQUMxRyxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyxHQUFHLENBQ25DLElBQUksR0FBRyxFQUFFLENBQ1YsQ0FBQSJ9
|
package/dist/hooks.d.ts
CHANGED
|
@@ -8,7 +8,7 @@ import { Done, Initial, Loading } from "@effect-app/prelude/client";
|
|
|
8
8
|
import type { ApiConfig, FetchResponse } from "@effect-app/prelude/client";
|
|
9
9
|
import * as swrv from "swrv";
|
|
10
10
|
import type { fetcherFn, IResponse } from "swrv/dist/types.js";
|
|
11
|
-
import type { Ref } from "vue";
|
|
11
|
+
import type { ComputedRef, Ref } from "vue";
|
|
12
12
|
export { isFailed, isInitializing, isSuccess } from "@effect-app/prelude/client";
|
|
13
13
|
type MutateType = {
|
|
14
14
|
<Data>(key: string, res: Data | Promise<Data>, cache?: swrv.SWRVCache<Omit<IResponse<any, any>, "mutate">>, ttl?: number): Promise<{
|
|
@@ -32,16 +32,17 @@ export declare function useMutateWithArg<Arg, E, A>(self: ((arg: Arg) => Effect<
|
|
|
32
32
|
error: any;
|
|
33
33
|
isValidating: any;
|
|
34
34
|
}>;
|
|
35
|
+
export type WatchSource<T = any> = Ref<T> | ComputedRef<T> | (() => T);
|
|
35
36
|
export declare function useSafeQueryWithArg<Arg, E, A>(self: ((arg: Arg) => Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>>) & {
|
|
36
37
|
mapPath: (arg: Arg) => string;
|
|
37
|
-
}, arg: Arg
|
|
38
|
+
}, arg: Arg | WatchSource<Arg>, config?: swrv.IConfig<A, fetcherFn<A>> | undefined): readonly [ComputedRef<import("@effect-app/prelude/client").QueryResult<E, A>>, ComputedRef<A | undefined>, () => Promise<void>, IResponse<A, E>];
|
|
38
39
|
export declare function useSafeQuery<E, A>(self: Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>> & {
|
|
39
40
|
mapPath: string;
|
|
40
|
-
}, config?: swrv.IConfig<A, fetcherFn<A>> | undefined): readonly [
|
|
41
|
-
export declare function useSafeQueryWithArg_<Arg, E, A>(self: (arg: Arg) => Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>>, mapPath: (arg: Arg) => string, arg: Arg
|
|
42
|
-
export declare function useSafeQuery_<E, A>(key: string
|
|
43
|
-
export declare function useSafeQueryLegacy<E, A>(self: Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>>): readonly [import("vue").ShallowRef<import("@effect-app/prelude/client").QueryResult<E, A>>,
|
|
44
|
-
export declare function make<R, E, A>(self: Effect<R, E, FetchResponse<A>>): readonly [import("vue").ShallowRef<import("@effect-app/prelude/client").QueryResult<E, A>>,
|
|
41
|
+
}, config?: swrv.IConfig<A, fetcherFn<A>> | undefined): readonly [ComputedRef<import("@effect-app/prelude/client").QueryResult<E, A>>, ComputedRef<A | undefined>, () => Promise<void>, IResponse<A, E>];
|
|
42
|
+
export declare function useSafeQueryWithArg_<Arg, E, A>(self: (arg: Arg) => Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>>, mapPath: (arg: Arg) => string, arg: Arg | WatchSource<Arg>, config?: swrv.IConfig<A, fetcherFn<A>> | undefined): readonly [ComputedRef<import("@effect-app/prelude/client").QueryResult<E, A>>, ComputedRef<A | undefined>, () => Promise<void>, IResponse<A, E>];
|
|
43
|
+
export declare function useSafeQuery_<E, A>(key: string | WatchSource<string>, self: () => Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>>, config?: swrv.IConfig<A, fetcherFn<A>> | undefined): readonly [ComputedRef<import("@effect-app/prelude/client").QueryResult<E, A>>, ComputedRef<A | undefined>, () => Promise<void>, IResponse<A, E>];
|
|
44
|
+
export declare function useSafeQueryLegacy<E, A>(self: Effect<ApiConfig | HttpClient.Default, E, FetchResponse<A>>): readonly [import("vue").ShallowRef<import("@effect-app/prelude/client").QueryResult<E, A>>, ComputedRef<A | undefined>, () => Promise<void | import("effect/Exit").Exit<never, Initial | Loading | import("@effect-app/prelude/client").Refreshing<E, A> | Done<E, A>>>];
|
|
45
|
+
export declare function make<R, E, A>(self: Effect<R, E, FetchResponse<A>>): readonly [import("vue").ShallowRef<import("@effect-app/prelude/client").QueryResult<E, A>>, ComputedRef<A | undefined>, import("effect/Effect").Effect<R, never, Initial | Loading | import("@effect-app/prelude/client").Refreshing<E, A> | Done<E, A>>];
|
|
45
46
|
export interface MutationInitial {
|
|
46
47
|
readonly _tag: "Initial";
|
|
47
48
|
}
|
package/dist/hooks.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../_src/hooks.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAE1E,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAC5B,OAAO,KAAK,EAAE,SAAS,EAAQ,SAAS,EAAE,MAAM,oBAAoB,CAAA;AACpE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,KAAK,CAAA;
|
|
1
|
+
{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../_src/hooks.ts"],"names":[],"mappings":"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"}
|
package/dist/hooks.js
CHANGED
|
@@ -43,10 +43,18 @@ export function useSafeQueryWithArg(self, arg, config) {
|
|
|
43
43
|
return useSafeQueryWithArg_(self, self.mapPath, arg, config);
|
|
44
44
|
}
|
|
45
45
|
export function useSafeQuery(self, config) {
|
|
46
|
-
return useSafeQuery_(self.mapPath, self, config);
|
|
46
|
+
return useSafeQuery_(self.mapPath, () => self, config);
|
|
47
47
|
}
|
|
48
48
|
export function useSafeQueryWithArg_(self, mapPath, arg, config) {
|
|
49
|
-
|
|
49
|
+
const arr = arg;
|
|
50
|
+
const r = typeof arr === "function"
|
|
51
|
+
? {
|
|
52
|
+
get value() {
|
|
53
|
+
return arr();
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
: ref(arg);
|
|
57
|
+
return useSafeQuery_(computed(() => mapPath(r.value)), () => self(r.value), config);
|
|
50
58
|
}
|
|
51
59
|
export function useSafeQuery_(key, self, config) {
|
|
52
60
|
// const [result, latestSuccess, execute] = make(self)
|
|
@@ -77,7 +85,7 @@ export function useSafeQuery_(key, self, config) {
|
|
|
77
85
|
// })
|
|
78
86
|
// }
|
|
79
87
|
// const swr = useSWRV<A, E>(key, () => execWithInterruption().then(_ => _?.body as any)) // Effect.runPromise(self.provide(Layers))
|
|
80
|
-
const swr = useSWRV(key, () => run.value(self).then((_) => _.body), config);
|
|
88
|
+
const swr = useSWRV(key, () => run.value(self()).then((_) => _.body), config);
|
|
81
89
|
const result = computed(() => swrToQuery({ data: swr.data.value, error: swr.error.value, isValidating: swr.isValidating.value })); // ref<QueryResult<E, A>>()
|
|
82
90
|
const latestSuccess = computed(() => {
|
|
83
91
|
const value = result.value;
|
|
@@ -184,4 +192,4 @@ export const useMutation = (self) => {
|
|
|
184
192
|
};
|
|
185
193
|
return tsplus_module_5.tuple(state, exec);
|
|
186
194
|
};
|
|
187
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
195
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../_src/hooks.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACnD,OAAO,KAAK,IAAI,MAAM,MAAM,CAAA;AAG5B,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,KAAK,CAAA;AAC/C,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAA;AAEnC,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAA;AAsBhF,sEAAsE;AACtE,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAA2B,CAAA;AACtG,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAA0B,CAAA;AAExG,SAAS,UAAU,CACjB,CAAuE;IAEvE,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;QACZ,OAAO,CAAC,CAAC,YAAY;YACnB,CAAC,CAAC,gBAAA,UAAU,CAAC,IAAI,CAAO,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC;YACxC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAO,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAA;IACtC,CAAC;IACD,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,CAAC,CAAC,YAAY;YACnB,CAAC,CAAC,gBAAA,UAAU,CAAC,OAAO,CAAO,CAAC,CAAC,IAAI,CAAC;YAClC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAO,CAAC,CAAC,IAAI,CAAC,CAAA;IAChC,CAAC;IAED,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,OAAO,EAAE,CAAA;AACvD,CAAC;AAED,MAAM,UAAU,SAAS,CACvB,IAAuF;IAEvF,MAAM,EAAE,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IACpD,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;AACvC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,IAAqH;IAErH,MAAM,EAAE,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;IACjE,OAAO,CAAC,GAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;AACzD,CAAC;AAID,0CAA0C;AAC1C,MAAM,UAAU,mBAAmB,CACjC,IAAqH,EACrH,GAA2B,EAC3B,MAAkD;IAElD,OAAO,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,CAAA;AAC9D,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,IAAuF,EACvF,MAAkD;IAElD,OAAO,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;AACxD,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,IAA+E,EAC/E,OAA6B,EAC7B,GAA2B,EAC3B,MAAkD;IAElD,MAAM,GAAG,GAAG,GAAG,CAAA;IACf,MAAM,CAAC,GAAmB,OAAO,GAAG,KAAK,UAAU;QACjD,CAAC,CAAC;YACA,IAAI,KAAK;gBACP,OAAQ,GAAW,EAAE,CAAA;YACvB,CAAC;SACK;QACR,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IACZ,OAAO,aAAa,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAA;AACrF,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,GAAiC,EACjC,IAAuE,EACvE,MAAkD;IAElD,sDAAsD;IAEtD,kCAAkC;IAClC,sCAAsC;IACtC,kCAAkC;IAClC,2EAA2E;IAC3E,uBAAuB;IACvB,gCAAgC;IAChC,qBAAqB;IACrB,0BAA0B;IAC1B,uBAAuB;IACvB,SAAS;IACT,MAAM;IAEN,mBAAmB;IACnB,2BAA2B;IAC3B,iBAAiB;IACjB,gDAAgD;IAChD,iBAAiB;IACjB,OAAO;IACP,yBAAyB;IACzB,oCAAoC;IACpC,8BAA8B;IAC9B,oBAAoB;IACpB,sBAAsB;IACtB,0DAA0D;IAC1D,yBAAyB;IACzB,SAAS;IACT,IAAI;IAEJ,oIAAoI;IACpI,MAAM,GAAG,GAAG,OAAO,CAAO,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAA;IACnF,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,CAC3B,UAAU,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,YAAY,EAAE,GAAG,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CACnG,CAAA,CAAC,2BAA2B;IAC7B,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,EAAE;QAClC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;QAC1B,OAAO,0BAAA,KAAK,CAAY;YACtB,CAAC,CAAC,wBAAA,KAAK,CAAC,OAAO,CAAU;gBACvB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK;gBACrB,CAAC,CAAC,uBAAA,KAAK,CAAC,QAAQ,CAAS;oBACzB,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK;oBACtB,CAAC,CAAC,SAAS;YACb,CAAC,CAAC,SAAS,CAAA;IACf,CAAC,CAAC,CAAA;IAEF,OAAO,gBAAA,KAAK,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,GAAG,CAAC,CAAA;AAC9D,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAO,IAAiE;IACxG,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAA;IAEnD,MAAM,GAAG,GAAG,oCAAqB,CAAC,CAAC,CAAA;IACnC,MAAM,UAAU,GAAG,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;IACrC,IAAI,GAAG,GAAgD,SAAS,CAAA;IAChE,MAAM,MAAM,GAAG,yCAAA,OAAO,GAEf,CAAC,QAAQ,EAAE,EAAE,CAChB,qBAAY,GAAG,EAAE;QACf,GAAG,GAAG,QAAQ,CAAA;IAChB,CAAC,CAAC,CACH,CAAA;IAEH,MAAM,EAAE,GAAG,wBAAA,wBACA,GAAG,EAAE;QACZ,OAAO,GAAG;YACR,CAAC,CAAC,mDAAA,GAAG,GAAoB,MAAM,CAAC;YAChC,CAAC,CAAC,MAAM,CAAA;IACZ,CAAC,CAAC;SACD,IAAI,CAAC,UAAU,CAAC,EACR,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IAE1B,SAAS,IAAI;QACX,OAAO,GAAG;aACP,KAAK,CAAC,EAAE,CAAC;aACT,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACb,OAAO;YACP,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,sBAAsB,CAAC;gBAAE,MAAM,GAAG,CAAA;QACtE,CAAC,CAAC,CAAA;IACN,CAAC;IAED,OAAO,gBAAA,KAAK,CAAC,MAAM,EAAE,aAAa,EAAE,IAAI,CAAC,CAAA;AAC3C,CAAC;AAED,MAAM,UAAU,IAAI,CAAU,IAAoC;IAChE,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,OAAO,EAAuB,CAAC,CAAA;IAE7D,MAAM,OAAO,GAAG,wBAAA,yBAAA,qBACR,GAAG,EAAE;QACT,MAAM,CAAC,KAAK,GAAG,+BAAA,MAAM,CAAC,KAAK,CAAiB;YAC1C,CAAC,CAAC,IAAI,OAAO,EAAE;YACf,CAAC,CAAC,oBAAI,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAClC,CAAC,CAAC,8BACQ,oBAAA,IAAI,EAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAe,EACvC,CAAC,CAAC,EAAE,EAAE,CAAC,2BAAO,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAA;IAE3C,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,EAAE;QAClC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;QAC1B,OAAO,yBAAA,KAAK,CAAW;YACrB,CAAC,CAAC,wBAAA,KAAK,CAAC,OAAO,CAAU;gBACvB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK;gBACrB,CAAC,CAAC,uBAAA,KAAK,CAAC,QAAQ,CAAS;oBACzB,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK;oBACtB,CAAC,CAAC,SAAS;YACb,CAAC,CAAC,SAAS,CAAA;IACf,CAAC,CAAC,CAAA;IAEF,OAAO,gBAAA,KAAK,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,CAAA;AAC9C,CAAC;AAsBD;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAcpB,CACF,IAA6G,EAC7G,EAAE;IACF,MAAM,KAAK,GAA8B,GAAG,CAAuB,EAAE,IAAI,EAAE,SAAS,EAAE,CAAQ,CAAA;IAE9F,SAAS,UAAU,CAAC,IAAgB;QAClC,OAAO,qBAAY,GAAG,EAAE;YACtB,IAAI,0BAAA,IAAI,CAAY,EAAE,CAAC;gBACrB,KAAK,CAAC,KAAK,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,CAAA;gBACnD,OAAO,sBAAO,IAAI,CAAC,KAAK,CAAC,CAAA;YAC3B,CAAC;YAED,MAAM,GAAG,iCAAG,IAAI,CAAC,KAAK,CAAc,CAAA;YACpC,IAAI,uBAAA,GAAG,CAAS,EAAE,CAAC;gBACjB,KAAK,CAAC,KAAK,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAA;gBACjD,OAAO,qBAAY,GAAG,CAAC,KAAK,CAAC,CAAA;YAC/B,CAAC;YAED,MAAM,IAAI,6BAAG,IAAI,CAAC,KAAK,CAAU,CAAA;YACjC,oCAAI,IAAI,GAAQ,CAAC;gBACf,sCAAM,IAAI,EAAM;YAClB,CAAC;YACD,MAAM,WAAW,mCAAG,IAAI,CAAC,KAAK,CAAgB,CAAA;YAC9C,oCAAI,WAAW,GAAQ,CAAC;gBACtB,MAAM,IAAI,oBAAoB,EAAE,CAAA;YAClC,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAA;QAClC,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,CAAC,GAAqB,EAAE,GAAiB,EAAE,EAAE;QACxD,IAAI,MAAoD,CAAA;QACxD,IAAI,WAAoC,CAAA;QACxC,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;YAC/B,MAAM,GAAG,IAAI,CAAC,GAAQ,CAAC,CAAA;YACvB,WAAW,GAAG,GAAG,CAAA;QACnB,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,IAAI,CAAA;YACb,WAAW,GAAG,GAA8B,CAAA;QAC9C,CAAC;QAED,OAAO,GAAG,CAAC,KAAK,CACd,6CAAA,6CAAA,yBAAA,qBACQ,GAAG,EAAE;YACT,KAAK,CAAC,KAAK,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,CAAA;QACnC,CAAC,CAAC,EACQ,MAAM,CAAC,GAER,UAAU,CAAC,GAEX,CAAC,CAAC,EAAE,EAAE;YACb,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,2BAAC,CAAC,EAAW,CAAA;YAC3C,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAA;YAChF,4BAAO,CAAC,EAAK;QACf,CAAC,CAAC,CACL,CAAA;IACH,CAAC,CAAA;IAED,OAAO,gBAAA,KAAK,CACV,KAAK,EACL,IAAI,CACL,CAAA;AACH,CAAC,CAAA"}
|
package/dist/routeParams.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Option } from "@effect-app/core/Option";
|
|
2
|
-
import type { REST, Schema } from "@effect-app/
|
|
2
|
+
import type { REST, Schema } from "@effect-app/schema";
|
|
3
3
|
import type { ParsedQuery } from "query-string";
|
|
4
4
|
export declare function getQueryParam(search: ParsedQuery, param: string): string | null | undefined;
|
|
5
5
|
export declare const getQueryParamO: (search: ParsedQuery, param: string) => import("effect/Option").Option<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routeParams.d.ts","sourceRoot":"","sources":["../_src/routeParams.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"routeParams.d.ts","sourceRoot":"","sources":["../_src/routeParams.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE/C,wBAAgB,aAAa,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,6BAM/D;AAED,eAAO,MAAM,cAAc,gFAA2C,CAAA;AAEtE,eAAO,MAAM,QAAQ,YAAa,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,uJAMlD,CAAA;AAED,eAAO,MAAM,eAAe,YAAa,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,uJAMzD,CAAA;AAED,wBAAgB,sBAAsB,CAAC,GAAG,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EACjF,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1B,CAAC,EAAE,GAAG,GACL;KACA,CAAC,IAAI,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;CAC5C,CAYA;AAED,wBAAgB,gBAAgB,CAAC,GAAG,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EAC3E,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1B,CAAC,EAAE,GAAG,GACL;KACA,CAAC,IAAI,MAAM,GAAG,GAAG,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACpC,CAYA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/vue",
|
|
3
|
-
"version": "0.87.0-next.
|
|
3
|
+
"version": "0.87.0-next.10",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
@@ -12,10 +12,10 @@
|
|
|
12
12
|
"query-string": "^8.1.0",
|
|
13
13
|
"swrv": "^1.0.4",
|
|
14
14
|
"vue": "^3.3.13",
|
|
15
|
-
"@effect-app/prelude": "0.107.0-next.
|
|
16
|
-
"@effect-app/
|
|
17
|
-
"@effect-app/vue": "0.87.0-next.
|
|
18
|
-
"@effect-app/
|
|
15
|
+
"@effect-app/prelude": "0.107.0-next.9",
|
|
16
|
+
"@effect-app/core": "0.97.0-next.2",
|
|
17
|
+
"@effect-app/vue": "0.87.0-next.10",
|
|
18
|
+
"@effect-app/schema": "0.150.0-next.6"
|
|
19
19
|
},
|
|
20
20
|
"devDependencies": {
|
|
21
21
|
"@rollup/pluginutils": "^5.1.0",
|
|
@@ -56,6 +56,16 @@
|
|
|
56
56
|
"default": "./_cjs/_global.cjs"
|
|
57
57
|
}
|
|
58
58
|
},
|
|
59
|
+
"./form": {
|
|
60
|
+
"import": {
|
|
61
|
+
"types": "./dist/form.d.ts",
|
|
62
|
+
"default": "./dist/form.js"
|
|
63
|
+
},
|
|
64
|
+
"require": {
|
|
65
|
+
"types": "./dist/form.d.ts",
|
|
66
|
+
"default": "./_cjs/form.cjs"
|
|
67
|
+
}
|
|
68
|
+
},
|
|
59
69
|
"./hooks": {
|
|
60
70
|
"import": {
|
|
61
71
|
"types": "./dist/hooks.d.ts",
|
package/_src/form.ts.bak
DELETED
|
@@ -1,224 +0,0 @@
|
|
|
1
|
-
import { type drawError, type Field, getMetadataFromSchemaOrProp } from "@effect-app/prelude/schema"
|
|
2
|
-
import type { AnyField, FromStruct, Schema, StructFields, To, ToStruct } from "@effect-app/schema"
|
|
3
|
-
import { AST } from "@effect-app/schema/schema"
|
|
4
|
-
import { createIntl, type IntlFormatters } from "@formatjs/intl"
|
|
5
|
-
import type { Simplify } from "effect/Types"
|
|
6
|
-
import type { Ref } from "vue"
|
|
7
|
-
import { capitalize, ref, watch } from "vue"
|
|
8
|
-
|
|
9
|
-
export function convertIn(v: string | null, type?: "text" | "float" | "int") {
|
|
10
|
-
return v === null ? "" : type === "text" ? v : `${v}`
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
export function convertOutInt(v: string, type?: "text" | "float" | "int") {
|
|
14
|
-
v = v == null ? v : v.trim()
|
|
15
|
-
const c = v === "" ? null : type === "float" ? parseFloat(v) : type === "int" ? parseInt(v) : v
|
|
16
|
-
return c
|
|
17
|
-
}
|
|
18
|
-
|
|
19
|
-
export function convertOut(v: string, set: (v: unknown | null) => void, type?: "text" | "float" | "int") {
|
|
20
|
-
return set(convertOutInt(v, type))
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
export function buildFieldInfoFromFields<Fields extends StructFields>(
|
|
24
|
-
fields: Fields
|
|
25
|
-
) {
|
|
26
|
-
return fields.$$.keys.reduce(
|
|
27
|
-
(prev, cur) => {
|
|
28
|
-
prev[cur] = buildFieldInfo(fields[cur] as AnyField, cur)
|
|
29
|
-
return prev
|
|
30
|
-
},
|
|
31
|
-
{} as {
|
|
32
|
-
[K in keyof Fields]: FieldInfo<
|
|
33
|
-
Schema.From<GetSchemaFromProp<Fields[K]>>,
|
|
34
|
-
Schema.To<GetSchemaFromProp<Fields[K]>>
|
|
35
|
-
>
|
|
36
|
-
}
|
|
37
|
-
)
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
export interface FieldMetadata {
|
|
41
|
-
minLength: number | undefined
|
|
42
|
-
maxLength: number | undefined
|
|
43
|
-
required: boolean
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
const f = Symbol()
|
|
47
|
-
abstract class PhantomTypeParameter<
|
|
48
|
-
Identifier extends keyof any,
|
|
49
|
-
InstantiatedType
|
|
50
|
-
> {
|
|
51
|
-
protected abstract readonly _: {
|
|
52
|
-
readonly [NameP in Identifier]: (_: InstantiatedType) => InstantiatedType
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
export interface FieldInfo<Tin, Tout> extends PhantomTypeParameter<typeof f, { in: Tin; out: Tout }> {
|
|
56
|
-
rules: ((v: string) => boolean | string)[]
|
|
57
|
-
metadata: FieldMetadata
|
|
58
|
-
type: "text" | "float" | "int" // todo; multi-line vs single line text
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
type GetSchemaFromProp<T> = T extends Field<infer S, any, any, any> ? S
|
|
62
|
-
: never
|
|
63
|
-
|
|
64
|
-
const defaultIntl = createIntl({ locale: "en" })
|
|
65
|
-
export const translate = ref<IntlFormatters["formatMessage"]>(defaultIntl.formatMessage.bind(defaultIntl))
|
|
66
|
-
export const customSchemaErrors = ref<Map<Schema<any, any>, (message: string, e: unknown, v: unknown) => string>>(
|
|
67
|
-
new Map()
|
|
68
|
-
)
|
|
69
|
-
|
|
70
|
-
function buildFieldInfo(
|
|
71
|
-
propOrSchema: Schema<any, any>,
|
|
72
|
-
fieldKey: PropertyKey
|
|
73
|
-
): FieldInfo<any, any> {
|
|
74
|
-
const metadata = getMetadataFromSchemaOrProp(propOrSchema) // TODO
|
|
75
|
-
const schema = propOrSchema
|
|
76
|
-
const parse = schema.parseEither
|
|
77
|
-
|
|
78
|
-
const nullable = AST.isUnion(schema.ast) && schema.ast.types.includes(Schema2.null.ast)
|
|
79
|
-
|
|
80
|
-
function renderError(e: any, v: unknown) {
|
|
81
|
-
const err = drawError(e)
|
|
82
|
-
const custom = customSchemaErrors.value.get(schema)
|
|
83
|
-
?? (nullable?.self ? customSchemaErrors.value.get(nullable.self) : undefined)
|
|
84
|
-
return custom ? custom(err, e, v) : translate.value(
|
|
85
|
-
{ defaultMessage: "The entered value is not a valid {type}: {message}", id: "validation.not_a_valid" },
|
|
86
|
-
{
|
|
87
|
-
type: translate.value({
|
|
88
|
-
defaultMessage: capitalize(fieldKey.toString()),
|
|
89
|
-
id: `fieldNames.${String(fieldKey)}`
|
|
90
|
-
}),
|
|
91
|
-
message: err.slice(err.indexOf("expected")) // TODO: this is not translated.
|
|
92
|
-
}
|
|
93
|
-
)
|
|
94
|
-
}
|
|
95
|
-
|
|
96
|
-
const stringRules = [
|
|
97
|
-
(v: string | null) =>
|
|
98
|
-
v === null
|
|
99
|
-
|| metadata.minLength === undefined
|
|
100
|
-
|| v.length >= metadata.minLength
|
|
101
|
-
|| translate.value({
|
|
102
|
-
defaultMessage: "The field requires at least {minLength} characters",
|
|
103
|
-
id: "validation.string.minLength"
|
|
104
|
-
}, {
|
|
105
|
-
minLength: metadata.minLength
|
|
106
|
-
}),
|
|
107
|
-
(v: string | null) =>
|
|
108
|
-
v === null
|
|
109
|
-
|| metadata.maxLength === undefined
|
|
110
|
-
|| v.length <= metadata.maxLength
|
|
111
|
-
|| translate.value({
|
|
112
|
-
defaultMessage: "The field cannot have more than {maxLength} characters",
|
|
113
|
-
id: "validation.string.maxLength"
|
|
114
|
-
}, {
|
|
115
|
-
maxLength: metadata.maxLength
|
|
116
|
-
})
|
|
117
|
-
]
|
|
118
|
-
|
|
119
|
-
const numberRules = [
|
|
120
|
-
(v: number | null) =>
|
|
121
|
-
v === null
|
|
122
|
-
|| metadata.minimum === undefined
|
|
123
|
-
|| metadata.minimumExclusive && v > metadata.minimum
|
|
124
|
-
|| !metadata.minimumExclusive && v >= metadata.minimum
|
|
125
|
-
|| translate.value({
|
|
126
|
-
defaultMessage: "The value should be {isExclusive, select, true {larger than} other {at least}} {minimum}",
|
|
127
|
-
id: "validation.number.min"
|
|
128
|
-
}, { isExclusive: metadata.minimumExclusive, minimum: metadata.minimum }),
|
|
129
|
-
(v: number | null) =>
|
|
130
|
-
v === null
|
|
131
|
-
|| metadata.maximum === undefined
|
|
132
|
-
|| metadata.maximumExclusive && v < metadata.maximum
|
|
133
|
-
|| !metadata.maximumExclusive && v <= metadata.maximum
|
|
134
|
-
|| translate.value({
|
|
135
|
-
defaultMessage: "The value should be {isExclusive, select, true {smaller than} other {at most}} {maximum}",
|
|
136
|
-
id: "validation.number.max"
|
|
137
|
-
}, { isExclusive: metadata.maximumExclusive, maximum: metadata.maximum })
|
|
138
|
-
]
|
|
139
|
-
|
|
140
|
-
const parseRule = (v: unknown) =>
|
|
141
|
-
pipe(
|
|
142
|
-
parse(v),
|
|
143
|
-
(_) =>
|
|
144
|
-
_.match(
|
|
145
|
-
{
|
|
146
|
-
onLeft: (_) => renderError(_, v),
|
|
147
|
-
onRight: ([_, optErr]) =>
|
|
148
|
-
optErr.isSome()
|
|
149
|
-
? renderError(optErr.value, v)
|
|
150
|
-
: true
|
|
151
|
-
}
|
|
152
|
-
)
|
|
153
|
-
)
|
|
154
|
-
|
|
155
|
-
type UnknownRule = (v: unknown) => boolean | string
|
|
156
|
-
const rules: UnknownRule[] = [
|
|
157
|
-
...(metadata.type === "text"
|
|
158
|
-
? stringRules
|
|
159
|
-
: numberRules) as UnknownRule[],
|
|
160
|
-
parseRule as UnknownRule
|
|
161
|
-
]
|
|
162
|
-
|
|
163
|
-
const info = {
|
|
164
|
-
type: metadata.type,
|
|
165
|
-
rules: [
|
|
166
|
-
(v: string) =>
|
|
167
|
-
!metadata.required
|
|
168
|
-
|| v !== ""
|
|
169
|
-
|| translate.value({ defaultMessage: "The field cannot be empty", id: "validation.empty" }),
|
|
170
|
-
(v: string) => {
|
|
171
|
-
const converted = convertOutInt(v, metadata.type)
|
|
172
|
-
|
|
173
|
-
for (const r of rules) {
|
|
174
|
-
const res = r(converted)
|
|
175
|
-
if (res !== true) {
|
|
176
|
-
return res
|
|
177
|
-
}
|
|
178
|
-
}
|
|
179
|
-
|
|
180
|
-
return true
|
|
181
|
-
}
|
|
182
|
-
],
|
|
183
|
-
metadata
|
|
184
|
-
}
|
|
185
|
-
|
|
186
|
-
return info as any
|
|
187
|
-
}
|
|
188
|
-
|
|
189
|
-
export const buildFormFromSchema = <
|
|
190
|
-
Fields extends StructFields,
|
|
191
|
-
OnSubmitA
|
|
192
|
-
>(
|
|
193
|
-
s: Schema<
|
|
194
|
-
Simplify<FromStruct<Fields>>,
|
|
195
|
-
Simplify<ToStruct<Fields>>
|
|
196
|
-
>,
|
|
197
|
-
state: Ref<FromStruct<Fields>>,
|
|
198
|
-
onSubmit: (a: ToStruct<Fields>) => Promise<OnSubmitA>
|
|
199
|
-
) => {
|
|
200
|
-
const fields = buildFieldInfoFromFields(s.Api.fields)
|
|
201
|
-
const parse = s.parseSync
|
|
202
|
-
const isDirty = ref(false)
|
|
203
|
-
const isValid = ref(true)
|
|
204
|
-
|
|
205
|
-
const submit1 = <A>(onSubmit: (a: To) => Promise<A>) => async <T extends Promise<{ valid: boolean }>>(e: T) => {
|
|
206
|
-
const r = await e
|
|
207
|
-
if (!r.valid) return
|
|
208
|
-
return onSubmit(parse(state.value))
|
|
209
|
-
}
|
|
210
|
-
const submit = submit1(onSubmit)
|
|
211
|
-
|
|
212
|
-
watch(
|
|
213
|
-
state,
|
|
214
|
-
(v) => {
|
|
215
|
-
// TODO: do better
|
|
216
|
-
isDirty.value = JSON.stringify(v) !== JSON.stringify(state.value)
|
|
217
|
-
},
|
|
218
|
-
{ deep: true }
|
|
219
|
-
)
|
|
220
|
-
|
|
221
|
-
const submitFromState = () => submit(Promise.resolve({ valid: isValid.value }))
|
|
222
|
-
|
|
223
|
-
return { fields, submit, submitFromState, isDirty, isValid }
|
|
224
|
-
}
|