@timeax/digital-service-engine 0.2.5 → 0.2.7

package/dist/workspace/index.js

@@ -4658,10 +4658,19 @@ function validateOrderKinds(v) {
 }
 
 // src/core/validate/steps/service-vs-input.ts
+function hasButtonTriggerMap(v, fieldId) {
+  var _a, _b;
+  const includes = (_a = v.props.includes_for_buttons) == null ? void 0 : _a[fieldId];
+  const excludes = (_b = v.props.excludes_for_buttons) == null ? void 0 : _b[fieldId];
+  return Array.isArray(includes) && includes.length > 0 || Array.isArray(excludes) && excludes.length > 0;
+}
 function validateServiceVsUserInput(v) {
   for (const f of v.fields) {
     const anySvc = hasAnyServiceOption(f);
     const hasName = !!(f.name && f.name.trim());
+    const isButton2 = f.button === true;
+    const hasFieldService = f.service_id !== void 0 && f.service_id !== null;
+    const hasTriggerMap = isButton2 && hasButtonTriggerMap(v, f.id);
     if (f.type === "custom" && anySvc) {
       v.errors.push({
         code: "user_input_field_has_service_option",
@@ -4672,14 +4681,15 @@ function validateServiceVsUserInput(v) {
       });
     }
     if (!hasName) {
-      if (!anySvc) {
-        v.errors.push({
-          code: "service_field_missing_service_id",
-          severity: "error",
-          message: `Service-backed field "${f.id}" has no "name" and must provide at least one option with a service_id.`,
-          nodeId: f.id
-        });
+      if (hasFieldService || anySvc || hasTriggerMap) {
+        continue;
       }
+      v.errors.push({
+        code: "service_field_missing_service_id",
+        severity: "error",
+        message: isButton2 ? `Button field "${f.id}" has no "name", no "service_id", and no includes/excludes trigger map. Add a name, attach a service_id, or configure includes_for_buttons/excludes_for_buttons.` : `Service-backed field "${f.id}" has no "name" and must provide at least one option with a service_id.`,
+        nodeId: f.id
+      });
     } else {
       if (anySvc) {
         v.errors.push({
@@ -6611,7 +6621,7 @@ function createNodeIndex(builder) {
     for (const fieldId of visible) {
       const node = getField(fieldId);
       if (!node) continue;
-      const explicit = includes.has(fieldId) || isFieldBoundDirectToTag(fieldId, tagId);
+      const explicit = includes.has(fieldId);
       results.push(explicit ? node : { ...node, isInherited: true });
     }
     return Object.freeze(results);
@@ -8365,7 +8375,9 @@ function include(ctx, receiverId, idOrIds) {
       const ids = Array.isArray(idOrIds) ? idOrIds : [idOrIds];
       if (receiver.kind === "tag" || receiver.kind === "field" && isActualButtonField(receiver.data) || receiver.kind === "option") {
         if (receiver.kind === "tag") {
-          const t = ((_a = p.filters) != null ? _a : []).find((x) => x.id === receiverId);
+          const t = ((_a = p.filters) != null ? _a : []).find(
+            (x) => x.id === receiverId
+          );
           if (t) {
             const accepted = [];
             const next = new Set((_b = t.includes) != null ? _b : []);
@@ -8407,7 +8419,12 @@ function include(ctx, receiverId, idOrIds) {
           const current = (_f = (_e = p.includes_for_buttons) == null ? void 0 : _e[receiverId]) != null ? _f : [];
           const next = new Set(current);
           for (const id of ids) {
-            if (wouldCreateIncludeExcludeCycle(ctx, p, receiverId, id)) {
+            if (wouldCreateIncludeExcludeCycle(
+              ctx,
+              p,
+              receiverId,
+              id
+            )) {
               ctx.emit("editor:error", {
                 message: `Cycle detected: ${receiverId} including ${id} would create a cycle.`,
                 code: "cycle_detected",
@@ -8423,7 +8440,8 @@ function include(ctx, receiverId, idOrIds) {
             accepted.push(id);
           }
           if (accepted.length > 0 || current.length > 0) {
-            if (!p.includes_for_buttons) p.includes_for_buttons = {};
+            if (!p.includes_for_buttons)
+              p.includes_for_buttons = {};
             p.includes_for_buttons[receiverId] = Array.from(next);
           }
           if ((_g = p.excludes_for_buttons) == null ? void 0 : _g[receiverId]) {
@@ -8438,7 +8456,9 @@ function include(ctx, receiverId, idOrIds) {
         if (!p.fields) p.fields = [];
         if (!p.filters) p.filters = [];
       } else {
-        throw new Error("Receiver must be a tag, button field, or option");
+        throw new Error(
+          "Receiver must be a tag, button field, or option"
+        );
       }
     }),
     undo: () => ctx.undo()
@@ -8453,7 +8473,9 @@ function exclude(ctx, receiverId, idOrIds) {
       const ids = Array.isArray(idOrIds) ? idOrIds : [idOrIds];
       if (receiver.kind === "tag" || receiver.kind === "field" && isActualButtonField(receiver.data) || receiver.kind === "option") {
         if (receiver.kind === "tag") {
-          const t = ((_a = p.filters) != null ? _a : []).find((x) => x.id === receiverId);
+          const t = ((_a = p.filters) != null ? _a : []).find(
+            (x) => x.id === receiverId
+          );
           if (t) {
             const accepted = [];
             const next = new Set((_b = t.excludes) != null ? _b : []);
@@ -8495,7 +8517,12 @@ function exclude(ctx, receiverId, idOrIds) {
           const current = (_f = (_e = p.excludes_for_buttons) == null ? void 0 : _e[receiverId]) != null ? _f : [];
           const next = new Set(current);
           for (const id of ids) {
-            if (wouldCreateIncludeExcludeCycle(ctx, p, receiverId, id)) {
+            if (wouldCreateIncludeExcludeCycle(
+              ctx,
+              p,
+              receiverId,
+              id
+            )) {
               ctx.emit("editor:error", {
                 message: `Cycle detected: ${receiverId} excluding ${id} would create a cycle.`,
                 code: "cycle_detected",
@@ -8511,7 +8538,8 @@ function exclude(ctx, receiverId, idOrIds) {
             accepted.push(id);
           }
           if (accepted.length > 0 || current.length > 0) {
-            if (!p.excludes_for_buttons) p.excludes_for_buttons = {};
+            if (!p.excludes_for_buttons)
+              p.excludes_for_buttons = {};
             p.excludes_for_buttons[receiverId] = Array.from(next);
           }
           if ((_g = p.includes_for_buttons) == null ? void 0 : _g[receiverId]) {
@@ -8526,7 +8554,9 @@ function exclude(ctx, receiverId, idOrIds) {
         if (!p.fields) p.fields = [];
         if (!p.filters) p.filters = [];
       } else {
-        throw new Error("Receiver must be a tag, button field, or option");
+        throw new Error(
+          "Receiver must be a tag, button field, or option"
+        );
       }
     }),
     undo: () => ctx.undo()
@@ -8536,87 +8566,98 @@ function connect(ctx, kind, fromId, toId2) {
   ctx.exec({
     name: `connect:${kind}`,
     do: () => ctx.patchProps((p) => {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c, _d, _e, _f, _g, _h;
       if (kind === "bind") {
         if (ctx.isTagId(fromId) && ctx.isTagId(toId2)) {
           if (wouldCreateTagCycle(ctx, p, fromId, toId2)) {
-            throw new Error(`bind would create a cycle: ${fromId} ? ${toId2}`);
+            throw new Error(
+              `bind would create a cycle: ${fromId} ? ${toId2}`
+            );
           }
-          const child = ((_a = p.filters) != null ? _a : []).find((t) => t.id === toId2);
+          const child = ((_a = p.filters) != null ? _a : []).find(
+            (t) => t.id === toId2
+          );
           if (child) child.bind_id = fromId;
           return;
         }
         if (ctx.isTagId(fromId) && ctx.isFieldId(toId2) || ctx.isFieldId(fromId) && ctx.isTagId(toId2)) {
           const fieldId = ctx.isFieldId(toId2) ? toId2 : fromId;
           const tagId = ctx.isTagId(fromId) ? fromId : toId2;
-          const f = ((_b = p.fields) != null ? _b : []).find((x) => x.id === fieldId);
+          const f = ((_b = p.fields) != null ? _b : []).find(
+            (x) => x.id === fieldId
+          );
           if (!f) return;
           if (!f.bind_id) {
             f.bind_id = tagId;
             return;
           }
           if (typeof f.bind_id === "string") {
-            if (f.bind_id !== tagId) f.bind_id = [f.bind_id, tagId];
+            if (f.bind_id !== tagId) {
+              f.bind_id = [f.bind_id, tagId];
+            }
             return;
           }
-          if (!f.bind_id.includes(tagId)) f.bind_id.push(tagId);
+          if (!f.bind_id.includes(tagId)) {
+            f.bind_id.push(tagId);
+          }
           return;
         }
-        throw new Error(`bind: unsupported route ${fromId} ? ${toId2}`);
+        throw new Error(
+          `bind: unsupported route ${fromId} ? ${toId2}`
+        );
       }
       if (kind === "include" || kind === "exclude") {
-        const key = kind === "include" ? "includes" : "excludes";
+        const tagKey = kind === "include" ? "includes" : "excludes";
+        const mapKey = kind === "include" ? "includes_for_buttons" : "excludes_for_buttons";
         if (ctx.isTagId(fromId) && ctx.isFieldId(toId2)) {
-          const t = ((_c = p.filters) != null ? _c : []).find((x) => x.id === fromId);
+          const t = ((_c = p.filters) != null ? _c : []).find(
+            (x) => x.id === fromId
+          );
           if (!t) return;
-          const arr = (_d = t[key]) != null ? _d : t[key] = [];
+          const arr = (_d = t[tagKey]) != null ? _d : t[tagKey] = [];
           if (!arr.includes(toId2)) arr.push(toId2);
           return;
         }
+        if (ctx.isFieldId(fromId) && ctx.isFieldId(toId2)) {
+          const source = ((_e = p.fields) != null ? _e : []).find(
+            (x) => x.id === fromId
+          );
+          if (!(source == null ? void 0 : source.button)) {
+            throw new Error(
+              `${kind}: source field must be button=true: ${fromId} ? ${toId2}`
+            );
+          }
+          addMappedField(p, mapKey, fromId, toId2);
+          return;
+        }
         if (ctx.isOptionId(fromId) && ctx.isFieldId(toId2)) {
-          const mapKey = kind === "include" ? "includes_for_options" : "excludes_for_options";
-          const maps = p[mapKey];
-          const next = { ...maps != null ? maps : {} };
-          const arr = (_e = next[fromId]) != null ? _e : [];
-          if (!arr.includes(toId2)) arr.push(toId2);
-          next[fromId] = arr;
-          p[mapKey] = next;
+          addMappedField(p, mapKey, fromId, toId2);
           return;
         }
-        throw new Error(`${kind}: unsupported route ${fromId} ? ${toId2}`);
+        throw new Error(
+          `${kind}: unsupported route ${fromId} ? ${toId2}`
+        );
       }
       if (kind === "service") {
         ensureServiceExists(ctx.opts, fromId);
         if (toId2.startsWith("t:")) {
-          ctx.exec({
-            name: "connect:service?tag",
-            do: () => ctx.patchProps((next) => {
-              var _a2;
-              const t = ((_a2 = next.filters) != null ? _a2 : []).find((x) => x.id === toId2);
-              if (t) t.service_id = fromId;
-            }),
-            undo: () => ctx.undo()
-          });
+          const t = ((_f = p.filters) != null ? _f : []).find((x) => x.id === toId2);
+          if (t) t.service_id = fromId;
           return;
         }
         if (toId2.startsWith("o:")) {
-          ctx.exec({
-            name: "connect:service?option",
-            do: () => ctx.patchProps((next) => {
-              var _a2, _b2;
-              for (const f of (_a2 = next.fields) != null ? _a2 : []) {
-                const o = (_b2 = f.options) == null ? void 0 : _b2.find((x) => x.id === toId2);
-                if (o) {
-                  o.service_id = fromId;
-                  return;
-                }
-              }
-            }),
-            undo: () => ctx.undo()
-          });
+          for (const f of (_g = p.fields) != null ? _g : []) {
+            const o = (_h = f.options) == null ? void 0 : _h.find((x) => x.id === toId2);
+            if (o) {
+              o.service_id = fromId;
+              return;
+            }
+          }
           return;
         }
-        throw new Error('service: to must be a tag ("t:*") or option ("o:*")');
+        throw new Error(
+          'service: to must be a tag ("t:*") or option ("o:*")'
+        );
       }
       throw new Error(`Unknown connect kind: ${kind}`);
     }),
@@ -8627,90 +8668,109 @@ function disconnect(ctx, kind, fromId, toId2) {
   ctx.exec({
     name: `disconnect:${kind}`,
     do: () => ctx.patchProps((p) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
       if (kind === "bind") {
         if (ctx.isTagId(fromId) && ctx.isTagId(toId2)) {
-          const child = ((_a = p.filters) != null ? _a : []).find((t) => t.id === toId2);
-          if ((child == null ? void 0 : child.bind_id) === fromId) delete child.bind_id;
+          const child = ((_a = p.filters) != null ? _a : []).find(
+            (t) => t.id === toId2
+          );
+          if ((child == null ? void 0 : child.bind_id) === fromId) {
+            delete child.bind_id;
+          }
           return;
         }
         if (ctx.isTagId(fromId) && ctx.isFieldId(toId2) || ctx.isFieldId(fromId) && ctx.isTagId(toId2)) {
           const fieldId = ctx.isFieldId(toId2) ? toId2 : fromId;
           const tagId = ctx.isTagId(fromId) ? fromId : toId2;
-          const f = ((_b = p.fields) != null ? _b : []).find((x) => x.id === fieldId);
+          const f = ((_b = p.fields) != null ? _b : []).find(
+            (x) => x.id === fieldId
+          );
           if (!(f == null ? void 0 : f.bind_id)) return;
           if (typeof f.bind_id === "string") {
-            if (f.bind_id === tagId) delete f.bind_id;
+            if (f.bind_id === tagId) {
+              delete f.bind_id;
+            }
             return;
           }
           f.bind_id = f.bind_id.filter((x) => x !== tagId);
-          if (((_c = f.bind_id) == null ? void 0 : _c.length) === 0) delete f.bind_id;
+          if (((_c = f.bind_id) == null ? void 0 : _c.length) === 0) {
+            delete f.bind_id;
+          }
           return;
         }
-        throw new Error(`unbind: unsupported route ${fromId} ? ${toId2}`);
+        throw new Error(
+          `unbind: unsupported route ${fromId} ? ${toId2}`
+        );
       }
       if (kind === "include" || kind === "exclude") {
-        const key = kind === "include" ? "includes" : "excludes";
+        const tagKey = kind === "include" ? "includes" : "excludes";
+        const mapKey = kind === "include" ? "includes_for_buttons" : "excludes_for_buttons";
         if (ctx.isTagId(fromId) && ctx.isFieldId(toId2)) {
-          const t = ((_d = p.filters) != null ? _d : []).find((x) => x.id === fromId);
+          const t = ((_d = p.filters) != null ? _d : []).find(
+            (x) => x.id === fromId
+          );
           if (!t) return;
-          t[key] = ((_e = t[key]) != null ? _e : []).filter((x) => x !== toId2);
-          if (!((_f = t[key]) == null ? void 0 : _f.length)) delete t[key];
+          t[tagKey] = ((_e = t[tagKey]) != null ? _e : []).filter((x) => x !== toId2);
+          if (!((_f = t[tagKey]) == null ? void 0 : _f.length)) {
+            delete t[tagKey];
+          }
           return;
         }
-        if (ctx.isOptionId(fromId) && ctx.isFieldId(toId2)) {
-          const mapKey = kind === "include" ? "includes_for_options" : "excludes_for_options";
+        if ((ctx.isFieldId(fromId) || ctx.isOptionId(fromId)) && ctx.isFieldId(toId2)) {
           const maps = p[mapKey];
-          if (!maps) return;
-          if (maps[fromId]) {
-            maps[fromId] = ((_g = maps[fromId]) != null ? _g : []).filter(
-              (fid) => fid !== toId2
-            );
-            if (!((_h = maps[fromId]) == null ? void 0 : _h.length)) delete maps[fromId];
+          if (!(maps == null ? void 0 : maps[fromId])) return;
+          maps[fromId] = maps[fromId].filter(
+            (fid) => fid !== toId2
+          );
+          if (!((_g = maps[fromId]) == null ? void 0 : _g.length)) {
+            delete maps[fromId];
+          }
+          if (!Object.keys(maps).length) {
+            delete p[mapKey];
           }
-          if (!Object.keys(maps).length) delete p[mapKey];
           return;
         }
-        throw new Error(`${kind}: unsupported route ${fromId} ? ${toId2}`);
+        throw new Error(
+          `${kind}: unsupported route ${fromId} ? ${toId2}`
+        );
       }
       if (kind === "service") {
         ensureServiceExists(ctx.opts, fromId);
         if (toId2.startsWith("t:")) {
-          ctx.exec({
-            name: "disconnect:service?tag",
-            do: () => ctx.patchProps((next) => {
-              var _a2;
-              const t = ((_a2 = next.filters) != null ? _a2 : []).find((x) => x.id === toId2);
-              if (t) delete t.service_id;
-            }),
-            undo: () => ctx.undo()
-          });
+          const t = ((_h = p.filters) != null ? _h : []).find((x) => x.id === toId2);
+          if (t) {
+            delete t.service_id;
+          }
           return;
         }
         if (toId2.startsWith("o:")) {
-          ctx.exec({
-            name: "disconnect:service?option",
-            do: () => ctx.patchProps((next) => {
-              var _a2, _b2;
-              for (const f of (_a2 = next.fields) != null ? _a2 : []) {
-                const o = (_b2 = f.options) == null ? void 0 : _b2.find((x) => x.id === toId2);
-                if (o) {
-                  delete o.service_id;
-                  return;
-                }
-              }
-            }),
-            undo: () => ctx.undo()
-          });
+          for (const f of (_i = p.fields) != null ? _i : []) {
+            const o = (_j = f.options) == null ? void 0 : _j.find((x) => x.id === toId2);
+            if (o) {
+              delete o.service_id;
+              return;
+            }
+          }
           return;
         }
-        throw new Error('service: to must be a tag ("t:*") or option ("o:*")');
+        throw new Error(
+          'service: to must be a tag ("t:*") or option ("o:*")'
+        );
       }
       throw new Error(`Unknown disconnect kind: ${kind}`);
     }),
     undo: () => ctx.undo()
   });
 }
+function addMappedField(p, mapKey, fromId, toId2) {
+  var _a, _b;
+  const maps = (_a = p[mapKey]) != null ? _a : {};
+  const arr = (_b = maps[fromId]) != null ? _b : [];
+  if (!arr.includes(toId2)) {
+    maps[fromId] = [...arr, toId2];
+  }
+  p[mapKey] = maps;
+}
 
 // src/react/canvas/editor/editor-service-filter.ts
 function filterServicesForVisibleGroup2(ctx, candidates, input) {