dot-language-support 2.0.9 → 2.1.0

package/.github/workflows/CD.yml

@@ -11,21 +11,24 @@ jobs:
   build:
     runs-on: ubuntu-latest
 
+    permissions:
+      contents: read
+      id-token: write
+
     steps:
     - uses: actions/checkout@v3
 
-    - name: Use Node.js 18
-      uses: actions/setup-node@v3
+    - uses: actions/setup-node@v3
       with:
-        node-version: 18
+        node-version: 20
         cache: npm
         registry-url: https://registry.npmjs.org
 
-    - run: npm ci --legacy-peer-deps
+    - run: npm ci
     - run: npm run compile
     - run: npm test
       env:
         CI: true
-    - run: npm publish
+    - run: npm publish --provenance --access public
       env:
         NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

package/.github/workflows/CI.yml

@@ -8,18 +8,17 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x, 18.x, 19.x]
+        node-version: [16.x, 18.x, 19.x, 20.x]
 
     steps:
     - uses: actions/checkout@v3
 
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v3
+    - uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
         cache: npm
 
-    - run: npm ci --legacy-peer-deps
+    - run: npm ci
     - run: npm run compile
     - run: npm test
       env:

package/CITATION.cff

@@ -0,0 +1,14 @@
+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/lib/cjs/service/hover.js

@@ -27,13 +27,36 @@ function getNodeHover(doc, sf, n) {
     }
     return undefined;
 }
+function getAssignedLabel(statement) {
+    const assignments = statement.attributes.flatMap(a => a.assignments);
+    const assignedLabel = assignments === null || assignments === void 0 ? void 0 : assignments.find(a => (0, checker_js_1.getIdentifierText)(a.leftId) === "label");
+    return (assignedLabel === null || assignedLabel === void 0 ? void 0 : assignedLabel.rightId) ? (0, checker_js_1.getIdentifierText)(assignedLabel.rightId) : undefined;
+}
 function getHoverContents(n) {
+    var _a, _b, _c;
     if ((0, parser_js_1.isIdentifierNode)(n)) {
         const parent = n.parent;
         if (parent) {
             switch (parent.kind) {
-                case types_js_1.SyntaxKind.NodeId:
+                case types_js_1.SyntaxKind.NodeId: {
+                    if ((_a = n.symbol) === null || _a === void 0 ? void 0 : _a.references) {
+                        const nodeIdentifierRefs = (_b = n.symbol) === null || _b === void 0 ? void 0 : _b.references;
+                        const labelMentions = nodeIdentifierRefs.map(e => { var _a, _b, _c; return (_c = (_b = (_a = e.symbol) === null || _a === void 0 ? void 0 : _a.members) === null || _b === void 0 ? void 0 : _b.get("label")) === null || _c === void 0 ? void 0 : _c.firstMention.parent; });
+                        for (let i = labelMentions.length; i > 0; i--) {
+                            const s = labelMentions[i];
+                            if (s === null || s === void 0 ? void 0 : s.rightId) {
+                                return `(node) ${(0, checker_js_1.getIdentifierText)(n)}: ${(0, checker_js_1.getIdentifierText)(s.rightId)}`;
+                            }
+                        }
+                    }
+                    else if (((_c = parent.parent) === null || _c === void 0 ? void 0 : _c.kind) === types_js_1.SyntaxKind.NodeStatement) {
+                        const label = getAssignedLabel(parent.parent);
+                        if (label) {
+                            return `(node) ${(0, checker_js_1.getIdentifierText)(n)}: ${label}`;
+                        }
+                    }
                     return `(node) ${(0, checker_js_1.getIdentifierText)(n)}`;
+                }
                 case types_js_1.SyntaxKind.Assignment: {
                     const assignment = parent;
                     const left = (0, checker_js_1.getIdentifierText)(assignment.leftId);

package/lib/esm/service/hover.js

@@ -23,13 +23,35 @@ function getNodeHover(doc, sf, n) {
     }
     return undefined;
 }
+function getAssignedLabel(statement) {
+    const assignments = statement.attributes.flatMap(a => a.assignments);
+    const assignedLabel = assignments?.find(a => getIdentifierText(a.leftId) === "label");
+    return assignedLabel?.rightId ? getIdentifierText(assignedLabel.rightId) : undefined;
+}
 function getHoverContents(n) {
     if (isIdentifierNode(n)) {
         const parent = n.parent;
         if (parent) {
             switch (parent.kind) {
-                case SyntaxKind.NodeId:
+                case SyntaxKind.NodeId: {
+                    if (n.symbol?.references) {
+                        const nodeIdentifierRefs = n.symbol?.references;
+                        const labelMentions = nodeIdentifierRefs.map(e => e.symbol?.members?.get("label")?.firstMention.parent);
+                        for (let i = labelMentions.length; i > 0; i--) {
+                            const s = labelMentions[i];
+                            if (s?.rightId) {
+                                return `(node) ${getIdentifierText(n)}: ${getIdentifierText(s.rightId)}`;
+                            }
+                        }
+                    }
+                    else if (parent.parent?.kind === SyntaxKind.NodeStatement) {
+                        const label = getAssignedLabel(parent.parent);
+                        if (label) {
+                            return `(node) ${getIdentifierText(n)}: ${label}`;
+                        }
+                    }
                     return `(node) ${getIdentifierText(n)}`;
+                }
                 case SyntaxKind.Assignment: {
                     const assignment = parent;
                     const left = getIdentifierText(assignment.leftId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dot-language-support",
-  "version": "2.0.9",
+  "version": "2.1.0",
   "description": "Parser and language service for graphviz (dot) files",
   "author": "Niklas Mollenhauer",
   "license": "MIT",
@@ -33,10 +33,10 @@
     "vscode-languageserver-types": "^3.17.3"
   },
   "devDependencies": {
-    "@vitest/coverage-c8": "^0.29.7",
-    "rimraf": "^4.4.1",
-    "typescript": "^5.0.2",
-    "vitest": "^0.29.7"
+    "@vitest/coverage-c8": "^0.31.1",
+    "rimraf": "^5.0.1",
+    "typescript": "^5.0.4",
+    "vitest": "^0.31.1"
   },
   "engines": {
     "node": ">=18"

package/jest.config.mjs

@@ -1,19 +0,0 @@
-/** @type {import("@jest/types").Config.ProjectConfig} */
-const config = {
-	preset: "ts-jest",
-	testEnvironment: "node",
-	transform: {
-		"\\.[jt]sx?$": "ts-jest",
-	},
-	globals: {
-		"ts-jest": {
-			"useESM": true,
-		},
-	},
-	moduleNameMapper: {
-		"(.+)\\.js": "$1",
-	},
-	extensionsToTreatAsEsm: [".ts"],
-};
-
-export default config;