ts-graphviz 1.4.1-dev.4c0d71c18 → 1.4.1-dev.5525f3630

package/lib/adapter/node/index.cjs

@@ -20,9 +20,29 @@ const pipeline = node_util.promisify(node_stream.pipeline);
  */
 async function toStream(dot, options) {
   const [command, args] = index_js.commandBuilder(options ?? {});
-  const p = node_child_process.spawn(command, args, { stdio: 'pipe' });
-  await pipeline(node_stream.Readable.from([dot]), p.stdin);
-  return p.stdout;
+  return new Promise(async function toStreamInternal(resolve, reject) {
+    const p = node_child_process.spawn(command, args, { stdio: 'pipe' });
+    // error handling
+    p.on('error', (e) => {
+      reject(
+        new Error(`Command "${command}" failed.\nMESSAGE:${e.message}`, {
+          cause: e,
+        }),
+      );
+    });
+    const stderrChunks = [];
+    p.stderr.on('data', (chunk) => stderrChunks.push(chunk));
+    const dist = p.stdout.pipe(new node_stream.PassThrough());
+    p.on('close', async (code, signal) => {
+      if (code === 0) {
+        resolve(dist);
+      } else {
+        const message = Buffer.concat(stderrChunks).toString();
+        reject(new Error(`Command "${command}" failed.\nCODE: ${code}\nSIGNAL: ${signal}\nMESSAGE: ${message}`));
+      }
+    });
+    await pipeline(node_stream.Readable.from([dot]), p.stdin);
+  });
 }
 
 /**

package/lib/adapter/node/index.js

@@ -1,4 +1,4 @@
-import { pipeline as pipeline$1, Readable } from 'node:stream';
+import { pipeline as pipeline$1, PassThrough, Readable } from 'node:stream';
 import { spawn } from 'node:child_process';
 import { commandBuilder } from '../utils/index.js';
 import { promisify } from 'node:util';
@@ -16,9 +16,29 @@ const pipeline = promisify(pipeline$1);
  */
 async function toStream(dot, options) {
   const [command, args] = commandBuilder(options ?? {});
-  const p = spawn(command, args, { stdio: 'pipe' });
-  await pipeline(Readable.from([dot]), p.stdin);
-  return p.stdout;
+  return new Promise(async function toStreamInternal(resolve, reject) {
+    const p = spawn(command, args, { stdio: 'pipe' });
+    // error handling
+    p.on('error', (e) => {
+      reject(
+        new Error(`Command "${command}" failed.\nMESSAGE:${e.message}`, {
+          cause: e,
+        }),
+      );
+    });
+    const stderrChunks = [];
+    p.stderr.on('data', (chunk) => stderrChunks.push(chunk));
+    const dist = p.stdout.pipe(new PassThrough());
+    p.on('close', async (code, signal) => {
+      if (code === 0) {
+        resolve(dist);
+      } else {
+        const message = Buffer.concat(stderrChunks).toString();
+        reject(new Error(`Command "${command}" failed.\nCODE: ${code}\nSIGNAL: ${signal}\nMESSAGE: ${message}`));
+      }
+    });
+    await pipeline(Readable.from([dot]), p.stdin);
+  });
 }
 
 /**

package/lib/adapter/types/index.d.ts

@@ -5,7 +5,7 @@ import {
   SubgraphAttributesObject,
 } from '../../common/index.js';
 
-type Format = 'png' | 'svg' | 'json' | 'jpg' | 'pdf' | 'xdot' | 'plain' | 'dot_json';
+type Format = 'png' | 'svg' | 'json' | 'jpg' | 'pdf' | 'xdot' | 'dot' | 'plain' | 'dot_json';
 type Layout = 'dot' | 'neato' | 'fdp' | 'sfdp' | 'circo' | 'twopi' | 'nop' | 'nop2' | 'osage' | 'patchwork';
 interface NeatoOptions {
   layout: 'neato';

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.4c0d71c18",
+    "version": "1.4.1-dev.5525f3630",
     "author": "kamiazya <yuki@kamiazya.tech>",
     "description": "Graphviz library for TypeScript.",
     "homepage": "https://ts-graphviz.github.io/ts-graphviz/",