@diagrammo/dgmo 0.2.28 → 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);
@@ -2710,23 +2731,6 @@ function parseClassDiagram(content, palette) {
     }
     currentClass = null;
     contentStarted = true;
-    const relKeyword = trimmed.match(REL_KEYWORD_RE);
-    if (relKeyword) {
-      const sourceName = relKeyword[1];
-      const keyword = relKeyword[2].toLowerCase();
-      const targetName = relKeyword[3];
-      const label = relKeyword[4]?.trim();
-      getOrCreateClass(sourceName, lineNumber);
-      getOrCreateClass(targetName, lineNumber);
-      result.relationships.push({
-        source: classId(sourceName),
-        target: classId(targetName),
-        type: KEYWORD_TO_TYPE[keyword],
-        ...label && { label },
-        lineNumber
-      });
-      continue;
-    }
     const relArrow = trimmed.match(REL_ARROW_RE);
     if (relArrow) {
       const sourceName = relArrow[1];
@@ -2747,13 +2751,24 @@ function parseClassDiagram(content, palette) {
     const classDecl = trimmed.match(CLASS_DECL_RE);
     if (classDecl) {
       const name = classDecl[1];
-      const modifier = classDecl[2];
-      const colorName = classDecl[3]?.trim();
+      const relKeyword = classDecl[2];
+      const parentName = classDecl[3];
+      const modifier = classDecl[4];
+      const colorName = classDecl[5]?.trim();
       const color = colorName ? resolveColor(colorName, palette) : void 0;
       const node = getOrCreateClass(name, lineNumber);
       if (modifier) node.modifier = modifier;
       if (color) node.color = color;
       node.lineNumber = lineNumber;
+      if (relKeyword && parentName) {
+        getOrCreateClass(parentName, lineNumber);
+        result.relationships.push({
+          source: classId(name),
+          target: classId(parentName),
+          type: relKeyword,
+          lineNumber
+        });
+      }
       currentClass = node;
       continue;
     }
@@ -2793,8 +2808,9 @@ function looksLikeClassDiagram(content) {
         hasModifier = true;
         hasClassDecl = true;
       }
-      if (REL_KEYWORD_RE.test(trimmed)) {
+      if (/^[A-Z][A-Za-z0-9_]*\s+(extends|implements)\s+[A-Z]/.test(trimmed)) {
         hasRelationship = true;
+        hasClassDecl = true;
       }
       if (REL_ARROW_RE.test(trimmed)) {
         hasRelationship = true;
@@ -2812,27 +2828,19 @@ function looksLikeClassDiagram(content) {
   if (hasRelationship && hasClassDecl && hasIndentedMember) return true;
   return false;
 }
-var CLASS_DECL_RE, REL_KEYWORD_RE, REL_ARROW_RE, VISIBILITY_RE, STATIC_SUFFIX_RE, METHOD_RE, FIELD_RE, KEYWORD_TO_TYPE, ARROW_TO_TYPE;
+var CLASS_DECL_RE, REL_ARROW_RE, VISIBILITY_RE, STATIC_SUFFIX_RE, METHOD_RE, FIELD_RE, ARROW_TO_TYPE;
 var init_parser2 = __esm({
   "src/class/parser.ts"() {
     "use strict";
     init_colors();
     init_diagnostics();
     init_parsing();
-    CLASS_DECL_RE = /^([A-Z][A-Za-z0-9_]*)(?:\s+\[(abstract|interface|enum)\])?(?:\s+\(([^)]+)\))?\s*$/;
-    REL_KEYWORD_RE = /^([A-Z][A-Za-z0-9_]*)\s+(extends|implements|contains|has|uses)\s+([A-Z][A-Za-z0-9_]*)(?:\s*:\s*(.+))?$/;
+    CLASS_DECL_RE = /^([A-Z][A-Za-z0-9_]*)(?:\s+(extends|implements)\s+([A-Z][A-Za-z0-9_]*))?(?:\s+\[(abstract|interface|enum)\])?(?:\s+\(([^)]+)\))?\s*$/;
     REL_ARROW_RE = /^([A-Z][A-Za-z0-9_]*)\s+(--\|>|\.\.\|>|\*--|o--|\.\.\>|->)\s+([A-Z][A-Za-z0-9_]*)(?:\s*:\s*(.+))?$/;
     VISIBILITY_RE = /^([+\-#])\s*/;
     STATIC_SUFFIX_RE = /\{static\}\s*$/;
     METHOD_RE = /^(.+?)\(([^)]*)\)(?:\s*:\s*(.+))?$/;
     FIELD_RE = /^(.+?)\s*:\s*(.+)$/;
-    KEYWORD_TO_TYPE = {
-      extends: "extends",
-      implements: "implements",
-      contains: "composes",
-      has: "aggregates",
-      uses: "depends"
-    };
     ARROW_TO_TYPE = {
       "--|>": "extends",
       "..|>": "implements",
@@ -2872,7 +2880,7 @@ function parseRelationship(trimmed, lineNumber, pushError) {
       };
     }
   }
-  const kw = trimmed.match(REL_KEYWORD_RE2);
+  const kw = trimmed.match(REL_KEYWORD_RE);
   if (kw) {
     const fromSym = KEYWORD_TO_SYMBOL[kw[2].toLowerCase()] ?? kw[2];
     const toSym = KEYWORD_TO_SYMBOL[kw[3].toLowerCase()] ?? kw[3];
@@ -3055,7 +3063,7 @@ function looksLikeERDiagram(content) {
   if (hasRelationship && hasTableDecl && hasConstraint) return true;
   return false;
 }
-var TABLE_DECL_RE, COLUMN_RE, CONSTRAINT_MAP, REL_SYMBOLIC_RE, REL_KEYWORD_RE2, KEYWORD_TO_SYMBOL;
+var TABLE_DECL_RE, COLUMN_RE, CONSTRAINT_MAP, REL_SYMBOLIC_RE, REL_KEYWORD_RE, KEYWORD_TO_SYMBOL;
 var init_parser3 = __esm({
   "src/er/parser.ts"() {
     "use strict";
@@ -3071,7 +3079,7 @@ var init_parser3 = __esm({
       nullable: "nullable"
     };
     REL_SYMBOLIC_RE = /^([a-zA-Z_]\w*)\s+([1*?])\s*-{1,2}\s*([1*?])\s+([a-zA-Z_]\w*)(?:\s*:\s*(.+))?$/;
-    REL_KEYWORD_RE2 = /^([a-zA-Z_]\w*)\s+(one|many|zero)[- ]to[- ](one|many|zero)\s+([a-zA-Z_]\w*)(?:\s*:\s*(.+))?$/i;
+    REL_KEYWORD_RE = /^([a-zA-Z_]\w*)\s+(one|many|zero)[- ]to[- ](one|many|zero)\s+([a-zA-Z_]\w*)(?:\s*:\s*(.+))?$/i;
     KEYWORD_TO_SYMBOL = {
       one: "1",
       many: "*",
@@ -3156,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) {
@@ -3236,6 +3252,7 @@ var init_chart = __esm({
     "use strict";
     init_colors();
     init_diagnostics();
+    init_parsing();
     VALID_TYPES = /* @__PURE__ */ new Set([
       "bar",
       "line",
@@ -3311,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) {
@@ -3348,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") {
@@ -4668,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([
@@ -7753,22 +7791,30 @@ function computeNodeDimensions(node) {
   }
   const width = Math.max(MIN_WIDTH, maxTextLen * CHAR_WIDTH2 + PADDING_X);
   const headerHeight = HEADER_BASE + (node.modifier ? MODIFIER_BADGE : 0);
-  let fieldsHeight = 0;
+  let fieldsHeight;
   if (isEnum) {
     const enumValues = node.members;
     if (enumValues.length > 0) {
       fieldsHeight = COMPARTMENT_PADDING_Y * 2 + enumValues.length * MEMBER_LINE_HEIGHT + SEPARATOR_HEIGHT;
+    } else {
+      fieldsHeight = SEPARATOR_HEIGHT + COMPARTMENT_PADDING_Y;
     }
   } else {
     if (fields.length > 0) {
       fieldsHeight = COMPARTMENT_PADDING_Y * 2 + fields.length * MEMBER_LINE_HEIGHT + SEPARATOR_HEIGHT;
+    } else {
+      fieldsHeight = SEPARATOR_HEIGHT + COMPARTMENT_PADDING_Y;
     }
   }
   let methodsHeight = 0;
-  if (!isEnum && methods.length > 0) {
-    methodsHeight = COMPARTMENT_PADDING_Y * 2 + methods.length * MEMBER_LINE_HEIGHT + SEPARATOR_HEIGHT;
+  if (!isEnum) {
+    if (methods.length > 0) {
+      methodsHeight = COMPARTMENT_PADDING_Y * 2 + methods.length * MEMBER_LINE_HEIGHT + SEPARATOR_HEIGHT;
+    } else {
+      methodsHeight = SEPARATOR_HEIGHT + COMPARTMENT_PADDING_Y;
+    }
   }
-  const height = headerHeight + fieldsHeight + methodsHeight + (fieldsHeight === 0 && methodsHeight === 0 ? 4 : 0);
+  const height = headerHeight + fieldsHeight + methodsHeight;
   return { width, height, headerHeight, fieldsHeight, methodsHeight };
 }
 function layoutClassDiagram(parsed) {
@@ -8021,17 +8067,15 @@ function renderClassDiagram(container, parsed, layout, palette, isDark, onClickI
     const fields = node.members.filter((m) => !m.isMethod);
     const methods = node.members.filter((m) => m.isMethod);
     if (isEnum) {
-      if (node.members.length > 0) {
-        nodeG.append("line").attr("x1", -w / 2).attr("y1", yPos).attr("x2", w / 2).attr("y2", yPos).attr("stroke", stroke2).attr("stroke-width", 0.5).attr("stroke-opacity", 0.5);
-        let memberY = yPos + COMPARTMENT_PADDING_Y2;
-        for (const member of node.members) {
-          nodeG.append("text").attr("x", -w / 2 + MEMBER_PADDING_X).attr("y", memberY + MEMBER_LINE_HEIGHT2 / 2).attr("dominant-baseline", "central").attr("fill", palette.text).attr("font-size", MEMBER_FONT_SIZE).text(member.name);
-          memberY += MEMBER_LINE_HEIGHT2;
-        }
+      nodeG.append("line").attr("x1", -w / 2).attr("y1", yPos).attr("x2", w / 2).attr("y2", yPos).attr("stroke", stroke2).attr("stroke-width", 0.5).attr("stroke-opacity", 0.5);
+      let memberY = yPos + COMPARTMENT_PADDING_Y2;
+      for (const member of node.members) {
+        nodeG.append("text").attr("x", -w / 2 + MEMBER_PADDING_X).attr("y", memberY + MEMBER_LINE_HEIGHT2 / 2).attr("dominant-baseline", "central").attr("fill", palette.text).attr("font-size", MEMBER_FONT_SIZE).text(member.name);
+        memberY += MEMBER_LINE_HEIGHT2;
       }
     } else {
+      nodeG.append("line").attr("x1", -w / 2).attr("y1", yPos).attr("x2", w / 2).attr("y2", yPos).attr("stroke", stroke2).attr("stroke-width", 0.5).attr("stroke-opacity", 0.5);
       if (fields.length > 0) {
-        nodeG.append("line").attr("x1", -w / 2).attr("y1", yPos).attr("x2", w / 2).attr("y2", yPos).attr("stroke", stroke2).attr("stroke-width", 0.5).attr("stroke-opacity", 0.5);
         let memberY = yPos + COMPARTMENT_PADDING_Y2;
         for (const field of fields) {
           const vis = visibilitySymbol(field.visibility);
@@ -8044,10 +8088,10 @@ function renderClassDiagram(container, parsed, layout, palette, isDark, onClickI
           textEl.text(text);
           memberY += MEMBER_LINE_HEIGHT2;
         }
-        yPos += node.fieldsHeight;
       }
+      yPos += node.fieldsHeight;
+      nodeG.append("line").attr("x1", -w / 2).attr("y1", yPos).attr("x2", w / 2).attr("y2", yPos).attr("stroke", stroke2).attr("stroke-width", 0.5).attr("stroke-opacity", 0.5);
       if (methods.length > 0) {
-        nodeG.append("line").attr("x1", -w / 2).attr("y1", yPos).attr("x2", w / 2).attr("y2", yPos).attr("stroke", stroke2).attr("stroke-width", 0.5).attr("stroke-opacity", 0.5);
         let memberY = yPos + COMPARTMENT_PADDING_Y2;
         for (const method of methods) {
           const vis = visibilitySymbol(method.visibility);
@@ -12147,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,
@@ -13428,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;
@@ -16255,6 +16331,7 @@ var init_d3 = __esm({
     init_colors();
     init_palettes();
     init_diagnostics();
+    init_parsing();
     DEFAULT_CLOUD_OPTIONS = {
       rotate: "none",
       max: 0,