partforge 0.47.1 → 0.49.0

package/src/framework/panel/widgets/select.js

@@ -0,0 +1,73 @@
+// select: a dropdown over `options`. radio: the same data as a segmented
+// control (reuses the app's existing `.seg` styling), for 2–4 options where
+// seeing all of them matters. Option values may be strings or numbers; the DOM
+// only speaks strings, so both widgets map String(value) back to the real
+// value on the way out.
+import { attachInfo } from "../info.js";
+import { normalizeOptions } from "../widget-specs.js";
+
+function el(tag, className, text) {
+  const node = document.createElement(tag);
+  if (className) node.className = className;
+  if (text != null) node.textContent = text;
+  return node;
+}
+
+function labeledRow(node, info) {
+  const wrap = el("div", "slider");
+  const row = el("div", "row");
+  const label = el("label", "", node.label);
+  attachInfo(label, node.description, info);
+  row.append(label);
+  wrap.append(row);
+  return wrap;
+}
+
+export function makeSelect(node, params, { onChange, onCommit, info }) {
+  const wrap = labeledRow(node, info);
+  const opts = normalizeOptions(node.options);
+  const byString = new Map(opts.map((o) => [String(o.value), o.value]));
+  const select = document.createElement("select");
+  select.className = "select-input";
+  for (const o of opts) {
+    const opt = document.createElement("option");
+    opt.value = String(o.value);
+    opt.textContent = o.label;
+    if (o.description) opt.title = o.description; // long-form option descriptions surface as tooltips
+    select.append(opt);
+  }
+  select.value = String(params[node.key]);
+  select.addEventListener("change", () => {
+    params[node.key] = byString.get(select.value);
+    onChange?.();
+    onCommit?.();
+  });
+  wrap.append(select);
+  const sync = () => { select.value = String(params[node.key]); };
+  return { el: wrap, sync };
+}
+
+export function makeRadio(node, params, { onChange, onCommit, info }) {
+  const wrap = labeledRow(node, info);
+  const opts = normalizeOptions(node.options);
+  const seg = el("div", "seg");
+  const buttons = opts.map((o) => {
+    const b = el("button", "", o.label);
+    b.type = "button";
+    if (o.description) b.title = o.description;
+    b.addEventListener("click", () => {
+      params[node.key] = o.value;
+      paint();
+      onChange?.();
+      onCommit?.();
+    });
+    seg.append(b);
+    return { b, value: o.value };
+  });
+  const paint = () => {
+    for (const { b, value } of buttons) b.classList.toggle("on", params[node.key] === value);
+  };
+  paint();
+  wrap.append(seg);
+  return { el: wrap, sync: paint };
+}

package/src/framework/panel/widgets/text.js

@@ -9,7 +9,7 @@ function el(tag, className, text) {
   return node;
 }
 
-export function makeText(node, params, { onChange, info }) {
+export function makeText(node, params, { onChange, onCommit, info }) {
   const multiline = node.type === "textarea";
   const wrap = el("div", "slider");
   const row = el("div", "row");
@@ -26,6 +26,7 @@ export function makeText(node, params, { onChange, info }) {
     params[node.key] = field.value;
     onChange?.();
   });
+  field.addEventListener("change", () => onCommit?.());
   wrap.append(field);
 
   const sync = () => { field.value = String(params[node.key] ?? ""); };

package/src/parts/bracket.js

@@ -42,12 +42,12 @@ export default {
     {
       id: "shape",
       title: "Shape ops",
-      toggles: [
-        { key: "clip", label: "Clip arms to a disc (intersect)", on: 1,
+      controls: [
+        { key: "clip", type: "radio", label: "Arm tips",
+          options: [{ value: 0, label: "Square" }, { value: 1, label: "Clipped" }],
           description: "**Intersect** the cross with a circle so the four arm tips are rounded off to a common radius." },
-      ],
-      advanced: [
-        { key: "clearance", label: "Print-clearance offset", unit: "mm", min: 0, max: 1, step: 0.1,
+        { key: "clearance", type: "slider", label: "Print-clearance offset", unit: "mm",
+          min: 0, max: 1, step: 0.1,
           description: "**Offset** the whole outline outward (round corners) for a looser slip fit. 0 = none." },
       ],
     },

package/src/parts/planter.js

@@ -30,28 +30,33 @@ export default {
       id: "body",
       title: "Body",
       description:
-        "The faceted vessel. Pick a preset to start, or open **Advanced** for exact dimensions. " +
-        "**Facets** and **Twist** are pure styling; **Wall** is the one that decides whether it prints cleanly.",
-      presets: {
-        "Pen cup": { facets: 6, dia: 80, height: 100, taper: 1.0, twist: 0, drain: 0 },
-        Planter: { facets: 8, dia: 90, height: 80, taper: 0.9, twist: 0, drain: 8 },
-        Vase: { facets: 5, dia: 70, height: 150, taper: 1.12, twist: 40, drain: 0 },
-      },
-      advanced: [
-        { key: "facets", label: "Facets", min: 3, max: 12, step: 1,
+        "The faceted vessel. Pick a preset to start, or dial exact dimensions below — " +
+        "**Facets** and **Twist** are pure styling; open **Wall** for the one that decides whether it prints cleanly.",
+      controls: [
+        { type: "preset", presets: {
+          "Pen cup": { facets: 6, dia: 80, height: 100, taper: 1.0, twist: 0, drain: 0 },
+          Planter: { facets: 8, dia: 90, height: 80, taper: 0.9, twist: 0, drain: 8 },
+          Vase: { facets: 5, dia: 70, height: 150, taper: 1.12, twist: 40, drain: 0 },
+        } },
+        { key: "facets", type: "slider", label: "Facets", min: 3, max: 12, step: 1,
           description: "Number of flat sides around the body. Low counts read as crystalline; high counts approach a smooth cylinder." },
-        { key: "dia", label: "Diameter", unit: "mm", min: 30, max: 150, step: 1,
+        { key: "dia", type: "slider", label: "Diameter", unit: "mm", min: 30, max: 150, step: 1,
           description: "Across-corners diameter at the base. Size it to the plant, pens, or shelf it has to fit." },
-        { key: "height", label: "Height", unit: "mm", min: 20, max: 200, step: 1,
+        { key: "height", type: "slider", label: "Height", unit: "mm", min: 20, max: 200, step: 1,
           description: "Overall height along the axis." },
-        { key: "taper", label: "Top taper", min: 0.6, max: 1.4, step: 0.02,
+        { key: "taper", type: "slider", label: "Top taper", min: 0.6, max: 1.4, step: 0.02,
           description: "Rim size relative to the base: below 1 tapers inward (planter), 1 is straight (cup), above 1 flares out (vase)." },
-        { key: "wall", label: "Wall thickness", unit: "mm", min: 0.8, max: 4, step: 0.1,
-          description: "Side-wall thickness. The fdm-pla profile wants **≥ 1.2 mm** — go thinner and partforge flags a min-wall warning." },
-        { key: "twist", label: "Twist", unit: "°", min: 0, max: 180, step: 5,
+        { key: "twist", type: "slider", label: "Twist", unit: "°", min: 0, max: 180, step: 5,
           description: "Rotates the facets from base to rim for a spiral look. 0 keeps the facets vertical." },
-        { key: "floor", label: "Floor thickness", unit: "mm", min: 1, max: 6, step: 0.5, hidden: true,
-          description: "Internal: solid base thickness, fixed by the design. Hidden from the end user but still drives the geometry." },
+        { type: "group", title: "Wall", collapsed: "auto", controls: [
+          { key: "wall", type: "slider", label: "Wall thickness", unit: "mm", min: 0.8, max: 4, step: 0.1,
+            recommended: [1.2, 4],
+            description: "Side-wall thickness. The fdm-pla profile wants **≥ 1.2 mm** — go thinner and partforge flags a min-wall warning." },
+          { type: "readout", label: "Inner diameter", derivedKey: "innerDia", unit: "mm",
+            description: "Clear inside width at the base, after the walls." },
+          { key: "floor", type: "slider", label: "Floor thickness", unit: "mm", min: 1, max: 6, step: 0.5, hidden: true,
+            description: "Internal: solid base thickness, fixed by the design. Hidden from the end user but still drives the geometry." },
+        ] },
       ],
     },
     {
@@ -87,6 +92,7 @@ export default {
       // pick it so inner_radius(top) = outer_radius(top) − wall.
       innerTaper: 1 + (Rout * (p.taper - 1)) / Rin,
       drainR: (p.drain + 0.2) / 2, // nominal hole + 0.2 mm print clearance, as a radius
+      innerDia: 2 * Rin, // across-corners inner diameter at the base, after the wall inset
     };
   },
   parts: {

package/types/part.d.ts

@@ -58,7 +58,7 @@ export interface PartMeta {
 export type ControlKind = "slider" | "number" | "text" | "textarea";
 
 /** Every control type the panel can render. */
-export type ControlType = "slider" | "number" | "text" | "textarea" | "checkbox";
+export type ControlType = "slider" | "number" | "text" | "textarea" | "checkbox" | "select" | "radio";
 
 /** A declarative visibility condition, evaluated against raw parameters. */
 export type WhenCondition =
@@ -70,10 +70,84 @@ export type WhenCondition =
       ne?: ParamValue; in?: ParamValue[];
     }>;
 
+/** One entry in a `controls` array: a control, a nested group, a preset picker, or a readout. */
+export type PanelEntry = PanelControlEntry | PanelGroupEntry | PanelPresetEntry | PanelReadoutEntry;
+
+/** A control bound to one key in `defaults`. `type` defaults to `"slider"`. */
+export interface PanelControlEntry {
+  key: string;
+  type?: ControlType;
+  label?: string;
+  description?: string;
+  unit?: string;
+  min?: number;
+  max?: number;
+  step?: number;
+  /** checkbox: the value written when ticked (default 1). */
+  on?: number;
+  /** select / radio: the choices. Strings are both value and label. */
+  options?: Array<ParamValue | { value: ParamValue; label?: string; description?: string }>;
+  /** slider: logarithmic response. Requires min > 0. */
+  scale?: "log";
+  /** slider: marked values on the track; `snap: true` makes the thumb prefer them. */
+  ticks?: number[];
+  snap?: boolean;
+  /** slider: [lo, hi] band drawn on the track; outside it the value box takes a warning tint. */
+  recommended?: [number, number];
+  hidden?: boolean;
+  when?: WhenCondition;
+  whenFalse?: "disable";
+  /** These two discriminate against the container entries. */
+  controls?: undefined;
+  presets?: undefined;
+}
+
+/** A nested group. `collapsed` defaults to `"auto"` (the small-panel auto-open rule). */
+export interface PanelGroupEntry {
+  type: "group";
+  id?: string;
+  title?: string;
+  collapsed?: boolean | "auto";
+  /** No title, no disclosure — just an indented block. */
+  bare?: boolean;
+  controls: PanelEntry[];
+  hidden?: boolean;
+  when?: WhenCondition;
+  whenFalse?: "disable";
+}
+
+/** A preset picker, positionable anywhere among the controls. */
+export interface PanelPresetEntry {
+  type: "preset";
+  id?: string;
+  label?: string;
+  /** Preset name -> the param overrides it applies. */
+  presets: Record<string, Record<string, ParamValue>>;
+  hidden?: boolean;
+  when?: WhenCondition;
+  whenFalse?: "disable";
+}
+
+/** A read-only display of one `derive()` output. Not bound to `defaults`. */
+export interface PanelReadoutEntry {
+  type: "readout";
+  label?: string;
+  description?: string;
+  unit?: string;
+  derivedKey: string;
+  hidden?: boolean;
+  when?: WhenCondition;
+  whenFalse?: "disable";
+  key?: undefined;
+  controls?: undefined;
+  presets?: undefined;
+}
+
 /**
- * One parameter control. The recognised field list mirrors
- * `CONTROL_FIELDS` in src/framework/lint/rules-schema.js — anything else is
- * ignored by the panel and warned about by `partforge lint`.
+ * One parameter control in a legacy `advanced` / `sliders` array. The recognised
+ * field list is the registry's, `fieldsFor("slider")` in
+ * src/framework/panel/widget-specs.js — anything else is ignored by the panel and
+ * warned about by `partforge lint`.
  *
  * @deprecated Prefer a `controls` array of control nodes. Still fully supported.
  */
@@ -142,14 +216,31 @@ export interface PresetSection extends SectionBase {
   advanced?: ControlDef[];
   /** A section with `features` is a feature section; `advanced` is ignored there. */
   features?: undefined;
+  /** Discriminator: a PresetSection carries no `controls` array. */
+  controls?: undefined;
 }
 
 /** A feature-toggle section: each feature is a checkbox plus its own controls. */
 export interface FeatureSection extends SectionBase {
   features: FeatureDef[];
+  /** Discriminator: a FeatureSection carries no `controls` array. */
+  controls?: undefined;
+}
+
+/** The new section shape: everything in `controls`, in render order. */
+export interface NodeSection extends SectionBase {
+  controls: PanelEntry[];
+  collapsed?: boolean | "auto";
+  when?: WhenCondition;
+  whenFalse?: "disable";
+  /** Discriminators: a NodeSection carries none of the legacy arrays. */
+  features?: undefined;
+  advanced?: undefined;
+  toggles?: undefined;
+  presets?: undefined;
 }
 
-export type ParameterSection = PresetSection | FeatureSection;
+export type ParameterSection = PresetSection | FeatureSection | NodeSection;
 
 // --- fonts ------------------------------------------------------------------