@diagrammo/dgmo 0.8.4 → 0.8.5

package/dist/index.cjs

@@ -25874,6 +25874,7 @@ function parseVisualization(content, palette) {
   let timelineEraBlockIndent = 0;
   let inTimelineMarkerBlock = false;
   let timelineMarkerBlockIndent = 0;
+  let inSlopePeriodBlock = false;
   const timelineAliasMap = /* @__PURE__ */ new Map();
   const VALID_D3_TYPES = /* @__PURE__ */ new Set([
     "slope",
@@ -26329,6 +26330,118 @@ function parseVisualization(content, palette) {
         continue;
       }
     }
+    if (result.type === "slope") {
+      if (inSlopePeriodBlock) {
+        if (indent > 0) {
+          result.periods.push(line10);
+          continue;
+        }
+        inSlopePeriodBlock = false;
+      }
+      if (result.data.length === 0) {
+        const periodMatch = line10.match(/^period\b(.*)$/i);
+        if (periodMatch) {
+          if (result.periods.length > 0 && !inSlopePeriodBlock) {
+            warn(
+              lineNumber,
+              `Duplicate 'period' directive \u2014 periods are already defined`
+            );
+          }
+          const rest = periodMatch[1].trim();
+          if (rest) {
+            const periodLabels = rest.split(/\s+/);
+            result.periods.push(...periodLabels);
+          } else {
+            inSlopePeriodBlock = true;
+          }
+          continue;
+        }
+      }
+      if (result.periods.length === 0 && line10.includes(",") && !line10.includes(":")) {
+        const tokens = line10.split(",").map((t) => t.trim()).filter(Boolean);
+        const looksLikePeriods = tokens.length >= 2 && tokens.every((t) => t.length <= 20);
+        if (looksLikePeriods) {
+          return fail(
+            lineNumber,
+            `Period lines require the 'period' keyword \u2014 use 'period ${tokens.join(" ")}'`
+          );
+        }
+      }
+      if (line10.includes(":")) {
+        const colonPos = line10.indexOf(":");
+        const afterColon = line10.substring(colonPos + 1).trim();
+        const numericTokens = afterColon.split(/[,\s]+/).filter((v) => /^-?\d/.test(v));
+        if (numericTokens.length >= 1) {
+          const allTokens = afterColon.split(/[,\s]+/).filter(Boolean);
+          if (numericTokens.length >= allTokens.length * 0.5) {
+            const label = line10.substring(0, colonPos).trim();
+            return fail(
+              lineNumber,
+              `Colons are no longer used in slope data rows \u2014 use '${label} ${numericTokens.join(" ")}'`
+            );
+          }
+        }
+      }
+      if (result.periods.length >= 2) {
+        const P = result.periods.length;
+        const tokens = line10.split(/\s+/);
+        const values = [];
+        let rightIdx = tokens.length - 1;
+        while (rightIdx >= 0 && values.length < P) {
+          const raw = tokens[rightIdx].replace(/,/g, "");
+          const num = parseFloat(raw);
+          if (!isNaN(num) && /^-?\d/.test(raw)) {
+            values.unshift(num);
+            rightIdx--;
+          } else {
+            break;
+          }
+        }
+        if (values.length < P) {
+          warn(
+            lineNumber,
+            `Data row has ${values.length} numeric value(s) but ${P} period(s) are defined \u2014 expected ${P} values`
+          );
+          continue;
+        }
+        const labelTokens = tokens.slice(0, rightIdx + 1);
+        const joinedLabel = labelTokens.join(" ");
+        if (!joinedLabel) {
+          warn(
+            lineNumber,
+            `Data row has no label \u2014 add a label before the numeric values`
+          );
+          continue;
+        }
+        const colorMatch = joinedLabel.match(/^(.+?)\(([^)]+)\)\s*$/);
+        const labelPart = colorMatch ? colorMatch[1].trim() : joinedLabel;
+        const colorPart = colorMatch ? resolveColor(colorMatch[2].trim(), palette) : null;
+        if (!labelPart) {
+          warn(
+            lineNumber,
+            `Data row has no label \u2014 add a label before the numeric values`
+          );
+          continue;
+        }
+        if (/^\d[\d,.]*$/.test(labelPart)) {
+          warn(
+            lineNumber,
+            `Label '${labelPart}' looks numeric \u2014 this may indicate too many values or a missing label`
+          );
+        }
+        result.data.push({
+          label: labelPart,
+          values,
+          color: colorPart,
+          lineNumber
+        });
+        continue;
+      }
+      if (firstLineParsed) {
+        warn(lineNumber, `Unexpected line: '${line10}'.`);
+      }
+      continue;
+    }
     const colonIndex = line10.indexOf(":");
     if (colonIndex !== -1) {
       const rawKey = line10.substring(0, colonIndex).trim();
@@ -26418,13 +26531,6 @@ function parseVisualization(content, palette) {
       }
       continue;
     }
-    if (result.periods.length === 0 && line10.includes(",") && !line10.includes(":")) {
-      const periods = line10.split(",").map((p) => p.trim()).filter(Boolean);
-      if (periods.length >= 2) {
-        result.periods = periods;
-        continue;
-      }
-    }
     if (firstLineParsed) {
       warn(lineNumber, `Unexpected line: '${line10}'.`);
     }
@@ -26562,13 +26668,13 @@ function parseVisualization(content, palette) {
   if (result.periods.length < 2) {
     return fail(
       1,
-      'Missing or invalid periods line. Provide at least 2 comma-separated period labels (e.g., "2020, 2024")'
+      "Missing 'period' directive. Add 'period 2020 2024' before data rows (minimum 2 periods required)"
     );
   }
   if (result.data.length === 0) {
     warn(
       1,
-      'No data lines found. Add data as "Label: value1, value2" (e.g., "Apple: 25, 35")'
+      "No data lines found. Add data as 'Label value1 value2' (e.g., 'Blackbeard 40 4')"
     );
   }
   for (const item of result.data) {
@@ -29828,6 +29934,7 @@ __export(index_exports, {
   parseC4: () => parseC4,
   parseChart: () => parseChart,
   parseClassDiagram: () => parseClassDiagram,
+  parseDataRowValues: () => parseDataRowValues,
   parseDgmo: () => parseDgmo,
   parseDgmoChartType: () => parseDgmoChartType,
   parseERDiagram: () => parseERDiagram,
@@ -31586,6 +31693,7 @@ init_branding();
   parseC4,
   parseChart,
   parseClassDiagram,
+  parseDataRowValues,
   parseDgmo,
   parseDgmoChartType,
   parseERDiagram,