@diagrammo/dgmo 0.58.0 → 0.59.0

package/dist/auto.mjs

@@ -861,7 +861,12 @@ function staticRegistry(keys) {
   return { keys: new Set(keys), tagAliases: /* @__PURE__ */ new Set() };
 }
 function withTagAliases(base, aliases) {
-  return { keys: base.keys, tagAliases: aliases };
+  const withSlugs = new Set(aliases);
+  for (const alias of aliases) withSlugs.add(tagSlug(alias));
+  return { keys: base.keys, tagAliases: withSlugs };
+}
+function tagSlug(name) {
+  return name.trim().toLowerCase().replace(/[^a-z0-9_-]+/g, "-").replace(/^-+|-+$/g, "");
 }
 function isReservedKey(registry, key) {
   return registry.keys.has(key) || registry.tagAliases.has(key);
@@ -1156,6 +1161,17 @@ function stripQuotes(token) {
   }
   return token;
 }
+function peelQuotedName(name) {
+  const trimmed = name.trim();
+  if (trimmed.length < 2) return name;
+  const first = trimmed[0];
+  const last = trimmed[trimmed.length - 1];
+  if ((first !== '"' || last !== '"') && (first !== "'" || last !== "'"))
+    return name;
+  const inner = trimmed.slice(1, -1);
+  if (inner.length === 0 || inner.includes(first)) return name;
+  return inner;
+}
 function tokenizeQuoteAware(input) {
   const tokens = [];
   let i = 0;
@@ -1600,7 +1616,17 @@ function assignAutoTagColors(group, palette) {
   }
 }
 function finalizeAutoTagColors(groups, palette) {
-  for (const g of groups) assignAutoTagColors(g, palette);
+  for (const g of groups) {
+    for (let i = 0; i < g.entries.length; i++) {
+      const entry = g.entries[i];
+      const peeled = peelQuotedName(entry.value);
+      if (peeled !== entry.value) g.entries[i] = { ...entry, value: peeled };
+    }
+    if (g.defaultValue !== void 0) {
+      g.defaultValue = peelQuotedName(g.defaultValue);
+    }
+    assignAutoTagColors(g, palette);
+  }
 }
 function isAliasToken(token) {
   return /^[A-Za-z][A-Za-z0-9_]{0,11}$/.test(token);
@@ -8459,7 +8485,7 @@ function parseNoteLine(trimmed, participants, participantIds, sortedParticipants
       if (!lastMsgFrom) return { kind: "skip" };
       participantId = lastMsgFrom;
     }
-    const lookupKey = normalizeName(participantId);
+    const lookupKey = normalizeName(peelQuotedName(participantId));
     if (participantIds.has(lookupKey)) {
       const found = participants.find((p) => normalizeName(p.id) === lookupKey);
       return {
@@ -8623,8 +8649,9 @@ function parseSequenceDgmo(content, palette) {
   const participantIds = /* @__PURE__ */ new Set();
   const idByKey = /* @__PURE__ */ new Map();
   const addParticipant = (name, lineNumber, extras) => {
-    const key = normalizeName(name);
-    const trimmed = name.trim();
+    const peeled = peelQuotedName(name);
+    const key = normalizeName(peeled);
+    const trimmed = peeled.trim();
     const incomingLabel = extras?.label ?? trimmed;
     if (participantIds.has(key)) {
       const existing = result.participants.find(
@@ -8656,7 +8683,7 @@ function parseSequenceDgmo(content, palette) {
     result.participants.push({
       id: trimmed,
       label: incomingLabel,
-      type: extras?.type ?? inferParticipantType(name),
+      type: extras?.type ?? inferParticipantType(peeled),
       lineNumber,
       ...extras?.position !== void 0 ? { position: extras.position } : {},
       // takePosition() may have emptied the metadata record (position was
@@ -12312,6 +12339,7 @@ function parseOrg(content, palette) {
     const containerMatch = trimmed.match(CONTAINER_RE);
     const metadataMatch = (() => {
       if (trimmed.includes("|")) return null;
+      if (trimmed.startsWith('"') || trimmed.startsWith("'")) return null;
       const m = trimmed.match(METADATA_RE);
       if (!m) return null;
       const keyRegion = m[1].trim();
@@ -12323,7 +12351,7 @@ function parseOrg(content, palette) {
       const asMatch = rawLabel.match(
         /^(.*?)\s+as\s+([A-Za-z][A-Za-z0-9_]{0,11})\s*$/
       );
-      const label = asMatch ? asMatch[1].trim() : rawLabel;
+      const label = peelQuotedName(asMatch ? asMatch[1].trim() : rawLabel);
       containerCounter++;
       const containerId = `container-${containerCounter}`;
       if (asMatch) nameAliasMap.set(asMatch[2], containerId);
@@ -12421,7 +12449,8 @@ function parseNodeLabel(trimmed, _indent, lineNumber, _palette, counter, metaAli
     (msg) => diagnostics?.push(makeDgmoError(lineNumber, msg, "warning")),
     split.name
   );
-  const label = split.color !== void 0 ? `${split.name} ${split.color}` : split.name;
+  const peeled = peelQuotedName(split.name);
+  const label = split.color !== void 0 ? `${peeled} ${split.color}` : peeled;
   if (split.alias) {
     nameAliasMap?.set(normalizeName(split.alias), id);
   }
@@ -12528,7 +12557,7 @@ function parseArrowLine(trimmed, _palette, _lineNumber, _diagnostics) {
     const rawTarget = bareMatch[1].trim();
     const groupMatch = rawTarget.match(/^\[(.+)\]$/);
     return {
-      target: groupMatch ? groupMatch[1].trim() : rawTarget,
+      target: peelQuotedName(groupMatch ? groupMatch[1].trim() : rawTarget),
       targetIsGroup: !!groupMatch
     };
   }
@@ -12539,7 +12568,7 @@ function parseArrowLine(trimmed, _palette, _lineNumber, _diagnostics) {
     const groupMatch = rawTarget.match(/^\[(.+)\]$/);
     return {
       ...label !== void 0 && { label },
-      target: groupMatch ? groupMatch[1].trim() : rawTarget,
+      target: peelQuotedName(groupMatch ? groupMatch[1].trim() : rawTarget),
       targetIsGroup: !!groupMatch
     };
   }
@@ -12740,7 +12769,7 @@ function parseSitemap(content, palette) {
       const asMatch = rawLabel.match(
         /^(.*?)\s+as\s+([A-Za-z][A-Za-z0-9_]{0,11})\s*$/
       );
-      const label = asMatch ? asMatch[1].trim() : rawLabel;
+      const label = peelQuotedName(asMatch ? asMatch[1].trim() : rawLabel);
       const tail = (containerMatch[2] ?? "").trim();
       const containerMetadata = {};
       if (tail.length > 0) {
@@ -12921,7 +12950,7 @@ function parseNodeLabel2(trimmed, lineNumber, _palette, counter, metaAliasMap =
       split.name
     );
   }
-  const label = split.name;
+  const label = peelQuotedName(split.name);
   if (split.alias) nameAliasMap?.set(normalizeName(split.alias), id);
   const metadata = { ...split.meta };
   if (split.color !== void 0) metadata["color"] = split.color;
@@ -13507,6 +13536,7 @@ function tokenizeActivityLine(line11, diagnostics, lineNumber, metaAliasMap) {
     name = rawTokens.slice(0, firstNumIdx).join(" ").trim();
     durationTokens = rawTokens.slice(firstNumIdx);
   }
+  name = peelQuotedName(name);
   return {
     name,
     durationTokens,
@@ -13734,7 +13764,7 @@ function parsePert(content, parseOpts = {}) {
     if (groupMatch) {
       contentStarted = true;
       currentTagGroup = null;
-      const name = groupMatch[1].trim();
+      const name = peelQuotedName(groupMatch[1].trim());
       let tail = (groupMatch[2] ?? "").trim();
       let bareCollapsed = false;
       const barePeel = peelTrailingCollapsedFlag(tail);
@@ -17327,7 +17357,7 @@ function parseKanban(content, palette) {
       }
       currentCard = null;
       columnCounter++;
-      const colName = columnMatch[1].trim();
+      const colName = peelQuotedName(columnMatch[1].trim());
       let tail = (columnMatch[2] ?? "").trim();
       let colCollapsed = false;
       const barePeel = peelTrailingCollapsedFlag(tail);
@@ -17506,7 +17536,8 @@ function parseCardLine(trimmed, lineNumber, counter, metaAliasMap, _palette, dia
     (msg) => diagnostics?.push(makeDgmoError(lineNumber, msg, "warning")),
     split.name
   );
-  const title = split.color !== void 0 ? `${split.name} ${split.color}` : split.name;
+  const name = peelQuotedName(split.name);
+  const title = split.color !== void 0 ? `${name} ${split.color}` : name;
   const tags = { ...split.meta };
   return {
     id: `card-${counter}`,
@@ -17639,7 +17670,8 @@ function parseC4(content, palette) {
   const metaAliasMap = /* @__PURE__ */ new Map();
   const nameAliasMap = /* @__PURE__ */ new Map();
   function resolveNameRef(rawName) {
-    return nameAliasMap.get(rawName.trim()) ?? rawName;
+    const trimmed = rawName.trim();
+    return nameAliasMap.get(trimmed) ?? peelQuotedName(trimmed);
   }
   const knownNames = /* @__PURE__ */ new Map();
   const elementMetadata = /* @__PURE__ */ new WeakMap();
@@ -17766,7 +17798,7 @@ function parseC4(content, palette) {
       } else {
         const refMatch = trimmed.match(CONTAINER_REF_RE);
         if (refMatch) {
-          const refName = refMatch[1].trim();
+          const refName = peelQuotedName(refMatch[1].trim());
           if (deployStack.length > 0) {
             deployStack[deployStack.length - 1].node.containerRefs.push(
               refName
@@ -17779,10 +17811,9 @@ function parseC4(content, palette) {
           }
           continue;
         }
-        const { name: nodeName, metadata } = parseC4NameAndMeta(
-          trimmed,
-          metaAliasMap
-        );
+        const parsedNode = parseC4NameAndMeta(trimmed, metaAliasMap);
+        const nodeName = peelQuotedName(parsedNode.name);
+        const metadata = parsedNode.metadata;
         warnUnknownMetaKeys(
           metadata,
           withTagAliases(C4_REGISTRY, new Set(metaAliasMap.keys())),
@@ -17964,11 +17995,12 @@ function parseC4(content, palette) {
       let namePart = isATypeMatch[1].trim();
       const rawType = isATypeMatch[2].toLowerCase();
       let remainder = isATypeMatch[3];
+      let declaredAlias;
       const asPostfix = remainder.match(
         /^(.*?)\s+as\s+([A-Za-z][A-Za-z0-9_]{0,11})\s*(\|.*)?$/
       );
       if (asPostfix) {
-        nameAliasMap.set(asPostfix[2], namePart);
+        declaredAlias = asPostfix[2];
         remainder = (asPostfix[1] + (asPostfix[3] ?? "")).trim();
       } else {
         const asInName = namePart.match(
@@ -17976,9 +18008,12 @@ function parseC4(content, palette) {
         );
         if (asInName) {
           namePart = asInName[1].trim();
-          nameAliasMap.set(asInName[2], namePart);
+          declaredAlias = asInName[2];
         }
       }
+      namePart = peelQuotedName(namePart);
+      if (declaredAlias !== void 0)
+        nameAliasMap.set(declaredAlias, namePart);
       let elementType;
       let explicitShape = null;
       if (rawType === "external") {
@@ -18073,7 +18108,7 @@ function parseC4(content, palette) {
         (msg) => pushError(lineNumber, msg, "warning"),
         parsed.name
       );
-      let namePart = parsed.name;
+      let namePart = peelQuotedName(parsed.name);
       const metadata = parsed.metadata;
       let explicitShape = null;
       const isAMatch = namePart.match(IS_A_RE);
@@ -18367,6 +18402,23 @@ __export(parser_exports11, {
   extractSymbols: () => extractSymbols4,
   parseInfra: () => parseInfra
 });
+function assignAutoTagColorNames(groups) {
+  for (const group of groups) {
+    const explicit = new Set(
+      group.values.filter((v) => v.color !== void 0).map((v) => v.color.toLowerCase())
+    );
+    let cursor = 0;
+    for (const value of group.values) {
+      if (value.color !== void 0) continue;
+      while (cursor < autoTagColorCycle.length && explicit.has(autoTagColorCycle[cursor].toLowerCase())) {
+        cursor++;
+      }
+      const name = autoTagColorCycle[cursor % autoTagColorCycle.length];
+      cursor++;
+      value.color = name;
+    }
+  }
+}
 function nodeId2(name) {
   return normalizeName(name);
 }
@@ -18468,6 +18520,16 @@ function parseInfra(content) {
       ...peeled.alias !== void 0 && { alias: peeled.alias }
     };
   }
+  function warnMisplacedProperties(tags, label, lineNumber) {
+    for (const key of Object.keys(tags)) {
+      if (!INFRA_BEHAVIOR_KEYS.has(key) && !EDGE_ONLY_KEYS.has(key)) continue;
+      warn2(
+        lineNumber,
+        `'${key}' is a node property \u2014 indent it under '${label}' as '${key}: ${tags[key]}', not on the declaration line.`
+      );
+      delete tags[key];
+    }
+  }
   function resolveTargetId(rawName) {
     const aliasResolved = nameAliasMap.get(rawName.trim());
     if (aliasResolved !== void 0) return aliasResolved;
@@ -18643,13 +18705,14 @@ function parseInfra(content) {
       if (compMatch) {
         finishCurrentNode();
         finishCurrentTagGroup();
-        const { qname, uname, alias: asAlias, meta } = compMatch.groups;
-        const rawName = (qname ?? uname ?? "").trim();
+        const { qname, uname, isa, alias: asAlias, meta } = compMatch.groups;
+        const rawName = ((qname ?? uname ?? "") + (isa ?? "")).trim();
         const peeled = peelInfraDecorations(rawName, lineNumber);
         const name = peeled.label;
         const alias = asAlias ?? peeled.alias;
         const rest = meta ?? "";
         const { tags } = extractPipeMetadata(rest);
+        warnMisplacedProperties(tags, name, lineNumber);
         warnUnknownMetaKeys(
           tags,
           withTagAliases(INFRA_REGISTRY, tagAliasSet),
@@ -18685,8 +18748,11 @@ function parseInfra(content) {
           valueName = cleanEntry.substring(0, lastSpaceIdx).trimEnd();
         }
       }
+      const peeledValue = peelQuotedName(valueName);
+      const wasQuoted = peeledValue !== valueName;
+      valueName = peeledValue;
       const tvMatch = valueName.match(TAG_VALUE_RE);
-      if (tvMatch || /^\w+$/.test(valueName)) {
+      if (wasQuoted || tvMatch || /^\w+$/.test(valueName)) {
         currentTagGroup.values.push({
           name: valueName,
           ...rawColor !== void 0 && { color: rawColor }
@@ -18746,13 +18812,14 @@ function parseInfra(content) {
       const compMatch = trimmed.match(COMPONENT_RE);
       if (compMatch) {
         finishCurrentTagGroup();
-        const { qname, uname, alias: asAlias, meta } = compMatch.groups;
-        const rawName = (qname ?? uname ?? "").trim();
+        const { qname, uname, isa, alias: asAlias, meta } = compMatch.groups;
+        const rawName = ((qname ?? uname ?? "") + (isa ?? "")).trim();
         const peeled = peelInfraDecorations(rawName, lineNumber);
         const name = peeled.label;
         const alias = asAlias ?? peeled.alias;
         const rest = meta ?? "";
         const { tags: nodeTags } = extractPipeMetadata(rest);
+        warnMisplacedProperties(nodeTags, name, lineNumber);
         warnUnknownMetaKeys(
           nodeTags,
           withTagAliases(INFRA_REGISTRY, tagAliasSet),
@@ -18999,13 +19066,14 @@ function parseInfra(content) {
       finishCurrentNode();
       const compMatch = trimmed.match(COMPONENT_RE);
       if (compMatch) {
-        const { qname, uname, alias: asAlias, meta } = compMatch.groups;
-        const rawName = (qname ?? uname ?? "").trim();
+        const { qname, uname, isa, alias: asAlias, meta } = compMatch.groups;
+        const rawName = ((qname ?? uname ?? "") + (isa ?? "")).trim();
         const peeled = peelInfraDecorations(rawName, lineNumber);
         const name = peeled.label;
         const alias = asAlias ?? peeled.alias;
         const rest = meta ?? "";
         const { tags: nodeTags } = extractPipeMetadata(rest);
+        warnMisplacedProperties(nodeTags, name, lineNumber);
         warnUnknownMetaKeys(
           nodeTags,
           withTagAliases(INFRA_REGISTRY, tagAliasSet),
@@ -19034,13 +19102,14 @@ function parseInfra(content) {
         finishCurrentNode();
         finishCurrentTagGroup();
         currentGroup = null;
-        const { qname, uname, alias: asAlias, meta } = compMatch.groups;
-        const rawName = (qname ?? uname ?? "").trim();
+        const { qname, uname, isa, alias: asAlias, meta } = compMatch.groups;
+        const rawName = ((qname ?? uname ?? "") + (isa ?? "")).trim();
         const peeled = peelInfraDecorations(rawName, lineNumber);
         const name = peeled.label;
         const alias = asAlias ?? peeled.alias;
         const rest = meta ?? "";
         const { tags } = extractPipeMetadata(rest);
+        warnMisplacedProperties(tags, name, lineNumber);
         warnUnknownMetaKeys(
           tags,
           withTagAliases(INFRA_REGISTRY, tagAliasSet),
@@ -19101,6 +19170,7 @@ function parseInfra(content) {
       }
     }
   }
+  assignAutoTagColorNames(result.tagGroups);
   validateTagGroupNames(result.tagGroups, warn2, setError);
   checkReachability(result);
   checkSplitSums(result);
@@ -19265,9 +19335,9 @@ var init_parser17 = __esm({
     DEPRECATED_FANOUT_RE = /\bx(\d+)\s*$/;
     GROUP_RE = /^\[([^\]]+)\]\s*(?:as\s+([A-Za-z][A-Za-z0-9_]{0,11})\s*)?(?:(collapsed)(?!\s*:)\s*)?((?:\|.*)|(?:[a-zA-Z_]\w*\s*:.*))?$/;
     TAG_VALUE_RE = /^(\w[\w\s]+?)\s*$/;
-    COMPONENT_RE = /^(?:"(?<qname>[^"]+)"|(?<uname>[a-zA-Z_][\w -]*?))(?:\s+as\s+(?<alias>[A-Za-z][A-Za-z0-9_]{0,11}))?\s*(?<meta>(?:\|.*)|(?:[a-zA-Z_]\w*\s*:.*))?$/;
+    COMPONENT_RE = /^(?:"(?<qname>[^"]+)"|(?<uname>[a-zA-Z_][\w -]*?))(?<isa>\s+is\s+an?\s+[A-Za-z][\w-]*)?(?:\s+as\s+(?<alias>[A-Za-z][A-Za-z0-9_]{0,11}))?\s*(?<meta>(?:\|.*)|(?:[a-zA-Z_][\w-]*\s*:.*))?$/;
     PIPE_META_RE = /[|,]\s*(\w+)\s*:\s*([^|,]+)/g;
-    SAMELINE_META_RE = /(?:^|[\s,])(\w+)\s*:\s*([^,]+?)(?=\s*,|\s*$)/g;
+    SAMELINE_META_RE = /(?:^|[\s,])([\w-]+)\s*:\s*([^,]+?)(?=\s*,|\s*$)/g;
     PROPERTY_RE = /^([\w-]+):\s*(.+)$/;
     PERCENT_RE = /^([\d.]+)%$/;
     RANGE_RE = /^(\d+)-(\d+)$/;
@@ -19538,7 +19608,9 @@ function parseGantt(content, palette) {
           result.eras.push({
             startDate: eraEntryMatch.start,
             endDate: eraEntryMatch.end,
-            label: eraExtracted.label,
+            // Peel after extractColor — the quotes are what keep a trailing
+            // color word inside the label (§2.2).
+            label: peelQuotedName(eraExtracted.label),
             color: eraExtracted.color || null,
             lineNumber
           });
@@ -19567,7 +19639,9 @@ function parseGantt(content, palette) {
           );
           result.markers.push({
             date: markerEntryMatch.iso,
-            label: markerExtracted.label,
+            // Peel after extractColor — the quotes are what keep a trailing
+            // color word inside the label (§2.2).
+            label: peelQuotedName(markerExtracted.label),
             color: markerExtracted.color || null,
             lineNumber
           });
@@ -19651,10 +19725,11 @@ function parseGantt(content, palette) {
             content2.explicitStart,
             content2.preExtracted
           );
+          if (content2.alias) nameAliasMap.set(content2.alias, task.label);
           const taskNode = { kind: "task", ...task };
           if (lastTaskNode) {
             lastTaskNode.dependencies.push({
-              targetName: content2.name,
+              targetName: task.label,
               ...arrowResult.label !== void 0 && {
                 label: arrowResult.label
               },
@@ -19695,7 +19770,9 @@ function parseGantt(content, palette) {
               targetSegment = split.name;
               meta = split.meta;
             }
-            const targetName = resolveAliasTarget(targetSegment);
+            const targetName = resolveAliasTarget(
+              peelQuotedName(targetSegment)
+            );
             let offset = arrowResult.lag;
             if (meta["lag"] || meta["lead"]) {
               const key = meta["lag"] ? "lag" : "lead";
@@ -19788,7 +19865,7 @@ function parseGantt(content, palette) {
         result.eras.push({
           startDate: "",
           endDate: "",
-          label: eraExtracted.label,
+          label: peelQuotedName(eraExtracted.label),
           color: eraExtracted.color || null,
           lineNumber,
           ...startOff && { offsetStart: startOff },
@@ -19808,7 +19885,7 @@ function parseGantt(content, palette) {
         );
         result.markers.push({
           date: "",
-          label: markerExtracted.label,
+          label: peelQuotedName(markerExtracted.label),
           color: markerExtracted.color || null,
           lineNumber,
           ...dateOff && { offsetDate: dateOff }
@@ -19891,7 +19968,7 @@ function parseGantt(content, palette) {
         result.eras.push({
           startDate: eraMatch.start,
           endDate: eraMatch.end,
-          label: eraExtracted.label,
+          label: peelQuotedName(eraExtracted.label),
           color: eraExtracted.color || null,
           lineNumber
         });
@@ -19916,7 +19993,7 @@ function parseGantt(content, palette) {
         );
         result.markers.push({
           date: markerMatch.iso,
-          label: markerExtracted.label,
+          label: peelQuotedName(markerExtracted.label),
           color: markerExtracted.color || null,
           lineNumber
         });
@@ -19977,7 +20054,6 @@ function parseGantt(content, palette) {
           softError(lineNumber, `Task name cannot be empty.`);
           continue;
         }
-        if (split.alias) nameAliasMap.set(split.alias, taskName);
         const preExtracted = { ...split.meta };
         delete preExtracted["duration"];
         delete preExtracted["start"];
@@ -19990,6 +20066,7 @@ function parseGantt(content, palette) {
           explicitStart,
           preExtracted
         );
+        if (split.alias) nameAliasMap.set(split.alias, task.label);
         const taskNode = { kind: "task", ...task };
         currentContainer().push(taskNode);
         const writableTaskN = taskNode;
@@ -20215,10 +20292,10 @@ function parseGantt(content, palette) {
           delete metadata["collapsed"];
         }
         const groupPeeled = peelAlias2(gm[1]);
-        if (groupPeeled.alias)
-          nameAliasMap.set(groupPeeled.alias, groupPeeled.label);
+        const groupName = peelQuotedName(groupPeeled.label);
+        if (groupPeeled.alias) nameAliasMap.set(groupPeeled.alias, groupName);
         const group = {
-          name: groupPeeled.label,
+          name: groupName,
           color: null,
           metadata,
           ...lineOffset && { offset: lineOffset },
@@ -20254,6 +20331,7 @@ function parseGantt(content, palette) {
             content2.explicitStart,
             content2.preExtracted
           );
+          if (content2.alias) nameAliasMap.set(content2.alias, task.label);
           if (lineOffset) {
             task.offset = lineOffset;
           }
@@ -20280,6 +20358,7 @@ function parseGantt(content, palette) {
   if (currentTagGroup) {
     result.tagGroups.push(currentTagGroup);
   }
+  finalizeAutoTagColors(result.tagGroups, palette);
   if (result.options.sort === "tag" && result.tagGroups.length === 0) {
     warn2(0, "sort tag has no effect \u2014 no tag groups defined.");
     result.options.sort = "default";
@@ -20401,7 +20480,8 @@ function parseGantt(content, palette) {
       duration,
       uncertain,
       explicitStart,
-      preExtracted
+      preExtracted,
+      alias: split.alias
     };
   }
   function findOwningTask(stack, metaIndent) {
@@ -20416,7 +20496,6 @@ function parseGantt(content, palette) {
   function makeTask(labelRaw, duration, uncertain, ln, explicitStart, preExtractedMeta) {
     const peeled = peelAlias2(labelRaw);
     let label = peeled.label;
-    if (peeled.alias) nameAliasMap.set(peeled.alias, label);
     if (label.toLowerCase() === "parallel") {
       softError(
         ln,
@@ -20448,6 +20527,8 @@ function parseGantt(content, palette) {
         Object.assign(metadata, split.meta);
       }
     }
+    label = peelQuotedName(label);
+    if (peeled.alias) nameAliasMap.set(peeled.alias, label);
     if (preExtractedMeta) {
       Object.assign(metadata, preExtractedMeta);
     }
@@ -21814,7 +21895,7 @@ function parseNodeLine(trimmed, lineNum, metaAliasMap, diagnostics, nameAliasMap
     (msg) => diagnostics.push(makeDgmoError(lineNum, msg, "warning")),
     split.name
   );
-  let label = split.name;
+  let label = peelQuotedName(split.name);
   const metadata = { ...split.meta };
   let description;
   if (split.color !== void 0) {
@@ -21868,7 +21949,7 @@ function resolveEndpoint(name, nameAliasMap) {
     const aliased = nameAliasMap.get(name.trim());
     if (aliased !== void 0) return aliased;
   }
-  return name;
+  return peelQuotedName(name);
 }
 function parseEdgeLine(trimmed, lineNum, metaAliasMap, diagnostics, nameAliasMap) {
   const edgeRegistry = withTagAliases(
@@ -44804,25 +44885,45 @@ function splitCamelCase(word) {
   parts.push(word.slice(start));
   return parts.length > 1 ? parts : [word];
 }
+function splitLabelChunks(label) {
+  const chunks = [];
+  const words = label.split(/\s+/).filter((w) => w.length > 0);
+  for (let wi = 0; wi < words.length; wi++) {
+    const word = words[wi];
+    const hyphenParts = [];
+    let start = 0;
+    for (let i = 0; i < word.length; i++) {
+      if (word[i] === "-") {
+        hyphenParts.push(word.slice(start, i + 1));
+        start = i + 1;
+      }
+    }
+    if (start < word.length) hyphenParts.push(word.slice(start));
+    let firstOfWord = true;
+    for (const part of hyphenParts) {
+      for (const camel of splitCamelCase(part)) {
+        chunks.push({ text: camel, spaceBefore: wi > 0 && firstOfWord });
+        firstOfWord = false;
+      }
+    }
+  }
+  return chunks;
+}
 function fitLabelToHeader(label, nodeWidth, maxLines) {
   const maxTextWidth = nodeWidth - NODE_TEXT_PADDING * 2;
-  const rawParts = label.split(/(\s+|-)/);
-  const words = [];
-  for (const part of rawParts) {
-    if (!part || /^\s+$/.test(part) || part === "-") continue;
-    words.push(...splitCamelCase(part));
-  }
+  const words = splitLabelChunks(label);
   for (let fontSize = NODE_FONT_SIZE; fontSize >= MIN_NODE_FONT_SIZE; fontSize--) {
     if (maxTextWidth < measureText("MM", fontSize)) continue;
     const lines = [];
     let current = "";
     for (const word of words) {
-      const test = current ? `${current} ${word}` : word;
+      const joiner = current && word.spaceBefore ? " " : "";
+      const test = current ? `${current}${joiner}${word.text}` : word.text;
       if (measureText(test, fontSize) <= maxTextWidth) {
         current = test;
       } else {
         if (current) lines.push(current);
-        current = word;
+        current = word.text;
       }
     }
     if (current) lines.push(current);
@@ -62221,10 +62322,10 @@ function ambiguousTaskMessage(trimmed, suggestions) {
   return `Multiple tasks match "${trimmed}". Did you mean ${suggestions.map((s) => `\`${s}\``).join(" or ")}?`;
 }
 function resolveTaskName(name, allTasks2) {
-  let trimmed = name.trim();
+  let trimmed = peelQuotedName(name.trim()).trim();
   const bracketMatch = trimmed.match(BRACKET_GROUP_RE);
   if (bracketMatch) {
-    trimmed = `${bracketMatch[1]}.${bracketMatch[2]}`;
+    trimmed = `${peelQuotedName(bracketMatch[1])}.${bracketMatch[2]}`;
   }
   const normTrimmed = normalizeName(trimmed);
   const exactMatches = allTasks2.filter(
@@ -62244,8 +62345,8 @@ function resolveTaskName(name, allTasks2) {
   }
   const lastDotIdx = trimmed.lastIndexOf(".");
   if (lastDotIdx > 0) {
-    const groupPrefix = trimmed.substring(0, lastDotIdx);
-    const taskLabel = trimmed.substring(lastDotIdx + 1);
+    const groupPrefix = peelQuotedName(trimmed.substring(0, lastDotIdx));
+    const taskLabel = peelQuotedName(trimmed.substring(lastDotIdx + 1));
     const normTaskLabel = normalizeName(taskLabel);
     const matches = allTasks2.filter((t) => {
       if (normalizeName(t.label) !== normTaskLabel) return false;
@@ -62282,6 +62383,7 @@ var init_resolver = __esm({
   "src/gantt/resolver.ts"() {
     "use strict";
     init_name_normalize();
+    init_parsing();
     BRACKET_GROUP_RE = /^\[(.+?)\]\.(.+)$/;
   }
 });
@@ -87723,7 +87825,7 @@ var CSS = AUTO_BASE_CSS + "\n" + BLOCK_CSS + "\n" + darkScopedBlockCss(BLOCK_CSS
 
 // src/auto/shared.ts
 init_safe_href();
-var VERSION = "0.58.0";
+var VERSION = "0.59.0";
 var ARIA_LABEL_MAX = 200;
 var COPIED_INTERACTION_MS = 1500;
 var LOG_PREFIX = "[dgmo]";