Merge pull request #308 from ajthinking/use-nodejs

Category for NodeJs nodes and allow interpolation for RunCommand
ajthinking · Sep 29, 2024 · a6aa91d · a6aa91d
2 parents 51559d9 + d3d9726
commit a6aa91d
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/packages/nodejs/src/computers/JsonFileRead/JsonFileRead.ts b/packages/nodejs/src/computers/JsonFileRead/JsonFileRead.ts
@@ -5,6 +5,7 @@ import { Computer, get, serializeError, str, stringifyError } from '@data-story/
 export const JsonFileRead: Computer = {
   name: 'JsonFile.read',
   label: 'JsonFile.read',
+  category: 'NodeJs',
   inputs: [],
   outputs: [
     {

diff --git a/packages/nodejs/src/computers/JsonFileWrite/JsonFileWrite.ts b/packages/nodejs/src/computers/JsonFileWrite/JsonFileWrite.ts
@@ -5,6 +5,7 @@ import { Computer, str } from '@data-story/core';
 export const JsonFileWrite: Computer = {
   name: 'JsonFile.write',
   label: 'JsonFile.write',
+  category: 'NodeJs',
   inputs: [{
     name: 'input',
     schema: {}

diff --git a/packages/nodejs/src/computers/ListFiles/ListFiles.ts b/packages/nodejs/src/computers/ListFiles/ListFiles.ts
@@ -5,6 +5,7 @@ import * as nodePath from 'path'
 export const ListFiles: Computer = {
   name: 'ListFiles',
   label: 'ListFiles',
+  category: 'NodeJs',
   inputs: [{
     name: 'input',
     schema: {},

diff --git a/packages/nodejs/src/computers/ReadFiles/ReadFiles.ts b/packages/nodejs/src/computers/ReadFiles/ReadFiles.ts
@@ -5,6 +5,7 @@ import { Computer, createDefaultStringable } from '@data-story/core';
 export const ReadFiles: Computer = {
   name: 'ReadFiles',
   label: 'ReadFiles',
+  category: 'NodeJs',
   inputs: [{
     name: 'input',
     schema: {}

diff --git a/packages/nodejs/src/computers/RunCommand/RunCommand.ts b/packages/nodejs/src/computers/RunCommand/RunCommand.ts
@@ -1,6 +1,6 @@
 import { promisify } from 'util';
 import { exec as execCallback } from 'child_process';
-import { Computer, createDefaultStringable } from '@data-story/core';
+import { Computer, str } from '@data-story/core';
 
 const exec = promisify(execCallback);
 
@@ -23,6 +23,7 @@ async function awaitableExec(command: string): Promise<{
 export const RunCommand: Computer = {
   name: 'RunCommand',
   label: 'RunCommand',
+  category: 'NodeJs',
   inputs: [{
     name: 'input',
     schema: {},
@@ -38,22 +39,18 @@ export const RunCommand: Computer = {
     },
   ],
   params: [
-    createDefaultStringable({
+    str({
       name: 'command',
-      label: 'Command',
-      help: 'Command to run',
-      multiline: true,
-      canInterpolate: false,
-      interpolate: false,
-      evaluations: [],
-      casts: [],
       value: 'say "Hello World"',
+      help: 'Command to run',
+      canInterpolate: true,
     })
   ],
 
-  async *run({ input, output, params }) {
+  async *run({ input, output }) {
     while(true) {
       const [ incoming ] = input.pull(1)
+
       const command = incoming.params.command as string
 
       const { stdout, stderr, error } = await awaitableExec(command);
@@ -79,7 +76,7 @@ export const RunCommand: Computer = {
         continue;
       }
 
-      throw new Error('Unknown exec result!')
+      yield;
     }
   },
 };
diff --git a/packages/nodejs/src/computers/WriteFile/WriteFile.ts b/packages/nodejs/src/computers/WriteFile/WriteFile.ts
@@ -4,6 +4,7 @@ import { Computer, str } from '@data-story/core';
 export const WriteFile: Computer = {
   name: 'WriteFile',
   label: 'WriteFile',
+  category: 'NodeJs',
   inputs: [{
     name: 'input',
     schema: {}