@timeax/digital-service-engine 0.2.1 → 0.2.2

package/dist/workspace/index.js

@@ -4663,6 +4663,9 @@ function toFiniteNumber(v) {
   const n = Number(v);
   return Number.isFinite(n) ? n : NaN;
 }
+function isValidServiceIdRef(value) {
+  return typeof value === "number" && Number.isFinite(value) || typeof value === "string" && value.trim().length > 0;
+}
 function constraintFitOk(svcMap, candidate, constraints) {
   const cap = getServiceCapability(svcMap, candidate);
   if (!cap) return false;
@@ -4671,18 +4674,27 @@ function constraintFitOk(svcMap, candidate, constraints) {
   return !(constraints.cancel === true && !cap.cancel);
 }
 function getServiceCapability(svcMap, candidate) {
-  if (candidate === void 0 || candidate === null) return void 0;
-  const direct = svcMap[candidate];
-  if (direct) return direct;
-  const byString = svcMap[String(candidate)];
-  if (byString) return byString;
-  if (typeof candidate === "string") {
-    const maybeNumber = Number(candidate);
-    if (Number.isFinite(maybeNumber)) {
-      return svcMap[maybeNumber];
-    }
+  var _a;
+  return (_a = getServiceCapabilityEntry(svcMap, candidate)) == null ? void 0 : _a.capability;
+}
+function getServiceCapabilityAliases(svcMap, candidate) {
+  const entry = getServiceCapabilityEntry(svcMap, candidate);
+  if (!entry) return [];
+  return collectServiceRefAliases(entry.key, entry.capability);
+}
+function isSameServiceCapabilityRef(svcMap, left, right) {
+  if (!isValidServiceIdRef(left) || !isValidServiceIdRef(right)) return false;
+  const leftAliases = new Set(
+    getServiceCapabilityAliases(svcMap, left).map((value) => String(value))
+  );
+  if (!leftAliases.size) {
+    leftAliases.add(String(left));
   }
-  return void 0;
+  const rightAliases = getServiceCapabilityAliases(svcMap, right);
+  if (!rightAliases.length) {
+    return leftAliases.has(String(right));
+  }
+  return rightAliases.some((value) => leftAliases.has(String(value)));
 }
 function normalizeRatePolicy(policy) {
   var _a;
@@ -4718,6 +4730,74 @@ function rateOk(svcMap, candidate, primary, policy) {
   if (!Number.isFinite(cRate) || !Number.isFinite(pRate)) return false;
   return passesRatePolicy(policy.ratePolicy, pRate, cRate);
 }
+function getServiceCapabilityEntry(svcMap, candidate) {
+  if (candidate === void 0 || candidate === null) return void 0;
+  const direct = svcMap[candidate];
+  if (direct) {
+    return { key: String(candidate), capability: direct };
+  }
+  const byString = svcMap[String(candidate)];
+  if (byString) {
+    return { key: String(candidate), capability: byString };
+  }
+  if (typeof candidate === "string") {
+    const maybeNumber = Number(candidate);
+    if (Number.isFinite(maybeNumber)) {
+      const byNumber = svcMap[maybeNumber];
+      if (byNumber) {
+        return { key: String(maybeNumber), capability: byNumber };
+      }
+    }
+  }
+  const target = String(candidate);
+  for (const [key, capability] of Object.entries(svcMap != null ? svcMap : {})) {
+    if (collectServiceRefAliases(key, capability).some(
+      (alias) => String(alias) === target
+    )) {
+      return { key, capability };
+    }
+  }
+  return void 0;
+}
+function collectServiceRefAliases(key, capability) {
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  const push = (value) => {
+    if (!isValidServiceIdRef(value)) return;
+    const normalized = normalizeServiceRef(value);
+    if (!normalized) return;
+    const aliasKey = String(normalized);
+    if (seen.has(aliasKey)) return;
+    seen.add(aliasKey);
+    out.push(normalized);
+  };
+  push(getCanonicalServiceRef(key, capability));
+  push(capability.service);
+  push(capability.key);
+  push(capability.id);
+  return out;
+}
+function getCanonicalServiceRef(key, capability) {
+  const explicitRefs = [capability.service, capability.key, capability.id];
+  for (const ref of explicitRefs) {
+    if (!isValidServiceIdRef(ref)) continue;
+    if (String(ref) === key) {
+      return ref;
+    }
+  }
+  return normalizeServiceRef(key);
+}
+function normalizeServiceRef(value) {
+  if (!isValidServiceIdRef(value)) return void 0;
+  if (typeof value === "number") return value;
+  const trimmed = value.trim();
+  if (!trimmed) return void 0;
+  const asNumber = Number(trimmed);
+  if (Number.isFinite(asNumber) && String(asNumber) === trimmed) {
+    return asNumber;
+  }
+  return trimmed;
+}
 
 // src/core/validate/steps/rates.ts
 function validateRates(v) {
@@ -6163,7 +6243,7 @@ function collectFailedFallbacks(props, services, settings) {
   const s = { ...DEFAULT_SETTINGS, ...settings != null ? settings : {} };
   const out = [];
   const fb = (_a = props.fallbacks) != null ? _a : {};
-  const primaryRate = (p) => rateOf(services, p);
+  const primaryRate = (primary) => rateOf(services, primary);
   for (const [nodeId, list] of Object.entries((_b = fb.nodes) != null ? _b : {})) {
     const { primary, tagContexts } = primaryForNode(props, nodeId);
     if (!primary) {
@@ -6176,34 +6256,34 @@ function collectFailedFallbacks(props, services, settings) {
       });
       continue;
     }
-    for (const cand of list) {
-      const cap = getCap(services, cand);
-      if (!cap) {
+    for (const candidate of list) {
+      const capability = getCap(services, candidate);
+      if (!capability) {
         out.push({
           scope: "node",
           nodeId,
           primary,
-          candidate: cand,
+          candidate,
           reason: "unknown_service"
         });
         continue;
       }
-      if (String(cand) === String(primary)) {
+      if (isSameServiceCapabilityRef(services, candidate, primary)) {
         out.push({
           scope: "node",
           nodeId,
           primary,
-          candidate: cand,
+          candidate,
           reason: "cycle"
         });
         continue;
       }
-      if (!passesRate(s.ratePolicy, primaryRate(primary), cap.rate)) {
+      if (!passesRate(s.ratePolicy, primaryRate(primary), capability.rate)) {
         out.push({
           scope: "node",
           nodeId,
           primary,
-          candidate: cand,
+          candidate,
           reason: "rate_violation"
         });
         continue;
@@ -6213,58 +6293,55 @@ function collectFailedFallbacks(props, services, settings) {
           scope: "node",
           nodeId,
           primary,
-          candidate: cand,
+          candidate,
           reason: "no_tag_context"
         });
         continue;
       }
-      let anyPass = false;
-      let anyFail = false;
       for (const tagId of tagContexts) {
-        const ok2 = s.requireConstraintFit ? satisfiesTagConstraints(tagId, { services, props }, cap) : true;
-        if (ok2) anyPass = true;
-        else {
-          anyFail = true;
-          out.push({
-            scope: "node",
-            nodeId,
-            primary,
-            candidate: cand,
-            tagContext: tagId,
-            reason: "constraint_mismatch"
-          });
-        }
+        const fitsConstraints = s.requireConstraintFit ? satisfiesTagConstraints(
+          tagId,
+          { services, props },
+          capability
+        ) : true;
+        if (fitsConstraints) continue;
+        out.push({
+          scope: "node",
+          nodeId,
+          primary,
+          candidate,
+          tagContext: tagId,
+          reason: "constraint_mismatch"
+        });
       }
-      void anyPass;
-      void anyFail;
     }
   }
   for (const [primary, list] of Object.entries((_c = fb.global) != null ? _c : {})) {
-    for (const cand of list) {
-      const cap = getCap(services, cand);
-      if (!cap) {
+    for (const candidate of list) {
+      const capability = getCap(services, candidate);
+      if (!capability) {
         out.push({
           scope: "global",
           primary,
-          candidate: cand,
+          candidate,
           reason: "unknown_service"
         });
         continue;
       }
-      if (String(cand) === String(primary)) {
+      if (isSameServiceCapabilityRef(services, candidate, primary)) {
         out.push({
           scope: "global",
           primary,
-          candidate: cand,
+          candidate,
           reason: "cycle"
         });
         continue;
       }
-      if (!passesRate(s.ratePolicy, primaryRate(primary), cap.rate)) {
+      if (!passesRate(s.ratePolicy, primaryRate(primary), capability.rate)) {
         out.push({
           scope: "global",
           primary,
-          candidate: cand,
+          candidate,
           reason: "rate_violation"
         });
       }
@@ -6273,52 +6350,61 @@ function collectFailedFallbacks(props, services, settings) {
   return out;
 }
 function rateOf(map, id) {
-  var _a;
+  var _a, _b;
   if (id === void 0 || id === null) return void 0;
-  const c = getCap(map, id);
-  return (_a = c == null ? void 0 : c.rate) != null ? _a : void 0;
+  return (_b = (_a = getCap(map, id)) == null ? void 0 : _a.rate) != null ? _b : void 0;
 }
-function passesRate(policy, primaryRate, candRate) {
-  if (typeof candRate !== "number" || !Number.isFinite(candRate))
+function passesRate(policy, primaryRate, candidateRate) {
+  if (typeof candidateRate !== "number" || !Number.isFinite(candidateRate)) {
     return false;
-  if (typeof primaryRate !== "number" || !Number.isFinite(primaryRate))
+  }
+  if (typeof primaryRate !== "number" || !Number.isFinite(primaryRate)) {
     return false;
-  return passesRatePolicy(normalizeRatePolicy(policy), primaryRate, candRate);
+  }
+  return passesRatePolicy(
+    normalizeRatePolicy(policy),
+    primaryRate,
+    candidateRate
+  );
 }
 function getCap(map, id) {
   return getServiceCapability(map, id);
 }
-function isCapFlagEnabled(cap, flagId) {
+function isCapFlagEnabled(capability, flagId) {
   var _a, _b;
-  const fromFlags = (_b = (_a = cap.flags) == null ? void 0 : _a[flagId]) == null ? void 0 : _b.enabled;
+  const fromFlags = (_b = (_a = capability.flags) == null ? void 0 : _a[flagId]) == null ? void 0 : _b.enabled;
   if (fromFlags === true) return true;
   if (fromFlags === false) return false;
-  const legacy = cap[flagId];
+  const legacy = capability[flagId];
   return legacy === true;
 }
-function satisfiesTagConstraints(tagId, ctx, cap) {
-  const tag = ctx.props.filters.find((t) => t.id === tagId);
-  const eff = tag == null ? void 0 : tag.constraints;
-  if (!eff) return true;
-  for (const [key, value] of Object.entries(eff)) {
-    if (value === true && !isCapFlagEnabled(cap, key)) {
+function satisfiesTagConstraints(tagId, ctx, capability) {
+  const tag = ctx.props.filters.find((item) => item.id === tagId);
+  const effectiveConstraints2 = tag == null ? void 0 : tag.constraints;
+  if (!effectiveConstraints2) return true;
+  for (const [key, value] of Object.entries(effectiveConstraints2)) {
+    if (value === true && !isCapFlagEnabled(capability, key)) {
       return false;
     }
   }
   return true;
 }
 function primaryForNode(props, nodeId) {
-  const tag = props.filters.find((t) => t.id === nodeId);
+  const tag = props.filters.find((item) => item.id === nodeId);
   if (tag) {
     return { primary: tag.service_id, tagContexts: [tag.id] };
   }
   const field = props.fields.find(
-    (f) => Array.isArray(f.options) && f.options.some((o) => o.id === nodeId)
+    (item) => Array.isArray(item.options) && item.options.some((option2) => option2.id === nodeId)
   );
-  if (!field) return { tagContexts: [], reasonNoPrimary: "no_parent_field" };
-  const opt = field.options.find((o) => o.id === nodeId);
-  const contexts = bindIdsToArray(field.bind_id);
-  return { primary: opt.service_id, tagContexts: contexts };
+  if (!field) {
+    return { tagContexts: [], reasonNoPrimary: "no_parent_field" };
+  }
+  const option = field.options.find((item) => item.id === nodeId);
+  return {
+    primary: option.service_id,
+    tagContexts: bindIdsToArray(field.bind_id)
+  };
 }
 function bindIdsToArray(bind) {
   if (!bind) return [];