@shwfed/config 2.7.7 → 2.8.0

package/dist/runtime/components/table/config.vue

@@ -914,6 +914,16 @@ function setPaginationEnabled(enabled) {
   const { pagination: _drop, ...rest } = cur;
   config.value = rest;
 }
+function setPersistQueryEnabled(enabled) {
+  if (enabled) {
+    writeGeneralPatch({ persistQuery: true });
+    return;
+  }
+  const cur = config.value;
+  if (!cur || cur.persistQuery === void 0) return;
+  const { persistQuery: _drop, ...rest } = cur;
+  config.value = rest;
+}
 function setPageSize(value) {
   const cur = readGeneral();
   if (!cur.pagination) return;
@@ -1249,12 +1259,6 @@ const tableQueryValue = computed({
                     @update:model-value="(v) => updateGeneralOptionalString('rowKey', v)"
                   />
                 </RowKeyCELContext>
-                <p
-                  v-if="getError('rowKey')"
-                  class="text-xs text-red-500"
-                >
-                  {{ getError("rowKey") }}
-                </p>
               </Field>
 
               <!-- Host slot inside the general grid: a wrapping editor (e.g. the
@@ -1297,12 +1301,6 @@ const tableQueryValue = computed({
                       @update:model-value="(v) => updateDataSourceOptional('request', v)"
                     />
                   </RequestCELContext>
-                  <p
-                    v-if="getError('dataSource.request')"
-                    class="text-xs text-red-500"
-                  >
-                    {{ getError("dataSource.request") }}
-                  </p>
                 </Field>
 
                 <div class="grid grid-cols-2 gap-x-6 gap-y-4">
@@ -1328,12 +1326,6 @@ const tableQueryValue = computed({
                         @update:model-value="(v) => setDataSourceField('data', v)"
                       />
                     </JsonCELContext>
-                    <p
-                      v-if="getError('dataSource.data')"
-                      class="text-xs text-red-500"
-                    >
-                      {{ getError("dataSource.data") }}
-                    </p>
                   </Field>
                   <Field orientation="vertical">
                     <FieldLabel class="text-xs text-zinc-500">
@@ -1357,12 +1349,6 @@ const tableQueryValue = computed({
                         @update:model-value="(v) => updateDataSourceOptional('total', v)"
                       />
                     </JsonCELContext>
-                    <p
-                      v-if="getError('dataSource.total')"
-                      class="text-xs text-red-500"
-                    >
-                      {{ getError("dataSource.total") }}
-                    </p>
                   </Field>
                 </div>
               </div>
@@ -1486,6 +1472,26 @@ const tableQueryValue = computed({
 
             <Separator />
 
+            <div class="flex items-center gap-2">
+              <h3 class="text-xs font-medium text-zinc-500">
+                {{ generalFieldTitle("persistQuery") }}
+              </h3>
+              <Switch
+                size="sm"
+                :model-value="editingGeneralConfig.persistQuery === true"
+                aria-label="搜索条件持久化"
+                @update:model-value="setPersistQueryEnabled"
+              />
+            </div>
+            <p
+              v-if="generalFieldDescription('persistQuery')"
+              class="text-xs text-zinc-400"
+            >
+              {{ generalFieldDescription("persistQuery") }}
+            </p>
+
+            <Separator />
+
             <h3 class="text-xs font-medium text-zinc-500">
               样式
             </h3>
@@ -1515,12 +1521,6 @@ const tableQueryValue = computed({
                     @update:model-value="(v) => updateGeneralOptionalString('cellStyle', v)"
                   />
                 </CellStyleCELContext>
-                <p
-                  v-if="getError('cellStyle')"
-                  class="text-xs text-red-500"
-                >
-                  {{ getError("cellStyle") }}
-                </p>
               </Field>
 
               <Field orientation="vertical">
@@ -1543,12 +1543,6 @@ const tableQueryValue = computed({
                   class="min-h-20 font-mono text-xs"
                   @update:model-value="(v) => updateGeneralOptionalString('style', String(v))"
                 />
-                <p
-                  v-if="getError('style')"
-                  class="text-xs text-red-500"
-                >
-                  {{ getError("style") }}
-                </p>
               </Field>
             </div>
           </div>

package/dist/runtime/components/table/index.d.vue.ts

@@ -31,6 +31,7 @@ declare const __VLS_export: import("vue").DefineComponent<{
         cellStyle?: string;
         style?: string;
         pagination?: import("effect/Schema").Schema.Type<typeof import("./schema.js").Pagination>;
+        persistQuery?: boolean;
         initialState?: import("effect/Schema").Schema.Type<import("effect/Schema").Struct<{
             columnVisibility: import("effect/Schema").optional<import("effect/Schema").Record$<typeof import("effect/Schema").String, typeof import("effect/Schema").Boolean>>;
             columnOrder: import("effect/Schema").optional<import("effect/Schema").Array$<typeof import("effect/Schema").String>>;
@@ -76,6 +77,7 @@ declare const __VLS_export: import("vue").DefineComponent<{
         cellStyle?: string;
         style?: string;
         pagination?: import("effect/Schema").Schema.Type<typeof import("./schema.js").Pagination>;
+        persistQuery?: boolean;
         initialState?: import("effect/Schema").Schema.Type<import("effect/Schema").Struct<{
             columnVisibility: import("effect/Schema").optional<import("effect/Schema").Record$<typeof import("effect/Schema").String, typeof import("effect/Schema").Boolean>>;
             columnOrder: import("effect/Schema").optional<import("effect/Schema").Array$<typeof import("effect/Schema").String>>;

package/dist/runtime/components/table/index.vue

@@ -30,6 +30,7 @@ import { evaluateInitial } from "../form/utils/initial";
 import { provideTableInstanceId } from "./utils/instance";
 import { provideSharedFetchLayer } from "./utils/shared-fetch";
 import { provideEventTarget } from "../../share/event-bus";
+import { usePersistedQuery } from "../../share/use-persisted-query";
 import { findColumn } from "./utils/resolve";
 import { interpolateMarkdown } from "./utils/runtime";
 import { carrySymbolId, createRowKeyResolver } from "./utils/row-key";
@@ -42,6 +43,11 @@ const rowData = defineModel("rows", { type: Array, ...{ default: () => [] } });
 const serverTotal = ref(void 0);
 const isFetching = ref(false);
 const queryState = ref({});
+const persistedQuery = usePersistedQuery(
+  config.value?.id,
+  queryState,
+  () => config.value?.persistQuery === true
+);
 const { t, locale } = useI18n({
   inheritLocale: true,
   messages: {
@@ -379,6 +385,7 @@ async function fetchDataSource() {
   }
 }
 async function resetQuery() {
+  persistedQuery.clear();
   const initial = config.value?.query?.initial;
   if (!initial) {
     queryState.value = {};
@@ -435,6 +442,7 @@ provideEventTarget(tableInstanceId, {
 const queryRef = ref(null);
 onMounted(async () => {
   await queryRef.value?.seeded;
+  persistedQuery.restore();
   await fetchDataSource();
 });
 watch(

package/dist/runtime/components/table/index.vue.d.ts

@@ -31,6 +31,7 @@ declare const __VLS_export: import("vue").DefineComponent<{
         cellStyle?: string;
         style?: string;
         pagination?: import("effect/Schema").Schema.Type<typeof import("./schema.js").Pagination>;
+        persistQuery?: boolean;
         initialState?: import("effect/Schema").Schema.Type<import("effect/Schema").Struct<{
             columnVisibility: import("effect/Schema").optional<import("effect/Schema").Record$<typeof import("effect/Schema").String, typeof import("effect/Schema").Boolean>>;
             columnOrder: import("effect/Schema").optional<import("effect/Schema").Array$<typeof import("effect/Schema").String>>;
@@ -76,6 +77,7 @@ declare const __VLS_export: import("vue").DefineComponent<{
         cellStyle?: string;
         style?: string;
         pagination?: import("effect/Schema").Schema.Type<typeof import("./schema.js").Pagination>;
+        persistQuery?: boolean;
         initialState?: import("effect/Schema").Schema.Type<import("effect/Schema").Struct<{
             columnVisibility: import("effect/Schema").optional<import("effect/Schema").Record$<typeof import("effect/Schema").String, typeof import("effect/Schema").Boolean>>;
             columnOrder: import("effect/Schema").optional<import("effect/Schema").Array$<typeof import("effect/Schema").String>>;

package/dist/runtime/components/table/schema.d.ts

@@ -255,6 +255,7 @@ export declare function TableConfig(configure: (env: Environment) => void): Sche
         readonly pageSizes?: readonly number[] | undefined;
         readonly pageIndex?: number | undefined;
     } | undefined;
+    readonly persistQuery?: boolean | undefined;
     readonly initialState?: {
         readonly expanded?: boolean | {
             readonly [x: string]: boolean;
@@ -536,6 +537,7 @@ export declare function TableConfig(configure: (env: Environment) => void): Sche
             message: Schema.SchemaClass<string, string, never>;
         }>]>>;
     }>>;
+    persistQuery: Schema.optional<Schema.SchemaClass<boolean, boolean, never>>;
     initialState: Schema.optional<Schema.Struct<{
         columnVisibility: Schema.optional<Schema.Record$<typeof Schema.String, typeof Schema.Boolean>>;
         columnOrder: Schema.optional<Schema.Array$<typeof Schema.String>>;
@@ -703,6 +705,7 @@ export declare function createTableConfig(body: Omit<Schema.Schema.Type<ReturnTy
         readonly pageSizes?: readonly number[] | undefined;
         readonly pageIndex?: number | undefined;
     } | undefined;
+    persistQuery?: boolean | undefined;
     initialState?: {
         readonly expanded?: boolean | {
             readonly [x: string]: boolean;
@@ -761,6 +764,7 @@ export type TableConfigValue = Readonly<{
     cellStyle?: string;
     style?: string;
     pagination?: Schema.Schema.Type<typeof Pagination>;
+    persistQuery?: boolean;
     initialState?: Schema.Schema.Type<typeof InitialState>;
 }>;
 export type PaginationValue = Schema.Schema.Type<typeof Pagination>;

package/dist/runtime/components/table/schema.js

@@ -328,6 +328,10 @@ export function TableConfig(configure) {
     pagination: Schema.optional(Pagination).annotations({
       title: "\u5206\u9875"
     }),
+    persistQuery: Schema.optional(Schema.Boolean.annotations({
+      title: "\u641C\u7D22\u6761\u4EF6\u6301\u4E45\u5316",
+      description: "\u5F00\u542F\u540E\uFF0C\u641C\u7D22\u6761\u4EF6\u8868\u5355\u7684\u5F53\u524D\u503C\u4F1A\u5199\u5165\u6D4F\u89C8\u5668\u4F1A\u8BDD\u5B58\u50A8\uFF08sessionStorage\uFF09\uFF0C\u5237\u65B0\u9875\u9762\u540E\u81EA\u52A8\u6062\u590D\uFF0C\u76F4\u5230\u5173\u95ED\u6807\u7B7E\u9875\u6216\u79BB\u5F00\u7AD9\u70B9\u3002\u9700\u8981\u8868\u683C\u5DF2\u914D\u7F6E ID\u3002"
+    })),
     initialState: Schema.optional(InitialState)
   }).pipe(Schema.filter((cfg) => {
     if (cfg.dataSource?.total !== void 0 && cfg.pagination === void 0) {

package/dist/runtime/components/ui/expression-editor/ExpressionEditor.d.vue.ts

@@ -12,12 +12,13 @@ type __VLS_Props = {
     placeholder?: string;
     resultType?: string | string[];
     extraVars?: Record<string, VarSpec>;
+    unlistedVarsAreDyn?: boolean;
 };
-declare var __VLS_14: {}, __VLS_130: {};
+declare var __VLS_13: {}, __VLS_129: {};
 type __VLS_Slots = {} & {
-    leading?: (props: typeof __VLS_14) => any;
+    leading?: (props: typeof __VLS_13) => any;
 } & {
-    trailing?: (props: typeof __VLS_130) => any;
+    trailing?: (props: typeof __VLS_129) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
     "update:modelValue": (payload: string) => any;

package/dist/runtime/components/ui/expression-editor/ExpressionEditor.vue

@@ -1,6 +1,7 @@
 <script setup>
 import { Icon } from "@iconify/vue";
 import { computed, ref, useSlots, useTemplateRef, watch } from "vue";
+import { buildCheckEnvironment, evaluateExpression } from "../../../share/expression";
 import { injectCELContext, useScopeAncestry } from "../../../utils/cel-context";
 import { Markdown } from "../markdown";
 import CodeMirrorInput from "./CodeMirrorInput.vue";
@@ -17,7 +18,8 @@ const props = defineProps({
   multiline: { type: Boolean, required: false },
   placeholder: { type: String, required: false },
   resultType: { type: [String, Array], required: false },
-  extraVars: { type: Object, required: false }
+  extraVars: { type: Object, required: false },
+  unlistedVarsAreDyn: { type: Boolean, required: false }
 });
 const emits = defineEmits(["update:modelValue"]);
 const celContext = injectCELContext();
@@ -26,6 +28,20 @@ const varEntries = computed(() => buildVarEntries(celContext, props.extraVars));
 const scopeEntries = computed(() => buildScopeEntries(scopeAncestry.value.slice(1)));
 const scopeLookup = computed(() => buildScopeLookup(scopeAncestry.value));
 const hasVars = computed(() => varEntries.value.length > 0 || scopeEntries.value.length > 0);
+const checkEnvironment = computed(() => {
+  const vars = /* @__PURE__ */ new Map();
+  for (const [name, entry] of Object.entries(celContext)) vars.set(name, entry.type);
+  for (const [name, spec] of Object.entries(props.extraVars ?? {})) vars.set(name, spec.type);
+  return buildCheckEnvironment(
+    [...vars].map(([name, type]) => ({ name, type })),
+    { unlistedVariablesAreDyn: props.unlistedVarsAreDyn }
+  );
+});
+const validationError = computed(() => {
+  const value = props.modelValue ?? props.defaultValue ?? "";
+  if (value.trim() === "") return null;
+  return evaluateExpression(checkEnvironment.value, value, props.resultType);
+});
 const open = ref(false);
 const entries = ref([]);
 const shownVars = computed(() => entries.value.filter((e) => e.group === "var"));
@@ -60,120 +76,128 @@ const addonAlign = computed(
 </script>
 
 <template>
-  <InputGroup>
-    <InputGroupAddon
-      v-if="$slots.leading"
-      align="inline-start"
-    >
-      <slot name="leading" />
-    </InputGroupAddon>
-    <CodeMirrorInput
-      ref="editor"
-      :model-value="props.modelValue"
-      :default-value="props.defaultValue"
-      :placeholder="props.placeholder"
-      :multiline="props.multiline"
-      :scope-lookup="scopeLookup"
-      :class="props.class"
-      @update:model-value="(v) => emits('update:modelValue', v)"
-    />
-    <InputGroupAddon
-      v-if="showAddon"
-      :align="addonAlign"
-      class="justify-end gap-1.5"
-    >
-      <Popover
-        v-if="hasVars"
-        v-model:open="open"
+  <div class="flex flex-col gap-1.5">
+    <InputGroup>
+      <InputGroupAddon
+        v-if="$slots.leading"
+        align="inline-start"
       >
-        <PopoverTrigger as-child>
-          <InputGroupButton
-            size="icon-xs"
-            aria-label="Inspect available variables"
-          >
-            <Icon icon="fluent:braces-variable-20-regular" />
-          </InputGroupButton>
-        </PopoverTrigger>
-        <PopoverContent
-          align="end"
-          :side-offset="6"
-          class="group/popover w-80 p-0 data-[side=top]:**:data-[slot=command-input-wrapper]:border-t data-[side=top]:**:data-[slot=command-input-wrapper]:border-b-0"
+        <slot name="leading" />
+      </InputGroupAddon>
+      <CodeMirrorInput
+        ref="editor"
+        :model-value="props.modelValue"
+        :default-value="props.defaultValue"
+        :placeholder="props.placeholder"
+        :multiline="props.multiline"
+        :scope-lookup="scopeLookup"
+        :class="props.class"
+        @update:model-value="(v) => emits('update:modelValue', v)"
+      />
+      <InputGroupAddon
+        v-if="showAddon"
+        :align="addonAlign"
+        class="justify-end gap-1.5"
+      >
+        <Popover
+          v-if="hasVars"
+          v-model:open="open"
         >
-          <Command class="rounded group-data-[side=top]/popover:flex-col-reverse">
-            <CommandInput placeholder="搜索可用变量" />
-            <CommandList class="max-h-48 overflow-y-auto">
-              <CommandEmpty>No variables.</CommandEmpty>
-              <CommandGroup>
-                <CommandItem
-                  v-for="entry in shownVars"
-                  :key="entry.id"
-                  :value="entry.display"
-                  class="cursor-pointer gap-2"
-                  @select="insertVariable(entry.insert)"
-                  @mouseenter="hoveredName = entry.id"
-                  @focus="hoveredName = entry.id"
+          <PopoverTrigger as-child>
+            <InputGroupButton
+              size="icon-xs"
+              aria-label="Inspect available variables"
+            >
+              <Icon icon="fluent:braces-variable-20-regular" />
+            </InputGroupButton>
+          </PopoverTrigger>
+          <PopoverContent
+            align="end"
+            :side-offset="6"
+            class="group/popover w-80 p-0 data-[side=top]:**:data-[slot=command-input-wrapper]:border-t data-[side=top]:**:data-[slot=command-input-wrapper]:border-b-0"
+          >
+            <Command class="rounded group-data-[side=top]/popover:flex-col-reverse">
+              <CommandInput placeholder="搜索可用变量" />
+              <CommandList class="max-h-48 overflow-y-auto">
+                <CommandEmpty>No variables.</CommandEmpty>
+                <CommandGroup>
+                  <CommandItem
+                    v-for="entry in shownVars"
+                    :key="entry.id"
+                    :value="entry.display"
+                    class="cursor-pointer gap-2"
+                    @select="insertVariable(entry.insert)"
+                    @mouseenter="hoveredName = entry.id"
+                    @focus="hoveredName = entry.id"
+                  >
+                    <Icon
+                      icon="fluent:braces-variable-20-regular"
+                      class="size-3.5 shrink-0 text-zinc-400"
+                    />
+                    <span class="font-mono text-xs text-zinc-800">{{ entry.display }}</span>
+                    <span class="flex-1 truncate text-xs text-zinc-500">{{ entry.label }}</span>
+                    <span class="rounded bg-purple-100 px-1.5 py-0.5 font-mono text-[10px] leading-none text-purple-700 select-none">
+                      {{ entry.type }}
+                    </span>
+                  </CommandItem>
+                </CommandGroup>
+                <CommandGroup
+                  v-if="shownScopes.length > 0"
+                  heading="跨层引用"
                 >
-                  <Icon
-                    icon="fluent:braces-variable-20-regular"
-                    class="size-3.5 shrink-0 text-zinc-400"
-                  />
-                  <span class="font-mono text-xs text-zinc-800">{{ entry.display }}</span>
-                  <span class="flex-1 truncate text-xs text-zinc-500">{{ entry.label }}</span>
-                  <span class="rounded bg-purple-100 px-1.5 py-0.5 font-mono text-[10px] leading-none text-purple-700 select-none">
-                    {{ entry.type }}
-                  </span>
-                </CommandItem>
-              </CommandGroup>
-              <CommandGroup
-                v-if="shownScopes.length > 0"
-                heading="跨层引用"
+                  <CommandItem
+                    v-for="entry in shownScopes"
+                    :key="entry.id"
+                    :value="`${entry.display} ${entry.id}`"
+                    class="cursor-pointer gap-2"
+                    @select="insertVariable(entry.insert)"
+                    @mouseenter="hoveredName = entry.id"
+                    @focus="hoveredName = entry.id"
+                  >
+                    <Icon
+                      icon="fluent:link-20-regular"
+                      class="size-3.5 shrink-0 text-zinc-400"
+                    />
+                    <span class="flex-1 truncate text-xs text-zinc-700">{{ entry.display }}</span>
+                    <span class="rounded bg-purple-100 px-1.5 py-0.5 font-mono text-[10px] leading-none text-purple-700 select-none">
+                      {{ entry.type }}
+                    </span>
+                  </CommandItem>
+                </CommandGroup>
+              </CommandList>
+              <div
+                v-if="hoveredEntry"
+                class="border-t border-zinc-200 px-3 py-2 group-data-[side=top]/popover:border-t-0 group-data-[side=top]/popover:border-b"
               >
-                <CommandItem
-                  v-for="entry in shownScopes"
-                  :key="entry.id"
-                  :value="`${entry.display} ${entry.id}`"
-                  class="cursor-pointer gap-2"
-                  @select="insertVariable(entry.insert)"
-                  @mouseenter="hoveredName = entry.id"
-                  @focus="hoveredName = entry.id"
-                >
-                  <Icon
-                    icon="fluent:link-20-regular"
-                    class="size-3.5 shrink-0 text-zinc-400"
-                  />
-                  <span class="flex-1 truncate text-xs text-zinc-700">{{ entry.display }}</span>
-                  <span class="rounded bg-purple-100 px-1.5 py-0.5 font-mono text-[10px] leading-none text-purple-700 select-none">
-                    {{ entry.type }}
+                <div class="flex items-center gap-2">
+                  <span class="text-xs font-medium text-zinc-700">{{ hoveredEntry.label }}</span>
+                  <span class="ml-auto shrink-0 rounded bg-purple-100 px-1.5 py-0.5 font-mono text-[10px] leading-none text-purple-700 select-none">
+                    {{ hoveredEntry.type }}
                   </span>
-                </CommandItem>
-              </CommandGroup>
-            </CommandList>
-            <div
-              v-if="hoveredEntry"
-              class="border-t border-zinc-200 px-3 py-2 group-data-[side=top]/popover:border-t-0 group-data-[side=top]/popover:border-b"
-            >
-              <div class="flex items-center gap-2">
-                <span class="text-xs font-medium text-zinc-700">{{ hoveredEntry.label }}</span>
-                <span class="ml-auto shrink-0 rounded bg-purple-100 px-1.5 py-0.5 font-mono text-[10px] leading-none text-purple-700 select-none">
-                  {{ hoveredEntry.type }}
-                </span>
+                </div>
+                <Markdown
+                  v-if="hoveredDescription"
+                  :source="hoveredDescription"
+                  class="prose prose-zinc prose-sm mt-1 text-xs"
+                />
               </div>
-              <Markdown
-                v-if="hoveredDescription"
-                :source="hoveredDescription"
-                class="prose prose-zinc prose-sm mt-1 text-xs"
-              />
-            </div>
-          </Command>
-        </PopoverContent>
-      </Popover>
-      <span
-        v-if="resultTypeLabel"
-        class="rounded bg-purple-100 px-1.5 py-0.5 font-mono text-[10px] leading-none text-purple-700 select-none"
-      >
-        {{ resultTypeLabel }}
-      </span>
-      <slot name="trailing" />
-    </InputGroupAddon>
-  </InputGroup>
+            </Command>
+          </PopoverContent>
+        </Popover>
+        <span
+          v-if="resultTypeLabel"
+          class="rounded bg-purple-100 px-1.5 py-0.5 font-mono text-[10px] leading-none text-purple-700 select-none"
+        >
+          {{ resultTypeLabel }}
+        </span>
+        <slot name="trailing" />
+      </InputGroupAddon>
+    </InputGroup>
+    <p
+      v-if="validationError"
+      class="text-xs text-red-500"
+    >
+      {{ validationError }}
+    </p>
+  </div>
 </template>

package/dist/runtime/components/ui/expression-editor/ExpressionEditor.vue.d.ts

@@ -12,12 +12,13 @@ type __VLS_Props = {
     placeholder?: string;
     resultType?: string | string[];
     extraVars?: Record<string, VarSpec>;
+    unlistedVarsAreDyn?: boolean;
 };
-declare var __VLS_14: {}, __VLS_130: {};
+declare var __VLS_13: {}, __VLS_129: {};
 type __VLS_Slots = {} & {
-    leading?: (props: typeof __VLS_14) => any;
+    leading?: (props: typeof __VLS_13) => any;
 } & {
-    trailing?: (props: typeof __VLS_130) => any;
+    trailing?: (props: typeof __VLS_129) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
     "update:modelValue": (payload: string) => any;

package/dist/runtime/share/expression.d.ts

@@ -15,6 +15,29 @@ export type ResultType = string | string[] | ((type: string) => boolean);
  * type-checker infers as `optional<HttpRequest>`.
  */
 export declare const HttpRequestResult: ResultType;
+/**
+ * Type-check `expression` against `env` and, if `resultType` is given, verify the
+ * inferred type satisfies it. Returns a Chinese error message, or `null` when the
+ * expression is valid. This is the single chokepoint both the schema validator
+ * (`Expression`'s filter) and the live `ExpressionEditor` call, so an inline
+ * verdict can never disagree with the save-time decode.
+ */
+export declare function evaluateExpression(env: Environment, expression: string, resultType?: ResultType): string | null;
+/**
+ * Build a checking `Environment` from a flat list of `{ name, type }` variable
+ * specs — the projection an `ExpressionEditor` already holds via its injected CEL
+ * context plus `extraVars`. Functions/operators come free from the cloned
+ * `globalRegistry`; only variables are host-scoped, so this is all the editor
+ * needs to reproduce the schema's validation env. `__scopes__` is registered
+ * canonically here (and skipped from `vars`) exactly as `Expression` does, so
+ * cross-layer addressing type-checks in the editor too.
+ */
+export declare function buildCheckEnvironment(vars: Iterable<{
+    name: string;
+    type: string;
+}>, options?: {
+    unlistedVariablesAreDyn?: boolean;
+}): Environment;
 export declare function Expression(options: {
     configure: (env: Environment) => void;
     resultType?: ResultType;

package/dist/runtime/share/expression.js

@@ -3,9 +3,17 @@ import { Environment } from "../vendor/cel-js/lib/index.js";
 import { CelError } from "../vendor/cel-js/lib/errors.js";
 import { Locale } from "./locale.js";
 export const HttpRequestResult = (t) => t === "HttpRequest" || t === "optional<HttpRequest>" || t === "optional<dyn>" || t === "dyn";
+function matchesScalarType(actual, expected) {
+  if (expected === "dyn" || actual === "dyn") return true;
+  if (actual === expected) return true;
+  if (actual.startsWith(`${expected}<`)) return true;
+  if (actual === `optional<${expected}>` || actual === "optional<dyn>") return true;
+  if (actual.startsWith(`optional<${expected}<`)) return true;
+  return false;
+}
 function matchesResultType(actual, expected) {
-  if (typeof expected === "string") return expected === "dyn" || actual === expected;
-  if (Array.isArray(expected)) return expected.includes("dyn") || expected.includes(actual);
+  if (typeof expected === "string") return matchesScalarType(actual, expected);
+  if (Array.isArray(expected)) return expected.some((e) => matchesScalarType(actual, e));
   return expected(actual);
 }
 function formatExpectedType(expected) {
@@ -19,6 +27,32 @@ function registerScopeAddressVar(env) {
     description: "\u6309 UUID \u5BFB\u5740\u88AB\u906E\u853D\u7684\u7956\u5148\u4F5C\u7528\u57DF"
   });
 }
+export function evaluateExpression(env, expression, resultType) {
+  const result = env.check(expression);
+  if (Either.isLeft(result)) {
+    const error = result.left;
+    const summary = error instanceof CelError ? error.summary : String(error);
+    return `\u8868\u8FBE\u5F0F\u65E0\u6548\uFF1A${summary}`;
+  }
+  if (resultType) {
+    const actualType = result.right;
+    if (!matchesResultType(actualType, resultType)) {
+      return `\u8868\u8FBE\u5F0F\u8FD4\u56DE\u7C7B\u578B\u4E0D\u5339\u914D\uFF0C\u671F\u671B ${formatExpectedType(resultType)}\uFF0C\u5B9E\u9645\u4E3A ${actualType}`;
+    }
+  }
+  return null;
+}
+export function buildCheckEnvironment(vars, options) {
+  const env = new Environment({
+    unlistedVariablesAreDyn: options?.unlistedVariablesAreDyn ?? false
+  });
+  registerScopeAddressVar(env);
+  for (const { name, type } of vars) {
+    if (name === "__scopes__") continue;
+    env.registerVariable(name, type);
+  }
+  return env;
+}
 function buildDescription(baseline, env, resultType) {
   const defs = env.getDefinitions();
   const baselineVarNames = new Set(baseline.variables.map((v) => v.name));
@@ -52,21 +86,7 @@ export function Expression(options) {
   const description = buildDescription(baseline, env, options.resultType);
   return Schema.String.pipe(
     Schema.filter(
-      (expression) => {
-        const result = env.check(expression);
-        if (Either.isLeft(result)) {
-          const error = result.left;
-          const summary = error instanceof CelError ? error.summary : String(error);
-          return `\u8868\u8FBE\u5F0F\u65E0\u6548\uFF1A${summary}`;
-        }
-        if (options.resultType) {
-          const actualType = result.right;
-          if (!matchesResultType(actualType, options.resultType)) {
-            return `\u8868\u8FBE\u5F0F\u8FD4\u56DE\u7C7B\u578B\u4E0D\u5339\u914D\uFF0C\u671F\u671B ${formatExpectedType(options.resultType)}\uFF0C\u5B9E\u9645\u4E3A ${actualType}`;
-          }
-        }
-        return true;
-      },
+      (expression) => evaluateExpression(env, expression, options.resultType) ?? true,
       {
         title: "CEL Expression",
         description