eventmodeler 0.3.0 → 0.3.2

package/dist/index.js

@@ -91,7 +91,7 @@ COMMANDS:
   map fields --flow <source→target> --json|--xml <mappings>
                                  Set field mappings on a flow
 
-  update field --command|--event|--read-model|--screen|--processor <name> --field <name> [--optional true|false] [--generated true|false]
+  update field --command|--event|--read-model|--screen|--processor <name> --field <name> [--optional true|false] [--generated true|false] [--user-input true|false (screen only)]
                                  Update field properties
 
   create state-change-slice --xml <data>
@@ -282,14 +282,16 @@ async function main() {
             break;
         case 'mark': {
             // mark <slice-name> <status> - status is last arg, slice name is everything before
+            // Note: subcommand contains first part of slice name, remainingArgs has the rest
             const validStatuses = ['created', 'in-progress', 'blocked', 'done'];
-            const lastArg = remainingArgs[remainingArgs.length - 1];
-            if (remainingArgs.length < 2 || !validStatuses.includes(lastArg)) {
+            const allArgs = subcommand ? [subcommand, ...remainingArgs] : remainingArgs;
+            const lastArg = allArgs[allArgs.length - 1];
+            if (allArgs.length < 2 || !validStatuses.includes(lastArg)) {
                 console.error('Usage: eventmodeler mark <slice-name> <status>');
                 console.error('Valid statuses: created, in-progress, blocked, done');
                 process.exit(1);
             }
-            const sliceName = remainingArgs.slice(0, -1).join(' ');
+            const sliceName = allArgs.slice(0, -1).join(' ');
             const status = lastArg;
             markSliceStatus(model, filePath, sliceName, status);
             break;
@@ -421,10 +423,16 @@ async function main() {
                     const fieldArg = getNamedArg(filteredArgs, '--field');
                     const optionalArg = getNamedArg(filteredArgs, '--optional');
                     const generatedArg = getNamedArg(filteredArgs, '--generated');
+                    const userInputArg = getNamedArg(filteredArgs, '--user-input');
                     const typeArg = getNamedArg(filteredArgs, '--type');
                     if (!fieldArg) {
                         console.error('Error: --field is required');
-                        console.error('Usage: eventmodeler update field --command|--event|--read-model|--screen|--processor <name> --field <field-name> [--optional true|false] [--generated true|false]');
+                        console.error('Usage: eventmodeler update field --command|--event|--read-model|--screen|--processor <name> --field <field-name> [--optional true|false] [--generated true|false] [--user-input true|false (screen only)]');
+                        process.exit(1);
+                    }
+                    // --user-input is only valid for screens
+                    if (userInputArg !== undefined && !screenArg) {
+                        console.error('Error: --user-input can only be used with --screen');
                         process.exit(1);
                     }
                     const updates = {};
@@ -434,11 +442,14 @@ async function main() {
                     if (generatedArg !== undefined) {
                         updates.generated = generatedArg === 'true';
                     }
+                    if (userInputArg !== undefined) {
+                        updates.userInput = userInputArg === 'true';
+                    }
                     if (typeArg !== undefined) {
                         updates.type = typeArg;
                     }
                     if (Object.keys(updates).length === 0) {
-                        console.error('Error: Must specify at least one update (--optional, --generated, or --type)');
+                        console.error('Error: Must specify at least one update (--optional, --generated, --user-input, or --type)');
                         process.exit(1);
                     }
                     updateField(model, filePath, { command: commandArg, event: eventArg, readModel: readModelArg, screen: screenArg, processor: processorArg }, fieldArg, updates);

package/dist/lib/flow-utils.js

@@ -61,12 +61,16 @@ function isElementInSlice(slice, position, width, height) {
         centerY >= slice.position.y &&
         centerY <= slice.position.y + slice.size.height);
 }
-// Get all component IDs in a slice
+// Get all component IDs in a slice (including canonical group members for linked copies)
 export function getSliceComponentIds(model, slice) {
     const ids = new Set();
+    const canonicalIds = new Set();
+    // First pass: collect IDs and canonical IDs of elements in the slice
     for (const screen of model.screens.values()) {
         if (isElementInSlice(slice, screen.position, screen.width, screen.height)) {
             ids.add(screen.id);
+            if (screen.canonicalId)
+                canonicalIds.add(screen.canonicalId);
         }
     }
     for (const command of model.commands.values()) {
@@ -77,11 +81,15 @@ export function getSliceComponentIds(model, slice) {
     for (const event of model.events.values()) {
         if (isElementInSlice(slice, event.position, event.width, event.height)) {
             ids.add(event.id);
+            if (event.canonicalId)
+                canonicalIds.add(event.canonicalId);
         }
     }
     for (const readModel of model.readModels.values()) {
         if (isElementInSlice(slice, readModel.position, readModel.width, readModel.height)) {
             ids.add(readModel.id);
+            if (readModel.canonicalId)
+                canonicalIds.add(readModel.canonicalId);
         }
     }
     for (const processor of model.processors.values()) {
@@ -89,6 +97,25 @@ export function getSliceComponentIds(model, slice) {
             ids.add(processor.id);
         }
     }
+    // Second pass: add all elements that share a canonical ID with elements in the slice
+    // This ensures flows targeting any element in a canonical group are detected
+    if (canonicalIds.size > 0) {
+        for (const screen of model.screens.values()) {
+            if (screen.canonicalId && canonicalIds.has(screen.canonicalId)) {
+                ids.add(screen.id);
+            }
+        }
+        for (const event of model.events.values()) {
+            if (event.canonicalId && canonicalIds.has(event.canonicalId)) {
+                ids.add(event.id);
+            }
+        }
+        for (const readModel of model.readModels.values()) {
+            if (readModel.canonicalId && canonicalIds.has(readModel.canonicalId)) {
+                ids.add(readModel.id);
+            }
+        }
+    }
     return ids;
 }
 // Find which slice contains a component

package/dist/slices/add-field/index.js

@@ -36,6 +36,7 @@ function parseXmlInput(input) {
         isList: getBoolAttr(fieldMatch[1], 'isList'),
         isGenerated: getBoolAttr(fieldMatch[1], 'isGenerated'),
         isOptional: getBoolAttr(fieldMatch[1], 'isOptional'),
+        isUserInput: getBoolAttr(fieldMatch[1], 'isUserInput'),
     };
     // Parse nested subfields for Custom type
     if (type === 'Custom' && fieldMatch[2]) {
@@ -63,6 +64,7 @@ function createFieldFromInput(input) {
         isList: input.isList ?? false,
         isGenerated: input.isGenerated ?? false,
         isOptional: input.isOptional,
+        isUserInput: input.isUserInput,
         subfields: input.subfields?.map(createFieldFromInput),
     };
 }

package/dist/slices/codegen-slice/index.js

@@ -292,12 +292,42 @@ export function codegenSlice(model, sliceName) {
     const slice = findElementOrExit(model.slices, sliceName, 'slice');
     // 2. Get components inside slice
     const components = getSliceComponents(model, slice);
-    // 3. Build component ID set
+    // 3. Build component ID set (including canonical group members for linked copies)
     const componentIds = new Set();
     components.commands.forEach(c => componentIds.add(c.id));
-    components.events.forEach(e => componentIds.add(e.id));
-    components.readModels.forEach(rm => componentIds.add(rm.id));
-    components.screens.forEach(s => componentIds.add(s.id));
+    components.events.forEach(e => {
+        componentIds.add(e.id);
+        // If this is a linked copy, also add all elements in the same canonical group
+        if (e.canonicalId) {
+            for (const evt of model.events.values()) {
+                if (evt.canonicalId === e.canonicalId) {
+                    componentIds.add(evt.id);
+                }
+            }
+        }
+    });
+    components.readModels.forEach(rm => {
+        componentIds.add(rm.id);
+        // If this is a linked copy, also add all elements in the same canonical group
+        if (rm.canonicalId) {
+            for (const r of model.readModels.values()) {
+                if (r.canonicalId === rm.canonicalId) {
+                    componentIds.add(r.id);
+                }
+            }
+        }
+    });
+    components.screens.forEach(s => {
+        componentIds.add(s.id);
+        // If this is a linked copy, also add all elements in the same canonical group
+        if (s.canonicalId) {
+            for (const scr of model.screens.values()) {
+                if (scr.canonicalId === s.canonicalId) {
+                    componentIds.add(scr.id);
+                }
+            }
+        }
+    });
     components.processors.forEach(p => componentIds.add(p.id));
     // 4. Determine slice type
     const sliceType = determineSliceType(components.processors.length > 0, components.commands.length > 0, components.events.length > 0, components.readModels.length > 0, components.screens.length > 0);

package/dist/slices/show-slice/index.js

@@ -1,7 +1,7 @@
 import { escapeXml, escapeXmlText, outputJson } from '../../lib/format.js';
 import { findElementOrExit } from '../../lib/element-lookup.js';
 import { findChapterForSlice, getChapterHierarchy } from '../../lib/chapter-utils.js';
-import { getInboundFlows, getOutboundFlows, getFlowsForElement, } from '../../lib/flow-utils.js';
+import { getInboundFlows, getOutboundFlows, getFlowsForElement, getSliceComponentIds, } from '../../lib/flow-utils.js';
 function formatFieldValues(values) {
     if (!values || Object.keys(values).length === 0)
         return '';
@@ -189,12 +189,8 @@ function formatSliceXml(model, slice) {
     const components = getSliceComponents(model, slice);
     const scenarios = [...model.scenarios.values()].filter(s => s.sliceId === slice.id);
     const chapter = findChapterForSlice(model, slice);
-    const componentIds = new Set();
-    components.commands.forEach(c => componentIds.add(c.id));
-    components.events.forEach(e => componentIds.add(e.id));
-    components.readModels.forEach(rm => componentIds.add(rm.id));
-    components.screens.forEach(s => componentIds.add(s.id));
-    components.processors.forEach(p => componentIds.add(p.id));
+    // Use shared function that handles canonical groups for linked copies
+    const componentIds = getSliceComponentIds(model, slice);
     const flows = [...model.flows.values()].filter(f => componentIds.has(f.sourceId) || componentIds.has(f.targetId));
     const internalFlows = flows.filter(f => componentIds.has(f.sourceId) && componentIds.has(f.targetId));
     // Get inbound and outbound flows for the slice
@@ -430,12 +426,8 @@ function formatSliceJson(model, slice) {
     const components = getSliceComponents(model, slice);
     const scenarios = [...model.scenarios.values()].filter(s => s.sliceId === slice.id);
     const chapter = findChapterForSlice(model, slice);
-    const componentIds = new Set();
-    components.commands.forEach(c => componentIds.add(c.id));
-    components.events.forEach(e => componentIds.add(e.id));
-    components.readModels.forEach(rm => componentIds.add(rm.id));
-    components.screens.forEach(s => componentIds.add(s.id));
-    components.processors.forEach(p => componentIds.add(p.id));
+    // Use shared function that handles canonical groups for linked copies
+    const componentIds = getSliceComponentIds(model, slice);
     const flows = [...model.flows.values()].filter(f => componentIds.has(f.sourceId) || componentIds.has(f.targetId));
     const internalFlows = flows.filter(f => componentIds.has(f.sourceId) && componentIds.has(f.targetId));
     // Get inbound and outbound flows for the slice

package/dist/slices/update-field/index.d.ts

@@ -2,6 +2,7 @@ import type { EventModel } from '../../types.js';
 interface UpdateOptions {
     optional?: boolean;
     generated?: boolean;
+    userInput?: boolean;
     type?: string;
 }
 export declare function updateField(model: EventModel, filePath: string, options: {

package/dist/slices/update-field/index.js

@@ -28,6 +28,7 @@ function createUpdatedField(original, updates) {
         ...original,
         isOptional: updates.optional !== undefined ? updates.optional : original.isOptional,
         isGenerated: updates.generated !== undefined ? updates.generated : original.isGenerated,
+        isUserInput: updates.userInput !== undefined ? updates.userInput : original.isUserInput,
         fieldType: updates.type !== undefined ? updates.type : original.fieldType,
     };
 }
@@ -185,6 +186,9 @@ function logUpdates(updates) {
     if (updates.generated !== undefined) {
         console.log(`  isGenerated: ${updates.generated}`);
     }
+    if (updates.userInput !== undefined) {
+        console.log(`  isUserInput: ${updates.userInput}`);
+    }
     if (updates.type !== undefined) {
         console.log(`  fieldType: ${updates.type}`);
     }

package/package.json

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