dot-language-support 2.3.0 → 3.0.0

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "dot-language-support",
-  "version": "2.3.0",
+  "version": "3.0.0",
   "description": "Parser and language service for graphviz (dot) files",
   "author": "Niklas Mollenhauer",
   "license": "MIT",
-  "main": "./lib/cjs/index.js",
-  "module": "./lib/esm/index.js",
-  "types": "./lib/esm/index.d.ts",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "type": "module",
   "scripts": {
     "ci": "biome ci ./src",
     "test": "tsc --noEmit && vitest run",
@@ -14,11 +15,8 @@
     "format": "biome format --write ./src",
     "lint": "biome lint ./src",
     "lint:fix": "biome lint --write ./src",
-    "clean": "rimraf lib",
-    "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"
+    "build": "tsup",
+    "prepare": "npm run build"
   },
   "keywords": [
     "graphviz",
@@ -37,13 +35,14 @@
     "vscode-languageserver-types": "^3.17.5"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.0.6",
+    "@biomejs/biome": "^2.1.1",
     "@vitest/coverage-v8": "^3.2.4",
     "rimraf": "^6.0.1",
+    "tsup": "^8.5.0",
     "typescript": "^5.8.3",
     "vitest": "^3.2.4"
   },
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   }
 }

package/.github/dependabot.yml

@@ -1,15 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "npm"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    groups:
-      patch-dependencies:
-        update-types:
-          - "patch"
-
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"

package/.github/workflows/CD.yml

@@ -1,37 +0,0 @@
-name: CD
-
-on:
-  push:
-    branches:
-    - "!*"
-    tags:
-    - "v*"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: read
-      id-token: write
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        show-progress: false
-
-    - uses: actions/setup-node@v4
-      with:
-        node-version: 24
-        cache: npm
-        registry-url: https://registry.npmjs.org
-
-    - run: npm ci
-    - run: npm run ci
-    - run: npm run build
-    - run: npm test
-      env:
-        CI: true
-    - run: npm publish --provenance --access public
-      env:
-        NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/.github/workflows/CI.yml

@@ -1,28 +0,0 @@
-name: CI
-
-on: [push]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [20.x, 22.x, 24.x]
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        show-progress: false
-
-    - uses: actions/setup-node@v4
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: npm
-
-    - run: npm ci
-    - run: npm run ci
-    - run: npm run build
-    - run: npm test
-      env:
-        CI: true

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

@@ -1,26 +0,0 @@
-name: Dependabot auto-merge
-
-# Taken and adapted from:
-# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#enable-auto-merge-on-a-pull-request
-
-on: pull_request
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  dependabot:
-    runs-on: ubuntu-latest
-    if: ${{ github.actor == 'dependabot[bot]' }}
-
-    steps:
-      - id: metadata
-        uses: dependabot/fetch-metadata@v2
-
-      - name: Enable auto-merge for Dependabot PRs
-        if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-patch' }}
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{ github.event.pull_request.html_url }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package/CITATION.cff

@@ -1,14 +0,0 @@
-cff-version: 1.2.0
-title: DOT Language Support
-message: If you use this software, please cite it using the metadata from this file.
-type: software
-authors:
-  - given-names: Niklas
-    family-names: Mollenhauer
-repository-code: 'https://github.com/nikeee/dot-language-support'
-abstract: A language service library for the DOT language (graphviz). Used by dot-language-server and edotor.net.
-keywords:
-  - dot
-  - graphviz
-  - language-server-protocol
-license: MIT

package/biome.json

@@ -1,48 +0,0 @@
-{
-	"$schema": "https://biomejs.dev/schemas/2.0.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": [
-		{
-			"includes": ["**/src/scanner.ts"],
-			"linter": {
-				"rules": {
-					"suspicious": {
-						"noAssignInExpressions": "off"
-					},
-					"style": {
-						"noParameterAssign": "off"
-					}
-				}
-			}
-		}
-	]
-}

package/lib/cjs/binder.d.ts

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

package/lib/cjs/binder.js

@@ -1,297 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-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);
-}
-function createBinder() {
-    let parent;
-    let symbolTable;
-    let colorTable;
-    let graphContext = 0;
-    function bind(node) {
-        if (!node)
-            return;
-        const saveParent = parent;
-        const saveContext = graphContext;
-        node.parent = saveParent;
-        node.graphContext = saveContext;
-        parent = node;
-        innerBind(node);
-        parent = saveParent;
-        graphContext = saveContext;
-    }
-    function innerBind(node) {
-        switch (node.kind) {
-            case types_js_1.SyntaxKind.DirectedGraph:
-            case types_js_1.SyntaxKind.UndirectedGraph:
-                return bindGraph(node);
-            case types_js_1.SyntaxKind.AttributeStatement:
-                return bindAttributeStatement(node);
-            case types_js_1.SyntaxKind.EdgeStatement:
-                return bindEdgeStatement(node);
-            case types_js_1.SyntaxKind.NodeStatement:
-                return bindNodeStatement(node);
-            case types_js_1.SyntaxKind.SubGraph:
-                return bindSubGraph(node);
-            case types_js_1.SyntaxKind.SubGraphStatement:
-                return bindSubGraphStatement(node);
-            case types_js_1.SyntaxKind.IdEqualsIdStatement:
-                return bindIdEqualsIdStatement(node);
-            case types_js_1.SyntaxKind.QuotedTextIdentifier:
-                return bindQuotedTextIdentifier(node);
-            case types_js_1.SyntaxKind.EdgeRhs:
-                return bindEdgeRhs(node);
-            case types_js_1.SyntaxKind.AttributeContainer:
-                return bindAttributeContainer(node);
-            case types_js_1.SyntaxKind.Assignment:
-                return bindAssignment(node);
-            case types_js_1.SyntaxKind.NormalPortDeclaration:
-                return bindNormalPortDeclaration(node);
-            case types_js_1.SyntaxKind.CompassPortDeclaration:
-                return bindCompassPortDeclaration(node);
-            case types_js_1.SyntaxKind.NodeId:
-                return bindNodeId(node);
-            default:
-                if (node.kind >= types_js_1.SyntaxKind.FirstNode)
-                    throw "TODO";
-        }
-    }
-    function bindGraph(node) {
-        if (node.strict) {
-            graphContext |= 2;
-        }
-        switch (node.kind) {
-            case types_js_1.SyntaxKind.DirectedGraph:
-                graphContext |= 4;
-                break;
-            case types_js_1.SyntaxKind.UndirectedGraph:
-                graphContext |= 8;
-                break;
-        }
-        if (node.id) {
-            ensureGlobalSymbol(node.id);
-            bind(node.id);
-        }
-        if (node.strict)
-            bind(node.strict);
-        bindChildren(node.statements);
-    }
-    function bindAttributeStatement(node) {
-        bind(node.subject);
-        bindChildren(node.attributes);
-        if (node.terminator)
-            bind(node.terminator);
-    }
-    function bindEdgeStatement(node) {
-        bindChildren(node.attributes);
-        bindChildren(node.rhs);
-        bind(node.source);
-        if (node.terminator)
-            bind(node.terminator);
-    }
-    function bindNodeStatement(node) {
-        bind(node.id);
-        bindChildren(node.attributes);
-        if (node.terminator)
-            bind(node.terminator);
-    }
-    function bindSubGraph(node) {
-        if (node.id) {
-            bind(node.id);
-        }
-        bindChildren(node.statements);
-    }
-    function bindSubGraphStatement(node) {
-        bind(node.subgraph);
-        if (node.terminator)
-            bind(node.terminator);
-    }
-    function bindIdEqualsIdStatement(node) {
-        bind(node.leftId);
-        bind(node.rightId);
-        if (node.rightId && !(0, checker_js_1.nodeContainsErrors)(node.rightId)) {
-            if (isAttributeName("color", node.leftId)) {
-                ensureGlobalColor(node.rightId);
-            }
-            else if (isAttributeName("fillcolor", node.leftId)) {
-                ensureGlobalColor(node.rightId);
-            }
-            else if (isAttributeName("bgcolor", node.leftId)) {
-                ensureGlobalColor(node.rightId);
-            }
-            else if (isAttributeName("fontcolor", node.leftId)) {
-                ensureGlobalColor(node.rightId);
-            }
-        }
-        if (node.terminator)
-            bind(node.terminator);
-    }
-    function bindQuotedTextIdentifier(node) {
-        bindChildren(node.values);
-        node.concatenation = node.values.map(v => v.text).join("");
-    }
-    function bindEdgeRhs(node) {
-        bind(node.operation);
-        bind(node.target);
-    }
-    function bindAttributeContainer(node) {
-        bind(node.openBracket);
-        bindChildren(node.assignments);
-        bind(node.closeBracket);
-    }
-    function bindAssignment(node) {
-        const attrContainer = node.parent;
-        console.assert(!!attrContainer);
-        const superParentStatement = attrContainer.parent;
-        console.assert(!!superParentStatement);
-        bind(node.leftId);
-        let carrierIdentifier;
-        switch (superParentStatement.kind) {
-            case types_js_1.SyntaxKind.NodeStatement:
-                carrierIdentifier = superParentStatement.id.id;
-                break;
-            case types_js_1.SyntaxKind.EdgeStatement:
-                break;
-            case types_js_1.SyntaxKind.SubGraphStatement:
-                break;
-            case types_js_1.SyntaxKind.AttributeStatement:
-                break;
-        }
-        if (carrierIdentifier)
-            ensureMemberSymbol(node.leftId, carrierIdentifier);
-        bind(node.rightId);
-        if (node.rightId && !(0, checker_js_1.nodeContainsErrors)(node.rightId)) {
-            if (isAttributeName("color", node.leftId)) {
-                ensureGlobalColor(node.rightId);
-            }
-        }
-        if (node.terminator)
-            bind(node.terminator);
-    }
-    function bindNormalPortDeclaration(node) {
-        bind(node.colon);
-        ensureGlobalSymbol(node.id);
-        bind(node.id);
-        if (node.compassPt)
-            bind(node.compassPt);
-    }
-    function bindCompassPortDeclaration(node) {
-        bind(node.colon);
-        if (node.compassPt)
-            bind(node.compassPt);
-    }
-    function bindNodeId(node) {
-        ensureGlobalSymbol(node.id);
-        bind(node.id);
-        if (node.port)
-            bind(node.port);
-    }
-    function bindChildren(nodes) {
-        for (const n of nodes)
-            bind(n);
-    }
-    function createSymbolTable() {
-        return new Map();
-    }
-    function createColorTable() {
-        return new Map();
-    }
-    function ensureMemberSymbol(node, carrier) {
-        if (node && carrier && (0, parser_js_1.isIdentifierNode)(node)) {
-            const name = (0, checker_js_1.getIdentifierText)(node);
-            if (name === undefined)
-                return;
-            const carrierSymbol = carrier.symbol;
-            if (carrierSymbol === undefined)
-                throw "carrierSymbol is undefined";
-            let symbols = carrierSymbol.members;
-            if (symbols === undefined)
-                carrierSymbol.members = symbols = createSymbolTable();
-            ensureSymbolOnTable(name, node, symbols);
-            return;
-        }
-        console.warn("ensureSymbol called on non-identifier node");
-        debugger;
-    }
-    function ensureGlobalSymbol(node) {
-        if (node && (0, parser_js_1.isIdentifierNode)(node)) {
-            const symbols = symbolTable;
-            const name = (0, checker_js_1.getIdentifierText)(node);
-            if (name === undefined)
-                return;
-            if (symbols === undefined)
-                throw "symbolTable is undefined";
-            ensureSymbolOnTable(name, node, symbols);
-            return;
-        }
-        console.warn("ensureSymbol called on non-identifier node");
-        debugger;
-    }
-    function ensureSymbolOnTable(name, node, symbols) {
-        if (!name)
-            return;
-        let sym = symbols.get(name);
-        if (sym === undefined) {
-            sym = createSymbol(name, node);
-            symbols.set(name, sym);
-        }
-        else {
-            if (!sym.references)
-                sym.references = [node];
-            else
-                sym.references.push(node);
-        }
-        node.symbol = sym;
-    }
-    function ensureGlobalColor(node) {
-        if (node && (0, parser_js_1.isIdentifierNode)(node)) {
-            const colors = colorTable;
-            const name = (0, checker_js_1.getIdentifierText)(node);
-            if (name === undefined)
-                return;
-            if (colors === undefined)
-                throw "symbolTable is undefined";
-            const color = createColor(node);
-            colors.set(name, color);
-            return;
-        }
-        console.warn("ensureSymbol called on non-identifier node");
-        debugger;
-    }
-    function createSymbol(name, node) {
-        if (!name)
-            throw "name is falsy";
-        if (!node)
-            throw "node is undefined or null";
-        return {
-            name,
-            firstMention: node,
-            references: undefined,
-        };
-    }
-    function createColor(node) {
-        return {
-            node,
-        };
-    }
-    function isAttributeName(name, id) {
-        return id ? (0, checker_js_1.getIdentifierText)(id).trim().toLowerCase() === name : false;
-    }
-    return {
-        bind: file => {
-            symbolTable = createSymbolTable();
-            colorTable = createColorTable();
-            const { graph } = file;
-            if (graph)
-                bind(graph);
-            file.symbols = symbolTable;
-            file.colors = colorTable;
-        },
-    };
-}
-//# sourceMappingURL=binder.js.map

package/lib/cjs/checker.d.ts

@@ -1,15 +0,0 @@
-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;
-export declare function findAllEdges(node: SyntaxNode): EdgeRhs[];
-export declare function findOptionalSemicolons(node: SyntaxNode): Token<SyntaxKind.SemicolonToken>[];
-export declare function findAllStatements<T extends Statement["kind"]>(node: SyntaxNode, kind?: T): StatementOf<T>[];
-export declare function isAttrStatement(node: SyntaxNode): node is AttributeStatement;
-export declare function isEdgeStatement(node: SyntaxNode): node is EdgeStatement;
-export declare function isSubGraphStatement(node: SyntaxNode): node is SubGraphStatement;
-export declare function isGraph(node: SyntaxNode): node is Graph;
-export declare function isNodeId(node: SyntaxNode): node is NodeId;
-export declare function edgeStatementHasAttributes(es: EdgeStatement): boolean;
-export declare function getIdentifierText(n: Identifier): string;
-export declare function nodeContainsErrors(node: SyntaxNode): boolean;