@shwfed/config 2.2.5 → 2.3.1

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

@@ -60,15 +60,9 @@ declare const InitialState: Schema.Struct<{
     rowSelection: Schema.optional<Schema.Record$<typeof Schema.String, typeof Schema.Boolean>>;
 }>;
 export declare const Pagination: Schema.Struct<{
-    pageSizes: Schema.optionalWith<Schema.Array$<Schema.filter<Schema.filter<typeof Schema.Number>>>, {
-        default: () => number[];
-    }>;
-    pageIndex: Schema.optionalWith<Schema.filter<Schema.filter<typeof Schema.Number>>, {
-        default: () => number;
-    }>;
-    pageSize: Schema.optionalWith<Schema.filter<Schema.filter<typeof Schema.Number>>, {
-        default: () => number;
-    }>;
+    pageSize: Schema.refine<number, Schema.filter<typeof Schema.Number>>;
+    pageSizes: Schema.optional<Schema.Array$<Schema.filter<Schema.filter<typeof Schema.Number>>>>;
+    pageIndex: Schema.optional<Schema.filter<Schema.filter<typeof Schema.Number>>>;
     left: Schema.optional<Schema.TupleType<readonly [Schema.Struct<{
         locale: Schema.Literal<["zh"]>;
         message: Schema.SchemaClass<string, string, never>;
@@ -129,11 +123,11 @@ export declare function TableConfig(configure: (env: Environment) => void): Sche
             readonly message: string;
         }[]] | undefined;
     }[];
-    readonly dataSource: {
+    readonly dataSource?: {
         readonly data: string;
         readonly request?: string | undefined;
         readonly total?: string | undefined;
-    };
+    } | undefined;
     readonly actions?: {
         readonly size: "default" | "sm" | "xs";
         readonly style?: string | undefined;
@@ -242,9 +236,9 @@ export declare function TableConfig(configure: (env: Environment) => void): Sche
             readonly locale: "en" | "ja" | "ko";
             readonly message: string;
         }[]] | undefined;
-        readonly pageSizes: readonly number[];
-        readonly pageIndex: number;
         readonly pageSize: number;
+        readonly pageSizes?: readonly number[] | undefined;
+        readonly pageIndex?: number | undefined;
     } | undefined;
     readonly initialState?: {
         readonly expanded?: boolean | {
@@ -298,11 +292,11 @@ export declare function TableConfig(configure: (env: Environment) => void): Sche
     }>>, {
         default: () => never[];
     }>;
-    dataSource: Schema.Struct<{
+    dataSource: Schema.optional<Schema.Struct<{
         request: Schema.optional<Schema.Schema<string, string, never>>;
         data: Schema.Schema<string, string, never>;
         total: Schema.optional<Schema.Schema<string, string, never>>;
-    }>;
+    }>>;
     actions: Schema.optional<Schema.Struct<{
         size: Schema.optionalWith<Schema.Literal<["default", "sm", "xs"]>, {
             default: () => "default";
@@ -444,15 +438,9 @@ export declare function TableConfig(configure: (env: Environment) => void): Sche
     cellStyle: Schema.optional<Schema.Schema<string, string, never>>;
     style: Schema.optional<typeof Schema.String>;
     pagination: Schema.optional<Schema.Struct<{
-        pageSizes: Schema.optionalWith<Schema.Array$<Schema.filter<Schema.filter<typeof Schema.Number>>>, {
-            default: () => number[];
-        }>;
-        pageIndex: Schema.optionalWith<Schema.filter<Schema.filter<typeof Schema.Number>>, {
-            default: () => number;
-        }>;
-        pageSize: Schema.optionalWith<Schema.filter<Schema.filter<typeof Schema.Number>>, {
-            default: () => number;
-        }>;
+        pageSize: Schema.refine<number, Schema.filter<typeof Schema.Number>>;
+        pageSizes: Schema.optional<Schema.Array$<Schema.filter<Schema.filter<typeof Schema.Number>>>>;
+        pageIndex: Schema.optional<Schema.filter<Schema.filter<typeof Schema.Number>>>;
         left: Schema.optional<Schema.TupleType<readonly [Schema.Struct<{
             locale: Schema.Literal<["zh"]>;
             message: Schema.SchemaClass<string, string, never>;
@@ -513,11 +501,11 @@ export declare function createTableConfig(body: Omit<Schema.Schema.Type<ReturnTy
             readonly message: string;
         }[]] | undefined;
     }[];
-    dataSource: {
+    dataSource?: {
         readonly data: string;
         readonly request?: string | undefined;
         readonly total?: string | undefined;
-    };
+    } | undefined;
     actions?: {
         readonly size: "default" | "sm" | "xs";
         readonly style?: string | undefined;
@@ -626,9 +614,9 @@ export declare function createTableConfig(body: Omit<Schema.Schema.Type<ReturnTy
             readonly locale: "en" | "ja" | "ko";
             readonly message: string;
         }[]] | undefined;
-        readonly pageSizes: readonly number[];
-        readonly pageIndex: number;
         readonly pageSize: number;
+        readonly pageSizes?: readonly number[] | undefined;
+        readonly pageIndex?: number | undefined;
     } | undefined;
     initialState?: {
         readonly expanded?: boolean | {
@@ -681,7 +669,7 @@ export type TableConfigValue = Readonly<{
     displayName?: string;
     columns: ReadonlyArray<ColumnValue>;
     groups: ReadonlyArray<ColumnGroupValue>;
-    dataSource: DataSourceValue;
+    dataSource?: DataSourceValue;
     actions?: TableActionsValue;
     query?: FormConfigValue;
     cellStyle?: string;

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

@@ -79,25 +79,26 @@ const InitialState = Schema.Struct({
   description: "\u8868\u683C\u521D\u59CB\u72B6\u6001"
 });
 export const Pagination = Schema.Struct({
-  pageSizes: Schema.optionalWith(
-    Schema.Array(Schema.Number.pipe(Schema.int(), Schema.positive())),
-    { default: () => [100, 200, 500, 1e3] }
+  // `pageSize` is required so the editor cannot save "pagination on but no
+  // page size" — the toggle in config.vue owns the on/off axis, and turning
+  // it on initializes `pageSize` explicitly. No `optionalWith(default)`
+  // anywhere in this struct: defaults would re-materialize on every decode
+  // pass (see use-editor confirm) and undo the user's intent of leaving a
+  // field unset.
+  pageSize: Schema.Number.pipe(Schema.int(), Schema.positive()).annotations({
+    title: "\u521D\u59CB\u6BCF\u9875\u884C\u6570",
+    description: "\u521D\u59CB\u6BCF\u9875\u884C\u6570"
+  }),
+  pageSizes: Schema.optional(
+    Schema.Array(Schema.Number.pipe(Schema.int(), Schema.positive()))
   ).annotations({
     title: "\u53EF\u9009\u5206\u9875\u5927\u5C0F",
-    description: "\u53EF\u9009\u5206\u9875\u5927\u5C0F\u5217\u8868"
+    description: "\u53EF\u9009\u5206\u9875\u5927\u5C0F\u5217\u8868\uFF1B\u7559\u7A7A\u5219\u4E0D\u663E\u793A\u9875\u5927\u5C0F\u9009\u62E9\u5668"
   }),
-  pageIndex: Schema.optionalWith(
-    Schema.Number.pipe(Schema.int(), Schema.nonNegative()),
-    { default: () => 0 }
+  pageIndex: Schema.optional(
+    Schema.Number.pipe(Schema.int(), Schema.nonNegative())
   ).annotations({
-    description: "\u521D\u59CB\u9875\u7801\uFF08\u4ECE 0 \u5F00\u59CB\uFF09"
-  }),
-  pageSize: Schema.optionalWith(
-    Schema.Number.pipe(Schema.int(), Schema.positive()),
-    { default: () => 20 }
-  ).annotations({
-    title: "\u521D\u59CB\u6BCF\u9875\u884C\u6570",
-    description: "\u521D\u59CB\u6BCF\u9875\u884C\u6570"
+    description: "\u521D\u59CB\u9875\u7801\uFF08\u4ECE 0 \u5F00\u59CB\uFF09\uFF1B\u7559\u7A7A\u89C6\u4E3A 0"
   }),
   left: Schema.optional(Locale).annotations({
     title: "\u5206\u9875\u680F\u5DE6\u4FA7",
@@ -222,10 +223,13 @@ export function TableConfig(configure) {
       title: "\u5217\u5206\u7EC4",
       description: "\u5217\u5206\u7EC4\u5217\u8868"
     }),
-    dataSource: dataSourceSchema.annotations({
+    // Optional so a host that drives rows directly (the `table` form field's
+    // `v-model:rows` binding) can omit it — `fetchDataSource` short-circuits
+    // when undefined, leaving rows fully owned by the host's model.
+    dataSource: Schema.optional(dataSourceSchema.annotations({
       title: "\u6570\u636E\u6E90",
       description: "\u6570\u636E\u6E90\u914D\u7F6E"
-    }),
+    })),
     actions: Schema.optional(TableActions).annotations({
       title: "\u64CD\u4F5C",
       description: "\u8868\u683C\u9876\u90E8\u64CD\u4F5C\u6309\u94AE"
@@ -248,7 +252,7 @@ export function TableConfig(configure) {
     initialState: Schema.optional(InitialState)
   }).pipe(Schema.filter((cfg) => {
     if (cfg.dataSource?.total !== void 0 && cfg.pagination === void 0) {
-      return "\u914D\u7F6E\u4E86 dataSource.total \u65F6\u5FC5\u987B\u540C\u65F6\u914D\u7F6E\u5206\u9875\uFF08\u81F3\u5C11\u586B\u5199\u6BCF\u9875\u884C\u6570\u6216\u53EF\u9009\u5206\u9875\u5927\u5C0F\uFF09";
+      return "\u914D\u7F6E\u4E86 dataSource.total \u65F6\u5FC5\u987B\u542F\u7528\u5206\u9875";
     }
     return true;
   })).annotations({

package/dist/runtime/components/table/utils/shared.d.ts

@@ -1,4 +1,5 @@
 import { Schema } from 'effect';
+import { type VNode } from 'vue';
 import type { Environment } from '../../../vendor/cel-js/lib/index.js';
 import { type ResultType } from '../../../share/expression.js';
 export declare const Align: Schema.Literal<["left", "center", "right"]>;
@@ -28,6 +29,29 @@ export declare function columnFields(configure: (env: Environment) => void): {
     id: Schema.refine<string, typeof Schema.String>;
     groupId: Schema.optional<typeof Schema.UUID>;
 };
+export declare function editableColumnFields(): {
+    title: Schema.TupleType<readonly [Schema.Struct<{
+        locale: Schema.Literal<["zh"]>;
+        message: Schema.SchemaClass<string, string, never>;
+    }>], [Schema.Struct<{
+        locale: Schema.Literal<["ja", "en", "ko"]>;
+        message: Schema.SchemaClass<string, string, never>;
+    }>]>;
+    binding: Schema.refine<string, typeof Schema.String>;
+    enableSorting: Schema.optional<Schema.SchemaClass<boolean, boolean, never>>;
+    size: Schema.optional<Schema.refine<number, Schema.filter<typeof Schema.Number>>>;
+    grow: Schema.optional<Schema.SchemaClass<boolean, boolean, never>>;
+    tooltip: Schema.optional<Schema.TupleType<readonly [Schema.Struct<{
+        locale: Schema.Literal<["zh"]>;
+        message: Schema.SchemaClass<string, string, never>;
+    }>], [Schema.Struct<{
+        locale: Schema.Literal<["ja", "en", "ko"]>;
+        message: Schema.SchemaClass<string, string, never>;
+    }>]>>;
+    id: Schema.refine<string, typeof Schema.String>;
+    groupId: Schema.optional<typeof Schema.UUID>;
+};
+export declare function editableHeader(titleText: string | undefined): () => VNode;
 export declare function registerRowVariablesIfAbsent(env: Environment): void;
 export declare function CelRowAccess(configure: (env: Environment) => void, options?: {
     resultType?: ResultType;
@@ -39,3 +63,7 @@ export declare function LocaleMarkdownWithRow(configure: (env: Environment) => v
     locale: Schema.Literal<["ja", "en", "ko"]>;
     message: Schema.SchemaClass<string, string, never>;
 }>]>>;
+export declare function derivedRowField(configure: (env: Environment) => void, resultType: ResultType): Schema.optional<Schema.Struct<{
+    mode: Schema.Literal<["formula", "prefill"]>;
+    expression: Schema.Schema<string, string, never>;
+}>>;

package/dist/runtime/components/table/utils/shared.js

@@ -1,7 +1,10 @@
 import { Schema } from "effect";
+import { Icon } from "@iconify/vue";
+import { h } from "vue";
 import { Expression, LocaleMarkdown } from "../../../share/expression.js";
 import { Locale } from "../../../share/locale.js";
 import { md } from "../../../share/markdown.js";
+import { derivedField } from "../../form/utils/common.js";
 export const Align = Schema.Literal("left", "center", "right").annotations({
   description: "\u5BF9\u9F50\u65B9\u5F0F"
 });
@@ -44,6 +47,40 @@ export function columnFields(configure) {
     tooltip: Schema.optional(Locale.annotations({ title: "\u63D0\u793A", description: "\u5217\u6807\u9898\u60AC\u6D6E\u63D0\u793A\uFF0C\u652F\u6301 Markdown" }))
   };
 }
+export function editableColumnFields() {
+  return {
+    ...columnIdentityFields(),
+    title: Locale.annotations({ title: "\u540D\u79F0", description: "\u5217\u6807\u9898" }),
+    binding: Schema.String.pipe(Schema.minLength(1)).annotations({
+      title: "\u7ED1\u5B9A\u8DEF\u5F84",
+      description: "\u5355\u5143\u683C\u8BFB\u5199\u7684 `dot-prop` \u8DEF\u5F84\uFF0C\u4F8B\u5982 `name` \u6216 `address.city`\uFF1B\u5199\u5165\u5373\u8986\u76D6\u8BE5\u8DEF\u5F84\u4E0A\u7684\u503C"
+    }),
+    enableSorting: Schema.optional(Schema.Boolean.annotations({
+      title: "\u5141\u8BB8\u6392\u5E8F",
+      description: "\u663E\u793A\u6392\u5E8F\u6309\u94AE\uFF1B\u542F\u7528\u5BA2\u6237\u7AEF\u6392\u5E8F\uFF0C\u6309\u5F53\u524D `binding` \u8DEF\u5F84\u4E0A\u7684\u503C\u6392\u5E8F"
+    })),
+    size: Schema.optional(Schema.Number.pipe(Schema.finite(), Schema.positive()).annotations({
+      title: "\u5217\u5BBD",
+      description: "\u6307\u5B9A\u4E00\u4E2A\u5408\u9002\u7684\u8868\u683C\u5217\u5BBD\u5EA6\uFF0C\u5F53\u5217\u5185\u5BB9\u957F\u5EA6\u5927\u4E8E\u8FD9\u91CC\u6307\u5B9A\u7684\u5BBD\u5EA6\u540E\uFF0C\u4F1A\u5BFC\u81F4\u8D85\u51FA\u7684\u90E8\u5206\u88AB\u622A\u65AD\u3002"
+    })),
+    grow: Schema.optional(Schema.Boolean.annotations({ title: "\u5360\u636E\u5269\u4F59\u5BBD\u5EA6", description: "\u5217\u662F\u5426\u5360\u636E\u5269\u4F59\u7A7A\u4F59\u5BBD\u5EA6" })),
+    tooltip: Schema.optional(Locale.annotations({ title: "\u63D0\u793A", description: "\u5217\u6807\u9898\u60AC\u6D6E\u63D0\u793A\uFF0C\u652F\u6301 Markdown" }))
+  };
+}
+export function editableHeader(titleText) {
+  return () => h(
+    "span",
+    { class: "inline-flex items-center gap-1" },
+    [
+      titleText ?? "",
+      h(Icon, {
+        "icon": "fluent:edit-20-regular",
+        "class": "size-3 text-zinc-400",
+        "aria-hidden": "true"
+      })
+    ]
+  );
+}
 export function registerRowVariablesIfAbsent(env) {
   const declared = new Set(env.getDefinitions().variables.map((v) => v.name));
   if (!declared.has("row")) {
@@ -65,3 +102,6 @@ export function CelRowAccess(configure, options) {
 export function LocaleMarkdownWithRow(configure) {
   return LocaleMarkdown({ configure: configureWithRow(configure) });
 }
+export function derivedRowField(configure, resultType) {
+  return derivedField(configureWithRow(configure), resultType);
+}

package/dist/runtime/components/ui/field/index.js

@@ -34,7 +34,12 @@ export const fieldVariants = cva(
           "has-data-[value=true]:**:data-[slot=field-label]:text-zinc-700",
           "data-[disabled=true]:**:data-[slot=field-label]:text-zinc-400",
           "*:data-[slot=field-label]:left-3",
-          "has-[[data-slot=input-group-addon][data-align=inline-start]]:**:data-[slot=field-label]:left-7"
+          "has-[[data-slot=input-group-addon][data-align=inline-start]]:**:data-[slot=field-label]:left-7",
+          // The floating label is notched into the top border, so we nudge the
+          // input baseline 0.5 down to keep its caret/text optically centered
+          // against the notch. Only applied when a label is actually present —
+          // a label-less floating field should sit flush with the border.
+          "has-[>[data-slot=field-label]]:**:data-[slot=input]:translate-y-0.5"
         ],
         contents: [
           "contents",

package/dist/runtime/components/ui/input/Input.vue

@@ -23,7 +23,7 @@ const modelValue = useVModel(props, "modelValue", emits, {
     :data-value="!treatEmptyAsDifferentStateFromNull ? !!modelValue : modelValue !== void 0"
     :placeholder="props.placeholder"
     :class="cn(
-  'file:text-zinc-700 placeholder:text-zinc-300 text-zinc-700 border-zinc-200 h-9 w-full min-w-0 rounded border bg-transparent px-3 py-1 text-base translate-y-0.5 transition-colors ease-out duration-180 outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
+  'file:text-zinc-700 placeholder:text-zinc-300 text-zinc-700 border-zinc-200 h-9 w-full min-w-0 rounded border bg-transparent px-3 py-1 text-base transition-colors ease-out duration-180 outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
   'aria-invalid:border-red-400 hover:border-zinc-300 focus-visible:border-(--primary)',
   props.class
 )"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shwfed/config",
-  "version": "2.2.5",
+  "version": "2.3.1",
   "description": "Configurable UI for SHWFED",
   "type": "module",
   "publishConfig": {