dot-language-support 1.7.0 → 2.0.3

package/.github/workflows/CD.yml

@@ -1,4 +1,4 @@
-name: Node.js CD
+name: CD
 
 on:
   push:
@@ -15,10 +15,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Use Node.js 16.x
+    - name: Use Node.js 18.x
       uses: actions/setup-node@v1
       with:
-        node-version: 16.x
+        node-version: 18.x
 
     - uses: actions/cache@v2
       with:

package/.github/workflows/CI.yml

@@ -1,4 +1,4 @@
-name: Node.js CI
+name: CI
 
 on: [push]
 
@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x, 16.x]
+        node-version: [14.x, 16.x, 18.x]
 
     steps:
     - uses: actions/checkout@v2

package/README.md

@@ -1,10 +1,11 @@
-# dot-language-support
-> [![Build Status](https://travis-ci.com/nikeee/dot-language-support.svg?branch=master)](https://travis-ci.com/nikeee/dot-language-support) ![Dependency Status](https://david-dm.org/nikeee/dot-language-support.svg) [![npm version](https://badge.fury.io/js/dot-language-support.svg)](https://www.npmjs.com/package/dot-language-support)
+# dot-language-support [![CD](https://github.com/nikeee/dot-language-support/actions/workflows/CD.yml/badge.svg)](https://github.com/nikeee/dot-language-support/actions/workflows/CD.yml) [![CI](https://github.com/nikeee/dot-language-support/actions/workflows/CI.yml/badge.svg)](https://github.com/nikeee/dot-language-support/actions/workflows/CI.yml) ![Dependencies](https://img.shields.io/librariesio/release/npm/dot-language-support) [![npm version](https://img.shields.io/npm/v/dot-language-support)](https://www.npmjs.com/package/dot-language-support)
+
+
 
 A language service library, written in TypeScript. Used by [dot-language-server](https://github.com/nikeee/dot-language-server) and [edotor.net](https://edotor.net).
 
 ## Features
-- Hightlight semantic and syntactic errors
+- Highlight semantic and syntactic errors
 - Auto completion for colors and shapes
 - Code Actions:
     - Refactoring Graphs to Digraphs and vice-versa
@@ -12,6 +13,6 @@ A language service library, written in TypeScript. Used by [dot-language-server]
     - Refactor edges to sub graphs
 
 ## Installation
-```Shell
+```sh
 npm -S i dot-language-support
 ```

package/jest.config.mjs

@@ -0,0 +1,19 @@
+/** @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;

package/lib/{binder.d.ts → cjs/binder.d.ts}

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

package/lib/{binder.js → cjs/binder.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bindSourceFile = void 0;
-const types_1 = require("./types");
-const checker_1 = require("./checker");
-const parser_1 = require("./parser");
+const types_js_1 = require("./types.js");
+const checker_js_1 = require("./checker.js");
+const parser_js_1 = require("./parser.js");
 const binder = createBinder();
 function bindSourceFile(file) {
     binder.bind(file);
@@ -28,37 +28,37 @@ function createBinder() {
     }
     function innerBind(node) {
         switch (node.kind) {
-            case types_1.SyntaxKind.DirectedGraph:
-            case types_1.SyntaxKind.UndirectedGraph:
+            case types_js_1.SyntaxKind.DirectedGraph:
+            case types_js_1.SyntaxKind.UndirectedGraph:
                 return bindGraph(node);
-            case types_1.SyntaxKind.AttributeStatement:
+            case types_js_1.SyntaxKind.AttributeStatement:
                 return bindAttributeStatement(node);
-            case types_1.SyntaxKind.EdgeStatement:
+            case types_js_1.SyntaxKind.EdgeStatement:
                 return bindEdgeStatement(node);
-            case types_1.SyntaxKind.NodeStatement:
+            case types_js_1.SyntaxKind.NodeStatement:
                 return bindNodeStatement(node);
-            case types_1.SyntaxKind.SubGraph:
+            case types_js_1.SyntaxKind.SubGraph:
                 return bindSubGraph(node);
-            case types_1.SyntaxKind.SubGraphStatement:
+            case types_js_1.SyntaxKind.SubGraphStatement:
                 return bindSubGraphStatement(node);
-            case types_1.SyntaxKind.IdEqualsIdStatement:
+            case types_js_1.SyntaxKind.IdEqualsIdStatement:
                 return bindIdEqualsIdStatement(node);
-            case types_1.SyntaxKind.QuotedTextIdentifier:
+            case types_js_1.SyntaxKind.QuotedTextIdentifier:
                 return bindQuotedTextIdentifier(node);
-            case types_1.SyntaxKind.EdgeRhs:
+            case types_js_1.SyntaxKind.EdgeRhs:
                 return bindEdgeRhs(node);
-            case types_1.SyntaxKind.AttributeContainer:
+            case types_js_1.SyntaxKind.AttributeContainer:
                 return bindAttributeContainer(node);
-            case types_1.SyntaxKind.Assignment:
+            case types_js_1.SyntaxKind.Assignment:
                 return bindAssignment(node);
-            case types_1.SyntaxKind.NormalPortDeclaration:
+            case types_js_1.SyntaxKind.NormalPortDeclaration:
                 return bindNormalPortDeclaration(node);
-            case types_1.SyntaxKind.CompassPortDeclaration:
+            case types_js_1.SyntaxKind.CompassPortDeclaration:
                 return bindCompassPortDeclaration(node);
-            case types_1.SyntaxKind.NodeId:
+            case types_js_1.SyntaxKind.NodeId:
                 return bindNodeId(node);
             default:
-                if (node.kind >= types_1.SyntaxKind.FirstNode)
+                if (node.kind >= types_js_1.SyntaxKind.FirstNode)
                     throw "TODO";
         }
     }
@@ -67,10 +67,10 @@ function createBinder() {
             graphContext |= 2;
         }
         switch (node.kind) {
-            case types_1.SyntaxKind.DirectedGraph:
+            case types_js_1.SyntaxKind.DirectedGraph:
                 graphContext |= 4;
                 break;
-            case types_1.SyntaxKind.UndirectedGraph:
+            case types_js_1.SyntaxKind.UndirectedGraph:
                 graphContext |= 8;
                 break;
         }
@@ -117,7 +117,7 @@ function createBinder() {
     function bindIdEqualsIdStatement(node) {
         bind(node.leftId);
         bind(node.rightId);
-        if (node.rightId && !(0, checker_1.nodeContainsErrors)(node.rightId)) {
+        if (node.rightId && !(0, checker_js_1.nodeContainsErrors)(node.rightId)) {
             if (isAttributeName("color", node.leftId)) {
                 ensureGlobalColor(node.rightId);
             }
@@ -155,20 +155,20 @@ function createBinder() {
         bind(node.leftId);
         let carrierIdentifier = undefined;
         switch (superParentStatement.kind) {
-            case types_1.SyntaxKind.NodeStatement:
+            case types_js_1.SyntaxKind.NodeStatement:
                 carrierIdentifier = superParentStatement.id.id;
                 break;
-            case types_1.SyntaxKind.EdgeStatement:
+            case types_js_1.SyntaxKind.EdgeStatement:
                 break;
-            case types_1.SyntaxKind.SubGraphStatement:
+            case types_js_1.SyntaxKind.SubGraphStatement:
                 break;
-            case types_1.SyntaxKind.AttributeStatement:
+            case types_js_1.SyntaxKind.AttributeStatement:
                 break;
         }
         if (carrierIdentifier)
             ensureMemberSymbol(node.leftId, carrierIdentifier);
         bind(node.rightId);
-        if (node.rightId && !(0, checker_1.nodeContainsErrors)(node.rightId)) {
+        if (node.rightId && !(0, checker_js_1.nodeContainsErrors)(node.rightId)) {
             if (isAttributeName("color", node.leftId)) {
                 ensureGlobalColor(node.rightId);
             }
@@ -205,8 +205,8 @@ function createBinder() {
         return new Map();
     }
     function ensureMemberSymbol(node, carrier) {
-        if (node && carrier && (0, parser_1.isIdentifierNode)(node)) {
-            const name = (0, checker_1.getIdentifierText)(node);
+        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;
@@ -222,9 +222,9 @@ function createBinder() {
         debugger;
     }
     function ensureGlobalSymbol(node) {
-        if (node && (0, parser_1.isIdentifierNode)(node)) {
+        if (node && (0, parser_js_1.isIdentifierNode)(node)) {
             const symbols = symbolTable;
-            const name = (0, checker_1.getIdentifierText)(node);
+            const name = (0, checker_js_1.getIdentifierText)(node);
             if (name === undefined)
                 return;
             if (symbols === undefined)
@@ -252,9 +252,9 @@ function createBinder() {
         node.symbol = sym;
     }
     function ensureGlobalColor(node) {
-        if (node && (0, parser_1.isIdentifierNode)(node)) {
+        if (node && (0, parser_js_1.isIdentifierNode)(node)) {
             const colors = colorTable;
-            const name = (0, checker_1.getIdentifierText)(node);
+            const name = (0, checker_js_1.getIdentifierText)(node);
             if (name === undefined)
                 return;
             if (colors === undefined)
@@ -283,7 +283,7 @@ function createBinder() {
         };
     }
     function isAttributeName(name, id) {
-        return id ? (0, checker_1.getIdentifierText)(id).trim().toLowerCase() === name : false;
+        return id ? (0, checker_js_1.getIdentifierText)(id).trim().toLowerCase() === name : false;
     }
     return {
         bind: file => {

package/lib/{checker.d.ts → cjs/checker.d.ts}

@@ -1,4 +1,4 @@
-import { SyntaxNode, Identifier, SyntaxKind, Graph, EdgeStatement, EdgeRhs, SourceFile, SubGraphStatement, NodeId, AttributeStatement, Statement, StatementOf, Token } from "./types";
+import { SyntaxNode, Identifier, SyntaxKind, Graph, EdgeStatement, EdgeRhs, SourceFile, SubGraphStatement, NodeId, AttributeStatement, Statement, StatementOf, 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;

package/lib/{checker.js → cjs/checker.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nodeContainsErrors = exports.getIdentifierText = exports.edgeStatementHasAttributes = exports.isNodeId = exports.isSubGraphStatement = exports.isEdgeStatement = exports.isAttrStatement = exports.findAllStatements = exports.findOptionalSemicolons = exports.findAllEdges = exports.getAllowedEdgeOperation = exports.findNodeAtOffset = exports.checkSourceFile = void 0;
-const types_1 = require("./types");
-const util_1 = require("./service/util");
-const visitor_1 = require("./visitor");
+const types_js_1 = require("./types.js");
+const util_js_1 = require("./service/util.js");
+const visitor_js_1 = require("./visitor.js");
 function checkSourceFile(file) {
     const g = file.graph;
     if (g) {
@@ -33,16 +33,16 @@ function findNodeAtOffset(root, offset, inclusiveEnd = false) {
     if (root.pos === offset && root.pos === root.end)
         return root;
     if (rangeContainsOffset(root, offset, inclusiveEnd)) {
-        const narrowerChild = (0, visitor_1.forEachChild)(root, child => findNodeAtOffset(child, offset, inclusiveEnd));
+        const narrowerChild = (0, visitor_js_1.forEachChild)(root, child => findNodeAtOffset(child, offset, inclusiveEnd));
         return narrowerChild ? narrowerChild : root;
     }
     return undefined;
 }
 exports.findNodeAtOffset = findNodeAtOffset;
 function getAllowedEdgeOperation(graph) {
-    return graph.kind === types_1.SyntaxKind.DirectedGraph
-        ? types_1.SyntaxKind.DirectedEdgeOp
-        : types_1.SyntaxKind.UndirectedEdgeOp;
+    return graph.kind === types_js_1.SyntaxKind.DirectedGraph
+        ? types_js_1.SyntaxKind.DirectedEdgeOp
+        : types_js_1.SyntaxKind.UndirectedEdgeOp;
 }
 exports.getAllowedEdgeOperation = getAllowedEdgeOperation;
 function checkGraphSemantics(file, root) {
@@ -54,7 +54,7 @@ function checkGraphSemantics(file, root) {
 }
 function findAllEdges(node) {
     const allEdges = [];
-    (0, visitor_1.forEachChild)(node, child => {
+    (0, visitor_js_1.forEachChild)(node, child => {
         if (isEdgeStatement(child)) {
             if (child.rhs && child.rhs.length > 0) {
                 for (const edgeRhs of child.rhs)
@@ -75,15 +75,15 @@ function findOptionalSemicolons(node) {
 }
 exports.findOptionalSemicolons = findOptionalSemicolons;
 function isStatement(node) {
-    return node.kind === types_1.SyntaxKind.SubGraphStatement
-        || node.kind === types_1.SyntaxKind.EdgeStatement
-        || node.kind === types_1.SyntaxKind.NodeStatement
-        || node.kind === types_1.SyntaxKind.IdEqualsIdStatement
-        || node.kind === types_1.SyntaxKind.AttributeStatement;
+    return node.kind === types_js_1.SyntaxKind.SubGraphStatement
+        || node.kind === types_js_1.SyntaxKind.EdgeStatement
+        || node.kind === types_js_1.SyntaxKind.NodeStatement
+        || node.kind === types_js_1.SyntaxKind.IdEqualsIdStatement
+        || node.kind === types_js_1.SyntaxKind.AttributeStatement;
 }
 function findAllStatements(node, kind) {
     const allStatements = [];
-    (0, visitor_1.forEachChild)(node, child => {
+    (0, visitor_js_1.forEachChild)(node, child => {
         if ((kind === undefined && isStatement(child)) || (child.kind === kind)) {
             allStatements.push(child);
         }
@@ -106,14 +106,14 @@ function findEdgeErrors(expectedEdgeOp, node) {
     return undefined;
 }
 function createEdgeViolationDiagnostics(file, expectedEdgeOp, violators) {
-    const op = expectedEdgeOp === types_1.SyntaxKind.UndirectedEdgeOp ? "--" : "->";
-    const graphType = expectedEdgeOp === types_1.SyntaxKind.UndirectedEdgeOp ? "undirected" : "directed";
+    const op = expectedEdgeOp === types_js_1.SyntaxKind.UndirectedEdgeOp ? "--" : "->";
+    const graphType = expectedEdgeOp === types_js_1.SyntaxKind.UndirectedEdgeOp ? "undirected" : "directed";
     const message = `Invalid edge operation, use "${op}" in ${graphType} graph`;
     const code = createCheckerError(0);
-    const category = types_1.DiagnosticCategory.Error;
+    const category = types_js_1.DiagnosticCategory.Error;
     violators.forEach(edge => edge.operation.flags |= 2);
     return violators.map(edge => {
-        const start = (0, util_1.getStart)(file, edge.operation);
+        const start = (0, util_js_1.getStart)(file, edge.operation);
         const end = edge.operation.end;
         return {
             message,
@@ -133,22 +133,22 @@ function getInvalidEdgeRhs(allowedOp, edges) {
     return res;
 }
 function isAttrStatement(node) {
-    return node.kind === types_1.SyntaxKind.AttributeStatement;
+    return node.kind === types_js_1.SyntaxKind.AttributeStatement;
 }
 exports.isAttrStatement = isAttrStatement;
 function isEdgeStatement(node) {
-    return node.kind === types_1.SyntaxKind.EdgeStatement;
+    return node.kind === types_js_1.SyntaxKind.EdgeStatement;
 }
 exports.isEdgeStatement = isEdgeStatement;
 function isSubGraphStatement(node) {
-    return node.kind === types_1.SyntaxKind.SubGraphStatement;
+    return node.kind === types_js_1.SyntaxKind.SubGraphStatement;
 }
 exports.isSubGraphStatement = isSubGraphStatement;
 function isGraph(node) {
-    return node.kind === types_1.SyntaxKind.DirectedGraph || node.kind === types_1.SyntaxKind.UndirectedGraph;
+    return node.kind === types_js_1.SyntaxKind.DirectedGraph || node.kind === types_js_1.SyntaxKind.UndirectedGraph;
 }
 function isNodeId(node) {
-    return node.kind === types_1.SyntaxKind.NodeId;
+    return node.kind === types_js_1.SyntaxKind.NodeId;
 }
 exports.isNodeId = isNodeId;
 function edgeStatementHasAttributes(es) {
@@ -159,16 +159,16 @@ function edgeStatementHasAttributes(es) {
 exports.edgeStatementHasAttributes = edgeStatementHasAttributes;
 function getIdentifierText(n) {
     switch (n.kind) {
-        case types_1.SyntaxKind.HtmlIdentifier:
+        case types_js_1.SyntaxKind.HtmlIdentifier:
             return n.htmlContent;
-        case types_1.SyntaxKind.TextIdentifier:
+        case types_js_1.SyntaxKind.TextIdentifier:
             return n.text;
-        case types_1.SyntaxKind.NumericIdentifier:
+        case types_js_1.SyntaxKind.NumericIdentifier:
             return n.text;
-        case types_1.SyntaxKind.QuotedTextIdentifier:
+        case types_js_1.SyntaxKind.QuotedTextIdentifier:
             return n.concatenation;
         default:
-            return (0, util_1.assertNever)(n);
+            return (0, util_js_1.assertNever)(n);
     }
 }
 exports.getIdentifierText = getIdentifierText;

package/lib/{error.d.ts → cjs/error.d.ts}

@@ -1,3 +1,3 @@
-import type { ErrorCode } from "./types";
+import type { ErrorCode } from "./types.js";
 export declare const diagnosicSource = "DOT";
 export declare function formatError(error: ErrorCode): string;

package/lib/cjs/index.d.ts

@@ -0,0 +1,5 @@
+export * from "./types.js";
+export * from "./scanner.js";
+export * from "./parser.js";
+export * from "./visitor.js";
+export * from "./service/service.js";

package/lib/{index.js → cjs/index.js}

@@ -14,9 +14,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./types"), exports);
-__exportStar(require("./scanner"), exports);
-__exportStar(require("./parser"), exports);
-__exportStar(require("./visitor"), exports);
-__exportStar(require("./service/service"), exports);
+__exportStar(require("./types.js"), exports);
+__exportStar(require("./scanner.js"), exports);
+__exportStar(require("./parser.js"), exports);
+__exportStar(require("./visitor.js"), exports);
+__exportStar(require("./service/service.js"), exports);
 //# sourceMappingURL=index.js.map

package/lib/{parser.d.ts → cjs/parser.d.ts}

@@ -1,4 +1,4 @@
-import { Scanner } from "./scanner";
+import { Scanner } from "./scanner.js";
 import { SyntaxKind, SourceFile, Identifier, SyntaxNode, DiagnosticMessage } from "./types";
 export declare enum ParsingContext {
     None = 0,

package/lib/{parser.js → cjs/parser.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isIdentifierNode = exports.isIdentifier = exports.Parser = exports.ParsingContext = void 0;
-const scanner_1 = require("./scanner");
-const util_1 = require("./service/util");
+const scanner_js_1 = require("./scanner.js");
+const util_js_1 = require("./service/util.js");
 const types_1 = require("./types");
 var ParsingContext;
 (function (ParsingContext) {
@@ -18,7 +18,7 @@ class Parser {
     constructor() {
         this.currentToken = types_1.SyntaxKind.Unknown;
         this.identifierCount = 0;
-        this.scanner = new scanner_1.DefaultScanner();
+        this.scanner = new scanner_js_1.DefaultScanner();
         this.resetState();
     }
     resetState() {
@@ -269,13 +269,13 @@ class Parser {
         node.terminator = this.parseOptionalToken(types_1.SyntaxKind.SemicolonToken);
         return this.finishNode(node);
     }
-    parseEdgeStatement(preceedingItem) {
-        console.assert(preceedingItem.kind === types_1.SyntaxKind.SubGraph || preceedingItem.kind === types_1.SyntaxKind.NodeId);
-        console.assert(preceedingItem.pos !== undefined);
+    parseEdgeStatement(precedingItem) {
+        console.assert(precedingItem.kind === types_1.SyntaxKind.SubGraph || precedingItem.kind === types_1.SyntaxKind.NodeId);
+        console.assert(precedingItem.pos !== undefined);
         if (!this.isEdgeOp())
             debugger;
-        const node = this.createNode(types_1.SyntaxKind.EdgeStatement, preceedingItem.pos);
-        node.source = preceedingItem;
+        const node = this.createNode(types_1.SyntaxKind.EdgeStatement, precedingItem.pos);
+        node.source = precedingItem;
         node.rhs = this.parseList(ParsingContext.EdgeRhsList, () => this.parseEdgeRhs());
         if (this.token() === types_1.SyntaxKind.OpenBracketToken) {
             node.attributes = this.parseList(ParsingContext.AttributeContainerList, () => this.parseAttributeContainer());
@@ -427,7 +427,7 @@ class Parser {
             case ParsingContext.Count:
                 return "Wat, 'Count' parsing context";
             default:
-                return (0, util_1.assertNever)(context);
+                return (0, util_js_1.assertNever)(context);
         }
     }
     isInSomeParsingContext() {
@@ -559,13 +559,13 @@ class Parser {
             ? "identifier"
             : this.token() === types_1.SyntaxKind.EndOfFileToken
                 ? "end of file"
-                : `"${(0, scanner_1.getTokenAsText)(this.token())}"`;
+                : `"${(0, scanner_js_1.getTokenAsText)(this.token())}"`;
         const expected = expectedKinds.map(k => {
             if (isIdentifier(k))
                 return "identifier";
             else if (k === types_1.SyntaxKind.EndOfFileToken)
                 return "end of file";
-            return `"${(0, scanner_1.getTokenAsText)(k)}"`;
+            return `"${(0, scanner_js_1.getTokenAsText)(k)}"`;
         });
         const lastExpected = expected.pop();
         const expectedJoined = expected.join(", ");

package/lib/{scanner.d.ts → cjs/scanner.d.ts}

@@ -1,4 +1,4 @@
-import { SyntaxKind, TokenFlags, DiagnosticCategory, ScanError } from "./types";
+import { SyntaxKind, TokenFlags, DiagnosticCategory, ScanError } from "./types.js";
 export interface Scanner {
     readonly end: number;
     readonly pos: number;