@effect-app/vue-components 4.0.0-beta.182 → 4.0.0-beta.184

package/dist/types/components/CommandButton.vue.d.ts

@@ -1,4 +1,5 @@
-import type { CommandBase } from "@effect-app/vue";
+import type { CommandBase, Progress } from "@effect-app/vue";
+import type * as AsyncResult from "effect/unstable/reactivity/AsyncResult";
 import type { VBtn } from "vuetify/components";
 export type VBtnProps = VBtn["$props"];
 export interface ButtonProps extends /* @vue-ignore */ VBtnProps {
@@ -6,18 +7,19 @@ export interface ButtonProps extends /* @vue-ignore */ VBtnProps {
 /** Command Button is an easy way to connect commands and have it execute on click, while keeping track of disabled/loading states automatically */
 declare const _default: typeof __VLS_export;
 export default _default;
-declare const __VLS_export: <I = never>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
+declare const __VLS_export: <I = never, RA = unknown, RE = unknown>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: import("vue").PublicProps & __VLS_PrettifyLocal<({
         input: NoInfer<I>;
-        command: CommandBase<I>;
+        command: CommandBase<I, any, RA, RE>;
         empty?: boolean;
     } | {
-        command: CommandBase;
+        command: CommandBase<any, any, RA, RE>;
         input?: undefined;
         empty?: boolean;
     }) & {
         disabled?: ButtonProps["disabled"];
         title?: string;
+        mapProgress?: (result: AsyncResult.AsyncResult<RA, RE>) => Progress | undefined;
     } & ButtonProps> & (typeof globalThis extends {
         __VLS_PROPS_FALLBACK: infer P;
     } ? P : {});

package/dist/vue-components3.es.js

@@ -7,28 +7,35 @@ var m = { class: "ml-2" }, h = { class: "ml-2" }, g = /* @__PURE__ */ s({
 		command: {},
 		empty: { type: Boolean },
 		disabled: {},
-		title: {}
+		title: {},
+		mapProgress: { type: Function }
 	},
 	setup(s) {
 		let g = s, _ = e(() => g.command.blocked || g.disabled), v = e(() => {
-			let e = g.command.progress;
-			if (e !== void 0) return typeof e == "string" ? e : e.text;
+			if (g.mapProgress) {
+				let e = g.command.result;
+				return e === void 0 ? void 0 : g.mapProgress(e);
+			}
+			return g.command.progress;
 		}), y = e(() => {
-			let e = g.command.progress;
+			let e = v.value;
+			if (e !== void 0) return typeof e == "string" ? e : e.text;
+		}), b = e(() => {
+			let e = v.value;
 			return typeof e == "object" && e ? e.percentage : void 0;
-		}), b = () => {
+		}), x = () => {
 			if (_.value) return;
 			let e = "input" in g && g.input ? g.input : void 0, t = g.command.handle;
 			t(e);
 		};
 		return (e, g) => {
-			let x = d("v-progress-circular"), S = d("v-btn");
+			let v = d("v-progress-circular"), S = d("v-btn");
 			return s.command.allowed && !s.empty ? (l(), t(S, c({ key: 0 }, e.$attrs, {
 				loading: s.command.waiting,
 				"aria-disabled": _.value,
 				title: s.title ?? s.command.action,
 				class: { "v-btn--disabled": _.value },
-				onClick: b
+				onClick: x
 			}), i({
 				default: p(() => [u(e.$slots, "default", {
 					loading: s.command.waiting,
@@ -37,14 +44,14 @@ var m = { class: "ml-2" }, h = { class: "ml-2" }, g = /* @__PURE__ */ s({
 					title: s.title ?? s.command.action
 				}, () => [a(f(s.command.label), 1)])]),
 				_: 2
-			}, [v.value === void 0 ? void 0 : {
+			}, [y.value === void 0 ? void 0 : {
 				name: "loader",
-				fn: p(() => [o(x, {
-					indeterminate: y.value === void 0,
-					"model-value": y.value,
+				fn: p(() => [o(v, {
+					indeterminate: b.value === void 0,
+					"model-value": b.value,
 					size: "20",
 					width: "2"
-				}, null, 8, ["indeterminate", "model-value"]), r("span", m, f(v.value), 1)]),
+				}, null, 8, ["indeterminate", "model-value"]), r("span", m, f(y.value), 1)]),
 				key: "0"
 			}]), 1040, [
 				"loading",
@@ -56,15 +63,15 @@ var m = { class: "ml-2" }, h = { class: "ml-2" }, g = /* @__PURE__ */ s({
 				"aria-disabled": _.value,
 				title: s.title ?? s.command.action,
 				class: { "v-btn--disabled": _.value },
-				onClick: b
-			}), i({ _: 2 }, [v.value === void 0 ? void 0 : {
+				onClick: x
+			}), i({ _: 2 }, [y.value === void 0 ? void 0 : {
 				name: "loader",
-				fn: p(() => [o(x, {
-					indeterminate: y.value === void 0,
-					"model-value": y.value,
+				fn: p(() => [o(v, {
+					indeterminate: b.value === void 0,
+					"model-value": b.value,
 					size: "20",
 					width: "2"
-				}, null, 8, ["indeterminate", "model-value"]), r("span", h, f(v.value), 1)]),
+				}, null, 8, ["indeterminate", "model-value"]), r("span", h, f(y.value), 1)]),
 				key: "0"
 			}]), 1040, [
 				"loading",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue-components",
-  "version": "4.0.0-beta.182",
+  "version": "4.0.0-beta.184",
   "peerDependencies": {
     "@mdi/js": "^7.4.47",
     "effect": "^4.0.0-beta.59",
@@ -57,8 +57,8 @@
     "highlight.js": "^11.11.1",
     "mitt": "^3.0.1",
     "vue3-highlightjs": "^1.0.5",
-    "@effect-app/vue": "4.0.0-beta.182",
-    "effect-app": "4.0.0-beta.182"
+    "@effect-app/vue": "4.0.0-beta.184",
+    "effect-app": "4.0.0-beta.184"
   },
   "scripts": {
     "check": "vue-tsc",

package/src/components/CommandButton.vue

@@ -1,9 +1,10 @@
 <script
   setup
   lang="ts"
-  generic="I = never"
+  generic="I = never, RA = unknown, RE = unknown"
 >
-import type { CommandBase } from "@effect-app/vue"
+import type { CommandBase, Progress } from "@effect-app/vue"
+import type * as AsyncResult from "effect/unstable/reactivity/AsyncResult"
 import { computed } from "vue"
 import type { VBtn } from "vuetify/components"
 
@@ -14,11 +15,11 @@ const props = defineProps<
   & (
     | {
       input: NoInfer<I>
-      command: CommandBase<I>
+      command: CommandBase<I, any, RA, RE>
       empty?: boolean
     }
     | {
-      command: CommandBase
+      command: CommandBase<any, any, RA, RE>
       input?: undefined
       empty?: boolean
     }
@@ -26,20 +27,29 @@ const props = defineProps<
   & {
     disabled?: ButtonProps["disabled"]
     title?: string // why isn't it part of VBtnProps??
+    mapProgress?: (result: AsyncResult.AsyncResult<RA, RE>) => Progress | undefined
   }
   & ButtonProps
 >()
 
 const isDisabled = computed(() => props.command.blocked || props.disabled)
 
+const resolvedProgress = computed(() => {
+  if (props.mapProgress) {
+    const result = props.command.result
+    return result !== undefined ? props.mapProgress(result) : undefined
+  }
+  return props.command.progress
+})
+
 const progressText = computed(() => {
-  const p = props.command.progress
+  const p = resolvedProgress.value
   if (p === undefined) return undefined
   return typeof p === "string" ? p : p.text
 })
 
 const progressPercentage = computed(() => {
-  const p = props.command.progress
+  const p = resolvedProgress.value
   return typeof p === "object" && p !== null ? p.percentage : undefined
 })