dot-language-support 2.2.1 → 2.2.3

package/lib/esm/service/rename.js

@@ -1,7 +1,7 @@
 import { TextEdit } from "vscode-languageserver-types";
-import { SyntaxKind } from "../types.js";
 import { findNodeAtOffset } from "../checker.js";
 import { isIdentifierNode } from "../index.js";
+import { SyntaxKind } from "../types.js";
 import { syntaxNodesToRanges } from "./util.js";
 export function renameSymbol(doc, sourceFile, position, newName) {
     if (!sourceFile.symbols)
@@ -16,7 +16,10 @@ export function renameSymbol(doc, sourceFile, position, newName) {
     if (!node)
         return undefined;
     const parent = node.parent;
-    if (isIdentifierNode(node) && isRenamableIdentifier(node) && !!parent && isRenameableNode(parent)) {
+    if (isIdentifierNode(node) &&
+        isRenamableIdentifier(node) &&
+        !!parent &&
+        isRenameableNode(parent)) {
         const nodeSymbol = node.symbol;
         if (!nodeSymbol)
             throw "node.symbol is not bound";
@@ -27,7 +30,7 @@ export function renameSymbol(doc, sourceFile, position, newName) {
         const res = {
             changes: {
                 [uri]: ranges.map(r => TextEdit.replace(r, newName)),
-            }
+            },
         };
         return res;
     }
@@ -35,9 +38,9 @@ export function renameSymbol(doc, sourceFile, position, newName) {
     return undefined;
 }
 function isRenameableNode(node) {
-    return node.kind === SyntaxKind.NodeId
-        || node.kind === SyntaxKind.DirectedGraph
-        || node.kind === SyntaxKind.UndirectedGraph;
+    return (node.kind === SyntaxKind.NodeId ||
+        node.kind === SyntaxKind.DirectedGraph ||
+        node.kind === SyntaxKind.UndirectedGraph);
 }
 function isRenamableIdentifier(node) {
     return node.kind !== SyntaxKind.QuotedTextIdentifier;

package/lib/esm/service/service.d.ts

@@ -1,7 +1,7 @@
-import type * as lst from "vscode-languageserver-types";
-import type { ColorInformation, Color, ColorPresentation } from "vscode-languageserver-types";
 import type { TextDocument } from "vscode-languageserver-textdocument";
-import { SourceFile, Omit } from "../types.js";
+import type * as lst from "vscode-languageserver-types";
+import type { Color, ColorInformation, ColorPresentation } from "vscode-languageserver-types";
+import type { Omit, SourceFile } from "../types.js";
 export interface DocumentLike {
     positionAt(offset: number): lst.Position;
     offsetAt(position: lst.Position): number;

package/lib/esm/service/service.js

@@ -1,13 +1,13 @@
-import { Parser } from "../index.js";
 import { bindSourceFile } from "../binder.js";
+import { checkSourceFile } from "../checker.js";
+import { Parser } from "../index.js";
+import { executeCommand, getAvailableCommands, getCodeActions } from "./codeAction.js";
+import { getColorRepresentations, getDocumentColors } from "./colorProvider.js";
+import { getCompletions } from "./completion.js";
 import { hover } from "./hover.js";
-import { validateDocument } from "./validation.js";
-import { findReferences, findDefinition } from "./reference.js";
+import { findDefinition, findReferences } from "./reference.js";
 import { renameSymbol } from "./rename.js";
-import { getCompletions } from "./completion.js";
-import { checkSourceFile } from "../checker.js";
-import { getCodeActions, executeCommand, getAvailableCommands } from "./codeAction.js";
-import { getDocumentColors, getColorRepresentations } from "./colorProvider.js";
+import { validateDocument } from "./validation.js";
 function parseDocument(doc) {
     const parser = new Parser();
     const content = typeof doc === "string" ? doc : doc.getText();

package/lib/esm/service/util.d.ts

@@ -1,6 +1,6 @@
 import type { Range } from "vscode-languageserver-types";
-import { SourceFile, SyntaxNode } from "../types.js";
 import type { DocumentLike } from "../index.js";
+import { type SourceFile, type SyntaxNode } from "../types.js";
 export declare function getStart(sourceFile: SourceFile, node: SyntaxNode): number;
 export declare function syntaxNodesToRanges(doc: DocumentLike, sourceFile: SourceFile, nodes: SyntaxNode[]): Range[];
 export declare function syntaxNodeToRange(doc: DocumentLike, sourceFile: SourceFile, node: SyntaxNode): {

package/lib/esm/service/util.js

@@ -1,5 +1,5 @@
+import { isIdentifierStart, skipTrivia } from "../scanner.js";
 import { SyntaxKind } from "../types.js";
-import { skipTrivia, isIdentifierStart } from "../scanner.js";
 export function getStart(sourceFile, node) {
     return getTokenPosOfNode(sourceFile, node);
 }
@@ -26,10 +26,8 @@ export function syntaxNodeToRange(doc, sourceFile, node) {
 export function escapeIdentifierText(text) {
     if (text === "")
         return quote("");
-    if (text.includes("\"") || text.includes("\n")) {
-        const esc = text
-            .replace(/"/, "\\\"")
-            .replace(/\n/, "\\\n");
+    if (text.includes('"') || text.includes("\n")) {
+        const esc = text.replace(/"/, '\\"').replace(/\n/, "\\\n");
         return quote(esc);
     }
     const ch = text.charCodeAt(0);
@@ -37,8 +35,8 @@ export function escapeIdentifierText(text) {
         return quote(text);
     return text;
 }
-const quote = (s) => "\"" + s + "\"";
+const quote = (s) => `"${s}"`;
 export function assertNever(v) {
-    throw new Error("Should not have reached this. Value: " + (v ?? ""));
+    throw new Error(`Should not have reached this. Value: ${v ?? ""}`);
 }
 //# sourceMappingURL=util.js.map

package/lib/esm/service/validation.d.ts

@@ -1,4 +1,4 @@
-import * as lst from "vscode-languageserver-types";
-import { SourceFile } from "../types.js";
-import { DocumentLike } from "../index.js";
+import type * as lst from "vscode-languageserver-types";
+import type { DocumentLike } from "../index.js";
+import type { SourceFile } from "../types.js";
 export declare function validateDocument(doc: DocumentLike, sourceFile: SourceFile): lst.Diagnostic[];

package/lib/esm/service/validation.js

@@ -1,4 +1,4 @@
-import { formatError, diagnosicSource } from "../error.js";
+import { diagnosicSource, formatError } from "../error.js";
 function convertDiagnostic(document, source) {
     return {
         range: {

package/lib/esm/tester.js

@@ -1,7 +1,7 @@
 import { TextDocument } from "vscode-languageserver-textdocument";
-import { Parser } from "./parser.js";
 import { bindSourceFile } from "./binder.js";
 import { checkSourceFile } from "./checker.js";
+import { Parser } from "./parser.js";
 import { getCompletions } from "./service/completion.js";
 const text = `graph {
 	node_name_a -- node_name_b [color=blue,

package/lib/esm/visitor.d.ts

@@ -1,2 +1,2 @@
-import { SyntaxNode, SyntaxNodeArray } from "./types.js";
+import { type SyntaxNode, type SyntaxNodeArray } from "./types.js";
 export declare function forEachChild<TReturn>(node: SyntaxNode, cbNode: (node: SyntaxNode) => TReturn, cbNodes?: (nodes: SyntaxNodeArray<SyntaxNode>) => TReturn): TReturn | undefined;

package/lib/esm/visitor.js

@@ -1,4 +1,4 @@
-import { SyntaxKind } from "./types.js";
+import { SyntaxKind, } from "./types.js";
 function visitNode(cbNode, node) {
     return node && cbNode(node);
 }
@@ -20,53 +20,52 @@ export function forEachChild(node, cbNode, cbNodes) {
     switch (node.kind) {
         case SyntaxKind.DirectedGraph:
         case SyntaxKind.UndirectedGraph:
-            return visitNodes(cbNode, cbNodes, node.statements)
-                || visitNode(cbNode, node.strict)
-                || visitNode(cbNode, node.id);
+            return (visitNodes(cbNode, cbNodes, node.statements) ||
+                visitNode(cbNode, node.strict) ||
+                visitNode(cbNode, node.id));
         case SyntaxKind.AttributeStatement:
-            return visitNodes(cbNode, cbNodes, node.attributes)
-                || visitNode(cbNode, node.subject)
-                || visitNode(cbNode, node.terminator);
+            return (visitNodes(cbNode, cbNodes, node.attributes) ||
+                visitNode(cbNode, node.subject) ||
+                visitNode(cbNode, node.terminator));
         case SyntaxKind.EdgeStatement:
-            return visitNodes(cbNode, cbNodes, node.attributes)
-                || visitNodes(cbNode, cbNodes, node.rhs)
-                || visitNode(cbNode, node.source)
-                || visitNode(cbNode, node.terminator);
+            return (visitNodes(cbNode, cbNodes, node.attributes) ||
+                visitNodes(cbNode, cbNodes, node.rhs) ||
+                visitNode(cbNode, node.source) ||
+                visitNode(cbNode, node.terminator));
         case SyntaxKind.NodeStatement:
-            return visitNodes(cbNode, cbNodes, node.attributes)
-                || visitNode(cbNode, node.id)
-                || visitNode(cbNode, node.terminator);
+            return (visitNodes(cbNode, cbNodes, node.attributes) ||
+                visitNode(cbNode, node.id) ||
+                visitNode(cbNode, node.terminator));
         case SyntaxKind.SubGraph:
-            return visitNodes(cbNode, cbNodes, node.statements)
-                || visitNode(cbNode, node.id);
+            return (visitNodes(cbNode, cbNodes, node.statements) ||
+                visitNode(cbNode, node.id));
         case SyntaxKind.SubGraphStatement:
-            return visitNode(cbNode, node.subgraph)
-                || visitNode(cbNode, node.terminator);
+            return (visitNode(cbNode, node.subgraph) ||
+                visitNode(cbNode, node.terminator));
         case SyntaxKind.IdEqualsIdStatement:
-            return visitNode(cbNode, node.leftId)
-                || visitNode(cbNode, node.rightId)
-                || visitNode(cbNode, node.terminator);
+            return (visitNode(cbNode, node.leftId) ||
+                visitNode(cbNode, node.rightId) ||
+                visitNode(cbNode, node.terminator));
         case SyntaxKind.QuotedTextIdentifier:
             return visitNodes(cbNode, cbNodes, node.values);
         case SyntaxKind.EdgeRhs:
-            return visitNode(cbNode, node.operation)
-                || visitNode(cbNode, node.target);
+            return (visitNode(cbNode, node.operation) ||
+                visitNode(cbNode, node.target));
         case SyntaxKind.AttributeContainer:
             return visitNodes(cbNode, cbNodes, node.assignments);
         case SyntaxKind.Assignment:
-            return visitNode(cbNode, node.leftId)
-                || visitNode(cbNode, node.rightId)
-                || visitNode(cbNode, node.terminator);
+            return (visitNode(cbNode, node.leftId) ||
+                visitNode(cbNode, node.rightId) ||
+                visitNode(cbNode, node.terminator));
         case SyntaxKind.NormalPortDeclaration:
-            return visitNode(cbNode, node.colon)
-                || visitNode(cbNode, node.id)
-                || visitNode(cbNode, node.compassPt);
+            return (visitNode(cbNode, node.colon) ||
+                visitNode(cbNode, node.id) ||
+                visitNode(cbNode, node.compassPt));
         case SyntaxKind.CompassPortDeclaration:
-            return visitNode(cbNode, node.colon)
-                || visitNode(cbNode, node.compassPt);
+            return (visitNode(cbNode, node.colon) ||
+                visitNode(cbNode, node.compassPt));
         case SyntaxKind.NodeId:
-            return visitNode(cbNode, node.port)
-                || visitNode(cbNode, node.id);
+            return (visitNode(cbNode, node.port) || visitNode(cbNode, node.id));
         default:
             return undefined;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dot-language-support",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "description": "Parser and language service for graphviz (dot) files",
   "author": "Niklas Mollenhauer",
   "license": "MIT",
@@ -8,13 +8,17 @@
   "module": "./lib/esm/index.js",
   "types": "./lib/esm/index.d.ts",
   "scripts": {
+    "ci": "biome ci ./src",
     "test": "tsc --noEmit && vitest run",
     "test:coverage": "vitest run --coverage",
+    "format": "biome format --write ./src",
+    "lint": "biome lint ./src",
+    "lint:fix": "biome lint --apply ./src",
     "clean": "rimraf lib",
-    "compile:esm": "tsc --target esnext --module esnext --outDir lib/esm",
-    "compile:cjs": "tsc --target es2017 --module commonjs --outDir lib/cjs",
-    "compile": "npm run compile:esm && npm run compile:cjs",
-    "prepare": "npm run clean && npm run compile"
+    "build:esm": "tsc --target esnext --module esnext --outDir lib/esm",
+    "build:cjs": "tsc --target es2017 --module commonjs --outDir lib/cjs",
+    "build": "npm run build:esm && npm run build:cjs",
+    "prepare": "npm run clean && npm run build"
   },
   "keywords": [
     "graphviz",
@@ -29,16 +33,17 @@
     "url": "https://github.com/nikeee/dot-language-support.git"
   },
   "dependencies": {
-    "vscode-languageserver-textdocument": "^1.0.8",
-    "vscode-languageserver-types": "^3.17.3"
+    "vscode-languageserver-textdocument": "^1.0.12",
+    "vscode-languageserver-types": "^3.17.5"
   },
   "devDependencies": {
-    "@vitest/coverage-v8": "^0.32.4",
-    "rimraf": "^5.0.1",
-    "typescript": "^5.1.6",
-    "vitest": "^0.32.4"
+    "@biomejs/biome": "^1.9.2",
+    "@vitest/coverage-v8": "^2.1.1",
+    "rimraf": "^6.0.1",
+    "typescript": "^5.6.2",
+    "vitest": "^2.1.1"
   },
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   }
 }