Simplify computer creation

ajthinking · Aug 2, 2023 · ebbe6c5 · ebbe6c5
1 parent c5d48f1
commit ebbe6c5
Show file tree

Hide file tree

Showing 41 changed files with 123 additions and 153 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@data-story/core",
-  "version": "0.0.65",
+  "version": "0.0.66",
   "main": "dist/index.js",
   "type": "commonjs",
   "types": "dist/index.d.ts",

diff --git a/packages/core/src/Application.test.ts b/packages/core/src/Application.test.ts
@@ -100,7 +100,7 @@ describe('descriptions', () => {
     const app = new Application()
 
     const computer1 = ComputerFactory.get(
-      Signal()
+      Signal
     )
 
     app.addComputers(

diff --git a/packages/core/src/ComputerFactory.ts b/packages/core/src/ComputerFactory.ts
@@ -1,6 +1,6 @@
 import { ComputerConfig } from './types/ComputerConfig';
 import { DefaultParams } from './Param';
-import { AbstractPort, Port, PortName } from './types/Port';
+import { AbstractPort, PortName } from './types/Port';
 import { Computer } from './types/Computer';
 
 /**
@@ -33,11 +33,4 @@ export const ComputerFactory = {
       canRun: config.canRun,
     };
   },
-}
-
-
-/*
-  ComputerConfigFactory: Creating a unique ComputerConfig
-  ComputerConfig: Serializeable
-  Computer: The Instance
-*/
+}
diff --git a/packages/core/src/DiagramBuilder.ts b/packages/core/src/DiagramBuilder.ts
@@ -1,10 +1,11 @@
-import { Computer, ComputerConfigFactory } from './types/Computer';
+import { Computer } from './types/Computer';
 import { ComputerFactory } from './ComputerFactory';
 import { Diagram } from './Diagram';
 import { Node } from './types/Node';
 import { Link } from './types/Link';
 import { PositionGuesser } from './PositionGuesser';
 import { Port, PortName } from './types/Port';
+import { ComputerConfig } from './types/ComputerConfig';
 
 export class DiagramBuilder {
   diagram: Diagram
@@ -31,10 +32,9 @@ export class DiagramBuilder {
   }
 
   add(
-    addable: ComputerConfigFactory | Computer,
+    config: ComputerConfig,
     params: Record<string, any> = {}
   ) {
-    const config = typeof addable === 'function' ? addable() : addable
     const computer = ComputerFactory.get(config)
 
     const nodeId = `${computer.name}.${this.getScopedId(computer.name)}`

diff --git a/packages/core/src/computerRegistry.ts b/packages/core/src/computerRegistry.ts
@@ -1,4 +1,4 @@
-import * as computerConfigFactories from './computers'
+import * as computerConfigs from './computers'
 import { Computer } from './types/Computer';
 import { ComputerFactory } from './ComputerFactory';
 import { NodeDescriptionFactory } from './NodeDescriptionFactory';
@@ -9,8 +9,7 @@ import { NodeDescriptionFactory } from './NodeDescriptionFactory';
 const computers = (() => {
   const map = new Map<string, Computer>()
 
-  for(const configFactory of Object.values(computerConfigFactories)) {
-    const config = configFactory()
+  for(const config of Object.values(computerConfigs)) {
     const computer = ComputerFactory.get(config)
 
     map.set(computer.name, computer)

diff --git a/packages/core/src/computers/AskChatGpt/AskChatGpt.ts b/packages/core/src/computers/AskChatGpt/AskChatGpt.ts
@@ -1,9 +1,8 @@
 import { Configuration, OpenAIApi } from 'openai';
-import { ComputerConfigFactory, RunArgs } from '../../types/Computer';
 import { ComputerConfig } from '../../types/ComputerConfig';
 import { string } from '../../ParamBuilder';
 
-export const AskChatGpt: ComputerConfigFactory = (): ComputerConfig => ({
+export const AskChatGpt: ComputerConfig = {
   name: 'AskChatGpt',
   inputs: ['input'],
   outputs: ['completions'],
@@ -38,4 +37,4 @@ export const AskChatGpt: ComputerConfigFactory = (): ComputerConfig => ({
       yield;
     }
   },
-});
+};
diff --git a/packages/core/src/computers/Comment/Comment.ts b/packages/core/src/computers/Comment/Comment.ts
@@ -1,8 +1,8 @@
-import { ComputerConfigFactory, RunArgs } from '../../types/Computer';
+
 import { json, string } from '../../ParamBuilder';
 import { ComputerConfig } from '../../types/ComputerConfig';
 
-export const Comment: ComputerConfigFactory = (): ComputerConfig => ({
+export const Comment: ComputerConfig = {
   name: 'Comment',
   inputs: [],
   outputs: [],
@@ -11,4 +11,4 @@ export const Comment: ComputerConfigFactory = (): ComputerConfig => ({
   },
 
   async *run({}) {},
-});
+};
diff --git a/packages/core/src/computers/Concatenate/Concatenate.ts b/packages/core/src/computers/Concatenate/Concatenate.ts
@@ -1,8 +1,7 @@
 import { string } from '../../ParamBuilder';
-import { Computer, ComputerConfigFactory } from '../../types/Computer';
 import { ComputerConfig } from '../../types/ComputerConfig';
 
-export const Concatenate: ComputerConfigFactory = (): ComputerConfig => ({
+export const Concatenate: ComputerConfig = {
   name: 'Concatenate',
   inputs: ['input'],
   outputs: ['output'],
@@ -29,4 +28,4 @@ export const Concatenate: ComputerConfigFactory = (): ComputerConfig => ({
         .join(params.delimiter),
     }])
   },
-});
+};
diff --git a/packages/core/src/computers/ConsoleLog/ConsoleLog.ts b/packages/core/src/computers/ConsoleLog/ConsoleLog.ts
@@ -1,10 +1,10 @@
-import { ComputerConfigFactory, RunArgs } from '../../types/Computer';
+
 import { ItemWithParams } from '../../ItemWithParams';
 import { string, text } from '../../ParamBuilder';
 import { ItemValue } from '../../types/ItemValue';
 import { ComputerConfig } from '../../types/ComputerConfig';
 
-export const ConsoleLog: ComputerConfigFactory = (): ComputerConfig => ({
+export const ConsoleLog: ComputerConfig = {
   name: 'ConsoleLog',
   label: 'Console.log',
   inputs: ['input'],
@@ -31,4 +31,4 @@ export const ConsoleLog: ComputerConfigFactory = (): ComputerConfig => ({
       yield;
     }
   },
-});
+};
diff --git a/packages/core/src/computers/CreateJson/CreateJson.ts b/packages/core/src/computers/CreateJson/CreateJson.ts
@@ -1,8 +1,8 @@
-import { ComputerConfigFactory, RunArgs } from '../../types/Computer';
+
 import { json } from '../../ParamBuilder';
 import { ComputerConfig } from '../../types/ComputerConfig';
 
-export const CreateJson: ComputerConfigFactory = (): ComputerConfig => ({
+export const CreateJson: ComputerConfig = {
   name: 'CreateJson',  
   outputs: ['output'],
   params: {
@@ -22,4 +22,4 @@ export const CreateJson: ComputerConfigFactory = (): ComputerConfig => ({
       throw error;
     }
   },
-});
+};
diff --git a/packages/core/src/computers/CreateProperty/CreateProperty.ts b/packages/core/src/computers/CreateProperty/CreateProperty.ts
@@ -1,9 +1,9 @@
-import { ComputerConfigFactory, RunArgs } from '../../types/Computer';
+
 import { ItemWithParams } from '../../ItemWithParams';
 import { string, text } from '../../ParamBuilder';
 import { ComputerConfig } from '../../types/ComputerConfig';
 
-export const CreateProperty: ComputerConfigFactory = (): ComputerConfig => ({
+export const CreateProperty: ComputerConfig = {
   name: 'CreateProperty',
   inputs: ['input'],
   outputs: ['output'],
@@ -23,4 +23,4 @@ export const CreateProperty: ComputerConfigFactory = (): ComputerConfig => ({
       yield;
     }
   },
-});
+};
diff --git a/packages/core/src/computers/Dump/Dump.ts b/packages/core/src/computers/Dump/Dump.ts
@@ -1,10 +1,10 @@
-import { ComputerConfigFactory, RunArgs } from '../../types/Computer';
+
 import { ItemWithParams } from '../../ItemWithParams';
 import { string, text } from '../../ParamBuilder';
 import { ItemValue } from '../../types/ItemValue';
 import { ComputerConfig } from '../../types/ComputerConfig';
 
-export const Dump: ComputerConfigFactory = (): ComputerConfig => ({
+export const Dump: ComputerConfig = {
   name: 'Dump',
   inputs: ['input'],
   params: {
@@ -29,4 +29,4 @@ export const Dump: ComputerConfigFactory = (): ComputerConfig => ({
     })      
 
   },
-});
+};
diff --git a/packages/core/src/computers/Eval/Eval.ts b/packages/core/src/computers/Eval/Eval.ts
@@ -1,8 +1,7 @@
 import { json } from '../../ParamBuilder';
-import { Computer, ComputerConfigFactory } from '../../types/Computer';
 import { ComputerConfig } from '../../types/ComputerConfig';
 
-export const Eval: ComputerConfigFactory = (): ComputerConfig => ({
+export const Eval: ComputerConfig = {
   name: 'Eval',
   inputs: [{
     name: 'input',
@@ -34,4 +33,4 @@ export const Eval: ComputerConfigFactory = (): ComputerConfig => ({
       yield;
     }
   },
-});
+};
diff --git a/packages/core/src/computers/Filter/Filter.ts b/packages/core/src/computers/Filter/Filter.ts
@@ -1,9 +1,9 @@
-import { ComputerConfigFactory, RunArgs } from '../../types/Computer';
+
 import { ItemValue } from '../../types/ItemValue';
 import { string } from '../../ParamBuilder';
 import { ComputerConfig } from '../../types/ComputerConfig';
 
-export const Filter: ComputerConfigFactory = (): ComputerConfig => ({
+export const Filter: ComputerConfig = {
   name: 'Filter',
   inputs: ['input'],
   outputs: ['passed', 'failed'],
@@ -29,4 +29,4 @@ export const Filter: ComputerConfigFactory = (): ComputerConfig => ({
       yield;
     }
   },
-});
+};
diff --git a/packages/core/src/computers/HubSpot/GetAllEntities.ts b/packages/core/src/computers/HubSpot/GetAllEntities.ts
@@ -1,4 +1,4 @@
-import { ComputerConfigFactory, RunArgs } from '../../types/Computer';
+
 import { ComputerConfig } from '../../types/ComputerConfig';
 import { json, number, string } from '../../ParamBuilder';
 import { hubspot } from './hubspot';
@@ -20,7 +20,7 @@ type EntityPage = {
   }
 }
 
-export const GetAllEntities: ComputerConfigFactory = (): ComputerConfig => ({
+export const GetAllEntities: ComputerConfig = {
   name: 'GetAll',
   outputs: ['all', 'errors'],
   params: {
@@ -63,4 +63,4 @@ export const GetAllEntities: ComputerConfigFactory = (): ComputerConfig => ({
 
     } while (nextPage && taken < params.limit);
   },
-});
+};
diff --git a/packages/core/src/computers/HubSpot/UpdateEntity.ts b/packages/core/src/computers/HubSpot/UpdateEntity.ts
@@ -1,11 +1,11 @@
-import { ComputerConfigFactory, RunArgs } from '../../types/Computer';
+
 import { ItemValue } from '../../types/ItemValue';
 import { json, string } from '../../ParamBuilder';
 import { hubspot } from './hubspot';
 import { ComputerConfig } from '../../types/ComputerConfig';
 import { CrmEntity } from './CrmEntity';
 
-export const UpdateEntity: ComputerConfigFactory = (): ComputerConfig => ({
+export const UpdateEntity: ComputerConfig = {
   name: 'UpdateEntity',
   inputs: ['input'],
   outputs: ['updated', 'errors'],
@@ -35,4 +35,4 @@ export const UpdateEntity: ComputerConfigFactory = (): ComputerConfig => ({
       }
     }
   },
-});
+};
diff --git a/packages/core/src/computers/Ignore/Ignore.ts b/packages/core/src/computers/Ignore/Ignore.ts
@@ -1,7 +1,7 @@
-import { ComputerConfigFactory, RunArgs } from '../../types/Computer';
+
 import { ComputerConfig } from '../../types/ComputerConfig';
 
-export const Ignore: ComputerConfigFactory = (): ComputerConfig => ({
+export const Ignore: ComputerConfig = {
   name: 'Ignore',
   inputs: ['input'],
 
@@ -11,4 +11,4 @@ export const Ignore: ComputerConfigFactory = (): ComputerConfig => ({
       yield;
     }
   },
-});
+};
diff --git a/packages/core/src/computers/Input/Input.ts b/packages/core/src/computers/Input/Input.ts
@@ -1,7 +1,7 @@
-import { ComputerConfigFactory, RunArgs } from '../../types/Computer';
+
 import { ComputerConfig } from '../../types/ComputerConfig';
 
-export const Input: ComputerConfigFactory = (): ComputerConfig => ({
+export const Input: ComputerConfig = {
   name: 'Input',
   outputs: ['output'],
 
@@ -21,4 +21,4 @@ export const Input: ComputerConfigFactory = (): ComputerConfig => ({
       yield;
     }
   },
-});
+};
diff --git a/packages/core/src/computers/InstantThrow/InstantThrow.ts b/packages/core/src/computers/InstantThrow/InstantThrow.ts
@@ -1,11 +1,11 @@
-import { ComputerConfigFactory, RunArgs } from '../../types/Computer';
+
 import { sleep } from '../../utils/sleep';
 import { ComputerConfig } from '../../types/ComputerConfig';
 
-export const InstantThrow: ComputerConfigFactory = (): ComputerConfig => ({
+export const InstantThrow: ComputerConfig = {
   name: 'InstantThrow',
 
   async *run({}) {
     throw Error("Instant Error!")
   },
-});
+};
diff --git a/packages/core/src/computers/JsonFile/JsonFile.ts b/packages/core/src/computers/JsonFile/JsonFile.ts
@@ -1,9 +1,9 @@
-import { ComputerConfigFactory, RunArgs } from '../../types/Computer';
+
 import { string } from '../../ParamBuilder';
 import { promises as fs } from 'fs'
 import { ComputerConfig } from '../../types/ComputerConfig';
 
-export const JsonFile: ComputerConfigFactory = (): ComputerConfig => ({
+export const JsonFile: ComputerConfig = {
   name: 'JsonFile',
   outputs: ['items', 'error'],
   params: {
@@ -26,4 +26,4 @@ export const JsonFile: ComputerConfigFactory = (): ComputerConfig => ({
 
     yield;
   },
-});
+};
diff --git a/packages/core/src/computers/ListFiles/ListFiles.ts b/packages/core/src/computers/ListFiles/ListFiles.ts
@@ -1,10 +1,10 @@
-import { ComputerConfigFactory, RunArgs } from '../../types/Computer';
+
 import { string } from '../../ParamBuilder';
 import { promises as fs } from 'fs'
 import * as nodePath from 'path'
 import { ComputerConfig } from '../../types/ComputerConfig';
 
-export const ListFiles: ComputerConfigFactory = (): ComputerConfig => ({
+export const ListFiles: ComputerConfig = {
   name: 'ListFiles',
   inputs: ['input'],
   outputs: [{
@@ -37,4 +37,4 @@ export const ListFiles: ComputerConfigFactory = (): ComputerConfig => ({
       yield;
     }
   },
-});
+};
diff --git a/packages/core/src/computers/Log/Log.ts b/packages/core/src/computers/Log/Log.ts
@@ -1,7 +1,7 @@
-import { ComputerConfigFactory, RunArgs } from '../../types/Computer';
+
 import { ComputerConfig } from '../../types/ComputerConfig';
 
-export const Log: ComputerConfigFactory = (): ComputerConfig => ({
+export const Log: ComputerConfig = {
   name: 'Log',
   inputs: ['input'],
 
@@ -14,4 +14,4 @@ export const Log: ComputerConfigFactory = (): ComputerConfig => ({
       yield;
     }
   },
-});
+};