@ts-graphviz/ast 0.0.0-pr956-20240225073457 → 0.0.0-pr956-20240225160253

package/lib/ast.js

@@ -1,23 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
-var __accessCheck = (obj, member, msg) => {
-  if (!member.has(obj))
-    throw TypeError("Cannot " + msg);
-};
-var __privateGet = (obj, member, getter) => {
-  __accessCheck(obj, member, "read from private field");
-  return getter ? getter.call(obj) : member.get(obj);
-};
-var __privateAdd = (obj, member, value) => {
-  if (member.has(obj))
-    throw TypeError("Cannot add the same private member more than once");
-  member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-};
-var _plugins, _plugins2;
 import { pipe, map, isNodeModel, isForwardRefNode, createModelsContext } from "@ts-graphviz/common";
 class Builder {
   /**
@@ -32,8 +12,7 @@ class Builder {
    * @internal
    */
   getLocation() {
-    var _a, _b;
-    return ((_b = (_a = this.options) == null ? void 0 : _a.locationFunction) == null ? void 0 : _b.call(_a)) ?? null;
+    return this.options?.locationFunction?.() ?? null;
   }
   /**
    * Create an {@link ASTNode} of the specified type
@@ -295,17 +274,17 @@ class Printer {
    * @param options Options to be used when generating the DOT string.
    */
   constructor(options = {}) {
-    /** @internal */
-    __privateAdd(this, _plugins, [...defaultPlugins$2]);
     this.options = options;
   }
+  /** @internal */
+  #plugins = [...defaultPlugins$2];
   /**
    * Generates a DOT string from an ASTNode.
    * @param ast The ASTNode to be converted into a DOT string.
    * @returns The DOT string generated from the ASTNode.
    */
   print(ast) {
-    const plugins = [...__privateGet(this, _plugins)];
+    const plugins = [...this.#plugins];
     const {
       indentSize = 2,
       indentStyle = "space",
@@ -328,7 +307,6 @@ class Printer {
     return context.print(ast);
   }
 }
-_plugins = new WeakMap();
 function stringify(ast, options) {
   const result = new Printer(options).print(ast);
   if (!result) {
@@ -3299,10 +3277,7 @@ const peggyParser = (
         const str = value.trim();
         const matches = str.match(/\n([\t ]+|(?!\s).)/g);
         if (matches) {
-          const indentLengths = matches.map((match) => {
-            var _a;
-            return ((_a = match.match(/[\t ]/g)) == null ? void 0 : _a.length) ?? 0;
-          });
+          const indentLengths = matches.map((match) => match.match(/[\t ]/g)?.length ?? 0);
           const pattern = new RegExp(`
 [	 ]{${Math.min(...indentLengths)}}`, "g");
           return str.replace(pattern, "\n");
@@ -3657,10 +3632,10 @@ const defaultPlugins$1 = [
 ];
 class FromModelConverter {
   constructor(options = {}) {
-    /** @hidden */
-    __privateAdd(this, _plugins2, [...defaultPlugins$1]);
     this.options = options;
   }
+  /** @hidden */
+  #plugins = [...defaultPlugins$1];
   /**
    * Converts a DotObjectModel into an AST.
    *
@@ -3668,7 +3643,7 @@ class FromModelConverter {
    * @returns The AST generated from the model.
    */
   convert(model) {
-    const plugins = [...__privateGet(this, _plugins2)];
+    const plugins = [...this.#plugins];
     const { commentKind = "Slash" } = this.options;
     const context = {
       commentKind,
@@ -3684,14 +3659,11 @@ class FromModelConverter {
     return context.convert(model);
   }
 }
-_plugins2 = new WeakMap();
 function fromModel(model, options) {
   return new FromModelConverter(options).convert(model);
 }
 class CommentHolder {
-  constructor() {
-    __publicField(this, "comment", null);
-  }
+  comment = null;
   set(comment) {
     this.comment = comment;
   }
@@ -3699,9 +3671,8 @@ class CommentHolder {
     this.comment = null;
   }
   apply(model, location) {
-    var _a, _b, _c;
-    if (location && ((_a = this.comment) == null ? void 0 : _a.location)) {
-      if (((_b = this.comment) == null ? void 0 : _b.kind) === "Block") {
+    if (location && this.comment?.location) {
+      if (this.comment?.kind === "Block") {
         if (this.comment.location.end.line === location.start.line - 1) {
           model.comment = this.comment.value;
         }
@@ -3711,7 +3682,7 @@ class CommentHolder {
         }
       }
     } else {
-      model.comment = (_c = this.comment) == null ? void 0 : _c.value;
+      model.comment = this.comment?.value;
     }
     this.reset();
   }
@@ -3739,23 +3710,19 @@ const DotPlugin = {
 };
 function convertToEdgeTargetTuple(edge) {
   return edge.targets.map((t) => {
-    var _a, _b;
     switch (t.type) {
       case "NodeRef":
         return {
           id: t.id.value,
-          port: (_a = t.port) == null ? void 0 : _a.value,
-          compass: (_b = t.compass) == null ? void 0 : _b.value
+          port: t.port?.value,
+          compass: t.compass?.value
         };
       case "NodeRefGroup":
-        return t.children.map((t2) => {
-          var _a2, _b2;
-          return {
-            id: t2.id.value,
-            port: (_a2 = t2.port) == null ? void 0 : _a2.value,
-            compass: (_b2 = t2.compass) == null ? void 0 : _b2.value
-          };
-        });
+        return t.children.map((t2) => ({
+          id: t2.id.value,
+          port: t2.port?.value,
+          compass: t2.compass?.value
+        }));
     }
   });
 }
@@ -3861,9 +3828,8 @@ const GraphPlugin = {
     return ast.type === "Graph";
   },
   convert(context, ast) {
-    var _a;
     const G = ast.directed ? context.models.Digraph : context.models.Graph;
-    const graph = new G((_a = ast.id) == null ? void 0 : _a.value, ast.strict);
+    const graph = new G(ast.id?.value, ast.strict);
     applyStatements(graph, ast.children);
     return graph;
   }
@@ -3893,8 +3859,7 @@ const SubgraphPlugin = {
     return ast.type === "Subgraph";
   },
   convert(context, ast) {
-    var _a;
-    const subgraph = new context.models.Subgraph((_a = ast.id) == null ? void 0 : _a.value);
+    const subgraph = new context.models.Subgraph(ast.id?.value);
     applyStatements(subgraph, ast.children);
     return subgraph;
   }
@@ -3908,12 +3873,12 @@ const defaultPlugins = [
 ];
 class ToModelConverter {
   constructor(options = {}) {
-    /** @hidden */
-    __publicField(this, "plugins", [
-      ...defaultPlugins
-    ]);
     this.options = options;
   }
+  /** @hidden */
+  plugins = [
+    ...defaultPlugins
+  ];
   /**
    * Convert AST to Model.
    *

package/package.json

@@ -1,11 +1,30 @@
 {
   "name": "@ts-graphviz/ast",
-  "version": "0.0.0-pr956-20240225073457",
-  "description": "",
+  "version": "0.0.0-pr956-20240225160253",
+  "description": "Graphviz AST(Abstract Syntax Tree) Utilities",
+  "keywords": [],
+  "homepage": "https://github.com/ts-graphviz/ts-graphviz#readme",
+  "bugs": {
+    "url": "https://github.com/ts-graphviz/ts-graphviz/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ts-graphviz/ts-graphviz.git",
+    "directory": "packages/ast"
+  },
+  "funding": [
+    {
+      "type": "github",
+      "url": "https://github.com/sponsors/ts-graphviz"
+    },
+    {
+      "type": "opencollective",
+      "url": "https://opencollective.com/ts-graphviz"
+    }
+  ],
+  "license": "NIT",
+  "author": "",
   "type": "module",
-  "main": "lib/ast.cjs",
-  "module": "lib/ast.js",
-  "types": "lib/ast.d.ts",
   "exports": {
     ".": {
       "require": {
@@ -19,24 +38,17 @@
     },
     "./package.json": "./package.json"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/ts-graphviz/ts-graphviz.git",
-    "directory": "packages/ast"
-  },
-  "publishConfig": {
-    "access": "public",
-    "provenance": true
-  },
-  "keywords": [],
-  "author": "",
-  "license": "NIT",
-  "bugs": {
-    "url": "https://github.com/ts-graphviz/ts-graphviz/issues"
-  },
-  "homepage": "https://github.com/ts-graphviz/ts-graphviz#readme",
+  "main": "lib/ast.cjs",
+  "module": "lib/ast.js",
+  "types": "lib/ast.d.ts",
+  "files": [
+    "lib",
+    "README.md",
+    "CHANGELOG.md",
+    "LICENSE"
+  ],
   "dependencies": {
-    "@ts-graphviz/common": "^0.0.0-pr956-20240225073457"
+    "@ts-graphviz/common": "^0.0.0-pr956-20240225160253"
   },
   "devDependencies": {
     "peggy": "^3.0.2",
@@ -45,8 +57,15 @@
     "vite": "^5.1.3",
     "vite-plugin-dts": "^3.7.2"
   },
+  "engines": {
+    "node": ">=18"
+  },
+  "publishConfig": {
+    "access": "public",
+    "provenance": true
+  },
   "scripts": {
-    "codegen": "peggy --plugin ts-pegjs --extra-options-file src/dot-shim/parser/peggy.options.json -o src/dot-shim/parser/_parse.ts src/dot-shim/parser/dot.peggy",
-    "build": "vite build"
+    "build": "vite build",
+    "codegen": "peggy --plugin ts-pegjs --extra-options-file src/dot-shim/parser/peggy.options.json -o src/dot-shim/parser/_parse.ts src/dot-shim/parser/dot.peggy"
   }
 }

package/src/ast.ts

@@ -1,8 +0,0 @@
-/**
- * @module ts-graphviz/ast
- * @beta
- */
-export * from './types.js';
-export * from './builder/index.js';
-export * from './dot-shim/index.js';
-export * from './model-shim/index.js';

package/src/builder/__snapshots__/create-element.test.ts.snap

@@ -1,166 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`createElement > Attribute 1`] = `
-{
-  "children": [],
-  "key": {
-    "children": [],
-    "location": null,
-    "quoted": false,
-    "type": "Literal",
-    "value": "color",
-  },
-  "location": null,
-  "type": "Attribute",
-  "value": {
-    "children": [],
-    "location": null,
-    "quoted": false,
-    "type": "Literal",
-    "value": "red",
-  },
-}
-`;
-
-exports[`createElement > Coment 1`] = `
-{
-  "children": [],
-  "kind": "Macro",
-  "location": null,
-  "type": "Comment",
-  "value": "This is comment",
-}
-`;
-
-exports[`createElement > Dot 1`] = `
-{
-  "children": [],
-  "location": null,
-  "type": "Dot",
-}
-`;
-
-exports[`createElement > Edge 1`] = `
-{
-  "children": [],
-  "location": null,
-  "targets": [
-    {
-      "children": [],
-      "id": {
-        "children": [],
-        "location": null,
-        "quoted": true,
-        "type": "Literal",
-        "value": "a",
-      },
-      "location": null,
-      "type": "NodeRef",
-    },
-    {
-      "children": [],
-      "id": {
-        "children": [],
-        "location": null,
-        "quoted": true,
-        "type": "Literal",
-        "value": "b",
-      },
-      "location": null,
-      "type": "NodeRef",
-    },
-  ],
-  "type": "Edge",
-}
-`;
-
-exports[`createElement > Graph 1`] = `
-{
-  "children": [],
-  "directed": true,
-  "location": null,
-  "strict": false,
-  "type": "Graph",
-}
-`;
-
-exports[`createElement > Literal 1`] = `
-{
-  "children": [],
-  "location": null,
-  "quoted": true,
-  "type": "Literal",
-  "value": "literal value",
-}
-`;
-
-exports[`createElement > Node 1`] = `
-{
-  "children": [],
-  "id": {
-    "children": [],
-    "location": null,
-    "quoted": false,
-    "type": "Literal",
-    "value": "node_id",
-  },
-  "location": null,
-  "type": "Node",
-}
-`;
-
-exports[`createElement > NodeRef 1`] = `
-{
-  "children": [],
-  "id": {
-    "children": [],
-    "location": null,
-    "quoted": true,
-    "type": "Literal",
-    "value": "b",
-  },
-  "location": null,
-  "type": "NodeRef",
-}
-`;
-
-exports[`createElement > NodeRefGroup 1`] = `
-{
-  "children": [
-    {
-      "children": [],
-      "id": {
-        "children": [],
-        "location": null,
-        "quoted": true,
-        "type": "Literal",
-        "value": "a",
-      },
-      "location": null,
-      "type": "NodeRef",
-    },
-    {
-      "children": [],
-      "id": {
-        "children": [],
-        "location": null,
-        "quoted": true,
-        "type": "Literal",
-        "value": "b",
-      },
-      "location": null,
-      "type": "NodeRef",
-    },
-  ],
-  "location": null,
-  "type": "NodeRefGroup",
-}
-`;
-
-exports[`createElement > Subgraph 1`] = `
-{
-  "children": [],
-  "location": null,
-  "type": "Subgraph",
-}
-`;

package/src/builder/builder.test.ts

@@ -1,36 +0,0 @@
-import { describe, expect, test } from 'vitest';
-import { Builder } from './builder.js';
-
-describe('Builder', () => {
-  test('should create an ASTNode with specified properties', () => {
-    const location = {
-      start: {
-        offset: 0,
-        line: 1,
-        column: 1,
-      },
-      end: {
-        offset: 3,
-        line: 1,
-        column: 3,
-      },
-    };
-    const builder = new Builder({
-      locationFunction: () => location,
-    });
-    const type = 'TestType' as any;
-    const props = { prop1: 'test1', prop2: 'test2' };
-    const children = [
-      { type: 'TestType', props: { prop1: 'test1', prop2: 'test2' } },
-    ] as any[];
-    const expectedResult = {
-      type,
-      ...props,
-      children,
-      location,
-    };
-    expect(builder.createElement(type, props, children)).toStrictEqual(
-      expectedResult,
-    );
-  });
-});

package/src/builder/builder.ts

@@ -1,44 +0,0 @@
-import type { ASTChildNode, ASTNode, FileRange } from '../types.js';
-import { ASTBuilder, BuilderOptions } from './types.js';
-
-/**
- * Builder is an ASTBuilder that provides a method to create an ASTNode.
- *
- * @group Create AST
- */
-export class Builder implements ASTBuilder {
-  /**
-   * Get the current file range or null
-   * @internal
-   */
-  private getLocation(): FileRange | null {
-    return this.options?.locationFunction?.() ?? null;
-  }
-
-  /**
-   * Constructor of Builder
-   * @param options - Options to initialize Builder
-   */
-  constructor(private options?: Partial<BuilderOptions>) {}
-
-  /**
-   * Create an {@link ASTNode} of the specified type
-   *
-   * @param type - Type of the {@link ASTNode}
-   * @param props - Properties of the {@link ASTNode}
-   * @param children - Children of the {@link ASTNode}
-   * @returns An {@link ASTNode}
-   */
-  public createElement<T extends ASTNode>(
-    type: T['type'],
-    props: any,
-    children: ASTChildNode<T>[] = [],
-  ): T {
-    return {
-      location: this.getLocation(),
-      ...props,
-      type,
-      children,
-    };
-  }
-}

package/src/builder/create-element.test.ts

@@ -1,110 +0,0 @@
-import { describe, expect, test } from 'vitest';
-import { createElement } from './create-element.js';
-
-describe('createElement', () => {
-  test('Dot', () => {
-    const ast = createElement('Dot', {}, []);
-    expect(ast).toMatchSnapshot();
-  });
-
-  test('Graph', () => {
-    const ast = createElement('Graph', {
-      strict: false,
-      directed: true,
-    });
-    expect(ast).toMatchSnapshot();
-  });
-
-  test('Node', () => {
-    const ast = createElement('Node', {
-      id: createElement('Literal', {
-        value: 'node_id',
-        quoted: false,
-      }),
-    });
-    expect(ast).toMatchSnapshot();
-  });
-
-  test('Edge', () => {
-    const ast = createElement('Edge', {
-      targets: [
-        createElement('NodeRef', {
-          id: createElement('Literal', {
-            value: 'a',
-            quoted: true,
-          }),
-        }),
-        createElement('NodeRef', {
-          id: createElement('Literal', {
-            value: 'b',
-            quoted: true,
-          }),
-        }),
-      ],
-    });
-    expect(ast).toMatchSnapshot();
-  });
-
-  test('NodeRef', () => {
-    const ast = createElement('NodeRef', {
-      id: createElement('Literal', {
-        value: 'b',
-        quoted: true,
-      }),
-    });
-    expect(ast).toMatchSnapshot();
-  });
-
-  test('NodeRefGroup', () => {
-    const ast = createElement('NodeRefGroup', {}, [
-      createElement('NodeRef', {
-        id: createElement('Literal', {
-          value: 'a',
-          quoted: true,
-        }),
-      }),
-      createElement('NodeRef', {
-        id: createElement('Literal', {
-          value: 'b',
-          quoted: true,
-        }),
-      }),
-    ]);
-    expect(ast).toMatchSnapshot();
-  });
-
-  test('Subgraph', () => {
-    const ast = createElement('Subgraph', {}, []);
-    expect(ast).toMatchSnapshot();
-  });
-
-  test('Literal', () => {
-    const ast = createElement('Literal', {
-      value: 'literal value',
-      quoted: true,
-    });
-    expect(ast).toMatchSnapshot();
-  });
-
-  test('Coment', () => {
-    const ast = createElement('Comment', {
-      kind: 'Macro',
-      value: 'This is comment',
-    });
-    expect(ast).toMatchSnapshot();
-  });
-
-  test('Attribute', () => {
-    const ast = createElement('Attribute', {
-      key: createElement('Literal', {
-        value: 'color',
-        quoted: false,
-      }),
-      value: createElement('Literal', {
-        value: 'red',
-        quoted: false,
-      }),
-    });
-    expect(ast).toMatchSnapshot();
-  });
-});

package/src/builder/create-element.ts

@@ -1,13 +0,0 @@
-import { Builder } from './builder.js';
-import { CreateElement } from './types.js';
-/**
- * Create an {@link ASTNode} of the specified type
- *
- * @param type - Type of the {@link ASTNode}
- * @param props - Properties of the {@link ASTNode}
- * @param children - Children of the {@link ASTNode}
- * @group Create AST
- * @returns An {@link ASTNode}
- */
-export const createElement: CreateElement =
-  Builder.prototype.createElement.bind(new Builder());

package/src/builder/index.ts

@@ -1,3 +0,0 @@
-export * from './builder.js';
-export * from './types.js';
-export * from './create-element.js';