dot-language-support 2.2.2 → 2.2.4

package/lib/esm/checker.js

@@ -1,7 +1,7 @@
-import { SyntaxKind, DiagnosticCategory, } from "./types.js";
+import { shapes as validShapes } from "./service/languageFacts.js";
 import { assertNever, getStart } from "./service/util.js";
+import { DiagnosticCategory, SyntaxKind, } from "./types.js";
 import { forEachChild } from "./visitor.js";
-import { shapes as validShapes } from "./service/languageFacts.js";
 export function checkSourceFile(file) {
     const g = file.graph;
     if (g) {
@@ -14,7 +14,7 @@ export function checkSourceFile(file) {
 function getNarrowerNode(offset, prev, toCheck) {
     const prevRange = prev.end - prev.pos;
     if (toCheck.pos <= offset && offset <= toCheck.end) {
-        let nrange = toCheck.end - toCheck.pos;
+        const nrange = toCheck.end - toCheck.pos;
         if (nrange < prevRange) {
             return toCheck;
         }
@@ -44,7 +44,7 @@ function checkGraphSemantics(file, root) {
     const expectedEdgeOp = getAllowedEdgeOperation(root);
     const invalidEdgeRhses = findEdgeErrors(expectedEdgeOp, root);
     const invalidShapes = checkShapeLabelValues(root);
-    const invalidEdgeDiagnostics = invalidEdgeRhses == undefined || invalidEdgeRhses.length === 0
+    const invalidEdgeDiagnostics = invalidEdgeRhses === undefined || invalidEdgeRhses.length === 0
         ? []
         : createEdgeViolationDiagnostics(file, expectedEdgeOp, invalidEdgeRhses);
     return [...invalidEdgeDiagnostics, ...invalidShapes];
@@ -62,7 +62,8 @@ function checkShapeLabelValues(root) {
     const invalidShapes = [];
     forEachAssignmentTransitive(root, assignment => {
         const { leftId, rightId } = assignment;
-        if (leftId.kind !== SyntaxKind.TextIdentifier || rightId.kind !== SyntaxKind.TextIdentifier) {
+        if (leftId.kind !== SyntaxKind.TextIdentifier ||
+            rightId.kind !== SyntaxKind.TextIdentifier) {
             return;
         }
         const leftText = leftId.text.trim();
@@ -105,16 +106,16 @@ export function findOptionalSemicolons(node) {
     return terminators.filter(t => !!t);
 }
 function isStatement(node) {
-    return node.kind === SyntaxKind.SubGraphStatement
-        || node.kind === SyntaxKind.EdgeStatement
-        || node.kind === SyntaxKind.NodeStatement
-        || node.kind === SyntaxKind.IdEqualsIdStatement
-        || node.kind === SyntaxKind.AttributeStatement;
+    return (node.kind === SyntaxKind.SubGraphStatement ||
+        node.kind === SyntaxKind.EdgeStatement ||
+        node.kind === SyntaxKind.NodeStatement ||
+        node.kind === SyntaxKind.IdEqualsIdStatement ||
+        node.kind === SyntaxKind.AttributeStatement);
 }
 export function findAllStatements(node, kind) {
     const allStatements = [];
     forEachChild(node, child => {
-        if ((kind === undefined && isStatement(child)) || (child.kind === kind)) {
+        if ((kind === undefined && isStatement(child)) || child.kind === kind) {
             allStatements.push(child);
         }
         const childStatements = findAllStatements(child, kind);
@@ -129,7 +130,9 @@ function findEdgeErrors(expectedEdgeOp, node) {
         ? edges.filter(e => e.operation.kind !== expectedEdgeOp)
         : undefined;
     if (wrongEdges && wrongEdges.length > 0) {
-        wrongEdges.forEach(e => e.operation.flags |= 2);
+        for (const edge of wrongEdges) {
+            edge.operation.flags |= 2;
+        }
         return wrongEdges;
     }
     return undefined;
@@ -140,7 +143,9 @@ function createEdgeViolationDiagnostics(file, expectedEdgeOp, violators) {
     const message = `Invalid edge operation, use "${op}" in ${graphType} graph`;
     const code = createCheckerError(0);
     const category = DiagnosticCategory.Error;
-    violators.forEach(edge => edge.operation.flags |= 2);
+    for (const edge of violators) {
+        edge.operation.flags |= 2;
+    }
     return violators.map(edge => {
         const start = getStart(file, edge.operation);
         const end = edge.operation.end;
@@ -177,9 +182,9 @@ export function isNodeId(node) {
     return node.kind === SyntaxKind.NodeId;
 }
 export function edgeStatementHasAttributes(es) {
-    return es.attributes
-        && es.attributes.length > 0
-        && es.attributes.some(a => a.assignments && a.assignments.length > 0);
+    return (es.attributes &&
+        es.attributes.length > 0 &&
+        es.attributes.some(a => a.assignments && a.assignments.length > 0));
 }
 export function getIdentifierText(n) {
     switch (n.kind) {

package/lib/esm/core.js

@@ -1,7 +1,7 @@
 export function createMapFromTemplate(template) {
     const map = new Map();
     for (const key in template) {
-        if (template.hasOwnProperty(key)) {
+        if (key in template) {
             map.set(key, template[key]);
         }
     }

package/lib/esm/error.js

@@ -2,9 +2,7 @@ export const diagnosicSource = "DOT";
 const errorCodeLength = 4;
 const subErrorCodeLength = errorCodeLength - 1;
 export function formatError(error) {
-    const subCode = (error.sub | 0)
-        .toString()
-        .padStart(subErrorCodeLength, "0");
+    const subCode = (error.sub | 0).toString().padStart(subErrorCodeLength, "0");
     return diagnosicSource + error.source + subCode;
 }
 //# sourceMappingURL=error.js.map

package/lib/esm/parser.d.ts

@@ -1,5 +1,5 @@
-import { Scanner } from "./scanner.js";
-import { SyntaxKind, SourceFile, Identifier, SyntaxNode, DiagnosticMessage } from "./types";
+import { type Scanner } from "./scanner.js";
+import { type DiagnosticMessage, type Identifier, type SourceFile, SyntaxKind, type SyntaxNode } from "./types";
 export declare enum ParsingContext {
     None = 0,
     StatementList = 1,
@@ -10,6 +10,7 @@ export declare enum ParsingContext {
     Count = 6
 }
 export declare class Parser {
+    #private;
     currentToken: SyntaxKind;
     nodeCount: number;
     identifiers: Set<string>;
@@ -20,65 +21,7 @@ export declare class Parser {
     currentContext: ParsingContext;
     diagnostics: DiagnosticMessage[];
     constructor();
-    private resetState;
-    private nextToken;
-    private token;
-    private getLinesFromFile;
     parse(sourceText: string): SourceFile;
-    private parseGraph;
-    private parseIdentifier;
-    private registerIdentifier;
-    private parseTextIdentifier;
-    private parseQuotedTextIdentifierConcatenation;
-    private parseQuotedTextIdentifier;
-    private isQuotedStringFollowing;
-    private parseHtmlIdentifier;
-    private parseNumericIdentifier;
-    private parseStatement;
-    private parseAttributeStatement;
-    private parseAttributeContainer;
-    private isAssignmentStart;
-    private parseIdEqualsIdStatement;
-    private isIdEqualsIdStatement;
-    private parseNodeStatement;
-    private parseEdgeStatement;
-    private parseEdgeRhs;
-    private createMissingNode;
-    private parseAssignment;
-    private parseSubGraph;
-    private parseNodeId;
-    private parseCompassPortDeclaration;
-    private parseNormalPortDeclaration;
-    private parsePortDeclaration;
-    private isCompassPort;
-    private parseList;
-    private getContextParseError;
-    private isInSomeParsingContext;
-    private abortListParsing;
-    private isListElement;
-    private isListTerminator;
-    private createEmptyArray;
-    private finishNode;
-    private createNode;
-    private createNodeArray;
-    private parseTokenNode;
-    private getLastError;
-    private parseErrorAtPosition;
-    private parseErrorAtCurrentToken;
-    private scanError;
-    private reportExpectedError;
-    private parseExpectedOneOf;
-    private parseExpectedTokenOneOf;
-    private parseExpectedToken;
-    private parseExpected;
-    private parseOptionalToken;
-    private parseOptional;
-    private isEdgeOp;
-    private isIdentifier;
-    private isCompassPortKind;
-    private speculationHelper;
-    private lookAhead;
-    private tryParse;
 }
-export declare function isIdentifier(kind: SyntaxKind): boolean;
+export declare function isIdentifier(kind: SyntaxKind): kind is SyntaxKind.HtmlIdentifier | SyntaxKind.TextIdentifier | SyntaxKind.QuotedTextIdentifier | SyntaxKind.NumericIdentifier;
 export declare function isIdentifierNode(node: SyntaxNode): node is Identifier;