@effect-app/vue 4.0.0-beta.22 → 4.0.0-beta.220

package/test/dist/stubs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stubs.d.ts","sourceRoot":"","sources":["../stubs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAE9E,OAAO,EAAU,KAAK,EAA0B,CAAC,EAAE,MAAM,YAAY,CAAA;AACrE,OAAO,EAAE,gBAAgB,EAAiB,MAAM,mBAAmB,CAAA;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAG9C,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAC5D,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AAElD,OAAO,KAAK,KAAK,MAAM,8BAA8B,CAAA;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAc,MAAM,sBAAsB,CAAA;AACjE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAA;AA8CxD,eAAO,MAAM,YAAY,GAAI,WAAU,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAM,KAepG,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAClD,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,WAAU,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAM,oCACpC,CAAA;AAExE,eAAO,MAAM,eAAe,GAC1B,UAAU;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,GAAG,EAAE,CAAA;CAAE,6GASxG,CAAA;;;;;;;;AAED,qBAAa,iBAAkB,SAAQ,sBAAyB;CAAG;AACnE,eAAO,MAAuB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAqC,CAAA;;;;;;;;;;;;;;;;;;AACtE,qBAAa,aAAc,SAAQ,kBAEA;CAAG;;;;;;;;;;;;;;iBAML,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC;;;;;AAJjE,qBAAa,6BAA8B,SAAQ,kCAMjD;CAAG;AAEL,eAAO,MAAM,SAAS;;;;;;CAA+F,CAAA;AAErH,eAAO,MAAM,SAAS,GACpB,UAAU;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,GAAG,EAAE,CAAA;CAAE;;;;;;;;;CAcxG,CAAA"}
+{"version":3,"file":"stubs.d.ts","sourceRoot":"","sources":["../stubs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAG9E,OAAO,EAAE,MAAM,EAAE,KAAK,EAA0B,CAAC,EAAE,MAAM,YAAY,CAAA;AACrE,OAAO,EAAE,gBAAgB,EAAiB,MAAM,mBAAmB,CAAA;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAI9C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAErC,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAExD,OAAO,KAAK,KAAK,MAAM,iBAAiB,CAAA;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAqD/C,eAAO,MAAM,YAAY,cAAc,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,KAe/F,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAClD,CAAA;AAED,eAAO,MAAM,aAAa,cAAc,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,oCAC/B,CAAA;AAExE,eAAO,MAAM,eAAe,aAChB;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,GAAG,EAAE,CAAA;CAAE,gGASxG,CAAA;AAKD,eAAO,MAAM,gBAAgB,aACjB;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,GAAG,EAAE,CAAA;CAAE,6HASxG,CAAA;;;;;;;;AAED,qBAAa,iBAAkB,SAAQ,sBAAyB;CAAG;AAKnE,eAAO,MAAQ,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gCAFA,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAE6B,CAAA;AAEjE,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gCAJM,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gCAAL,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gCAAL,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gCAAL,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gCAAL,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gCAAL,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gCAAL,KAAK;;;;;;;;;;;;;;;;;;;;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"}

package/test/dist/stubs.js

@@ -1,15 +1,17 @@
 import * as Intl from "@formatjs/intl";
+import { QueryClient, VueQueryPlugin } from "@tanstack/vue-query";
 import { Effect, Layer, ManagedRuntime, Option, S } from "effect-app";
 import { ApiClientFactory, makeRpcClient } from "effect-app/client";
 import { RpcContextMap } from "effect-app/rpc";
+import * as Exit from "effect/Exit";
 import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient";
-import { ref } from "vue";
-import { Commander } from "../src/experimental/commander.js";
-import { I18n } from "../src/experimental/intl.js";
-import { makeUseCommand } from "../src/experimental/makeUseCommand.js";
-import * as Toast from "../src/experimental/toast.js";
-import { WithToast } from "../src/experimental/withToast.js";
-import { LegacyMutation, makeClient } from "../src/makeClient.js";
+import { createApp, ref } from "vue";
+import { Commander } from "../src/commander.js";
+import { I18n } from "../src/intl.js";
+import { makeClient } from "../src/makeClient.js";
+import { makeUseCommand } from "../src/makeUseCommand.js";
+import * as Toast from "../src/toast.js";
+import { WithToast } from "../src/withToast.js";
 const fakeToastLayer = (toasts = []) => Layer.effect(Toast.Toast, Effect.sync(() => {
     const dismiss = (id) => {
         const idx = toasts.findIndex((_) => _.id === id);
@@ -19,33 +21,41 @@ const fakeToastLayer = (toasts = []) => Layer.effect(Toast.Toast, Effect.sync(()
             toasts.splice(idx, 1);
         }
     };
-    const fakeToast = (message, options) => {
+    const scheduleAutoDismiss = (toast, timeout) => {
+        // Treat Infinity / undefined as "stays until explicitly replaced/dismissed".
+        // Node's setTimeout silently clamps Infinity to 1ms which would otherwise
+        // cause the toast to disappear before assertions can observe it.
+        if (timeout === undefined || !Number.isFinite(timeout))
+            return;
+        toast.timeoutId = setTimeout(() => {
+            const i = toasts.indexOf(toast);
+            if (i > -1)
+                toasts.splice(i, 1);
+        }, timeout);
+    };
+    const fakeToast = (type) => (message, options) => {
         const id = options?.id ?? Math.random().toString(36).substring(2, 15);
-        console.log(`Toast [${id}]: ${message}`, options);
+        console.log(`Toast [${type}][${id}]: ${message}`, options);
         options = { ...options, id };
         const idx = toasts.findIndex((_) => _.id === id);
         if (idx > -1) {
             const toast = toasts[idx];
             clearTimeout(toast.timeoutId);
-            Object.assign(toast, { message, options });
-            toast.timeoutId = setTimeout(() => {
-                toasts.splice(idx, 1);
-            }, options?.timeout ?? 3000);
+            Object.assign(toast, { type, message, options });
+            scheduleAutoDismiss(toast, options?.timeout ?? 3000);
         }
         else {
-            const toast = { id, message, options };
-            toast.timeoutId = setTimeout(() => {
-                toasts.splice(idx, 1);
-            }, options?.timeout ?? 3000);
+            const toast = { id, type, message, options };
             toasts.push(toast);
+            scheduleAutoDismiss(toast, options?.timeout ?? 3000);
         }
         return id;
     };
     return Toast.Toast.of(Toast.wrap({
-        error: fakeToast,
-        warning: fakeToast,
-        success: fakeToast,
-        info: fakeToast,
+        error: fakeToast("error"),
+        warning: fakeToast("warning"),
+        success: fakeToast("success"),
+        info: fakeToast("info"),
         dismiss
     }));
 }));
@@ -74,31 +84,172 @@ export const useExperimental = (options) => {
     const layers = Layer.mergeAll(CommanderLayer, WithToastLayer, FakeToastLayer, FakeIntlLayer);
     return Effect.runSync(makeUseCommand(Layer.empty).pipe(Effect.provide(layers)));
 };
+// Effect-returning variant: keeps the caller's runtime context (e.g. a TestClock
+// provided by `it.effect`) so virtual-time advances reach the runtime captured
+// inside Commander.
+export const useExperimentalE = (options) => {
+    const FakeIntlLayer = fakeIntlLayer(options?.messages);
+    const FakeToastLayer = fakeToastLayer(options?.toasts);
+    const CommanderLayer = Commander.Default.pipe(Layer.provide([FakeIntlLayer, FakeToastLayer]));
+    const WithToastLayer = WithToast.Default.pipe(Layer.provide(FakeToastLayer));
+    const layers = Layer.mergeAll(CommanderLayer, WithToastLayer, FakeToastLayer, FakeIntlLayer);
+    return makeUseCommand(Layer.empty).pipe(Effect.provide(layers));
+};
 export class RequestContextMap extends RpcContextMap.makeMap({}) {
 }
-export const { TaggedRequest: Req } = makeRpcClient(RequestContextMap);
-export class GetSomething2 extends Req()("GetSomething2", {
+const stubMiddleware = {
+    requestContextMap: RequestContextMap.config,
+    requestContext: undefined
+};
+export const { TaggedRequestFor } = makeRpcClient(stubMiddleware);
+export const SomethingReq = TaggedRequestFor("Something");
+const SomethingQuery = SomethingReq.Query;
+const SomethingCommand = SomethingReq.Command;
+class SomethingGetSomething2 extends SomethingQuery()("GetSomething2", {
     id: S.String
-}, { success: S.NumberFromString }) {
+}, { success: S.FiniteFromString }) {
+}
+class SomethingGetSomething3 extends SomethingQuery()("GetSomething3", {
+    id: S.NullOr(S.String).withConstructorDefault
+}, { success: S.FiniteFromString }) {
 }
-export class GetSomething2WithDependencies extends Req()("GetSomething2", {
+class SomethingGetSomething4 extends SomethingQuery()("GetSomething4", {}, { success: S.FiniteFromString }) {
+}
+class SomethingGetSomething2WithDependencies extends SomethingQuery()("GetSomething2", {
     id: S.String
 }, {
     // this is intentilally fake, to simulate a codec that requires a dependency
-    success: S.NumberFromString,
+    success: S.FiniteFromString,
+    error: S.String
+}) {
+}
+// command stubs covering the input-shape matrix
+class SomethingDoNoProps extends SomethingCommand()("DoNoProps", {}) {
+}
+class SomethingDoOptionalOnly extends SomethingCommand()("DoOptionalOnly", {
+    name: S.optional(S.String)
+}) {
+}
+class SomethingDoRequiredOnly extends SomethingCommand()("DoRequiredOnly", {
+    id: S.String
+}) {
+}
+class SomethingDoMixed extends SomethingCommand()("DoMixed", {
+    id: S.String,
+    name: S.optional(S.String)
+}) {
+}
+class SomethingDoSomething extends SomethingCommand()("DoSomething", {
+    id: S.String
+}, {
+    success: S.FiniteFromString
+}, (queryKey, { Something }, input, output) => {
+    return [
+        { filters: { queryKey } },
+        {
+            filters: {
+                queryKey: [
+                    Something["GetSomething2"].id,
+                    input.id,
+                    Exit.isSuccess(output) ? output.value.toString() : "failed"
+                ]
+            }
+        }
+    ];
+}) {
+}
+// success schema has encoded shape { a: string | null } — used to test projection constraints
+class SomethingGetStructNullable extends SomethingQuery()("GetStructNullable", {}, {
+    success: S.Struct({ a: S.NullOr(S.String) })
+}) {
+}
+/** Stream event: intermediate progress update. */
+export class OperationProgress extends S.TaggedClass()("OperationProgress", {
+    completed: S.NonNegativeInt,
+    total: S.NonNegativeInt
+}) {
+}
+/** Stream event: final completion result. */
+export class ExportComplete extends S.TaggedClass()("ExportComplete", {
+    fileUrl: S.NonEmptyString
+}) {
+}
+/** Stream with no `final` schema — execute resolves with `void`. */
+class SomethingStreamWithoutFinal extends SomethingCommand()("StreamWithoutFinal", {
+    id: S.String
+}, {
+    stream: true,
+    success: S.Union([OperationProgress, ExportComplete])
+}) {
+}
+/** Stream with a `final` schema — execute resolves with `ExportComplete`. */
+class SomethingStreamWithFinal extends SomethingCommand()("StreamWithFinal", {
+    id: S.String
+}, {
+    stream: true,
+    success: S.Union([OperationProgress, ExportComplete]),
+    final: ExportComplete
+}) {
+}
+export const Something = {
+    GetSomething2: SomethingGetSomething2,
+    GetSomething2WithDependencies: SomethingGetSomething2WithDependencies,
+    GetSomething3: SomethingGetSomething3,
+    GetSomething4: SomethingGetSomething4,
+    DoNoProps: SomethingDoNoProps,
+    DoOptionalOnly: SomethingDoOptionalOnly,
+    DoRequiredOnly: SomethingDoRequiredOnly,
+    DoMixed: SomethingDoMixed,
+    DoSomething: SomethingDoSomething,
+    GetStructNullable: SomethingGetStructNullable,
+    StreamWithoutFinal: SomethingStreamWithoutFinal,
+    StreamWithFinal: SomethingStreamWithFinal
+};
+export const SomethingElseReq = TaggedRequestFor("SomethingElse");
+const SomethingElseQuery = SomethingElseReq.Query;
+class SomethingElseGetSomething2 extends SomethingElseQuery()("GetSomething2", {
+    id: S.String
+}, { success: S.FiniteFromString }) {
+}
+class SomethingElseGetSomething2WithDependencies extends SomethingElseQuery()("GetSomething2", {
+    id: S.String
+}, {
+    success: S.FiniteFromString,
     error: S.String
 }) {
 }
-export const Something = { GetSomething2, GetSomething2WithDependencies, meta: { moduleName: "Something" } };
+export const SomethingElse = {
+    GetSomething2: SomethingElseGetSomething2,
+    GetSomething2WithDependencies: SomethingElseGetSomething2WithDependencies
+};
 export const useClient = (options) => {
     const FakeIntlLayer = fakeIntlLayer(options?.messages);
     const FakeToastLayer = fakeToastLayer(options?.toasts);
     const CommanderLayer = Commander.Default.pipe(Layer.provide([FakeIntlLayer, FakeToastLayer]));
     const WithToastLayer = WithToast.Default.pipe(Layer.provide(FakeToastLayer));
     const api = ApiClientFactory.layer({ url: "bogus", headers: Option.none() }).pipe(Layer.provide(FetchHttpClient.layer));
-    const lm = LegacyMutation.Default.pipe(Layer.provide([FakeIntlLayer, FakeToastLayer]));
-    const layers = Layer.mergeAll(CommanderLayer, WithToastLayer, FakeToastLayer, FakeIntlLayer, api, lm);
+    const layers = Layer.mergeAll(CommanderLayer, WithToastLayer, FakeToastLayer, FakeIntlLayer, api);
     const clientFor_ = ApiClientFactory.makeFor(Layer.empty);
-    return makeClient(() => ManagedRuntime.make(layers), clientFor_, Layer.empty);
+    const rawClient = makeClient(() => ManagedRuntime.make(layers), clientFor_, Layer.empty);
+    // Provide a Vue injection context so that composition-API hooks (e.g. useQueryClient)
+    // called during client initialisation work outside a component setup() function.
+    const vueApp = createApp({});
+    const testQueryClientConfig = { defaultOptions: { queries: { retry: false }, mutations: { retry: false } } };
+    vueApp.use(VueQueryPlugin, { queryClient: new QueryClient(testQueryClientConfig) });
+    const origClientFor = rawClient.clientFor;
+    const clientFor = function (m, ...args) {
+        const proxy = origClientFor(m, ...args);
+        // Warm up lazy mutation-hook initialisation inside the Vue injection context.
+        // After the first property access, useMutation() is cached and subsequent
+        // accesses outside the context succeed.
+        const firstPropertyName = Object.keys(m)[0];
+        if (firstPropertyName !== undefined) {
+            vueApp.runWithContext(() => {
+                void proxy[firstPropertyName];
+            });
+        }
+        return proxy;
+    };
+    return { ...rawClient, clientFor };
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3R1YnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zdHVicy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEtBQUssSUFBSSxNQUFNLGdCQUFnQixDQUFBO0FBQ3RDLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLGNBQWMsRUFBRSxNQUFNLEVBQUUsQ0FBQyxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQ3JFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxhQUFhLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQUNuRSxPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sZ0JBQWdCLENBQUE7QUFDOUMsT0FBTyxLQUFLLGVBQWUsTUFBTSxzQ0FBc0MsQ0FBQTtBQUN2RSxPQUFPLEVBQUUsR0FBRyxFQUFFLE1BQU0sS0FBSyxDQUFBO0FBQ3pCLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSxrQ0FBa0MsQ0FBQTtBQUM1RCxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sNkJBQTZCLENBQUE7QUFDbEQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHVDQUF1QyxDQUFBO0FBQ3RFLE9BQU8sS0FBSyxLQUFLLE1BQU0sOEJBQThCLENBQUE7QUFDckQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBQzVELE9BQU8sRUFBRSxjQUFjLEVBQUUsVUFBVSxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFHakUsTUFBTSxjQUFjLEdBQUcsQ0FBQyxTQUFnQixFQUFFLEVBQUUsRUFBRSxDQUM1QyxLQUFLLENBQUMsTUFBTSxDQUNWLEtBQUssQ0FBQyxLQUFLLEVBQ1gsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUU7SUFDZixNQUFNLE9BQU8sR0FBRyxDQUFDLEVBQWlCLEVBQUUsRUFBRTtRQUNwQyxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxL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
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"stubs.js","sourceRoot":"","sources":["../stubs.ts"],"names":[],"mappings":"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"}

package/test/form-validation-errors.test.ts

@@ -4,7 +4,7 @@ import { buildFieldInfoFromFieldsRoot, translate } from "../src/form.js"
 // test schema with integer field
 class TestSchema extends S.Class<TestSchema>("TestSchema")({
   integerField: S.Int,
-  numberField: S.Number,
+  numberField: S.Finite,
   stringField: S.String
 }) {}
 
@@ -137,22 +137,26 @@ it("validates integer field with valid integer", () =>
     .pipe(Effect.runPromise))
 
 it("error message format matches regex pattern", () => {
-  // test the actual error message format from Effect Schema
-  const errorMessage = `Int
-└─ From side refinement failure
-   └─ Int
-      └─ Predicate refinement failure
-         └─ Expected an integer, actual 59.5`
-
-  const integerMatch = errorMessage.match(/Expected.*integer.*actual\s+(.+)/i)
-  expect(integerMatch).toBeTruthy()
-  expect(integerMatch![1]).toBe("59.5")
-
-  const numberErrorMessage = `Number
-└─ Type side transformation failure
-   └─ Expected a number, actual "not-a-number"`
-
-  const numberMatch = numberErrorMessage.match(/Expected.*number.*actual\s+(.+)/i)
-  expect(numberMatch).toBeTruthy()
-  expect(numberMatch![1]).toBe("\"not-a-number\"")
+  // test the actual error message format from Effect Schema (both old "actual" and new "got" formats)
+  const errorMessageOld = `Expected an integer, actual 59.5`
+  const errorMessageNew = `SchemaError(Expected an integer, got 59.5)`
+
+  const oldMatch = errorMessageOld.match(/Expected.*integer.*(?:actual|got)\s+([^)]+)/i)
+  expect(oldMatch).toBeTruthy()
+  expect(oldMatch![1]).toBe("59.5")
+
+  const newMatch = errorMessageNew.match(/Expected.*integer.*(?:actual|got)\s+([^)]+)/i)
+  expect(newMatch).toBeTruthy()
+  expect(newMatch![1]).toBe("59.5")
+
+  const numberErrorOld = `Expected a number, actual "not-a-number"`
+  const numberErrorNew = `SchemaError(Expected a finite number, got "not-a-number")`
+
+  const numOldMatch = numberErrorOld.match(/Expected.*number.*(?:actual|got)\s+([^)]+)/i)
+  expect(numOldMatch).toBeTruthy()
+  expect(numOldMatch![1]).toBe("\"not-a-number\"")
+
+  const numNewMatch = numberErrorNew.match(/Expected.*number.*(?:actual|got)\s+([^)]+)/i)
+  expect(numNewMatch).toBeTruthy()
+  expect(numNewMatch![1]).toBe("\"not-a-number\"")
 })

package/test/form.test.ts

@@ -1,5 +1,5 @@
 import { Effect, S } from "effect-app"
-import { buildFieldInfoFromFieldsRoot, type DiscriminatedUnionFieldInfo, type FieldInfo, type NestedFieldInfo, type UnionFieldInfo } from "../src/form.js"
+import { buildFieldInfoFromFieldsRoot, type DiscriminatedUnionFieldInfo, type FieldInfo, getMetadataFromSchema, type NestedFieldInfo, type UnionFieldInfo } from "../src/form.js"
 
 export class NestedSchema extends S.Class<NestedSchema>("NestedSchema")({
   shallow: S.String,
@@ -9,7 +9,11 @@ export class NestedSchema extends S.Class<NestedSchema>("NestedSchema")({
       deepest: S.Number
     })
   }),
-  age: S.Struct({ nfs: S.NumberFromString.pipe(S.decodeTo(S.PositiveInt)) })
+  age: S.Struct({ nfs: S.NumberFromString.pipe(S.decodeTo(S.PositiveInt)) }),
+  testNumber: S.Number,
+  testFinite: S.Finite,
+  testNullableNummber: S.NullOr(S.Number),
+  testOptionalNumber: S.optional(S.Number)
 }) {}
 
 export class SchemaContainsClass extends S.Class<SchemaContainsClass>("SchemaContainsClass")({
@@ -156,6 +160,15 @@ function testDiscriminatedUnionFieldInfo<T extends Record<PropertyKey, any>>(duf
   )
 }
 
+it("getMetadataFromSchema handles composed numeric schemas", () => {
+  expect(getMetadataFromSchema(S.Number.ast).type).toBe("float")
+  expect(getMetadataFromSchema(S.Finite.ast).type).toBe("float")
+  expect(getMetadataFromSchema(S.PositiveNumber.ast).type).toBe("float")
+  expect(getMetadataFromSchema(S.Int.ast).type).toBe("int")
+  expect(getMetadataFromSchema(S.PositiveInt.ast).type).toBe("int")
+  expect(getMetadataFromSchema(S.NullOr(S.Number).ast).type).toBe("float")
+})
+
 it("buildFieldInfo", () =>
   Effect
     .gen(function*() {
@@ -176,6 +189,11 @@ it("buildFieldInfo", () =>
       testNestedFieldInfo(nestedFieldinfo)
       testNestedFieldInfo(nestedFieldinfo.fields.nested)
       testNestedFieldInfo(nestedFieldinfo.fields.age)
+
+      expect(nestedFieldinfo.fields.testNumber.type).toBe("float")
+      expect(nestedFieldinfo.fields.testFinite.type).toBe("float")
+      expect(nestedFieldinfo.fields.testNullableNummber.type).toBe("float")
+      expect(nestedFieldinfo.fields.testOptionalNumber.type).toBe("float")
     })
     .pipe(Effect.runPromise))