@effect-app/vue 2.55.9 → 2.56.0

package/dist/runtime.d.ts

@@ -1,45 +1,6 @@
-import { Exit, Runtime } from "effect";
+import { ManagedRuntime } from "effect";
 import { Effect, Layer } from "effect-app";
-export declare function makeAppRuntime<A, E, R>(layer: Layer.Layer<A, E, R>): Effect.Effect<{
-    runtime: Runtime.Runtime<A> & {
-        runPromise: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, A>, options?: {
-            readonly signal?: AbortSignal;
-        } | undefined) => Promise<A_1>;
-        runPromiseExit: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, A>, options?: {
-            readonly signal?: AbortSignal;
-        } | undefined) => Promise<Exit.Exit<A_1, E_1>>;
-        runSync: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, A>) => A_1;
-        runSyncExit: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, A>) => Exit.Exit<A_1, E_1>;
-        runFork: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, A>, options?: Runtime.RunForkOptions | undefined) => import("effect/Fiber").RuntimeFiber<A_1, E_1>;
-    };
-    clean: Effect.Effect<void, never, never>;
-}, E, R>;
-export declare function initializeSync<A, E>(layer: Layer.Layer<A, E, never>): {
-    runtime: Runtime.Runtime<A> & {
-        runPromise: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, A>, options?: {
-            readonly signal?: AbortSignal;
-        } | undefined) => Promise<A_1>;
-        runPromiseExit: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, A>, options?: {
-            readonly signal?: AbortSignal;
-        } | undefined) => Promise<Exit.Exit<A_1, E_1>>;
-        runSync: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, A>) => A_1;
-        runSyncExit: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, A>) => Exit.Exit<A_1, E_1>;
-        runFork: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, A>, options?: Runtime.RunForkOptions | undefined) => import("effect/Fiber").RuntimeFiber<A_1, E_1>;
-    };
-    clean: () => void;
-};
-export declare function initializeAsync<A, E>(layer: Layer.Layer<A, E, never>): Promise<{
-    runtime: Runtime.Runtime<A> & {
-        runPromise: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, A>, options?: {
-            readonly signal?: AbortSignal;
-        } | undefined) => Promise<A_1>;
-        runPromiseExit: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, A>, options?: {
-            readonly signal?: AbortSignal;
-        } | undefined) => Promise<Exit.Exit<A_1, E_1>>;
-        runSync: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, A>) => A_1;
-        runSyncExit: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, A>) => Exit.Exit<A_1, E_1>;
-        runFork: <A_1, E_1>(effect: Effect.Effect<A_1, E_1, A>, options?: Runtime.RunForkOptions | undefined) => import("effect/Fiber").RuntimeFiber<A_1, E_1>;
-    };
-    clean: () => Promise<void>;
-}>;
+export declare function makeAppRuntime<A, E>(layer: Layer.Layer<A, E>): Effect.Effect<ManagedRuntime.ManagedRuntime<A, never>, E, never>;
+export declare function initializeSync<A, E>(layer: Layer.Layer<A, E, never>): ManagedRuntime.ManagedRuntime<A, never>;
+export declare function initializeAsync<A, E>(layer: Layer.Layer<A, E, never>): Promise<ManagedRuntime.ManagedRuntime<A, never>>;
 //# sourceMappingURL=runtime.d.ts.map

package/dist/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AACtC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAU,MAAM,YAAY,CAAA;AAGlD,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;;;2BAwC62K,CAAC;;;2BAAu1C,CAAC;;;;;;;SApBxwN;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC;;;2BAkB42K,CAAC;;;2BAAu1C,CAAC;;;;;;;EAZxwN;AAED,wBAAgB,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC;;;2BAU22K,CAAC;;;2BAAu1C,CAAC;;;;;;;GADxwN"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../src/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAU,MAAM,YAAY,CAAA;AAElD,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,oEAS5D;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,2CAGnE;AAED,wBAAgB,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,oDAGpE"}

package/dist/runtime.js

@@ -1,39 +1,19 @@
-import { Exit, Runtime } from "effect";
+import { ManagedRuntime } from "effect";
 import { Effect, Layer, Logger } from "effect-app";
-import * as Scope from "effect/Scope";
 export function makeAppRuntime(layer) {
     return Effect.gen(function* () {
         layer = layer.pipe(Layer.provide(Logger.replace(Logger.defaultLogger, Logger.withSpanAnnotations(Logger.prettyLogger()))));
-        const scope = yield* Scope.make();
-        const env = yield* layer.pipe(Layer.buildWithScope(scope));
-        const runtime = yield* Effect.runtime().pipe(Effect.scoped, Effect.provide(env));
-        return {
-            runtime: Object.assign(runtime, {
-                runPromise: Runtime.runPromise(runtime),
-                runPromiseExit: Runtime.runPromiseExit(runtime),
-                runSync: Runtime.runSync(runtime),
-                runSyncExit: Runtime.runSyncExit(runtime),
-                runFork: Runtime.runFork(runtime)
-            }),
-            clean: Scope.close(scope, Exit.void)
-        };
+        const mrt = ManagedRuntime.make(layer);
+        yield* mrt.runtimeEffect;
+        return mrt; // as we initialise here, there is no more error left.
     });
 }
 export function initializeSync(layer) {
-    const { clean, runtime } = Effect.runSync(makeAppRuntime(layer));
-    return {
-        runtime,
-        clean: () => Effect.runSync(clean)
-    };
+    const runtime = Effect.runSync(makeAppRuntime(layer));
+    return runtime;
 }
 export function initializeAsync(layer) {
     return Effect
-        .runPromise(makeAppRuntime(layer))
-        .then(({ clean, runtime }) => {
-        return {
-            runtime,
-            clean: () => Effect.runPromise(clean)
-        };
-    });
+        .runPromise(makeAppRuntime(layer));
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVudGltZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9ydW50aW1lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLE1BQU0sUUFBUSxDQUFBO0FBQ3RDLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUNsRCxPQUFPLEtBQUssS0FBSyxNQUFNLGNBQWMsQ0FBQTtBQUVyQyxNQUFNLFVBQVUsY0FBYyxDQUFVLEtBQTJCO0lBQ2pFLE9BQU8sTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUM7UUFDekIsS0FBSyxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQ2hCLEtBQUssQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsYUFBYSxFQUFFLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQyxNQUFNLENBQUMsWUFBWSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQ3ZHLENBQUE7UUFDRCxNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLENBQUE7UUFDakMsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUE7UUFDMUQsTUFBTSxPQUFPLEdBQUcsS0FBSyxDQUFDLENBQUMsTUFBTSxDQUFDLE9BQU8sRUFBSyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQTtRQUVuRixPQUFPO1lBQ0wsT0FBTyxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFO2dCQUM5QixVQUFVLEVBQUUsT0FBTyxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUM7Z0JBQ3ZDLGNBQWMsRUFBRSxPQUFPLENBQUMsY0FBYyxDQUFDLE9BQU8sQ0FBQztnQkFDL0MsT0FBTyxFQUFFLE9BQU8sQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDO2dCQUNqQyxXQUFXLEVBQUUsT0FBTyxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUM7Z0JBQ3pDLE9BQU8sRUFBRSxPQUFPLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQzthQUNsQyxDQUFDO1lBQ0YsS0FBSyxFQUFFLEtBQUssQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUM7U0FDckMsQ0FBQTtJQUNILENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQztBQUVELE1BQU0sVUFBVSxjQUFjLENBQU8sS0FBK0I7SUFDbEUsTUFBTSxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFBO0lBQ2hFLE9BQU87UUFDTCxPQUFPO1FBQ1AsS0FBSyxFQUFFLEdBQUcsRUFBRSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDO0tBQ25DLENBQUE7QUFDSCxDQUFDO0FBRUQsTUFBTSxVQUFVLGVBQWUsQ0FBTyxLQUErQjtJQUNuRSxPQUFPLE1BQU07U0FDVixVQUFVLENBQUMsY0FBYyxDQUFDLEtBQUssQ0FBQyxDQUFDO1NBQ2pDLElBQUksQ0FBQyxDQUFDLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSxFQUFFLEVBQUU7UUFDM0IsT0FBTztZQUNMLE9BQU87WUFDUCxLQUFLLEVBQUUsR0FBRyxFQUFFLENBQUMsTUFBTSxDQUFDLFVBQVUsQ0FBQyxLQUFLLENBQUM7U0FDdEMsQ0FBQTtJQUNILENBQUMsQ0FBQyxDQUFBO0FBQ04sQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicnVudGltZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9ydW50aW1lLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxRQUFRLENBQUE7QUFDdkMsT0FBTyxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBRWxELE1BQU0sVUFBVSxjQUFjLENBQU8sS0FBd0I7SUFDM0QsT0FBTyxNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQztRQUN6QixLQUFLLEdBQUcsS0FBSyxDQUFDLElBQUksQ0FDaEIsS0FBSyxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxhQUFhLEVBQUUsTUFBTSxDQUFDLG1CQUFtQixDQUFDLE1BQU0sQ0FBQyxZQUFZLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FDdkcsQ0FBQTtRQUNELE1BQU0sR0FBRyxHQUFHLGNBQWMsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDdEMsS0FBSyxDQUFDLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQTtRQUN4QixPQUFPLEdBQThDLENBQUEsQ0FBQyxzREFBc0Q7SUFDOUcsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDO0FBRUQsTUFBTSxVQUFVLGNBQWMsQ0FBTyxLQUErQjtJQUNsRSxNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLGNBQWMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFBO0lBQ3JELE9BQU8sT0FBTyxDQUFBO0FBQ2hCLENBQUM7QUFFRCxNQUFNLFVBQVUsZUFBZSxDQUFPLEtBQStCO0lBQ25FLE9BQU8sTUFBTTtTQUNWLFVBQVUsQ0FBQyxjQUFjLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQTtBQUN0QyxDQUFDIn0=

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue",
-  "version": "2.55.9",
+  "version": "2.56.0",
   "license": "MIT",
   "type": "module",
   "homepage": "https://github.com/effect-ts-app/libs/tree/main/packages/vue",
@@ -60,9 +60,9 @@
       "types": "./dist/experimental/intl.d.ts",
       "default": "./dist/experimental/intl.js"
     },
-    "./experimental/makeExperimental": {
-      "types": "./dist/experimental/makeExperimental.d.ts",
-      "default": "./dist/experimental/makeExperimental.js"
+    "./experimental/makeUseCommand": {
+      "types": "./dist/experimental/makeUseCommand.d.ts",
+      "default": "./dist/experimental/makeUseCommand.js"
     },
     "./experimental/toast": {
       "types": "./dist/experimental/toast.d.ts",

package/src/experimental/commander.ts

@@ -602,7 +602,9 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
 
           return Effect.currentSpan.pipe(
             Effect.option,
-            Effect.map((span) => runFork(Option.isSome(span) ? command.pipe(Effect.withParentSpan(span.value)) : command))
+            Effect.map((span) =>
+              runFork(Option.isSome(span) ? command.pipe(Effect.withParentSpan(span.value)) : command)
+            )
           )
         }, { action })
 
@@ -782,16 +784,8 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
           self: Effect.Effect<A, E, R>
         ) =>
           Effect.gen(function*() {
-            const { action } = yield* CommandContext
+            const cc = yield* CommandContext
 
-            const defaultWarnMessage = intl.formatMessage(
-              { id: "handle.with_warnings" },
-              { action }
-            )
-            const defaultErrorMessage = intl.formatMessage(
-              { id: "handle.with_errors" },
-              { action }
-            )
             function renderError(e: E): string {
               if (options?.errorRenderer) {
                 const m = options.errorRenderer(e)
@@ -826,19 +820,19 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
               withToast({
                 onWaiting: options?.onWaiting === null ? null : intl.formatMessage(
                   { id: "handle.waiting" },
-                  { action }
+                  { action: cc.action }
                 ),
                 onSuccess: options?.onSuccess === null
                   ? null
                   : (a) =>
-                    intl.formatMessage({ id: "handle.success" }, { action })
+                    intl.formatMessage({ id: "handle.success" }, { action: cc.action })
                     + (S.is(OperationSuccess)(a) && a.message ? "\n" + a.message : ""),
                 onFailure: Option.match({
                   onNone: () =>
                     intl.formatMessage(
                       { id: "handle.unexpected_error2" },
                       {
-                        action,
+                        action: cc.action,
                         error: "" // TODO consider again Cause.pretty(cause), // will be reported to Sentry/Otel anyway.. and we shouldn't bother users with error dumps?
                       }
                     ),
@@ -846,9 +840,19 @@ export class Commander extends Effect.Service<Commander>()("Commander", {
                     S.is(OperationFailure)(e)
                       ? {
                         level: "warn",
-                        message: defaultWarnMessage + e.message ? "\n" + e.message : ""
+                        message: intl.formatMessage(
+                            { id: "handle.with_warnings" },
+                            { action: cc.action }
+                          ) + e.message
+                          ? "\n" + e.message
+                          : ""
                       }
-                      : `${defaultErrorMessage}:\n` + renderError(e)
+                      : `${
+                        intl.formatMessage(
+                          { id: "handle.with_errors" },
+                          { action: cc.action }
+                        )
+                      }:\n` + renderError(e)
                 })
               })
             )

package/src/experimental/{makeExperimental.ts → makeUseCommand.ts}

@@ -1,7 +1,7 @@
 import { Effect } from "effect-app"
 import { Commander } from "./commander.js"
 
-export const makeExperimental = Effect.fnUntraced(function*<R = never>() {
+export const makeUseCommand = Effect.fnUntraced(function*<R = never>() {
   const cmndr = yield* Commander
   const runtime = yield* Effect.runtime<R>()
 

package/src/form.ts

@@ -2,11 +2,11 @@ import { createIntl, type IntlFormatters } from "@formatjs/intl"
 import * as JSONSchema from "effect/JSONSchema"
 import type { ParseError } from "effect/ParseResult"
 import type {} from "intl-messageformat"
-import { Either, Option, pipe, S, Struct } from "effect-app"
+import { Either, Option, pipe, S } from "effect-app"
 import type { Schema } from "effect-app/Schema"
 import type { Unbranded } from "effect-app/Schema/brand"
 import type { IsUnion } from "effect-app/utils"
-import { capitalize, type Ref, ref, watch } from "vue"
+import { capitalize, ref } from "vue"
 
 // type GetSchemaFromProp<T> = T extends Field<infer S, any, any, any> ? S
 //   : never
@@ -381,64 +381,6 @@ function buildFieldInfo(
   return info as any
 }
 
-export const buildFormFromSchema = <
-  From extends Record<PropertyKey, any>,
-  To extends Record<PropertyKey, any>,
-  C extends Record<PropertyKey, any>,
-  OnSubmitA
->(
-  s:
-    & Schema<
-      To,
-      From,
-      never
-    >
-    & { new(c: C): any; extend: any; fields: S.Struct.Fields },
-  state: Ref<Omit<From, "_tag">>,
-  onSubmit: (a: To) => Promise<OnSubmitA>
-) => {
-  const fields = buildFieldInfoFromFieldsRoot(s).fields
-  const parse = S.decodeUnknownSync<any, any>(S.Struct(Struct.omit(s.fields, "_tag")) as any)
-  const isDirty = ref(false)
-  const isValid = ref(true)
-  const isLoading = ref(false)
-
-  const submit1 = <A>(onSubmit: (a: To) => Promise<A>) => async <T extends Promise<{ valid: boolean }>>(e: T) => {
-    isLoading.value = true
-    try {
-      const r = await e
-      if (!r.valid) return
-      return onSubmit(new s(parse(state.value)))
-    } finally {
-      isLoading.value = false
-    }
-  }
-  const submit = submit1(onSubmit)
-
-  watch(
-    state,
-    (v) => {
-      // TODO: do better
-      isDirty.value = JSON.stringify(v) !== JSON.stringify(state.value)
-    },
-    { deep: true }
-  )
-
-  const submitFromState = () => submit(Promise.resolve({ valid: isValid.value }))
-
-  return {
-    fields,
-    /** optimized for Vuetify v-form submit callback */
-    submit,
-    /** optimized for Native form submit callback or general use */
-    submitFromState,
-    isDirty,
-    isValid,
-    /** includes whole submit, including potential asynchronous validation steps */
-    isLoading
-  }
-}
-
 export function getMetadataFromSchema(
   ast: S.AST.AST
 ): {