@coral-viz/language 0.2.3 → 0.2.4

package/dist/parser/index.js

@@ -5,19 +5,29 @@
  */
 import { IdAllocator, allocateEdgeId, labelToId } from '../ids.js';
 import { unescapeString } from '../strings.js';
+import { isJsonSafe, isPlainObject } from '../structured.js';
 import { finishParse, parseDiagnostic, } from '../diagnostics.js';
 /**
  * Parse Coral DSL text into Graph-IR
  */
 export function parse(source, options = {}) {
     const { includeSourceInfo = false, graphId = 'coral-graph', graphName, } = options;
+    const sourceLines = source.split('\n');
+    const lineStarts = [0];
+    for (let index = 0; index < source.length; index++) {
+        if (source[index] === '\n')
+            lineStarts.push(index + 1);
+    }
     // Create context for parsing
     const ctx = {
         source,
+        sourceLines,
+        lineStarts,
         includeSourceInfo,
         nodeIds: new IdAllocator(),
         edgeIds: new IdAllocator(),
         diagnostics: [],
+        sawDeclaration: false,
     };
     // The portable TypeScript parser is the supported 0.2 runtime. The
     // Tree-sitter grammar is shipped and tested separately for editor tooling.
@@ -26,18 +36,115 @@ export function parse(source, options = {}) {
     // everything that parsed (R-009 AC-8).
     const graph = {
         version: '1.0.0',
-        id: graphId,
+        id: ctx.graphHeader?.id ?? graphId,
         nodes: parseResult.nodes,
         edges: parseResult.edges,
     };
-    if (graphName) {
-        graph.name = graphName;
-    }
+    const resolvedName = ctx.graphHeader?.name ?? graphName;
+    if (resolvedName !== undefined)
+        graph.name = resolvedName;
+    if (ctx.graphHeader?.metadata !== undefined)
+        graph.metadata = ctx.graphHeader.metadata;
+    if (ctx.graphHeader?.layoutOptions !== undefined)
+        graph.layoutOptions = ctx.graphHeader.layoutOptions;
     return finishParse(ctx.diagnostics, graph);
 }
 /** Record a diagnostic on the context. */
-function report(ctx, severity, code, message, position, source) {
-    ctx.diagnostics.push(parseDiagnostic({ severity, code, message, position, source }));
+function report(ctx, severity, code, message, position, source, rangeSource = source ?? '') {
+    const rawLine = ctx.sourceLines[position.line - 1] ?? '';
+    const lineStart = ctx.lineStarts[position.line - 1] ?? 0;
+    const normalizedPosition = {
+        line: position.line,
+        column: Math.min(Math.max(0, position.column), rawLine.length),
+        offset: lineStart + Math.min(Math.max(0, position.column), rawLine.length),
+    };
+    const matches = [];
+    if (rangeSource && !rangeSource.includes('\n')) {
+        for (let from = 0; from <= rawLine.length - rangeSource.length;) {
+            const found = rawLine.indexOf(rangeSource, from);
+            if (found < 0)
+                break;
+            matches.push(found);
+            from = found + Math.max(1, rangeSource.length);
+        }
+    }
+    const exactColumn = matches.includes(normalizedPosition.column)
+        ? normalizedPosition.column
+        : matches.length === 1 ? matches[0] : undefined;
+    const start = exactColumn === undefined ? normalizedPosition : {
+        line: position.line,
+        column: exactColumn,
+        offset: lineStart + exactColumn,
+    };
+    ctx.diagnostics.push(parseDiagnostic({
+        severity,
+        code,
+        message,
+        position: start,
+        source,
+        ...(exactColumn !== undefined ? { range: {
+                start,
+                end: {
+                    line: position.line,
+                    column: exactColumn + rangeSource.length,
+                    offset: lineStart + exactColumn + rangeSource.length,
+                },
+            } } : {}),
+    }));
+}
+function tokenPosition(ctx, lineNumber, token, after, keyToken = false) {
+    const rawLine = ctx.sourceLines[lineNumber - 1] ?? '';
+    const anchor = after ? syntaxAnchor(rawLine, after) : -1;
+    let found = rawLine.indexOf(token, anchor >= 0 ? anchor + (after?.length ?? 0) : 0);
+    if (keyToken) {
+        const candidates = [];
+        while (found >= 0) {
+            let cursor = found + token.length;
+            while (/\s/.test(rawLine[cursor] ?? ''))
+                cursor++;
+            if (rawLine[cursor] === ':')
+                candidates.push(found);
+            found = rawLine.indexOf(token, found + token.length);
+        }
+        found = candidates.length === 1 ? candidates[0] : -1;
+    }
+    const column = Math.max(0, found);
+    const lineStart = ctx.lineStarts[lineNumber - 1] ?? 0;
+    return { line: lineNumber, column, offset: lineStart + column };
+}
+function syntaxAnchor(line, needle) {
+    let quoted = false;
+    let escaped = false;
+    for (let index = 0; index <= line.length - needle.length; index++) {
+        const char = line[index];
+        if (escaped) {
+            escaped = false;
+            continue;
+        }
+        if (quoted && char === '\\') {
+            escaped = true;
+            continue;
+        }
+        if (char === '"') {
+            quoted = !quoted;
+            continue;
+        }
+        if (!quoted && line.startsWith(needle, index))
+            return index;
+    }
+    return -1;
+}
+function exactLineRange(ctx, line, lineStart, lineNumber) {
+    const rawLineEnd = ctx.source.indexOf('\n', lineStart);
+    const rawLine = ctx.source.slice(lineStart, rawLineEnd < 0 ? ctx.source.length : rawLineEnd);
+    const column = rawLine.indexOf(line);
+    const startColumn = column < 0 ? 0 : column;
+    return {
+        start: lineStart + startColumn,
+        end: lineStart + startColumn + line.length,
+        startPosition: { line: lineNumber, column: startColumn },
+        endPosition: { line: lineNumber, column: startColumn + line.length },
+    };
 }
 /**
  * Pure JS parser implementation
@@ -46,7 +153,7 @@ function report(ctx, severity, code, message, position, source) {
 function parseSource(ctx) {
     const nodes = [];
     const edges = [];
-    const lines = ctx.source.split('\n');
+    const lines = ctx.sourceLines;
     let currentOffset = 0;
     let lineNumber = 0;
     // Track brace depth for parsing bodies
@@ -59,6 +166,11 @@ function parseSource(ctx) {
             currentOffset += line.length + 1;
             continue;
         }
+        if (trimmed.startsWith('@graph')) {
+            parseGraphDirective(trimmed, ctx, currentOffset, lineNumber);
+            currentOffset += line.length + 1;
+            continue;
+        }
         // Handle closing braces
         if (trimmed === '}') {
             if (braceStack.length === 0) {
@@ -71,6 +183,7 @@ function parseSource(ctx) {
         // Try to parse node declaration
         const nodeMatch = parseNodeDeclaration(trimmed, ctx, currentOffset, lineNumber);
         if (nodeMatch) {
+            ctx.sawDeclaration = true;
             if (braceStack.length > 0) {
                 // This is a child node
                 const parent = braceStack[braceStack.length - 1].node;
@@ -88,7 +201,11 @@ function parseSource(ctx) {
                 braceStack.push({
                     node: nodeMatch,
                     indent: line.search(/\S/),
-                    opened: { line: lineNumber, column: Math.max(line.indexOf('{'), 0), offset: currentOffset },
+                    opened: {
+                        line: lineNumber,
+                        column: Math.max(line.lastIndexOf('{'), 0),
+                        offset: currentOffset + Math.max(line.lastIndexOf('{'), 0),
+                    },
                 });
             }
             currentOffset += line.length + 1;
@@ -102,7 +219,7 @@ function parseSource(ctx) {
                 parent.properties = {};
             }
             if (propertyMatch.key.startsWith('_')) {
-                report(ctx, 'info', 'coral.property.reserved-key.dropped', `Property key "${propertyMatch.key}" is reserved for internal use and is not stored`, { line: lineNumber, column: 0, offset: currentOffset }, trimmed);
+                report(ctx, 'info', 'coral.property.reserved-key.dropped', `Property key "${propertyMatch.key}" is reserved for internal use and is not stored`, tokenPosition(ctx, lineNumber, propertyMatch.key), trimmed, propertyMatch.key);
             }
             else {
                 parent.properties[propertyMatch.key] = propertyMatch.value;
@@ -113,6 +230,7 @@ function parseSource(ctx) {
         // Try to parse edge declaration
         const edgeMatch = parseEdgeDeclaration(trimmed, ctx, currentOffset, lineNumber);
         if (edgeMatch) {
+            ctx.sawDeclaration = true;
             edges.push(edgeMatch);
             currentOffset += line.length + 1;
             continue;
@@ -123,7 +241,7 @@ function parseSource(ctx) {
     }
     // Check for unclosed braces
     for (const unclosed of braceStack) {
-        report(ctx, 'error', 'coral.brace.unparsed', 'Unclosed brace', unclosed.opened);
+        report(ctx, 'error', 'coral.brace.unparsed', 'Unclosed brace', unclosed.opened, '{', '{');
     }
     return {
         success: !ctx.diagnostics.some((d) => d.severity === 'error'),
@@ -131,27 +249,88 @@ function parseSource(ctx) {
         edges,
     };
 }
+function parseGraphDirective(line, ctx, offset, lineNumber) {
+    if (ctx.sawDeclaration || ctx.graphHeader) {
+        report(ctx, 'error', 'coral.graph.unparsed', 'Graph header must appear once before declarations', tokenPosition(ctx, lineNumber, '@graph'), line, '@graph');
+        return;
+    }
+    const raw = line.slice('@graph'.length).trim();
+    const value = parseJsonObject(raw);
+    if (!value || typeof value.id !== 'string' || value.id.length === 0) {
+        report(ctx, 'error', 'coral.graph.unparsed', 'Graph header must be a JSON object with a non-empty string id', tokenPosition(ctx, lineNumber, raw || '@graph', raw ? '@graph' : undefined), line, raw || '@graph');
+        return;
+    }
+    const header = { id: value.id };
+    const allowed = new Set(['id', 'name', 'metadata', 'layoutOptions']);
+    for (const key of Object.keys(value)) {
+        if (!allowed.has(key))
+            reportDataField(ctx, 'graph', key, 'is not supported', offset, lineNumber, line);
+    }
+    if (value.name !== undefined) {
+        if (typeof value.name === 'string')
+            header.name = value.name;
+        else
+            reportDataField(ctx, 'graph', 'name', 'must be a string', offset, lineNumber, line);
+    }
+    if (value.metadata !== undefined) {
+        if (isGraphMetadata(value.metadata))
+            header.metadata = value.metadata;
+        else
+            reportDataField(ctx, 'graph', 'metadata', 'has the wrong shape', offset, lineNumber, line);
+    }
+    if (value.layoutOptions !== undefined) {
+        if (isLayoutOptions(value.layoutOptions))
+            header.layoutOptions = value.layoutOptions;
+        else
+            reportDataField(ctx, 'graph', 'layoutOptions', 'has the wrong shape', offset, lineNumber, line);
+    }
+    ctx.graphHeader = header;
+}
+function parseJsonObject(raw) {
+    try {
+        const value = JSON.parse(raw);
+        return isPlainObject(value) ? value : null;
+    }
+    catch {
+        return null;
+    }
+}
+function reportDataField(ctx, kind, field, reason, _offset, lineNumber, source) {
+    const fieldParts = field.split('.');
+    const leafField = fieldParts[fieldParts.length - 1] ?? field;
+    const quotedField = `"${leafField}"`;
+    const rangeSource = source.includes(quotedField) ? quotedField : leafField;
+    const anchor = source.includes(' data ') ? ' data ' : source.startsWith('@graph') ? '@graph' : undefined;
+    report(ctx, 'warning', `coral.${kind}.data-field.unsupported`, `${field} ${reason}`, tokenPosition(ctx, lineNumber, rangeSource, anchor, true), source, rangeSource);
+}
 function parseNodeDeclaration(line, ctx, offset, lineNumber) {
-    // Match: node_type "label" [as id] [{ ...]
+    // Match: type label [as id] [@ (x,y)] [pinned] [data object] [{ ...]
     const NUM = '-?\\d+(?:\\.\\d+)?';
-    const nodeRegex = new RegExp('^([A-Za-z_][\\w-]*)\\s+"((?:[^"\\\\]|\\\\.)*)"' +
+    const nodeRegex = new RegExp('^(?:"((?:[^"\\\\]|\\\\.)*)"|([A-Za-z_][\\w-]*))\\s+"((?:[^"\\\\]|\\\\.)*)"' +
         '(?:\\s+as\\s+(?:"((?:[^"\\\\]|\\\\.)*)"|([A-Za-z_][A-Za-z0-9_]*)))?' +
         `(?:\\s*@\\s*\\(\\s*(${NUM})\\s*,\\s*(${NUM})\\s*\\))?` +
         '(\\s+pinned)?' +
+        '(?:\\s+data\\s+(.+?))?' +
         '(\\s*\\{\\s*\\}|\\s*\\{)?$');
     const match = line.match(nodeRegex);
     if (!match) {
         return null;
     }
-    const nodeType = match[1];
-    const label = unescapeString(match[2]);
-    const explicitId = match[3] !== undefined ? unescapeString(match[3]) : match[4];
-    const posX = match[5];
-    const posY = match[6];
-    const isPinned = match[7] !== undefined;
+    const nodeType = match[1] !== undefined ? unescapeString(match[1]) : match[2];
+    if (nodeType.length === 0) {
+        report(ctx, 'error', 'coral.node.type.unparsed', 'Node type must not be empty', tokenPosition(ctx, lineNumber, '""'), line, '""');
+        return null;
+    }
+    const label = unescapeString(match[3]);
+    const explicitId = match[4] !== undefined ? unescapeString(match[4]) : match[5];
+    const explicitIdToken = match[4] !== undefined ? `"${match[4]}"` : match[5];
+    const posX = match[6];
+    const posY = match[7];
+    const isPinned = match[8] !== undefined;
+    const rawData = match[9];
     let id;
     if (explicitId === '') {
-        report(ctx, 'warning', 'coral.node.id.degraded', 'An empty id clause cannot be honoured; the id was derived from the label instead', { line: lineNumber, column: 0, offset }, line);
+        report(ctx, 'warning', 'coral.node.id.degraded', 'An empty id clause cannot be honoured; the id was derived from the label instead', tokenPosition(ctx, lineNumber, explicitIdToken ?? '""', ' as '), line, explicitIdToken ?? '""');
         id = ctx.nodeIds.allocateFromLabel(label);
     }
     else if (explicitId !== undefined) {
@@ -161,7 +340,7 @@ function parseNodeDeclaration(line, ctx, offset, lineNumber) {
         else {
             // The id is already spoken for, so the reservation cannot be honoured.
             id = ctx.nodeIds.allocateFromLabel(label);
-            report(ctx, 'warning', 'coral.node.id.degraded', `Node id "${explicitId}" is already in use; this declaration was given "${id}"`, { line: lineNumber, column: 0, offset }, line);
+            report(ctx, 'warning', 'coral.node.id.degraded', `Node id "${explicitId}" is already in use; this declaration was given "${id}"`, tokenPosition(ctx, lineNumber, explicitIdToken, ' as '), line, explicitIdToken);
         }
     }
     else {
@@ -179,18 +358,116 @@ function parseNodeDeclaration(line, ctx, offset, lineNumber) {
     if (isPinned) {
         node.pinned = true;
     }
+    if (rawData !== undefined)
+        applyNodeData(node, rawData.trim(), ctx, offset, lineNumber, line);
     if (ctx.includeSourceInfo) {
         node.sourceInfo = {
-            range: {
-                start: offset,
-                end: offset + line.length,
-                startPosition: { line: lineNumber, column: 0 },
-                endPosition: { line: lineNumber, column: line.length },
-            },
+            range: exactLineRange(ctx, line, offset, lineNumber),
         };
     }
     return node;
 }
+function applyNodeData(node, raw, ctx, offset, lineNumber, source) {
+    const data = parseJsonObject(raw);
+    if (!data) {
+        report(ctx, 'error', 'coral.node.data.unparsed', 'Node data must be a JSON object', tokenPosition(ctx, lineNumber, raw, ' data '), source, raw);
+        return;
+    }
+    const allowed = new Set(['description', 'dimensions', 'layoutOptions', 'ports', 'symbol', 'variant']);
+    for (const [key, value] of Object.entries(data)) {
+        if (!allowed.has(key)) {
+            reportDataField(ctx, 'node', key, 'is not supported', offset, lineNumber, source);
+            continue;
+        }
+        const valid = ((key === 'description' || key === 'symbol' || key === 'variant') && typeof value === 'string') ||
+            (key === 'dimensions' && isDimensions(value)) ||
+            (key === 'layoutOptions' && isNodeLayoutOptions(value)) ||
+            (key === 'ports' && isPorts(value));
+        if (!valid) {
+            reportDataField(ctx, 'node', key, 'has the wrong shape', offset, lineNumber, source);
+            continue;
+        }
+        node[key] = value;
+    }
+}
+function isDimensions(value) {
+    return isPlainObject(value) && typeof value.width === 'number' && Number.isFinite(value.width) &&
+        value.width >= 0 && typeof value.height === 'number' && Number.isFinite(value.height) && value.height >= 0 &&
+        hasOnlyKeys(value, ['width', 'height']);
+}
+function hasOnlyKeys(value, allowed) {
+    return Object.keys(value).every((key) => allowed.includes(key));
+}
+function optionalEnum(value, choices) {
+    return value === undefined || (typeof value === 'string' && choices.includes(value));
+}
+function optionalNonNegative(value) {
+    return value === undefined || (typeof value === 'number' && Number.isFinite(value) && value >= 0);
+}
+function isGraphMetadata(value) {
+    if (!isPlainObject(value) || !hasOnlyKeys(value, ['author', 'created', 'modified', 'description', 'tags', 'notation', 'custom']))
+        return false;
+    for (const key of ['author', 'created', 'modified', 'description', 'notation']) {
+        if (value[key] !== undefined && typeof value[key] !== 'string')
+            return false;
+    }
+    if (value.tags !== undefined && (!Array.isArray(value.tags) || !value.tags.every((tag) => typeof tag === 'string')))
+        return false;
+    return value.custom === undefined || (isPlainObject(value.custom) && isJsonSafe(value.custom));
+}
+function isLayoutOptions(value) {
+    if (!isPlainObject(value) || !hasOnlyKeys(value, ['algorithm', 'direction', 'spacing', 'edgeRouting', 'hierarchyHandling', 'algorithmOptions']))
+        return false;
+    if (!optionalEnum(value.algorithm, ['layered', 'force', 'radial', 'tree', 'fixed']))
+        return false;
+    if (!optionalEnum(value.direction, ['DOWN', 'UP', 'LEFT', 'RIGHT']))
+        return false;
+    if (!optionalEnum(value.edgeRouting, ['orthogonal', 'polyline', 'spline']))
+        return false;
+    if (!optionalEnum(value.hierarchyHandling, ['INCLUDE_CHILDREN', 'SEPARATE_CHILDREN']))
+        return false;
+    if (value.spacing !== undefined) {
+        if (!isPlainObject(value.spacing) || !hasOnlyKeys(value.spacing, ['nodeNode', 'nodeEdge', 'edgeEdge', 'layerSpacing']))
+            return false;
+        const spacing = value.spacing;
+        if (!['nodeNode', 'nodeEdge', 'edgeEdge', 'layerSpacing'].every((key) => optionalNonNegative(spacing[key])))
+            return false;
+    }
+    if (value.algorithmOptions !== undefined) {
+        if (!isPlainObject(value.algorithmOptions) || !Object.values(value.algorithmOptions).every((item) => typeof item === 'string' || typeof item === 'boolean' || (typeof item === 'number' && Number.isFinite(item))))
+            return false;
+    }
+    return true;
+}
+function isNodeLayoutOptions(value) {
+    if (!isPlainObject(value) || !hasOnlyKeys(value, ['portConstraints', 'portAlignment', 'sizeConstraints', 'minimumSize', 'padding']))
+        return false;
+    if (!optionalEnum(value.portConstraints, ['FREE', 'FIXED_SIDE', 'FIXED_ORDER', 'FIXED_POS']))
+        return false;
+    if (!optionalEnum(value.portAlignment, ['BEGIN', 'CENTER', 'END', 'JUSTIFIED']))
+        return false;
+    if (value.sizeConstraints !== undefined && (!Array.isArray(value.sizeConstraints) || !value.sizeConstraints.every((item) => typeof item === 'string' && ['MINIMUM_SIZE', 'NODE_LABELS', 'PORTS'].includes(item))))
+        return false;
+    if (value.minimumSize !== undefined && !isDimensions(value.minimumSize))
+        return false;
+    if (value.padding !== undefined) {
+        if (!isPlainObject(value.padding) || !hasOnlyKeys(value.padding, ['top', 'right', 'bottom', 'left']))
+            return false;
+        const padding = value.padding;
+        if (!['top', 'right', 'bottom', 'left'].every((key) => optionalNonNegative(padding[key])))
+            return false;
+    }
+    return true;
+}
+function isPorts(value) {
+    const sides = new Set(['NORTH', 'SOUTH', 'EAST', 'WEST']);
+    return Array.isArray(value) && value.every((port) => isPlainObject(port) &&
+        hasOnlyKeys(port, ['id', 'side', 'label', 'position', 'properties']) &&
+        typeof port.id === 'string' && port.id.length > 0 && typeof port.side === 'string' && sides.has(port.side) &&
+        (port.label === undefined || typeof port.label === 'string') &&
+        (port.position === undefined || (typeof port.position === 'number' && Number.isFinite(port.position) && port.position >= 0 && port.position <= 1)) &&
+        (port.properties === undefined || (isPlainObject(port.properties) && isJsonSafe(port.properties))));
+}
 function parseProperty(line) {
     // Match: key: "value" (string), key: 123 (number), key: true/false (boolean)
     const keyMatch = line.match(/^(?:"((?:[^"\\]|\\.)*)"|([a-zA-Z_][a-zA-Z0-9_]*))\s*:\s*/);
@@ -250,6 +527,18 @@ function parseProperty(line) {
         return { key, value: true };
     if (rest === 'false')
         return { key, value: false };
+    if (rest === 'null')
+        return { key, value: null };
+    if (rest.startsWith('[') || rest.startsWith('{')) {
+        try {
+            const value = JSON.parse(rest);
+            if (isJsonSafe(value))
+                return { key, value };
+        }
+        catch {
+            // Fall through to the ordinary invalid-property path.
+        }
+    }
     // Try number. The pattern must accept everything String(n) can emit for a
     // finite number, including exponent form such as 1e-7 and 1e+21.
     if (/^-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?$/.test(rest)) {
@@ -260,18 +549,34 @@ function parseProperty(line) {
     return null;
 }
 function parseEdgeDeclaration(line, ctx, offset, lineNumber) {
-    // Match: source -> target [type, attr = "value"]
+    // Match: source -> target [as id] [attributes] [data object] [via points]
     const ENDPOINT = '(?:"((?:[^"\\\\]|\\\\.)*)"|([A-Za-z_][A-Za-z0-9_]*))';
-    const edgeRegex = new RegExp(`^${ENDPOINT}\\s*->\\s*${ENDPOINT}(?:\\s*\\[(.+?)\\])?((?:\\s+via(?:\\s*\\(\\s*-?\\d+(?:\\.\\d+)?\\s*,\\s*-?\\d+(?:\\.\\d+)?\\s*\\))+)?)$`);
+    const edgeRegex = new RegExp(`^${ENDPOINT}\\s*->\\s*${ENDPOINT}` +
+        '(?:\\s+as\\s+(?:"((?:[^"\\\\]|\\\\.)*)"|([A-Za-z_][A-Za-z0-9_]*)))?' +
+        '(?:\\s*\\[(.+?)\\])?' +
+        '(?:\\s+data\\s+(.+?))?' +
+        `((?:\\s+via(?:\\s*\\(\\s*-?\\d+(?:\\.\\d+)?\\s*,\\s*-?\\d+(?:\\.\\d+)?\\s*\\))+)?)$`);
     const match = line.match(edgeRegex);
     if (!match) {
         return null;
     }
     const source = match[1] !== undefined ? unescapeString(match[1]) : match[2];
     const target = match[3] !== undefined ? unescapeString(match[3]) : match[4];
-    const attributes = match[5];
-    const waypointClause = match[6];
-    const edgeId = allocateEdgeId(source, target, ctx.edgeIds);
+    const explicitId = match[5] !== undefined ? unescapeString(match[5]) : match[6];
+    const explicitIdToken = match[5] !== undefined ? `"${match[5]}"` : match[6];
+    const attributes = match[7];
+    const rawData = match[8];
+    const waypointClause = match[9];
+    let edgeId;
+    if (explicitId !== undefined && ctx.edgeIds.reserve(explicitId)) {
+        edgeId = explicitId;
+    }
+    else {
+        edgeId = allocateEdgeId(source, target, ctx.edgeIds);
+        if (explicitId !== undefined) {
+            report(ctx, 'warning', 'coral.edge.id.degraded', explicitId === '' ? `An empty edge id was replaced with "${edgeId}"` : `Edge id "${explicitId}" is already in use; this edge was given "${edgeId}"`, tokenPosition(ctx, lineNumber, explicitIdToken, ' as '), line, explicitIdToken);
+        }
+    }
     const edge = {
         id: edgeId,
         source,
@@ -302,7 +607,7 @@ function parseEdgeDeclaration(line, ctx, offset, lineNumber) {
             }
             // Reserved for internal use; dropped on both sides (R-009 AC-7).
             if (attr.key.startsWith('_')) {
-                report(ctx, 'info', 'coral.edge.reserved-key.dropped', `Attribute key "${attr.key}" is reserved for internal use and is not stored`, { line: lineNumber, column: 0, offset }, line);
+                report(ctx, 'info', 'coral.edge.reserved-key.dropped', `Attribute key "${attr.key}" is reserved for internal use and is not stored`, tokenPosition(ctx, lineNumber, attr.key, '['), line, attr.key);
                 continue;
             }
             if (!edge.properties)
@@ -310,6 +615,8 @@ function parseEdgeDeclaration(line, ctx, offset, lineNumber) {
             edge.properties[attr.key] = attr.value;
         }
     }
+    if (rawData !== undefined)
+        applyEdgeData(edge, rawData.trim(), ctx, offset, lineNumber, line);
     // Waypoints follow the attributes (R-018).
     if (waypointClause) {
         const points = [];
@@ -324,16 +631,74 @@ function parseEdgeDeclaration(line, ctx, offset, lineNumber) {
     }
     if (ctx.includeSourceInfo) {
         edge.sourceInfo = {
-            range: {
-                start: offset,
-                end: offset + line.length,
-                startPosition: { line: lineNumber, column: 0 },
-                endPosition: { line: lineNumber, column: line.length },
-            },
+            range: exactLineRange(ctx, line, offset, lineNumber),
         };
     }
     return edge;
 }
+function applyEdgeData(edge, raw, ctx, offset, lineNumber, source) {
+    const data = parseJsonObject(raw);
+    if (!data) {
+        report(ctx, 'error', 'coral.edge.data.unparsed', 'Edge data must be a JSON object', tokenPosition(ctx, lineNumber, raw, ' data '), source, raw);
+        return;
+    }
+    const allowed = new Set(['sourcePort', 'targetPort', 'style', 'properties']);
+    for (const [key, value] of Object.entries(data)) {
+        if (!allowed.has(key)) {
+            reportDataField(ctx, 'edge', key, 'is not supported', offset, lineNumber, source);
+            continue;
+        }
+        if (key === 'sourcePort' || key === 'targetPort') {
+            if (typeof value === 'string')
+                edge[key] = value;
+            else
+                reportDataField(ctx, 'edge', key, 'must be a string', offset, lineNumber, source);
+            continue;
+        }
+        if (key === 'style') {
+            if (!isPlainObject(value)) {
+                reportDataField(ctx, 'edge', key, 'must be an object', offset, lineNumber, source);
+                continue;
+            }
+            const style = {};
+            const enums = {
+                sourceArrow: new Set(['arrow', 'diamond', 'circle', 'none']),
+                targetArrow: new Set(['arrow', 'diamond', 'circle', 'none']),
+                routing: new Set(['orthogonal', 'polyline', 'spline']),
+            };
+            for (const [styleKey, styleValue] of Object.entries(value)) {
+                if (styleKey === 'lineStyle' || !enums[styleKey]?.has(String(styleValue))) {
+                    reportDataField(ctx, 'edge', `style.${styleKey}`, 'is not supported here', offset, lineNumber, source);
+                }
+                else {
+                    style[styleKey] = styleValue;
+                }
+            }
+            if (Object.keys(style).length > 0)
+                edge.style = { ...edge.style, ...style };
+            continue;
+        }
+        if (!isPlainObject(value) || !isJsonSafe(value)) {
+            reportDataField(ctx, 'edge', 'properties', 'must be a JSON object', offset, lineNumber, source);
+            continue;
+        }
+        if (!edge.properties)
+            edge.properties = {};
+        for (const [propertyKey, propertyValue] of Object.entries(value)) {
+            if (propertyKey.startsWith('_')) {
+                const keyToken = source.includes(`"${propertyKey}"`) ? `"${propertyKey}"` : propertyKey;
+                report(ctx, 'info', 'coral.edge.reserved-key.dropped', `Attribute key "${propertyKey}" is reserved for internal use and is not stored`, tokenPosition(ctx, lineNumber, keyToken, ' data '), source, keyToken);
+            }
+            else if (Object.prototype.hasOwnProperty.call(edge.properties, propertyKey)) {
+                const keyToken = source.includes(`"${propertyKey}"`) ? `"${propertyKey}"` : propertyKey;
+                report(ctx, 'warning', 'coral.edge.property.degraded', `Structured property "${propertyKey}" conflicts with a readable attribute and was ignored`, tokenPosition(ctx, lineNumber, keyToken, ' data '), source, keyToken);
+            }
+            else {
+                edge.properties[propertyKey] = propertyValue;
+            }
+        }
+    }
+}
 /**
  * Scan an edge attribute list.
  *