@zenuml/core 3.49.6 → 3.50.0

package/dist/cli/zenuml.mjs

@@ -9518,10 +9518,6 @@ RetContext.prototype.From = function() {
   return this.asyncMessage()?.From() || this.returnAsyncMessage()?.From() || this.ClosestAncestorStat().Origin();
 };
 
-antlr4.ParserRuleContext.prototype.Key = function() {
-  return `${this.start.start}:${this.stop.stop}`;
-};
-
 const seqParser = sequenceParser;
 const StatContext = seqParser.StatContext;
 antlr4.ParserRuleContext.prototype.ClosestAncestorStat = function() {
@@ -9650,10 +9646,6 @@ antlr4.ParserRuleContext.prototype.getComment = function () {
   );
 };
 
-antlr4.ParserRuleContext.prototype.returnedValue = function () {
-  return this.braceBlock().block().ret().value();
-};
-
 sequenceParser.ProgContext;
 const RootContext = rootContext;
 sequenceParser.GroupContext;
@@ -13223,7 +13215,10 @@ function expandInputs(inputs) {
     }
     const glob = new Bun.Glob(input);
     const matches = [];
-    for (const match of glob.scanSync({ cwd: process.cwd(), onlyFiles: true })) {
+    for (const match of glob.scanSync({
+      cwd: process.cwd(),
+      onlyFiles: true
+    })) {
       matches.push(match);
     }
     if (matches.length === 0) {
@@ -13242,7 +13237,17 @@ function isDirectory(p) {
   }
 }
 function parseArgs(argv) {
-  const args = { inputs: [], check: false, parse: false, json: false, quiet: false, help: false, version: false, md: false, watch: false };
+  const args = {
+    inputs: [],
+    check: false,
+    parse: false,
+    json: false,
+    quiet: false,
+    help: false,
+    version: false,
+    md: false,
+    watch: false
+  };
   let i = 0;
   while (i < argv.length) {
     const arg = argv[i];
@@ -13306,9 +13311,11 @@ function parseArgs(argv) {
         args.watch = true;
         break;
       default:
-        process.stderr.write(`Unknown option: ${arg}
+        process.stderr.write(
+          `Unknown option: ${arg}
 Run "zenuml --help" for usage.
-`);
+`
+        );
         process.exit(1);
     }
     i++;
@@ -13361,7 +13368,9 @@ async function getPlaywrightBrowser() {
   }
   const executablePath = process.env["ZENUML_CHROMIUM_PATH"];
   try {
-    _browser = await playwright.chromium.launch(executablePath ? { executablePath } : void 0);
+    _browser = await playwright.chromium.launch(
+      executablePath ? { executablePath } : void 0
+    );
     return _browser;
   } catch (error) {
     throw new Error(
@@ -13402,6 +13411,54 @@ async function rasterizeToPng(svgString, svgWidth, svgHeight, scale) {
 function getRuleNames(ctx) {
   return ctx?.parser?.ruleNames;
 }
+function isFacadeNode(node) {
+  return !!node && node.symbol === void 0 && !node.parser && !!node._doc && typeof node.constructor?.name === "string" && node.constructor.name.endsWith("Context");
+}
+function facadeRuleName(className) {
+  const base = className.endsWith("Context") ? className.slice(0, -"Context".length) : className;
+  return base.charAt(0).toLowerCase() + base.slice(1);
+}
+function serializeFacadeNode(node) {
+  const result = {
+    type: "rule",
+    ruleName: facadeRuleName(node.constructor.name)
+  };
+  const ruleChildren = node.children ?? [];
+  const childSpans = ruleChildren.map((c) => ({
+    c,
+    start: c.start?.start ?? null,
+    end: c.stop?.stop ?? null
+    // inclusive
+  }));
+  const items = [];
+  for (const cs of childSpans) {
+    if (cs.start !== null) {
+      items.push({ off: cs.start, node: serializeParseTree(cs.c) });
+    }
+  }
+  const nodeStart = node.start?.start;
+  const nodeStop = node.stop?.stop;
+  if (nodeStart !== void 0 && nodeStop !== null && nodeStop !== void 0) {
+    for (const leaf of node._doc.leaves) {
+      if (leaf.offset < nodeStart) continue;
+      if (leaf.offset > nodeStop) break;
+      if (leaf.hidden) continue;
+      const covered = childSpans.some(
+        (cs) => cs.start !== null && cs.end !== null && leaf.offset >= cs.start && leaf.offset <= cs.end
+      );
+      if (covered) continue;
+      items.push({
+        off: leaf.offset,
+        node: { type: "terminal", text: leaf.text }
+      });
+    }
+  }
+  items.sort((a, b) => a.off - b.off);
+  if (items.length > 0) {
+    result.children = items.map((it) => it.node);
+  }
+  return result;
+}
 function serializeParseTree(node) {
   if (!node) return { type: "null" };
   if (node.symbol !== void 0) {
@@ -13410,6 +13467,9 @@ function serializeParseTree(node) {
       text: node.getText()
     };
   }
+  if (isFacadeNode(node)) {
+    return serializeFacadeNode(node);
+  }
   const ruleNames = getRuleNames(node);
   const ruleName = ruleNames && node.ruleIndex !== void 0 ? ruleNames[node.ruleIndex] : void 0;
   const result = {
@@ -13501,7 +13561,9 @@ async function main() {
       process.exit(1);
     }
     if (expandedInputs.includes("-")) {
-      process.stderr.write("Error: --watch is incompatible with stdin input.\n");
+      process.stderr.write(
+        "Error: --watch is incompatible with stdin input.\n"
+      );
       process.exit(1);
     }
   }
@@ -13521,8 +13583,10 @@ async function main() {
           }
           for (const e of r.errors) {
             const prefix = expandedInputs.length > 1 ? "  " : "";
-            process.stderr.write(`${prefix}line ${e.line}, col ${e.column}: ${e.msg}
-`);
+            process.stderr.write(
+              `${prefix}line ${e.line}, col ${e.column}: ${e.msg}
+`
+            );
           }
         }
       }
@@ -13532,7 +13596,9 @@ async function main() {
   }
   if (args.parse) {
     if (expandedInputs.length > 1) {
-      process.stderr.write("Error: --parse supports only a single input file.\n");
+      process.stderr.write(
+        "Error: --parse supports only a single input file.\n"
+      );
       process.exit(1);
     }
     const input = expandedInputs[0];
@@ -13558,20 +13624,22 @@ async function main() {
     process.stdout.write(JSON.stringify(ast, null, 2) + "\n");
     process.exit(0);
   }
-  const isMdMode = args.md || expandedInputs.some(
-    (f) => f !== "-" && /\.(?:md|markdown)$/i.test(f)
-  );
+  const isMdMode = args.md || expandedInputs.some((f) => f !== "-" && /\.(?:md|markdown)$/i.test(f));
   if (isMdMode) {
     if (expandedInputs.length > 1) {
-      process.stderr.write("Error: --md mode supports only a single input file.\n");
+      process.stderr.write(
+        "Error: --md mode supports only a single input file.\n"
+      );
       process.exit(1);
     }
     const inputArg = expandedInputs[0];
     if (args.md && inputArg !== "-") {
       const ext = extname(inputArg).toLowerCase();
       if (ext !== ".md" && ext !== ".markdown") {
-        process.stderr.write(`Error: --md flag requires a .md or .markdown input file, got: ${inputArg}
-`);
+        process.stderr.write(
+          `Error: --md flag requires a .md or .markdown input file, got: ${inputArg}
+`
+        );
         process.exit(1);
       }
     }
@@ -13585,8 +13653,10 @@ async function main() {
     }
     const effectiveFormat = args.outputFormat ?? "svg";
     if (effectiveFormat !== "svg" && effectiveFormat !== "png") {
-      process.stderr.write(`Error: Unsupported output format: "${effectiveFormat}". Use "svg" or "png".
-`);
+      process.stderr.write(
+        `Error: Unsupported output format: "${effectiveFormat}". Use "svg" or "png".
+`
+      );
       process.exit(1);
     }
     let imageDir;
@@ -13646,13 +13716,20 @@ async function main() {
         svgWidth = result.width;
         svgHeight = result.height;
       } catch (err) {
-        process.stderr.write(`Error: Failed to render zenuml block ${block.index}: ${err.message}
-`);
+        process.stderr.write(
+          `Error: Failed to render zenuml block ${block.index}: ${err.message}
+`
+        );
         process.exit(1);
       }
       mkdirSync(imageDir, { recursive: true });
       if (effectiveFormat === "png") {
-        const pngBuffer = await rasterizeToPng(svg, svgWidth, svgHeight, effectiveScale);
+        const pngBuffer = await rasterizeToPng(
+          svg,
+          svgWidth,
+          svgHeight,
+          effectiveScale
+        );
         writeFileSync(imageFilePath, pngBuffer);
       } else {
         writeFileSync(imageFilePath, svg, "utf-8");
@@ -13694,11 +13771,14 @@ async function main() {
     const cfg = loadConfigFile(args.configFile);
     if (typeof cfg.scale === "number") configScale = cfg.scale;
     if (typeof cfg.theme === "string") configTheme = cfg.theme;
-    if (typeof cfg.outputFormat === "string") configOutputFormat = cfg.outputFormat;
+    if (typeof cfg.outputFormat === "string")
+      configOutputFormat = cfg.outputFormat;
   }
   const multipleInputs = expandedInputs.length > 1;
   if (multipleInputs && args.output && args.output !== "-" && !isDirectory(resolve(args.output))) {
-    process.stderr.write("Error: -o must be a directory when multiple input files are provided.\n");
+    process.stderr.write(
+      "Error: -o must be a directory when multiple input files are provided.\n"
+    );
     process.exit(1);
   }
   if (args.watch) {
@@ -13717,7 +13797,9 @@ async function main() {
       }
       const effectiveFormat = args.outputFormat ?? "svg";
       if (effectiveFormat !== "svg" && effectiveFormat !== "png") {
-        throw new Error(`Unsupported output format: "${effectiveFormat}". Use "svg" or "png".`);
+        throw new Error(
+          `Unsupported output format: "${effectiveFormat}". Use "svg" or "png".`
+        );
       }
       let mdOutputPath;
       let imageDir;
@@ -13749,7 +13831,12 @@ async function main() {
         const { svg, width: svgWidth, height: svgHeight } = result;
         mkdirSync(imageDir, { recursive: true });
         if (effectiveFormat === "png") {
-          const pngBuffer = await rasterizeToPng(svg, svgWidth, svgHeight, effectiveScale);
+          const pngBuffer = await rasterizeToPng(
+            svg,
+            svgWidth,
+            svgHeight,
+            effectiveScale
+          );
           writeFileSync(imageFilePath, pngBuffer);
         } else {
           writeFileSync(imageFilePath, svg, "utf-8");
@@ -13775,7 +13862,9 @@ async function main() {
         writeFileSync(mdOutputPath, outputMd, "utf-8");
       }
     };
-    const hasMdInputs = expandedInputs.some((f) => /\.(?:md|markdown)$/i.test(f));
+    const hasMdInputs = expandedInputs.some(
+      (f) => /\.(?:md|markdown)$/i.test(f)
+    );
     const renderMdFnForWatch = hasMdInputs ? renderMdForWatch : void 0;
     const watchHandle = await startWatchMode(
       expandedInputs,
@@ -13828,7 +13917,9 @@ async function renderOneFile(inputArg, args, config) {
   const autoFormatFromExt = outputPath !== "-" && extname(outputPath).toLowerCase() === ".png" ? "png" : void 0;
   const effectiveFormat = args.outputFormat ?? config.configOutputFormat ?? autoFormatFromExt ?? "svg";
   if (effectiveFormat !== "svg" && effectiveFormat !== "png") {
-    throw new Error(`Unsupported output format: "${effectiveFormat}". Use "svg" or "png".`);
+    throw new Error(
+      `Unsupported output format: "${effectiveFormat}". Use "svg" or "png".`
+    );
   }
   const effectiveScale = args.scale ?? config.configScale ?? 2;
   const effectiveTheme = args.theme ?? config.configTheme;
@@ -13870,7 +13961,12 @@ async function renderOneFile(inputArg, args, config) {
     mkdirSync(dir, { recursive: true });
   }
   if (effectiveFormat === "png") {
-    const pngBuffer = await rasterizeToPng(svg, svgWidth, svgHeight, effectiveScale);
+    const pngBuffer = await rasterizeToPng(
+      svg,
+      svgWidth,
+      svgHeight,
+      effectiveScale
+    );
     if (finalOutputPath === "-") {
       process.stdout.write(pngBuffer);
     } else {