@effect-app/vue 4.0.0-beta.18 → 4.0.0-beta.180
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 +1224 -0
- package/dist/commander.d.ts +370 -0
- package/dist/commander.d.ts.map +1 -0
- package/dist/commander.js +591 -0
- package/dist/confirm.d.ts +19 -0
- package/dist/confirm.d.ts.map +1 -0
- package/dist/confirm.js +24 -0
- package/dist/errorReporter.d.ts +4 -4
- package/dist/errorReporter.d.ts.map +1 -1
- package/dist/errorReporter.js +12 -18
- package/dist/form.d.ts +13 -4
- package/dist/form.d.ts.map +1 -1
- package/dist/form.js +41 -12
- package/dist/index.d.ts +1 -1
- package/dist/intl.d.ts +15 -0
- package/dist/intl.d.ts.map +1 -0
- package/dist/intl.js +9 -0
- package/dist/lib.d.ts +6 -8
- package/dist/lib.d.ts.map +1 -1
- package/dist/lib.js +34 -7
- package/dist/makeClient.d.ts +148 -290
- package/dist/makeClient.d.ts.map +1 -1
- package/dist/makeClient.js +205 -361
- package/dist/makeContext.d.ts +1 -1
- package/dist/makeContext.d.ts.map +1 -1
- package/dist/makeIntl.d.ts +1 -1
- package/dist/makeIntl.d.ts.map +1 -1
- package/dist/makeUseCommand.d.ts +8 -0
- package/dist/makeUseCommand.d.ts.map +1 -0
- package/dist/makeUseCommand.js +13 -0
- package/dist/mutate.d.ts +57 -25
- package/dist/mutate.d.ts.map +1 -1
- package/dist/mutate.js +160 -33
- package/dist/query.d.ts +11 -15
- package/dist/query.d.ts.map +1 -1
- package/dist/query.js +19 -27
- package/dist/routeParams.d.ts +1 -1
- package/dist/runtime.d.ts +5 -2
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +27 -17
- package/dist/toast.d.ts +46 -0
- package/dist/toast.d.ts.map +1 -0
- package/dist/toast.js +32 -0
- package/dist/withToast.d.ts +26 -0
- package/dist/withToast.d.ts.map +1 -0
- package/dist/withToast.js +49 -0
- package/eslint.config.mjs +2 -2
- package/examples/streamMutation.ts +83 -0
- package/package.json +48 -48
- package/src/{experimental/commander.ts → commander.ts} +930 -255
- package/src/{experimental/confirm.ts → confirm.ts} +10 -14
- package/src/errorReporter.ts +62 -74
- package/src/form.ts +55 -16
- package/src/intl.ts +12 -0
- package/src/lib.ts +46 -13
- package/src/makeClient.ts +570 -1038
- package/src/{experimental/makeUseCommand.ts → makeUseCommand.ts} +3 -3
- package/src/mutate.ts +306 -72
- package/src/query.ts +39 -50
- package/src/runtime.ts +39 -18
- package/src/{experimental/toast.ts → toast.ts} +11 -25
- package/src/{experimental/withToast.ts → withToast.ts} +15 -6
- package/test/Mutation.test.ts +130 -10
- package/test/dist/form.test.d.ts.map +1 -1
- package/test/dist/lib.test.d.ts.map +1 -0
- package/test/dist/streamFinal.test.d.ts.map +1 -0
- package/test/dist/stubs.d.ts +3144 -117
- package/test/dist/stubs.d.ts.map +1 -1
- package/test/dist/stubs.js +132 -25
- package/test/form-validation-errors.test.ts +23 -19
- package/test/form.test.ts +20 -2
- package/test/lib.test.ts +240 -0
- package/test/makeClient.test.ts +241 -38
- package/test/streamFinal.test.ts +110 -0
- package/test/stubs.ts +172 -42
- package/tsconfig.examples.json +20 -0
- package/tsconfig.json +0 -1
- package/tsconfig.json.bak +5 -2
- package/tsconfig.src.json +34 -34
- package/tsconfig.test.json +2 -2
- package/vitest.config.ts +5 -5
- package/dist/experimental/commander.d.ts +0 -359
- package/dist/experimental/commander.d.ts.map +0 -1
- package/dist/experimental/commander.js +0 -557
- package/dist/experimental/confirm.d.ts +0 -19
- package/dist/experimental/confirm.d.ts.map +0 -1
- package/dist/experimental/confirm.js +0 -28
- package/dist/experimental/intl.d.ts +0 -16
- package/dist/experimental/intl.d.ts.map +0 -1
- package/dist/experimental/intl.js +0 -5
- package/dist/experimental/makeUseCommand.d.ts +0 -8
- package/dist/experimental/makeUseCommand.d.ts.map +0 -1
- package/dist/experimental/makeUseCommand.js +0 -13
- package/dist/experimental/toast.d.ts +0 -47
- package/dist/experimental/toast.d.ts.map +0 -1
- package/dist/experimental/toast.js +0 -41
- package/dist/experimental/withToast.d.ts +0 -25
- package/dist/experimental/withToast.d.ts.map +0 -1
- package/dist/experimental/withToast.js +0 -45
- package/src/experimental/intl.ts +0 -9
package/test/dist/stubs.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stubs.d.ts","sourceRoot":"","sources":["../stubs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;
|
|
1
|
+
{"version":3,"file":"stubs.d.ts","sourceRoot":"","sources":["../stubs.ts"],"names":[],"mappings":"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"}
|
package/test/dist/stubs.js
CHANGED
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
import * as Intl from "@formatjs/intl";
|
|
2
|
+
import { QueryClient, VueQueryPlugin } from "@tanstack/vue-query";
|
|
2
3
|
import { Effect, Layer, ManagedRuntime, Option, S } from "effect-app";
|
|
3
4
|
import { ApiClientFactory, makeRpcClient } from "effect-app/client";
|
|
4
5
|
import { RpcContextMap } from "effect-app/rpc";
|
|
6
|
+
import * as Exit from "effect/Exit";
|
|
5
7
|
import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient";
|
|
6
|
-
import { ref } from "vue";
|
|
7
|
-
import { Commander } from "../src/
|
|
8
|
-
import { I18n } from "../src/
|
|
9
|
-
import {
|
|
10
|
-
import
|
|
11
|
-
import
|
|
12
|
-
import {
|
|
8
|
+
import { createApp, ref } from "vue";
|
|
9
|
+
import { Commander } from "../src/commander.js";
|
|
10
|
+
import { I18n } from "../src/intl.js";
|
|
11
|
+
import { makeClient } from "../src/makeClient.js";
|
|
12
|
+
import { makeUseCommand } from "../src/makeUseCommand.js";
|
|
13
|
+
import * as Toast from "../src/toast.js";
|
|
14
|
+
import { WithToast } from "../src/withToast.js";
|
|
13
15
|
const fakeToastLayer = (toasts = []) => Layer.effect(Toast.Toast, Effect.sync(() => {
|
|
14
16
|
const dismiss = (id) => {
|
|
15
17
|
const idx = toasts.findIndex((_) => _.id === id);
|
|
@@ -19,21 +21,21 @@ const fakeToastLayer = (toasts = []) => Layer.effect(Toast.Toast, Effect.sync(()
|
|
|
19
21
|
toasts.splice(idx, 1);
|
|
20
22
|
}
|
|
21
23
|
};
|
|
22
|
-
const fakeToast = (message, options) => {
|
|
24
|
+
const fakeToast = (type) => (message, options) => {
|
|
23
25
|
const id = options?.id ?? Math.random().toString(36).substring(2, 15);
|
|
24
|
-
console.log(`Toast [${id}]: ${message}`, options);
|
|
26
|
+
console.log(`Toast [${type}][${id}]: ${message}`, options);
|
|
25
27
|
options = { ...options, id };
|
|
26
28
|
const idx = toasts.findIndex((_) => _.id === id);
|
|
27
29
|
if (idx > -1) {
|
|
28
30
|
const toast = toasts[idx];
|
|
29
31
|
clearTimeout(toast.timeoutId);
|
|
30
|
-
Object.assign(toast, { message, options });
|
|
32
|
+
Object.assign(toast, { type, message, options });
|
|
31
33
|
toast.timeoutId = setTimeout(() => {
|
|
32
34
|
toasts.splice(idx, 1);
|
|
33
35
|
}, options?.timeout ?? 3000);
|
|
34
36
|
}
|
|
35
37
|
else {
|
|
36
|
-
const toast = { id, message, options };
|
|
38
|
+
const toast = { id, type, message, options };
|
|
37
39
|
toast.timeoutId = setTimeout(() => {
|
|
38
40
|
toasts.splice(idx, 1);
|
|
39
41
|
}, options?.timeout ?? 3000);
|
|
@@ -42,10 +44,10 @@ const fakeToastLayer = (toasts = []) => Layer.effect(Toast.Toast, Effect.sync(()
|
|
|
42
44
|
return id;
|
|
43
45
|
};
|
|
44
46
|
return Toast.Toast.of(Toast.wrap({
|
|
45
|
-
error: fakeToast,
|
|
46
|
-
warning: fakeToast,
|
|
47
|
-
success: fakeToast,
|
|
48
|
-
info: fakeToast,
|
|
47
|
+
error: fakeToast("error"),
|
|
48
|
+
warning: fakeToast("warning"),
|
|
49
|
+
success: fakeToast("success"),
|
|
50
|
+
info: fakeToast("info"),
|
|
49
51
|
dismiss
|
|
50
52
|
}));
|
|
51
53
|
}));
|
|
@@ -76,29 +78,134 @@ export const useExperimental = (options) => {
|
|
|
76
78
|
};
|
|
77
79
|
export class RequestContextMap extends RpcContextMap.makeMap({}) {
|
|
78
80
|
}
|
|
79
|
-
export const {
|
|
80
|
-
export
|
|
81
|
+
export const { TaggedRequestFor } = makeRpcClient(RequestContextMap);
|
|
82
|
+
export const SomethingReq = TaggedRequestFor("Something");
|
|
83
|
+
const SomethingQuery = SomethingReq.Query;
|
|
84
|
+
const SomethingCommand = SomethingReq.Command;
|
|
85
|
+
const SomethingStream = SomethingReq.Stream;
|
|
86
|
+
class SomethingGetSomething2 extends SomethingQuery()("GetSomething2", {
|
|
81
87
|
id: S.String
|
|
82
|
-
}, { success: S.
|
|
88
|
+
}, { success: S.FiniteFromString }) {
|
|
83
89
|
}
|
|
84
|
-
|
|
90
|
+
class SomethingGetSomething3 extends SomethingQuery()("GetSomething3", {
|
|
91
|
+
id: S.NullOr(S.String).withDefault
|
|
92
|
+
}, { success: S.FiniteFromString }) {
|
|
93
|
+
}
|
|
94
|
+
class SomethingGetSomething4 extends SomethingQuery()("GetSomething4", {}, { success: S.FiniteFromString }) {
|
|
95
|
+
}
|
|
96
|
+
class SomethingGetSomething2WithDependencies extends SomethingQuery()("GetSomething2", {
|
|
85
97
|
id: S.String
|
|
86
98
|
}, {
|
|
87
99
|
// this is intentilally fake, to simulate a codec that requires a dependency
|
|
88
|
-
success: S.
|
|
100
|
+
success: S.FiniteFromString,
|
|
101
|
+
error: S.String
|
|
102
|
+
}) {
|
|
103
|
+
}
|
|
104
|
+
class SomethingDoSomething extends SomethingCommand()("DoSomething", {
|
|
105
|
+
id: S.String
|
|
106
|
+
}, {
|
|
107
|
+
success: S.FiniteFromString
|
|
108
|
+
}, (queryKey, { Something }, input, output) => {
|
|
109
|
+
return [
|
|
110
|
+
{ filters: { queryKey } },
|
|
111
|
+
{
|
|
112
|
+
filters: {
|
|
113
|
+
queryKey: [
|
|
114
|
+
Something["GetSomething2"].id,
|
|
115
|
+
input.id,
|
|
116
|
+
Exit.isSuccess(output) ? output.value.toString() : "failed"
|
|
117
|
+
]
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
];
|
|
121
|
+
}) {
|
|
122
|
+
}
|
|
123
|
+
// success schema has encoded shape { a: string | null } — used to test projection constraints
|
|
124
|
+
class SomethingGetStructNullable extends SomethingQuery()("GetStructNullable", {}, {
|
|
125
|
+
success: S.Struct({ a: S.NullOr(S.String) })
|
|
126
|
+
}) {
|
|
127
|
+
}
|
|
128
|
+
/** Stream event: intermediate progress update. */
|
|
129
|
+
export class OperationProgress extends S.TaggedClass()("OperationProgress", {
|
|
130
|
+
completed: S.NonNegativeInt,
|
|
131
|
+
total: S.NonNegativeInt
|
|
132
|
+
}) {
|
|
133
|
+
}
|
|
134
|
+
/** Stream event: final completion result. */
|
|
135
|
+
export class ExportComplete extends S.TaggedClass()("ExportComplete", {
|
|
136
|
+
fileUrl: S.NonEmptyString
|
|
137
|
+
}) {
|
|
138
|
+
}
|
|
139
|
+
/** Stream with no `final` schema — execute resolves with `void`. */
|
|
140
|
+
class SomethingStreamWithoutFinal extends SomethingStream()("StreamWithoutFinal", {
|
|
141
|
+
id: S.String
|
|
142
|
+
}, {
|
|
143
|
+
success: S.Union([OperationProgress, ExportComplete])
|
|
144
|
+
}) {
|
|
145
|
+
}
|
|
146
|
+
/** Stream with a `final` schema — execute resolves with `ExportComplete`. */
|
|
147
|
+
class SomethingStreamWithFinal extends SomethingStream()("StreamWithFinal", {
|
|
148
|
+
id: S.String
|
|
149
|
+
}, {
|
|
150
|
+
success: S.Union([OperationProgress, ExportComplete]),
|
|
151
|
+
final: ExportComplete
|
|
152
|
+
}) {
|
|
153
|
+
}
|
|
154
|
+
export const Something = {
|
|
155
|
+
GetSomething2: SomethingGetSomething2,
|
|
156
|
+
GetSomething2WithDependencies: SomethingGetSomething2WithDependencies,
|
|
157
|
+
GetSomething3: SomethingGetSomething3,
|
|
158
|
+
GetSomething4: SomethingGetSomething4,
|
|
159
|
+
DoSomething: SomethingDoSomething,
|
|
160
|
+
GetStructNullable: SomethingGetStructNullable,
|
|
161
|
+
StreamWithoutFinal: SomethingStreamWithoutFinal,
|
|
162
|
+
StreamWithFinal: SomethingStreamWithFinal
|
|
163
|
+
};
|
|
164
|
+
export const SomethingElseReq = TaggedRequestFor("SomethingElse");
|
|
165
|
+
const SomethingElseQuery = SomethingElseReq.Query;
|
|
166
|
+
class SomethingElseGetSomething2 extends SomethingElseQuery()("GetSomething2", {
|
|
167
|
+
id: S.String
|
|
168
|
+
}, { success: S.FiniteFromString }) {
|
|
169
|
+
}
|
|
170
|
+
class SomethingElseGetSomething2WithDependencies extends SomethingElseQuery()("GetSomething2", {
|
|
171
|
+
id: S.String
|
|
172
|
+
}, {
|
|
173
|
+
success: S.FiniteFromString,
|
|
89
174
|
error: S.String
|
|
90
175
|
}) {
|
|
91
176
|
}
|
|
92
|
-
export const
|
|
177
|
+
export const SomethingElse = {
|
|
178
|
+
GetSomething2: SomethingElseGetSomething2,
|
|
179
|
+
GetSomething2WithDependencies: SomethingElseGetSomething2WithDependencies
|
|
180
|
+
};
|
|
93
181
|
export const useClient = (options) => {
|
|
94
182
|
const FakeIntlLayer = fakeIntlLayer(options?.messages);
|
|
95
183
|
const FakeToastLayer = fakeToastLayer(options?.toasts);
|
|
96
184
|
const CommanderLayer = Commander.Default.pipe(Layer.provide([FakeIntlLayer, FakeToastLayer]));
|
|
97
185
|
const WithToastLayer = WithToast.Default.pipe(Layer.provide(FakeToastLayer));
|
|
98
186
|
const api = ApiClientFactory.layer({ url: "bogus", headers: Option.none() }).pipe(Layer.provide(FetchHttpClient.layer));
|
|
99
|
-
const
|
|
100
|
-
const layers = Layer.mergeAll(CommanderLayer, WithToastLayer, FakeToastLayer, FakeIntlLayer, api, lm);
|
|
187
|
+
const layers = Layer.mergeAll(CommanderLayer, WithToastLayer, FakeToastLayer, FakeIntlLayer, api);
|
|
101
188
|
const clientFor_ = ApiClientFactory.makeFor(Layer.empty);
|
|
102
|
-
|
|
189
|
+
const rawClient = makeClient(() => ManagedRuntime.make(layers), clientFor_, Layer.empty);
|
|
190
|
+
// Provide a Vue injection context so that composition-API hooks (e.g. useQueryClient)
|
|
191
|
+
// called during client initialisation work outside a component setup() function.
|
|
192
|
+
const vueApp = createApp({});
|
|
193
|
+
const testQueryClientConfig = { defaultOptions: { queries: { retry: false }, mutations: { retry: false } } };
|
|
194
|
+
vueApp.use(VueQueryPlugin, { queryClient: new QueryClient(testQueryClientConfig) });
|
|
195
|
+
const origClientFor = rawClient.clientFor;
|
|
196
|
+
const clientFor = function (m, ...args) {
|
|
197
|
+
const proxy = origClientFor(m, ...args);
|
|
198
|
+
// Warm up lazy mutation-hook initialisation inside the Vue injection context.
|
|
199
|
+
// After the first property access, useMutation() is cached and subsequent
|
|
200
|
+
// accesses outside the context succeed.
|
|
201
|
+
const firstPropertyName = Object.keys(m)[0];
|
|
202
|
+
if (firstPropertyName !== undefined) {
|
|
203
|
+
vueApp.runWithContext(() => {
|
|
204
|
+
void proxy[firstPropertyName];
|
|
205
|
+
});
|
|
206
|
+
}
|
|
207
|
+
return proxy;
|
|
208
|
+
};
|
|
209
|
+
return { ...rawClient, clientFor };
|
|
103
210
|
};
|
|
104
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3R1YnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zdHVicy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssSUFBSSxNQUFNLGdCQUFnQixDQUFBO0FBQ3RDLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLEVBQUUsQ0FBQyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQ3JFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxhQUFhLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUNuRSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0JBQWdCLENBQUE7QUFDOUMsT0FBTyxLQUFLLGVBQWUsTUFBTSxzQ0FBc0MsQ0FBQTtBQUN2RSxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sS0FBSyxDQUFBO0FBQ3pCLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQTtBQUM1RCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sNkJBQTZCLENBQUE7QUFDbEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHVDQUF1QyxDQUFBO0FBQ3RFLE9BQU8sS0FBSyxLQUFLLE1BQU0sOEJBQThCLENBQUE7QUFDckQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBQzVELE9BQU8sRUFBRSxjQUFjLEVBQUUsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFHakUsTUFBTSxjQUFjLEdBQUcsQ0FBQyxTQUFnQixFQUFFLEVBQUUsRUFBRSxDQUM1QyxLQUFLLENBQUMsTUFBTSxDQUNWLEtBQUssQ0FBQyxLQUFLLEVBQ1gsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUU7SUFDZixNQUFNLE9BQU8sR0FBRyxDQUFDLEVBQWlCLEVBQUUsRUFBRTtRQUNwQyxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxL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
|
|
211
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"stubs.js","sourceRoot":"","sources":["../stubs.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { buildFieldInfoFromFieldsRoot, translate } from "../src/form.js"
|
|
|
4
4
|
// test schema with integer field
|
|
5
5
|
class TestSchema extends S.Class<TestSchema>("TestSchema")({
|
|
6
6
|
integerField: S.Int,
|
|
7
|
-
numberField: S.
|
|
7
|
+
numberField: S.Finite,
|
|
8
8
|
stringField: S.String
|
|
9
9
|
}) {}
|
|
10
10
|
|
|
@@ -137,22 +137,26 @@ it("validates integer field with valid integer", () =>
|
|
|
137
137
|
.pipe(Effect.runPromise))
|
|
138
138
|
|
|
139
139
|
it("error message format matches regex pattern", () => {
|
|
140
|
-
// test the actual error message format from Effect Schema
|
|
141
|
-
const
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
expect(
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
const
|
|
156
|
-
expect(
|
|
157
|
-
expect(
|
|
140
|
+
// test the actual error message format from Effect Schema (both old "actual" and new "got" formats)
|
|
141
|
+
const errorMessageOld = `Expected an integer, actual 59.5`
|
|
142
|
+
const errorMessageNew = `SchemaError(Expected an integer, got 59.5)`
|
|
143
|
+
|
|
144
|
+
const oldMatch = errorMessageOld.match(/Expected.*integer.*(?:actual|got)\s+([^)]+)/i)
|
|
145
|
+
expect(oldMatch).toBeTruthy()
|
|
146
|
+
expect(oldMatch![1]).toBe("59.5")
|
|
147
|
+
|
|
148
|
+
const newMatch = errorMessageNew.match(/Expected.*integer.*(?:actual|got)\s+([^)]+)/i)
|
|
149
|
+
expect(newMatch).toBeTruthy()
|
|
150
|
+
expect(newMatch![1]).toBe("59.5")
|
|
151
|
+
|
|
152
|
+
const numberErrorOld = `Expected a number, actual "not-a-number"`
|
|
153
|
+
const numberErrorNew = `SchemaError(Expected a finite number, got "not-a-number")`
|
|
154
|
+
|
|
155
|
+
const numOldMatch = numberErrorOld.match(/Expected.*number.*(?:actual|got)\s+([^)]+)/i)
|
|
156
|
+
expect(numOldMatch).toBeTruthy()
|
|
157
|
+
expect(numOldMatch![1]).toBe("\"not-a-number\"")
|
|
158
|
+
|
|
159
|
+
const numNewMatch = numberErrorNew.match(/Expected.*number.*(?:actual|got)\s+([^)]+)/i)
|
|
160
|
+
expect(numNewMatch).toBeTruthy()
|
|
161
|
+
expect(numNewMatch![1]).toBe("\"not-a-number\"")
|
|
158
162
|
})
|
package/test/form.test.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Effect, S } from "effect-app"
|
|
2
|
-
import { buildFieldInfoFromFieldsRoot, type DiscriminatedUnionFieldInfo, type FieldInfo, type NestedFieldInfo, type UnionFieldInfo } from "../src/form.js"
|
|
2
|
+
import { buildFieldInfoFromFieldsRoot, type DiscriminatedUnionFieldInfo, type FieldInfo, getMetadataFromSchema, type NestedFieldInfo, type UnionFieldInfo } from "../src/form.js"
|
|
3
3
|
|
|
4
4
|
export class NestedSchema extends S.Class<NestedSchema>("NestedSchema")({
|
|
5
5
|
shallow: S.String,
|
|
@@ -9,7 +9,11 @@ export class NestedSchema extends S.Class<NestedSchema>("NestedSchema")({
|
|
|
9
9
|
deepest: S.Number
|
|
10
10
|
})
|
|
11
11
|
}),
|
|
12
|
-
age: S.Struct({ nfs: S.NumberFromString.pipe(S.decodeTo(S.PositiveInt)) })
|
|
12
|
+
age: S.Struct({ nfs: S.NumberFromString.pipe(S.decodeTo(S.PositiveInt)) }),
|
|
13
|
+
testNumber: S.Number,
|
|
14
|
+
testFinite: S.Finite,
|
|
15
|
+
testNullableNummber: S.NullOr(S.Number),
|
|
16
|
+
testOptionalNumber: S.optional(S.Number)
|
|
13
17
|
}) {}
|
|
14
18
|
|
|
15
19
|
export class SchemaContainsClass extends S.Class<SchemaContainsClass>("SchemaContainsClass")({
|
|
@@ -156,6 +160,15 @@ function testDiscriminatedUnionFieldInfo<T extends Record<PropertyKey, any>>(duf
|
|
|
156
160
|
)
|
|
157
161
|
}
|
|
158
162
|
|
|
163
|
+
it("getMetadataFromSchema handles composed numeric schemas", () => {
|
|
164
|
+
expect(getMetadataFromSchema(S.Number.ast).type).toBe("float")
|
|
165
|
+
expect(getMetadataFromSchema(S.Finite.ast).type).toBe("float")
|
|
166
|
+
expect(getMetadataFromSchema(S.PositiveNumber.ast).type).toBe("float")
|
|
167
|
+
expect(getMetadataFromSchema(S.Int.ast).type).toBe("int")
|
|
168
|
+
expect(getMetadataFromSchema(S.PositiveInt.ast).type).toBe("int")
|
|
169
|
+
expect(getMetadataFromSchema(S.NullOr(S.Number).ast).type).toBe("float")
|
|
170
|
+
})
|
|
171
|
+
|
|
159
172
|
it("buildFieldInfo", () =>
|
|
160
173
|
Effect
|
|
161
174
|
.gen(function*() {
|
|
@@ -176,6 +189,11 @@ it("buildFieldInfo", () =>
|
|
|
176
189
|
testNestedFieldInfo(nestedFieldinfo)
|
|
177
190
|
testNestedFieldInfo(nestedFieldinfo.fields.nested)
|
|
178
191
|
testNestedFieldInfo(nestedFieldinfo.fields.age)
|
|
192
|
+
|
|
193
|
+
expect(nestedFieldinfo.fields.testNumber.type).toBe("float")
|
|
194
|
+
expect(nestedFieldinfo.fields.testFinite.type).toBe("float")
|
|
195
|
+
expect(nestedFieldinfo.fields.testNullableNummber.type).toBe("float")
|
|
196
|
+
expect(nestedFieldinfo.fields.testOptionalNumber.type).toBe("float")
|
|
179
197
|
})
|
|
180
198
|
.pipe(Effect.runPromise))
|
|
181
199
|
|
package/test/lib.test.ts
ADDED
|
@@ -0,0 +1,240 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest"
|
|
2
|
+
import { computed, isProxy, isReactive, isRef, reactive, ref } from "vue"
|
|
3
|
+
import { deepToRaw } from "../src/lib.js"
|
|
4
|
+
|
|
5
|
+
type DeepMapKey = { id: string } | "list"
|
|
6
|
+
type DeepMapValue = { nestedSet: Set<{ ok: boolean } | Date> } | Array<{ count: number }>
|
|
7
|
+
type DeepSetValue = Map<string, { value: number }> | Array<{ value: number }>
|
|
8
|
+
|
|
9
|
+
const expectPlainDeep = (value: unknown): void => {
|
|
10
|
+
expect(isRef(value)).toBe(false)
|
|
11
|
+
expect(isReactive(value)).toBe(false)
|
|
12
|
+
expect(isProxy(value)).toBe(false)
|
|
13
|
+
|
|
14
|
+
if (Array.isArray(value)) {
|
|
15
|
+
value.forEach(expectPlainDeep)
|
|
16
|
+
return
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
if (value instanceof Map) {
|
|
20
|
+
value.forEach((entryValue, entryKey) => {
|
|
21
|
+
expectPlainDeep(entryKey)
|
|
22
|
+
expectPlainDeep(entryValue)
|
|
23
|
+
})
|
|
24
|
+
return
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
if (value instanceof Set) {
|
|
28
|
+
value.forEach((entry) => {
|
|
29
|
+
expectPlainDeep(entry)
|
|
30
|
+
})
|
|
31
|
+
return
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
if (value instanceof Date) {
|
|
35
|
+
return
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
if (value && typeof value === "object") {
|
|
39
|
+
Object.values(value).forEach(expectPlainDeep)
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
describe("deepToRaw", () => {
|
|
44
|
+
it("supports non-object root inputs", () => {
|
|
45
|
+
expect(deepToRaw(1)).toBe(1)
|
|
46
|
+
expect(deepToRaw("x")).toBe("x")
|
|
47
|
+
expect(deepToRaw(null)).toBe(null)
|
|
48
|
+
expect(deepToRaw(undefined)).toBe(undefined)
|
|
49
|
+
expect(deepToRaw(ref(123))).toBe(123)
|
|
50
|
+
|
|
51
|
+
const rootArray = deepToRaw(reactive([reactive({ n: 1 }), ref(2)]))
|
|
52
|
+
expect(rootArray).toEqual([{ n: 1 }, 2])
|
|
53
|
+
expect(Array.isArray(rootArray)).toBe(true)
|
|
54
|
+
|
|
55
|
+
const rootMap = deepToRaw(
|
|
56
|
+
reactive(new Map<string, unknown>([["k", reactive({ n: 1 })], ["r", ref(2)]]))
|
|
57
|
+
)
|
|
58
|
+
expect(rootMap).toBeInstanceOf(Map)
|
|
59
|
+
expect(rootMap.get("k")).toEqual({ n: 1 })
|
|
60
|
+
expect(rootMap.get("r")).toBe(2)
|
|
61
|
+
|
|
62
|
+
const rootSet = deepToRaw(reactive(new Set([reactive({ n: 1 }), ref(2)])))
|
|
63
|
+
expect(rootSet).toBeInstanceOf(Set)
|
|
64
|
+
expect(Array.from(rootSet)).toEqual([{ n: 1 }, 2])
|
|
65
|
+
|
|
66
|
+
const date = new Date("2024-02-03T00:00:00.000Z")
|
|
67
|
+
const rootDate = deepToRaw(date)
|
|
68
|
+
expect(rootDate).toBeInstanceOf(Date)
|
|
69
|
+
expect(rootDate).not.toBe(date)
|
|
70
|
+
expect(rootDate.toISOString()).toBe(date.toISOString())
|
|
71
|
+
})
|
|
72
|
+
|
|
73
|
+
it("unwraps nested objects and arrays without leaving vue proxies behind", () => {
|
|
74
|
+
const source = reactive({
|
|
75
|
+
list: [
|
|
76
|
+
reactive({
|
|
77
|
+
nested: reactive({
|
|
78
|
+
count: 1,
|
|
79
|
+
items: [reactive({ label: "a" }), reactive({ label: "b" })]
|
|
80
|
+
})
|
|
81
|
+
})
|
|
82
|
+
],
|
|
83
|
+
plain: reactive({ ok: true })
|
|
84
|
+
})
|
|
85
|
+
|
|
86
|
+
const result = deepToRaw(source)
|
|
87
|
+
|
|
88
|
+
expect(Array.isArray(result.list)).toBe(true)
|
|
89
|
+
expect(Array.isArray(result.list[0]?.nested.items)).toBe(true)
|
|
90
|
+
expect(result).toEqual({
|
|
91
|
+
list: [{ nested: { count: 1, items: [{ label: "a" }, { label: "b" }] } }],
|
|
92
|
+
plain: { ok: true }
|
|
93
|
+
})
|
|
94
|
+
expectPlainDeep(result)
|
|
95
|
+
})
|
|
96
|
+
|
|
97
|
+
it("preserves maps and sets while deeply unwrapping nested entries", () => {
|
|
98
|
+
const key = reactive({ id: "key" })
|
|
99
|
+
const nestedDate = new Date("2024-01-02T03:04:05.000Z")
|
|
100
|
+
const map = reactive(
|
|
101
|
+
new Map<DeepMapKey, DeepMapValue>([
|
|
102
|
+
[key, reactive({ nestedSet: reactive(new Set([{ ok: true }, nestedDate])) })],
|
|
103
|
+
["list", reactive([{ count: 2 }])]
|
|
104
|
+
])
|
|
105
|
+
)
|
|
106
|
+
const set = reactive(
|
|
107
|
+
new Set<DeepSetValue>([
|
|
108
|
+
reactive(new Map([["deep", reactive({ value: 3 })]])),
|
|
109
|
+
reactive([{ value: 4 }])
|
|
110
|
+
])
|
|
111
|
+
)
|
|
112
|
+
const source = reactive({
|
|
113
|
+
map,
|
|
114
|
+
set
|
|
115
|
+
})
|
|
116
|
+
|
|
117
|
+
const result = deepToRaw(source)
|
|
118
|
+
|
|
119
|
+
expect(result.map).toBeInstanceOf(Map)
|
|
120
|
+
expect(result.set).toBeInstanceOf(Set)
|
|
121
|
+
|
|
122
|
+
const entries = Array.from(result.map.entries())
|
|
123
|
+
expect(entries[0]?.[0]).toEqual({ id: "key" })
|
|
124
|
+
expect(entries[0]?.[0]).not.toBe(key)
|
|
125
|
+
expect(entries[0]?.[1]).toEqual({ nestedSet: new Set([{ ok: true }, nestedDate]) })
|
|
126
|
+
expect(entries[1]?.[1]).toEqual([{ count: 2 }])
|
|
127
|
+
|
|
128
|
+
const setValues = Array.from(result.set.values())
|
|
129
|
+
expect(setValues[0]).toBeInstanceOf(Map)
|
|
130
|
+
expect(setValues[1]).toEqual([{ value: 4 }])
|
|
131
|
+
expect((setValues[0] as Map<string, { value: number }>).get("deep")).toEqual({ value: 3 })
|
|
132
|
+
|
|
133
|
+
expectPlainDeep(result)
|
|
134
|
+
})
|
|
135
|
+
|
|
136
|
+
it("keeps nested dates as dates, including dates reached through refs", () => {
|
|
137
|
+
const date = new Date("2025-06-07T08:09:10.000Z")
|
|
138
|
+
const source = reactive({
|
|
139
|
+
createdAt: date,
|
|
140
|
+
nested: reactive({
|
|
141
|
+
updatedAt: ref(date),
|
|
142
|
+
list: [ref(date)],
|
|
143
|
+
map: reactive(new Map([["at", ref(date)]])),
|
|
144
|
+
set: reactive(new Set([ref(date)]))
|
|
145
|
+
})
|
|
146
|
+
})
|
|
147
|
+
|
|
148
|
+
const result = deepToRaw(source)
|
|
149
|
+
|
|
150
|
+
expect(result.createdAt).toBeInstanceOf(Date)
|
|
151
|
+
expect(result.nested.updatedAt).toBeInstanceOf(Date)
|
|
152
|
+
expect(result.nested.list[0]).toBeInstanceOf(Date)
|
|
153
|
+
expect(result.nested.map).toBeInstanceOf(Map)
|
|
154
|
+
expect(result.nested.set).toBeInstanceOf(Set)
|
|
155
|
+
|
|
156
|
+
const updatedAt = result.nested.updatedAt
|
|
157
|
+
const firstListDate = result.nested.list[0]
|
|
158
|
+
const mappedDate = result.nested.map.get("at")
|
|
159
|
+
const firstSetDate = Array.from(result.nested.set)[0]
|
|
160
|
+
|
|
161
|
+
if (!(updatedAt instanceof Date)) {
|
|
162
|
+
throw new Error("expected updatedAt to be a Date")
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
if (!(firstListDate instanceof Date)) {
|
|
166
|
+
throw new Error("expected first list item to be a Date")
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
if (!(mappedDate instanceof Date)) {
|
|
170
|
+
throw new Error("expected mapped date to be a Date")
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
if (!(firstSetDate instanceof Date)) {
|
|
174
|
+
throw new Error("expected first set item to be a Date")
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
expect(result.createdAt.toISOString()).toBe(date.toISOString())
|
|
178
|
+
expect(updatedAt.toISOString()).toBe(date.toISOString())
|
|
179
|
+
expect(firstListDate.toISOString()).toBe(date.toISOString())
|
|
180
|
+
expect(mappedDate.toISOString()).toBe(date.toISOString())
|
|
181
|
+
expect(firstSetDate.toISOString()).toBe(date.toISOString())
|
|
182
|
+
|
|
183
|
+
expectPlainDeep(result)
|
|
184
|
+
})
|
|
185
|
+
|
|
186
|
+
it("unwraps computed values nested in refs/plain objects and deepToRawes the computed result", () => {
|
|
187
|
+
const source = {
|
|
188
|
+
innerRef: ref({
|
|
189
|
+
computedValue: computed(() =>
|
|
190
|
+
reactive({
|
|
191
|
+
list: [reactive({ n: 1 }), reactive({ n: 2 })],
|
|
192
|
+
map: reactive(new Map([["k", reactive({ nested: true })]])),
|
|
193
|
+
set: reactive(new Set([reactive({ fromSet: true })]))
|
|
194
|
+
})
|
|
195
|
+
)
|
|
196
|
+
}),
|
|
197
|
+
plainComputed: computed(() => reactive({ date: ref(new Date("2025-01-01T00:00:00.000Z")) }))
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
const result = deepToRaw(source)
|
|
201
|
+
|
|
202
|
+
expect(result).toEqual({
|
|
203
|
+
innerRef: {
|
|
204
|
+
computedValue: {
|
|
205
|
+
list: [{ n: 1 }, { n: 2 }],
|
|
206
|
+
map: new Map([["k", { nested: true }]]),
|
|
207
|
+
set: new Set([{ fromSet: true }])
|
|
208
|
+
}
|
|
209
|
+
},
|
|
210
|
+
plainComputed: {
|
|
211
|
+
date: new Date("2025-01-01T00:00:00.000Z")
|
|
212
|
+
}
|
|
213
|
+
})
|
|
214
|
+
|
|
215
|
+
const innerRefValue = Reflect.get(result, "innerRef")
|
|
216
|
+
if (!innerRefValue || typeof innerRefValue !== "object") {
|
|
217
|
+
throw new Error("expected innerRef to be an object")
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
const computedValue = Reflect.get(innerRefValue, "computedValue")
|
|
221
|
+
if (!computedValue || typeof computedValue !== "object") {
|
|
222
|
+
throw new Error("expected computedValue to be an object")
|
|
223
|
+
}
|
|
224
|
+
|
|
225
|
+
const computedMap = Reflect.get(computedValue, "map")
|
|
226
|
+
const computedSet = Reflect.get(computedValue, "set")
|
|
227
|
+
|
|
228
|
+
const plainComputedValue = Reflect.get(result, "plainComputed")
|
|
229
|
+
if (!plainComputedValue || typeof plainComputedValue !== "object") {
|
|
230
|
+
throw new Error("expected plainComputed to be an object")
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
const computedDate = Reflect.get(plainComputedValue, "date")
|
|
234
|
+
|
|
235
|
+
expect(computedMap).toBeInstanceOf(Map)
|
|
236
|
+
expect(computedSet).toBeInstanceOf(Set)
|
|
237
|
+
expect(computedDate).toBeInstanceOf(Date)
|
|
238
|
+
expectPlainDeep(result)
|
|
239
|
+
})
|
|
240
|
+
})
|