@fuaran-ui/ops 0.1.0 → 0.3.0

package/dist/index.d.cts

@@ -59,7 +59,6 @@ type TreeOp<TMsg> = {
 } | {
     readonly kind: 'InsertChild';
     readonly parentId: NodeId;
-    readonly position: number;
     readonly child: Node<TMsg>;
 } | {
     readonly kind: 'RemoveNode';
@@ -68,7 +67,6 @@ type TreeOp<TMsg> = {
     readonly kind: 'MoveNode';
     readonly target: NodeId;
     readonly newParentId: NodeId;
-    readonly newPosition: number;
 } | {
     readonly kind: 'ReorderChildren';
     readonly parentId: NodeId;

package/dist/index.d.ts

@@ -59,7 +59,6 @@ type TreeOp<TMsg> = {
 } | {
     readonly kind: 'InsertChild';
     readonly parentId: NodeId;
-    readonly position: number;
     readonly child: Node<TMsg>;
 } | {
     readonly kind: 'RemoveNode';
@@ -68,7 +67,6 @@ type TreeOp<TMsg> = {
     readonly kind: 'MoveNode';
     readonly target: NodeId;
     readonly newParentId: NodeId;
-    readonly newPosition: number;
 } | {
     readonly kind: 'ReorderChildren';
     readonly parentId: NodeId;

package/dist/index.js

@@ -1,4 +1,4 @@
-import { defaults, projectSelectionField, controlValueDefaults } from '@fuaran-ui/schema';
+import { FORM_FIELD_KIND_NAMES, NODE_KIND_GROUPS, defaults, projectSelectionField, controlValueDefaults } from '@fuaran-ui/schema';
 
 // src/encode.ts
 var assertNever = (x) => {
@@ -360,8 +360,10 @@ var flushTrigger = (t) => {
 };
 var binding = (b, staticEnc = objValue) => {
   switch (b.kind) {
-    case "Static":
-      return caseObj("Static", [["value", staticEnc(b.value)]]);
+    case "Static": {
+      const valueFields = b.value === null || b.value === void 0 ? [] : [["value", staticEnc(b.value)]];
+      return caseObj("Static", valueFields);
+    }
     case "Query": {
       const dependsOnFields = b.dependsOn !== void 0 && b.dependsOn.length > 0 ? [["dependsOn", jArray(b.dependsOn.map((s) => str(s)))]] : [];
       return caseObj("Query", [...dependsOnFields, ["name", str(b.name)]]);
@@ -375,11 +377,10 @@ var binding = (b, staticEnc = objValue) => {
       const fieldField = b.field !== void 0 ? [["field", str(b.field)]] : [];
       return caseObj("Selection", [...defaultField, ...fieldField, ["nodeId", str(b.nodeId)]]);
     }
-    case "State":
-      return caseObj("State", [
-        ["defaultValue", staticEnc(b.defaultValue)],
-        ["key", str(b.key)]
-      ]);
+    case "State": {
+      const defaultFields = b.defaultValue === null || b.defaultValue === void 0 ? [] : [["defaultValue", staticEnc(b.defaultValue)]];
+      return caseObj("State", [...defaultFields, ["key", str(b.key)]]);
+    }
     case "Computed":
       return caseObj("Computed", [["fn", CLOSURE]]);
     case "I18n": {
@@ -934,6 +935,25 @@ var formFieldKind = (autoBind, k) => {
       if (k.constraints.step !== void 0) fields.push(["step", num(k.constraints.step)]);
       return caseObj("Date", fields);
     }
+    case "DateRange": {
+      const staticPair = (p) => jObject([
+        ["from", str(p[0])],
+        ["to", str(p[1])]
+      ]);
+      const fields = [
+        ...handlerField("onChange", k.onChange),
+        ...valueField(
+          k.value,
+          controlValueDefaults.dateRange,
+          (v) => v.kind === "Static" ? staticPair(v.value) : binding(v, staticPair)
+        ),
+        ["variant", str(k.variant)]
+      ];
+      if (k.constraints.min !== void 0) fields.push(["min", str(k.constraints.min)]);
+      if (k.constraints.max !== void 0) fields.push(["max", str(k.constraints.max)]);
+      if (k.constraints.step !== void 0) fields.push(["step", num(k.constraints.step)]);
+      return caseObj("DateRange", fields);
+    }
     default:
       return assertNever(k);
   }
@@ -1515,15 +1535,13 @@ var treeOp = (op) => {
     case "InsertChild":
       return caseObj("InsertChild", [
         ["child", node(op.child)],
-        ["parentId", str(op.parentId)],
-        ["position", num(op.position)]
+        ["parentId", str(op.parentId)]
       ]);
     case "RemoveNode":
       return caseObj("RemoveNode", [["target", str(op.target)]]);
     case "MoveNode":
       return caseObj("MoveNode", [
         ["newParentId", str(op.newParentId)],
-        ["newPosition", num(op.newPosition)],
         ["target", str(op.target)]
       ]);
     case "ReorderChildren":
@@ -4032,9 +4050,8 @@ var decodeBinding = (path, j, parseStatic = (_p, v) => ok(decodeAstValue(v)), pl
   if (!d.ok) return d;
   switch (d.value) {
     case "Static": {
-      const v = requireField(path, f, "value", "Binding.Static value of the slot's expected type");
-      if (!v.ok) return v;
-      const parsed = parseStatic(`${path}.value`, v.value);
+      const raw = f.get("value") ?? { kind: "JNull" };
+      const parsed = parseStatic(`${path}.value`, raw);
       return parsed.ok ? ok({ kind: "Static", value: parsed.value }) : parsed;
     }
     case "Query": {
@@ -4111,7 +4128,7 @@ var decodeBinding = (path, j, parseStatic = (_p, v) => ok(decodeAstValue(v)), pl
     case "State": {
       const key = reqField(path, f, "key", "state key string", requireString);
       if (!key.ok) return key;
-      const dv = fieldAliased(f, "defaultValue", ["initialValue", "default"]);
+      const dv = fieldAliased(f, "defaultValue", ["initialValue", "default"]) ?? { kind: "JNull" };
       let defaultValue = placeholder;
       if (dv !== void 0) {
         const parsed = parseStatic(`${path}.defaultValue`, dv);
@@ -4339,6 +4356,41 @@ var decodeBindingFloatPair = (p, j) => {
   }
   return decodeBinding(p, j, parseStaticFloatPair, [0, 0]);
 };
+var parseStaticStringPair = (p, v) => {
+  const ordered = (a, b) => a > b ? makeError(
+    "WRONG_TYPE",
+    p,
+    `date-range start '${a}' is after end '${b}' \u2014 a DateRange pair is ordered (from <= to); ISO-8601 strings of one variant compare lexicographically, so swap the two values`,
+    'ordered ISO-8601 pair ({"from": <iso>, "to": <iso>} with from <= to)'
+  ) : ok([a, b]);
+  if (v.kind === "JObject") {
+    const from = v.fields.get("from");
+    const to = v.fields.get("to");
+    if (from !== void 0 && to !== void 0) {
+      const a = requireString(`${p}.from`, from);
+      if (!a.ok) return a;
+      const b = requireString(`${p}.to`, to);
+      if (!b.ok) return b;
+      return ordered(a.value, b.value);
+    }
+    return wrongType(p, "object with from and to ISO-8601 strings");
+  }
+  if (v.kind === "JArray" && v.items.length === 2) {
+    const a = requireString(`${p}[0]`, v.items[0]);
+    if (!a.ok) return a;
+    const b = requireString(`${p}[1]`, v.items[1]);
+    if (!b.ok) return b;
+    return ordered(a.value, b.value);
+  }
+  return wrongType(p, "date-range pair ({from, to} object or [from, to] array)");
+};
+var decodeBindingStringPair = (p, j) => {
+  if (j.kind === "JObject" && j.fields.get("$type") === void 0 && j.fields.get("from") !== void 0 && j.fields.get("to") !== void 0) {
+    const parsed = parseStaticStringPair(p, j);
+    return parsed.ok ? ok({ kind: "Static", value: parsed.value }) : parsed;
+  }
+  return decodeBinding(p, j, parseStaticStringPair, ["", ""]);
+};
 var parseStaticStringList = (p, v) => {
   if (v.kind === "JNull") return ok([]);
   if (v.kind === "JString" && v.value === OPAQUE2) return ok([OPAQUE2]);
@@ -5186,6 +5238,7 @@ var decodeDisplayKind = (path, j) => {
       );
   }
 };
+var WRONG_FORM_FIELD_KIND_HINT = FORM_FIELD_KIND_NAMES.join(" | ");
 var decodeFormFieldKind = (autoBind, path, j) => {
   const fo = requireObject(path, j);
   if (!fo.ok) return fo;
@@ -5335,12 +5388,35 @@ var decodeFormFieldKind = (autoBind, path, j) => {
         }
       });
     }
-    default:
-      return unknownDuCase(
-        path,
-        d.value,
-        "Text | Number | Checkbox | Choice | Range | RangedNumber | SegmentedChoice | TextArea | Date"
+    case "DateRange": {
+      const value = valueOr(
+        decodeBindingStringPair,
+        controlValueDefaults.dateRange,
+        "Binding<[from, to]> ISO-8601 pair value"
       );
+      if (!value.ok) return value;
+      const variant = reqField(path, f, "variant", "DateVariant", decodeDateVariant);
+      if (!variant.ok) return variant;
+      const min = optField(path, f, "min", requireString);
+      if (!min.ok) return min;
+      const max = optField(path, f, "max", requireString);
+      if (!max.ok) return max;
+      const step = optField(path, f, "step", requireFloat);
+      if (!step.ok) return step;
+      return ok({
+        kind: "DateRange",
+        value: value.value,
+        ...onChangeField,
+        variant: variant.value,
+        constraints: {
+          ...min.value !== void 0 ? { min: min.value } : {},
+          ...max.value !== void 0 ? { max: max.value } : {},
+          ...step.value !== void 0 ? { step: step.value } : {}
+        }
+      });
+    }
+    default:
+      return unknownDuCase(path, d.value, WRONG_FORM_FIELD_KIND_HINT);
   }
 };
 var decodeFormField = (path, j) => {
@@ -5826,23 +5902,6 @@ var decodeVisKind = (path, j) => {
       const r = decodeChartSpec(path, j);
       return r.ok ? ok({ kind: "Chart", spec: r.value }) : r;
     }
-    // Phase 393 — legacy decode-upgrade: a `Table` tag folds into a read-only `Grid`
-    // (the `staticRows` mode). Accepted on read but NEVER re-encodes as `Table` (the
-    // encoder has no `Table` arm), riding the Phase 390 retired-kind seam.
-    case "Table": {
-      const r = decodeStaticRows(path, j);
-      return r.ok ? ok({
-        kind: "Grid",
-        spec: {
-          // An opaque Static source re-encodes to {"$type":"Static","value":"<opaque>"} —
-          // byte-identical to the F# static grid's `Binding.Static Seq.empty`.
-          source: { kind: "Static", value: OPAQUE2 },
-          columns: [],
-          editable: false,
-          staticRows: r.value
-        }
-      }) : r;
-    }
     case "Map": {
       const r = decodeMapSpec(path, j);
       return r.ok ? ok({ kind: "Map", spec: r.value }) : r;
@@ -5934,64 +5993,6 @@ var decodeBox = (path, j) => {
     role: role.value
   });
 };
-var decodeLegacyDashboard = (path, j) => {
-  const fo = requireObject(path, j);
-  if (!fo.ok) return fo;
-  const children = decodeChildren(path, fo.value);
-  if (!children.ok) return children;
-  return ok({ children: children.value, layout: { kind: "Auto" }, role: "Dashboard" });
-};
-var decodeLegacyStack = (path, j) => {
-  const fo = requireObject(path, j);
-  if (!fo.ok) return fo;
-  const f = fo.value;
-  const children = decodeChildren(path, f);
-  if (!children.ok) return children;
-  const orientation = reqField(path, f, "orientation", "Orientation", decodeOrientation);
-  if (!orientation.ok) return orientation;
-  const wrap = reqField(path, f, "wrap", "wrap bool", requireBool);
-  if (!wrap.ok) return wrap;
-  return ok({
-    children: children.value,
-    layout: { kind: "Flex", direction: orientation.value, wrap: wrap.value },
-    role: "Group"
-  });
-};
-var decodeLegacyGridLayout = (path, j) => {
-  const fo = requireObject(path, j);
-  if (!fo.ok) return fo;
-  const f = fo.value;
-  const children = decodeChildren(path, f);
-  if (!children.ok) return children;
-  const cols = reqFieldAliased(path, f, "cols", ["columns"], "cols integer", requireInt);
-  if (!cols.ok) return cols;
-  const templateColumns = optField(path, f, "templateColumns", requireString);
-  if (!templateColumns.ok) return templateColumns;
-  return ok({
-    children: children.value,
-    layout: {
-      kind: "Grid",
-      cols: cols.value,
-      ...templateColumns.value !== void 0 ? { templateColumns: templateColumns.value } : {}
-    },
-    role: "Group"
-  });
-};
-var decodeLegacyCard = (path, j) => {
-  const fo = requireObject(path, j);
-  if (!fo.ok) return fo;
-  const f = fo.value;
-  const children = decodeChildren(path, f);
-  if (!children.ok) return children;
-  const heading = optFieldAliased(path, f, "heading", ["title"], decodeTextSource);
-  if (!heading.ok) return heading;
-  return ok({
-    children: children.value,
-    ...heading.value !== void 0 ? { heading: heading.value } : {},
-    layout: { kind: "Flex", direction: "Vertical", wrap: false },
-    role: "Card"
-  });
-};
 var decodeSplitPanelSpec = (path, j) => {
   const fo = requireObject(path, j);
   if (!fo.ok) return fo;
@@ -6181,22 +6182,6 @@ var decodeLayoutKind = (path, j) => {
       const r = decodeBox(path, j);
       return r.ok ? ok({ kind: "Box", spec: r.value }) : r;
     }
-    case "Dashboard": {
-      const r = decodeLegacyDashboard(path, j);
-      return r.ok ? ok({ kind: "Box", spec: r.value }) : r;
-    }
-    case "Stack": {
-      const r = decodeLegacyStack(path, j);
-      return r.ok ? ok({ kind: "Box", spec: r.value }) : r;
-    }
-    case "GridLayout": {
-      const r = decodeLegacyGridLayout(path, j);
-      return r.ok ? ok({ kind: "Box", spec: r.value }) : r;
-    }
-    case "Card": {
-      const r = decodeLegacyCard(path, j);
-      return r.ok ? ok({ kind: "Box", spec: r.value }) : r;
-    }
     case "SplitPanel": {
       const r = decodeSplitPanelSpec(path, j);
       return r.ok ? ok({ kind: "SplitPanel", spec: r.value }) : r;
@@ -6229,7 +6214,7 @@ var decodeLayoutKind = (path, j) => {
       return unknownDuCase(
         path,
         d.value,
-        "Box | Dashboard | Stack | GridLayout | SplitPanel | Tabs | Card | Stepper | SummaryList | Disclosure | Modal | ScrollArea"
+        "Box | SplitPanel | Tabs | Stepper | SummaryList | Disclosure | Modal | ScrollArea"
       );
   }
 };
@@ -6393,6 +6378,13 @@ var decodeEffectClass = (path, j) => {
     );
   return ok({ hostEffect: host.value, determinism: det.value });
 };
+var WRONG_NODE_KIND_HINT = (() => {
+  const primitives = NODE_KIND_GROUPS.filter((g) => g.label !== "Structural").map(
+    (g) => `${"AEIOU".includes(g.label[0]) ? "an" : "a"} ${g.label} primitive (${g.kinds.join(" | ")})`
+  ).join(", ");
+  const structural = NODE_KIND_GROUPS.find((g) => g.label === "Structural")?.kinds ?? [];
+  return `${primitives}, or ${structural.join(" | ")}`;
+})();
 var decodeNodeKind = (path, j) => {
   const fo = requireObject(path, j);
   if (!fo.ok) return fo;
@@ -6405,12 +6397,8 @@ var decodeNodeKind = (path, j) => {
     // each primitive to its inner decoder and recover the category here. These
     // name-sets MUST stay in sync with the four inner decoders + the encoder.
     case "Box":
-    case "Dashboard":
-    case "Stack":
-    case "GridLayout":
     case "SplitPanel":
     case "Tabs":
-    case "Card":
     case "Stepper":
     case "SummaryList":
     case "Disclosure":
@@ -6449,7 +6437,6 @@ var decodeNodeKind = (path, j) => {
     }
     case "DataGrid":
     case "Chart":
-    case "Table":
     case "Map": {
       const k = decodeVisKind(path, j);
       return k.ok ? ok({ kind: "Visualisation", visualisation: k.value }) : k;
@@ -6652,7 +6639,7 @@ var decodeNodeKind = (path, j) => {
         "WRONG_NODE_KIND",
         `${path}.$type`,
         `unknown NodeKind discriminator '${d.value}'`,
-        "a Layout primitive (Dashboard | Stack | GridLayout | SplitPanel | Tabs | Card | Stepper | SummaryList | Disclosure | Modal | ScrollArea), a Display primitive (Heading | Markdown | Metric | Badge | Sparkline | Callout | Progress | Skeleton | LabelValueRow | Link | Image | List | Toast), an Input primitive (Form | Filters | Button | FileUpload | Select), a Visualisation primitive (DataGrid | Chart | Table | Map), or Custom | ErrorBoundary | FragmentDecl | FragmentRef | Mount"
+        WRONG_NODE_KIND_HINT
       );
   }
 };
@@ -6823,13 +6810,10 @@ var decodeTreeOpAst = (path, j) => {
     case "InsertChild": {
       const parentJ = reqField(path, f, "parentId", "parent NodeId", requireString);
       if (!parentJ.ok) return parentJ;
-      const position = reqField(path, f, "position", "position integer", requireInt);
-      if (!position.ok) return position;
       const child = reqField(path, f, "child", "child Node object", decodeNodeAst);
       return child.ok ? ok({
         kind: "InsertChild",
         parentId: parentJ.value,
-        position: position.value,
         child: child.value
       }) : child;
     }
@@ -6841,14 +6825,11 @@ var decodeTreeOpAst = (path, j) => {
       const t = target();
       if (!t.ok) return t;
       const newParent = reqField(path, f, "newParentId", "new parent NodeId", requireString);
-      if (!newParent.ok) return newParent;
-      const newPosition = reqField(path, f, "newPosition", "new position integer", requireInt);
-      return newPosition.ok ? ok({
+      return newParent.ok ? ok({
         kind: "MoveNode",
         target: t.value,
-        newParentId: newParent.value,
-        newPosition: newPosition.value
-      }) : newPosition;
+        newParentId: newParent.value
+      }) : newParent;
     }
     case "ReorderChildren": {
       const parentJ = reqField(path, f, "parentId", "parent NodeId", requireString);
@@ -7856,11 +7837,6 @@ var applyOne = (op, root, telem) => {
           "ChildlessKind",
           `Node '${op.parentId}' (kind=${parent.kind.kind}) has no children field \u2014 only Layout kinds accept structural child ops.`
         );
-      if (op.position < 0 || op.position > children.length)
-        return fail2(
-          "PositionOutOfRange",
-          `Position ${op.position} is out of range for parent '${op.parentId}' (valid: 0..${children.length}).`
-        );
       const existing = new Set(allNodeIds(root));
       const duplicate = allNodeIds(op.child).find((id) => existing.has(id));
       if (duplicate !== void 0)
@@ -7868,11 +7844,7 @@ var applyOne = (op, root, telem) => {
           "DuplicateNodeId",
           `NodeId '${duplicate}' is already present in the tree; ids must be unique.`
         );
-      const newChildren = [
-        ...children.slice(0, op.position),
-        op.child,
-        ...children.slice(op.position)
-      ];
+      const newChildren = [...children, op.child];
       const newTree = mapNode(op.parentId, (n) => withLayoutChildren(n, newChildren), root);
       if (newTree === void 0)
         return fail2("ParentNotFound", `Parent node '${op.parentId}' not found in tree.`);
@@ -7920,7 +7892,7 @@ var applyOne = (op, root, telem) => {
       const afterRemove = applyOne({ kind: "RemoveNode", target: op.target }, root, []);
       if (!afterRemove.ok) return afterRemove;
       const inserted = applyOne(
-        { kind: "InsertChild", parentId: op.newParentId, position: op.newPosition, child: moving },
+        { kind: "InsertChild", parentId: op.newParentId, child: moving },
         afterRemove.value,
         []
       );