@diagrammo/dgmo 0.89.0 → 0.91.0

package/dist/{chunk-WPL5PFXE.js → chunk-3SLRZKLB.js}

@@ -1,6 +1,6 @@
 import {
   tryCollectNote
-} from "./chunk-J64NZ6NF.js";
+} from "./chunk-KSZHIAI2.js";
 import {
   resolveNotes
 } from "./chunk-O753JUEZ.js";
@@ -20,7 +20,7 @@ import {
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-L5AFONQU.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   AliasRegistry,
   ER_REGISTRY,
@@ -34,7 +34,7 @@ import {
   tryParseSharedOption,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-44GP7PD5.js";
+} from "./chunk-MPJQMMBZ.js";
 import {
   resolveColorWithDiagnostic
 } from "./chunk-2M4IGSCY.js";
@@ -149,7 +149,7 @@ function parseERDiagram(content, palette) {
   const pushError = (line, message) => {
     const diag = makeDgmoError(line, message);
     result.diagnostics.push(diag);
-    if (!result.error) result.error = formatDgmoError(diag);
+    result.error ??= formatDgmoError(diag);
   };
   const tableMap = /* @__PURE__ */ new Map();
   const tableMetadataMap = /* @__PURE__ */ new Map();
@@ -244,12 +244,12 @@ function parseERDiagram(content, palette) {
         if (tagBlockMatch.alias) {
           metaAliasMap.set(
             normalizeName(tagBlockMatch.alias),
-            tagBlockMatch.name.toLowerCase()
+            tagAttrKey(tagBlockMatch.name)
           );
         }
         metaAliasMap.set(
           normalizeName(tagBlockMatch.name),
-          tagBlockMatch.name.toLowerCase()
+          tagAttrKey(tagBlockMatch.name)
         );
         result.tagGroups.push(currentTagGroup);
         continue;

package/dist/chunk-3UR4F7FE.js

@@ -0,0 +1,14 @@
+// src/palettes/built-in-ids.ts
+var BUILT_IN_PALETTE_IDS = /* @__PURE__ */ new Set([
+  "atlas",
+  "blueprint",
+  "catppuccin",
+  "nord",
+  "slate",
+  "tidewater",
+  "tokyo-night"
+]);
+
+export {
+  BUILT_IN_PALETTE_IDS
+};

package/dist/{chunk-ZUCXFXLD.js → chunk-3YTAOMMN.js}

@@ -8,14 +8,14 @@ import {
   resolveActiveTagGroup,
   stripDefaultModifier,
   tagAttrKey
-} from "./chunk-L5AFONQU.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   extractColor,
   fillModeFromToken,
   measureIndent,
   parseFirstLine,
   splitNameAndMeta
-} from "./chunk-44GP7PD5.js";
+} from "./chunk-MPJQMMBZ.js";
 import {
   makeDgmoError,
   makeFail

package/dist/{chunk-NIUO2TNR.js → chunk-4HG4PYHM.js}

@@ -1,3 +1,6 @@
+import {
+  BUILT_IN_PALETTE_IDS
+} from "./chunk-3UR4F7FE.js";
 import {
   apcaContrast,
   contrastRatio,
@@ -78,6 +81,197 @@ function getAvailablePalettes() {
   );
 }
 
+// src/palettes/theme-file.ts
+var CONTRAST_FLOOR = 4.5;
+var SOLID_FLOOR_LC = 45;
+var FILL_ACCENT_KEYS = [
+  "primary",
+  "secondary",
+  "accent",
+  "destructive"
+];
+var CONTRAST_EXEMPT = /* @__PURE__ */ new Set([
+  "black",
+  "white"
+]);
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function collectShapeErrors(value, mode, errors) {
+  if (!isRecord(value)) {
+    errors.push(
+      `${mode}: expected an object of colors, got ${describe(value)}`
+    );
+    return false;
+  }
+  const before = errors.length;
+  const fields = /* @__PURE__ */ new Set([...SEMANTIC_KEYS, "colors"]);
+  for (const key of Object.keys(value)) {
+    if (!fields.has(key)) {
+      errors.push(`${mode}.${key}: not a palette field`);
+    }
+  }
+  for (const key of SEMANTIC_KEYS) {
+    const hex = value[key];
+    if (typeof hex !== "string" || !isValidHex(hex)) {
+      errors.push(`${mode}.${key}: invalid hex ${describe(hex)}`);
+    }
+  }
+  const named = value["colors"];
+  if (!isRecord(named)) {
+    errors.push(
+      `${mode}.colors: expected an object of named colors, got ${describe(named)}`
+    );
+  } else {
+    const names = new Set(COLOR_KEYS);
+    for (const key of Object.keys(named)) {
+      if (!names.has(key)) {
+        errors.push(
+          `${mode}.colors.${key}: not a palette color \u2014 a theme sets the existing color names and cannot add one`
+        );
+      }
+    }
+    for (const key of COLOR_KEYS) {
+      const hex = named[key];
+      if (typeof hex !== "string" || !isValidHex(hex)) {
+        errors.push(`${mode}.colors.${key}: invalid hex ${describe(hex)}`);
+      }
+    }
+  }
+  return errors.length === before;
+}
+function describe(value) {
+  if (value === void 0) return "nothing";
+  if (typeof value === "string") return `"${value}"`;
+  if (value === null) return "null";
+  return typeof value;
+}
+function intents(colors) {
+  const out = [];
+  for (const key of COLOR_KEYS) {
+    if (CONTRAST_EXEMPT.has(key)) continue;
+    out.push([`colors.${key}`, colors.colors[key]]);
+  }
+  for (const key of FILL_ACCENT_KEYS) out.push([key, colors[key]]);
+  return out;
+}
+function drawnToken(colors, bg) {
+  const drawn = contrastText(bg, colors.textOnFillLight, colors.textOnFillDark);
+  return drawn === colors.textOnFillDark ? "textOnFillDark" : "textOnFillLight";
+}
+function worstTintedFill(colors, isDark) {
+  let worst;
+  for (const [fill, intent] of intents(colors)) {
+    const fillHex = shapeFill(colors, intent, isDark);
+    const token = drawnToken(colors, fillHex);
+    const ratio = contrastRatio(colors[token], fillHex);
+    if (!worst || ratio < worst.ratio) {
+      worst = { ratio, token, fill, fillHex };
+    }
+  }
+  return worst;
+}
+function worstSolidFill(colors) {
+  let worst;
+  for (const [fill, intent] of intents(colors)) {
+    const token = drawnToken(colors, intent);
+    const lc = Math.abs(apcaContrast(colors[token], intent));
+    if (!worst || lc < worst.lc) {
+      worst = { lc, token, fill, fillHex: intent };
+    }
+  }
+  return worst;
+}
+function collectContrastErrors(colors, where, isDark, errors) {
+  const tinted = worstTintedFill(colors, isDark);
+  if (tinted.ratio < CONTRAST_FLOOR) {
+    errors.push(
+      `${where}: ${tinted.token} ${colors[tinted.token]} on the ${tinted.fill} fill ${tinted.fillHex} reaches only ${tinted.ratio.toFixed(2)}:1 \u2014 text on a fill needs ${CONTRAST_FLOOR.toFixed(1)}:1`
+    );
+  }
+}
+function collectSolidErrors(colors, where, errors) {
+  const solid = worstSolidFill(colors);
+  if (solid.lc >= SOLID_FLOOR_LC) return;
+  errors.push(
+    `${where}: ${solid.token} ${colors[solid.token]} on the solid ${solid.fill} ${solid.fillHex} reaches only Lc ${solid.lc.toFixed(1)} \u2014 text on a solid fill needs Lc ${SOLID_FLOOR_LC}`
+  );
+}
+function validateThemeFile(input) {
+  const errors = [];
+  if (!isRecord(input)) {
+    return {
+      ok: false,
+      errors: [`expected a theme object, got ${describe(input)}`]
+    };
+  }
+  const id = input["id"];
+  if (typeof id !== "string" || id.trim() === "") {
+    errors.push(`id: expected a non-empty string, got ${describe(id)}`);
+  } else if (BUILT_IN_PALETTE_IDS.has(id)) {
+    errors.push(
+      `id: "${id}" is a built-in palette \u2014 a theme file needs an id of its own`
+    );
+  }
+  const name = input["name"];
+  if (typeof name !== "string" || name.trim() === "") {
+    errors.push(`name: expected a non-empty string, got ${describe(name)}`);
+  }
+  const declared = input["mode"];
+  let mode = null;
+  if (declared !== void 0) {
+    if (declared === "light" || declared === "dark") {
+      mode = declared;
+    } else {
+      errors.push(
+        `mode: expected "light" or "dark", got ${describe(declared)}`
+      );
+    }
+  }
+  if (mode) {
+    const other = mode === "light" ? "dark" : "light";
+    if (input[other] !== void 0) {
+      errors.push(
+        `${other}: a theme declaring mode "${mode}" must not also define ${other} \u2014 drop the mode to define both`
+      );
+    }
+  }
+  const wanted = mode ? [mode] : ["light", "dark"];
+  const modes = {};
+  for (const key of wanted) {
+    const value = input[key];
+    if (value === void 0) {
+      errors.push(
+        mode ? `${key}: a theme declaring mode "${mode}" has to define ${key}` : `${key}: a theme without a mode has to define both light and dark`
+      );
+      continue;
+    }
+    if (collectShapeErrors(value, key, errors)) modes[key] = value;
+  }
+  if (errors.length === 0) {
+    const light2 = modes.light ?? modes.dark;
+    const dark2 = modes.dark ?? modes.light;
+    const declaredMode = mode;
+    const label = (render) => declaredMode !== null && render !== declaredMode ? `${render} (a theme declaring mode "${declaredMode}" is used in ${render} mode too)` : render;
+    collectContrastErrors(light2, label("light"), false, errors);
+    collectContrastErrors(dark2, label("dark"), true, errors);
+    if (declaredMode !== null) {
+      collectSolidErrors(light2, declaredMode, errors);
+    } else {
+      collectSolidErrors(light2, "light", errors);
+      collectSolidErrors(dark2, "dark", errors);
+    }
+  }
+  if (errors.length > 0) return { ok: false, errors };
+  const light = modes.light ?? modes.dark;
+  const dark = modes.dark ?? modes.light;
+  return {
+    ok: true,
+    palette: { id, name, light, dark },
+    mode
+  };
+}
+
 // src/palettes/atlas.ts
 var atlasPalette = {
   id: "atlas",
@@ -783,208 +977,6 @@ var tokyoNightPalette = {
 };
 registerPalette(tokyoNightPalette);
 
-// src/palettes/theme-file.ts
-var CONTRAST_FLOOR = 4.5;
-var SOLID_FLOOR_LC = 45;
-var FILL_ACCENT_KEYS = [
-  "primary",
-  "secondary",
-  "accent",
-  "destructive"
-];
-var CONTRAST_EXEMPT = /* @__PURE__ */ new Set([
-  "black",
-  "white"
-]);
-var BUILT_IN_IDS = new Set(
-  [
-    atlasPalette,
-    blueprintPalette,
-    catppuccinPalette,
-    nordPalette,
-    slatePalette,
-    tidewaterPalette,
-    tokyoNightPalette
-  ].map((palette) => palette.id)
-);
-function isRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function collectShapeErrors(value, mode, errors) {
-  if (!isRecord(value)) {
-    errors.push(
-      `${mode}: expected an object of colors, got ${describe(value)}`
-    );
-    return false;
-  }
-  const before = errors.length;
-  const fields = /* @__PURE__ */ new Set([...SEMANTIC_KEYS, "colors"]);
-  for (const key of Object.keys(value)) {
-    if (!fields.has(key)) {
-      errors.push(`${mode}.${key}: not a palette field`);
-    }
-  }
-  for (const key of SEMANTIC_KEYS) {
-    const hex = value[key];
-    if (typeof hex !== "string" || !isValidHex(hex)) {
-      errors.push(`${mode}.${key}: invalid hex ${describe(hex)}`);
-    }
-  }
-  const named = value["colors"];
-  if (!isRecord(named)) {
-    errors.push(
-      `${mode}.colors: expected an object of named colors, got ${describe(named)}`
-    );
-  } else {
-    const names = new Set(COLOR_KEYS);
-    for (const key of Object.keys(named)) {
-      if (!names.has(key)) {
-        errors.push(
-          `${mode}.colors.${key}: not a palette color \u2014 a theme sets the existing color names and cannot add one`
-        );
-      }
-    }
-    for (const key of COLOR_KEYS) {
-      const hex = named[key];
-      if (typeof hex !== "string" || !isValidHex(hex)) {
-        errors.push(`${mode}.colors.${key}: invalid hex ${describe(hex)}`);
-      }
-    }
-  }
-  return errors.length === before;
-}
-function describe(value) {
-  if (value === void 0) return "nothing";
-  if (typeof value === "string") return `"${value}"`;
-  if (value === null) return "null";
-  return typeof value;
-}
-function intents(colors) {
-  const out = [];
-  for (const key of COLOR_KEYS) {
-    if (CONTRAST_EXEMPT.has(key)) continue;
-    out.push([`colors.${key}`, colors.colors[key]]);
-  }
-  for (const key of FILL_ACCENT_KEYS) out.push([key, colors[key]]);
-  return out;
-}
-function drawnToken(colors, bg) {
-  const drawn = contrastText(bg, colors.textOnFillLight, colors.textOnFillDark);
-  return drawn === colors.textOnFillDark ? "textOnFillDark" : "textOnFillLight";
-}
-function worstTintedFill(colors, isDark) {
-  let worst;
-  for (const [fill, intent] of intents(colors)) {
-    const fillHex = shapeFill(colors, intent, isDark);
-    const token = drawnToken(colors, fillHex);
-    const ratio = contrastRatio(colors[token], fillHex);
-    if (!worst || ratio < worst.ratio) {
-      worst = { ratio, token, fill, fillHex };
-    }
-  }
-  return worst;
-}
-function worstSolidFill(colors) {
-  let worst;
-  for (const [fill, intent] of intents(colors)) {
-    const token = drawnToken(colors, intent);
-    const lc = Math.abs(apcaContrast(colors[token], intent));
-    if (!worst || lc < worst.lc) {
-      worst = { lc, token, fill, fillHex: intent };
-    }
-  }
-  return worst;
-}
-function collectContrastErrors(colors, where, isDark, errors) {
-  const tinted = worstTintedFill(colors, isDark);
-  if (tinted.ratio < CONTRAST_FLOOR) {
-    errors.push(
-      `${where}: ${tinted.token} ${colors[tinted.token]} on the ${tinted.fill} fill ${tinted.fillHex} reaches only ${tinted.ratio.toFixed(2)}:1 \u2014 text on a fill needs ${CONTRAST_FLOOR.toFixed(1)}:1`
-    );
-  }
-}
-function collectSolidErrors(colors, where, errors) {
-  const solid = worstSolidFill(colors);
-  if (solid.lc >= SOLID_FLOOR_LC) return;
-  errors.push(
-    `${where}: ${solid.token} ${colors[solid.token]} on the solid ${solid.fill} ${solid.fillHex} reaches only Lc ${solid.lc.toFixed(1)} \u2014 text on a solid fill needs Lc ${SOLID_FLOOR_LC}`
-  );
-}
-function validateThemeFile(input) {
-  const errors = [];
-  if (!isRecord(input)) {
-    return {
-      ok: false,
-      errors: [`expected a theme object, got ${describe(input)}`]
-    };
-  }
-  const id = input["id"];
-  if (typeof id !== "string" || id.trim() === "") {
-    errors.push(`id: expected a non-empty string, got ${describe(id)}`);
-  } else if (BUILT_IN_IDS.has(id)) {
-    errors.push(
-      `id: "${id}" is a built-in palette \u2014 a theme file needs an id of its own`
-    );
-  }
-  const name = input["name"];
-  if (typeof name !== "string" || name.trim() === "") {
-    errors.push(`name: expected a non-empty string, got ${describe(name)}`);
-  }
-  const declared = input["mode"];
-  let mode = null;
-  if (declared !== void 0) {
-    if (declared === "light" || declared === "dark") {
-      mode = declared;
-    } else {
-      errors.push(
-        `mode: expected "light" or "dark", got ${describe(declared)}`
-      );
-    }
-  }
-  if (mode) {
-    const other = mode === "light" ? "dark" : "light";
-    if (input[other] !== void 0) {
-      errors.push(
-        `${other}: a theme declaring mode "${mode}" must not also define ${other} \u2014 drop the mode to define both`
-      );
-    }
-  }
-  const wanted = mode ? [mode] : ["light", "dark"];
-  const modes = {};
-  for (const key of wanted) {
-    const value = input[key];
-    if (value === void 0) {
-      errors.push(
-        mode ? `${key}: a theme declaring mode "${mode}" has to define ${key}` : `${key}: a theme without a mode has to define both light and dark`
-      );
-      continue;
-    }
-    if (collectShapeErrors(value, key, errors)) modes[key] = value;
-  }
-  if (errors.length === 0) {
-    const light2 = modes.light ?? modes.dark;
-    const dark2 = modes.dark ?? modes.light;
-    const declaredMode = mode;
-    const label = (render) => declaredMode !== null && render !== declaredMode ? `${render} (a theme declaring mode "${declaredMode}" is used in ${render} mode too)` : render;
-    collectContrastErrors(light2, label("light"), false, errors);
-    collectContrastErrors(dark2, label("dark"), true, errors);
-    if (declaredMode !== null) {
-      collectSolidErrors(light2, declaredMode, errors);
-    } else {
-      collectSolidErrors(light2, "light", errors);
-      collectSolidErrors(dark2, "dark", errors);
-    }
-  }
-  if (errors.length > 0) return { ok: false, errors };
-  const light = modes.light ?? modes.dark;
-  const dark = modes.dark ?? modes.light;
-  return {
-    ok: true,
-    palette: { id, name, light, dark },
-    mode
-  };
-}
-
 // src/palettes/index.ts
 var palettes = {
   atlas: atlasPalette,
@@ -999,10 +991,13 @@ var palettes = {
 export {
   DEFAULT_PALETTE_ID,
   isValidHex,
+  COLOR_KEYS,
+  SEMANTIC_KEYS,
   registerPalette,
   getPalette,
   resolvePaletteOrFallback,
   getAvailablePalettes,
+  validateThemeFile,
   atlasPalette,
   blueprintPalette,
   catppuccinPalette,
@@ -1010,6 +1005,5 @@ export {
   slatePalette,
   tidewaterPalette,
   tokyoNightPalette,
-  validateThemeFile,
   palettes
 };

package/dist/{chunk-BOO24UMJ.js → chunk-4YO7VJTP.js}

@@ -5,7 +5,7 @@ import {
   normalizeNumericToken,
   parseFirstLine,
   tryParseSharedOption
-} from "./chunk-44GP7PD5.js";
+} from "./chunk-MPJQMMBZ.js";
 import {
   makeDgmoError,
   makeFail

package/dist/{chunk-HUNDJTTH.js → chunk-53BJIOLF.js}

@@ -1,7 +1,7 @@
 import {
   resolveTagColor,
   tagAttrKey
-} from "./chunk-L5AFONQU.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   mix
 } from "./chunk-L24LESXF.js";

package/dist/{chunk-LR6RRDWN.js → chunk-57L2JPP2.js}

@@ -9,17 +9,17 @@ import {
   rectsOverlap,
   segmentRectOverlap
 } from "./chunk-KMU65FYM.js";
-import {
-  TITLE_FONT_SIZE,
-  TITLE_Y
-} from "./chunk-VLC6WNRD.js";
 import {
   compactNumber,
   computeLegendLayout
 } from "./chunk-NS7L7YKH.js";
+import {
+  TITLE_FONT_SIZE,
+  TITLE_Y
+} from "./chunk-VLC6WNRD.js";
 import {
   tagAttrKey
-} from "./chunk-L5AFONQU.js";
+} from "./chunk-QKJ6MQXW.js";
 import {
   measureLegendText
 } from "./chunk-I6GGMCTV.js";
@@ -40,6 +40,7 @@ var LEGEND_BOTTOM_GAP = 10;
 function mapLegendGroups(legend) {
   const ramp = legend.ramp;
   const scoreGroup = ramp ? {
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- a blank metric name must still read 'Value'
     name: ramp.metric?.trim() || "Value",
     entries: [],
     gradient: {
@@ -1981,7 +1982,10 @@ function layoutMap(resolvedIn, data, size, opts) {
   const rampHue = resolveColor(resolved.directives.regionMetricColor ?? "", palette) ?? palette.colors.red;
   const rampLow = resolved.directives.regionMetricLowColor ? resolveColor(resolved.directives.regionMetricLowColor, palette) ?? void 0 : void 0;
   const hasRamp = values.length > 0;
-  const VALUE_NAME = hasRamp ? resolved.directives.regionMetric?.trim() || "Value" : null;
+  const VALUE_NAME = hasRamp ? (
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- a blank metric name must still read 'Value'
+    resolved.directives.regionMetric?.trim() || "Value"
+  ) : null;
   const matchColorGroup = (v) => {
     const lv = v.trim().toLowerCase();
     if (lv === "none") return null;