@diagrammo/dgmo 0.2.28 → 0.3.0

package/dist/index.js

@@ -2688,23 +2688,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];
@@ -2725,13 +2708,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;
     }
@@ -2771,8 +2765,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;
@@ -2790,27 +2785,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",
@@ -2850,7 +2837,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];
@@ -3033,7 +3020,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";
@@ -3049,7 +3036,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: "*",
@@ -7732,22 +7719,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) {
@@ -8001,17 +7996,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);
@@ -8024,10 +8017,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);