dot-language-support 4.1.0 → 4.1.2

package/dist/index.mjs

@@ -1,13 +1,11 @@
 import * as lst from "vscode-languageserver-types";
 import { Range, TextEdit } from "vscode-languageserver-types";
-
 //#region src/core.ts
 function createMapFromTemplate(template) {
 	const map = /* @__PURE__ */ new Map();
 	for (const key in template) if (key in template) map.set(key, template[key]);
 	return map;
 }
-
 //#endregion
 //#region src/types.ts
 const errorSource = {
@@ -295,7 +293,6 @@ const characterCodes = {
 	tab: 9,
 	verticalTab: 11
 };
-
 //#endregion
 //#region src/service/util.ts
 function getStart(sourceFile, node) {
@@ -328,7 +325,6 @@ const quote = (s) => `"${s}"`;
 function assertNever(v) {
 	throw new Error(`Should not have reached this. Value: ${v ?? ""}`);
 }
-
 //#endregion
 //#region src/scanner.ts
 const textToToken = createMapFromTemplate({
@@ -403,7 +399,7 @@ var DefaultScanner = class {
 		this.tokenValue = void 0;
 		this.tokenFlags = tokenFlags.None;
 	}
-	scan(skipTrivia$1 = true) {
+	scan(skipTrivia = true) {
 		this.startPos = this.pos;
 		this.tokenFlags = tokenFlags.None;
 		this.isUnterminated = false;
@@ -415,7 +411,7 @@ var DefaultScanner = class {
 				case characterCodes.lineFeed:
 				case characterCodes.carriageReturn:
 					this.tokenFlags |= tokenFlags.PrecedingLineBreak;
-					if (skipTrivia$1) {
+					if (skipTrivia) {
 						this.pos++;
 						continue;
 					}
@@ -426,29 +422,29 @@ var DefaultScanner = class {
 				case characterCodes.verticalTab:
 				case characterCodes.formFeed:
 				case characterCodes.space:
-					if (skipTrivia$1) {
+					if (skipTrivia) {
 						this.pos++;
 						continue;
 					}
 					while (this.pos < this.end && this.#isWhiteSpaceSingleLine(this.text.charCodeAt(this.pos))) this.pos++;
 					return this.token = syntaxKind.WhitespaceTrivia;
 				case characterCodes.hash: {
-					const content = this.#scanHashCommentTrivia(skipTrivia$1);
-					if (skipTrivia$1) continue;
+					const content = this.#scanHashCommentTrivia(skipTrivia);
+					if (skipTrivia) continue;
 					this.tokenValue = content;
 					return this.token = syntaxKind.HashCommentTrivia;
 				}
 				case characterCodes.slash:
 					if (this.pos + 1 < this.end) switch (this.text.charCodeAt(this.pos + 1)) {
 						case characterCodes.slash: {
-							const commentContent = this.#scanSingleLineCommentTrivia(skipTrivia$1);
-							if (skipTrivia$1) continue;
+							const commentContent = this.#scanSingleLineCommentTrivia(skipTrivia);
+							if (skipTrivia) continue;
 							this.tokenValue = commentContent;
 							return this.token = syntaxKind.SingleLineCommentTrivia;
 						}
 						case characterCodes.asterisk: {
-							const commentContent = this.#scanMultiLineCommentTrivia(skipTrivia$1);
-							if (skipTrivia$1) continue;
+							const commentContent = this.#scanMultiLineCommentTrivia(skipTrivia);
+							if (skipTrivia) continue;
 							this.tokenValue = commentContent;
 							return this.token = syntaxKind.MultiLineCommentTrivia;
 						}
@@ -620,7 +616,7 @@ var DefaultScanner = class {
 		return result;
 	}
 	#scanString(allowEscapes = true) {
-		const quote$1 = this.text.charCodeAt(this.pos);
+		const quote = this.text.charCodeAt(this.pos);
 		this.pos++;
 		let result = "";
 		const start = this.pos;
@@ -637,7 +633,7 @@ var DefaultScanner = class {
 			if (ch === characterCodes.backslash) hasBackslash = true;
 			else if (hasBackslash) hasBackslash = false;
 			else {
-				if (ch === quote$1) {
+				if (ch === quote) {
 					result += this.text.substring(start, this.pos);
 					this.pos++;
 					break;
@@ -787,7 +783,6 @@ function skipTrivia(text, pos) {
 function isLineBreak(ch) {
 	return ch === characterCodes.lineFeed || ch === characterCodes.carriageReturn;
 }
-
 //#endregion
 //#region src/parser.ts
 const parsingContext = {
@@ -949,10 +944,10 @@ var Parser = class {
 			case syntaxKind.SubgraphKeyword: {
 				const subgraph = this.#parseSubGraph();
 				if (this.#token() === syntaxKind.SemicolonToken) {
-					const subgraphStatement$1 = this.#createNode(syntaxKind.SubGraphStatement, subgraph.pos);
-					subgraphStatement$1.subgraph = subgraph;
-					subgraphStatement$1.terminator = this.#parseExpectedToken(syntaxKind.SemicolonToken);
-					return this.#finishNode(subgraphStatement$1);
+					const subgraphStatement = this.#createNode(syntaxKind.SubGraphStatement, subgraph.pos);
+					subgraphStatement.subgraph = subgraph;
+					subgraphStatement.terminator = this.#parseExpectedToken(syntaxKind.SemicolonToken);
+					return this.#finishNode(subgraphStatement);
 				}
 				if (this.#isEdgeOp()) return this.#parseEdgeStatement(subgraph);
 				const subgraphStatement = this.#createNode(syntaxKind.SubGraphStatement, subgraph.pos);
@@ -1374,7 +1369,6 @@ function isIdentifier(kind) {
 function isIdentifierNode(node) {
 	return isIdentifier(node.kind);
 }
-
 //#endregion
 //#region src/service/languageFacts.ts
 const shapes = Object.freeze([
@@ -2377,7 +2371,6 @@ const colors = Object.freeze({
 	yellow4: "#8b8b00",
 	yellowgreen: "#9acd32"
 });
-
 //#endregion
 //#region src/visitor.ts
 function visitNode(cbNode, node) {
@@ -2413,7 +2406,6 @@ function forEachChild(node, cbNode, cbNodes) {
 		default: return;
 	}
 }
-
 //#endregion
 //#region src/checker.ts
 const validShapesLowerCase = new Set(shapes.map((s) => s.toLowerCase()));
@@ -2554,7 +2546,6 @@ function createCheckerError(sub) {
 function nodeContainsErrors(node) {
 	return (node.flags & syntaxNodeFlags.ContainsErrors) === syntaxNodeFlags.ContainsErrors;
 }
-
 //#endregion
 //#region src/binder.ts
 const binder = createBinder();
@@ -2746,12 +2737,12 @@ function createBinder() {
 	}
 	function ensureGlobalColor(node) {
 		if (node && isIdentifierNode(node)) {
-			const colors$1 = colorTable;
+			const colors = colorTable;
 			const name = getIdentifierText(node);
 			if (name === void 0) return;
-			if (colors$1 === void 0) throw "symbolTable is undefined";
+			if (colors === void 0) throw "symbolTable is undefined";
 			const color = createColor(node);
-			colors$1.set(name, color);
+			colors.set(name, color);
 			return;
 		}
 		console.warn("ensureSymbol called on non-identifier node");
@@ -2784,7 +2775,6 @@ function createBinder() {
 		file.colors = colorTable;
 	} };
 }
-
 //#endregion
 //#region src/service/command/common.ts
 function createChangeToEdit(start, end, changeTo) {
@@ -2805,7 +2795,6 @@ function getOppositeEdgeOp(g) {
 function getAllowedOp(g) {
 	return g === syntaxKind.DigraphKeyword ? syntaxKind.DirectedEdgeOp : syntaxKind.UndirectedEdgeOp;
 }
-
 //#endregion
 //#region src/service/command/ChangeAllOtherEdgeOpsAndFixGraphCommand.ts
 function create$3(edgeOffsets, changeEdgesTo, graphOffset, changeFromGraph, changeGraphTo) {
@@ -2840,7 +2829,6 @@ function execute$3(doc, _sourceFile, cmd) {
 function isChangeAllOtherEdgeOpsAndFixGraphCommand(cmd) {
 	return cmd.command === commandIds.ConvertGraphType && !!cmd.arguments && cmd.arguments.length === 4;
 }
-
 //#endregion
 //#region src/service/command/ChangeEdgeOpCommand.ts
 function create$2(startOffset, endOffset, changeTo, changeFrom) {
@@ -2869,7 +2857,6 @@ function execute$2(doc, _sourceFile, cmd) {
 function isChangeEdgeOpCommand(cmd) {
 	return cmd.command === commandIds.ChangeEdgeOp && !!cmd.arguments && cmd.arguments.length === 3;
 }
-
 //#endregion
 //#region src/service/command/ConsolidateDescendantsCommand.ts
 function create$1(statements, below) {
@@ -2937,7 +2924,6 @@ function execute$1(doc, sourceFile, cmd) {
 function isConsolidateDescendantsCommand(cmd) {
 	return cmd.command === commandIds.ConsolidateDescendants && !!cmd.arguments && cmd.arguments.length > 1;
 }
-
 //#endregion
 //#region src/service/command/RemoveSemicolons.ts
 function create() {
@@ -2964,7 +2950,6 @@ function execute(doc, sourceFile, cmd) {
 function isRemoveSemicolonsCommand(cmd) {
 	return cmd.command === commandIds.RemoveSemicolons && (!cmd.arguments || cmd.arguments.length === 0 || cmd.arguments.every((e) => e === void 0));
 }
-
 //#endregion
 //#region src/service/codeAction.ts
 function getCodeActions(doc, sourceFile, range, _context) {
@@ -3085,15 +3070,13 @@ function getCheckerErrorCommand(_doc, file, d, code) {
 }
 function convertGraphTypeCommand(file, graph, changeToGraphType) {
 	const changeToEdgeOp = getAllowedOp(changeToGraphType);
-	const edgeOffsets = findAllEdges(graph).filter((e) => e.operation.kind !== changeToEdgeOp).map((e) => ({
+	return create$3(findAllEdges(graph).filter((e) => e.operation.kind !== changeToEdgeOp).map((e) => ({
 		start: getStart(file, e.operation),
 		end: e.operation.end
-	}));
-	const graphTypeOffset = {
+	})), changeToEdgeOp, {
 		start: getStart(file, graph.keyword),
 		end: graph.keyword.end
-	};
-	return create$3(edgeOffsets, changeToEdgeOp, graphTypeOffset, graph.keyword.kind, changeToGraphType);
+	}, graph.keyword.kind, changeToGraphType);
 }
 function isInRange(rangeStartOffset, rangeEndOffset, startOffset, endOffset) {
 	if (rangeStartOffset === rangeEndOffset) return startOffset <= rangeStartOffset && rangeEndOffset <= endOffset;
@@ -3128,7 +3111,6 @@ function subtreeContainsErrors(node) {
 	});
 	return hasError;
 }
-
 //#endregion
 //#region src/service/colorProvider.ts
 const colorMap = colors;
@@ -3139,10 +3121,10 @@ function getDocumentColors(doc, sourceFile) {
 function getColorRepresentations(_doc, _sourceFile, color, range) {
 	return !color || !range ? void 0 : [{ label: `"${getColorStringFromColor(color)}"` }];
 }
-function colorTableToColorInformation(doc, sf, colors$1) {
-	if (!colors$1 || colors$1.size === 0) return [];
+function colorTableToColorInformation(doc, sf, colors) {
+	if (!colors || colors.size === 0) return [];
 	const res = [];
-	for (const [name, value] of colors$1) {
+	for (const [name, value] of colors) {
 		if (!name || !value) continue;
 		const color = getColorFromName(name);
 		if (color) res.push({
@@ -3177,7 +3159,6 @@ function numberToPaddedString(n) {
 	const s = n.toString(16);
 	return (s.length === 1 ? `0${s}` : s).toLowerCase();
 }
-
 //#endregion
 //#region src/service/completion.ts
 function getCompletions(doc, sourceFile, position) {
@@ -3210,8 +3191,8 @@ function getCompletions(doc, sourceFile, position) {
 		const attribute = prevNode;
 		if (!attribute) return [];
 		if (!attribute.parent) throw "sourceFile is not bound";
-		const parent$1 = attribute.parent;
-		if (parent$1.kind === syntaxKind.Assignment) return getAssignmentCompletion(parent$1);
+		const parent = attribute.parent;
+		if (parent.kind === syntaxKind.Assignment) return getAssignmentCompletion(parent);
 	}
 	return [];
 }
@@ -3274,7 +3255,6 @@ function getNodeCompletions(symbols, exlucdedSymbols) {
 	}
 	return res;
 }
-
 //#endregion
 //#region src/service/hover.ts
 function hover(doc, sourceFile, position) {
@@ -3370,7 +3350,6 @@ function getEdgeHover(n) {
 function getEdgeSourceOrTargetText(n) {
 	return n.kind === syntaxKind.NodeId ? getIdentifierText(n.id) : n.id !== void 0 ? `${getIdentifierText(n.id)}` : "sub graph";
 }
-
 //#endregion
 //#region src/service/reference.ts
 function findReferences(doc, sourceFile, position, context) {
@@ -3418,7 +3397,6 @@ function findDefinition(doc, sourceFile, position) {
 	}
 	debugger;
 }
-
 //#endregion
 //#region src/service/rename.ts
 function renameSymbol(doc, sourceFile, position, newName) {
@@ -3434,7 +3412,7 @@ function renameSymbol(doc, sourceFile, position, newName) {
 		if (!nodeSymbol) throw "node.symbol is not bound";
 		const r = nodeSymbol.references;
 		const ranges = syntaxNodesToRanges(doc, sourceFile, r ? [nodeSymbol.firstMention, ...r] : [nodeSymbol.firstMention]);
-		return { changes: { [doc.uri]: ranges.map((r$1) => TextEdit.replace(r$1, newName)) } };
+		return { changes: { [doc.uri]: ranges.map((r) => TextEdit.replace(r, newName)) } };
 	}
 	debugger;
 }
@@ -3444,16 +3422,11 @@ function isRenameableNode(node) {
 function isRenamableIdentifier(node) {
 	return node.kind !== syntaxKind.QuotedTextIdentifier;
 }
-
-//#endregion
-//#region src/error.ts
-const diagnosicSource = "DOT";
 const subErrorCodeLength = 3;
 function formatError(error) {
 	const subCode = (error.sub | 0).toString().padStart(subErrorCodeLength, "0");
-	return diagnosicSource + error.source + subCode;
+	return "DOT" + error.source + subCode;
 }
-
 //#endregion
 //#region src/service/validation.ts
 function convertDiagnostic(document, source) {
@@ -3464,7 +3437,7 @@ function convertDiagnostic(document, source) {
 		},
 		severity: source.category,
 		code: formatError(source.code),
-		source: diagnosicSource,
+		source: "DOT",
 		message: source.message
 	};
 }
@@ -3473,7 +3446,6 @@ function validateDocument(doc, sourceFile) {
 	if (!diagnostics || diagnostics.length <= 0) return [];
 	return diagnostics.map((d) => convertDiagnostic(doc, d));
 }
-
 //#endregion
 //#region src/service/service.ts
 function parseDocument(doc) {
@@ -3500,6 +3472,5 @@ function createService() {
 		getAvailableCommands
 	};
 }
-
 //#endregion
-export { DefaultScanner, Parser, characterCodes, checkError, createService, diagnosticCategory, errorSource, forEachChild, getTextAsToken, getTokenAsText, graphContext, isIdentifier, isIdentifierNode, isIdentifierStart, isLineBreak, parseError, parsingContext, scanError, skipTrivia, syntaxKind, syntaxKindNames, syntaxNodeFlags, tokenFlags };
+export { DefaultScanner, Parser, characterCodes, checkError, createService, diagnosticCategory, errorSource, forEachChild, getTextAsToken, getTokenAsText, graphContext, isIdentifier, isIdentifierNode, isIdentifierStart, isLineBreak, parseError, parsingContext, scanError, skipTrivia, syntaxKind, syntaxKindNames, syntaxNodeFlags, tokenFlags };

package/package.json

@@ -1,43 +1,45 @@
 {
   "name": "dot-language-support",
-  "version": "4.1.0",
+  "version": "4.1.2",
   "description": "Parser and language service for graphviz (dot) files",
-  "author": "Niklas Mollenhauer",
-  "license": "MIT",
-  "main": "./dist/index.mjs",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.mts",
-  "type": "module",
-  "scripts": {
-    "ci": "biome ci ./src",
-    "test": "tsc && node --test '**/*.spec.ts'",
-    "test:coverage": "node --test --experimental-test-coverage '**/*.spec.ts'",
-    "format": "biome format --write ./src",
-    "lint": "biome lint ./src",
-    "lint:fix": "biome lint --write ./src",
-    "build": "tsdown",
-    "prepare": "npm run build"
-  },
   "keywords": [
-    "graphviz",
     "dot",
+    "graphviz",
     "gv",
-    "parser",
     "language",
+    "parser",
     "service"
   ],
+  "license": "MIT",
+  "author": "Niklas Mollenhauer",
   "repository": {
     "type": "git",
     "url": "https://github.com/nikeee/dot-language-support.git"
   },
+  "type": "module",
+  "main": "./dist/index.mjs",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.mts",
+  "scripts": {
+    "ci": "oxlint -f github",
+    "test": "tsc && node --test '**/*.spec.ts'",
+    "test:coverage": "node --test --experimental-test-coverage '**/*.spec.ts'",
+    "format": "oxfmt",
+    "lint": "oxlint --type-aware",
+    "lint:fix": "oxlint --type-aware --fix",
+    "build": "tsdown",
+    "prepare": "npm run build"
+  },
   "dependencies": {
     "vscode-languageserver-textdocument": "^1.0.12",
     "vscode-languageserver-types": "^3.17.5"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.3.11",
-    "expect": "^30.2.0",
-    "tsdown": "^0.19.0",
+    "expect": "^30.3.0",
+    "oxfmt": "^0.41.0",
+    "oxlint": "^1.49.0",
+    "oxlint-tsgolint": "^0.17.1",
+    "tsdown": "^0.21.4",
     "typescript": "^5.9.3"
   },
   "engines": {