@timeax/digital-service-engine 0.0.2 → 0.0.4

package/dist/workspace/index.js

@@ -3457,13 +3457,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;
@@ -7755,6 +7752,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);
@@ -7809,7 +7807,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) };
       }
@@ -7820,6 +7820,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 = {
@@ -7893,28 +7985,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);