@timeax/digital-service-engine 0.0.2 → 0.0.3

package/dist/react/index.cjs

@@ -1222,13 +1222,10 @@ function visibleFieldIdsUnder(props, tagId, opts = {}) {
   if (order && order.length) {
     const ordered = order.filter((fid) => visible.has(fid));
     const orderedSet = new Set(ordered);
-    const rest2 = base.filter((fid) => !orderedSet.has(fid));
-    return [...ordered, ...rest2];
+    const rest = base.filter((fid) => !orderedSet.has(fid));
+    return [...ordered, ...rest];
   }
-  const promoted = revealedOrder.filter((fid) => visible.has(fid));
-  const promotedSet = new Set(promoted);
-  const rest = base.filter((fid) => !promotedSet.has(fid));
-  return [...promoted, ...rest];
+  return base;
 }
 function visibleFieldsUnder(props, tagId, opts = {}) {
   var _a;
@@ -3302,7 +3299,7 @@ function rateOk(svcMap, candidate, primary, policy) {
 
 // src/utils/build-order-snapshot.ts
 function buildOrderSnapshot(props, builder, selection, services, settings = {}) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const mode = (_a = settings.mode) != null ? _a : "prod";
   const hostDefaultQty = Number.isFinite(
     (_b = settings.hostDefaultQuantity) != null ? _b : 1
@@ -3316,20 +3313,18 @@ function buildOrderSnapshot(props, builder, selection, services, settings = {})
   };
   const builtAt = (/* @__PURE__ */ new Date()).toISOString();
   const tagId = selection.activeTagId;
-  const selectedOptionKeys = toSelectedOptionKeys(
-    selection.optionSelectionsByFieldId
-  );
+  const selectedButtonKeys = (_d = selection.selectedKeys) != null ? _d : toSelectedOptionKeys(selection.optionSelectionsByFieldId);
   const visibleFieldIds = builder.visibleFields(
     tagId,
-    selectedOptionKeys
+    selectedButtonKeys
   );
   const tagById = new Map(
-    ((_d = props.filters) != null ? _d : []).map((t) => [t.id, t])
+    ((_e = props.filters) != null ? _e : []).map((t) => [t.id, t])
   );
   const fieldById = new Map(
-    ((_e = props.fields) != null ? _e : []).map((f) => [f.id, f])
+    ((_f = props.fields) != null ? _f : []).map((f) => [f.id, f])
   );
-  const tagConstraints = (_g = (_f = tagById.get(tagId)) == null ? void 0 : _f.constraints) != null ? _g : void 0;
+  const tagConstraints = (_h = (_g = tagById.get(tagId)) == null ? void 0 : _g.constraints) != null ? _h : void 0;
   const selectionFields = visibleFieldIds.map((fid) => fieldById.get(fid)).filter((f) => !!f).map((f) => {
     var _a2;
     const optIds = isOptionBased(f) ? (_a2 = selection.optionSelectionsByFieldId[f.id]) != null ? _a2 : [] : void 0;
@@ -3406,6 +3401,7 @@ function buildOrderSnapshot(props, builder, selection, services, settings = {})
     builtAt,
     selection: {
       tag: tagId,
+      buttons: selectedButtonKeys,
       fields: selectionFields
     },
     inputs: {
@@ -3438,6 +3434,10 @@ function toSelectedOptionKeys(byField) {
   }
   return keys;
 }
+function isServicedBased(field) {
+  if (field.service_id) return true;
+  return !!(field.options && field.options.some((item) => item.service_id));
+}
 function buildInputs(visibleFieldIds, fieldById, selection) {
   const formValues = {};
   const selections = {};
@@ -3448,7 +3448,7 @@ function buildInputs(visibleFieldIds, fieldById, selection) {
     if (selOptIds && selOptIds.length) {
       selections[fid] = [...selOptIds];
     }
-    if (!isOptionBased(f)) {
+    if (!isServicedBased(f)) {
       const name = f.name;
       const val = selection.formValuesByFieldId[fid];
       if (!name || val === void 0) continue;
@@ -6057,6 +6057,7 @@ var Selection = class {
     this.emit();
   }
   add(id) {
+    if (this.set.has(id)) this.set.delete(id);
     this.set.add(id);
     this.primaryId = id;
     this.updateCurrentTagFrom(id);
@@ -6111,7 +6112,9 @@ var Selection = class {
     var _a;
     const props = this.builder.getProps();
     if (((_a = this.opts.env) != null ? _a : "client") === "workspace") {
-      const tagIds = Array.from(this.set).filter(this.builder.isTagId.bind(this.builder));
+      const tagIds = Array.from(this.set).filter(
+        this.builder.isTagId.bind(this.builder)
+      );
       if (tagIds.length > 1) {
         return { kind: "multi", groups: Array.from(this.set) };
       }
@@ -6122,6 +6125,98 @@ var Selection = class {
     const group = this.computeGroupForTag(props, tagId);
     return { kind: "single", group };
   }
+  /**
+   * Build a fieldId -> triggerKeys[] map from the current selection set.
+   *
+   * What counts as a "button selection" (trigger key):
+   * - field key where the field has button === true (e.g. "f:dripfeed")
+   * - option key (e.g. "o:fast")
+   * - composite key "fieldId::optionId" (e.g. "f:speed::o:fast")
+   *
+   * Grouping:
+   * - button-field trigger groups under its own fieldId
+   * - option/composite groups under the option's owning fieldId (from nodeMap)
+   *
+   * Deterministic:
+   * - preserves selection insertion order
+   * - de-dupes per field
+   */
+  buttonSelectionsByFieldId() {
+    var _a, _b, _c, _d, _e;
+    const nodeMap = this.builder.getNodeMap();
+    const out = {};
+    const push = (fieldId, triggerKey) => {
+      var _a2;
+      const arr = (_a2 = out[fieldId]) != null ? _a2 : out[fieldId] = [];
+      if (!arr.includes(triggerKey)) arr.push(triggerKey);
+    };
+    for (const key of this.set) {
+      if (!key) continue;
+      const idx = key.indexOf("::");
+      if (idx !== -1) {
+        const optionId = key.slice(idx + 2);
+        const optRef = nodeMap.get(optionId);
+        if ((optRef == null ? void 0 : optRef.kind) === "option" && typeof optRef.fieldId === "string") {
+          push(optRef.fieldId, key);
+        }
+        continue;
+      }
+      const ref = nodeMap.get(key);
+      if (!ref) continue;
+      if (ref.kind === "option" && typeof ref.fieldId === "string") {
+        push(ref.fieldId, (_a = ref.id) != null ? _a : key);
+        continue;
+      }
+      if (ref.kind === "field") {
+        const field = (_c = (_b = ref.node) != null ? _b : ref.field) != null ? _c : ref;
+        const fieldId = (_e = (_d = ref.id) != null ? _d : field == null ? void 0 : field.id) != null ? _e : key;
+        if ((field == null ? void 0 : field.button) === true && typeof fieldId === "string") {
+          push(fieldId, fieldId);
+        }
+      }
+    }
+    return out;
+  }
+  /**
+   * Returns only selection keys that are valid "trigger buttons":
+   * - field keys where field.button === true
+   * - option keys
+   * - composite keys "fieldId::optionId" (validated by optionId)
+   * Excludes tags and non-button fields.
+   */
+  selectedButtons() {
+    var _a, _b;
+    const nodeMap = this.builder.getNodeMap();
+    const out = [];
+    const seen = /* @__PURE__ */ new Set();
+    const push = (k) => {
+      if (!seen.has(k)) {
+        seen.add(k);
+        out.push(k);
+      }
+    };
+    for (const key of this.set) {
+      if (!key) continue;
+      const idx = key.indexOf("::");
+      if (idx !== -1) {
+        const optionId = key.slice(idx + 2);
+        const optRef = nodeMap.get(optionId);
+        if ((optRef == null ? void 0 : optRef.kind) === "option") push(key);
+        continue;
+      }
+      const ref = nodeMap.get(key);
+      if (!ref) continue;
+      if (ref.kind === "option") {
+        push(key);
+        continue;
+      }
+      if (ref.kind === "field") {
+        const field = (_b = (_a = ref.node) != null ? _a : ref.field) != null ? _b : ref;
+        if ((field == null ? void 0 : field.button) === true) push(key);
+      }
+    }
+    return out;
+  }
   // ── Internals ────────────────────────────────────────────────────────────
   emit() {
     const payload = {
@@ -6195,28 +6290,13 @@ var Selection = class {
     }
     return this.opts.rootTagId;
   }
-  selectedButtonTriggerIds(props) {
-    var _a;
-    const fields = (_a = props.fields) != null ? _a : [];
-    const fieldById = new Map(fields.map((f) => [f.id, f]));
-    const out = [];
-    for (const selId of this.set) {
-      if (selId.startsWith("o:")) {
-        out.push(selId);
-        continue;
-      }
-      const f = fieldById.get(selId);
-      if ((f == null ? void 0 : f.button) === true) out.push(selId);
-    }
-    return out;
-  }
   computeGroupForTag(props, tagId) {
     var _a, _b, _c, _d, _e, _f, _g;
     const tags = (_a = props.filters) != null ? _a : [];
     const fields = (_b = props.fields) != null ? _b : [];
     const tagById = new Map(tags.map((t) => [t.id, t]));
     const tag = tagById.get(tagId);
-    const selectedTriggerIds = this.selectedButtonTriggerIds(props);
+    const selectedTriggerIds = this.selectedButtons();
     const fieldIds = this.builder.visibleFields(tagId, selectedTriggerIds);
     const fieldById = new Map(fields.map((f) => [f.id, f]));
     const visible = fieldIds.map((id) => fieldById.get(id)).filter(Boolean);
@@ -6555,12 +6635,7 @@ function useFormApi() {
 function useOptionalFormApi() {
   return React.useContext(Ctx);
 }
-function FormProvider({
-  children,
-  schema,
-  initial,
-  onUpdate
-}) {
+function FormProvider({ children, schema, initial }) {
   const [bag, setBag] = React.useState(() => {
     var _a;
     return {
@@ -6651,7 +6726,6 @@ function FormProvider({
       },
       submit() {
         const core = coreRef.current;
-        console.log(core);
         if (!core) return { values: {}, valid: false };
         return core.submit();
       }
@@ -6664,12 +6738,7 @@ function FormProvider({
       schema,
       valueBag: bag,
       formRef: coreRef,
-      onUpdate: (vals) => {
-        const next = vals != null ? vals : {};
-        setBag((prev) => ({ ...prev, ...next }));
-        onUpdate == null ? void 0 : onUpdate({ ...bag, ...next });
-        publish();
-      },
+      onChange: () => publish(),
       children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Bridge, {}),
         children
@@ -7134,7 +7203,10 @@ function useOrderFlow() {
     const values = (_c2 = (_b2 = (_a2 = ctx.formApi).snapshot) == null ? void 0 : _b2.call(_a2)) != null ? _c2 : {};
     return values;
   }, [ctx.formApi, formTick]);
-  const optionSelectionsByFieldId = (0, import_react6.useMemo)(() => ({}), []);
+  const optionSelectionsByFieldId = (0, import_react6.useMemo)(
+    () => ({}),
+    []
+  );
   const previewSnapshot = (0, import_react6.useMemo)(() => {
     var _a2, _b2, _c2;
     if (!ready) {
@@ -7142,7 +7214,7 @@ function useOrderFlow() {
         version: "1",
         mode: "prod",
         builtAt: (/* @__PURE__ */ new Date()).toISOString(),
-        selection: { tag: "unknown", fields: [] },
+        selection: { tag: "unknown", fields: [], buttons: [] },
         inputs: { form: {}, selections: {} },
         quantity: 1,
         quantitySource: { kind: "default", defaultedFromHost: true },
@@ -7164,7 +7236,7 @@ function useOrderFlow() {
         }
       };
     }
-    const { builder, init } = ctx.ensureReady("previewSnapshot");
+    const { builder, init, selection } = ctx.ensureReady("previewSnapshot");
     const mode = (_b2 = init.mode) != null ? _b2 : "prod";
     const hostDefaultQuantity = Number((_c2 = init.hostDefaultQuantity) != null ? _c2 : 1) || 1;
     return buildOrderSnapshot(
@@ -7173,6 +7245,7 @@ function useOrderFlow() {
       {
         activeTagId: activeTagId != null ? activeTagId : ROOT_TAG_ID2,
         formValuesByFieldId,
+        selectedKeys: selection.selectedButtons(),
         optionSelectionsByFieldId
         // Selection-owned now
       },
@@ -7183,7 +7256,14 @@ function useOrderFlow() {
         fallback: ctx.fallbackPolicy
       }
     );
-  }, [ready, ctx, activeTagId, formValuesByFieldId, optionSelectionsByFieldId, selTick]);
+  }, [
+    ready,
+    ctx,
+    activeTagId,
+    formValuesByFieldId,
+    optionSelectionsByFieldId,
+    selTick
+  ]);
   const pricingPreview = (0, import_react6.useMemo)(() => {
     var _a2, _b2, _c2, _d, _e, _f;
     const empty = {
@@ -7300,17 +7380,21 @@ function useOrderFlow() {
     var _a2, _b2;
     const { builder, selection, init } = ctx.ensureReady("buildSnapshot");
     const tagId = selection.currentTag();
-    if (!tagId) throw new Error("OrderFlow: no active tag/context selected");
+    const selectedKeys = selection.selectedButtons();
+    if (!tagId)
+      throw new Error("OrderFlow: no active tag/context selected");
     const mode = (_a2 = init.mode) != null ? _a2 : "prod";
     const hostDefaultQuantity = Number((_b2 = init.hostDefaultQuantity) != null ? _b2 : 1) || 1;
     const submitted = ctx.formApi.submit();
     const values = submitted.values;
+    if (!submitted.valid) return;
     return buildOrderSnapshot(
       builder.getProps(),
       builder,
       {
         activeTagId: tagId,
         formValuesByFieldId: values,
+        selectedKeys,
         optionSelectionsByFieldId
         // Selection-owned
       },
@@ -7430,9 +7514,10 @@ function Wrapper({
   disabled,
   extraProps,
   templateStrings = true,
-  ctxOverrides
+  ctxOverrides,
+  className = ""
 }) {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const { registry } = useInputs();
   const flow = useOrderFlow();
   const kind = toKind(field);
@@ -7454,13 +7539,14 @@ function Wrapper({
   }, [baseProps, field.defaults]);
   const valueProp = (_c = adapter.valueProp) != null ? _c : "value";
   const changeProp = (_d = adapter.changeProp) != null ? _d : "onChange";
+  const errorProp = (_e = adapter.errorProp) != null ? _e : "errorText";
   const isOptionBased2 = Array.isArray(field.options) && field.options.length > 0;
   const isActionButton = field.button === true && !isOptionBased2;
   const fp = (0, import_form_palette2.useField)({
     name: field.id,
     required: !!field.required,
     variant: field.type,
-    defaultValue: (_e = field.defaults) == null ? void 0 : _e.value,
+    defaultValue: (_f = field.defaults) == null ? void 0 : _f.value,
     disabled: !!disabled
   });
   const optionIds = React4.useMemo(() => {
@@ -7549,11 +7635,12 @@ function Wrapper({
       return extraProps != null ? extraProps : {};
     return templateDeep(extraProps != null ? extraProps : {}, templateCtx);
   }, [extraProps, templateCtx, templateStrings]);
-  const fieldProps = (_g = (_f = adapter == null ? void 0 : adapter.getInputPropsFromField) == null ? void 0 : _f.call(adapter, { field, props: flow.raw })) != null ? _g : {};
+  const fieldProps = (_h = (_g = adapter == null ? void 0 : adapter.getInputPropsFromField) == null ? void 0 : _g.call(adapter, { field, props: flow.raw })) != null ? _h : {};
   const hostProps = {
     id: field.id,
     field,
     disabled: !!disabled || !!fp.disabled,
+    required: field.required,
     // DO NOT pass `name` to InputField/entries
     fieldKey: field.id,
     ...fieldProps != null ? fieldProps : {},
@@ -7562,9 +7649,10 @@ function Wrapper({
     ...templatedDefaultProps != null ? templatedDefaultProps : {},
     ...templatedExtraProps != null ? templatedExtraProps : {}
   };
-  hostProps[valueProp] = (_h = fp.value) != null ? _h : null;
+  hostProps[valueProp] = (_i = fp.value) != null ? _i : null;
   hostProps[changeProp] = onHostChange;
-  return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(Component, { ...hostProps });
+  hostProps[errorProp] = fp.error;
+  return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { ref: fp.ref, className, children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(Component, { ...hostProps }) });
 }
 
 // src/react/inputs/entries/text.tsx
@@ -9693,6 +9781,7 @@ function withInputFieldUi(desc) {
         return {
           label: field.label,
           tags: fieldNotices.map(toTagPill),
+          required: field.required,
           ...((_b = field.options) == null ? void 0 : _b.length) ? {
             options: field.options.map((item) => {
               const optionNotices = notices.filter(