eventmodeler 0.2.7 → 0.2.9

package/dist/index.js

@@ -160,7 +160,10 @@ async function main() {
             : getDefaultFormat();
     const command = filteredArgs[0];
     const subcommand = filteredArgs[1];
-    const target = filteredArgs[2];
+    // Join remaining args as target (allows "show chapter Register Products" without quotes)
+    // For commands with named args (--flag), those are already extracted by getNamedArg
+    const remainingArgs = filteredArgs.slice(2);
+    const target = remainingArgs.length > 0 ? remainingArgs.join(' ') : undefined;
     if (!command) {
         openApp();
         return;
@@ -271,14 +274,20 @@ async function main() {
             }
             search(model, subcommand, format);
             break;
-        case 'mark':
-            if (!subcommand || !target) {
+        case 'mark': {
+            // mark <slice-name> <status> - status is last arg, slice name is everything before
+            const validStatuses = ['created', 'in-progress', 'blocked', 'done'];
+            const lastArg = remainingArgs[remainingArgs.length - 1];
+            if (remainingArgs.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);
             }
-            markSliceStatus(model, filePath, subcommand, target);
+            const sliceName = remainingArgs.slice(0, -1).join(' ');
+            const status = lastArg;
+            markSliceStatus(model, filePath, sliceName, status);
             break;
+        }
         case 'summary':
             showModelSummary(model, format);
             break;

package/dist/lib/element-lookup.d.ts

@@ -1,6 +1,6 @@
 /**
  * Element lookup utilities for CLI commands.
- * Provides exact-match lookup with UUID disambiguation for duplicate names.
+ * Provides fuzzy lookup with UUID disambiguation for ambiguous matches.
  */
 export type LookupResult<T> = {
     success: true;
@@ -11,10 +11,12 @@ export type LookupResult<T> = {
     matches: T[];
 };
 /**
- * Find an element by exact name (case-insensitive) or UUID.
+ * Find an element by name (fuzzy) or UUID.
  * - If search starts with "id:", treats rest as UUID/UUID prefix
- * - Otherwise, performs case-insensitive exact name match
- * - Returns error if multiple elements have the same name
+ * - Otherwise, performs fuzzy name matching:
+ *   1. Exact match (case-insensitive, normalized spaces)
+ *   2. Partial match (search is contained in name)
+ * - Returns error if multiple elements match
  */
 export declare function findElement<T extends {
     id: string;

package/dist/lib/element-lookup.js

@@ -1,12 +1,23 @@
 /**
  * Element lookup utilities for CLI commands.
- * Provides exact-match lookup with UUID disambiguation for duplicate names.
+ * Provides fuzzy lookup with UUID disambiguation for ambiguous matches.
  */
 /**
- * Find an element by exact name (case-insensitive) or UUID.
+ * Normalize a string for fuzzy matching:
+ * - lowercase
+ * - collapse multiple spaces to single space
+ * - trim whitespace
+ */
+function normalize(str) {
+    return str.toLowerCase().replace(/\s+/g, ' ').trim();
+}
+/**
+ * Find an element by name (fuzzy) or UUID.
  * - If search starts with "id:", treats rest as UUID/UUID prefix
- * - Otherwise, performs case-insensitive exact name match
- * - Returns error if multiple elements have the same name
+ * - Otherwise, performs fuzzy name matching:
+ *   1. Exact match (case-insensitive, normalized spaces)
+ *   2. Partial match (search is contained in name)
+ * - Returns error if multiple elements match
  */
 export function findElement(elements, search) {
     const elementArray = Array.isArray(elements) ? elements : [...elements.values()];
@@ -28,14 +39,34 @@ export function findElement(elements, search) {
         }
         return { success: false, error: 'not_found', matches: [] };
     }
-    // Case-insensitive exact name match
-    const searchLower = search.toLowerCase();
-    const matches = elementArray.filter(e => e.name.toLowerCase() === searchLower);
-    if (matches.length === 1) {
-        return { success: true, element: matches[0] };
+    const searchNorm = normalize(search);
+    // 1. Try exact match first (case-insensitive, normalized)
+    const exactMatches = elementArray.filter(e => normalize(e.name) === searchNorm);
+    if (exactMatches.length === 1) {
+        return { success: true, element: exactMatches[0] };
+    }
+    if (exactMatches.length > 1) {
+        return { success: false, error: 'ambiguous', matches: exactMatches };
+    }
+    // 2. Try partial match (search contained in name)
+    const partialMatches = elementArray.filter(e => normalize(e.name).includes(searchNorm));
+    if (partialMatches.length === 1) {
+        return { success: true, element: partialMatches[0] };
+    }
+    if (partialMatches.length > 1) {
+        return { success: false, error: 'ambiguous', matches: partialMatches };
+    }
+    // 3. Try word-based match (all search words appear in name)
+    const searchWords = searchNorm.split(' ').filter(w => w.length > 0);
+    const wordMatches = elementArray.filter(e => {
+        const nameNorm = normalize(e.name);
+        return searchWords.every(word => nameNorm.includes(word));
+    });
+    if (wordMatches.length === 1) {
+        return { success: true, element: wordMatches[0] };
     }
-    if (matches.length > 1) {
-        return { success: false, error: 'ambiguous', matches };
+    if (wordMatches.length > 1) {
+        return { success: false, error: 'ambiguous', matches: wordMatches };
     }
     return { success: false, error: 'not_found', matches: [] };
 }

package/dist/lib/format.d.ts

@@ -1,3 +1,10 @@
 export type OutputFormat = 'xml' | 'json';
+/**
+ * Escape string for use in XML attributes (escapes quotes)
+ */
 export declare function escapeXml(str: string): string;
+/**
+ * Escape string for use in XML text content (doesn't escape quotes)
+ */
+export declare function escapeXmlText(str: string): string;
 export declare function outputJson(data: unknown): void;

package/dist/lib/format.js

@@ -1,3 +1,6 @@
+/**
+ * Escape string for use in XML attributes (escapes quotes)
+ */
 export function escapeXml(str) {
     return str
         .replace(/&/g, '&')
@@ -6,6 +9,15 @@ export function escapeXml(str) {
         .replace(/"/g, '"')
         .replace(/'/g, ''');
 }
+/**
+ * Escape string for use in XML text content (doesn't escape quotes)
+ */
+export function escapeXmlText(str) {
+    return str
+        .replace(/&/g, '&')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;');
+}
 export function outputJson(data) {
     console.log(JSON.stringify(data, null, 2));
 }

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

@@ -112,13 +112,22 @@ function getSourceFields(model, sourceId) {
         return proc.fields;
     return [];
 }
-function flattenFields(fields, prefix = '') {
+/**
+ * Flattens nested Custom fields into a flat list with dot-notation paths.
+ * When skipCustomParents is true, Custom fields with subfields are excluded.
+ */
+function flattenFields(fields, prefix = '', skipCustomParents = false) {
     const result = [];
     for (const field of fields) {
         const path = prefix ? `${prefix}.${field.name}` : field.name;
-        result.push({ id: field.id, path, field });
+        const isCustomParent = field.fieldType === 'Custom' &&
+            field.subfields &&
+            field.subfields.length > 0;
+        if (!skipCustomParents || !isCustomParent) {
+            result.push({ id: field.id, path, field });
+        }
         if (field.fieldType === 'Custom' && field.subfields) {
-            result.push(...flattenFields(field.subfields, path));
+            result.push(...flattenFields(field.subfields, path, skipCustomParents));
         }
     }
     return result;
@@ -158,7 +167,8 @@ function calculateReadModelUnionCompleteness(model, readModelId, readModelFields
         }
     }
     // Check each target field against the union of all sources
-    const flatTarget = flattenFields(readModelFields);
+    // Skip custom parents - only check leaf fields
+    const flatTarget = flattenFields(readModelFields, '', true);
     const untraceableFields = [];
     const optionalMissingFields = [];
     const fieldStatuses = [];
@@ -214,7 +224,8 @@ function calculateReadModelUnionCompleteness(model, readModelId, readModelFields
 }
 function calculateFlowCompleteness(model, flow, targetFields, sourceFields) {
     const flatSource = flattenFields(sourceFields);
-    const flatTarget = flattenFields(targetFields);
+    // Skip custom parents for target fields - only check leaf fields
+    const flatTarget = flattenFields(targetFields, '', true);
     const manualMappings = flow.fieldMappings ?? [];
     // Get source entity name
     let sourceName = 'Unknown';

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

@@ -1,4 +1,4 @@
-import { escapeXml, outputJson } from '../../lib/format.js';
+import { escapeXml, escapeXmlText, outputJson } from '../../lib/format.js';
 import { findElementOrExit } from '../../lib/element-lookup.js';
 function formatFieldValues(values) {
     if (!values || Object.keys(values).length === 0)
@@ -243,7 +243,7 @@ function formatSliceXml(model, slice) {
         for (const scenario of scenarios) {
             xml += `    <scenario name="${escapeXml(scenario.name)}">\n`;
             if (scenario.description) {
-                xml += `      <description>${escapeXml(scenario.description)}</description>\n`;
+                xml += `      <description>${escapeXmlText(scenario.description)}</description>\n`;
             }
             if (scenario.givenEvents.length > 0) {
                 xml += '      <given>\n';
@@ -252,7 +252,7 @@ function formatSliceXml(model, slice) {
                     const name = evt?.name ?? 'UnknownEvent';
                     const values = formatFieldValues(given.fieldValues);
                     xml += values
-                        ? `        <event type="${escapeXml(name)}">${escapeXml(values)}</event>\n`
+                        ? `        <event type="${escapeXml(name)}">${escapeXmlText(values)}</event>\n`
                         : `        <event type="${escapeXml(name)}"/>\n`;
                 }
                 xml += '      </given>\n';
@@ -263,7 +263,7 @@ function formatSliceXml(model, slice) {
                 const values = formatFieldValues(scenario.whenCommand.fieldValues);
                 xml += '      <when>\n';
                 xml += values
-                    ? `        <command type="${escapeXml(name)}">${escapeXml(values)}</command>\n`
+                    ? `        <command type="${escapeXml(name)}">${escapeXmlText(values)}</command>\n`
                     : `        <command type="${escapeXml(name)}"/>\n`;
                 xml += '      </when>\n';
             }
@@ -272,7 +272,7 @@ function formatSliceXml(model, slice) {
                 xml += `        <error`;
                 if (scenario.then.errorType)
                     xml += ` type="${escapeXml(scenario.then.errorType)}"`;
-                xml += `>${escapeXml(scenario.then.errorMessage ?? '')}</error>\n`;
+                xml += `>${escapeXmlText(scenario.then.errorMessage ?? '')}</error>\n`;
             }
             else if (scenario.then.type === 'events' && scenario.then.expectedEvents) {
                 for (const expected of scenario.then.expectedEvents) {
@@ -280,7 +280,7 @@ function formatSliceXml(model, slice) {
                     const name = evt?.name ?? 'UnknownEvent';
                     const values = formatFieldValues(expected.fieldValues);
                     xml += values
-                        ? `        <event type="${escapeXml(name)}">${escapeXml(values)}</event>\n`
+                        ? `        <event type="${escapeXml(name)}">${escapeXmlText(values)}</event>\n`
                         : `        <event type="${escapeXml(name)}"/>\n`;
                 }
             }
@@ -289,7 +289,7 @@ function formatSliceXml(model, slice) {
                 const rm = model.readModels.get(assertion.readModelStickyId);
                 const name = rm?.name ?? 'UnknownReadModel';
                 xml += `        <read-model-assertion type="${escapeXml(name)}">\n`;
-                xml += `          <expected>${escapeXml(formatFieldValues(assertion.expectedFieldValues))}</expected>\n`;
+                xml += `          <expected>${escapeXmlText(formatFieldValues(assertion.expectedFieldValues))}</expected>\n`;
                 xml += '        </read-model-assertion>\n';
             }
             xml += '      </then>\n';

package/package.json

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