libpetri 2.10.2 → 2.10.4

package/dist/index.js

@@ -1130,6 +1130,8 @@ function mergeTransitions(caller, instance, mergedName) {
   const mergedTiming = mergeTimings(caller.timing, instance.timing, mergedName);
   const mergedPriority = pickPriority(caller.priority, instance.priority);
   const mergedAction = composeActions(caller.action, instance.action);
+  const mergedMatch = mergeMatchSpecs(caller.matchSpec, instance.matchSpec, mergedName);
+  const mergedAlias = mergePlaceAlias(caller.placeAlias, instance.placeAlias, mergedName);
   const builder = Transition.builder(mergedName).timing(mergedTiming).priority(mergedPriority);
   if (mergedAction !== void 0) {
     builder.action(mergedAction);
@@ -1155,8 +1157,36 @@ function mergeTransitions(caller, instance, mergedName) {
   for (const rs of unionArcs(caller.resets, instance.resets, keyOfReset)) {
     builder.reset(rs.place);
   }
+  if (mergedMatch !== null) {
+    builder.match(mergedMatch);
+  }
+  if (mergedAlias.size > 0) {
+    builder.placeAlias(mergedAlias);
+  }
   return builder.build();
 }
+function mergeMatchSpecs(caller, instance, channelName) {
+  if (caller === null) return instance;
+  if (instance === null) return caller;
+  throw new Error(
+    `Channel composition '${channelName}': both the caller-side and instance-side transition carry a \u03BD-net match \u2014 refusing to fuse two independent correlations into one transition (NU-060). Resolve explicitly by keeping the match on a single side.`
+  );
+}
+function mergePlaceAlias(caller, instance, channelName) {
+  if (caller.size === 0) return instance;
+  if (instance.size === 0) return caller;
+  const merged = new Map(caller);
+  for (const [declared, actual] of instance) {
+    const existing = merged.get(declared);
+    if (existing !== void 0 && existing.name !== actual.name) {
+      throw new Error(
+        `Channel composition '${channelName}': conflicting declared\u2192actual place alias for declared place '${declared}' \u2014 caller-side maps to '${existing.name}', instance-side to '${actual.name}' (MOD-031). Resolve explicitly.`
+      );
+    }
+    merged.set(declared, actual);
+  }
+  return merged;
+}
 function mergeTimings(caller, instance, channelName) {
   if (caller.type === "immediate" && instance.type === "immediate") {
     return { type: "immediate" };
@@ -2298,6 +2328,9 @@ function rebuildWithAction(t, action) {
   for (const r of t.resets) {
     builder.reset(r.place);
   }
+  if (t.matchSpec !== null) {
+    builder.match(t.matchSpec);
+  }
   return builder.build();
 }