eventmodeler 0.3.4 → 0.3.5

package/dist/slices/map-fields/index.js

@@ -1,4 +1,36 @@
 import { appendEvent } from '../../lib/file-loader.js';
+/**
+ * Resolves an entity ID to its canonical original.
+ * If the entity is a linked copy, returns the original's ID.
+ * Otherwise returns the entity ID unchanged.
+ */
+function resolveToOriginal(model, entityId) {
+    const event = model.events.get(entityId);
+    if (event?.originalNodeId)
+        return event.originalNodeId;
+    const readModel = model.readModels.get(entityId);
+    if (readModel?.originalNodeId)
+        return readModel.originalNodeId;
+    const screen = model.screens.get(entityId);
+    if (screen?.originalNodeId)
+        return screen.originalNodeId;
+    return entityId;
+}
+/**
+ * Checks if an entity is a linked copy (has originalNodeId set).
+ */
+function isLinkedCopy(model, entityId) {
+    const event = model.events.get(entityId);
+    if (event?.originalNodeId)
+        return true;
+    const readModel = model.readModels.get(entityId);
+    if (readModel?.originalNodeId)
+        return true;
+    const screen = model.screens.get(entityId);
+    if (screen?.originalNodeId)
+        return true;
+    return false;
+}
 function flattenFields(fields, prefix = '') {
     const result = [];
     for (const field of fields) {
@@ -64,7 +96,8 @@ export function mapFields(model, filePath, flowIdentifier, input) {
         if (arrowMatch) {
             const sourceName = arrowMatch[1].trim().toLowerCase();
             const targetName = arrowMatch[2].trim().toLowerCase();
-            // Find matching flow
+            // Find matching flow, preferring flows that don't involve linked copies
+            let fallbackFlow = undefined;
             for (const f of model.flows.values()) {
                 let sourceEntityName = '';
                 let targetEntityName = '';
@@ -104,16 +137,32 @@ export function mapFields(model, filePath, flowIdentifier, input) {
                 const sourceMatches = sourceEntityName === sourceName || sourceEntityName.includes(sourceName);
                 const targetMatches = targetEntityName === targetName || targetEntityName.includes(targetName);
                 if (sourceMatches && targetMatches) {
-                    flow = f;
-                    break;
+                    // Prefer flows that don't involve linked copies
+                    const involvesLinkedCopy = isLinkedCopy(model, f.sourceId) || isLinkedCopy(model, f.targetId);
+                    if (!involvesLinkedCopy) {
+                        flow = f;
+                        break;
+                    }
+                    else if (!fallbackFlow) {
+                        // Keep as fallback in case no non-copy flow is found
+                        fallbackFlow = f;
+                    }
                 }
             }
+            // Use fallback if no non-copy flow was found
+            if (!flow && fallbackFlow) {
+                flow = fallbackFlow;
+            }
         }
     }
     if (!flow) {
         console.error(`Error: Flow not found: ${flowIdentifier}`);
         console.error('Available flows:');
         for (const f of model.flows.values()) {
+            // Skip flows where source or target is a linked copy (UI-only elements)
+            if (isLinkedCopy(model, f.sourceId) || isLinkedCopy(model, f.targetId)) {
+                continue;
+            }
             const source = getEntityName(model, f.sourceId);
             const target = getEntityName(model, f.targetId);
             console.error(`  - ${source}→${target} (${f.id})`);
@@ -197,19 +246,21 @@ function getEntityName(model, entityId) {
     return entityId;
 }
 function getEntityFields(model, entityId) {
-    const event = model.events.get(entityId);
+    // Resolve linked copies to their originals to get canonical fields
+    const resolvedId = resolveToOriginal(model, entityId);
+    const event = model.events.get(resolvedId);
     if (event)
         return event.fields;
-    const readModel = model.readModels.get(entityId);
+    const readModel = model.readModels.get(resolvedId);
     if (readModel)
         return readModel.fields;
-    const command = model.commands.get(entityId);
+    const command = model.commands.get(resolvedId);
     if (command)
         return command.fields;
-    const screen = model.screens.get(entityId);
+    const screen = model.screens.get(resolvedId);
     if (screen)
         return screen.fields;
-    const processor = model.processors.get(entityId);
+    const processor = model.processors.get(resolvedId);
     if (processor)
         return processor.fields;
     return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eventmodeler",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "CLI tool for interacting with Event Model files - query, update, and export event models from the terminal",
   "type": "module",
   "bin": {