ts-graphviz 1.2.0 → 1.2.2-1

package/lib/ast/index.cjs

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var utils = require('#lib/utils');
-var common = require('#lib/common');
+var index_js = require('../utils/index.js');
+var index_js$1 = require('../common/index.js');
 
 /**
  * @group Create AST
@@ -49,7 +49,7 @@ function leftPadWith(left) {
 const escape = (value) => value.replace(/\r/g, '\\r').replace(/\n/g, '\\n').replace(/"/g, '\\"');
 const splitByLine = (value) => value.split(EOL);
 const indent = (style, size, eol) =>
-  utils.pipe(splitByLine, utils.map(leftPadWith(style === 'space' ? ' '.repeat(size) : '\n')), joinBy(eol));
+  index_js.pipe(splitByLine, index_js.map(leftPadWith(style === 'space' ? ' '.repeat(size) : '\n')), joinBy(eol));
 const endOfLine = (eol) => {
   switch (eol) {
     case 'crlf':
@@ -68,8 +68,8 @@ const AttributeListPrintPlugin = {
       return `${ast.kind.toLocaleLowerCase()} [];`;
     }
     const eol = endOfLine(context.endOfLine);
-    return utils.pipe(
-      utils.map(context.print),
+    return index_js.pipe(
+      index_js.map(context.print),
       joinBy(eol),
       indent(context.indentStyle, context.indentSize, eol),
       wrapByPair(`${ast.kind.toLocaleLowerCase()} [${eol}`, `${eol}];`),
@@ -94,17 +94,17 @@ const CommentPrintPlugin = {
     const eol = endOfLine(context.endOfLine);
     switch (ast.kind) {
       case 'Block':
-        return utils.pipe(
+        return index_js.pipe(
           splitByLine,
-          utils.map(leftPadWith(' * ')),
+          index_js.map(leftPadWith(' * ')),
           joinBy(eol),
           wrapByPair(`/**${eol}`, `${eol} */`),
         )(ast.value);
       case 'Macro':
-        return utils.pipe(splitByLine, utils.map(leftPadWith('# ')), joinBy(eol))(ast.value);
+        return index_js.pipe(splitByLine, index_js.map(leftPadWith('# ')), joinBy(eol))(ast.value);
       case 'Slash':
       default:
-        return utils.pipe(splitByLine, utils.map(leftPadWith('// ')), joinBy(eol))(ast.value);
+        return index_js.pipe(splitByLine, index_js.map(leftPadWith('// ')), joinBy(eol))(ast.value);
     }
   },
 };
@@ -123,13 +123,13 @@ const EdgePrintPlugin = {
     return ast.type === 'Edge';
   },
   print(context, ast) {
-    const targets = utils.pipe(utils.map(context.print), joinBy(context.directed ? ' -> ' : ' -- '))(ast.targets);
+    const targets = index_js.pipe(index_js.map(context.print), joinBy(context.directed ? ' -> ' : ' -- '))(ast.targets);
     if (ast.children.length === 0) {
       return `${targets};`;
     }
     const eol = endOfLine(context.endOfLine);
-    const contents = utils.pipe(
-      utils.map(context.print),
+    const contents = index_js.pipe(
+      index_js.map(context.print),
       joinBy(eol),
       indent(context.indentStyle, context.indentSize, eol),
       wrapByPair(`[${eol}`, `${eol}];`),
@@ -156,8 +156,8 @@ const GraphPrintPlugin = {
       return `${parts.join(' ')} {}`;
     }
     const eol = endOfLine(context.endOfLine);
-    const contents = utils.pipe(
-      utils.map(context.print),
+    const contents = index_js.pipe(
+      index_js.map(context.print),
       joinBy(eol),
       indent(context.indentStyle, context.indentSize, eol),
       wrapByPair(`{${eol}`, `${eol}}`),
@@ -166,7 +166,7 @@ const GraphPrintPlugin = {
   },
 };
 
-const quoteLiteralValue = utils.pipe(escape, wrapWith('"'));
+const quoteLiteralValue = index_js.pipe(escape, wrapWith('"'));
 const quoteHTMLLikeLiteralValue = wrapByPair('<', '>');
 const LiteralPrintPlugin = {
   match(ast) {
@@ -195,8 +195,8 @@ const NodePrintPlugin = {
       return `${id};`;
     }
     const eol = endOfLine(context.endOfLine);
-    const contents = utils.pipe(
-      utils.map(context.print),
+    const contents = index_js.pipe(
+      index_js.map(context.print),
       joinBy(eol),
       indent(context.indentStyle, context.indentSize, eol),
       wrapByPair(`[${eol}`, `${eol}];`),
@@ -210,7 +210,7 @@ const NodeRefGroupPrintPlugin = {
     return ast.type === 'NodeRefGroup';
   },
   print(context, ast) {
-    return utils.pipe(utils.map(context.print), joinBy(' '), wrapByPair('{', '}'))(ast.children);
+    return index_js.pipe(index_js.map(context.print), joinBy(' '), wrapByPair('{', '}'))(ast.children);
   },
 };
 
@@ -243,8 +243,8 @@ const SubgraphPrintPlugin = {
       return `${parts.join(' ')} {}`;
     }
     const eol = endOfLine(context.endOfLine);
-    const contents = utils.pipe(
-      utils.map(context.print),
+    const contents = index_js.pipe(
+      index_js.map(context.print),
       joinBy(eol),
       indent(context.indentStyle, context.indentSize, eol),
       wrapByPair(`{${eol}`, `${eol}}`),
@@ -5366,7 +5366,7 @@ const EdgePlugin$1 = {
       'Edge',
       {
         targets: model.targets.map((target) => {
-          if (common.isNodeModel(target)) {
+          if (index_js$1.isNodeModel(target)) {
             return createElement(
               'NodeRef',
               {
@@ -5381,7 +5381,7 @@ const EdgePlugin$1 = {
               },
               [],
             );
-          } else if (common.isForwardRefNode(target)) {
+          } else if (index_js$1.isForwardRefNode(target)) {
             return createElement(
               'NodeRef',
               {
@@ -5733,7 +5733,7 @@ class ToModelConverter {
   convert(ast) {
     const plugins = [...this.plugins];
     const context = {
-      models: common.createModelsContext(this.options.models ?? {}),
+      models: index_js$1.createModelsContext(this.options.models ?? {}),
       convert(m) {
         for (const plugin of plugins) {
           if (plugin.match(m)) {

package/lib/ast/index.d.ts

@@ -8,7 +8,7 @@ import {
   NodeModel,
   SubgraphModel,
   ModelsContext,
-} from '#lib/common';
+} from '../common/index.js';
 
 /**
  * @group AST

package/lib/ast/index.js

@@ -1,5 +1,5 @@
-import { pipe, map } from '#lib/utils';
-import { isNodeModel, isForwardRefNode, createModelsContext } from '#lib/common';
+import { pipe, map } from '../utils/index.js';
+import { isNodeModel, isForwardRefNode, createModelsContext } from '../common/index.js';
 
 /**
  * @group Create AST

package/lib/common/index.cjs

@@ -2,8 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('#lib/core');
-
 /** @hidden */
 function isForwardRefNode(object) {
   return typeof object === 'object' && object !== null && typeof object.id === 'string';
@@ -52,7 +50,7 @@ function toNodeRefGroup(targets) {
  * @alpha
  */
 const RootModelsContext = Object.seal({
-  // NOTE: RootModelsContext is also initialized after the model class is declared in the '#lib/core' module.
+  // NOTE: RootModelsContext is also initialized after the model class is declared in the 'core/index.js' module.
   Graph: null,
   Digraph: null,
   Subgraph: null,

package/lib/common/index.js

@@ -1,5 +1,3 @@
-import '#lib/core';
-
 /** @hidden */
 function isForwardRefNode(object) {
   return typeof object === 'object' && object !== null && typeof object.id === 'string';
@@ -48,7 +46,7 @@ function toNodeRefGroup(targets) {
  * @alpha
  */
 const RootModelsContext = Object.seal({
-  // NOTE: RootModelsContext is also initialized after the model class is declared in the '#lib/core' module.
+  // NOTE: RootModelsContext is also initialized after the model class is declared in the 'core/index.js' module.
   Graph: null,
   Digraph: null,
   Subgraph: null,

package/lib/core/index.cjs

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var common = require('#lib/common');
-var ast = require('#lib/ast');
+var index_js = require('../common/index.js');
+var index_js$1 = require('../ast/index.js');
 
 /**
  * @group Attribute
@@ -81,7 +81,7 @@ class AttributeList extends AttributesBase {
  */
 class GraphBase extends AttributesBase {
   /** @hidden */
-  #models = common.RootModelsContext;
+  #models = index_js.RootModelsContext;
   id;
   comment;
   attributes = Object.freeze({
@@ -105,7 +105,7 @@ class GraphBase extends AttributesBase {
     subgraphs: new Set(),
   };
   with(models) {
-    this.#models = common.createModelsContext(models);
+    this.#models = index_js.createModelsContext(models);
   }
   addNode(node) {
     this.#objects.nodes.set(node.id, node);
@@ -152,7 +152,9 @@ class GraphBase extends AttributesBase {
     return this.#objects.nodes.get(id);
   }
   createEdge(targets, attributes) {
-    const ts = targets.map((t) => (common.isNodeRefGroupLike(t) ? common.toNodeRefGroup(t) : common.toNodeRef(t)));
+    const ts = targets.map((t) =>
+      index_js.isNodeRefGroupLike(t) ? index_js.toNodeRefGroup(t) : index_js.toNodeRef(t),
+    );
     const edge = new this.#models.Edge(ts, attributes);
     this.addEdge(edge);
     return edge;
@@ -320,14 +322,14 @@ class Edge extends DotObject {
   constructor(targets, attributes) {
     super();
     this.targets = targets;
-    if (targets.length < 2 && (common.isNodeRefLike(targets[0]) && common.isNodeRefLike(targets[1])) === false) {
+    if (targets.length < 2 && (index_js.isNodeRefLike(targets[0]) && index_js.isNodeRefLike(targets[1])) === false) {
       throw Error('The element of Edge target is missing or not satisfied as Edge target.');
     }
     this.attributes = new AttributesGroup(attributes);
   }
 }
 
-Object.assign(common.RootModelsContext, {
+Object.assign(index_js.RootModelsContext, {
   Graph,
   Digraph,
   Subgraph,
@@ -350,7 +352,7 @@ function ModelFactoryBuilder(directed, strictMode) {
     return g;
   };
 }
-function createModelFactories(strict, context = common.RootModelsContext) {
+function createModelFactories(strict, context = index_js.RootModelsContext) {
   return Object.freeze({
     digraph: ModelFactoryBuilder.call(context, true, strict),
     graph: ModelFactoryBuilder.call(context, false, strict),
@@ -377,7 +379,7 @@ const strict = createModelFactories(true);
  * @group Model Factory
  */
 function withContext(models) {
-  const context = common.createModelsContext(models);
+  const context = index_js.createModelsContext(models);
   return Object.freeze({
     ...createModelFactories(false, context),
     strict: createModelFactories(true, context),
@@ -394,24 +396,24 @@ function withContext(models) {
  * @returns DOT string
  */
 function toDot(model, options) {
-  const ast$1 = ast.fromModel(model, options?.convert);
-  return ast.stringify(ast$1, options?.print);
+  const ast = index_js$1.fromModel(model, options?.convert);
+  return index_js$1.stringify(ast, options?.print);
 }
 
 function fromDot(dot, options) {
-  const ast$1 = ast.parse(dot, options?.parse);
+  const ast = index_js$1.parse(dot, options?.parse);
   if (
-    Array.isArray(ast$1) ||
-    ast$1.type === 'Attribute' ||
-    ast$1.type === 'AttributeList' ||
-    ast$1.type === 'Comment' ||
-    ast$1.type === 'NodeRef' ||
-    ast$1.type === 'NodeRefGroup' ||
-    ast$1.type === 'Literal'
+    Array.isArray(ast) ||
+    ast.type === 'Attribute' ||
+    ast.type === 'AttributeList' ||
+    ast.type === 'Comment' ||
+    ast.type === 'NodeRef' ||
+    ast.type === 'NodeRefGroup' ||
+    ast.type === 'Literal'
   ) {
     throw new Error();
   }
-  return ast.toModel(ast$1, options?.convert);
+  return index_js$1.toModel(ast, options?.convert);
 }
 
 exports.AttributeList = AttributeList;

package/lib/core/index.d.ts

@@ -28,8 +28,8 @@ import {
   SubgraphAttributeKey,
   ClusterSubgraphAttributeKey,
   DotObjectModel,
-} from '#lib/common';
-import { ConvertFromModelOptions, PrintOptions, ParseOptions, ConvertToModelOptions } from '#lib/ast';
+} from '../common/index.js';
+import { ConvertFromModelOptions, PrintOptions, ParseOptions, ConvertToModelOptions } from '../ast/index.js';
 
 /**
  * @group Attribute

package/lib/core/index.js

@@ -5,8 +5,8 @@ import {
   toNodeRefGroup,
   toNodeRef,
   isNodeRefLike,
-} from '#lib/common';
-import { fromModel, stringify, parse, toModel } from '#lib/ast';
+} from '../common/index.js';
+import { fromModel, stringify, parse, toModel } from '../ast/index.js';
 
 /**
  * @group Attribute

package/lib/index.cjs

@@ -2,24 +2,24 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var common = require('#lib/common');
-var core = require('#lib/core');
+var index_js = require('./common/index.js');
+var index_js$1 = require('./core/index.js');
 
-Object.keys(common).forEach(function (k) {
+Object.keys(index_js).forEach(function (k) {
   if (k !== 'default' && !exports.hasOwnProperty(k))
     Object.defineProperty(exports, k, {
       enumerable: true,
       get: function () {
-        return common[k];
+        return index_js[k];
       },
     });
 });
-Object.keys(core).forEach(function (k) {
+Object.keys(index_js$1).forEach(function (k) {
   if (k !== 'default' && !exports.hasOwnProperty(k))
     Object.defineProperty(exports, k, {
       enumerable: true,
       get: function () {
-        return core[k];
+        return index_js$1[k];
       },
     });
 });

package/lib/index.d.ts

@@ -1,2 +1,2 @@
-export * from '#lib/common';
-export * from '#lib/core';
+export * from './common/index.js';
+export * from './core/index.js';

package/lib/index.js

@@ -1,2 +1,2 @@
-export * from '#lib/common';
-export * from '#lib/core';
+export * from './common/index.js';
+export * from './core/index.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-graphviz",
-  "version": "1.2.0",
+  "version": "1.2.2-1",
   "author": "kamiazya <yuki@kamiazya.tech>",
   "description": "Graphviz library for TypeScript.",
   "homepage": "https://ts-graphviz.github.io/ts-graphviz/",

package/test/utils/to-dot.ts

@@ -1,4 +1,4 @@
-import { pipe } from '#lib/utils';
+import { pipe } from '../../src/utils/index.js';
 import { wrap } from 'jest-snapshot-serializer-raw';
 import { toDot as _toDot } from 'ts-graphviz';