@diagrammo/dgmo 0.3.0 → 0.3.1

package/dist/index.cjs

@@ -1275,6 +1275,67 @@ var init_palettes = __esm({
   }
 });
 
+// src/utils/parsing.ts
+function measureIndent(line7) {
+  let indent = 0;
+  for (const ch of line7) {
+    if (ch === " ") indent++;
+    else if (ch === "	") indent += 4;
+    else break;
+  }
+  return indent;
+}
+function extractColor(label, palette) {
+  const m = label.match(COLOR_SUFFIX_RE);
+  if (!m) return { label };
+  const colorName = m[1].trim();
+  return {
+    label: label.substring(0, m.index).trim(),
+    color: resolveColor(colorName, palette)
+  };
+}
+function collectIndentedValues(lines, startIndex) {
+  const values = [];
+  let j = startIndex + 1;
+  for (; j < lines.length; j++) {
+    const raw = lines[j];
+    const trimmed = raw.trim();
+    if (!trimmed) continue;
+    if (trimmed.startsWith("//")) continue;
+    if (raw[0] !== " " && raw[0] !== "	") break;
+    values.push(trimmed.replace(/,\s*$/, ""));
+  }
+  return { values, newIndex: j - 1 };
+}
+function parsePipeMetadata(segments, aliasMap = /* @__PURE__ */ new Map()) {
+  const metadata = {};
+  for (let j = 1; j < segments.length; j++) {
+    for (const part of segments[j].split(",")) {
+      const trimmedPart = part.trim();
+      if (!trimmedPart) continue;
+      const colonIdx = trimmedPart.indexOf(":");
+      if (colonIdx > 0) {
+        const rawKey = trimmedPart.substring(0, colonIdx).trim().toLowerCase();
+        const key = aliasMap.get(rawKey) ?? rawKey;
+        const value = trimmedPart.substring(colonIdx + 1).trim();
+        metadata[key] = value;
+      }
+    }
+  }
+  return metadata;
+}
+var COLOR_SUFFIX_RE, CHART_TYPE_RE, TITLE_RE, OPTION_RE;
+var init_parsing = __esm({
+  "src/utils/parsing.ts"() {
+    "use strict";
+    init_colors();
+    COLOR_SUFFIX_RE = /\(([^)]+)\)\s*$/;
+    CHART_TYPE_RE = /^chart\s*:\s*(.+)/i;
+    TITLE_RE = /^title\s*:\s*(.+)/i;
+    OPTION_RE = /^([a-z][a-z0-9-]*)\s*:\s*(.+)$/i;
+  }
+});
+
 // src/sequence/participant-inference.ts
 function inferParticipantType(name) {
   for (const rule of PARTICIPANT_RULES) {
@@ -1591,54 +1652,6 @@ var init_arrows = __esm({
   }
 });
 
-// src/utils/parsing.ts
-function measureIndent(line7) {
-  let indent = 0;
-  for (const ch of line7) {
-    if (ch === " ") indent++;
-    else if (ch === "	") indent += 4;
-    else break;
-  }
-  return indent;
-}
-function extractColor(label, palette) {
-  const m = label.match(COLOR_SUFFIX_RE);
-  if (!m) return { label };
-  const colorName = m[1].trim();
-  return {
-    label: label.substring(0, m.index).trim(),
-    color: resolveColor(colorName, palette)
-  };
-}
-function parsePipeMetadata(segments, aliasMap = /* @__PURE__ */ new Map()) {
-  const metadata = {};
-  for (let j = 1; j < segments.length; j++) {
-    for (const part of segments[j].split(",")) {
-      const trimmedPart = part.trim();
-      if (!trimmedPart) continue;
-      const colonIdx = trimmedPart.indexOf(":");
-      if (colonIdx > 0) {
-        const rawKey = trimmedPart.substring(0, colonIdx).trim().toLowerCase();
-        const key = aliasMap.get(rawKey) ?? rawKey;
-        const value = trimmedPart.substring(colonIdx + 1).trim();
-        metadata[key] = value;
-      }
-    }
-  }
-  return metadata;
-}
-var COLOR_SUFFIX_RE, CHART_TYPE_RE, TITLE_RE, OPTION_RE;
-var init_parsing = __esm({
-  "src/utils/parsing.ts"() {
-    "use strict";
-    init_colors();
-    COLOR_SUFFIX_RE = /\(([^)]+)\)\s*$/;
-    CHART_TYPE_RE = /^chart\s*:\s*(.+)/i;
-    TITLE_RE = /^title\s*:\s*(.+)/i;
-    OPTION_RE = /^([a-z][a-z0-9-]*)\s*:\s*(.+)$/i;
-  }
-});
-
 // src/sequence/parser.ts
 var parser_exports = {};
 __export(parser_exports, {
@@ -1659,6 +1672,13 @@ function isSequenceNote(el) {
 }
 function parseReturnLabel(rawLabel) {
   if (!rawLabel) return { label: "" };
+  const standaloneMatch = rawLabel.match(/^<-\s*(.*)$/);
+  if (standaloneMatch) {
+    return {
+      label: standaloneMatch[1].trim(),
+      standaloneReturn: true
+    };
+  }
   const arrowReturn = rawLabel.match(ARROW_RETURN_PATTERN);
   if (arrowReturn) {
     return { label: arrowReturn[1].trim(), returnLabel: arrowReturn[2].trim() };
@@ -1996,14 +2016,15 @@ function parseSequenceDgmo(content) {
       const to = arrowMatch[2];
       lastMsgFrom = from;
       const rawLabel = arrowMatch[3]?.trim() || "";
-      const { label, returnLabel } = isAsync ? { label: rawLabel, returnLabel: void 0 } : parseReturnLabel(rawLabel);
+      const { label, returnLabel, standaloneReturn } = isAsync ? { label: rawLabel, returnLabel: void 0, standaloneReturn: void 0 } : parseReturnLabel(rawLabel);
       const msg = {
         from,
         to,
         label,
         returnLabel,
         lineNumber,
-        ...isAsync ? { async: true } : {}
+        ...isAsync ? { async: true } : {},
+        ...standaloneReturn ? { standaloneReturn: true } : {}
       };
       result.messages.push(msg);
       currentContainer().push(msg);
@@ -3143,8 +3164,16 @@ function parseChart(content, palette) {
       continue;
     }
     if (key === "series") {
-      result.series = value;
-      const rawNames = value.split(",").map((s) => s.trim()).filter(Boolean);
+      let rawNames;
+      if (value) {
+        result.series = value;
+        rawNames = value.split(",").map((s) => s.trim()).filter(Boolean);
+      } else {
+        const collected = collectIndentedValues(lines, i);
+        i = collected.newIndex;
+        rawNames = collected.values;
+        result.series = rawNames.join(", ");
+      }
       const names = [];
       const nameColors = [];
       for (const raw of rawNames) {
@@ -3223,6 +3252,7 @@ var init_chart = __esm({
     "use strict";
     init_colors();
     init_diagnostics();
+    init_parsing();
     VALID_TYPES = /* @__PURE__ */ new Set([
       "bar",
       "line",
@@ -3298,8 +3328,16 @@ function parseEChart(content, palette) {
       continue;
     }
     if (key === "series") {
-      result.series = value;
-      const rawNames = value.split(",").map((s) => s.trim()).filter(Boolean);
+      let rawNames;
+      if (value) {
+        result.series = value;
+        rawNames = value.split(",").map((s) => s.trim()).filter(Boolean);
+      } else {
+        const collected = collectIndentedValues(lines, i);
+        i = collected.newIndex;
+        rawNames = collected.values;
+        result.series = rawNames.join(", ");
+      }
       const names = [];
       const nameColors = [];
       for (const raw of rawNames) {
@@ -3335,11 +3373,23 @@ function parseEChart(content, palette) {
       continue;
     }
     if (key === "columns") {
-      result.columns = value.split(",").map((s) => s.trim());
+      if (value) {
+        result.columns = value.split(",").map((s) => s.trim());
+      } else {
+        const collected = collectIndentedValues(lines, i);
+        i = collected.newIndex;
+        result.columns = collected.values;
+      }
       continue;
     }
     if (key === "rows") {
-      result.rows = value.split(",").map((s) => s.trim());
+      if (value) {
+        result.rows = value.split(",").map((s) => s.trim());
+      } else {
+        const collected = collectIndentedValues(lines, i);
+        i = collected.newIndex;
+        result.rows = collected.values;
+      }
       continue;
     }
     if (key === "x") {
@@ -4655,6 +4705,7 @@ var init_echarts = __esm({
     init_palettes();
     init_chart();
     init_diagnostics();
+    init_parsing();
     ECHART_EXPORT_WIDTH = 1200;
     ECHART_EXPORT_HEIGHT = 800;
     STANDARD_CHART_TYPES = /* @__PURE__ */ new Set([
@@ -12140,6 +12191,22 @@ function buildRenderSequence(messages) {
         messageIndex: top.messageIndex
       });
     }
+    if (msg.standaloneReturn) {
+      for (let si = stack.length - 1; si >= 0; si--) {
+        if (stack[si].from === msg.to && stack[si].to === msg.from) {
+          stack.splice(si, 1);
+          break;
+        }
+      }
+      steps.push({
+        type: "return",
+        from: msg.from,
+        to: msg.to,
+        label: msg.label,
+        messageIndex: mi
+      });
+      continue;
+    }
     steps.push({
       type: "call",
       from: msg.from,
@@ -13421,18 +13488,34 @@ function parseD3(content, palette) {
       }
     }
     if (result.type === "quadrant") {
-      const xAxisMatch = line7.match(/^x-axis\s*:\s*(.+)/i);
+      const xAxisMatch = line7.match(/^x-axis\s*:\s*(.*)/i);
       if (xAxisMatch) {
-        const parts = xAxisMatch[1].split(",").map((s) => s.trim());
+        const val = xAxisMatch[1].trim();
+        let parts;
+        if (val) {
+          parts = val.split(",").map((s) => s.trim());
+        } else {
+          const collected = collectIndentedValues(lines, i);
+          i = collected.newIndex;
+          parts = collected.values;
+        }
         if (parts.length >= 2) {
           result.quadrantXAxis = [parts[0], parts[1]];
           result.quadrantXAxisLineNumber = lineNumber;
         }
         continue;
       }
-      const yAxisMatch = line7.match(/^y-axis\s*:\s*(.+)/i);
+      const yAxisMatch = line7.match(/^y-axis\s*:\s*(.*)/i);
       if (yAxisMatch) {
-        const parts = yAxisMatch[1].split(",").map((s) => s.trim());
+        const val = yAxisMatch[1].trim();
+        let parts;
+        if (val) {
+          parts = val.split(",").map((s) => s.trim());
+        } else {
+          const collected = collectIndentedValues(lines, i);
+          i = collected.newIndex;
+          parts = collected.values;
+        }
         if (parts.length >= 2) {
           result.quadrantYAxis = [parts[0], parts[1]];
           result.quadrantYAxisLineNumber = lineNumber;
@@ -16248,6 +16331,7 @@ var init_d3 = __esm({
     init_colors();
     init_palettes();
     init_diagnostics();
+    init_parsing();
     DEFAULT_CLOUD_OPTIONS = {
       rotate: "none",
       max: 0,