eventmodeler 0.2.8 → 0.2.9

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-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.8",
+  "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": {