@shwfed/config 2.12.13 → 2.12.14

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "shwfed",
   "configKey": "shwfed",
-  "version": "2.12.13",
+  "version": "2.12.14",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "unknown"

package/dist/runtime/components/actions/buttons/2026-06-25/com.shwfed.actions.button.state.write/config.d.vue.ts

@@ -13,6 +13,10 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_ModelProps, {},
             readonly target: string;
             readonly operation: string;
         }[] | undefined;
+        readonly requests?: readonly {
+            readonly id: string;
+            readonly request: string;
+        }[] | undefined;
         readonly writes: readonly {
             readonly path: string;
             readonly value: string;
@@ -29,6 +33,10 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_ModelProps, {},
             readonly target: string;
             readonly operation: string;
         }[] | undefined;
+        readonly requests?: readonly {
+            readonly id: string;
+            readonly request: string;
+        }[] | undefined;
         readonly writes: readonly {
             readonly path: string;
             readonly value: string;

package/dist/runtime/components/actions/buttons/2026-06-25/com.shwfed.actions.button.state.write/config.vue

@@ -8,6 +8,7 @@ import { Markdown } from "../../../../ui/markdown";
 import { InputGroupButton } from "../../../../ui/input-group";
 import { getStructFieldDescription, getStructFieldTitle } from "../../../schema";
 import TriggersField from "../../../components/triggers-field.vue";
+import TriggerRowScope from "../../../components/trigger-row-scope.vue";
 import { schema } from "./schema";
 defineOptions({ name: "ShwfedStateWriteActionConfig" });
 const value = defineModel({ type: null, ...{ required: true } });
@@ -16,9 +17,33 @@ const actionSchema = schema(() => {
 const fieldTitle = (f) => getStructFieldTitle(actionSchema, f) ?? f;
 const fieldDescription = (f) => getStructFieldDescription(actionSchema, f);
 const writes = computed(() => value.value.writes ?? []);
+const requests = computed(() => value.value.requests ?? []);
+const roster = computed(
+  () => requests.value.map((r, i) => ({
+    id: r.id,
+    label: `\u7B2C ${i + 1} \u6B65`,
+    valid: true,
+    description: "HTTP \u54CD\u5E94"
+  }))
+);
 function patchWrites(next) {
   value.value = { ...value.value, writes: next };
 }
+function patchRequests(next) {
+  const draft = { ...value.value };
+  if (next.length === 0) Reflect.deleteProperty(draft, "requests");
+  else draft.requests = next;
+  value.value = draft;
+}
+function updateRequestRow(index, patch) {
+  patchRequests(requests.value.map((r, i) => i === index ? { ...r, ...patch } : r));
+}
+function addRequestRow() {
+  patchRequests([...requests.value, { id: crypto.randomUUID(), request: "" }]);
+}
+function removeRequestRow(index) {
+  patchRequests(requests.value.filter((_, i) => i !== index));
+}
 function updateRow(index, patch) {
   patchWrites(writes.value.map((w, i) => i === index ? { ...w, ...patch } : w));
 }
@@ -41,40 +66,37 @@ function updateTriggers(next) {
     <Field orientation="vertical">
       <FieldLabel class="text-xs text-zinc-500">
         <template
-          v-if="fieldDescription('writes')"
+          v-if="fieldDescription('requests')"
           #tooltip
         >
           <Markdown
-            :source="fieldDescription('writes')"
+            :source="fieldDescription('requests')"
             block
             class="prose prose-sm prose-zinc"
           />
         </template>
-        {{ fieldTitle("writes") }}
+        {{ fieldTitle("requests") }}
       </FieldLabel>
 
       <div class="flex flex-col gap-3">
-        <!-- One write item, on a single line: a monofont binding path notched
-             into the editor's `leading` slot, the value expression in the
-             editor itself (its own `{x}` badge), and a destructive delete in
-             the `trailing` slot. Reuses the ExpressionEditor's own InputGroup. -->
+        <!-- One「写入前」request per line: a static「第 N 步」marker notched into
+             the editor's `leading` slot (its response is referenced positionally
+             as `steps["<id>"]`), the request expression in the editor, and a
+             destructive delete in the `trailing` slot. Outside `TriggerRowScope`
+             so the request expressions keep the base scope (no `steps`). -->
         <ExpressionEditor
-          v-for="(row, index) in writes"
-          :key="index"
-          :model-value="row.value"
-          placeholder="值，如 selected[?0].?exchangeRate"
-          @update:model-value="(v) => updateRow(index, { value: v })"
+          v-for="(row, index) in requests"
+          :key="row.id"
+          :model-value="row.request"
+          result-type="HttpRequest"
+          placeholder="请求，如 http.get('/api/rate')"
+          @update:model-value="(v) => updateRequestRow(index, { request: v })"
         >
           <template #leading>
-            <input
-              type="text"
-              data-slot="state-write-path"
-              :value="row.path"
-              placeholder="路径"
-              class="w-44 min-w-0 border-r border-zinc-200 bg-transparent pr-3 font-mono text-sm text-zinc-700 outline-none placeholder:text-zinc-300"
-              :aria-label="`\u5199\u5165\u8DEF\u5F84 ${index + 1}`"
-              @input="updateRow(index, { path: $event.target.value })"
-            >
+            <span
+              data-slot="state-write-request-step"
+              class="w-16 shrink-0 border-r border-zinc-200 pr-3 font-mono text-xs whitespace-nowrap text-zinc-500 select-none"
+            >第 {{ index + 1 }} 步</span>
           </template>
           <template #trailing>
             <InputGroupButton
@@ -84,8 +106,8 @@ function updateTriggers(next) {
             >
               <button
                 type="button"
-                :aria-label="`\u79FB\u9664\u5199\u5165\u9879 ${index + 1}`"
-                @click="removeRow(index)"
+                :aria-label="`\u79FB\u9664\u8BF7\u6C42 ${index + 1}`"
+                @click="removeRequestRow(index)"
               >
                 <Icon icon="fluent:delete-20-regular" />
               </button>
@@ -96,14 +118,85 @@ function updateTriggers(next) {
         <Button
           type="button"
           class="justify-center"
-          @click="addRow"
+          @click="addRequestRow"
         >
           <Icon icon="fluent:add-20-regular" />
-          <span>添加写入项</span>
+          <span>添加请求</span>
         </Button>
       </div>
     </Field>
 
+    <Field orientation="vertical">
+      <FieldLabel class="text-xs text-zinc-500">
+        <template
+          v-if="fieldDescription('writes')"
+          #tooltip
+        >
+          <Markdown
+            :source="fieldDescription('writes')"
+            block
+            class="prose prose-sm prose-zinc"
+          />
+        </template>
+        {{ fieldTitle("writes") }}
+      </FieldLabel>
+
+      <!-- Advertise the「写入前」requests as the step roster to the value
+           editors only: they get the「第 N 步」picker chips + `steps` inline
+           validation, while the request editors above keep the base scope. -->
+      <TriggerRowScope :roster="roster">
+        <div class="flex flex-col gap-3">
+          <!-- One write item, on a single line: a monofont binding path notched
+               into the editor's `leading` slot, the value expression in the
+               editor itself (its own `{x}` badge), and a destructive delete in
+               the `trailing` slot. Reuses the ExpressionEditor's own InputGroup. -->
+          <ExpressionEditor
+            v-for="(row, index) in writes"
+            :key="index"
+            :model-value="row.value"
+            placeholder="值，如 selected[?0].?exchangeRate"
+            @update:model-value="(v) => updateRow(index, { value: v })"
+          >
+            <template #leading>
+              <input
+                type="text"
+                data-slot="state-write-path"
+                :value="row.path"
+                placeholder="路径"
+                class="w-44 min-w-0 border-r border-zinc-200 bg-transparent pr-3 font-mono text-sm text-zinc-700 outline-none placeholder:text-zinc-300"
+                :aria-label="`\u5199\u5165\u8DEF\u5F84 ${index + 1}`"
+                @input="updateRow(index, { path: $event.target.value })"
+              >
+            </template>
+            <template #trailing>
+              <InputGroupButton
+                variant="destructive"
+                size="icon-xs"
+                as-child
+              >
+                <button
+                  type="button"
+                  :aria-label="`\u79FB\u9664\u5199\u5165\u9879 ${index + 1}`"
+                  @click="removeRow(index)"
+                >
+                  <Icon icon="fluent:delete-20-regular" />
+                </button>
+              </InputGroupButton>
+            </template>
+          </ExpressionEditor>
+
+          <Button
+            type="button"
+            class="justify-center"
+            @click="addRow"
+          >
+            <Icon icon="fluent:add-20-regular" />
+            <span>添加写入项</span>
+          </Button>
+        </div>
+      </TriggerRowScope>
+    </Field>
+
     <Field orientation="vertical">
       <FieldLabel class="text-xs text-zinc-500">
         <template

package/dist/runtime/components/actions/buttons/2026-06-25/com.shwfed.actions.button.state.write/config.vue.d.ts

@@ -13,6 +13,10 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_ModelProps, {},
             readonly target: string;
             readonly operation: string;
         }[] | undefined;
+        readonly requests?: readonly {
+            readonly id: string;
+            readonly request: string;
+        }[] | undefined;
         readonly writes: readonly {
             readonly path: string;
             readonly value: string;
@@ -29,6 +33,10 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_ModelProps, {},
             readonly target: string;
             readonly operation: string;
         }[] | undefined;
+        readonly requests?: readonly {
+            readonly id: string;
+            readonly request: string;
+        }[] | undefined;
         readonly writes: readonly {
             readonly path: string;
             readonly value: string;

package/dist/runtime/components/actions/buttons/2026-06-25/com.shwfed.actions.button.state.write/runtime.vue

@@ -1,9 +1,11 @@
 <script setup>
-import { Effect } from "effect";
+import { Effect, Option } from "effect";
+import { Fetch } from "fx-fetch";
 import { createDefu } from "defu";
 import { cel as _rawCel } from "../../../../../utils/cel";
 import { celBindings, injectCELContext } from "../../../../../utils/cel-context";
 import { dispatchTriggers, useEventChannel } from "../../../../../share/event-bus";
+import { asRequest } from "../../../../../share/request";
 import { useFormState } from "../../../../form/utils/state";
 import ShwfedActionDefinition from "../../../components/definition.vue";
 defineOptions({ name: "ShwfedStateWriteActionRuntime" });
@@ -31,27 +33,52 @@ function mergeAtPath(current, next) {
   }
   return next;
 }
-const effect = Effect.suspend(
-  () => Effect.flatMap(
-    // Evaluate every row's `value` in list order. A row with a blank `path` is
-    // skipped (a half-authored row writes nowhere) but its value is never
-    // evaluated — `Effect.forEach` keeps the click sequential and short-circuits
-    // on the first failing expression, matching the old map-eval-then-write.
-    Effect.forEach(
-      props.config.writes ?? [],
-      (write) => {
-        const path = write.path?.trim() ?? "";
-        if (path.length === 0) return Effect.void;
-        return Effect.map($cel(write.value), (result) => {
-          const merged = mergeAtPath(formState.getAt(path), result);
-          formState.setAt(path, merged);
-        });
-      },
-      { discard: true }
+const effect = Effect.suspend(() => {
+  const steps = {};
+  return Effect.forEach(
+    // 写入前: issue each request in list order against the base scope (no
+    // `steps` — requests can't reference each other). `asRequest` maps the
+    // evaluated value to `Some(builder)` / `None` (author opted out → skip the
+    // fetch, leaving `steps["<id>"]` unset). A failed `.json()` short-circuits
+    // the whole click before any write runs — the effect fails and the action
+    // runner absorbs it, exactly as a failing `value` expression does.
+    props.config.requests ?? [],
+    (request) => Effect.flatMap($cel(request.request), (evaluated) => {
+      const builder = asRequest(evaluated);
+      if (Option.isNone(builder)) return Effect.void;
+      return Effect.map(builder.value.json(), (json) => {
+        steps[request.id] = json;
+      });
+    }),
+    { discard: true }
+  ).pipe(
+    Effect.flatMap(
+      () => (
+        // Evaluate every row's `value` in list order. A row with a blank `path` is
+        // skipped (a half-authored row writes nowhere) but its value is never
+        // evaluated — `Effect.forEach` keeps the click sequential and short-circuits
+        // on the first failing expression, matching the old map-eval-then-write.
+        Effect.forEach(
+          props.config.writes ?? [],
+          (write) => {
+            const path = write.path?.trim() ?? "";
+            if (path.length === 0) return Effect.void;
+            return Effect.map($cel(write.value, { steps }), (result) => {
+              const merged = mergeAtPath(formState.getAt(path), result);
+              formState.setAt(path, merged);
+            });
+          },
+          { discard: true }
+        )
+      )
     ),
-    () => dispatchTriggers(channel, props.config.onSuccess, $cel)
-  )
-);
+    Effect.flatMap(() => dispatchTriggers(channel, props.config.onSuccess, $cel)),
+    // The request builders need a `Fetch` layer; `ShwfedActionDefinition` runs
+    // the effect with no requirements channel, so provide it here — same layer
+    // the request op/button use.
+    Effect.provide(Fetch.layer)
+  );
+});
 </script>
 
 <template>

package/dist/runtime/components/actions/buttons/2026-06-25/com.shwfed.actions.button.state.write/schema.d.ts

@@ -9,6 +9,10 @@ export declare const metadata: {
 export declare function schema(configure: (env: Environment) => void): Schema.Struct<{
     type: Schema.Literal<["com.shwfed.actions.button.state.write"]>;
     compatibilityDate: Schema.Literal<["2026-06-25"]>;
+    requests: Schema.optional<Schema.Array$<Schema.Struct<{
+        id: Schema.refine<string, typeof Schema.String>;
+        request: Schema.Schema<string, string, never>;
+    }>>>;
     writes: Schema.Array$<Schema.Struct<{
         path: Schema.SchemaClass<string, string, never>;
         value: Schema.Schema<string, string, never>;
@@ -23,3 +27,4 @@ export declare function schema(configure: (env: Environment) => void): Schema.St
 }>;
 export type Value = Schema.Schema.Type<ReturnType<typeof schema>>;
 export type WriteValue = Value['writes'][number];
+export type RequestValue = NonNullable<Value['requests']>[number];

package/dist/runtime/components/actions/buttons/2026-06-25/com.shwfed.actions.button.state.write/schema.js

@@ -2,6 +2,7 @@ import { Schema } from "effect";
 import { Expression } from "../../../../../share/expression.js";
 import { Triggers } from "../../../../../share/event-bus.js";
 import { md } from "../../../../../share/markdown.js";
+import { registerStepsVariableIfAbsent } from "../../../../operations/utils/step-vars.js";
 export const type = "com.shwfed.actions.button.state.write";
 export const compatibilityDate = "2026-06-25";
 export const metadata = {
@@ -9,19 +10,41 @@ export const metadata = {
   icon: "fluent:document-edit-20-regular"
 };
 export function schema(configure) {
+  const withSteps = (env) => {
+    configure(env);
+    registerStepsVariableIfAbsent(env);
+  };
   const Write = Schema.Struct({
     path: Schema.String.annotations({
       title: "\u8DEF\u5F84",
       description: "\u5199\u5165\u7684\u7ED1\u5B9A\u8DEF\u5F84\uFF0C\u5982 `dataJson.cus_currency`"
     }),
-    value: Expression({ configure }).annotations({
+    value: Expression({ configure: withSteps }).annotations({
       title: "\u503C",
       description: "\u70B9\u51FB\u540E\u6C42\u503C\uFF0C\u7ED3\u679C\u5199\u5165\u8BE5\u8DEF\u5F84"
     })
   });
+  const Request = Schema.Struct({
+    id: Schema.UUID.annotations({
+      title: "ID",
+      description: '\u8BF7\u6C42\u6807\u8BC6\uFF0C\u5199\u5165\u503C\u7ECF `steps["<id>"]` \u5F15\u7528'
+    }),
+    request: Expression({ configure, resultType: "HttpRequest" }).annotations({
+      title: "\u8BF7\u6C42",
+      description: "\u6784\u9020\u4E00\u4E2A\u8BF7\u6C42\uFF0C\u670D\u52A1\u5668\u987B\u8FD4\u56DE JSON \u54CD\u5E94\uFF1B\u7ED3\u679C\u6309\u300C\u7B2C N \u6B65\u300D\u5B58\u5165 `steps`"
+    })
+  });
   return Schema.Struct({
     type: Schema.Literal(type),
     compatibilityDate: Schema.Literal(compatibilityDate),
+    requests: Schema.optional(Schema.Array(Request).annotations({
+      title: "\u5199\u5165\u524D",
+      description: md`
+        点击后先按列表顺序发起这些请求，其响应可在「写入值」中经
+        \`steps["<第 N 步>"]\` 引用。任一请求失败（网络错误 / 非 2xx / 不可解析）
+        则中止，不进行任何写入。
+      `
+    })),
     writes: Schema.Array(Write).annotations({
       title: "\u5199\u5165\u503C",
       description: md`

package/dist/runtime/components/config/blocks/2026-05-06/com.shwfed.block.table/config.d.vue.ts

@@ -34,6 +34,40 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_PublicProps, {},
                     readonly message: string;
                 }[]] | undefined;
             }[];
+            readonly query?: {
+                readonly style?: string | undefined;
+                readonly id?: string | undefined;
+                readonly initial?: {
+                    readonly data: string;
+                    readonly request?: string | undefined;
+                } | undefined;
+                readonly displayName?: string | undefined;
+                readonly kind: "shwfed.component.form";
+                readonly fields: readonly any[];
+                readonly layouts: readonly {
+                    readonly name: string;
+                    readonly layout: {
+                        readonly style?: string | undefined;
+                        readonly columns: number;
+                        readonly gap?: number | undefined;
+                        readonly rows?: number | undefined;
+                        readonly placements: {
+                            readonly [x: string]: {
+                                readonly area: readonly [readonly [number, number], readonly [number, number]];
+                                readonly v?: "stretch" | "center" | "end" | "start" | undefined;
+                                readonly h?: "stretch" | "center" | "end" | "start" | undefined;
+                            };
+                        };
+                    };
+                    readonly media?: string | undefined;
+                }[];
+                readonly readonly?: string | undefined;
+            } | undefined;
+            readonly dataSource?: {
+                readonly data: string;
+                readonly total?: string | undefined;
+                readonly request?: string | undefined;
+            } | undefined;
             readonly actions?: {
                 readonly size: "default" | "sm" | "xs";
                 readonly style?: string | undefined;
@@ -101,40 +135,6 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_PublicProps, {},
                     readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
                 }[];
             } | undefined;
-            readonly query?: {
-                readonly style?: string | undefined;
-                readonly id?: string | undefined;
-                readonly initial?: {
-                    readonly data: string;
-                    readonly request?: string | undefined;
-                } | undefined;
-                readonly displayName?: string | undefined;
-                readonly kind: "shwfed.component.form";
-                readonly fields: readonly any[];
-                readonly layouts: readonly {
-                    readonly name: string;
-                    readonly layout: {
-                        readonly style?: string | undefined;
-                        readonly columns: number;
-                        readonly gap?: number | undefined;
-                        readonly rows?: number | undefined;
-                        readonly placements: {
-                            readonly [x: string]: {
-                                readonly area: readonly [readonly [number, number], readonly [number, number]];
-                                readonly v?: "stretch" | "center" | "end" | "start" | undefined;
-                                readonly h?: "stretch" | "center" | "end" | "start" | undefined;
-                            };
-                        };
-                    };
-                    readonly media?: string | undefined;
-                }[];
-                readonly readonly?: string | undefined;
-            } | undefined;
-            readonly dataSource?: {
-                readonly data: string;
-                readonly total?: string | undefined;
-                readonly request?: string | undefined;
-            } | undefined;
             readonly bottomActions?: {
                 readonly size: "default" | "sm" | "xs";
                 readonly style?: string | undefined;
@@ -282,6 +282,40 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_PublicProps, {},
                     readonly message: string;
                 }[]] | undefined;
             }[];
+            readonly query?: {
+                readonly style?: string | undefined;
+                readonly id?: string | undefined;
+                readonly initial?: {
+                    readonly data: string;
+                    readonly request?: string | undefined;
+                } | undefined;
+                readonly displayName?: string | undefined;
+                readonly kind: "shwfed.component.form";
+                readonly fields: readonly any[];
+                readonly layouts: readonly {
+                    readonly name: string;
+                    readonly layout: {
+                        readonly style?: string | undefined;
+                        readonly columns: number;
+                        readonly gap?: number | undefined;
+                        readonly rows?: number | undefined;
+                        readonly placements: {
+                            readonly [x: string]: {
+                                readonly area: readonly [readonly [number, number], readonly [number, number]];
+                                readonly v?: "stretch" | "center" | "end" | "start" | undefined;
+                                readonly h?: "stretch" | "center" | "end" | "start" | undefined;
+                            };
+                        };
+                    };
+                    readonly media?: string | undefined;
+                }[];
+                readonly readonly?: string | undefined;
+            } | undefined;
+            readonly dataSource?: {
+                readonly data: string;
+                readonly total?: string | undefined;
+                readonly request?: string | undefined;
+            } | undefined;
             readonly actions?: {
                 readonly size: "default" | "sm" | "xs";
                 readonly style?: string | undefined;
@@ -349,40 +383,6 @@ declare const __VLS_export: import("vue").DefineComponent<__VLS_PublicProps, {},
                     readonly variant?: "default" | "link" | "destructive" | "primary" | "ghost" | undefined;
                 }[];
             } | undefined;
-            readonly query?: {
-                readonly style?: string | undefined;
-                readonly id?: string | undefined;
-                readonly initial?: {
-                    readonly data: string;
-                    readonly request?: string | undefined;
-                } | undefined;
-                readonly displayName?: string | undefined;
-                readonly kind: "shwfed.component.form";
-                readonly fields: readonly any[];
-                readonly layouts: readonly {
-                    readonly name: string;
-                    readonly layout: {
-                        readonly style?: string | undefined;
-                        readonly columns: number;
-                        readonly gap?: number | undefined;
-                        readonly rows?: number | undefined;
-                        readonly placements: {
-                            readonly [x: string]: {
-                                readonly area: readonly [readonly [number, number], readonly [number, number]];
-                                readonly v?: "stretch" | "center" | "end" | "start" | undefined;
-                                readonly h?: "stretch" | "center" | "end" | "start" | undefined;
-                            };
-                        };
-                    };
-                    readonly media?: string | undefined;
-                }[];
-                readonly readonly?: string | undefined;
-            } | undefined;
-            readonly dataSource?: {
-                readonly data: string;
-                readonly total?: string | undefined;
-                readonly request?: string | undefined;
-            } | undefined;
             readonly bottomActions?: {
                 readonly size: "default" | "sm" | "xs";
                 readonly style?: string | undefined;