@diagrammo/dgmo 0.53.0 → 0.54.0

package/dist/{chunk-CMVZWP32.js → chunk-AHTTKERF.js}

@@ -1,7 +1,7 @@
 import {
   stripQuotes,
   tokenizeQuoteAware
-} from "./chunk-YJVA3QUU.js";
+} from "./chunk-3FRO35WW.js";
 import {
   CATEGORICAL_COLOR_ORDER,
   RECOGNIZED_COLOR_NAMES,
@@ -250,4 +250,4 @@ export {
   resolveActiveTagGroup,
   matchTagBlockHeading
 };
-//# sourceMappingURL=chunk-CMVZWP32.js.map
+//# sourceMappingURL=chunk-AHTTKERF.js.map

package/dist/{chunk-GAWKIIPO.js → chunk-AJFHNS67.js}

@@ -6,10 +6,10 @@ import {
   mapLegendConfig,
   mapLegendGroups,
   parsePathRings
-} from "./chunk-UFQJMOVZ.js";
+} from "./chunk-KBVOVDYP.js";
 import {
   renderIntegratedLegend
-} from "./chunk-W5KMNC5U.js";
+} from "./chunk-2NZOHEP4.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -20,7 +20,7 @@ import {
 } from "./chunk-6KFWC4CO.js";
 import {
   parseClock
-} from "./chunk-FLDC7ZAK.js";
+} from "./chunk-KV4HLIJE.js";
 import {
   fixedParts,
   formatTime,
@@ -28,13 +28,13 @@ import {
   workStatus,
   zoneParts
 } from "./chunk-APKUAJ2L.js";
+import {
+  measureText
+} from "./chunk-4ASYQ347.js";
 import {
   mix,
   themeBaseBg
 } from "./chunk-JYDMBWRP.js";
-import {
-  measureText
-} from "./chunk-4ASYQ347.js";
 
 // src/map/renderer.ts
 import * as d3Selection from "d3-selection";
@@ -781,4 +781,4 @@ export {
   renderMap,
   renderMapForExport
 };
-//# sourceMappingURL=chunk-GAWKIIPO.js.map
+//# sourceMappingURL=chunk-AJFHNS67.js.map

package/dist/{chunk-Q7AH665U.js → chunk-AQEYUVGJ.js}

@@ -1,12 +1,18 @@
 import {
+  isEmphasisToken,
+  parseEmphasisDirective
+} from "./chunk-2CW5ZTNH.js";
+import {
+  GLOBAL_BOOLEANS,
   collectIndentedValues,
+  detectBadChartTypeDeclaration,
   extractColor,
   fillModeFromToken,
   measureIndent,
   normalizeNumericToken,
   parseFirstLine,
   parseSeriesNames
-} from "./chunk-YJVA3QUU.js";
+} from "./chunk-3FRO35WW.js";
 import {
   RECOGNIZED_COLOR_NAMES,
   resolveColorWithDiagnostic
@@ -55,6 +61,11 @@ var KNOWN_BOOLEANS = /* @__PURE__ */ new Set([
   "fill",
   "hole"
 ]);
+var KNOWN_FIRST_TOKENS = /* @__PURE__ */ new Set([
+  ...KNOWN_OPTIONS,
+  ...KNOWN_BOOLEANS,
+  ...GLOBAL_BOOLEANS
+]);
 function rejectSeriesHeader(result, keyword, lineNumber) {
   if (result.type === "bar" && keyword === "series") {
     const diag = makeDgmoError(
@@ -141,9 +152,13 @@ function parseChart(content, palette) {
           return fail(lineNumber, msg2);
         }
       }
-      if (!trimmed.includes(" ") && !trimmed.includes(":") && !/\d/.test(trimmed)) {
-        let msg2 = `Unsupported chart type: ${trimmed}. Supported types: ${[...VALID_TYPES].join(", ")}.`;
-        const hint2 = suggest(trimmed.toLowerCase(), [...VALID_TYPES]);
+      const badType = detectBadChartTypeDeclaration(
+        trimmed,
+        KNOWN_FIRST_TOKENS
+      );
+      if (badType) {
+        let msg2 = `Unsupported chart type: ${badType}. Supported types: ${[...VALID_TYPES].join(", ")}.`;
+        const hint2 = suggest(badType.toLowerCase(), [...VALID_TYPES]);
         if (hint2) msg2 += ` ${hint2}`;
         return fail(lineNumber, msg2);
       }
@@ -329,6 +344,14 @@ function parseChart(content, palette) {
       ...multiValue && { expectedValues: seriesCount }
     });
     if (dataValues) {
+      if (multiValue) {
+        const surplus = surplusValueDiagnostic(
+          dataValues,
+          seriesCount,
+          lineNumber
+        );
+        if (surplus) result.diagnostics.push(surplus);
+      }
       const { label: rawLabel, color: pointColor } = extractColor(
         dataValues.label,
         palette,
@@ -420,32 +443,72 @@ function parseChart(content, palette) {
   return result;
 }
 function parseDataRowValues(line, options) {
+  const quoted = line.match(/^(["'])(.*?)\1\s+(\S.*)$/);
+  if (quoted) {
+    const label2 = quoted[2].trim();
+    if (!label2) return null;
+    const valueTokens = quoted[3].trim().split(/\s+/);
+    const numeric2 = trailingNumerics(valueTokens, 0);
+    if (numeric2.length !== valueTokens.length) return null;
+    const limit = options?.multiValue ? options.expectedValues ?? Infinity : 1;
+    return {
+      label: label2,
+      values: numeric2.slice(0, limit),
+      bareLabel: label2,
+      trailingNumericCount: numeric2.length,
+      quotedLabel: true
+    };
+  }
   const tokens = line.split(/\s+/);
   if (tokens.length < 2) return null;
+  const numeric = trailingNumerics(tokens, 1);
+  if (numeric.length === 0) return null;
+  const bareLabel = tokens.slice(0, tokens.length - numeric.length).join(" ");
   if (options?.multiValue) {
     const limit = options.expectedValues ?? Infinity;
-    const values = [];
-    let idx = tokens.length - 1;
-    while (idx >= 1 && values.length < limit) {
-      const tok = tokens[idx];
-      const normTok = normalizeNumericToken(tok) ?? tok;
-      const num2 = parseFloat(normTok);
-      if (isNaN(num2) || !isFinite(Number(normTok))) break;
-      values.unshift(num2);
-      idx--;
-    }
-    if (values.length === 0) return null;
-    const label2 = tokens.slice(0, idx + 1).join(" ");
+    const take = Math.min(numeric.length, limit);
+    const values = numeric.slice(numeric.length - take);
+    const label2 = tokens.slice(0, tokens.length - take).join(" ");
     if (!label2) return null;
-    return { label: label2, values };
+    return {
+      label: label2,
+      values,
+      bareLabel,
+      trailingNumericCount: numeric.length,
+      quotedLabel: false
+    };
   }
-  const lastToken = tokens[tokens.length - 1];
-  const normalizedLast = normalizeNumericToken(lastToken) ?? lastToken;
-  const num = parseFloat(normalizedLast);
-  if (isNaN(num) || !isFinite(Number(normalizedLast))) return null;
   const label = tokens.slice(0, -1).join(" ");
   if (!label) return null;
-  return { label, values: [num] };
+  return {
+    label,
+    // numeric.length >= 1 by the guard above.
+    values: [numeric[numeric.length - 1]],
+    bareLabel,
+    trailingNumericCount: numeric.length,
+    quotedLabel: false
+  };
+}
+function surplusValueDiagnostic(row, expectedValues, lineNumber) {
+  if (row.quotedLabel || row.trailingNumericCount <= expectedValues)
+    return null;
+  const expectation = expectedValues === 1 ? "but only 1 value is expected" : `but ${expectedValues} series defined`;
+  return makeDgmoError(
+    lineNumber,
+    `Data point "${row.bareLabel}" has ${row.trailingNumericCount} value(s), ${expectation}. If the label ends in a number, quote it: "${row.label}" ${row.values.join(" ")}`,
+    "warning"
+  );
+}
+function trailingNumerics(tokens, minIndex) {
+  const values = [];
+  for (let idx = tokens.length - 1; idx >= minIndex; idx--) {
+    const tok = tokens[idx];
+    const normTok = normalizeNumericToken(tok) ?? tok;
+    const num = parseFloat(normTok);
+    if (isNaN(num) || !isFinite(Number(normTok))) break;
+    values.unshift(num);
+  }
+  return values;
 }
 
 // src/data-chart-parser.ts
@@ -470,7 +533,13 @@ var KNOWN_EXTENDED_OPTIONS = /* @__PURE__ */ new Set([
   "no-percent",
   "columns",
   "rows",
-  "x"
+  "x",
+  "highlight",
+  "dim"
+]);
+var KNOWN_EXTENDED_FIRST_TOKENS = /* @__PURE__ */ new Set([
+  ...KNOWN_EXTENDED_OPTIONS,
+  ...GLOBAL_BOOLEANS
 ]);
 function parseScatterRow(line, palette, currentCategory, lineNumber, diagnostics) {
   const dataRow = parseDataRowValues(line, { multiValue: true });
@@ -594,10 +663,14 @@ function parseExtendedChartFull(content, palette) {
           return result;
         }
       }
-      if (!trimmed.includes(" ") && !trimmed.includes(":") && !/\d/.test(trimmed)) {
+      const badType = detectBadChartTypeDeclaration(
+        trimmed,
+        KNOWN_EXTENDED_FIRST_TOKENS
+      );
+      if (badType) {
         const validTypes = [...VALID_EXTENDED_TYPES];
-        let msg = `Unsupported chart type: ${trimmed}. Supported types: ${validTypes.join(", ")}.`;
-        const hint = suggest(trimmed.toLowerCase(), validTypes);
+        let msg = `Unsupported chart type: ${badType}. Supported types: ${validTypes.join(", ")}.`;
+        const hint = suggest(badType.toLowerCase(), validTypes);
         if (hint) msg += ` ${hint}`;
         const diag = makeDgmoError(lineNumber, msg);
         result.diagnostics.push(diag);
@@ -625,7 +698,7 @@ function parseExtendedChartFull(content, palette) {
       continue;
     }
     const arrowMatch = trimmed.match(
-      /^(.+?)\s*(->|--)\s*(.+?)\s+(-?[\d_]+(?:\.[\d]+)?)(?:\s+(red|orange|yellow|green|blue|purple|teal|cyan|gray|black|white))?\s*$/
+      /^(.+?)\s*(->|--)\s*(.+?)\s+(-?[\d,_]+(?:\.[\d]+)?)(?:\s+([A-Za-z][A-Za-z0-9_-]*))?\s*$/
     );
     if (arrowMatch) {
       const [, rawSource, arrow, rawTarget, rawVal, rawLinkColor] = arrowMatch;
@@ -674,12 +747,9 @@ function parseExtendedChartFull(content, palette) {
         }
         if (sankeyStack.length > 0) {
           const valColorMatch = trimmed.match(
-            /(-?[\d_]+(?:\.[\d]+)?)\s+(red|orange|yellow|green|blue|purple|teal|cyan|gray|black|white)\s*$/
+            /(-?[\d,_]+(?:\.[\d]+)?)\s+([A-Za-z][A-Za-z0-9_-]*)\s*$/
           );
-          const strippedLine = valColorMatch ? trimmed.replace(
-            /\s+(red|orange|yellow|green|blue|purple|teal|cyan|gray|black|white)\s*$/,
-            ""
-          ) : trimmed;
+          const strippedLine = valColorMatch ? trimmed.replace(/\s+[A-Za-z][A-Za-z0-9_-]*\s*$/, "") : trimmed;
           const dataRow2 = parseDataRowValues(strippedLine);
           if (dataRow2?.values.length === 1) {
             const source = sankeyStack.at(-1).name;
@@ -720,8 +790,9 @@ function parseExtendedChartFull(content, palette) {
       const isBareKeywordOption = spaceIdx2 < 0 && /^(fill-tint|fill-solid|fill-outline|no-name|no-value|no-percent|shade|no-title)$/i.test(
         trimmed
       );
-      const isLayoutDirective = spaceIdx2 >= 0 && trimmed.substring(0, spaceIdx2).toLowerCase() === "layout";
-      if (!hasNumericSuffix && !isBareKeywordOption && !isLayoutDirective) {
+      const leadToken = spaceIdx2 >= 0 ? trimmed.substring(0, spaceIdx2).toLowerCase() : "";
+      const isValuedDirective = spaceIdx2 >= 0 && (leadToken === "layout" || isEmphasisToken(leadToken));
+      if (!hasNumericSuffix && !isBareKeywordOption && !isValuedDirective) {
         while (sankeyStack.length && sankeyStack.at(-1).indent >= indent) {
           sankeyStack.pop();
         }
@@ -760,6 +831,11 @@ function parseExtendedChartFull(content, palette) {
         }
         continue;
       }
+      if (isEmphasisToken(firstToken)) {
+        const directive = parseEmphasisDirective(trimmed, lineNumber);
+        if (directive) result.emphasis = directive;
+        continue;
+      }
       if (firstToken === "title") {
         result.diagnostics.push(emit(TITLE_DIRECTIVE_DX, lineNumber));
         continue;
@@ -1071,4 +1147,4 @@ export {
   getSimpleChartLegendGroups,
   getExtendedChartLegendGroups
 };
-//# sourceMappingURL=chunk-Q7AH665U.js.map
+//# sourceMappingURL=chunk-AQEYUVGJ.js.map

package/dist/{chunk-BR7AYN76.js → chunk-B7N5KYXQ.js}

@@ -1,15 +1,6 @@
-import {
-  AUTO_TAG_COLOR_SENTINEL,
-  finalizeAutoTagColors,
-  matchTagBlockHeading,
-  stripDefaultModifier,
-  tagAttrKey,
-  validateTagGroupNames,
-  validateTagValues
-} from "./chunk-CMVZWP32.js";
 import {
   tryCollectNote
-} from "./chunk-ZXUAPTCK.js";
+} from "./chunk-WWHECSYZ.js";
 import {
   resolveNotes
 } from "./chunk-QZAW5SFH.js";
@@ -20,6 +11,15 @@ import {
   displayName,
   normalizeName
 } from "./chunk-NOTA6TEI.js";
+import {
+  AUTO_TAG_COLOR_SENTINEL,
+  finalizeAutoTagColors,
+  matchTagBlockHeading,
+  stripDefaultModifier,
+  tagAttrKey,
+  validateTagGroupNames,
+  validateTagValues
+} from "./chunk-AHTTKERF.js";
 import {
   ER_REGISTRY,
   OPTION_NOCOLON_RE,
@@ -32,7 +32,7 @@ import {
   tryParseSharedOption,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-YJVA3QUU.js";
+} from "./chunk-3FRO35WW.js";
 import {
   resolveColorWithDiagnostic
 } from "./chunk-ZKPPI6BF.js";
@@ -521,4 +521,4 @@ export {
   looksLikeERDiagram,
   extractSymbols
 };
-//# sourceMappingURL=chunk-BR7AYN76.js.map
+//# sourceMappingURL=chunk-B7N5KYXQ.js.map