dot-language-support 2.2.2 → 2.2.4

package/.github/workflows/CD.yml

@@ -17,15 +17,18 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        show-progress: false
 
     - uses: actions/setup-node@v4
       with:
-        node-version: 20
+        node-version: 23
         cache: npm
         registry-url: https://registry.npmjs.org
 
     - run: npm ci
-    - run: npm run compile
+    - run: npm run ci
+    - run: npm run build
     - run: npm test
       env:
         CI: true

package/.github/workflows/CI.yml

@@ -8,10 +8,12 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x, 21.x]
+        node-version: [20.x, 21.x, 22.x, 23.x]
 
     steps:
     - uses: actions/checkout@v4
+      with:
+        show-progress: false
 
     - uses: actions/setup-node@v4
       with:
@@ -19,7 +21,8 @@ jobs:
         cache: npm
 
     - run: npm ci
-    - run: npm run compile
+    - run: npm run ci
+    - run: npm run build
     - run: npm test
       env:
         CI: true

package/.github/workflows/auto-merge.yaml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - id: metadata
-        uses: dependabot/fetch-metadata@v1
+        uses: dependabot/fetch-metadata@v2
 
       - name: Enable auto-merge for Dependabot PRs
         if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-patch' }}

package/biome.json

@@ -0,0 +1,50 @@
+{
+	"$schema": "https://biomejs.dev/schemas/1.5.0/schema.json",
+	"formatter": {
+		"enabled": true,
+		"indentWidth": 4,
+		"indentStyle": "tab",
+		"lineWidth": 100
+	},
+	"vcs": {
+		"enabled": true,
+		"clientKind": "git",
+		"defaultBranch": "master",
+		"root": "."
+	},
+	"linter": {
+		"enabled": true,
+		"rules": {
+			"recommended": true,
+			"suspicious": {
+				"noConstEnum": "off",
+				"noDebugger": "off"
+			},
+			"correctness": {
+				"noVoidTypeReturn": "off"
+			}
+		}
+	},
+	"javascript": {
+		"formatter": {
+			"arrowParentheses": "asNeeded"
+		}
+	},
+	"overrides": [
+		{
+			"include": [
+				"src/scanner.ts"
+			],
+			"linter": {
+				"rules": {
+					"suspicious": {
+						"noAssignInExpressions": "off"
+					},
+					"style": {
+						"noParameterAssign": "off"
+					}
+				}
+			}
+		}
+	]
+}

package/lib/cjs/binder.d.ts

@@ -1,2 +1,2 @@
-import { SourceFile } from "./types.js";
+import { type SourceFile } from "./types.js";
 export declare function bindSourceFile(file: SourceFile): void;

package/lib/cjs/binder.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bindSourceFile = void 0;
-const types_js_1 = require("./types.js");
+exports.bindSourceFile = bindSourceFile;
 const checker_js_1 = require("./checker.js");
 const parser_js_1 = require("./parser.js");
+const types_js_1 = require("./types.js");
 const binder = createBinder();
 function bindSourceFile(file) {
     binder.bind(file);
 }
-exports.bindSourceFile = bindSourceFile;
 function createBinder() {
     let parent = undefined;
     let symbolTable = undefined;
@@ -78,7 +77,6 @@ function createBinder() {
             ensureGlobalSymbol(node.id);
             bind(node.id);
         }
-        ;
         if (node.strict)
             bind(node.strict);
         bindChildren(node.statements);
@@ -106,7 +104,6 @@ function createBinder() {
         if (node.id) {
             bind(node.id);
         }
-        ;
         bindChildren(node.statements);
     }
     function bindSubGraphStatement(node) {

package/lib/cjs/checker.d.ts

@@ -1,4 +1,4 @@
-import { SyntaxNode, Identifier, SyntaxKind, Graph, EdgeStatement, EdgeRhs, SourceFile, SubGraphStatement, NodeId, AttributeStatement, Statement, StatementOf, Token } from "./types.js";
+import { type AttributeStatement, type EdgeRhs, type EdgeStatement, type Graph, type Identifier, type NodeId, type SourceFile, type Statement, type StatementOf, type SubGraphStatement, SyntaxKind, type SyntaxNode, type Token } from "./types.js";
 export declare function checkSourceFile(file: SourceFile): void;
 export declare function findNodeAtOffset(root: SyntaxNode, offset: number, inclusiveEnd?: boolean): SyntaxNode | undefined;
 export declare function getAllowedEdgeOperation(graph: Graph): SyntaxKind.DirectedEdgeOp | SyntaxKind.UndirectedEdgeOp;

package/lib/cjs/checker.js

@@ -1,10 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nodeContainsErrors = exports.getIdentifierText = exports.edgeStatementHasAttributes = exports.isNodeId = exports.isSubGraphStatement = exports.isEdgeStatement = exports.isAttrStatement = exports.findAllStatements = exports.findOptionalSemicolons = exports.findAllEdges = exports.getAllowedEdgeOperation = exports.findNodeAtOffset = exports.checkSourceFile = void 0;
-const types_js_1 = require("./types.js");
+exports.checkSourceFile = checkSourceFile;
+exports.findNodeAtOffset = findNodeAtOffset;
+exports.getAllowedEdgeOperation = getAllowedEdgeOperation;
+exports.findAllEdges = findAllEdges;
+exports.findOptionalSemicolons = findOptionalSemicolons;
+exports.findAllStatements = findAllStatements;
+exports.isAttrStatement = isAttrStatement;
+exports.isEdgeStatement = isEdgeStatement;
+exports.isSubGraphStatement = isSubGraphStatement;
+exports.isNodeId = isNodeId;
+exports.edgeStatementHasAttributes = edgeStatementHasAttributes;
+exports.getIdentifierText = getIdentifierText;
+exports.nodeContainsErrors = nodeContainsErrors;
+const languageFacts_js_1 = require("./service/languageFacts.js");
 const util_js_1 = require("./service/util.js");
+const types_js_1 = require("./types.js");
 const visitor_js_1 = require("./visitor.js");
-const languageFacts_js_1 = require("./service/languageFacts.js");
 function checkSourceFile(file) {
     const g = file.graph;
     if (g) {
@@ -14,11 +26,10 @@ function checkSourceFile(file) {
         }
     }
 }
-exports.checkSourceFile = checkSourceFile;
 function getNarrowerNode(offset, prev, toCheck) {
     const prevRange = prev.end - prev.pos;
     if (toCheck.pos <= offset && offset <= toCheck.end) {
-        let nrange = toCheck.end - toCheck.pos;
+        const nrange = toCheck.end - toCheck.pos;
         if (nrange < prevRange) {
             return toCheck;
         }
@@ -39,18 +50,16 @@ function findNodeAtOffset(root, offset, inclusiveEnd = false) {
     }
     return undefined;
 }
-exports.findNodeAtOffset = findNodeAtOffset;
 function getAllowedEdgeOperation(graph) {
     return graph.kind === types_js_1.SyntaxKind.DirectedGraph
         ? types_js_1.SyntaxKind.DirectedEdgeOp
         : types_js_1.SyntaxKind.UndirectedEdgeOp;
 }
-exports.getAllowedEdgeOperation = getAllowedEdgeOperation;
 function checkGraphSemantics(file, root) {
     const expectedEdgeOp = getAllowedEdgeOperation(root);
     const invalidEdgeRhses = findEdgeErrors(expectedEdgeOp, root);
     const invalidShapes = checkShapeLabelValues(root);
-    const invalidEdgeDiagnostics = invalidEdgeRhses == undefined || invalidEdgeRhses.length === 0
+    const invalidEdgeDiagnostics = invalidEdgeRhses === undefined || invalidEdgeRhses.length === 0
         ? []
         : createEdgeViolationDiagnostics(file, expectedEdgeOp, invalidEdgeRhses);
     return [...invalidEdgeDiagnostics, ...invalidShapes];
@@ -68,7 +77,8 @@ function checkShapeLabelValues(root) {
     const invalidShapes = [];
     forEachAssignmentTransitive(root, assignment => {
         const { leftId, rightId } = assignment;
-        if (leftId.kind !== types_js_1.SyntaxKind.TextIdentifier || rightId.kind !== types_js_1.SyntaxKind.TextIdentifier) {
+        if (leftId.kind !== types_js_1.SyntaxKind.TextIdentifier ||
+            rightId.kind !== types_js_1.SyntaxKind.TextIdentifier) {
             return;
         }
         const leftText = leftId.text.trim();
@@ -105,24 +115,22 @@ function findAllEdges(node) {
     });
     return allEdges;
 }
-exports.findAllEdges = findAllEdges;
 function findOptionalSemicolons(node) {
     const statements = findAllStatements(node);
     const terminators = statements.map(p => p.terminator);
     return terminators.filter(t => !!t);
 }
-exports.findOptionalSemicolons = findOptionalSemicolons;
 function isStatement(node) {
-    return node.kind === types_js_1.SyntaxKind.SubGraphStatement
-        || node.kind === types_js_1.SyntaxKind.EdgeStatement
-        || node.kind === types_js_1.SyntaxKind.NodeStatement
-        || node.kind === types_js_1.SyntaxKind.IdEqualsIdStatement
-        || node.kind === types_js_1.SyntaxKind.AttributeStatement;
+    return (node.kind === types_js_1.SyntaxKind.SubGraphStatement ||
+        node.kind === types_js_1.SyntaxKind.EdgeStatement ||
+        node.kind === types_js_1.SyntaxKind.NodeStatement ||
+        node.kind === types_js_1.SyntaxKind.IdEqualsIdStatement ||
+        node.kind === types_js_1.SyntaxKind.AttributeStatement);
 }
 function findAllStatements(node, kind) {
     const allStatements = [];
     (0, visitor_js_1.forEachChild)(node, child => {
-        if ((kind === undefined && isStatement(child)) || (child.kind === kind)) {
+        if ((kind === undefined && isStatement(child)) || child.kind === kind) {
             allStatements.push(child);
         }
         const childStatements = findAllStatements(child, kind);
@@ -131,14 +139,15 @@ function findAllStatements(node, kind) {
     });
     return allStatements;
 }
-exports.findAllStatements = findAllStatements;
 function findEdgeErrors(expectedEdgeOp, node) {
     const edges = findAllEdges(node);
     const wrongEdges = edges && edges.length > 0
         ? edges.filter(e => e.operation.kind !== expectedEdgeOp)
         : undefined;
     if (wrongEdges && wrongEdges.length > 0) {
-        wrongEdges.forEach(e => e.operation.flags |= 2);
+        for (const edge of wrongEdges) {
+            edge.operation.flags |= 2;
+        }
         return wrongEdges;
     }
     return undefined;
@@ -149,7 +158,9 @@ function createEdgeViolationDiagnostics(file, expectedEdgeOp, violators) {
     const message = `Invalid edge operation, use "${op}" in ${graphType} graph`;
     const code = createCheckerError(0);
     const category = types_js_1.DiagnosticCategory.Error;
-    violators.forEach(edge => edge.operation.flags |= 2);
+    for (const edge of violators) {
+        edge.operation.flags |= 2;
+    }
     return violators.map(edge => {
         const start = (0, util_js_1.getStart)(file, edge.operation);
         const end = edge.operation.end;
@@ -173,28 +184,23 @@ function getInvalidEdgeRhs(allowedOp, edges) {
 function isAttrStatement(node) {
     return node.kind === types_js_1.SyntaxKind.AttributeStatement;
 }
-exports.isAttrStatement = isAttrStatement;
 function isEdgeStatement(node) {
     return node.kind === types_js_1.SyntaxKind.EdgeStatement;
 }
-exports.isEdgeStatement = isEdgeStatement;
 function isSubGraphStatement(node) {
     return node.kind === types_js_1.SyntaxKind.SubGraphStatement;
 }
-exports.isSubGraphStatement = isSubGraphStatement;
 function isGraph(node) {
     return node.kind === types_js_1.SyntaxKind.DirectedGraph || node.kind === types_js_1.SyntaxKind.UndirectedGraph;
 }
 function isNodeId(node) {
     return node.kind === types_js_1.SyntaxKind.NodeId;
 }
-exports.isNodeId = isNodeId;
 function edgeStatementHasAttributes(es) {
-    return es.attributes
-        && es.attributes.length > 0
-        && es.attributes.some(a => a.assignments && a.assignments.length > 0);
+    return (es.attributes &&
+        es.attributes.length > 0 &&
+        es.attributes.some(a => a.assignments && a.assignments.length > 0));
 }
-exports.edgeStatementHasAttributes = edgeStatementHasAttributes;
 function getIdentifierText(n) {
     switch (n.kind) {
         case types_js_1.SyntaxKind.HtmlIdentifier:
@@ -209,7 +215,6 @@ function getIdentifierText(n) {
             return (0, util_js_1.assertNever)(n);
     }
 }
-exports.getIdentifierText = getIdentifierText;
 function createCheckerError(sub) {
     return {
         source: 4,
@@ -219,5 +224,4 @@ function createCheckerError(sub) {
 function nodeContainsErrors(node) {
     return (node.flags & 2) === 2;
 }
-exports.nodeContainsErrors = nodeContainsErrors;
 //# sourceMappingURL=checker.js.map

package/lib/cjs/core.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMapFromTemplate = void 0;
+exports.createMapFromTemplate = createMapFromTemplate;
 function createMapFromTemplate(template) {
     const map = new Map();
     for (const key in template) {
-        if (template.hasOwnProperty(key)) {
+        if (key in template) {
             map.set(key, template[key]);
         }
     }
     return map;
 }
-exports.createMapFromTemplate = createMapFromTemplate;
 //# sourceMappingURL=core.js.map

package/lib/cjs/error.js

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatError = exports.diagnosicSource = void 0;
+exports.diagnosicSource = void 0;
+exports.formatError = formatError;
 exports.diagnosicSource = "DOT";
 const errorCodeLength = 4;
 const subErrorCodeLength = errorCodeLength - 1;
 function formatError(error) {
-    const subCode = (error.sub | 0)
-        .toString()
-        .padStart(subErrorCodeLength, "0");
+    const subCode = (error.sub | 0).toString().padStart(subErrorCodeLength, "0");
     return exports.diagnosicSource + error.source + subCode;
 }
-exports.formatError = formatError;
 //# sourceMappingURL=error.js.map

package/lib/cjs/parser.d.ts

@@ -1,5 +1,5 @@
-import { Scanner } from "./scanner.js";
-import { SyntaxKind, SourceFile, Identifier, SyntaxNode, DiagnosticMessage } from "./types";
+import { type Scanner } from "./scanner.js";
+import { type DiagnosticMessage, type Identifier, type SourceFile, SyntaxKind, type SyntaxNode } from "./types";
 export declare enum ParsingContext {
     None = 0,
     StatementList = 1,
@@ -10,6 +10,7 @@ export declare enum ParsingContext {
     Count = 6
 }
 export declare class Parser {
+    #private;
     currentToken: SyntaxKind;
     nodeCount: number;
     identifiers: Set<string>;
@@ -20,65 +21,7 @@ export declare class Parser {
     currentContext: ParsingContext;
     diagnostics: DiagnosticMessage[];
     constructor();
-    private resetState;
-    private nextToken;
-    private token;
-    private getLinesFromFile;
     parse(sourceText: string): SourceFile;
-    private parseGraph;
-    private parseIdentifier;
-    private registerIdentifier;
-    private parseTextIdentifier;
-    private parseQuotedTextIdentifierConcatenation;
-    private parseQuotedTextIdentifier;
-    private isQuotedStringFollowing;
-    private parseHtmlIdentifier;
-    private parseNumericIdentifier;
-    private parseStatement;
-    private parseAttributeStatement;
-    private parseAttributeContainer;
-    private isAssignmentStart;
-    private parseIdEqualsIdStatement;
-    private isIdEqualsIdStatement;
-    private parseNodeStatement;
-    private parseEdgeStatement;
-    private parseEdgeRhs;
-    private createMissingNode;
-    private parseAssignment;
-    private parseSubGraph;
-    private parseNodeId;
-    private parseCompassPortDeclaration;
-    private parseNormalPortDeclaration;
-    private parsePortDeclaration;
-    private isCompassPort;
-    private parseList;
-    private getContextParseError;
-    private isInSomeParsingContext;
-    private abortListParsing;
-    private isListElement;
-    private isListTerminator;
-    private createEmptyArray;
-    private finishNode;
-    private createNode;
-    private createNodeArray;
-    private parseTokenNode;
-    private getLastError;
-    private parseErrorAtPosition;
-    private parseErrorAtCurrentToken;
-    private scanError;
-    private reportExpectedError;
-    private parseExpectedOneOf;
-    private parseExpectedTokenOneOf;
-    private parseExpectedToken;
-    private parseExpected;
-    private parseOptionalToken;
-    private parseOptional;
-    private isEdgeOp;
-    private isIdentifier;
-    private isCompassPortKind;
-    private speculationHelper;
-    private lookAhead;
-    private tryParse;
 }
-export declare function isIdentifier(kind: SyntaxKind): boolean;
+export declare function isIdentifier(kind: SyntaxKind): kind is SyntaxKind.HtmlIdentifier | SyntaxKind.TextIdentifier | SyntaxKind.QuotedTextIdentifier | SyntaxKind.NumericIdentifier;
 export declare function isIdentifierNode(node: SyntaxNode): node is Identifier;