dot-language-support 4.0.4 → 4.1.0

package/dist/index.d.mts

@@ -162,7 +162,7 @@ interface CompassPortDeclaration extends SyntaxNode {
   colon: Token<typeof syntaxKind.ColonToken>;
   compassPt: CompassPort;
 }
-type CompassPort = Token<typeof syntaxKind.CompassNorthToken> | Token<typeof syntaxKind.CompassNorthEastToken> | Token<typeof syntaxKind.CompassEastToken> | Token<typeof syntaxKind.CompassSouthEastToken> | Token<typeof syntaxKind.CompassSouthToken> | Token<typeof syntaxKind.CompassSouthWestToken> | Token<typeof syntaxKind.CompassWestToken> | Token<typeof syntaxKind.CompassNorthWestToken> | Token<typeof syntaxKind.CompassCenterToken> | Token<typeof syntaxKind.UnderscoreToken>;
+type CompassPort = Token<typeof syntaxKind.CompassNorthToken> | Token<typeof syntaxKind.CompassNorthEastToken> | Token<typeof syntaxKind.CompassEastToken> | Token<typeof syntaxKind.CompassSouthEastToken> | Token<typeof syntaxKind.CompassSouthToken> | Token<typeof syntaxKind.CompassSouthWestToken> | Token<typeof syntaxKind.CompassWestToken> | Token<typeof syntaxKind.CompassNorthWestToken> | Token<typeof syntaxKind.CompassCenterToken>;
 type EdgeOp = Token<typeof syntaxKind.DirectedEdgeOp> | Token<typeof syntaxKind.UndirectedEdgeOp>;
 interface TextRange {
   pos: number;
@@ -197,39 +197,38 @@ declare const syntaxKind: {
   readonly CompassWestToken: 24;
   readonly CompassNorthWestToken: 25;
   readonly CompassCenterToken: 26;
-  readonly UnderscoreToken: 27;
-  readonly StringLiteral: 28;
-  readonly HtmlIdentifier: 29;
-  readonly TextIdentifier: 30;
-  readonly QuotedTextIdentifier: 31;
-  readonly NumericIdentifier: 32;
-  readonly GraphKeyword: 33;
-  readonly DigraphKeyword: 34;
-  readonly NodeKeyword: 35;
-  readonly EdgeKeyword: 36;
-  readonly SubgraphKeyword: 37;
-  readonly StrictKeyword: 38;
-  readonly DirectedEdgeOp: 39;
-  readonly UndirectedEdgeOp: 40;
-  readonly DirectedGraph: 41;
-  readonly UndirectedGraph: 42;
-  readonly NodeStatement: 43;
-  readonly EdgeStatement: 44;
-  readonly AttributeStatement: 45;
-  readonly IdEqualsIdStatement: 46;
-  readonly SubGraph: 47;
-  readonly SubGraphStatement: 48;
-  readonly EdgeRhs: 49;
-  readonly AttributeContainer: 50;
-  readonly Assignment: 51;
-  readonly NormalPortDeclaration: 52;
-  readonly CompassPortDeclaration: 53;
-  readonly NodeId: 54;
-  readonly Count: 55;
-  readonly FirstNode: 41;
+  readonly StringLiteral: 27;
+  readonly HtmlIdentifier: 28;
+  readonly TextIdentifier: 29;
+  readonly QuotedTextIdentifier: 30;
+  readonly NumericIdentifier: 31;
+  readonly GraphKeyword: 32;
+  readonly DigraphKeyword: 33;
+  readonly NodeKeyword: 34;
+  readonly EdgeKeyword: 35;
+  readonly SubgraphKeyword: 36;
+  readonly StrictKeyword: 37;
+  readonly DirectedEdgeOp: 38;
+  readonly UndirectedEdgeOp: 39;
+  readonly DirectedGraph: 40;
+  readonly UndirectedGraph: 41;
+  readonly NodeStatement: 42;
+  readonly EdgeStatement: 43;
+  readonly AttributeStatement: 44;
+  readonly IdEqualsIdStatement: 45;
+  readonly SubGraph: 46;
+  readonly SubGraphStatement: 47;
+  readonly EdgeRhs: 48;
+  readonly AttributeContainer: 49;
+  readonly Assignment: 50;
+  readonly NormalPortDeclaration: 51;
+  readonly CompassPortDeclaration: 52;
+  readonly NodeId: 53;
+  readonly Count: 54;
+  readonly FirstNode: 40;
   readonly CompassBegin: 18;
-  readonly CompassEnd: 27;
-  readonly LastKeyword: 38;
+  readonly CompassEnd: 26;
+  readonly LastKeyword: 37;
 };
 declare const syntaxKindNames: {
   readonly 0: "Unknown";
@@ -259,35 +258,34 @@ declare const syntaxKindNames: {
   readonly 24: "CompassWestToken";
   readonly 25: "CompassNorthWestToken";
   readonly 26: "CompassCenterToken";
-  readonly 27: "UnderscoreToken";
-  readonly 28: "StringLiteral";
-  readonly 29: "HtmlIdentifier";
-  readonly 30: "TextIdentifier";
-  readonly 31: "QuotedTextIdentifier";
-  readonly 32: "NumericIdentifier";
-  readonly 33: "GraphKeyword";
-  readonly 34: "DigraphKeyword";
-  readonly 35: "NodeKeyword";
-  readonly 36: "EdgeKeyword";
-  readonly 37: "SubgraphKeyword";
-  readonly 38: "StrictKeyword";
-  readonly 39: "DirectedEdgeOp";
-  readonly 40: "UndirectedEdgeOp";
-  readonly 41: "DirectedGraph";
-  readonly 42: "UndirectedGraph";
-  readonly 43: "NodeStatement";
-  readonly 44: "EdgeStatement";
-  readonly 45: "AttributeStatement";
-  readonly 46: "IdEqualsIdStatement";
-  readonly 47: "SubGraph";
-  readonly 48: "SubGraphStatement";
-  readonly 49: "EdgeRhs";
-  readonly 50: "AttributeContainer";
-  readonly 51: "Assignment";
-  readonly 52: "NormalPortDeclaration";
-  readonly 53: "CompassPortDeclaration";
-  readonly 54: "NodeId";
-  readonly 55: "Count";
+  readonly 27: "StringLiteral";
+  readonly 28: "HtmlIdentifier";
+  readonly 29: "TextIdentifier";
+  readonly 30: "QuotedTextIdentifier";
+  readonly 31: "NumericIdentifier";
+  readonly 32: "GraphKeyword";
+  readonly 33: "DigraphKeyword";
+  readonly 34: "NodeKeyword";
+  readonly 35: "EdgeKeyword";
+  readonly 36: "SubgraphKeyword";
+  readonly 37: "StrictKeyword";
+  readonly 38: "DirectedEdgeOp";
+  readonly 39: "UndirectedEdgeOp";
+  readonly 40: "DirectedGraph";
+  readonly 41: "UndirectedGraph";
+  readonly 42: "NodeStatement";
+  readonly 43: "EdgeStatement";
+  readonly 44: "AttributeStatement";
+  readonly 45: "IdEqualsIdStatement";
+  readonly 46: "SubGraph";
+  readonly 47: "SubGraphStatement";
+  readonly 48: "EdgeRhs";
+  readonly 49: "AttributeContainer";
+  readonly 50: "Assignment";
+  readonly 51: "NormalPortDeclaration";
+  readonly 52: "CompassPortDeclaration";
+  readonly 53: "NodeId";
+  readonly 54: "Count";
 };
 interface SyntaxNode extends TextRange {
   kind: SyntaxKind;
@@ -536,7 +534,7 @@ declare class Parser {
   constructor();
   parse(sourceText: string): SourceFile;
 }
-declare function isIdentifier(kind: SyntaxKind): kind is 29 | 30 | 31 | 32;
+declare function isIdentifier(kind: SyntaxKind): kind is 28 | 29 | 30 | 31;
 declare function isIdentifierNode(node: SyntaxNode): node is Identifier;
 //#endregion
 //#region src/service/service.d.ts

package/dist/index.mjs

@@ -62,39 +62,38 @@ const syntaxKind = {
 	CompassWestToken: 24,
 	CompassNorthWestToken: 25,
 	CompassCenterToken: 26,
-	UnderscoreToken: 27,
-	StringLiteral: 28,
-	HtmlIdentifier: 29,
-	TextIdentifier: 30,
-	QuotedTextIdentifier: 31,
-	NumericIdentifier: 32,
-	GraphKeyword: 33,
-	DigraphKeyword: 34,
-	NodeKeyword: 35,
-	EdgeKeyword: 36,
-	SubgraphKeyword: 37,
-	StrictKeyword: 38,
-	DirectedEdgeOp: 39,
-	UndirectedEdgeOp: 40,
-	DirectedGraph: 41,
-	UndirectedGraph: 42,
-	NodeStatement: 43,
-	EdgeStatement: 44,
-	AttributeStatement: 45,
-	IdEqualsIdStatement: 46,
-	SubGraph: 47,
-	SubGraphStatement: 48,
-	EdgeRhs: 49,
-	AttributeContainer: 50,
-	Assignment: 51,
-	NormalPortDeclaration: 52,
-	CompassPortDeclaration: 53,
-	NodeId: 54,
-	Count: 55,
-	FirstNode: 41,
+	StringLiteral: 27,
+	HtmlIdentifier: 28,
+	TextIdentifier: 29,
+	QuotedTextIdentifier: 30,
+	NumericIdentifier: 31,
+	GraphKeyword: 32,
+	DigraphKeyword: 33,
+	NodeKeyword: 34,
+	EdgeKeyword: 35,
+	SubgraphKeyword: 36,
+	StrictKeyword: 37,
+	DirectedEdgeOp: 38,
+	UndirectedEdgeOp: 39,
+	DirectedGraph: 40,
+	UndirectedGraph: 41,
+	NodeStatement: 42,
+	EdgeStatement: 43,
+	AttributeStatement: 44,
+	IdEqualsIdStatement: 45,
+	SubGraph: 46,
+	SubGraphStatement: 47,
+	EdgeRhs: 48,
+	AttributeContainer: 49,
+	Assignment: 50,
+	NormalPortDeclaration: 51,
+	CompassPortDeclaration: 52,
+	NodeId: 53,
+	Count: 54,
+	FirstNode: 40,
 	CompassBegin: 18,
-	CompassEnd: 27,
-	LastKeyword: 38
+	CompassEnd: 26,
+	LastKeyword: 37
 };
 /** reverse lookup because we cannot make syntaxKind an enum */
 const syntaxKindNames = {
@@ -125,35 +124,34 @@ const syntaxKindNames = {
 	24: "CompassWestToken",
 	25: "CompassNorthWestToken",
 	26: "CompassCenterToken",
-	27: "UnderscoreToken",
-	28: "StringLiteral",
-	29: "HtmlIdentifier",
-	30: "TextIdentifier",
-	31: "QuotedTextIdentifier",
-	32: "NumericIdentifier",
-	33: "GraphKeyword",
-	34: "DigraphKeyword",
-	35: "NodeKeyword",
-	36: "EdgeKeyword",
-	37: "SubgraphKeyword",
-	38: "StrictKeyword",
-	39: "DirectedEdgeOp",
-	40: "UndirectedEdgeOp",
-	41: "DirectedGraph",
-	42: "UndirectedGraph",
-	43: "NodeStatement",
-	44: "EdgeStatement",
-	45: "AttributeStatement",
-	46: "IdEqualsIdStatement",
-	47: "SubGraph",
-	48: "SubGraphStatement",
-	49: "EdgeRhs",
-	50: "AttributeContainer",
-	51: "Assignment",
-	52: "NormalPortDeclaration",
-	53: "CompassPortDeclaration",
-	54: "NodeId",
-	55: "Count"
+	27: "StringLiteral",
+	28: "HtmlIdentifier",
+	29: "TextIdentifier",
+	30: "QuotedTextIdentifier",
+	31: "NumericIdentifier",
+	32: "GraphKeyword",
+	33: "DigraphKeyword",
+	34: "NodeKeyword",
+	35: "EdgeKeyword",
+	36: "SubgraphKeyword",
+	37: "StrictKeyword",
+	38: "DirectedEdgeOp",
+	39: "UndirectedEdgeOp",
+	40: "DirectedGraph",
+	41: "UndirectedGraph",
+	42: "NodeStatement",
+	43: "EdgeStatement",
+	44: "AttributeStatement",
+	45: "IdEqualsIdStatement",
+	46: "SubGraph",
+	47: "SubGraphStatement",
+	48: "EdgeRhs",
+	49: "AttributeContainer",
+	50: "Assignment",
+	51: "NormalPortDeclaration",
+	52: "CompassPortDeclaration",
+	53: "NodeId",
+	54: "Count"
 };
 const syntaxNodeFlags = {
 	None: 0,
@@ -359,7 +357,6 @@ const textToToken = createMapFromTemplate({
 	"]": syntaxKind.CloseBracketToken,
 	";": syntaxKind.SemicolonToken,
 	":": syntaxKind.ColonToken,
-	_: syntaxKind.UnderscoreToken,
 	",": syntaxKind.CommaToken,
 	"<": syntaxKind.LessThan,
 	">": syntaxKind.GreaterThan
@@ -519,9 +516,6 @@ var DefaultScanner = class {
 					}
 					this.pos++;
 					break;
-				case characterCodes._:
-					this.pos++;
-					return this.token = syntaxKind.UnderscoreToken;
 				case characterCodes.semicolon:
 					this.pos++;
 					return this.token = syntaxKind.SemicolonToken;
@@ -740,10 +734,10 @@ var DefaultScanner = class {
 	}
 };
 function isIdentifierStart(ch) {
-	return ch >= characterCodes.A && ch <= characterCodes.Z || ch >= characterCodes.a && ch <= characterCodes.z || ch >= characterCodes._0 && ch <= characterCodes._9 || ch === characterCodes._ || ch === characterCodes.lessThan || ch === characterCodes.doubleQuote;
+	return ch >= characterCodes.A && ch <= characterCodes.Z || ch >= characterCodes.a && ch <= characterCodes.z || ch >= 128 && ch <= 255 || ch === characterCodes._ || ch >= characterCodes._0 && ch <= characterCodes._9 || ch === characterCodes.minus || ch === characterCodes.dot || ch === characterCodes.doubleQuote || ch === characterCodes.lessThan;
 }
 function isIdentifierPart(ch) {
-	return ch >= characterCodes.A && ch <= characterCodes.Z || ch >= characterCodes.a && ch <= characterCodes.z || ch >= characterCodes._0 && ch <= characterCodes._9 || ch === characterCodes.$ || ch === characterCodes._ || ch > characterCodes.maxAsciiCharacter;
+	return ch >= characterCodes.A && ch <= characterCodes.Z || ch >= characterCodes.a && ch <= characterCodes.z || ch >= characterCodes._0 && ch <= characterCodes._9 || ch === characterCodes._ || ch >= 128 && ch <= 255;
 }
 function skipTrivia(text, pos) {
 	while (true) {
@@ -836,9 +830,6 @@ var Parser = class {
 	#token() {
 		return this.currentToken;
 	}
-	#getLinesFromFile(sourceText) {
-		return sourceText.split(/\r?\n/);
-	}
 	parse(sourceText) {
 		this.sourceText = sourceText;
 		this.scanner.setText(this.sourceText);
@@ -2704,8 +2695,8 @@ function createBinder() {
 		if (node.compassPt) bind(node.compassPt);
 	}
 	function bindNodeId(node) {
-		ensureGlobalSymbol(node.id);
 		bind(node.id);
+		ensureGlobalSymbol(node.id);
 		if (node.port) bind(node.port);
 	}
 	function bindChildren(nodes) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dot-language-support",
-  "version": "4.0.4",
+  "version": "4.1.0",
   "description": "Parser and language service for graphviz (dot) files",
   "author": "Niklas Mollenhauer",
   "license": "MIT",
@@ -37,7 +37,7 @@
   "devDependencies": {
     "@biomejs/biome": "^2.3.11",
     "expect": "^30.2.0",
-    "tsdown": "^0.18.4",
+    "tsdown": "^0.19.0",
     "typescript": "^5.9.3"
   },
   "engines": {