@diagrammo/dgmo 0.53.0 → 0.54.0

package/dist/{chunk-4K42RUGC.js → chunk-XWODFBHJ.js}

@@ -7,19 +7,20 @@ import {
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-CMVZWP32.js";
+} from "./chunk-AHTTKERF.js";
 import {
   TREEMAP_REGISTRY,
   extractColor,
   fillModeFromToken,
   measureIndent,
+  normalizeNumericToken,
   parseFirstLine,
   peelRampColors,
   splitNameAndMeta,
   stripQuotes,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-YJVA3QUU.js";
+} from "./chunk-3FRO35WW.js";
 import {
   emit,
   formatDgmoError,
@@ -48,6 +49,21 @@ var TREEMAP_DX = {
     hint: "Add a trailing number (e.g. `Lonely 40`) so the leaf gets a size.",
     example: "treemap T\nA\n  Lonely"
   },
+  LEAF_VALUE_UNPARSEABLE: {
+    code: "W_TREEMAP_LEAF_VALUE_UNPARSEABLE",
+    severity: "warning",
+    chartType: "treemap",
+    title: "Leaf value could not be read as a number",
+    message: (p) => {
+      const token = p.token ?? "1,24,000";
+      return `Leaf "${p.label ?? "Cluster"}" \u2014 could not read "${token}" as a number, so it renders with zero size. Remove the grouping separators: ${token.replace(
+        /[,_]/g,
+        ""
+      )}`;
+    },
+    hint: "Grouping separators must split the digits into even groups \u2014 `1,240,000` or `1_240_000`. Anything else must be written plainly, e.g. `1240000`.",
+    example: "treemap T\nA\n  Cluster 1,24,000"
+  },
   BRANCH_VALUE_IGNORED: {
     code: "W_TREEMAP_BRANCH_VALUE_IGNORED",
     severity: "warning",
@@ -61,7 +77,7 @@ var TREEMAP_DX = {
 var TREEMAP_DIAGNOSTICS = Object.values(TREEMAP_DX);
 
 // src/treemap/parser.ts
-var VALUE_TOKEN_RE = /^(.+?)\s+(-?\d[\d_.]*)$/;
+var VALUE_TOKEN_RE = /^(.+?)\s+(-?\d[\d_,.]*)$/;
 function isFullyQuoted(s) {
   return s.length >= 2 && (s.startsWith('"') && s.endsWith('"') || s.startsWith("'") && s.endsWith("'"));
 }
@@ -102,6 +118,7 @@ function parseTreemap(content, palette) {
   const lines = content.split("\n");
   let contentStarted = false;
   let nodeCounter = 0;
+  const badValueTokens = /* @__PURE__ */ new Map();
   let currentTagGroup = null;
   const aliasMap = /* @__PURE__ */ new Map();
   const indentStack = [];
@@ -196,7 +213,8 @@ function parseTreemap(content, palette) {
       lineNumber,
       ++nodeCounter,
       aliasMap,
-      result.diagnostics
+      result.diagnostics,
+      badValueTokens
     );
     if (node.heat !== void 0) result.hasHeat = true;
     attachNode(node, indent, indentStack, result);
@@ -223,8 +241,12 @@ function parseTreemap(content, palette) {
         delete node.value;
       }
     } else if (node.value === void 0) {
+      const bad = badValueTokens.get(n);
       result.diagnostics.push(
-        emit(TREEMAP_DX.LEAF_NO_VALUE, node.lineNumber, {
+        bad !== void 0 ? emit(TREEMAP_DX.LEAF_VALUE_UNPARSEABLE, node.lineNumber, {
+          label: node.label,
+          token: bad
+        }) : emit(TREEMAP_DX.LEAF_NO_VALUE, node.lineNumber, {
           label: node.label
         })
       );
@@ -331,7 +353,7 @@ function resolveDefaultColorMode(result, pushWarning) {
   if (result.tagGroups.length > 0) return "tag";
   return "branch";
 }
-function parseNodeLine(trimmed, lineNumber, counter, aliasMap, diagnostics) {
+function parseNodeLine(trimmed, lineNumber, counter, aliasMap, diagnostics, badValueTokens) {
   const registry = withTagAliases(TREEMAP_REGISTRY, new Set(aliasMap.keys()));
   const split = splitNameAndMeta(
     trimmed,
@@ -350,13 +372,15 @@ function parseNodeLine(trimmed, lineNumber, counter, aliasMap, diagnostics) {
   const metadata = { ...split.meta };
   let heat;
   if ("heat" in metadata) {
-    const h = parseFloat(metadata["heat"].replace(/_/g, ""));
+    const rawHeat = metadata["heat"];
+    const h = parseFloat(normalizeNumericToken(rawHeat) ?? rawHeat);
     if (Number.isFinite(h)) heat = h;
     delete metadata["heat"];
   }
   const rawName = split.name;
   let label;
   let value;
+  let badValueToken;
   if (isFullyQuoted(rawName)) {
     label = stripQuotes(rawName);
   } else {
@@ -364,11 +388,16 @@ function parseNodeLine(trimmed, lineNumber, counter, aliasMap, diagnostics) {
     if (vm) {
       const labelPart = vm[1].trim();
       const token = vm[2];
-      const cleaned = token.replace(/_/g, "");
-      const parsed = parseFloat(cleaned);
+      const normalized = normalizeNumericToken(token);
+      const hasSeparators = /[,_]/.test(token);
+      const parsed = hasSeparators && normalized === null ? NaN : parseFloat(normalized ?? token);
+      const peeled = isFullyQuoted(labelPart) ? stripQuotes(labelPart) : labelPart;
       if (Number.isFinite(parsed)) {
         value = parsed;
-        label = isFullyQuoted(labelPart) ? stripQuotes(labelPart) : labelPart;
+        label = peeled;
+      } else if (hasSeparators) {
+        label = peeled;
+        badValueToken = token;
       } else {
         label = rawName;
       }
@@ -376,7 +405,7 @@ function parseNodeLine(trimmed, lineNumber, counter, aliasMap, diagnostics) {
       label = rawName;
     }
   }
-  return {
+  const node = {
     id: `treemap-node-${counter}`,
     label,
     ...value !== void 0 && { value },
@@ -385,6 +414,8 @@ function parseNodeLine(trimmed, lineNumber, counter, aliasMap, diagnostics) {
     children: [],
     lineNumber
   };
+  if (badValueToken !== void 0) badValueTokens.set(node, badValueToken);
+  return node;
 }
 function attachNode(node, indent, indentStack, result) {
   while (indentStack.length > 0) {
@@ -405,4 +436,4 @@ export {
   TREEMAP_DIAGNOSTICS,
   parseTreemap
 };
-//# sourceMappingURL=chunk-4K42RUGC.js.map
+//# sourceMappingURL=chunk-XWODFBHJ.js.map

package/dist/{chunk-VAO6ANGC.js → chunk-YENNFS5F.js}

@@ -1,6 +1,12 @@
 import {
   SKETCH_DIAGNOSTIC_CODES
 } from "./chunk-RT7ACF77.js";
+import {
+  parseInArrowLabel
+} from "./chunk-WF64MW5G.js";
+import {
+  normalizeName
+} from "./chunk-NOTA6TEI.js";
 import {
   AUTO_TAG_COLOR_SENTINEL,
   finalizeAutoTagColors,
@@ -10,13 +16,7 @@ import {
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-CMVZWP32.js";
-import {
-  parseInArrowLabel
-} from "./chunk-WF64MW5G.js";
-import {
-  normalizeName
-} from "./chunk-NOTA6TEI.js";
+} from "./chunk-AHTTKERF.js";
 import {
   SKETCH_REGISTRY,
   extractColor,
@@ -27,7 +27,7 @@ import {
   stripQuotes,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-YJVA3QUU.js";
+} from "./chunk-3FRO35WW.js";
 import {
   NAME_DIAGNOSTIC_CODES,
   formatDgmoError,
@@ -627,4 +627,4 @@ export {
   isSketchShapeKind,
   parseSketch
 };
-//# sourceMappingURL=chunk-VAO6ANGC.js.map
+//# sourceMappingURL=chunk-YENNFS5F.js.map