ts-graphviz 1.4.1-dev.d42db466f → 1.5.1-dev.32bea0347

package/README.md

@@ -48,6 +48,8 @@ $ yarn add ts-graphviz
 $ pnpm add ts-graphviz
 ```
 
+> **Note** Want to try before installing? Check out [Runkit](https://npm.runkit.com/ts-graphviz) to see how it works.
+
 ### Deno 🦕
 
 [Deno v1.28 and above supports npm](https://deno.land/manual/node/npm_specifiers).

package/example/runkit.cjs

@@ -0,0 +1,25 @@
+const { attribute: _, digraph, toDot } = require('ts-graphviz');
+
+const G = digraph('G', (g) => {
+  const a = g.node('aa');
+  const b = g.node('bb');
+  const c = g.node('cc');
+  g.edge([a, b, c], {
+    [_.color]: 'red',
+  });
+  g.subgraph('A', (A) => {
+    const Aa = A.node('Aaa', {
+      [_.color]: 'pink',
+    });
+
+    const Ab = A.node('Abb', {
+      [_.color]: 'violet',
+    });
+    const Ac = A.node('Acc');
+    A.edge([Aa.port('a'), Ab, Ac, 'E'], {
+      [_.color]: 'red',
+    });
+  });
+});
+
+toDot(G);

package/lib/adapter/utils/index.cjs

@@ -2,26 +2,33 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+function escapeValue(value) {
+  if (value !== true) {
+    if (typeof value === 'string' && /\s/g.test(value)) {
+      return `="${value}"`;
+    } else {
+      return `=${value}`;
+    }
+  }
+  return '';
+}
 function* args(options) {
   const { suppressWarnings = true, format = 'svg', attributes = {}, library = [], y = false, scale } = options;
   if (suppressWarnings) yield '-q';
   yield `-T${format}`;
   if (attributes.graph) {
     for (const [key, value] of Object.entries(attributes.graph)) {
-      if (value === true) yield `-G${key}`;
-      else yield `-G${key}="${value}"`;
+      yield `-G${key}${escapeValue(value)}`;
     }
   }
   if (attributes.node) {
     for (const [key, value] of Object.entries(attributes.node)) {
-      if (value === true) yield `-N${key}`;
-      else yield `-N${key}="${value}"`;
+      yield `-N${key}${escapeValue(value)}`;
     }
   }
   if (attributes.edge) {
     for (const [key, value] of Object.entries(attributes.edge)) {
-      if (value === true) yield `-E${key}`;
-      else yield `-E${key}="${value}"`;
+      yield `-E${key}${escapeValue(value)}`;
     }
   }
   if (typeof scale === 'number' && !Number.isNaN(scale)) yield `-s${scale}`;

package/lib/adapter/utils/index.js

@@ -1,23 +1,30 @@
+function escapeValue(value) {
+  if (value !== true) {
+    if (typeof value === 'string' && /\s/g.test(value)) {
+      return `="${value}"`;
+    } else {
+      return `=${value}`;
+    }
+  }
+  return '';
+}
 function* args(options) {
   const { suppressWarnings = true, format = 'svg', attributes = {}, library = [], y = false, scale } = options;
   if (suppressWarnings) yield '-q';
   yield `-T${format}`;
   if (attributes.graph) {
     for (const [key, value] of Object.entries(attributes.graph)) {
-      if (value === true) yield `-G${key}`;
-      else yield `-G${key}="${value}"`;
+      yield `-G${key}${escapeValue(value)}`;
     }
   }
   if (attributes.node) {
     for (const [key, value] of Object.entries(attributes.node)) {
-      if (value === true) yield `-N${key}`;
-      else yield `-N${key}="${value}"`;
+      yield `-N${key}${escapeValue(value)}`;
     }
   }
   if (attributes.edge) {
     for (const [key, value] of Object.entries(attributes.edge)) {
-      if (value === true) yield `-E${key}`;
-      else yield `-E${key}="${value}"`;
+      yield `-E${key}${escapeValue(value)}`;
     }
   }
   if (typeof scale === 'number' && !Number.isNaN(scale)) yield `-s${scale}`;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ts-graphviz",
-    "version": "1.4.1-dev.d42db466f",
+    "version": "1.5.1-dev.32bea0347",
     "author": "kamiazya <yuki@kamiazya.tech>",
     "description": "Graphviz library for TypeScript.",
     "homepage": "https://ts-graphviz.github.io/ts-graphviz/",
@@ -81,6 +81,7 @@
     "engines": {
         "node": ">=14.16"
     },
+    "runkitExampleFilename": "example/runkit.cjs",
     "scripts": {
         "build:peggy": "peggy --plugin ts-pegjs --extra-options-file src/ast/dot-shim/parser/peggy.options.json -o src/ast/dot-shim/parser/_parse.ts src/ast/dot-shim/parser/dot.peggy",
         "prebuild": "yarn build:peggy",