Skip to content

Turn any idea, plan, or codebase into a beautiful interactive diagram. An agent skill for Claude Code, Codex, and more.

fix: preserve literal dollar sequences in architecture comparisons

ifLov555ef2f2fdd3
diff --git a/archify.zip b/archify.zip
index ede3ba35..84055df0 100644
Binary files a/archify.zip and b/archify.zip differ
diff --git a/archify/delta/architecture-delta.mjs b/archify/delta/architecture-delta.mjs
index 7ca38d62..7f7e28fa 100644
--- a/archify/delta/architecture-delta.mjs
+++ b/archify/delta/architecture-delta.mjs
@@ -464,11 +464,11 @@ export function annotateArchitectureSideSvg(svg, receipt, side) {
if (!change) return markup;
if (part === 'frame') {
return addState(markup, change, side)
- .replace(/\/>$/, ` data-delta-boundary-key="${esc(change.key)}"/>`);
+ .replace(/\/>$/, () => ` data-delta-boundary-key="${esc(change.key)}"/>`);
}
return markup.replace(
/<text[^>]*>/,
- (tag) => tag.replace(/>$/, ` data-delta-state="${change.status}" data-delta-boundary-state="${change.status}" data-delta-boundary-key="${esc(change.key)}">`),
+ (tag) => tag.replace(/>$/, () => ` data-delta-state="${change.status}" data-delta-boundary-state="${change.status}" data-delta-boundary-key="${esc(change.key)}">`),
);
});
result = transformNodeGroups(result, (group, id) => {
@@ -521,13 +521,13 @@ function boundaryMarkupParts(markup) {
function forceBoundaryState(markup, state, key, classifications = []) {
return markup
- .replace(/^<rect[^>]+\/>/, (tag) => addState(tag, { classifications }, 'delta', state).replace(/\/>$/, ` data-delta-boundary-key="${esc(key)}"/>`))
+ .replace(/^<rect[^>]+\/>/, (tag) => addState(tag, { classifications }, 'delta', state).replace(/\/>$/, () => ` data-delta-boundary-key="${esc(key)}"/>`))
.replace(
/<rect data-graph-role="structural-frame-label-mask"[^>]*\/>/,
(tag) => addState(tag, { classifications }, 'delta', state)
- .replace(/\/>$/, ` data-delta-boundary-state="${state}" data-delta-boundary-mask-key="${esc(key)}"/>`),
+ .replace(/\/>$/, () => ` data-delta-boundary-state="${state}" data-delta-boundary-mask-key="${esc(key)}"/>`),
)
- .replace(/<text[^>]*>/, (tag) => tag.replace(/>$/, ` data-delta-state="${state}" data-delta-boundary-state="${state}" data-delta-boundary-key="${esc(key)}">`));
+ .replace(/<text[^>]*>/, (tag) => tag.replace(/>$/, () => ` data-delta-state="${state}" data-delta-boundary-state="${state}" data-delta-boundary-key="${esc(key)}">`));
}
function viewBoxSize(svg) {
@@ -600,15 +600,17 @@ export function buildDeltaSvg(baseSvg, headSvg, receipt) {
}
}
+ // Insert generated markup literally: authored labels can contain replacement
+ // tokens such as $$, $&, and $` that string replacements would interpret.
let delta = annotateArchitectureSideSvg(headSvg, receipt, 'head');
if (baseEdgePhantoms.length) {
const baseDefinitions = baseRelationshipsSvg.match(/<defs>([\s\S]*?)<\/defs>/)?.[1] || '';
- delta = delta.replace('</defs>', `${baseDefinitions}</defs>`);
+ delta = delta.replace('</defs>', () => `${baseDefinitions}</defs>`);
}
delta = delta.replace(/^<svg[^>]+>/, (tag) => tag.replace(/viewBox="[^"]+"/, `viewBox="0 0 ${Math.max(baseW, headW) + 24} ${Math.max(baseH, headH) + 24}"`));
- delta = delta.replace(' <!-- Boundaries (behind everything) -->', ` <!-- Baseline boundary frame phantoms -->\n${baseBoundaryFramePhantoms.filter(Boolean).join('\n')}\n\n <!-- Boundaries (behind everything) -->`);
- delta = delta.replace(' <!-- Connection paths (before components for correct z-order) -->', ` <!-- Baseline relationship phantoms -->\n${baseEdgePhantoms.join('\n')}\n\n <!-- Connection paths (before components for correct z-order) -->`);
- delta = delta.replace(' <!-- Components -->', ` <!-- Baseline boundary label phantoms (below current components) -->\n${baseBoundaryLabelPhantoms.filter(Boolean).join('\n')}\n\n <!-- Baseline removed and move-from component phantoms -->\n${baseNodePhantoms.join('\n')}\n\n <!-- Components -->`);
+ delta = delta.replace(' <!-- Boundaries (behind everything) -->', () => ` <!-- Baseline boundary frame phantoms -->\n${baseBoundaryFramePhantoms.filter(Boolean).join('\n')}\n\n <!-- Boundaries (behind everything) -->`);
+ delta = delta.replace(' <!-- Connection paths (before components for correct z-order) -->', () => ` <!-- Baseline relationship phantoms -->\n${baseEdgePhantoms.join('\n')}\n\n <!-- Connection paths (before components for correct z-order) -->`);
+ delta = delta.replace(' <!-- Components -->', () => ` <!-- Baseline boundary label phantoms (below current components) -->\n${baseBoundaryLabelPhantoms.filter(Boolean).join('\n')}\n\n <!-- Baseline removed and move-from component phantoms -->\n${baseNodePhantoms.join('\n')}\n\n <!-- Components -->`);
for (const change of edges.values()) {
if (change.status === 'added' || change.status === 'changed' || change.status === 'rerouted') {
@@ -621,7 +623,7 @@ export function buildDeltaSvg(baseSvg, headSvg, receipt) {
const renderedKey = `${change.kind}:${esc(change.label)}`;
boundaryMarkers.push(boundarySymbolMarkup(boundaryMarkupByKey(delta, renderedKey), change.status));
}
- delta = delta.replace(' <!-- Legend -->', ` <!-- Delta relationship symbols -->\n${edgeMarkers.filter(Boolean).join('\n')}\n\n <!-- Delta boundary symbols -->\n${boundaryMarkers.filter(Boolean).join('\n')}\n\n <!-- Legend -->`);
+ delta = delta.replace(' <!-- Legend -->', () => ` <!-- Delta relationship symbols -->\n${edgeMarkers.filter(Boolean).join('\n')}\n\n <!-- Delta boundary symbols -->\n${boundaryMarkers.filter(Boolean).join('\n')}\n\n <!-- Legend -->`);
return prefixSvgIds(staticize(delta), 'delta');
}
diff --git a/archify/test/architecture-delta-literals.test.mjs b/archify/test/architecture-delta-literals.test.mjs
new file mode 100644
index 00000000..49adc375
--- /dev/null
+++ b/archify/test/architecture-delta-literals.test.mjs
@@ -0,0 +1,82 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { spawnSync } from 'node:child_process';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { parse } from 'parse5';
+
+const skillRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
+const attr = (node, name) => node.attrs?.find((entry) => entry.name === name)?.value;
+const descendants = (node) => [node, ...(node.childNodes || []).flatMap(descendants)];
+const textContent = (node) => node.nodeName === '#text' ? node.value : (node.childNodes || []).map(textContent).join('');
+
+function fixtures(kind, operation, label) {
+ const base = {
+ schema_version: 1, diagram_type: 'architecture', meta: { title: 'Literal labels' },
+ components: [
+ { id: 'keep', type: 'backend', label: 'Keep', pos: [80, 80], size: [160, 80] },
+ { id: 'target', type: 'database', label: kind === 'node' ? label : 'Target', pos: [380, 80], size: [160, 80] },
+ ],
+ connections: kind === 'edge' ? [{ id: 'link', from: 'keep', to: 'target', label }] : [],
+ boundaries: kind === 'boundary' ? [{ kind: 'region', label, wraps: ['target'], pad: 30 }] : [],
+ };
+ const head = structuredClone(base);
+ if (operation === 'removed') {
+ if (kind === 'node') head.components.pop();
+ if (kind === 'edge') head.connections = [];
+ if (kind === 'boundary') head.boundaries = [];
+ } else if (kind === 'edge') {
+ Object.assign(head.connections[0], { fromSide: 'bottom', toSide: 'bottom', via: [[160, 240], [460, 240]] });
+ } else if (kind === 'boundary') head.boundaries[0].pad = 40;
+ else head.components[1].pos = [380, 280];
+ return [base, head];
+}
+
+for (const kind of ['node', 'edge', 'boundary']) {
+ for (const operation of ['removed', 'moved']) {
+ test(`compare preserves literal replacement tokens in ${operation} ${kind} labels`, (t) => {
+ const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'archify-delta-literals-'));
+ t.after(() => fs.rmSync(dir, { recursive: true, force: true }));
+ for (const label of ['PID $$', 'Match $&', 'Before $`', "After $'"]) {
+ const inputs = fixtures(kind, operation, label).map((value, index) => {
+ const file = path.join(dir, `${index}.json`);
+ fs.writeFileSync(file, JSON.stringify(value));
+ return file;
+ });
+ const output = path.join(dir, 'delta.html');
+ const run = spawnSync(process.execPath, [path.join(skillRoot, 'bin/archify.mjs'),
+ 'compare', 'architecture', ...inputs, output, '--quality', 'standard', '--json'],
+ { cwd: skillRoot, encoding: 'utf8', timeout: 30000 });
+ assert.ifError(run.error);
+ assert.equal(run.status, 0, `${label}: ${run.stderr || run.stdout}`);
+ const document = parse(fs.readFileSync(output, 'utf8'));
+ const section = descendants(document).find((node) => attr(node, 'data-view') === 'delta');
+ assert.ok(section, 'delta section exists');
+ const nodes = descendants(section);
+ const state = operation === 'removed' ? 'removed' : 'moved-from';
+ let texts;
+ if (kind === 'node') {
+ const group = nodes.find((node) => attr(node, 'data-node-id') === 'target' && attr(node, 'data-delta-state') === state);
+ assert.ok(group, 'baseline node exists');
+ assert.equal(attr(group, 'data-node-label'), label);
+ texts = descendants(group).filter((node) => node.tagName === 'text');
+ } else if (kind === 'edge') {
+ const group = nodes.find((node) => node.tagName === 'g' && attr(node, 'data-edge-id') === 'link' && attr(node, 'data-delta-state') === state);
+ assert.ok(group, 'baseline relationship label exists');
+ texts = descendants(group).filter((node) => node.tagName === 'text');
+ } else {
+ const frame = nodes.find((node) => attr(node, 'data-graph-role') === 'structural-frame' && attr(node, 'data-delta-state') === state);
+ assert.ok(frame, 'baseline boundary exists');
+ assert.equal(attr(frame, 'data-composition-frame-label'), label);
+ const keyed = nodes.filter((node) => attr(node, 'data-delta-boundary-key') !== undefined);
+ assert.ok(keyed.length >= 2, 'boundary frame and label have navigation keys');
+ for (const node of keyed) assert.equal(attr(node, 'data-delta-boundary-key'), `region:${label}`);
+ texts = nodes.filter((node) => node.tagName === 'text' && attr(node, 'data-boundary-label') !== undefined && attr(node, 'data-delta-state') === state);
+ }
+ assert.ok(texts.some((node) => textContent(node) === label), `${kind} visible label must preserve ${label}`);
+ }
+ });
+ }
+}