@diagrammo/dgmo 0.72.0 → 0.73.0

package/dist/{chunk-UTVKOGFF.js → chunk-KCHCOXAL.js}

@@ -4,10 +4,10 @@ import {
 import {
   isTagBlockHeading,
   matchTagBlockHeading
-} from "./chunk-DPGI742S.js";
+} from "./chunk-4FKEI4MF.js";
 import {
   makeDgmoError
-} from "./chunk-OLMWTJVU.js";
+} from "./chunk-5SI6T5A5.js";
 
 // src/pert/share-normalize.ts
 var START_DATE_NOW_RE = /^(\s*start-date\s+)now(\s*)$/i;
@@ -34,8 +34,9 @@ function normalizePertSourceForShare(dsl) {
 
 // src/org/resolver.ts
 var MAX_DEPTH = 10;
-var IMPORT_RE = /^(\s+)import:?\s+(.+\.dgmo)\s*$/i;
-var TAGS_RE = /^tags:?\s+(.+\.dgmo)\s*$/i;
+var IMPORT_RE = /^(\s+)import\s+(.+\.dgmo)\s*$/i;
+var HEADER_IMPORT_RE = /^import\s+(.+\.dgmo)\s*$/i;
+var FILE_REF_RE = /^\s*([A-Za-z][\w-]*)(:?)\s+\S+\.dgmo\s*$/;
 var HEADER_RE = /^(org|kanban|title\s*:)/i;
 var KNOWN_HEADER_OPTIONS = /* @__PURE__ */ new Set([
   "direction-tb",
@@ -100,7 +101,7 @@ function parseFileHeader(lines) {
       }
     }
   }
-  let tagsDirective = null;
+  let headerImportPath = null;
   const contentLines = [];
   const contentLineIndices = [];
   let headerDone = false;
@@ -111,9 +112,9 @@ function parseFileHeader(lines) {
     if (!headerDone && (trimmed === "" || trimmed.startsWith("//"))) continue;
     if (!headerDone) {
       if (HEADER_RE.test(trimmed)) continue;
-      const tagsMatch = trimmed.match(TAGS_RE);
-      if (tagsMatch) {
-        tagsDirective = tagsMatch[1].trim();
+      const headerImportMatch = rawLine.match(HEADER_IMPORT_RE);
+      if (headerImportMatch) {
+        headerImportPath = headerImportMatch[1].trim();
         continue;
       }
       if (!rawLine.match(/^\s/) && !isTagBlockHeading(trimmed) && !trimmed.includes("|")) {
@@ -127,7 +128,7 @@ function parseFileHeader(lines) {
     contentLines.push(rawLine);
     contentLineIndices.push(i);
   }
-  return { contentLines, contentLineIndices, tagGroups, tagsDirective };
+  return { contentLines, contentLineIndices, tagGroups, headerImportPath };
 }
 async function resolveOrgImports(content, filePath, readFileFn) {
   const diagnostics = [];
@@ -137,7 +138,8 @@ async function resolveOrgImports(content, filePath, readFileFn) {
     readFileFn,
     diagnostics,
     /* @__PURE__ */ new Set([filePath]),
-    0
+    0,
+    null
   );
   return {
     content: result.content,
@@ -146,13 +148,40 @@ async function resolveOrgImports(content, filePath, readFileFn) {
     importSourceMap: result.importSourceMap
   };
 }
-async function resolveFile(content, filePath, readFileFn, diagnostics, ancestorChain, depth) {
+function pushDiag(diagnostics, origin, line, message) {
+  if (origin === null) {
+    diagnostics.push(makeDgmoError(line, message));
+    return;
+  }
+  diagnostics.push({
+    ...makeDgmoError(
+      origin.line,
+      `${origin.displayPath} line ${line}: ${message}`
+    ),
+    file: origin.displayPath,
+    fileLine: line
+  });
+}
+async function resolveFile(content, filePath, readFileFn, diagnostics, ancestorChain, depth, origin) {
   const lines = content.split("\n");
+  for (let i = 0; i < lines.length; i++) {
+    const match = lines[i].match(FILE_REF_RE);
+    if (!match) continue;
+    const keyword = match[1];
+    const colon = match[2];
+    if (keyword.toLowerCase() === "import" && colon === "") continue;
+    pushDiag(
+      diagnostics,
+      origin,
+      i + 1,
+      keyword.toLowerCase() === "import" ? "An import takes no colon: write `import <file>.dgmo`" : `Unknown directive \`${keyword}\`: a file is pulled in with \`import <file>.dgmo\``
+    );
+  }
   const headerLines = [];
-  let tagsDirective = null;
+  let headerImportPath = null;
   const inlineTagGroups = extractTagGroups(lines);
   const bodyStartIndex = findBodyStart(lines);
-  let tagsLineNumber = 0;
+  let headerImportLine = 0;
   for (let i = 0; i < bodyStartIndex; i++) {
     const rawLine = lines[i];
     const trimmed = rawLine.trim();
@@ -162,24 +191,26 @@ async function resolveFile(content, filePath, readFileFn, diagnostics, ancestorC
     }
     if (isTagBlockHeading(trimmed)) continue;
     if (/^\s/.test(rawLine)) continue;
-    const tagsMatch = trimmed.match(TAGS_RE);
-    if (tagsMatch) {
-      tagsDirective = tagsMatch[1].trim();
-      tagsLineNumber = i + 1;
+    const headerImportMatch = rawLine.match(HEADER_IMPORT_RE);
+    if (headerImportMatch) {
+      headerImportPath = headerImportMatch[1].trim();
+      headerImportLine = i + 1;
       continue;
     }
     headerLines.push({ text: rawLine, originalLine: i + 1 });
   }
-  let tagsFileGroups = [];
-  if (tagsDirective) {
-    const tagsPath = resolvePath(filePath, tagsDirective);
+  let headerImportGroups = [];
+  if (headerImportPath) {
+    const absPath = resolvePath(filePath, headerImportPath);
     try {
-      const tagsContent = await readFileFn(tagsPath);
-      const tagsLines = tagsContent.split("\n");
-      tagsFileGroups = extractTagGroups(tagsLines);
+      const importedContent = await readFileFn(absPath);
+      headerImportGroups = extractTagGroups(importedContent.split("\n"));
     } catch {
-      diagnostics.push(
-        makeDgmoError(tagsLineNumber, `Tags file not found: ${tagsDirective}`)
+      pushDiag(
+        diagnostics,
+        origin,
+        headerImportLine,
+        `Import file not found: ${headerImportPath}`
       );
     }
   }
@@ -191,6 +222,19 @@ async function resolveFile(content, filePath, readFileFn, diagnostics, ancestorC
     const lineNumber = bodyStartIndex + i + 1;
     const importMatch = line.match(IMPORT_RE);
     if (!importMatch) {
+      if (HEADER_IMPORT_RE.test(line)) {
+        pushDiag(
+          diagnostics,
+          origin,
+          lineNumber,
+          "An import in the body must be indented under the person it reports to"
+        );
+        continue;
+      }
+      const fileRef = line.match(FILE_REF_RE);
+      if (fileRef && !(fileRef[1].toLowerCase() === "import" && fileRef[2] === "")) {
+        continue;
+      }
       const trimmed = line.trim();
       if (isTagBlockHeading(trimmed) || inlineTagGroups.length > 0 && isTagGroupEntry(line, bodyLines, i)) {
         continue;
@@ -206,18 +250,21 @@ async function resolveFile(content, filePath, readFileFn, diagnostics, ancestorC
     const importRelPath = importMatch[2].trim();
     const importAbsPath = resolvePath(filePath, importRelPath);
     if (depth >= MAX_DEPTH) {
-      diagnostics.push(
-        makeDgmoError(
-          lineNumber,
-          `Import depth limit exceeded (${MAX_DEPTH}): ${importRelPath}`
-        )
+      pushDiag(
+        diagnostics,
+        origin,
+        lineNumber,
+        `Import depth limit exceeded (${MAX_DEPTH}): ${importRelPath}`
       );
       continue;
     }
     if (ancestorChain.has(importAbsPath)) {
       const chain = [...ancestorChain, importAbsPath].map((p) => p.split("/").pop()).join(" -> ");
-      diagnostics.push(
-        makeDgmoError(lineNumber, `Circular import detected: ${chain}`)
+      pushDiag(
+        diagnostics,
+        origin,
+        lineNumber,
+        `Circular import detected: ${chain}`
       );
       continue;
     }
@@ -225,8 +272,11 @@ async function resolveFile(content, filePath, readFileFn, diagnostics, ancestorC
     try {
       importedContent = await readFileFn(importAbsPath);
     } catch {
-      diagnostics.push(
-        makeDgmoError(lineNumber, `Import file not found: ${importRelPath}`)
+      pushDiag(
+        diagnostics,
+        origin,
+        lineNumber,
+        `Import file not found: ${importRelPath}`
       );
       continue;
     }
@@ -238,7 +288,11 @@ async function resolveFile(content, filePath, readFileFn, diagnostics, ancestorC
       readFileFn,
       diagnostics,
       nestedChain,
-      depth + 1
+      depth + 1,
+      {
+        displayPath: importRelPath,
+        line: origin === null ? lineNumber : origin.line
+      }
     );
     const resolvedLines = resolved.content.split("\n");
     const parsed = parseFileHeader(resolvedLines);
@@ -289,7 +343,7 @@ async function resolveFile(content, filePath, readFileFn, diagnostics, ancestorC
   }
   const mergedGroups = mergeTagGroups(
     inlineTagGroups,
-    tagsFileGroups,
+    headerImportGroups,
     importedTagGroups
   );
   const outputLines = [];
@@ -357,7 +411,7 @@ function findBodyStart(lines) {
       inTagGroup = false;
     }
     if (HEADER_RE.test(trimmed)) continue;
-    if (TAGS_RE.test(trimmed)) continue;
+    if (HEADER_IMPORT_RE.test(rawLine)) continue;
     if (!rawLine.match(/^\s/) && !trimmed.includes("|") && !isTagBlockHeading(trimmed)) {
       const firstToken = trimmed.split(/\s/)[0].toLowerCase();
       if (KNOWN_HEADER_OPTIONS.has(firstToken)) {
@@ -380,12 +434,12 @@ function isTagGroupEntry(line, allLines, index) {
   }
   return false;
 }
-function mergeTagGroups(inline, tagsFile, imported) {
+function mergeTagGroups(inline, headerImport, imported) {
   const seen = /* @__PURE__ */ new Map();
   for (const group of inline) {
     seen.set(group.name, group);
   }
-  for (const group of tagsFile) {
+  for (const group of headerImport) {
     if (!seen.has(group.name)) {
       seen.set(group.name, group);
     }
@@ -402,4 +456,4 @@ export {
   normalizePertSourceForShare,
   resolveOrgImports
 };
-//# sourceMappingURL=chunk-UTVKOGFF.js.map
+//# sourceMappingURL=chunk-KCHCOXAL.js.map

package/dist/{chunk-VGLSKDDI.js → chunk-KI2L4DWM.js}

@@ -8,10 +8,10 @@ import {
 } from "./chunk-NOTA6TEI.js";
 import {
   peelQuotedName
-} from "./chunk-ZJJWON5O.js";
+} from "./chunk-MK55PZVB.js";
 import {
   makeDgmoError
-} from "./chunk-OLMWTJVU.js";
+} from "./chunk-5SI6T5A5.js";
 
 // src/gantt/resolver.ts
 function isResolverError(r) {
@@ -787,4 +787,4 @@ export {
   resolveTaskName,
   calculateSchedule
 };
-//# sourceMappingURL=chunk-VGLSKDDI.js.map
+//# sourceMappingURL=chunk-KI2L4DWM.js.map

package/dist/{chunk-AEYRSPVV.js → chunk-KUDYLU3M.js}

@@ -2,13 +2,13 @@ import {
   extractColor,
   measureIndent,
   parseFirstLine
-} from "./chunk-ZJJWON5O.js";
+} from "./chunk-MK55PZVB.js";
 import {
   emit,
   formatDgmoError,
   makeFail,
   suggest
-} from "./chunk-OLMWTJVU.js";
+} from "./chunk-5SI6T5A5.js";
 
 // src/version-control/diagnostics.ts
 var VERSION_CONTROL_DX = {
@@ -507,4 +507,4 @@ export {
   VERSION_CONTROL_DIAGNOSTICS,
   parseVersionControl
 };
-//# sourceMappingURL=chunk-AEYRSPVV.js.map
+//# sourceMappingURL=chunk-KUDYLU3M.js.map

package/dist/{chunk-QITH5XOX.js → chunk-KZKRK57S.js}

@@ -1,13 +1,13 @@
 import {
   layoutERDiagram
-} from "./chunk-UJXCDF4E.js";
+} from "./chunk-5VMUVJO4.js";
 import {
   NOTE_BADGE_RADIUS,
   noteConnectorPoints,
   renderNoteBadge,
   renderNoteBox,
   renderNoteConnector
-} from "./chunk-IW6N2JJL.js";
+} from "./chunk-Q74GP3GK.js";
 import {
   EDGE_STROKE_WIDTH,
   NODE_STROKE_WIDTH
@@ -17,7 +17,7 @@ import {
 } from "./chunk-24YPR5EH.js";
 import {
   layoutInlineHeader
-} from "./chunk-6CLC26GU.js";
+} from "./chunk-YJMWEZOB.js";
 import {
   serializeSvg
 } from "./chunk-RU2HHHYA.js";
@@ -28,36 +28,36 @@ import {
 } from "./chunk-A4GOY3PE.js";
 import {
   renderIntegratedLegend
-} from "./chunk-6S53NO3M.js";
+} from "./chunk-O7ZKDUDX.js";
 import {
   getLegendExtent
-} from "./chunk-MTPKBSTR.js";
+} from "./chunk-4SXHMFFP.js";
 import {
   FONT_FAMILY
 } from "./chunk-UTCPNJND.js";
 import {
   LEGEND_HEIGHT
-} from "./chunk-QX53GOI7.js";
+} from "./chunk-YT5ICQ4R.js";
 import {
   measureText
 } from "./chunk-MTGGOCND.js";
 import {
   parseERDiagram
-} from "./chunk-KOVRFBGR.js";
+} from "./chunk-ARM4G2HJ.js";
 import {
   resolveTagColor,
   tagAttrKey
-} from "./chunk-DPGI742S.js";
+} from "./chunk-4FKEI4MF.js";
 import {
   fillModeFromOptions,
   legendInlineRequested,
   legendSuppressed
-} from "./chunk-ZJJWON5O.js";
+} from "./chunk-MK55PZVB.js";
 import {
   contrastText,
   getSeriesColors,
   shapeFill
-} from "./chunk-KWRW6BLG.js";
+} from "./chunk-GLREDNBA.js";
 
 // src/er/renderer.ts
 import * as d3Selection from "d3-selection";
@@ -603,4 +603,4 @@ export {
   renderERDiagram,
   renderERDiagramForExport
 };
-//# sourceMappingURL=chunk-QITH5XOX.js.map
+//# sourceMappingURL=chunk-KZKRK57S.js.map

package/dist/{chunk-4VUFJ7UA.js → chunk-LGASNVZE.js}

@@ -8,14 +8,14 @@ import {
 } from "./chunk-FJ57274M.js";
 import {
   layoutInlineHeader
-} from "./chunk-6CLC26GU.js";
+} from "./chunk-YJMWEZOB.js";
 import {
   renderIntegratedLegend
-} from "./chunk-6S53NO3M.js";
+} from "./chunk-O7ZKDUDX.js";
 import {
   getLegendExtent,
   getMaxLegendReservedHeight
-} from "./chunk-MTPKBSTR.js";
+} from "./chunk-4SXHMFFP.js";
 import {
   FONT_FAMILY
 } from "./chunk-UTCPNJND.js";
@@ -27,13 +27,13 @@ import {
   resolveActiveTagGroup,
   resolveTagColor,
   tagAttrKey
-} from "./chunk-DPGI742S.js";
+} from "./chunk-4FKEI4MF.js";
 import {
   contrastText,
   mix,
   shapeFill,
   themeBaseBg
-} from "./chunk-KWRW6BLG.js";
+} from "./chunk-GLREDNBA.js";
 
 // src/sketch/renderer.ts
 import * as d3 from "d3-selection";
@@ -1127,4 +1127,4 @@ export {
   sketchEdgeGeometry,
   renderSketchForExport
 };
-//# sourceMappingURL=chunk-4VUFJ7UA.js.map
+//# sourceMappingURL=chunk-LGASNVZE.js.map

package/dist/{chunk-ET4R3AU5.js → chunk-LM3HY3VG.js}

@@ -9,7 +9,7 @@ import {
 } from "./chunk-MTGGOCND.js";
 import {
   resolveNotes
-} from "./chunk-7NK42OIB.js";
+} from "./chunk-E6PNTYRK.js";
 
 // src/class/layout.ts
 import dagre from "@dagrejs/dagre";
@@ -201,4 +201,4 @@ function layoutClassDiagram(parsed, options) {
 export {
   layoutClassDiagram
 };
-//# sourceMappingURL=chunk-ET4R3AU5.js.map
+//# sourceMappingURL=chunk-LM3HY3VG.js.map

package/dist/{chunk-RJI6MHHK.js → chunk-LMJKHQ4W.js}

@@ -3,13 +3,13 @@ import {
 } from "./chunk-7TF3QOOD.js";
 import {
   tryCollectNote
-} from "./chunk-MX3BYU7V.js";
+} from "./chunk-JLSGQMRA.js";
 import {
   resolveNotes
-} from "./chunk-7NK42OIB.js";
+} from "./chunk-E6PNTYRK.js";
 import {
   parseInArrowLabel
-} from "./chunk-RRX4Z4TH.js";
+} from "./chunk-IHOFUR74.js";
 import {
   displayName,
   normalizeName
@@ -21,7 +21,7 @@ import {
   measureIndent,
   parseFirstLine,
   tryParseSharedOption
-} from "./chunk-ZJJWON5O.js";
+} from "./chunk-MK55PZVB.js";
 import {
   NAME_DIAGNOSTIC_CODES,
   emit,
@@ -29,7 +29,7 @@ import {
   makeDgmoError,
   nameMergedMessage,
   suggest
-} from "./chunk-OLMWTJVU.js";
+} from "./chunk-5SI6T5A5.js";
 
 // src/graph/flowchart-parser.ts
 function nodeId(shape, label) {
@@ -470,4 +470,4 @@ export {
   looksLikeFlowchart,
   extractSymbols
 };
-//# sourceMappingURL=chunk-RJI6MHHK.js.map
+//# sourceMappingURL=chunk-LMJKHQ4W.js.map