eventmodeler 0.3.8 → 0.3.10

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

@@ -261,6 +261,11 @@ function formatScenarioThen(model, then) {
             },
         };
     }
+    if (then.type === 'noCommand') {
+        return {
+            type: 'noCommand',
+        };
+    }
     if (then.type === 'readModelAssertion' && then.readModelAssertion) {
         const rm = model.readModels.get(then.readModelAssertion.readModelStickyId);
         return {

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

@@ -330,6 +330,18 @@ function formatSliceXml(model, slice) {
                     : `        <command type="${escapeXml(name)}"/>\n`;
                 xml += '      </when>\n';
             }
+            else if (scenario.whenEvents && scenario.whenEvents.length > 0) {
+                xml += '      <when>\n';
+                for (const whenEvent of scenario.whenEvents) {
+                    const evt = model.events.get(whenEvent.eventStickyId);
+                    const name = evt?.name ?? 'UnknownEvent';
+                    const values = formatFieldValues(whenEvent.fieldValues);
+                    xml += values
+                        ? `        <event type="${escapeXml(name)}">${escapeXmlText(values)}</event>\n`
+                        : `        <event type="${escapeXml(name)}"/>\n`;
+                }
+                xml += '      </when>\n';
+            }
             xml += '      <then>\n';
             if (scenario.then.type === 'error') {
                 xml += `        <error`;
@@ -347,6 +359,17 @@ function formatSliceXml(model, slice) {
                         : `        <event type="${escapeXml(name)}"/>\n`;
                 }
             }
+            else if (scenario.then.type === 'command' && scenario.then.expectedCommand) {
+                const cmd = model.commands.get(scenario.then.expectedCommand.commandStickyId);
+                const name = cmd?.name ?? 'UnknownCommand';
+                const values = formatFieldValues(scenario.then.expectedCommand.fieldValues);
+                xml += values
+                    ? `        <command type="${escapeXml(name)}">${escapeXmlText(values)}</command>\n`
+                    : `        <command type="${escapeXml(name)}"/>\n`;
+            }
+            else if (scenario.then.type === 'noCommand') {
+                xml += '        <no-command/>\n';
+            }
             else if (scenario.then.type === 'readModelAssertion' && scenario.then.readModelAssertion) {
                 const assertion = scenario.then.readModelAssertion;
                 const rm = model.readModels.get(assertion.readModelStickyId);
@@ -571,6 +594,17 @@ function formatSliceJson(model, slice) {
                     ...(scenario.whenCommand.fieldValues && Object.keys(scenario.whenCommand.fieldValues).length > 0 ? { fieldValues: scenario.whenCommand.fieldValues } : {})
                 };
             }
+            else if (scenario.whenEvents && scenario.whenEvents.length > 0) {
+                scenarioObj.when = {
+                    events: scenario.whenEvents.map(whenEvent => {
+                        const evt = model.events.get(whenEvent.eventStickyId);
+                        return {
+                            eventType: evt?.name ?? 'UnknownEvent',
+                            ...(whenEvent.fieldValues && Object.keys(whenEvent.fieldValues).length > 0 ? { fieldValues: whenEvent.fieldValues } : {})
+                        };
+                    })
+                };
+            }
             if (scenario.then.type === 'error') {
                 scenarioObj.then = {
                     type: 'error',
@@ -590,6 +624,19 @@ function formatSliceJson(model, slice) {
                     })
                 };
             }
+            else if (scenario.then.type === 'command' && scenario.then.expectedCommand) {
+                const cmd = model.commands.get(scenario.then.expectedCommand.commandStickyId);
+                scenarioObj.then = {
+                    type: 'command',
+                    commandType: cmd?.name ?? 'UnknownCommand',
+                    ...(scenario.then.expectedCommand.fieldValues && Object.keys(scenario.then.expectedCommand.fieldValues).length > 0 ? { fieldValues: scenario.then.expectedCommand.fieldValues } : {})
+                };
+            }
+            else if (scenario.then.type === 'noCommand') {
+                scenarioObj.then = {
+                    type: 'noCommand'
+                };
+            }
             else if (scenario.then.type === 'readModelAssertion' && scenario.then.readModelAssertion) {
                 const assertion = scenario.then.readModelAssertion;
                 const rm = model.readModels.get(assertion.readModelStickyId);

package/dist/types.d.ts

@@ -22,7 +22,7 @@ export interface ReadModelAssertion {
     givenEvents: EventReference[];
     expectedFieldValues: Record<string, unknown>;
 }
-export type ScenarioThenType = 'error' | 'events' | 'readModelAssertion' | 'command';
+export type ScenarioThenType = 'error' | 'events' | 'readModelAssertion' | 'command' | 'noCommand';
 export interface ScenarioThen {
     type: ScenarioThenType;
     errorMessage?: string;

package/package.json

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