eventmodeler 0.2.1 → 0.2.4

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

@@ -1,9 +1,116 @@
-function escapeXml(str) {
-    return str
-        .replace(/&/g, '&')
-        .replace(/</g, '&lt;')
-        .replace(/>/g, '&gt;')
-        .replace(/"/g, '&quot;');
+import { escapeXml, outputJson } from '../../lib/format.js';
+const INCOMING_FLOW_TYPES = {
+    command: ['ScreenToCommand', 'ProcessorToCommand'],
+    event: ['CommandToEvent'],
+    readModel: ['EventToReadModel'],
+    screen: ['ReadModelToScreen'],
+    processor: ['ReadModelToProcessor'],
+};
+function findElementByName(model, name) {
+    // Check for UUID lookup (id:prefix or full UUID format)
+    if (name.startsWith('id:')) {
+        const idSearch = name.slice(3).toLowerCase();
+        // Search all element types by ID
+        for (const cmd of model.commands.values()) {
+            if (cmd.id.toLowerCase().startsWith(idSearch)) {
+                return { element: { id: cmd.id, name: cmd.name, fields: cmd.fields, type: 'command' }, ambiguous: [] };
+            }
+        }
+        for (const evt of model.events.values()) {
+            if (evt.id.toLowerCase().startsWith(idSearch)) {
+                return { element: { id: evt.id, name: evt.name, fields: evt.fields, type: 'event' }, ambiguous: [] };
+            }
+        }
+        for (const rm of model.readModels.values()) {
+            if (rm.id.toLowerCase().startsWith(idSearch)) {
+                return { element: { id: rm.id, name: rm.name, fields: rm.fields, type: 'readModel' }, ambiguous: [] };
+            }
+        }
+        for (const scr of model.screens.values()) {
+            if (scr.id.toLowerCase().startsWith(idSearch)) {
+                return { element: { id: scr.id, name: scr.name, fields: scr.fields, type: 'screen' }, ambiguous: [] };
+            }
+        }
+        for (const proc of model.processors.values()) {
+            if (proc.id.toLowerCase().startsWith(idSearch)) {
+                return { element: { id: proc.id, name: proc.name, fields: proc.fields, type: 'processor' }, ambiguous: [] };
+            }
+        }
+        return { element: null, ambiguous: [] };
+    }
+    // Check if it's a full UUID
+    const uuidPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+    if (uuidPattern.test(name)) {
+        const cmd = model.commands.get(name);
+        if (cmd)
+            return { element: { id: cmd.id, name: cmd.name, fields: cmd.fields, type: 'command' }, ambiguous: [] };
+        const evt = model.events.get(name);
+        if (evt)
+            return { element: { id: evt.id, name: evt.name, fields: evt.fields, type: 'event' }, ambiguous: [] };
+        const rm = model.readModels.get(name);
+        if (rm)
+            return { element: { id: rm.id, name: rm.name, fields: rm.fields, type: 'readModel' }, ambiguous: [] };
+        const scr = model.screens.get(name);
+        if (scr)
+            return { element: { id: scr.id, name: scr.name, fields: scr.fields, type: 'screen' }, ambiguous: [] };
+        const proc = model.processors.get(name);
+        if (proc)
+            return { element: { id: proc.id, name: proc.name, fields: proc.fields, type: 'processor' }, ambiguous: [] };
+        return { element: null, ambiguous: [] };
+    }
+    // Case-insensitive exact name match across all types
+    const nameLower = name.toLowerCase();
+    const matches = [];
+    for (const cmd of model.commands.values()) {
+        if (cmd.name.toLowerCase() === nameLower) {
+            matches.push({ element: { id: cmd.id, name: cmd.name, fields: cmd.fields, type: 'command' }, type: 'command' });
+        }
+    }
+    for (const evt of model.events.values()) {
+        if (evt.name.toLowerCase() === nameLower) {
+            matches.push({ element: { id: evt.id, name: evt.name, fields: evt.fields, type: 'event' }, type: 'event' });
+        }
+    }
+    for (const rm of model.readModels.values()) {
+        if (rm.name.toLowerCase() === nameLower) {
+            matches.push({ element: { id: rm.id, name: rm.name, fields: rm.fields, type: 'readModel' }, type: 'readModel' });
+        }
+    }
+    for (const scr of model.screens.values()) {
+        if (scr.name.toLowerCase() === nameLower) {
+            matches.push({ element: { id: scr.id, name: scr.name, fields: scr.fields, type: 'screen' }, type: 'screen' });
+        }
+    }
+    for (const proc of model.processors.values()) {
+        if (proc.name.toLowerCase() === nameLower) {
+            matches.push({ element: { id: proc.id, name: proc.name, fields: proc.fields, type: 'processor' }, type: 'processor' });
+        }
+    }
+    if (matches.length === 1) {
+        return { element: matches[0].element, ambiguous: [] };
+    }
+    if (matches.length > 1) {
+        return { element: null, ambiguous: matches };
+    }
+    return { element: null, ambiguous: [] };
+}
+function getSourceFields(model, sourceId) {
+    const cmd = model.commands.get(sourceId);
+    if (cmd)
+        return cmd.fields;
+    const evt = model.events.get(sourceId);
+    if (evt)
+        return evt.fields;
+    const rm = model.readModels.get(sourceId);
+    if (rm)
+        return rm.fields;
+    const scr = model.screens.get(sourceId);
+    if (scr)
+        return scr.fields;
+    const proc = model.processors.get(sourceId);
+    if (proc)
+        return proc.fields;
+    return [];
 }
 function flattenFields(fields, prefix = '') {
     const result = [];
@@ -104,40 +211,117 @@ function calculateFlowCompleteness(model, flow, targetFields, sourceFields) {
         })),
     };
 }
-export function showCompleteness(model, readModelName) {
-    // Find the read model
-    const nameLower = readModelName.toLowerCase();
-    const readModels = [...model.readModels.values()];
-    const readModel = readModels.find(rm => rm.name.toLowerCase() === nameLower || rm.name.toLowerCase().includes(nameLower));
-    if (!readModel) {
-        console.error(`Error: Read model not found: ${readModelName}`);
-        console.error('Available read models:');
-        for (const rm of readModels) {
-            console.error(`  - ${rm.name}`);
+export function showCompleteness(model, elementName, format) {
+    // Find the element by name (searches all element types)
+    const { element, ambiguous } = findElementByName(model, elementName);
+    if (ambiguous.length > 0) {
+        console.error(`Error: Multiple elements found with name "${elementName}"`);
+        console.error('Please specify using the element ID:');
+        for (const match of ambiguous) {
+            console.error(`  - "${match.element.name}" (${match.type}) (id: ${match.element.id})`);
+        }
+        console.error('');
+        console.error(`Usage: eventmodeler show completeness "id:${ambiguous[0].element.id.slice(0, 8)}"`);
+        process.exit(1);
+    }
+    if (!element) {
+        console.error(`Error: Element not found: "${elementName}"`);
+        // List all available elements with their IDs
+        const allElements = [];
+        for (const cmd of model.commands.values()) {
+            allElements.push({ name: cmd.name, type: 'command', id: cmd.id });
+        }
+        for (const evt of model.events.values()) {
+            allElements.push({ name: evt.name, type: 'event', id: evt.id });
+        }
+        for (const rm of model.readModels.values()) {
+            allElements.push({ name: rm.name, type: 'read model', id: rm.id });
+        }
+        for (const scr of model.screens.values()) {
+            allElements.push({ name: scr.name, type: 'screen', id: scr.id });
+        }
+        for (const proc of model.processors.values()) {
+            allElements.push({ name: proc.name, type: 'processor', id: proc.id });
+        }
+        if (allElements.length > 0) {
+            console.error('Available elements:');
+            for (const el of allElements) {
+                console.error(`  - "${el.name}" (${el.type}) (id: ${el.id.slice(0, 8)})`);
+            }
+        }
+        else {
+            console.error('No elements exist in the model.');
         }
         process.exit(1);
     }
-    // Find all flows into this read model (EventToReadModel flows)
-    const incomingFlows = [...model.flows.values()].filter(f => f.targetId === readModel.id && f.flowType === 'EventToReadModel');
+    // Find all incoming flows for this element type
+    const validFlowTypes = INCOMING_FLOW_TYPES[element.type];
+    const incomingFlows = [...model.flows.values()].filter(f => f.targetId === element.id && validFlowTypes.includes(f.flowType));
+    const elementTypeLabel = element.type === 'readModel' ? 'read-model' : element.type;
     if (incomingFlows.length === 0) {
-        console.log(`<completeness readModel="${escapeXml(readModel.name)}">`);
-        console.log('  <no-flows>No events flow into this read model</no-flows>');
-        console.log('</completeness>');
+        if (format === 'json') {
+            outputJson({
+                elementType: elementTypeLabel,
+                name: element.name,
+                message: `No flows into this ${elementTypeLabel}`
+            });
+        }
+        else {
+            console.log(`<completeness ${elementTypeLabel}="${escapeXml(element.name)}">`);
+            console.log(`  <no-flows>No flows into this ${elementTypeLabel}</no-flows>`);
+            console.log('</completeness>');
+        }
         return;
     }
     // Calculate completeness for each flow
     const completenessResults = [];
     for (const flow of incomingFlows) {
-        const sourceEvent = model.events.get(flow.sourceId);
-        if (!sourceEvent)
-            continue;
-        const result = calculateFlowCompleteness(model, flow, readModel.fields, sourceEvent.fields);
+        const sourceFields = getSourceFields(model, flow.sourceId);
+        if (sourceFields.length === 0 && element.fields.length > 0) {
+            // Source has no fields but target expects some - still calculate
+        }
+        const result = calculateFlowCompleteness(model, flow, element.fields, sourceFields);
         completenessResults.push(result);
     }
-    // Output XML
     const overallComplete = completenessResults.every(r => r.isComplete);
     const overallStatus = overallComplete ? 'complete' : 'incomplete';
-    console.log(`<completeness readModel="${escapeXml(readModel.name)}" status="${overallStatus}">`);
+    if (format === 'json') {
+        const flatTargetFields = flattenFields(element.fields);
+        outputJson({
+            elementType: elementTypeLabel,
+            name: element.name,
+            status: overallStatus,
+            flows: completenessResults.map(result => ({
+                flowId: result.flowId,
+                from: result.sourceName,
+                sourceType: result.sourceType,
+                status: result.isComplete ? 'complete' : 'incomplete',
+                ...(result.hasWarnings ? { hasWarnings: true } : {}),
+                targetFields: result.targetFields.map(f => ({
+                    name: f.fieldName,
+                    status: f.status,
+                    ...(f.sourceFieldName ? { source: f.sourceFieldName } : {})
+                })),
+                availableSourceFields: result.sourceFields.map(sf => ({
+                    id: sf.id,
+                    name: sf.name,
+                    type: sf.type,
+                    ...(sf.isList ? { isList: true } : {})
+                }))
+            })),
+            elementFields: flatTargetFields.map(({ id, path, field }) => ({
+                id,
+                name: path,
+                type: field.fieldType,
+                ...(field.isList ? { isList: true } : {}),
+                ...(field.isOptional ? { isOptional: true } : {}),
+                ...(field.isGenerated ? { isGenerated: true } : {})
+            }))
+        });
+        return;
+    }
+    // Output XML
+    console.log(`<completeness ${elementTypeLabel}="${escapeXml(element.name)}" status="${overallStatus}">`);
     for (const result of completenessResults) {
         const flowStatus = result.isComplete ? 'complete' : 'incomplete';
         const warningAttr = result.hasWarnings ? ' hasWarnings="true"' : '';
@@ -162,9 +346,9 @@ export function showCompleteness(model, readModelName) {
         console.log('    </available-source-fields>');
         console.log('  </flow>');
     }
-    // Also show the read model's fields with their IDs (needed for mapping)
-    console.log('  <read-model-fields>');
-    const flatTargetFields = flattenFields(readModel.fields);
+    // Also show the element's fields with their IDs (needed for mapping)
+    console.log(`  <${elementTypeLabel}-fields>`);
+    const flatTargetFields = flattenFields(element.fields);
     for (const { id, path, field } of flatTargetFields) {
         const attrs = [`id="${id}"`, `name="${escapeXml(path)}"`, `type="${field.fieldType}"`];
         if (field.isList)
@@ -175,6 +359,104 @@ export function showCompleteness(model, readModelName) {
             attrs.push('isGenerated="true"');
         console.log(`    <field ${attrs.join(' ')}/>`);
     }
-    console.log('  </read-model-fields>');
+    console.log(`  </${elementTypeLabel}-fields>`);
     console.log('</completeness>');
 }
+export function showModelCompleteness(model, format) {
+    const allFlows = [...model.flows.values()];
+    const incompleteFlows = [];
+    let completeCount = 0;
+    let totalCount = 0;
+    for (const flow of allFlows) {
+        // Get target element info
+        let targetName = 'Unknown';
+        let targetType = 'unknown';
+        let targetFields = [];
+        const targetCmd = model.commands.get(flow.targetId);
+        const targetEvt = model.events.get(flow.targetId);
+        const targetRm = model.readModels.get(flow.targetId);
+        const targetScr = model.screens.get(flow.targetId);
+        const targetProc = model.processors.get(flow.targetId);
+        if (targetCmd) {
+            targetName = targetCmd.name;
+            targetType = 'command';
+            targetFields = targetCmd.fields;
+        }
+        else if (targetEvt) {
+            targetName = targetEvt.name;
+            targetType = 'event';
+            targetFields = targetEvt.fields;
+        }
+        else if (targetRm) {
+            targetName = targetRm.name;
+            targetType = 'read-model';
+            targetFields = targetRm.fields;
+        }
+        else if (targetScr) {
+            targetName = targetScr.name;
+            targetType = 'screen';
+            targetFields = targetScr.fields;
+        }
+        else if (targetProc) {
+            targetName = targetProc.name;
+            targetType = 'processor';
+            targetFields = targetProc.fields;
+        }
+        // Get source fields
+        const sourceFields = getSourceFields(model, flow.sourceId);
+        // Calculate completeness
+        const result = calculateFlowCompleteness(model, flow, targetFields, sourceFields);
+        totalCount++;
+        if (result.isComplete) {
+            completeCount++;
+        }
+        else {
+            const unsatisfiedFields = result.targetFields
+                .filter(f => f.status === 'unsatisfied')
+                .map(f => f.fieldName);
+            incompleteFlows.push({
+                flow,
+                sourceName: result.sourceName,
+                targetName,
+                targetType,
+                unsatisfiedFields,
+            });
+        }
+    }
+    const incompleteCount = totalCount - completeCount;
+    if (format === 'json') {
+        outputJson({
+            summary: {
+                complete: completeCount,
+                incomplete: incompleteCount,
+                total: totalCount
+            },
+            incompleteFlows: incompleteFlows.map(item => ({
+                from: item.sourceName,
+                to: item.targetName,
+                targetType: item.targetType,
+                flowType: item.flow.flowType,
+                unsatisfiedFields: item.unsatisfiedFields
+            }))
+        });
+        return;
+    }
+    console.log('<model-completeness>');
+    console.log(`  <summary complete="${completeCount}" incomplete="${incompleteCount}" total="${totalCount}"/>`);
+    if (incompleteFlows.length > 0) {
+        console.log('  <incomplete-flows>');
+        for (const item of incompleteFlows) {
+            console.log(`    <flow from="${escapeXml(item.sourceName)}" to="${escapeXml(item.targetName)}" target-type="${item.targetType}" flow-type="${item.flow.flowType}">`);
+            if (item.unsatisfiedFields.length > 0) {
+                console.log('      <unsatisfied-fields>');
+                for (const fieldName of item.unsatisfiedFields) {
+                    console.log(`        <field name="${escapeXml(fieldName)}"/>`);
+                }
+                console.log('      </unsatisfied-fields>');
+            }
+            console.log('    </flow>');
+        }
+        console.log('  </incomplete-flows>');
+    }
+    console.log('</model-completeness>');
+}

package/dist/slices/show-event/index.d.ts

@@ -1,2 +1,3 @@
 import type { EventModel } from '../../types.js';
-export declare function showEvent(model: EventModel, name: string): void;
+import { type OutputFormat } from '../../lib/format.js';
+export declare function showEvent(model: EventModel, name: string, format: OutputFormat): void;

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

@@ -1,11 +1,5 @@
-function escapeXml(str) {
-    return str
-        .replace(/&/g, '&')
-        .replace(/</g, '&lt;')
-        .replace(/>/g, '&gt;')
-        .replace(/"/g, '&quot;')
-        .replace(/'/g, '&apos;');
-}
+import { escapeXml, outputJson } from '../../lib/format.js';
+import { findElementOrExit } from '../../lib/element-lookup.js';
 function formatFieldXml(field, indent) {
     const attrs = [
         `name="${escapeXml(field.name)}"`,
@@ -27,6 +21,22 @@ function formatFieldXml(field, indent) {
     }
     return `${indent}<field ${attrs.join(' ')}/>\n`;
 }
+function fieldToJson(field) {
+    const result = {
+        name: field.name,
+        type: field.fieldType
+    };
+    if (field.isList)
+        result.list = true;
+    if (field.isGenerated)
+        result.generated = true;
+    if (field.isOptional)
+        result.optional = true;
+    if (field.subfields && field.subfields.length > 0) {
+        result.subfields = field.subfields.map(fieldToJson);
+    }
+    return result;
+}
 // Find which aggregate an event belongs to (center point inside aggregate bounds)
 function findAggregateForEvent(model, event) {
     const centerX = event.position.x + event.width / 2;
@@ -47,7 +57,7 @@ function findAggregateForEvent(model, event) {
 function formatEventXml(model, event) {
     const aggregate = findAggregateForEvent(model, event);
     const aggregateAttr = aggregate ? ` aggregate="${escapeXml(aggregate.name)}"` : '';
-    let xml = `<event name="${escapeXml(event.name)}"${aggregateAttr}>\n`;
+    let xml = `<event id="${event.id}" name="${escapeXml(event.name)}"${aggregateAttr}>\n`;
     if (event.fields.length > 0) {
         xml += '  <fields>\n';
         for (const field of event.fields) {
@@ -78,17 +88,31 @@ function formatEventXml(model, event) {
     xml += '</event>';
     return xml;
 }
-export function showEvent(model, name) {
-    const events = [...model.events.values()];
-    const nameLower = name.toLowerCase();
-    const event = events.find(e => e.name.toLowerCase() === nameLower || e.name.toLowerCase().includes(nameLower));
-    if (!event) {
-        console.error(`Error: Event not found: ${name}`);
-        console.error('Available events:');
-        for (const e of events) {
-            console.error(`  - ${e.name}`);
-        }
-        process.exit(1);
+export function showEvent(model, name, format) {
+    const event = findElementOrExit(model.events, name, 'event');
+    if (format === 'json') {
+        const aggregate = findAggregateForEvent(model, event);
+        const incomingFlows = [...model.flows.values()].filter(f => f.targetId === event.id);
+        const outgoingFlows = [...model.flows.values()].filter(f => f.sourceId === event.id);
+        const result = {
+            id: event.id,
+            name: event.name,
+            fields: event.fields.map(fieldToJson)
+        };
+        if (aggregate)
+            result.aggregate = aggregate.name;
+        const producedBy = incomingFlows
+            .map(f => model.commands.get(f.sourceId)?.name)
+            .filter(Boolean);
+        if (producedBy.length > 0)
+            result.producedBy = producedBy;
+        const consumedBy = outgoingFlows
+            .map(f => model.readModels.get(f.targetId)?.name)
+            .filter(Boolean);
+        if (consumedBy.length > 0)
+            result.consumedBy = consumedBy;
+        outputJson(result);
+        return;
     }
     console.log(formatEventXml(model, event));
 }

package/dist/slices/show-model-summary/index.d.ts

@@ -1,2 +1,3 @@
 import type { EventModel } from '../../types.js';
-export declare function showModelSummary(model: EventModel): void;
+import { type OutputFormat } from '../../lib/format.js';
+export declare function showModelSummary(model: EventModel, format: OutputFormat): void;

package/dist/slices/show-model-summary/index.js

@@ -1,12 +1,21 @@
-function escapeXml(str) {
-    return str
-        .replace(/&/g, '&')
-        .replace(/</g, '&lt;')
-        .replace(/>/g, '&gt;')
-        .replace(/"/g, '&quot;')
-        .replace(/'/g, '&apos;');
-}
-export function showModelSummary(model) {
+import { escapeXml, outputJson } from '../../lib/format.js';
+export function showModelSummary(model, format) {
+    if (format === 'json') {
+        outputJson({
+            name: model.name,
+            slices: model.slices.size,
+            commands: model.commands.size,
+            events: model.events.size,
+            readModels: model.readModels.size,
+            screens: model.screens.size,
+            processors: model.processors.size,
+            aggregates: model.aggregates.size,
+            actors: model.actors.size,
+            scenarios: model.scenarios.size,
+            flows: model.flows.size
+        });
+        return;
+    }
     console.log(`<model name="${escapeXml(model.name)}">`);
     console.log(`  <slices count="${model.slices.size}"/>`);
     console.log(`  <commands count="${model.commands.size}"/>`);

package/dist/slices/show-slice/index.d.ts

@@ -1,2 +1,3 @@
 import type { EventModel } from '../../types.js';
-export declare function showSlice(model: EventModel, name: string): void;
+import { type OutputFormat } from '../../lib/format.js';
+export declare function showSlice(model: EventModel, name: string, format: OutputFormat): void;