dot-language-support 2.1.1 → 2.2.0

package/lib/cjs/checker.js

@@ -4,6 +4,7 @@ exports.nodeContainsErrors = exports.getIdentifierText = exports.edgeStatementHa
 const types_js_1 = require("./types.js");
 const util_js_1 = require("./service/util.js");
 const visitor_js_1 = require("./visitor.js");
+const languageFacts_js_1 = require("./service/languageFacts.js");
 function checkSourceFile(file) {
     const g = file.graph;
     if (g) {
@@ -48,9 +49,46 @@ exports.getAllowedEdgeOperation = getAllowedEdgeOperation;
 function checkGraphSemantics(file, root) {
     const expectedEdgeOp = getAllowedEdgeOperation(root);
     const invalidEdgeRhses = findEdgeErrors(expectedEdgeOp, root);
-    return invalidEdgeRhses == undefined || invalidEdgeRhses.length === 0
-        ? undefined
+    const invalidShapes = checkShapeLabelValues(root);
+    const invalidEdgeDiagnostics = invalidEdgeRhses == undefined || invalidEdgeRhses.length === 0
+        ? []
         : createEdgeViolationDiagnostics(file, expectedEdgeOp, invalidEdgeRhses);
+    return [...invalidEdgeDiagnostics, ...invalidShapes];
+}
+function forEachAssignmentTransitive(root, cb) {
+    (0, visitor_js_1.forEachChild)(root, child => {
+        if (child.kind === types_js_1.SyntaxKind.Assignment) {
+            cb(child);
+            return;
+        }
+        (0, visitor_js_1.forEachChild)(child, c => forEachAssignmentTransitive(c, cb));
+    });
+}
+function checkShapeLabelValues(root) {
+    const invalidShapes = [];
+    forEachAssignmentTransitive(root, assignment => {
+        const { leftId, rightId } = assignment;
+        if (leftId.kind !== types_js_1.SyntaxKind.TextIdentifier || rightId.kind !== types_js_1.SyntaxKind.TextIdentifier) {
+            return;
+        }
+        const leftText = leftId.text.trim();
+        if (leftText.toLocaleLowerCase() !== "shape") {
+            return;
+        }
+        const rightText = rightId.text.trim();
+        const shapeCandidate = rightText.toLowerCase();
+        if (languageFacts_js_1.shapes.includes(shapeCandidate)) {
+            return;
+        }
+        invalidShapes.push({
+            category: types_js_1.DiagnosticCategory.Warning,
+            code: createCheckerError(1),
+            message: `Unknown shape "${rightText}".`,
+            start: assignment.pos,
+            end: assignment.end,
+        });
+    });
+    return invalidShapes;
 }
 function findAllEdges(node) {
     const allEdges = [];

package/lib/cjs/parser.js

@@ -13,7 +13,7 @@ var ParsingContext;
     ParsingContext[ParsingContext["EdgeRhsList"] = 4] = "EdgeRhsList";
     ParsingContext[ParsingContext["QuotedTextIdentifierConcatenation"] = 5] = "QuotedTextIdentifierConcatenation";
     ParsingContext[ParsingContext["Count"] = 6] = "Count";
-})(ParsingContext = exports.ParsingContext || (exports.ParsingContext = {}));
+})(ParsingContext || (exports.ParsingContext = ParsingContext = {}));
 class Parser {
     constructor() {
         this.currentToken = types_1.SyntaxKind.Unknown;

package/lib/cjs/service/codeAction.js

@@ -179,6 +179,8 @@ function getCheckerErrorCommand(_doc, file, d, code) {
                 convertToThisWrongType,
             ];
         }
+        case 1:
+            return undefined;
     }
 }
 function convertGraphTypeCommand(file, graph, changeToGraphType) {

package/lib/cjs/types.d.ts

@@ -26,7 +26,8 @@ export declare const enum ScanError {
     Unterminated = 1
 }
 export declare const enum CheckError {
-    InvalidEdgeOperation = 0
+    InvalidEdgeOperation = 0,
+    InvalidShapeName = 1
 }
 export interface DiagnosticMessage {
     message: string;

package/lib/cjs/types.js

@@ -7,7 +7,7 @@ var DiagnosticCategory;
     DiagnosticCategory[DiagnosticCategory["Warning"] = 2] = "Warning";
     DiagnosticCategory[DiagnosticCategory["Message"] = 3] = "Message";
     DiagnosticCategory[DiagnosticCategory["Suggestion"] = 4] = "Suggestion";
-})(DiagnosticCategory = exports.DiagnosticCategory || (exports.DiagnosticCategory = {}));
+})(DiagnosticCategory || (exports.DiagnosticCategory = DiagnosticCategory = {}));
 var SyntaxKind;
 (function (SyntaxKind) {
     SyntaxKind[SyntaxKind["Unknown"] = 0] = "Unknown";
@@ -70,5 +70,5 @@ var SyntaxKind;
     SyntaxKind[SyntaxKind["CompassBegin"] = 18] = "CompassBegin";
     SyntaxKind[SyntaxKind["CompassEnd"] = 27] = "CompassEnd";
     SyntaxKind[SyntaxKind["LastKeyword"] = 38] = "LastKeyword";
-})(SyntaxKind = exports.SyntaxKind || (exports.SyntaxKind = {}));
+})(SyntaxKind || (exports.SyntaxKind = SyntaxKind = {}));
 //# sourceMappingURL=types.js.map

package/lib/esm/checker.js

@@ -1,6 +1,7 @@
 import { SyntaxKind, DiagnosticCategory, } from "./types.js";
 import { assertNever, getStart } from "./service/util.js";
 import { forEachChild } from "./visitor.js";
+import { shapes as validShapes } from "./service/languageFacts.js";
 export function checkSourceFile(file) {
     const g = file.graph;
     if (g) {
@@ -42,9 +43,46 @@ export function getAllowedEdgeOperation(graph) {
 function checkGraphSemantics(file, root) {
     const expectedEdgeOp = getAllowedEdgeOperation(root);
     const invalidEdgeRhses = findEdgeErrors(expectedEdgeOp, root);
-    return invalidEdgeRhses == undefined || invalidEdgeRhses.length === 0
-        ? undefined
+    const invalidShapes = checkShapeLabelValues(root);
+    const invalidEdgeDiagnostics = invalidEdgeRhses == undefined || invalidEdgeRhses.length === 0
+        ? []
         : createEdgeViolationDiagnostics(file, expectedEdgeOp, invalidEdgeRhses);
+    return [...invalidEdgeDiagnostics, ...invalidShapes];
+}
+function forEachAssignmentTransitive(root, cb) {
+    forEachChild(root, child => {
+        if (child.kind === SyntaxKind.Assignment) {
+            cb(child);
+            return;
+        }
+        forEachChild(child, c => forEachAssignmentTransitive(c, cb));
+    });
+}
+function checkShapeLabelValues(root) {
+    const invalidShapes = [];
+    forEachAssignmentTransitive(root, assignment => {
+        const { leftId, rightId } = assignment;
+        if (leftId.kind !== SyntaxKind.TextIdentifier || rightId.kind !== SyntaxKind.TextIdentifier) {
+            return;
+        }
+        const leftText = leftId.text.trim();
+        if (leftText.toLocaleLowerCase() !== "shape") {
+            return;
+        }
+        const rightText = rightId.text.trim();
+        const shapeCandidate = rightText.toLowerCase();
+        if (validShapes.includes(shapeCandidate)) {
+            return;
+        }
+        invalidShapes.push({
+            category: DiagnosticCategory.Warning,
+            code: createCheckerError(1),
+            message: `Unknown shape "${rightText}".`,
+            start: assignment.pos,
+            end: assignment.end,
+        });
+    });
+    return invalidShapes;
 }
 export function findAllEdges(node) {
     const allEdges = [];

package/lib/esm/service/codeAction.js

@@ -152,6 +152,8 @@ function getCheckerErrorCommand(_doc, file, d, code) {
                 convertToThisWrongType,
             ];
         }
+        case 1:
+            return undefined;
     }
 }
 function convertGraphTypeCommand(file, graph, changeToGraphType) {

package/lib/esm/types.d.ts

@@ -26,7 +26,8 @@ export declare const enum ScanError {
     Unterminated = 1
 }
 export declare const enum CheckError {
-    InvalidEdgeOperation = 0
+    InvalidEdgeOperation = 0,
+    InvalidShapeName = 1
 }
 export interface DiagnosticMessage {
     message: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dot-language-support",
-  "version": "2.1.1",
+  "version": "2.2.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.31.1",
+    "@vitest/coverage-v8": "^0.32.4",
     "rimraf": "^5.0.1",
-    "typescript": "^5.0.4",
-    "vitest": "^0.31.1"
+    "typescript": "^5.1.6",
+    "vitest": "^0.32.4"
   },
   "engines": {
     "node": ">=18"