@effect-app/vue 4.0.0-beta.34 → 4.0.0-beta.37

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @effect-app/vue
 
+## 4.0.0-beta.37
+
+### Patch Changes
+
+- 04fc985: Fixes error handling
+- Updated dependencies [947fe20]
+  - effect-app@4.0.0-beta.37
+
+## 4.0.0-beta.36
+
+### Patch Changes
+
+- effect-app@4.0.0-beta.36
+
+## 4.0.0-beta.35
+
+### Patch Changes
+
+- effect-app@4.0.0-beta.35
+
 ## 4.0.0-beta.34
 
 ### Patch Changes

package/dist/form.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../src/form.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"form.d.ts","sourceRoot":"","sources":["../src/form.ts"],"names":[],"mappings":"AAEA,OAAO,EAA6B,CAAC,EAAE,MAAM,YAAY,CAAA;AACzD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAoB/C,wCAAwC;AACxC,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,UAE1E;AAED;;;GAGG;AACH,wCAAwC;AACxC,eAAO,MAAM,sBAAsB,GAAI,GAAG,MAAM,WAA4C,CAAA;AAE5F,wCAAwC;AACxC,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,0BAevE;AAED,wCAAwC;AACxC,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,GAAG,IAAI,KAAK,IAAI,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,KAAK,QAEjG;AAED,QAAA,MAAM,CAAC,eAAW,CAAA;AAClB,MAAM,WAAW,SAAS,CAAC,IAAI,CAAE,SAAQ,oBAAoB,CAAC,OAAO,CAAC,EAAE;IAAE,GAAG,EAAE,IAAI,CAAA;CAAE,CAAC;IACpF,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;IAC9B,IAAI,EAAE,WAAW,CAAA;CAClB;AAED,MAAM,WAAW,cAAc,CAAC,CAAC;IAC/B,OAAO,EAAE,CAAC,CAAA;IACV,IAAI,EAAE,gBAAgB,CAAA;CACvB;AAED,MAAM,WAAW,2BAA2B,CAAC,CAAC;IAC5C,OAAO,EAAE,CAAC,CAAA;IACV,IAAI,EAAE,6BAA6B,CAAA;CACpC;AAED,MAAM,MAAM,kBAAkB,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,GAC1E,SAAS,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,GAAG,eAAe,CAAC,GAAG,CAAC,GACtE,SAAS,CAAC,GAAG,CAAC,GACd,SAAS,CAAC,GAAG,CAAC,CAAA;AAElB,MAAM,MAAM,8BAA8B,CAAC,GAAG,IAAI,GAAG,SAAS,GAAG,GAAG,kBAAkB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;AAEnG,MAAM,MAAM,eAAe,CAAC,EAAE,SAAS,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,IAC7D;IACE,MAAM,EAAE;SACL,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC,GAAG;YACjB,MAAM,EAAE;gBACN,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS;oBAAE,MAAM,EAAE,MAAM,CAAA;iBAAE,GAAG,2BAA2B,CAClE;qBAAG,CAAC,IAAI,8BAA8B,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,GAAG,MAAM,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC;iBAAE,CAC1F,GACC,cAAc,CAAC,8BAA8B,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;gBAC3D,OAAO,EAAE,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;aACnC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS,MAAM,GAAG,IAAI,GAAG,KAAK,EAAE,CAAC,CAAA;YAC3C,OAAO,EAAE,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;SACnC,CAAC,GAAG,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACvB,CAAA;IACD,IAAI,EAAE,iBAAiB,CAAA;IACvB,QAAQ,EAAE,EAAE,SAAS;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,SAAS,CAAA;CACjE,CAAA;AAuGH,wCAAwC;AACxC,wBAAgB,wBAAwB,CACtC,IAAI,SAAS,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,EACrC,EAAE,SAAS,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,EAEnC,MAAM,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,GAAG;IAAE,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAA;CAAE,MAzHrD,CAAC;;;kBAEkC,MAAM;2CAC/B,CAAC;;;;0BAyHjB;AAED,wCAAwC;AACxC,wBAAgB,4BAA4B,CAC1C,IAAI,SAAS,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,EACrC,EAAE,SAAS,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,EACnC,CAAC,EAED,MAAM,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG;IAAE,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAA;CAAE,GAC5D,eAAe,CAAC,EAAE,CAAC,CAYrB;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,QAAQ,EAAE,OAAO,CAAA;CAClB;AAED,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;AAID,wCAAwC;AACxC,eAAO,MAAM,SAAS;;;;;;EAAkE,CAAA;AACxF,wCAAwC;AACxC,eAAO,MAAM,kBAAkB,sDAAyC,MAAM,KAAK,OAAO,KAAK,OAAO,KAAK,MAAM,2CAAzC,MAAM,KAAK,OAAO,KAAK,OAAO,KAAK,MAAM,2DAAzC,MAAM,KAAK,OAAO,KAAK,OAAO,KAAK,MAAM,uCAAzC,MAAM,KAAK,OAAO,KAAK,OAAO,KAAK,MAAM,2CAAzC,MAAM,KAAK,OAAO,KAAK,OAAO,KAAK,MAAM,yBAEhH,CAAA;AAgKD,wCAAwC;AACxC,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,GACb;IACD,IAAI,EAAE,KAAK,GAAG,OAAO,GAAG,MAAM,CAAA;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,OAAO,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,CA2CA"}

package/dist/form.js

@@ -74,10 +74,18 @@ function handlePropertySignature(propertySignature) {
                     // try to retrieve the _tag literal to set _infoTag later
                     const typeLiteral = getObjectsAST(ps.type);
                     const tagPropertySignature = typeLiteral?.propertySignatures.find((_) => _.name === "_tag");
-                    const tagLiteral = tagPropertySignature
-                        && S.AST.isLiteral(tagPropertySignature.type)
-                        && typeof tagPropertySignature.type.literal === "string"
-                        ? tagPropertySignature.type.literal
+                    // unwrap single-element Union to Literal (S.Struct({ _tag: S.Literal("x") }) wraps as Union([Literal("x")]))
+                    const tagType = tagPropertySignature
+                        ? S.AST.isUnion(tagPropertySignature.type)
+                            && tagPropertySignature.type.types.length === 1
+                            && S.AST.isLiteral(tagPropertySignature.type.types[0])
+                            ? tagPropertySignature.type.types[0]
+                            : tagPropertySignature.type
+                        : undefined;
+                    const tagLiteral = tagType
+                        && S.AST.isLiteral(tagType)
+                        && typeof tagType.literal === "string"
+                        ? tagType.literal
                         : void 0;
                     const toRet = handlePropertySignature(ps);
                     if (toRet._tag === "UnionFieldInfo") {
@@ -163,11 +171,11 @@ function buildFieldInfo(property) {
             return custom(err, e, v);
         }
         // parse specific error types for better translation support
-        const integerMatch = err.match(/Expected.*integer.*actual\s+(.+)/i);
+        const integerMatch = err.match(/Expected.*integer.*(?:actual|got)\s+([^)]+)/i);
         if (integerMatch) {
             return translate.value({ defaultMessage: "Expected an integer, actual {actualValue}", id: "validation.integer.expected" }, { actualValue: integerMatch[1] });
         }
-        const numberMatch = err.match(/Expected.*number.*actual\s+(.+)/i);
+        const numberMatch = err.match(/Expected.*number.*(?:actual|got)\s+([^)]+)/i);
         if (numberMatch) {
             return translate.value({ defaultMessage: "Expected a number, actual {actualValue}", id: "validation.number.expected" }, { actualValue: numberMatch[1] });
         }
@@ -307,4 +315,4 @@ export function getMetadataFromSchema(ast) {
         required: !nullable
     };
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"form.js","sourceRoot":"","sources":["../src/form.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"form.js","sourceRoot":"","sources":["../src/form.ts"],"names":[],"mappings":"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"}

package/dist/makeClient.d.ts

@@ -402,14 +402,14 @@ export declare class QueryImpl<R> {
 type Base = I18n | Toast;
 type Mix = ApiClientFactory | Commander | LegacyMutation | Base;
 export declare const makeClient: <RT_, RTHooks>(getBaseMrt: () => ManagedRuntime.ManagedRuntime<RT_ | Mix, never>, clientFor_: ReturnType<(typeof ApiClientFactory)["makeFor"]>, rtHooks: Layer.Layer<RTHooks, never, Mix>) => {
-    Command: CommanderResolved<RT_ | Mix, RTHooks>;
-    useCommand: () => CommanderResolved<RT_ | Mix, RTHooks>;
-    clientFor: <M extends Requests>(m: M, queryInvalidation?: (client: ClientFrom<M>) => QueryInvalidation<M>) => { [Key in keyof RequestHandlers<never, never, M, M["meta"]["moduleName"]>]: RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key] & RequestWithExtensions<RTHooks | (RT_ | Mix), RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key]> & {
-        mutate: MutationWithExtensions<RTHooks | (RT_ | Mix), RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key]>;
-    } & Queries<RT_ | Mix, RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key]>; } & {
-        helpers: { [Key_1 in keyof RequestHandlers<never, never, M, M["meta"]["moduleName"]> as `${ToCamel<string & Key_1>}Request`]: RequestWithExtensions<RTHooks | (RT_ | Mix), RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key_1]>; } & { [Key_2 in keyof RequestHandlers<never, never, M, M["meta"]["moduleName"]> as `${ToCamel<string & Key_2>}Mutation`]: MutationWithExtensions<RTHooks | (RT_ | Mix), RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key_2]>; } & { [Key_3 in keyof RequestHandlers<never, never, M, M["meta"]["moduleName"]> as `${ToCamel<string & Key_3>}Query`]: Queries<RT_ | Mix, RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key_3]>["query"]; } & { [Key_4 in keyof RequestHandlers<never, never, M, M["meta"]["moduleName"]> as `${ToCamel<string & Key_4>}SuspenseQuery`]: Queries<RT_ | Mix, RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key_4]>["suspense"]; };
+    Command: CommanderResolved<Mix | RT_, RTHooks>;
+    useCommand: () => CommanderResolved<Mix | RT_, RTHooks>;
+    clientFor: <M extends Requests>(m: M, queryInvalidation?: (client: ClientFrom<M>) => QueryInvalidation<M>) => { [Key in keyof RequestHandlers<never, never, M, M["meta"]["moduleName"]>]: RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key] & RequestWithExtensions<RTHooks | (Mix | RT_), RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key]> & {
+        mutate: MutationWithExtensions<RTHooks | (Mix | RT_), RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key]>;
+    } & Queries<Mix | RT_, RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key]>; } & {
+        helpers: { [Key_1 in keyof RequestHandlers<never, never, M, M["meta"]["moduleName"]> as `${ToCamel<string & Key_1>}Request`]: RequestWithExtensions<RTHooks | (Mix | RT_), RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key_1]>; } & { [Key_2 in keyof RequestHandlers<never, never, M, M["meta"]["moduleName"]> as `${ToCamel<string & Key_2>}Mutation`]: MutationWithExtensions<RTHooks | (Mix | RT_), RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key_2]>; } & { [Key_3 in keyof RequestHandlers<never, never, M, M["meta"]["moduleName"]> as `${ToCamel<string & Key_3>}Query`]: Queries<Mix | RT_, RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key_3]>["query"]; } & { [Key_4 in keyof RequestHandlers<never, never, M, M["meta"]["moduleName"]> as `${ToCamel<string & Key_4>}SuspenseQuery`]: Queries<Mix | RT_, RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key_4]>["suspense"]; };
     };
-    legacy: Legacy<RT_ | Mix>;
+    legacy: Legacy<Mix | RT_>;
 };
 export interface Legacy<R> extends Pick<QueryImpl<R>, "useQuery" | "useSuspenseQuery">, Omit<LegacyMutationImpl<R>, "getRuntime" | "toast" | "intl"> {
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue",
-  "version": "4.0.0-beta.34",
+  "version": "4.0.0-beta.37",
   "license": "MIT",
   "type": "module",
   "homepage": "https://github.com/effect-ts-app/libs/tree/main/packages/vue",
@@ -11,7 +11,7 @@
     "@vueuse/core": "^14.2.1",
     "change-case": "^5.4.4",
     "query-string": "^9.3.1",
-    "effect-app": "4.0.0-beta.34"
+    "effect-app": "4.0.0-beta.37"
   },
   "peerDependencies": {
     "@effect/atom-vue": "^4.0.0-beta.40",

package/src/form.ts

@@ -147,10 +147,18 @@ function handlePropertySignature(
             const typeLiteral = getObjectsAST(ps.type)
 
             const tagPropertySignature = typeLiteral?.propertySignatures.find((_) => _.name === "_tag")
-            const tagLiteral = tagPropertySignature
-                && S.AST.isLiteral(tagPropertySignature.type)
-                && typeof tagPropertySignature.type.literal === "string"
-              ? tagPropertySignature.type.literal
+            // unwrap single-element Union to Literal (S.Struct({ _tag: S.Literal("x") }) wraps as Union([Literal("x")]))
+            const tagType = tagPropertySignature
+              ? S.AST.isUnion(tagPropertySignature.type)
+                  && tagPropertySignature.type.types.length === 1
+                  && S.AST.isLiteral(tagPropertySignature.type.types[0]!)
+                ? tagPropertySignature.type.types[0]!
+                : tagPropertySignature.type
+              : undefined
+            const tagLiteral = tagType
+                && S.AST.isLiteral(tagType)
+                && typeof tagType.literal === "string"
+              ? tagType.literal
               : void 0
 
             const toRet = handlePropertySignature(ps)
@@ -277,7 +285,7 @@ function buildFieldInfo(
     }
 
     // parse specific error types for better translation support
-    const integerMatch = err.match(/Expected.*integer.*actual\s+(.+)/i)
+    const integerMatch = err.match(/Expected.*integer.*(?:actual|got)\s+([^)]+)/i)
     if (integerMatch) {
       return translate.value(
         { defaultMessage: "Expected an integer, actual {actualValue}", id: "validation.integer.expected" },
@@ -285,7 +293,7 @@ function buildFieldInfo(
       )
     }
 
-    const numberMatch = err.match(/Expected.*number.*actual\s+(.+)/i)
+    const numberMatch = err.match(/Expected.*number.*(?:actual|got)\s+([^)]+)/i)
     if (numberMatch) {
       return translate.value(
         { defaultMessage: "Expected a number, actual {actualValue}", id: "validation.number.expected" },

package/test/dist/stubs.d.ts

@@ -13,7 +13,7 @@ export declare const fakeIntlLayer: (messages?: Record<string, string> | Record<
 export declare const useExperimental: (options?: {
     messages?: Record<string, string> | Record<string, MessageFormatElement[]>;
     toasts: any[];
-}) => import("../src/experimental/makeUseCommand.js").CommanderResolved<I18n | WithToast | Toast.Toast, never>;
+}) => import("../src/experimental/makeUseCommand.js").CommanderResolved<Toast.Toast | I18n | WithToast, never>;
 declare const RequestContextMap_base: (new () => {
     readonly config: {};
 }) & {
@@ -155,14 +155,14 @@ export declare const useClient: (options?: {
     messages?: Record<string, string> | Record<string, MessageFormatElement[]>;
     toasts: any[];
 }) => {
-    Command: import("../src/experimental/makeUseCommand.js").CommanderResolved<WithToast | (Commander | ApiClientFactory | LegacyMutation | (I18n | Toast.Toast)), never>;
-    useCommand: () => import("../src/experimental/makeUseCommand.js").CommanderResolved<WithToast | (Commander | ApiClientFactory | LegacyMutation | (I18n | Toast.Toast)), never>;
-    clientFor: <M extends import("effect-app/client").Requests>(m: M, queryInvalidation?: ((client: import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]>) => import("../src/makeClient.js").QueryInvalidation<M>) | undefined) => { [Key in keyof import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]>]: import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key] & import("../src/makeClient.js").RequestWithExtensions<WithToast | (Commander | ApiClientFactory | LegacyMutation | (I18n | Toast.Toast)), import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key]> & {
-        mutate: import("../src/makeClient.js").MutationWithExtensions<WithToast | (Commander | ApiClientFactory | LegacyMutation | (I18n | Toast.Toast)), import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key]>;
-    } & import("../src/makeClient.js").Queries<WithToast | (Commander | ApiClientFactory | LegacyMutation | (I18n | Toast.Toast)), import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key]>; } & {
-        helpers: { [Key_1 in keyof import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]> as `${import("../src/makeClient.js").ToCamel<string & Key_1>}Request`]: import("../src/makeClient.js").RequestWithExtensions<WithToast | (Commander | ApiClientFactory | LegacyMutation | (I18n | Toast.Toast)), import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key_1]>; } & { [Key_2 in keyof import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]> as `${import("../src/makeClient.js").ToCamel<string & Key_2>}Mutation`]: import("../src/makeClient.js").MutationWithExtensions<WithToast | (Commander | ApiClientFactory | LegacyMutation | (I18n | Toast.Toast)), import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key_2]>; } & { [Key_3 in keyof import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]> as `${import("../src/makeClient.js").ToCamel<string & Key_3>}Query`]: import("../src/makeClient.js").Queries<WithToast | (Commander | ApiClientFactory | LegacyMutation | (I18n | Toast.Toast)), import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key_3]>["query"]; } & { [Key_4 in keyof import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]> as `${import("../src/makeClient.js").ToCamel<string & Key_4>}SuspenseQuery`]: import("../src/makeClient.js").Queries<WithToast | (Commander | ApiClientFactory | LegacyMutation | (I18n | Toast.Toast)), import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key_4]>["suspense"]; };
+    Command: import("../src/experimental/makeUseCommand.js").CommanderResolved<WithToast | (Commander | ApiClientFactory | LegacyMutation | (Toast.Toast | I18n)), never>;
+    useCommand: () => import("../src/experimental/makeUseCommand.js").CommanderResolved<WithToast | (Commander | ApiClientFactory | LegacyMutation | (Toast.Toast | I18n)), never>;
+    clientFor: <M extends import("effect-app/client").Requests>(m: M, queryInvalidation?: ((client: import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]>) => import("../src/makeClient.js").QueryInvalidation<M>) | undefined) => { [Key in keyof import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]>]: import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key] & import("../src/makeClient.js").RequestWithExtensions<WithToast | (Commander | ApiClientFactory | LegacyMutation | (Toast.Toast | I18n)), import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key]> & {
+        mutate: import("../src/makeClient.js").MutationWithExtensions<WithToast | (Commander | ApiClientFactory | LegacyMutation | (Toast.Toast | I18n)), import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key]>;
+    } & import("../src/makeClient.js").Queries<WithToast | (Commander | ApiClientFactory | LegacyMutation | (Toast.Toast | I18n)), import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key]>; } & {
+        helpers: { [Key_1 in keyof import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]> as `${import("../src/makeClient.js").ToCamel<string & Key_1>}Request`]: import("../src/makeClient.js").RequestWithExtensions<WithToast | (Commander | ApiClientFactory | LegacyMutation | (Toast.Toast | I18n)), import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key_1]>; } & { [Key_2 in keyof import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]> as `${import("../src/makeClient.js").ToCamel<string & Key_2>}Mutation`]: import("../src/makeClient.js").MutationWithExtensions<WithToast | (Commander | ApiClientFactory | LegacyMutation | (Toast.Toast | I18n)), import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key_2]>; } & { [Key_3 in keyof import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]> as `${import("../src/makeClient.js").ToCamel<string & Key_3>}Query`]: import("../src/makeClient.js").Queries<WithToast | (Commander | ApiClientFactory | LegacyMutation | (Toast.Toast | I18n)), import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key_3]>["query"]; } & { [Key_4 in keyof import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]> as `${import("../src/makeClient.js").ToCamel<string & Key_4>}SuspenseQuery`]: import("../src/makeClient.js").Queries<WithToast | (Commander | ApiClientFactory | LegacyMutation | (Toast.Toast | I18n)), import("effect-app/client").RequestHandlers<never, never, M, M["meta"]["moduleName"]>[Key_4]>["suspense"]; };
     };
-    legacy: import("../src/makeClient.js").Legacy<WithToast | (Commander | ApiClientFactory | LegacyMutation | (I18n | Toast.Toast))>;
+    legacy: import("../src/makeClient.js").Legacy<WithToast | (Commander | ApiClientFactory | LegacyMutation | (Toast.Toast | I18n))>;
 };
 export {};
 //# sourceMappingURL=stubs.d.ts.map

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

@@ -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,261 +0,0 @@
-import { Effect, S } from "effect-app"
-import { buildFieldInfoFromFieldsRoot, type DiscriminatedUnionFieldInfo, type FieldInfo, type NestedFieldInfo, type UnionFieldInfo } from "../src/form.js"
-
-export class NestedSchema extends S.Class<NestedSchema>("NestedSchema")({
-  shallow: S.String,
-  nested: S.Struct({
-    deep: S.NonEmptyString,
-    nested: S.Struct({
-      deepest: S.Finite
-    })
-  }),
-  age: S.Struct({ nfs: S.FiniteFromString.pipe(S.decodeTo(S.PositiveInt)) })
-}) {}
-
-export class SchemaContainsClass extends S.Class<SchemaContainsClass>("SchemaContainsClass")({
-  inner: NestedSchema
-}) {}
-
-export class UnionSchema extends S.Class<UnionSchema>("UnionSchema")({
-  generalUnion: S.Union([S.String, S.Struct({ unionNested: NestedSchema })]),
-  structsUnion: S.Union([NestedSchema, SchemaContainsClass]),
-  optional: S.optional(S.String),
-  nullable: S.NullOr(S.String)
-}) {}
-
-class Circle extends S.TaggedClass<Circle>()("Circle", {
-  radius: S.PositiveInt
-}) {}
-
-class Square extends S.TaggedClass<Square>()("Square", {
-  sideLength: S.PositiveInt
-}) {}
-
-class Triangle extends S.TaggedClass<Triangle>()("Triangle", {
-  base: S.PositiveInt,
-  height: S.Finite
-}) {}
-
-const CircleStruct = S.Struct({
-  _tag: S.Literal("CircleStruct"),
-  radius: S.PositiveInt
-})
-
-const SquareStruct = S.Struct({
-  _tag: S.Literal("SquareStruct"),
-  sideLength: S.PositiveInt
-})
-
-const TriangleStruct = S.Struct({
-  _tag: S.Literal("TriangleStruct"),
-  base: S.PositiveInt,
-  height: S.Finite
-})
-
-const ShapeWithStructs = S.Union([CircleStruct, SquareStruct, TriangleStruct])
-const ShapeWithClasses = S.Union([Circle, Square, Triangle])
-
-export class ShapeContainer extends S.Class<ShapeContainer>("ShapeContainer")({
-  shapeWithStruct: ShapeWithStructs,
-  shapeWithClasses: ShapeWithClasses
-}) {}
-
-function testFieldInfo<T>(fi: FieldInfo<T>) {
-  expect(fi).toBeInstanceOf(Object)
-  expect(fi._tag).toBe("FieldInfo")
-  expect(["text", "float", "int"]).toContain(fi.type)
-  expect(fi.rules).toBeInstanceOf(Array)
-  fi.rules.forEach((r) => {
-    expect(r).toBeInstanceOf(Function)
-  })
-  expect(fi.metadata).toBeInstanceOf(Object)
-  expect(fi.metadata.maxLength === void 0 || typeof fi.metadata.maxLength === "number").toBeTruthy()
-  expect(fi.metadata.minLength === void 0 || typeof fi.metadata.minLength === "number").toBeTruthy()
-  expect(typeof fi.metadata.required === "boolean").toBeTruthy()
-}
-
-function testUnionFieldInfo<T>(ufi: UnionFieldInfo<T[]>) {
-  expect(ufi).toBeInstanceOf(Object)
-  expect(ufi._tag).toBe("UnionFieldInfo")
-  expect(ufi.members).toBeInstanceOf(Array)
-  ufi.members.forEach(
-    (
-      i: any
-    ) => {
-      switch (i._tag) {
-        case "FieldInfo":
-          testFieldInfo(i as FieldInfo<any>)
-          break
-        case "NestedFieldInfo":
-          testNestedFieldInfo(i as NestedFieldInfo<any>)
-          break
-        case "UnionFieldInfo":
-          testUnionFieldInfo(i as UnionFieldInfo<any>)
-          break
-        case "DiscriminatedUnionFieldInfo":
-          testDiscriminatedUnionFieldInfo(i as DiscriminatedUnionFieldInfo<any>)
-          break
-      }
-    }
-  )
-}
-
-function testNestedFieldInfo<T extends Record<PropertyKey, any>>(nfi: NestedFieldInfo<T>) {
-  expect(nfi).toBeInstanceOf(Object)
-  expect(nfi._tag).toBe("NestedFieldInfo")
-  expect(nfi.fields).toBeInstanceOf(Object)
-
-  // remove the value of _infoTag from the object when it is undefined
-  // when it isn't undefined, the followin switch will ignore it
-  Object.values(nfi).filter(Boolean).forEach(
-    (
-      i: any
-    ) => {
-      switch (i._tag) {
-        case "FieldInfo":
-          testFieldInfo(i as FieldInfo<any>)
-          break
-        case "NestedFieldInfo":
-          testNestedFieldInfo(i as NestedFieldInfo<any>)
-          break
-        case "UnionFieldInfo":
-          testUnionFieldInfo(i as UnionFieldInfo<any>)
-          break
-        case "DiscriminatedUnionFieldInfo":
-          testDiscriminatedUnionFieldInfo(i as DiscriminatedUnionFieldInfo<any>)
-          break
-      }
-    }
-  )
-}
-
-function testDiscriminatedUnionFieldInfo<T extends Record<PropertyKey, any>>(dufi: DiscriminatedUnionFieldInfo<T>) {
-  expect(dufi).toBeInstanceOf(Object)
-  expect(dufi._tag).toBe("DiscriminatedUnionFieldInfo")
-  expect(dufi.members).toBeInstanceOf(Object)
-
-  Object.values(dufi.members).forEach(
-    (
-      i: any
-    ) => {
-      switch (i._tag) {
-        case "FieldInfo":
-          testFieldInfo(i as FieldInfo<any>)
-          break
-        case "NestedFieldInfo":
-          testNestedFieldInfo(i as NestedFieldInfo<any>)
-          break
-        case "UnionFieldInfo":
-          testUnionFieldInfo(i as UnionFieldInfo<any>)
-          break
-        case "DiscriminatedUnionFieldInfo":
-          testDiscriminatedUnionFieldInfo(i as DiscriminatedUnionFieldInfo<any>)
-          break
-      }
-    }
-  )
-}
-
-it("buildFieldInfo", () =>
-  Effect
-    .gen(function*() {
-      const nestedFieldinfo = buildFieldInfoFromFieldsRoot(NestedSchema)
-      expectTypeOf(nestedFieldinfo).toEqualTypeOf<NestedFieldInfo<NestedSchema>>()
-      expectTypeOf(nestedFieldinfo.fields.shallow).toEqualTypeOf<FieldInfo<string>>()
-      expectTypeOf(nestedFieldinfo.fields.age).toEqualTypeOf<NestedFieldInfo<NestedSchema["age"]>>()
-      // TODO: v4 migration - type inference changed with S.decodeTo, investigate if this is correct
-      // expectTypeOf(nestedFieldinfo.fields.age.fields.nfs).toEqualTypeOf<FieldInfo<number & S.PositiveIntBrand>>()
-      expectTypeOf(nestedFieldinfo.fields.nested).toEqualTypeOf<NestedFieldInfo<NestedSchema["nested"]>>()
-      expectTypeOf(nestedFieldinfo.fields.nested.fields.deep).toEqualTypeOf<FieldInfo<string & S.NonEmptyStringBrand>>()
-      expectTypeOf(nestedFieldinfo.fields.nested.fields.nested).toEqualTypeOf<
-        NestedFieldInfo<NestedSchema["nested"]["nested"]>
-      >()
-      expectTypeOf(nestedFieldinfo.fields.nested.fields.nested.fields.deepest).toEqualTypeOf<FieldInfo<number>>()
-
-      // it's a recursive check on actual runtime structure
-      testNestedFieldInfo(nestedFieldinfo)
-      testNestedFieldInfo(nestedFieldinfo.fields.nested)
-      testNestedFieldInfo(nestedFieldinfo.fields.age)
-    })
-    .pipe(Effect.runPromise))
-
-it("buildFieldInfo schema containing class", () =>
-  Effect
-    .gen(function*() {
-      const fieldinfo = buildFieldInfoFromFieldsRoot(SchemaContainsClass)
-
-      // the type system says that these are NestedFieldInfo<NestedSchema>s
-      // are they really? let's check
-      testNestedFieldInfo(fieldinfo.fields.inner)
-      testNestedFieldInfo(fieldinfo.fields.inner.fields.nested.fields.nested)
-    })
-    .pipe(Effect.runPromise))
-
-it("buildFieldInfo with simple union", () =>
-  Effect
-    .gen(function*() {
-      const unionFieldinfo = buildFieldInfoFromFieldsRoot(UnionSchema)
-      expectTypeOf(unionFieldinfo).toEqualTypeOf<NestedFieldInfo<UnionSchema>>()
-      expectTypeOf(unionFieldinfo.fields.nullable).toEqualTypeOf<
-        FieldInfo<string | null>
-      >()
-      expectTypeOf(unionFieldinfo.fields.optional).toEqualTypeOf<
-        FieldInfo<string | undefined>
-      >()
-      expectTypeOf(unionFieldinfo.fields.structsUnion).toEqualTypeOf<
-        UnionFieldInfo<(NestedFieldInfo<NestedSchema> | NestedFieldInfo<SchemaContainsClass>)[]>
-      >()
-      expectTypeOf(unionFieldinfo.fields.generalUnion).toEqualTypeOf<
-        FieldInfo<
-          string | {
-            readonly unionNested: NestedSchema
-          }
-        >
-      >
-
-      // it's a recursive check on actual runtime structure
-      testNestedFieldInfo(unionFieldinfo)
-      testFieldInfo(unionFieldinfo.fields.nullable)
-      testFieldInfo(unionFieldinfo.fields.optional)
-      console.log({ asd: unionFieldinfo.fields.structsUnion })
-      testUnionFieldInfo(unionFieldinfo.fields.structsUnion)
-      testFieldInfo(unionFieldinfo.fields.generalUnion)
-    })
-    .pipe(Effect.runPromise))
-
-it("buildFieldInfo with tagged unions", () =>
-  Effect
-    .gen(function*() {
-      const shapeFieldinfo = buildFieldInfoFromFieldsRoot(ShapeContainer)
-
-      // check at runtime if the structure is really an union
-      testDiscriminatedUnionFieldInfo(shapeFieldinfo.fields.shapeWithClasses)
-      testDiscriminatedUnionFieldInfo(shapeFieldinfo.fields.shapeWithStruct)
-
-      testNestedFieldInfo(shapeFieldinfo.fields.shapeWithClasses.members.Square)
-      expect(shapeFieldinfo.fields.shapeWithClasses.members.Square._infoTag).toBe("Square")
-      testFieldInfo(shapeFieldinfo.fields.shapeWithClasses.members.Square.fields.sideLength)
-
-      testNestedFieldInfo(shapeFieldinfo.fields.shapeWithClasses.members.Triangle)
-      expect(shapeFieldinfo.fields.shapeWithClasses.members.Triangle._infoTag).toBe("Triangle")
-      testFieldInfo(shapeFieldinfo.fields.shapeWithClasses.members.Triangle.fields.base)
-      testFieldInfo(shapeFieldinfo.fields.shapeWithClasses.members.Triangle.fields.height)
-
-      testNestedFieldInfo(shapeFieldinfo.fields.shapeWithClasses.members.Circle)
-      expect(shapeFieldinfo.fields.shapeWithClasses.members.Circle._infoTag).toBe("Circle")
-      testFieldInfo(shapeFieldinfo.fields.shapeWithClasses.members.Circle.fields.radius)
-
-      testNestedFieldInfo(shapeFieldinfo.fields.shapeWithStruct.members.SquareStruct)
-      expect(shapeFieldinfo.fields.shapeWithStruct.members.SquareStruct._infoTag).toBe("SquareStruct")
-      testFieldInfo(shapeFieldinfo.fields.shapeWithStruct.members.SquareStruct.fields.sideLength)
-
-      testNestedFieldInfo(shapeFieldinfo.fields.shapeWithStruct.members.TriangleStruct)
-      expect(shapeFieldinfo.fields.shapeWithStruct.members.TriangleStruct._infoTag).toBe("TriangleStruct")
-      testFieldInfo(shapeFieldinfo.fields.shapeWithStruct.members.TriangleStruct.fields.base)
-      testFieldInfo(shapeFieldinfo.fields.shapeWithStruct.members.TriangleStruct.fields.height)
-
-      testNestedFieldInfo(shapeFieldinfo.fields.shapeWithStruct.members.CircleStruct)
-      expect(shapeFieldinfo.fields.shapeWithStruct.members.CircleStruct._infoTag).toBe("CircleStruct")
-      testFieldInfo(shapeFieldinfo.fields.shapeWithStruct.members.CircleStruct.fields.radius)
-    })
-    .pipe(Effect.runPromise))