@effect-app/vue 4.0.0-beta.9 → 4.0.0-beta.90

package/dist/form.d.ts

@@ -1,13 +1,17 @@
 import { S } from "effect-app";
 import type { Unbranded } from "effect-app/Schema/brand";
 import type { IsUnion } from "effect-app/utils";
+/** @deprecated Use OmegaForm instead */
 export declare function convertIn(v: string | null, type?: "text" | "float" | "int"): string;
 /**
  * Makes sure our international number format is converted to js int/float format.
  * Right now assumes . for thousands and , for decimal.
  */
+/** @deprecated Use OmegaForm instead */
 export declare const prepareNumberForLocale: (v: string) => string;
+/** @deprecated Use OmegaForm instead */
 export declare function convertOutInt(v: string, type?: "text" | "float" | "int"): string | number | null;
+/** @deprecated Use OmegaForm instead */
 export declare function convertOut(v: string, set: (v: {} | null) => void, type?: "text" | "float" | "int"): void;
 declare const f: unique symbol;
 export interface FieldInfo<Tout> extends PhantomTypeParameter<typeof f, {
@@ -47,6 +51,7 @@ export type NestedFieldInfo<To extends Record<PropertyKey, any>> = {
         "_tag": string;
     } ? To["_tag"] : undefined;
 };
+/** @deprecated Use OmegaForm instead */
 export declare function buildFieldInfoFromFields<From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>>(schema: (S.Codec<To, From>) & {
     fields?: S.Struct.Fields;
 }): { [K in keyof To]-?: {
@@ -58,6 +63,7 @@ export declare function buildFieldInfoFromFields<From extends Record<PropertyKey
     }[`${To[K] extends object ? true : false}`];
     false: NestedFieldInfoKey<To[K]>;
 }[`${IsUnion<To[K]>}`]; };
+/** @deprecated Use OmegaForm instead */
 export declare function buildFieldInfoFromFieldsRoot<From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, R>(schema: (S.Codec<To, From, R>) & {
     fields?: S.Struct.Fields;
 }): NestedFieldInfo<To>;
@@ -71,6 +77,7 @@ declare abstract class PhantomTypeParameter<Identifier extends keyof any, Instan
         readonly [NameP in Identifier]: (_: InstantiatedType) => InstantiatedType;
     };
 }
+/** @deprecated Use OmegaForm instead */
 export declare const translate: import("vue").Ref<{
     (this: void, descriptor: import("@formatjs/intl").MessageDescriptor, values?: Record<string, import("intl-messageformat").PrimitiveType | import("intl-messageformat").FormatXMLElementFn<string, string>>, opts?: import("intl-messageformat").Options): string;
     <T extends unknown, TValue extends T | import("intl-messageformat").FormatXMLElementFn<T>>(this: void, descriptor: import("@formatjs/intl").MessageDescriptor, values?: Record<string, import("intl-messageformat").PrimitiveType | TValue> | undefined, opts?: import("intl-messageformat").Options): string | T | (string | T)[];
@@ -78,7 +85,9 @@ export declare const translate: import("vue").Ref<{
     (this: void, descriptor: import("@formatjs/intl").MessageDescriptor, values?: Record<string, import("intl-messageformat").PrimitiveType | import("intl-messageformat").FormatXMLElementFn<string, string>>, opts?: import("intl-messageformat").Options): string;
     <T extends unknown, TValue extends T | import("intl-messageformat").FormatXMLElementFn<T>>(this: void, descriptor: import("@formatjs/intl").MessageDescriptor, values?: Record<string, import("intl-messageformat").PrimitiveType | TValue> | undefined, opts?: import("intl-messageformat").Options): string | T | (string | T)[];
 }>;
+/** @deprecated Use OmegaForm instead */
 export declare const customSchemaErrors: import("vue").Ref<Map<string | S.AST.AST, (message: string, e: unknown, v: unknown) => string> & Omit<Map<string | S.AST.AST, (message: string, e: unknown, v: unknown) => string>, keyof Map<any, any>>, Map<string | S.AST.AST, (message: string, e: unknown, v: unknown) => string> | (Map<string | S.AST.AST, (message: string, e: unknown, v: unknown) => string> & Omit<Map<string | S.AST.AST, (message: string, e: unknown, v: unknown) => string>, keyof Map<any, any>>)>;
+/** @deprecated Use OmegaForm instead */
 export declare function getMetadataFromSchema(ast: S.AST.AST): {
     type: "int" | "float" | "text";
     minimum?: number;

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,CAgEA"}

package/dist/form.js

@@ -17,6 +17,7 @@ function getObjectsAST(ast) {
     }
     return null;
 }
+/** @deprecated Use OmegaForm instead */
 export function convertIn(v, type) {
     return v === null ? "" : type === "text" ? v : `${v}`;
 }
@@ -24,7 +25,9 @@ export function convertIn(v, type) {
  * Makes sure our international number format is converted to js int/float format.
  * Right now assumes . for thousands and , for decimal.
  */
+/** @deprecated Use OmegaForm instead */
 export const prepareNumberForLocale = (v) => v.replace(/\./g, "").replace(/,/g, ".");
+/** @deprecated Use OmegaForm instead */
 export function convertOutInt(v, type) {
     v = v == null ? v : v.trim();
     const c = v === ""
@@ -41,6 +44,7 @@ export function convertOutInt(v, type) {
                 : v;
     return c;
 }
+/** @deprecated Use OmegaForm instead */
 export function convertOut(v, set, type) {
     return set(convertOutInt(v, type));
 }
@@ -70,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") {
@@ -115,9 +127,11 @@ function handlePropertySignature(propertySignature) {
         }
     }
 }
+/** @deprecated Use OmegaForm instead */
 export function buildFieldInfoFromFields(schema) {
     return buildFieldInfoFromFieldsRoot(schema).fields;
 }
+/** @deprecated Use OmegaForm instead */
 export function buildFieldInfoFromFieldsRoot(schema) {
     const ast = getObjectsAST(schema.ast);
     if (!ast)
@@ -131,7 +145,9 @@ export function buildFieldInfoFromFieldsRoot(schema) {
 class PhantomTypeParameter {
 }
 const defaultIntl = createIntl({ locale: "en" });
+/** @deprecated Use OmegaForm instead */
 export const translate = ref(defaultIntl.formatMessage);
+/** @deprecated Use OmegaForm instead */
 export const customSchemaErrors = ref(new Map());
 function buildFieldInfo(property) {
     const propertyKey = property.name;
@@ -155,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] });
         }
@@ -254,7 +270,20 @@ function buildFieldInfo(property) {
     };
     return info;
 }
+/** @deprecated Use OmegaForm instead */
 export function getMetadataFromSchema(ast) {
+    const findJsonSchemaType = (schema, target) => {
+        if (!schema || typeof schema !== "object") {
+            return false;
+        }
+        if (schema.type === target) {
+            return true;
+        }
+        if (Array.isArray(schema.type) && schema.type.includes(target)) {
+            return true;
+        }
+        return ["anyOf", "oneOf", "allOf"].some((key) => Array.isArray(schema[key]) && schema[key].some((member) => findJsonSchemaType(member, target)));
+    };
     const nullable = S.AST.isUnion(ast) && ast.types.includes(S.Null.ast);
     const realSelf = nullable && S.AST.isUnion(ast)
         ? ast.types.filter((_) => _ !== S.Null.ast)[0]
@@ -284,8 +313,8 @@ export function getMetadataFromSchema(ast) {
     //         "title": "Int"
     //     }
     // }
-    const isNumber = jschema.type === "number" || jschema.type === "integer";
-    const isInt = jschema.type === "integer";
+    const isInt = findJsonSchemaType(jschema, "integer");
+    const isNumber = isInt || findJsonSchemaType(jschema, "number");
     return {
         type: isInt ? "int" : isNumber ? "float" : "text",
         minimum: jschema.minimum,
@@ -298,4 +327,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":"AAAA,OAAO,EAAE,UAAU,EAAuB,MAAM,gBAAgB,CAAA;AAEhE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,MAAM,YAAY,CAAA;AAGzD,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,KAAK,CAAA;AAErC,0EAA0E;AAC1E,YAAY;AAEZ,SAAS,aAAa,CAAC,GAAc;IACnC,IAAI,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;QACzB,OAAO,GAAG,CAAA;IACZ,CAAC;IACD,IAAI,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7B,KAAK,MAAM,SAAS,IAAI,GAAG,CAAC,cAAc,EAAE,CAAC;YAC3C,MAAM,MAAM,GAAG,aAAa,CAAC,SAAS,CAAC,CAAA;YACvC,IAAI,MAAM;gBAAE,OAAO,MAAM,CAAA;QAC3B,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED,wCAAwC;AACxC,MAAM,UAAU,SAAS,CAAC,CAAgB,EAAE,IAA+B;IACzE,OAAO,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAA;AACvD,CAAC;AAED;;;GAGG;AACH,wCAAwC;AACxC,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;AAE5F,wCAAwC;AACxC,MAAM,UAAU,aAAa,CAAC,CAAS,EAAE,IAA+B;IACtE,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;IAC5B,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE;QAChB,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,IAAI,KAAK,OAAO;YAClB,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;YACf,CAAC,CAAC,IAAI,KAAK,KAAK;gBAChB,CAAC,CAAC,CAAC,GAAG,EAAE;oBACN,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;oBAC7B,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;oBACzB,6FAA6F;oBAC7F,OAAO,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAA;gBAC5C,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,CAAC,CAAA;IACL,OAAO,CAAC,CAAA;AACV,CAAC;AAED,wCAAwC;AACxC,MAAM,UAAU,UAAU,CAAC,CAAS,EAAE,GAA2B,EAAE,IAA+B;IAChG,OAAO,GAAG,CAAC,aAAa,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAA;AACpC,CAAC;AAED,MAAM,CAAC,GAAG,MAAM,EAAE,CAAA;AA2ClB,SAAS,uBAAuB,CAC9B,iBAA0C;IAO1C,MAAM,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAA;IAE7C,IAAI,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;QACpC,MAAM,EAAE,GAAG,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QACpC,OAAO,EAAE;YACP,CAAC,CAAC,uBAAuB,CACvB,IAAI,CAAC,CAAC,GAAG,CAAC,iBAAiB,CACzB,iBAAiB,CAAC,IAAI,EACtB,EAAE,CACH,CACF;YACD,CAAC,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAA;IACvC,CAAC;IAED,QAAQ,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QACxB,KAAK,SAAS,CAAC,CAAC,CAAC;YACf,OAAO,4BAA4B,CACjC,MAA2C,CAC5C,CAAA;QACH,CAAC;QACD,KAAK,OAAO,CAAC,CAAC,CAAC;YACb,MAAM,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,CAAA;YAE7D,IAAI,eAAe,EAAE,CAAC;gBACpB,MAAM,OAAO,GAAG,MAAM;qBACnB,GAAG;qBACH,KAAK;qBACL,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;gBACb,4EAA4E;gBAC5E,IAAI,CAAC,CAAC,GAAG,CAAC,iBAAiB,CACzB,iBAAiB,CAAC,IAAI,EACtB,KAAK,CACN,CACF;qBACA,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;oBACd,yDAAyD;oBACzD,MAAM,WAAW,GAAG,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,CAAA;oBAE1C,MAAM,oBAAoB,GAAG,WAAW,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAA;oBAC3F,6GAA6G;oBAC7G,MAAM,OAAO,GAAG,oBAAoB;wBAClC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAAC;+BACnC,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;+BAC5C,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC;4BACzD,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;4BACpC,CAAC,CAAC,oBAAoB,CAAC,IAAI;wBAC7B,CAAC,CAAC,SAAS,CAAA;oBACb,MAAM,UAAU,GAAG,OAAO;2BACnB,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC;2BACxB,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ;wBACxC,CAAC,CAAC,OAAO,CAAC,OAAO;wBACjB,CAAC,CAAC,KAAK,CAAC,CAAA;oBAEV,MAAM,KAAK,GAAG,uBAAuB,CAAC,EAAE,CAAC,CAAA;oBAEzC,IAAI,KAAK,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;wBACpC,OAAO,KAAK,CAAC,OAAO,CAAA;oBACtB,CAAC;yBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,iBAAiB,EAAE,CAAC;wBAC5C,OAAO,CAAC,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,UAAmB,EAAE,CAAC,CAAA;oBACtD,CAAC;yBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,6BAA6B,EAAE,CAAC;wBACxD,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAmE,CAAA;oBACvG,CAAC;yBAAM,CAAC;wBACN,OAAO,CAAC,KAAK,CAAC,CAAA;oBAChB,CAAC;gBACH,CAAC,CAAC,CAAA;gBAEJ,oEAAoE;gBACpE,MAAM,oBAAoB,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,iBAAiB,IAAI,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAA;gBAE3G,IAAI,oBAAoB,EAAE,CAAC;oBACzB,OAAO;wBACL,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;4BACnC,4CAA4C;4BAC5C,MAAM,GAAG,GAAI,GAAiD,CAAC,QAA6B,CAAA;4BAC5F,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAA;4BACd,OAAO,GAAG,CAAA;wBACZ,CAAC,EAAE,EAAgF,CAAC;wBACpF,IAAI,EAAE,6BAA6B;qBACpC,CAAA;gBACH,CAAC;qBAAM,CAAC;oBACN,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,EAAE,CAAA;gBAC5C,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,OAAO,cAAc,CAAC,iBAAiB,CAAC,CAAA;YAC1C,CAAC;QACH,CAAC;QAED,OAAO,CAAC,CAAC,CAAC;YACR,OAAO,cAAc,CAAC,iBAAiB,CAAC,CAAA;QAC1C,CAAC;IACH,CAAC;AACH,CAAC;AAED,wCAAwC;AACxC,MAAM,UAAU,wBAAwB,CAItC,MAA0D;IAE1D,OAAO,4BAA4B,CAAC,MAAM,CAAC,CAAC,MAAM,CAAA;AACpD,CAAC;AAED,wCAAwC;AACxC,MAAM,UAAU,4BAA4B,CAK1C,MAA6D;IAE7D,MAAM,GAAG,GAAG,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAErC,IAAI,CAAC,GAAG;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAA;IAC9C,OAAO,GAAG,CAAC,kBAAkB,CAAC,MAAM,CAClC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACX,CAAC;QAAC,GAAG,CAAC,MAAc,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAA;QAE7D,OAAO,GAAG,CAAA;IACZ,CAAC,EACD,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,EAAE,EAAyB,CAC/D,CAAA;AACH,CAAC;AAQD,MAAe,oBAAoB;CAOlC;AAED,MAAM,WAAW,GAAG,UAAU,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;AAEhD,wCAAwC;AACxC,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,CAAkC,WAAW,CAAC,aAAa,CAAC,CAAA;AACxF,wCAAwC;AACxC,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CACnC,IAAI,GAAG,EAAE,CACV,CAAA;AAED,SAAS,cAAc,CACrB,QAAiC;IAEjC,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAA;IACjC,MAAM,MAAM,GAAG,CAAC,CAAC,IAAI,CAAmB,QAAQ,CAAC,IAAI,CAAC,CAAA;IACtD,MAAM,QAAQ,GAAG,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACrD,MAAM,KAAK,GAAG,CAAC,CAAC,iBAAiB,CAAC,MAAiE,CAAC,CAAA;IAEpG,MAAM,mBAAmB,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;WACnD,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAA;IAC1G,MAAM,QAAQ,GAAG,mBAAmB,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;QAClE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,CAAE;QACnF,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAA;IACjB,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IACjD,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAA;IAE7C,SAAS,WAAW,CAAC,CAAgB,EAAE,CAAU;QAC/C,MAAM,GAAG,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAA;QAExB,MAAM,MAAM,GAAG,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC;eACrD,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC;eACtC,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;eACnD,CAAC,GAAG,CAAC,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;QAE1D,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;QAC1B,CAAC;QAED,4DAA4D;QAC5D,MAAM,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAA;QAC9E,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,SAAS,CAAC,KAAK,CACpB,EAAE,cAAc,EAAE,2CAA2C,EAAE,EAAE,EAAE,6BAA6B,EAAE,EAClG,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,CACjC,CAAA;QACH,CAAC;QAED,MAAM,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAA;QAC5E,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,SAAS,CAAC,KAAK,CACpB,EAAE,cAAc,EAAE,yCAAyC,EAAE,EAAE,EAAE,4BAA4B,EAAE,EAC/F,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,CAChC,CAAA;QACH,CAAC;QAED,oCAAoC;QACpC,OAAO,SAAS,CAAC,KAAK,CACpB,EAAE,cAAc,EAAE,oDAAoD,EAAE,EAAE,EAAE,wBAAwB,EAAE,EACtG;YACE,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC;gBACpB,cAAc,EAAE,UAAU,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;gBAClD,EAAE,EAAE,cAAc,MAAM,CAAC,WAAW,CAAC,EAAE;aACxC,CAAC;YACF,2BAA2B;YAC3B,OAAO,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;SACxG,CACF,CAAA;IACH,CAAC;IAED,MAAM,WAAW,GAAG;QAClB,CAAC,CAAgB,EAAE,EAAE,CACnB,CAAC,KAAK,IAAI;eACP,QAAQ,CAAC,SAAS,KAAK,SAAS;eAChC,CAAC,CAAC,MAAM,IAAI,QAAQ,CAAC,SAAS;eAC9B,SAAS,CAAC,KAAK,CAAC;gBACjB,cAAc,EAAE,oDAAoD;gBACpE,EAAE,EAAE,6BAA6B;aAClC,EAAE;gBACD,SAAS,EAAE,QAAQ,CAAC,SAAS;aAC9B,CAAC;QACJ,CAAC,CAAgB,EAAE,EAAE,CACnB,CAAC,KAAK,IAAI;eACP,QAAQ,CAAC,SAAS,KAAK,SAAS;eAChC,CAAC,CAAC,MAAM,IAAI,QAAQ,CAAC,SAAS;eAC9B,SAAS,CAAC,KAAK,CAAC;gBACjB,cAAc,EAAE,wDAAwD;gBACxE,EAAE,EAAE,6BAA6B;aAClC,EAAE;gBACD,SAAS,EAAE,QAAQ,CAAC,SAAS;aAC9B,CAAC;KACL,CAAA;IAED,MAAM,WAAW,GAAG;QAClB,CAAC,CAAgB,EAAE,EAAE,CACnB,CAAC,KAAK,IAAI;eACP,CAAC,QAAQ,CAAC,OAAO,KAAK,SAAS,IAAI,QAAQ,CAAC,gBAAgB,KAAK,SAAS,CAAC;eAC3E,QAAQ,CAAC,gBAAgB,KAAK,SAAS,IAAI,CAAC,GAAG,QAAQ,CAAC,gBAAgB;eACxE,QAAQ,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,IAAI,QAAQ,CAAC,OAAO;eACvD,SAAS,CAAC,KAAK,CAAC;gBACjB,cAAc,EAAE,0FAA0F;gBAC1G,EAAE,EAAE,uBAAuB;aAC5B,EAAE;gBACD,WAAW,EAAE,QAAQ,CAAC,gBAAgB,KAAK,SAAS;gBACpD,OAAO,EAAE,QAAQ,CAAC,gBAAgB,IAAI,QAAQ,CAAC,OAAO;aACvD,CAAC;QACJ,CAAC,CAAgB,EAAE,EAAE,CACnB,CAAC,KAAK,IAAI;eACP,CAAC,QAAQ,CAAC,OAAO,KAAK,SAAS,IAAI,QAAQ,CAAC,gBAAgB,KAAK,SAAS,CAAC;eAC3E,QAAQ,CAAC,gBAAgB,KAAK,SAAS,IAAI,CAAC,GAAG,QAAQ,CAAC,gBAAgB;eACxE,QAAQ,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,IAAI,QAAQ,CAAC,OAAO;eACvD,SAAS,CAAC,KAAK,CAAC;gBACjB,cAAc,EAAE,0FAA0F;gBAC1G,EAAE,EAAE,uBAAuB;aAC5B,EAAE;gBACD,WAAW,EAAE,QAAQ,CAAC,gBAAgB,KAAK,SAAS;gBACpD,OAAO,EAAE,QAAQ,CAAC,gBAAgB,IAAI,QAAQ,CAAC,OAAO;aACvD,CAAC;KACL,CAAA;IAED,MAAM,SAAS,GAAG,CAAC,CAAU,EAAE,EAAE,CAC/B,IAAI,CACF,KAAK,CAAC,CAAC,CAAC,EACR,IAAI,CAAC,KAAK,CAAC;QACT,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE;YACnB,MAAM,GAAG,GAAG,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;YACxC,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAA;QACzE,CAAC;QACD,SAAS,EAAE,GAAG,EAAE,CAAC,IAAI;KACtB,CAAC,CACH,CAAA;IAGH,MAAM,KAAK,GAAkB;QAC3B,GAAG,CAAC,QAAQ,CAAC,IAAI,KAAK,MAAM;YAC1B,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO,IAAI,QAAQ,CAAC,IAAI,KAAK,KAAK;gBACtD,CAAC,CAAC,WAAW;gBACb,CAAC,CAAC,EAAE,CAAkB;QACxB,SAAwB;KACzB,CAAA;IAED,MAAM,IAAI,GAAG;QACX,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,KAAK,EAAE;YACL,CAAC,CAAS,EAAE,EAAE,CACZ,CAAC,QAAQ,CAAC,QAAQ;mBACf,CAAC,KAAK,EAAE;mBACR,SAAS,CAAC,KAAK,CAAC,EAAE,cAAc,EAAE,2BAA2B,EAAE,EAAE,EAAE,kBAAkB,EAAE,CAAC;YAC7F,CAAC,CAAS,EAAE,EAAE;gBACZ,MAAM,SAAS,GAAG,aAAa,CAAC,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAA;gBAEjD,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;oBACtB,MAAM,GAAG,GAAG,CAAC,CAAC,SAAS,CAAC,CAAA;oBACxB,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;wBACjB,OAAO,GAAG,CAAA;oBACZ,CAAC;gBACH,CAAC;gBAED,OAAO,IAAI,CAAA;YACb,CAAC;SACF;QACD,QAAQ;QACR,IAAI,EAAE,WAAW;KAClB,CAAA;IAED,OAAO,IAAW,CAAA;AACpB,CAAC;AAED,wCAAwC;AACxC,MAAM,UAAU,qBAAqB,CACnC,GAAc;IAYd,MAAM,kBAAkB,GAAG,CACzB,MAAW,EACX,MAA4B,EACnB,EAAE;QACX,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC1C,OAAO,KAAK,CAAA;QACd,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC3B,OAAO,IAAI,CAAA;QACb,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/D,OAAO,IAAI,CAAA;QACb,CAAC;QAED,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAC9C,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,MAAW,EAAE,EAAE,CAAC,kBAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CACpG,CAAA;IACH,CAAC,CAAA;IAED,MAAM,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACrE,MAAM,QAAQ,GAAG,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC;QAC7C,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAE;QAC/C,CAAC,CAAC,GAAG,CAAA;IAEP,IAAI,OAAY,CAAA;IAChB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,IAAI,CAAmB,QAAQ,CAAC,CAAC,CAAA;QACtE,OAAO,GAAG,GAAG,CAAC,MAAa,CAAA;QAC3B,MAAM,IAAI,GAAG,GAAG,CAAC,WAAkC,CAAA;QACnD,mCAAmC;QACnC,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YACjE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAA;YACpC,OAAO,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,CAAA;QACzE,CAAC;IACH,CAAC;IAAC,OAAO,IAAI,EAAE,CAAC;QACd,OAAO,GAAG,EAAE,CAAA;IACd,CAAC;IACD,2EAA2E;IAC3E,mDAAmD;IACnD,2CAA2C;IAC3C,cAAc;IACd,aAAa;IACb,eAAe;IACf,4CAA4C;IAC5C,uCAAuC;IACvC,yBAAyB;IACzB,QAAQ;IACR,IAAI;IACJ,MAAM,KAAK,GAAG,kBAAkB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAA;IACpD,MAAM,QAAQ,GAAG,KAAK,IAAI,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;IAC/D,OAAO;QACL,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,KAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAgB,CAAC,CAAC,CAAC,MAAe;QAC5E,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;QAC1C,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;QAC1C,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,QAAQ,EAAE,CAAC,QAAQ;KACpB,CAAA;AACH,CAAC"}

package/dist/intl.d.ts

@@ -0,0 +1,15 @@
+import { Context } from "effect-app";
+declare const I18n_base: Context.OpaqueClass<I18n, "I18n", {
+    locale: import("vue").Ref<string, string>;
+    trans: (id: string, values?: Record<string, import("intl-messageformat").PrimitiveType | import("intl-messageformat").FormatXMLElementFn<string, string>>) => string;
+    readonly formatMessage: (descriptor: import("@formatjs/intl").MessageDescriptor, values?: Record<string, import("intl-messageformat").PrimitiveType | import("intl-messageformat").FormatXMLElementFn<string, string>>, opts?: import("intl-messageformat").Options) => string;
+    readonly intl: import("./makeIntl.js").IntlShape<Locale>;
+}>;
+export declare class I18n extends I18n_base {
+    static readonly locale: import("effect/Effect").Effect<import("vue").Ref<string, string>, never, I18n>;
+    static readonly trans: (id: string, values?: Record<string, import("intl-messageformat").PrimitiveType | import("intl-messageformat").FormatXMLElementFn<string, string>> | undefined) => import("effect/Effect").Effect<string, never, I18n>;
+    static readonly formatMessage: (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) => import("effect/Effect").Effect<string, never, I18n>;
+    static readonly intl: import("effect/Effect").Effect<import("./makeIntl.js").IntlShape<string>, never, I18n>;
+}
+export {};
+//# sourceMappingURL=intl.d.ts.map

package/dist/intl.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"intl.d.ts","sourceRoot":"","sources":["../src/intl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;;;;;;;AAMpC,qBAAa,IAAK,SAAQ,SAAyC;IACjE,MAAM,CAAC,QAAQ,CAAC,MAAM,iFAA2B;IACjD,MAAM,CAAC,QAAQ,CAAC,KAAK,yNAA0B;IAC/C,MAAM,CAAC,QAAQ,CAAC,aAAa,8TAAkC;IAC/D,MAAM,CAAC,QAAQ,CAAC,IAAI,yFAAyB;CAC9C"}

package/dist/intl.js

@@ -0,0 +1,9 @@
+import { Context } from "effect-app";
+import { accessCn, accessFn } from "effect-app/Context";
+export class I18n extends Context.Opaque()("I18n") {
+    static locale = accessCn(this, "locale");
+    static trans = accessFn(this, "trans");
+    static formatMessage = accessFn(this, "formatMessage");
+    static intl = accessCn(this, "intl");
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50bC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9pbnRsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDcEMsT0FBTyxFQUFFLFFBQVEsRUFBRSxRQUFRLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUt2RCxNQUFNLE9BQU8sSUFBSyxTQUFRLE9BQU8sQ0FBQyxNQUFNLEVBQW1CLENBQUMsTUFBTSxDQUFDO0lBQ2pFLE1BQU0sQ0FBVSxNQUFNLEdBQUcsUUFBUSxDQUFDLElBQUksRUFBRSxRQUFRLENBQUMsQ0FBQTtJQUNqRCxNQUFNLENBQVUsS0FBSyxHQUFHLFFBQVEsQ0FBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLENBQUE7SUFDL0MsTUFBTSxDQUFVLGFBQWEsR0FBRyxRQUFRLENBQUMsSUFBSSxFQUFFLGVBQWUsQ0FBQyxDQUFBO0lBQy9ELE1BQU0sQ0FBVSxJQUFJLEdBQUcsUUFBUSxDQUFDLElBQUksRUFBRSxNQUFNLENBQUMsQ0FBQSJ9

package/dist/makeClient.d.ts

@@ -1,18 +1,16 @@
-import * as AsyncResult from "effect/unstable/reactivity/AsyncResult";
 import { type InvalidateOptions, type InvalidateQueryFilters, type QueryObserverResult, type RefetchOptions, type UseQueryReturnType } from "@tanstack/vue-query";
-import { Cause, Effect, Exit, Layer, type ManagedRuntime, S, ServiceMap } from "effect-app";
+import { type Context, Effect, type Layer, type ManagedRuntime } from "effect-app";
 import { type ApiClientFactory, type Req } from "effect-app/client";
-import type { RequestHandler, RequestHandlers, RequestHandlerWithInput, Requests } from "effect-app/client/clientFor";
-import { ErrorSilenced, type SupportedErrors } from "effect-app/client/errors";
-import { type OperationFailure } from "effect-app/Operations";
+import type { ExtractModuleName, RequestHandler, RequestHandlers, RequestHandlerWithInput, RequestsAny } from "effect-app/client/clientFor";
 import { type Fiber } from "effect/Fiber";
-import { type ComputedRef, type Ref, type WatchSource } from "vue";
-import { type Commander } from "./experimental/commander.js";
-import { I18n } from "./experimental/intl.js";
-import { type CommanderResolved } from "./experimental/makeUseCommand.js";
-import { Toast } from "./experimental/toast.js";
-import { type MutationOptions, type MutationOptionsBase, type Res } from "./mutate.js";
+import * as AsyncResult from "effect/unstable/reactivity/AsyncResult";
+import { type ComputedRef, type WatchSource } from "vue";
+import { type Commander } from "./commander.js";
+import { type I18n } from "./intl.js";
+import { type CommanderResolved } from "./makeUseCommand.js";
+import { type MutationOptionsBase } from "./mutate.js";
 import { type CustomUndefinedInitialQueryOptions, makeQuery } from "./query.js";
+import { type Toast } from "./toast.js";
 export interface RequestExtensions<RT, Id extends string, I, A, E, R> {
     /** Defines a Command based on this call, taking the `id` of the call as the `id` of the Command.
      * The Request function will be taken as the first member of the Command, the Command required input will be the Request input.
@@ -98,46 +96,6 @@ export type Queries<RT, Req> = Req extends RequestHandlerWithInput<infer I, infe
     query: MissingDependencies<RT, R> & {};
     suspense: MissingDependencies<RT, R> & {};
 } : never;
-declare const SuppressErrors_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").MatchRecord<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }, void, { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => Cause.YieldableError & {
-    readonly _tag: "SuppressErrors";
-} & Readonly<A>;
-/**
- * Use this after handling an error yourself, still continueing on the Error track, but the error will not be reported.
- */
-export declare class SuppressErrors extends SuppressErrors_base<{}> {
-    readonly [ErrorSilenced]: true;
-}
-export type ResponseErrors = S.SchemaError | SupportedErrors | SuppressErrors | OperationFailure;
-export interface Opts<A, E, R, I = void, A2 = A, E2 = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never> extends MutationOptions<A, E, R, A2, E2, R2, I> {
-    /** set to `undefined` to use default message */
-    successMessage?: ((a: A2, i: I) => Effect.Effect<string | undefined, ESuccess, RSuccess>) | undefined;
-    /** set to `undefined` to use default message */
-    failMessage?: ((e: E2, i: I) => Effect.Effect<string | undefined, EError, RError>) | undefined;
-    /** set to `undefined` to use default message */
-    defectMessage?: ((e: Cause.Cause<E2>, i: I) => Effect.Effect<string | undefined, EDefect, RDefect>) | undefined;
-}
-export interface LowOpts<A, E, I = void, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never> {
-    onSuccess: (a: A, i: I) => Effect.Effect<void, ESuccess, RSuccess>;
-    onFail: (e: E, i: I) => Effect.Effect<void, EError, RError>;
-    onDefect: (e: Cause.Cause<E>, i: I) => Effect.Effect<void, EDefect, RDefect>;
-}
-export interface LowOptsOptional<A, E, R, I = void, A2 = A, E2 = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never> extends MutationOptions<A, E, R, A2, E2, R2, I> {
-    onSuccess?: (a: A, i: I) => Effect.Effect<void, ESuccess, RSuccess>;
-    onFail?: (e: E, i: I) => Effect.Effect<void, EError, RError>;
-    onDefect?: (e: Cause.Cause<E>, i: I) => Effect.Effect<void, EDefect, RDefect>;
-}
-type WithAction<A> = A & {
-    action: string;
-};
-type Resp<I, A, E, R, V = ComputedRef<Res<A, E>>> = readonly [
-    V,
-    WithAction<(I: I) => Effect.Effect<Exit.Exit<A, E>, never, R>>
-];
-type ActResp<A, E, R, V = ComputedRef<Res<A, E>>> = readonly [
-    V,
-    WithAction<Effect.Effect<Exit.Exit<A, E>, never, R>>
-];
-export declare const suppressToast: import("effect/Function").LazyArg<Effect.Effect<undefined, never, never>>;
 declare const _useMutation: {
     <I, E, A, R, Request extends Req, Id extends string>(self: RequestHandlerWithInput<I, A, E, R, Request, Id>, options?: MutationOptionsBase): ((i: I) => Effect.Effect<A, E, R>) & {
         readonly id: Id;
@@ -165,189 +123,10 @@ export declare const useMutationInt: () => {
         readonly id: Id;
     };
 };
-export declare class LegacyMutationImpl<RT> {
-    private readonly getRuntime;
-    private readonly toast;
-    private readonly intl;
-    constructor(getRuntime: () => ServiceMap.ServiceMap<RT>, toast: Toast, intl: I18n);
-    /**
-     * Effect results are converted to Exit, so errors are ignored by default.
-     * you should use the result ref to render errors!
-     * @deprecated use `Command.fn` and friends instead
-     */
-    readonly useSafeMutation: {
-        /**
-         * Effect results are converted to Exit, so errors are ignored by default.
-         * you should use the result ref to render errors!
-         * @deprecated use `Command.fn` and friends instead
-         */
-        <I, E, A, R, Request extends Req, Name extends string, A2 = A, E2 = E, R2 = R>(self: RequestHandlerWithInput<I, A, E, R, Request, Name>, options?: MutationOptions<A, E, R, A2, E2, R2, I>): readonly [
-            ComputedRef<AsyncResult.AsyncResult<A2, E2>>,
-            (i: I) => Effect.Effect<Exit.Exit<A2, E2>, never, R2>
-        ];
-        /**
-         * Effect results are converted to Exit, so errors are ignored by default.
-         * you should use the result ref to render errors!
-         * @deprecated use `Command.fn` and friends instead
-         */
-        <E, A, R, Request extends Req, Name extends string, A2 = A, E2 = E, R2 = R>(self: RequestHandler<A, E, R, Request, Name>, options?: MutationOptions<A, E, R, A2, E2, R2>): readonly [
-            ComputedRef<AsyncResult.AsyncResult<A2, E2>>,
-            Effect.Effect<Exit.Exit<A2, E2>, never, R2>
-        ];
-    };
-    /** handles errors as toasts and reports defects
-     * @deprecated use `Command.fn` and friends instead
-     */
-    readonly useHandleRequestWithToast: () => <A, E extends ResponseErrors, R, I = void, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(f: Effect.Effect<Exit.Exit<A2, E2>, never, R2> | ((i: I) => Effect.Effect<Exit.Exit<A2, E2>, never, R2>), id: string, action: string, options?: Opts<A, E, R, I, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>) => (Effect.Effect<Exit.Exit<A2, E2>, ESuccess | EError | EDefect, Exclude<R2, import("effect/Tracer").ParentSpan> | Exclude<RSuccess, import("effect/Tracer").ParentSpan> | Exclude<RError, import("effect/Tracer").ParentSpan> | Exclude<RDefect, import("effect/Tracer").ParentSpan>> | ((i: any) => Effect.Effect<Exit.Exit<A2, E2>, ESuccess | EError | EDefect, Exclude<R2, import("effect/Tracer").ParentSpan> | Exclude<RSuccess, import("effect/Tracer").ParentSpan> | Exclude<RError, import("effect/Tracer").ParentSpan> | Exclude<RDefect, import("effect/Tracer").ParentSpan>>)) & {
-        action: string;
-    };
-    /**
-     * Pass a function that returns an Effect, e.g from a client action, give it a name.
-     * Returns a tuple with raw Result and execution function which reports success and errors as Toast.
-     * @deprecated use `Command.fn` and friends instead
-     */
-    readonly useAndHandleMutationResult: {
-        /**
-         * Pass a function that returns an Effect, e.g from a client action, give it a name.
-         * Returns a tuple with raw Result and execution function which reports success and errors as Toast.
-         * @deprecated use `Command.fn` and friends instead
-         */
-        <I, E extends ResponseErrors, A, R, Request extends Req, Name extends string, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandlerWithInput<I, A, E, R, Request, Name>, action: string, options?: Opts<A, E, R, I, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>): Resp<I, A2, E2, R2, ComputedRef<AsyncResult.AsyncResult<A2, E2>>>;
-        /**
-         * Pass a function that returns an Effect, e.g from a client action, give it a name.
-         * Returns a tuple with raw Result and execution function which reports success and errors as Toast.
-         * @deprecated use `Command.fn` and friends instead
-         */
-        <E extends ResponseErrors, A, R, Request extends Req, Name extends string, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandler<A, E, R, Request, Name>, action: string, options?: Opts<A, E, R, void, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>): ActResp<A2, E2, R2, ComputedRef<AsyncResult.AsyncResult<A2, E2>>>;
-    };
-    /**
-     * Pass a function that returns an Effect, e.g from a client action, give it a name.
-     * Returns a tuple with state ref and execution function which reports success and errors as Toast.
-     *
-     * @deprecated use `Command.fn` and friends instead
-     */
-    readonly useAndHandleMutation: {
-        /**
-         * Pass a function that returns an Effect, e.g from a client action, give it a name.
-         * Returns a tuple with state ref and execution function which reports success and errors as Toast.
-         *
-         * @deprecated use `Command.fn` and friends instead
-         */
-        <I, E extends ResponseErrors, A, R, Request extends Req, Name extends string, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandlerWithInput<I, A, E, R, Request, Name>, action: string, options?: Opts<A, E, R, I, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>): Resp<I, A2, E2, R2>;
-        /**
-         * Pass a function that returns an Effect, e.g from a client action, give it a name.
-         * Returns a tuple with state ref and execution function which reports success and errors as Toast.
-         *
-         * @deprecated use `Command.fn` and friends instead
-         */
-        <E extends ResponseErrors, A, R, Request extends Req, Name extends string, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandler<A, E, R, Request, Name>, action: string, options?: Opts<A, E, R, void, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>): ActResp<A2, E2, R2>;
-    };
-    /** @deprecated use `Command.fn` and friends instead */
-    readonly makeUseAndHandleMutation: (defaultOptions?: Opts<any, any, any, any, any, any, any, any, any>) => {
-        <I, E extends ResponseErrors, A, R, Request extends Req, Name extends string, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandlerWithInput<I, A, E, R, Request, Name>, action: string, options?: Opts<A, E, R, I, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>): Resp<I, A2, E2, R2>;
-        <E extends ResponseErrors, A, R, Request extends Req, Name extends string, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandler<A, E, R, Request, Name>, action: string, options?: Opts<A, E, R, void, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>): ActResp<A2, E2, R2>;
-    };
-    /**
-     * The same as @see useAndHandleMutation, but does not display any toasts by default.
-     * Messages for success, error and defect toasts can be provided in the Options.
-     * @deprecated use `Command.fn` and friends instead
-     */
-    readonly useAndHandleMutationSilently: {
-        /**
-         * The same as @see useAndHandleMutation, but does not display any toasts by default.
-         * Messages for success, error and defect toasts can be provided in the Options.
-         * @deprecated use `Command.fn` and friends instead
-         */
-        <I, E extends ResponseErrors, A, R, Request extends Req, Name extends string, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandlerWithInput<I, A, E, R, Request, Name>, action: string, options?: Opts<A, E, R, I, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>): Resp<I, A2, E2, R>;
-        /**
-         * The same as @see useAndHandleMutation, but does not display any toasts by default.
-         * Messages for success, error and defect toasts can be provided in the Options.
-         * @deprecated use `Command.fn` and friends instead
-         */
-        <E extends ResponseErrors, A, R, Request extends Req, Name extends string, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandler<A, E, R, Request, Name>, action: string, options?: Opts<A, E, R, void, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>): ActResp<void, never, R>;
-    };
-    /**
-     * The same as @see useAndHandleMutation, but does not act on success, error or defect by default.
-     * Actions for success, error and defect can be provided in the Options.
-     * @deprecated use `Command.fn` and friends instead
-     */
-    readonly useAndHandleMutationCustom: {
-        /**
-         * The same as @see useAndHandleMutation, but does not act on success, error or defect by default.
-         * Actions for success, error and defect can be provided in the Options.
-         * @deprecated use `Command.fn` and friends instead
-         */
-        <I, E extends ResponseErrors, A, R, Request extends Req, Name extends string, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandlerWithInput<I, A, E, R, Request, Name>, action: string, options?: LowOptsOptional<A, E, R, I, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>): Resp<I, A2, E2, R2>;
-        /**
-         * The same as @see useAndHandleMutation, but does not act on success, error or defect by default.
-         * Actions for success, error and defect can be provided in the Options.
-         * @deprecated use `Command.fn` and friends instead
-         */
-        <E extends ResponseErrors, A, R, Request extends Req, Name extends string, A2 = A, E2 extends ResponseErrors = E, R2 = R, ESuccess = never, RSuccess = never, EError = never, RError = never, EDefect = never, RDefect = never>(self: RequestHandler<A, E, R, Request, Name>, action: string, options?: LowOptsOptional<A, E, R, void, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>): ActResp<A2, E2, R2>;
-    };
-    /**
-     * Effect results are converted to Exit, so errors are ignored by default.
-     * you should use the result ref to render errors!
-     * @deprecated use `Command.fn` and friends instead
-     */
-    readonly useSafeMutationWithState: {
-        /**
-         * Effect results are converted to Exit, so errors are ignored by default.
-         * you should use the result ref to render errors!
-         * @deprecated use `Command.fn` and friends instead
-         */
-        <I, E, A, R, Request extends Req, Name extends string, A2 = A, E2 = E, R2 = R>(self: RequestHandlerWithInput<I, A, E, R, Request, Name>, options?: MutationOptions<A, E, R, A2, E2, R2, I>): readonly [
-            ComputedRef<Res<A, E>>,
-            (i: I) => Effect.Effect<Exit.Exit<A2, E2>, never, R2>
-        ];
-        /**
-         * Effect results are converted to Exit, so errors are ignored by default.
-         * you should use the result ref to render errors!
-         * @deprecated use `Command.fn` and friends instead
-         */
-        <E, A, R, Request extends Req, Name extends string, A2 = A, E2 = E, R2 = R>(self: RequestHandler<A, E, R, Request, Name>, options?: MutationOptions<A, E, R, A2, E2, R2>): readonly [
-            ComputedRef<Res<A, E>>,
-            Effect.Effect<Exit.Exit<A2, E2>, never, R2>
-        ];
-    };
-    /** @deprecated use OmegaForm */
-    readonly buildFormFromSchema: <From extends Record<PropertyKey, any>, To extends Record<PropertyKey, any>, C extends Record<PropertyKey, any>, OnSubmitA>(s: S.Codec<To> & {
-        new (c: C): any;
-        extend: any;
-        fields: S.Struct.Fields;
-    }, state: Ref<Omit<From, "_tag">>, onSubmit: (a: To) => Effect.Effect<OnSubmitA, never, RT>) => {
-        fields: { [K in keyof To]-?: {
-            true: {
-                true: To[K] extends {
-                    _tag: string;
-                } ? import("./form.js").DiscriminatedUnionFieldInfo<{ [P in import("./form.js").DistributiveNestedFieldInfoKey<To[K]> as P["_infoTag" & keyof P] & string]: P; }> : import("./form.js").UnionFieldInfo<import("./form.js").DistributiveNestedFieldInfoKey<To[K]>[]>;
-                false: import("./form.js").NestedFieldInfoKey<To[K]>;
-            }[`${To[K] extends object ? true : false}`];
-            false: import("./form.js").NestedFieldInfoKey<To[K]>;
-        }[`${import("effect-app/utils").IsUnion<To[K]>}`]; };
-        /** optimized for Vuetify v-form submit callback */
-        submit: <T extends Promise<{
-            valid: boolean;
-        }>>(e: T) => Promise<unknown>;
-        /** optimized for Native form submit callback or general use */
-        submitFromState: Effect.Effect<any, unknown, unknown>;
-        submitFromStatePromise: () => Promise<unknown>;
-        isDirty: Ref<boolean, boolean>;
-        isValid: Ref<boolean, boolean>;
-        isLoading: Ref<boolean, boolean>;
-    };
-}
-declare const LegacyMutation_base: ServiceMap.ServiceClass<LegacyMutation, "LegacyMutation", <R>(getRuntime: () => ServiceMap.ServiceMap<R>) => LegacyMutationImpl<R>> & {
-    readonly make: Effect.Effect<(<R>(getRuntime: () => ServiceMap.ServiceMap<R>) => LegacyMutationImpl<R>), never, I18n | Toast>;
-};
-export declare class LegacyMutation extends LegacyMutation_base {
-    static readonly DefaultWithoutDependencies: Layer.Layer<LegacyMutation, never, I18n | Toast>;
-    static readonly Default: Layer.Layer<LegacyMutation, never, I18n | Toast>;
-}
-export type ClientFrom<M extends Requests> = RequestHandlers<never, never, M, M["meta"]["moduleName"]>;
+export type ClientFrom<M extends RequestsAny> = RequestHandlers<never, never, M, ExtractModuleName<M>>;
 export declare class QueryImpl<R> {
-    readonly getRuntime: () => ServiceMap.ServiceMap<R>;
-    constructor(getRuntime: () => ServiceMap.ServiceMap<R>);
+    readonly getRuntime: () => Context.Context<R>;
+    constructor(getRuntime: () => Context.Context<R>);
     /**
      * Effect results are passed to the caller, including errors.
      * @deprecated use client helpers instead (.query())
@@ -400,19 +179,17 @@ export declare class QueryImpl<R> {
     };
 }
 type Base = I18n | Toast;
-type Mix = ApiClientFactory | Commander | LegacyMutation | Base;
+type Mix = ApiClientFactory | Commander | 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<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"]; };
+    clientFor: <M extends RequestsAny>(m: M, queryInvalidation?: (client: ClientFrom<M>) => QueryInvalidation<M>) => { [Key in keyof RequestHandlers<never, never, M, ExtractModuleName<M>>]: RequestHandlers<never, never, M, ExtractModuleName<M>>[Key] & RequestWithExtensions<RTHooks | (Mix | RT_), RequestHandlers<never, never, M, ExtractModuleName<M>>[Key]> & {
+        mutate: MutationWithExtensions<RTHooks | (Mix | RT_), RequestHandlers<never, never, M, ExtractModuleName<M>>[Key]>;
+        Input: RequestHandlers<never, never, M, ExtractModuleName<M>>[Key] extends RequestHandlerWithInput<infer I, any, any, any, any, any> ? I : never;
+    } & Queries<Mix | RT_, RequestHandlers<never, never, M, ExtractModuleName<M>>[Key]>; } & {
+        helpers: { [Key_1 in keyof RequestHandlers<never, never, M, ExtractModuleName<M>> as `${ToCamel<string & Key_1>}Request`]: RequestWithExtensions<RTHooks | (Mix | RT_), RequestHandlers<never, never, M, ExtractModuleName<M>>[Key_1]>; } & { [Key_2 in keyof RequestHandlers<never, never, M, ExtractModuleName<M>> as `${ToCamel<string & Key_2>}Mutation`]: MutationWithExtensions<RTHooks | (Mix | RT_), RequestHandlers<never, never, M, ExtractModuleName<M>>[Key_2]>; } & { [Key_3 in keyof RequestHandlers<never, never, M, ExtractModuleName<M>> as `${ToCamel<string & Key_3>}Query`]: Queries<Mix | RT_, RequestHandlers<never, never, M, ExtractModuleName<M>>[Key_3]>["query"]; } & { [Key_4 in keyof RequestHandlers<never, never, M, ExtractModuleName<M>> as `${ToCamel<string & Key_4>}SuspenseQuery`]: Queries<Mix | RT_, RequestHandlers<never, never, M, ExtractModuleName<M>>[Key_4]>["suspense"]; };
     };
-    legacy: Legacy<Mix | RT_>;
 };
-export interface Legacy<R> extends Pick<QueryImpl<R>, "useQuery" | "useSuspenseQuery">, Omit<LegacyMutationImpl<R>, "getRuntime" | "toast" | "intl"> {
-}
 export type QueryInvalidation<M> = {
     [K in keyof M]?: (defaultKey: string[], name: string) => {
         filters?: InvalidateQueryFilters | undefined;