eventmodeler 0.4.2 → 0.4.4

package/dist/cloud/slices/index.d.ts

@@ -7,6 +7,13 @@ export interface SearchResult {
     type: string;
     id: string;
     name: string;
+    chapterId?: string;
+    chapterName?: string;
+    sliceId?: string;
+    sliceName?: string;
+    sliceStatus?: string;
+    parentChapterId?: string;
+    parentChapterName?: string;
 }
 export interface SearchResponse {
     query: string;

package/dist/cloud/slices/index.js

@@ -11,16 +11,7 @@ import { getValidAccessToken } from '../../lib/auth.js';
  */
 async function handleHttpError(response, path) {
     const text = await response.text().catch(() => '');
-    let errorDetail = '';
-    if (text.trim()) {
-        try {
-            const parsed = JSON.parse(text);
-            errorDetail = parsed.error ?? parsed.message ?? '';
-        }
-        catch {
-            // Response body isn't JSON (could be HTML error page, etc.)
-        }
-    }
+    const errorDetail = extractErrorDetail(text);
     switch (response.status) {
         case 401:
             throw new Error(`Authentication required. Run 'eventmodeler login' to authenticate.` +
@@ -34,6 +25,73 @@ async function handleHttpError(response, path) {
             throw new Error(errorDetail || `HTTP ${response.status}: ${response.statusText}`);
     }
 }
+const GENERIC_ERROR_MESSAGES = new Set([
+    'internal server error',
+    'bad request',
+    'unauthorized',
+    'forbidden',
+    'not found',
+]);
+function isGenericErrorMessage(value) {
+    return GENERIC_ERROR_MESSAGES.has(value.trim().toLowerCase());
+}
+function toStringValue(value) {
+    return typeof value === 'string' ? value.trim() : '';
+}
+function collectCandidateMessages(node, out) {
+    if (!node || typeof node !== 'object')
+        return;
+    const obj = node;
+    // Prefer richer fields before generic "error".
+    for (const key of ['message', 'detail', 'reason', 'description', 'title', 'error']) {
+        const value = toStringValue(obj[key]);
+        if (value)
+            out.push(value);
+    }
+    const errors = obj.errors;
+    if (Array.isArray(errors)) {
+        for (const entry of errors) {
+            if (typeof entry === 'string') {
+                const value = entry.trim();
+                if (value)
+                    out.push(value);
+            }
+            else if (entry && typeof entry === 'object') {
+                collectCandidateMessages(entry, out);
+            }
+        }
+    }
+    const cause = obj.cause;
+    if (cause && typeof cause === 'object') {
+        collectCandidateMessages(cause, out);
+    }
+}
+function extractErrorDetail(text) {
+    const body = text.trim();
+    if (!body)
+        return '';
+    try {
+        const parsed = JSON.parse(body);
+        if (typeof parsed === 'string') {
+            return parsed.trim();
+        }
+        const candidates = [];
+        collectCandidateMessages(parsed, candidates);
+        if (candidates.length > 0) {
+            const specific = candidates.find((value) => !isGenericErrorMessage(value));
+            return specific ?? candidates[0];
+        }
+    }
+    catch {
+        // Not JSON. Fall back to plain text below.
+    }
+    // Avoid dumping entire HTML pages from reverse proxies.
+    if (body.startsWith('<')) {
+        const title = body.match(/<title>([^<]+)<\/title>/i)?.[1]?.trim();
+        return title && !isGenericErrorMessage(title) ? title : '';
+    }
+    return body;
+}
 async function cliGet(path, params) {
     const backendUrl = getBackendUrl();
     const accessToken = await getValidAccessToken();

package/dist/index.js

@@ -1510,10 +1510,21 @@ EXAMPLES:
                 }
                 else {
                     const esc = (s) => s.replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+                    const attr = (name, value) => value ? ` ${name}="${esc(value)}"` : '';
                     console.log(`<search-results query="${esc(subcommand)}" count="${response.results.length}">`);
                     for (const r of response.results) {
                         const tag = r.type === 'readmodel' ? 'read-model' : r.type;
-                        console.log(`  <${tag} name="${esc(r.name)}"/>`);
+                        console.log(`  <${tag}` +
+                            `${attr('id', r.id)}` +
+                            `${attr('name', r.name)}` +
+                            `${attr('chapter-id', r.chapterId)}` +
+                            `${attr('chapter-name', r.chapterName)}` +
+                            `${attr('slice-id', r.sliceId)}` +
+                            `${attr('slice-name', r.sliceName)}` +
+                            `${attr('slice-status', r.sliceStatus)}` +
+                            `${attr('parent-chapter-id', r.parentChapterId)}` +
+                            `${attr('parent-chapter-name', r.parentChapterName)}` +
+                            '/>');
                     }
                     console.log('</search-results>');
                 }

package/dist/lib/cloud-client.js

@@ -4,8 +4,8 @@ import { getValidAccessToken } from './auth.js';
  * Handle HTTP error responses with user-friendly messages
  */
 async function handleHttpError(response) {
-    const errorData = await response.json().catch(() => ({}));
-    const errorDetail = errorData.error ?? errorData.message ?? '';
+    const text = await response.text().catch(() => '');
+    const errorDetail = extractErrorDetail(text);
     switch (response.status) {
         case 401:
             throw new Error(`Authentication required. Run 'eventmodeler login' to authenticate.` +
@@ -19,6 +19,73 @@ async function handleHttpError(response) {
             throw new Error(errorDetail || `HTTP ${response.status}: ${response.statusText}`);
     }
 }
+const GENERIC_ERROR_MESSAGES = new Set([
+    'internal server error',
+    'bad request',
+    'unauthorized',
+    'forbidden',
+    'not found',
+]);
+function isGenericErrorMessage(value) {
+    return GENERIC_ERROR_MESSAGES.has(value.trim().toLowerCase());
+}
+function toStringValue(value) {
+    return typeof value === 'string' ? value.trim() : '';
+}
+function collectCandidateMessages(node, out) {
+    if (!node || typeof node !== 'object')
+        return;
+    const obj = node;
+    // Prefer specific fields before generic "error".
+    for (const key of ['message', 'detail', 'reason', 'description', 'title', 'error']) {
+        const value = toStringValue(obj[key]);
+        if (value)
+            out.push(value);
+    }
+    const errors = obj.errors;
+    if (Array.isArray(errors)) {
+        for (const entry of errors) {
+            if (typeof entry === 'string') {
+                const value = entry.trim();
+                if (value)
+                    out.push(value);
+            }
+            else if (entry && typeof entry === 'object') {
+                collectCandidateMessages(entry, out);
+            }
+        }
+    }
+    const cause = obj.cause;
+    if (cause && typeof cause === 'object') {
+        collectCandidateMessages(cause, out);
+    }
+}
+function extractErrorDetail(text) {
+    const body = text.trim();
+    if (!body)
+        return '';
+    try {
+        const parsed = JSON.parse(body);
+        if (typeof parsed === 'string') {
+            return parsed.trim();
+        }
+        const candidates = [];
+        collectCandidateMessages(parsed, candidates);
+        if (candidates.length > 0) {
+            const specific = candidates.find((value) => !isGenericErrorMessage(value));
+            return specific ?? candidates[0];
+        }
+    }
+    catch {
+        // Not JSON. Fall back to plain text below.
+    }
+    // Avoid dumping full HTML error pages.
+    if (body.startsWith('<')) {
+        const title = body.match(/<title>([^<]+)<\/title>/i)?.[1]?.trim();
+        return title && !isGenericErrorMessage(title) ? title : '';
+    }
+    return body;
+}
 /**
  * Create a cloud client for interacting with the Axon backend.
  */

package/dist/projection.js

@@ -78,16 +78,6 @@ function applyEvent(model, event) {
             }
             break;
         }
-        case 'CommandStickyDuplicated':
-            model.commands.set(d.commandStickyId, {
-                id: d.commandStickyId,
-                name: d.name,
-                fields: d.fields,
-                position: d.position,
-                width: d.width,
-                height: d.height,
-            });
-            break;
         // Event sticky events
         case 'EventStickyPlaced':
             model.events.set(d.eventStickyId, {
@@ -449,16 +439,6 @@ function applyEvent(model, event) {
             }
             break;
         }
-        case 'ProcessorDuplicated':
-            model.processors.set(d.processorId, {
-                id: d.processorId,
-                name: d.name,
-                fields: d.fields,
-                position: d.position,
-                width: d.width,
-                height: d.height,
-            });
-            break;
         // Slice events
         case 'SlicePlaced':
             model.slices.set(d.sliceId, {
@@ -548,16 +528,6 @@ function applyEvent(model, event) {
             }
             break;
         }
-        case 'SliceDuplicated':
-            model.slices.set(d.sliceId, {
-                id: d.sliceId,
-                name: d.name,
-                status: d.status,
-                position: d.position,
-                size: d.size,
-                nodeIds: [],
-            });
-            break;
         // Aggregate events
         case 'AggregatePlaced':
             model.aggregates.set(d.aggregateId, {
@@ -756,92 +726,6 @@ function applyEvent(model, event) {
                 flow.fieldMappings = [];
             break;
         }
-        // Quick place events - create node and flow atomically
-        case 'CommandQuickPlacedFromScreen':
-            model.commands.set(d.commandStickyId, {
-                id: d.commandStickyId,
-                name: d.name,
-                fields: [],
-                position: d.position,
-                width: d.width,
-                height: d.height,
-            });
-            model.flows.set(d.flowId, {
-                id: d.flowId,
-                flowType: 'ScreenToCommand',
-                sourceId: d.screenId,
-                targetId: d.commandStickyId,
-                fieldMappings: [],
-            });
-            break;
-        case 'EventQuickPlacedFromCommand':
-            model.events.set(d.eventStickyId, {
-                id: d.eventStickyId,
-                name: d.name,
-                fields: [],
-                position: d.position,
-                width: d.width,
-                height: d.height,
-            });
-            model.flows.set(d.flowId, {
-                id: d.flowId,
-                flowType: 'CommandToEvent',
-                sourceId: d.commandStickyId,
-                targetId: d.eventStickyId,
-                fieldMappings: [],
-            });
-            break;
-        case 'ReadModelQuickPlacedFromEvent':
-            model.readModels.set(d.readModelStickyId, {
-                id: d.readModelStickyId,
-                name: d.name,
-                fields: [],
-                position: d.position,
-                width: d.width,
-                height: d.height,
-            });
-            model.flows.set(d.flowId, {
-                id: d.flowId,
-                flowType: 'EventToReadModel',
-                sourceId: d.eventStickyId,
-                targetId: d.readModelStickyId,
-                fieldMappings: [],
-            });
-            break;
-        case 'ScreenQuickPlacedFromReadModel':
-            model.screens.set(d.screenId, {
-                id: d.screenId,
-                name: d.name,
-                fields: [],
-                position: d.position,
-                width: d.width,
-                height: d.height,
-            });
-            model.flows.set(d.flowId, {
-                id: d.flowId,
-                flowType: 'ReadModelToScreen',
-                sourceId: d.readModelStickyId,
-                targetId: d.screenId,
-                fieldMappings: [],
-            });
-            break;
-        case 'CommandQuickPlacedFromProcessor':
-            model.commands.set(d.commandStickyId, {
-                id: d.commandStickyId,
-                name: d.name,
-                fields: [],
-                position: d.position,
-                width: d.width,
-                height: d.height,
-            });
-            model.flows.set(d.flowId, {
-                id: d.flowId,
-                flowType: 'ProcessorToCommand',
-                sourceId: d.processorId,
-                targetId: d.commandStickyId,
-                fieldMappings: [],
-            });
-            break;
         // Field propagation events
         case 'FieldsPropagatedFromCommandToEvent':
         case 'FieldsPropagatedFromEventToCommand':

package/package.json

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