Release: 1.0 (worker, engine, cli, runtime)

build/install-global.js

@@ -14,6 +14,8 @@ const outputPath = process.argv[2] || './dist';
 
 // Package everything up like a local build
 exec('git branch --show-current', {}, async (err, branchName) => {
+  console.log('Installing openfnx for branch:', branchName);
+  console.log();
   const files = await findPackages();
   const pkgs = mapPackages(files);
   await ensureOutputPath(outputPath);
@@ -37,9 +39,13 @@ exec('git branch --show-current', {}, async (err, branchName) => {
   ).then(async () => {
     const cliPath = getLocalTarballName(pkgs['@openfn/cli']);
     const command = `npm install -g ${path.resolve(outputPath, cliPath)}`;
-    console.log(command);
+    //console.log(command);
 
     await exec(command);
     // install the local CLI globally
+
+    console.log();
+    console.log('openfnx installed successfully! To test:');
+    console.log('  openfnx --version');
   });
 });

integration-tests/cli/test/cli.test.ts

@@ -14,7 +14,7 @@ test.serial('openfn version', async (t) => {
 test.serial('openfn test', async (t) => {
   const { stdout } = await run(t.title);
   t.regex(stdout, /Versions:/);
-  t.regex(stdout, /Running test job.../);
+  t.regex(stdout, /Running test workflow/);
   t.regex(stdout, /Result: 42/);
 });
 

integration-tests/cli/test/errors.test.ts

@@ -2,19 +2,20 @@ import test from 'ava';
 import path from 'node:path';
 import run from '../src/run';
 import { extractLogs, assertLog } from '../src/util';
+import { stderr } from 'node:process';
 
 const jobsPath = path.resolve('test/fixtures');
 
 // These are all errors that will stop the CLI from even running
 
-test.serial('job not found', async (t) => {
+test.serial('expression not found', async (t) => {
   const { stdout, err } = await run('openfn blah.js --log-json');
   t.is(err.code, 1);
 
   const stdlogs = extractLogs(stdout);
 
-  assertLog(t, stdlogs, /job not found/i);
-  assertLog(t, stdlogs, /failed to load the job from blah.js/i);
+  assertLog(t, stdlogs, /expression not found/i);
+  assertLog(t, stdlogs, /failed to load the expression from blah.js/i);
   assertLog(t, stdlogs, /critical error: aborting command/i);
 });
 

integration-tests/cli/test/execute-workflow.test.ts

@@ -83,6 +83,15 @@ test.serial(
   }
 );
 
+// Run a new-style execution plan with custom start
+test.serial(`openfn ${jobsPath}/plan.json -i`, async (t) => {
+  const { err } = await run(t.title);
+  t.falsy(err);
+
+  const out = getJSON();
+  t.deepEqual(out.data.userId, 1);
+});
+
 test.serial(`openfn ${jobsPath}/wf-conditional.json`, async (t) => {
   const { err } = await run(t.title);
   t.falsy(err);
@@ -124,36 +133,6 @@ test.serial(
   }
 );
 
-test.serial(`openfn ${jobsPath}/wf-strict.json --strict`, async (t) => {
-  const { err } = await run(t.title);
-  t.falsy(err);
-
-  const out = getJSON();
-  t.deepEqual(out, {
-    data: {
-      name: 'jane',
-    },
-  });
-});
-
-test.serial(`openfn ${jobsPath}/wf-strict.json --no-strict`, async (t) => {
-  const { err } = await run(t.title);
-  t.falsy(err);
-
-  const out = getJSON();
-  t.deepEqual(out, {
-    x: 22,
-    data: {
-      name: 'jane',
-    },
-    references: [
-      {
-        name: 'bob',
-      },
-    ],
-  });
-});
-
 test.serial(
   `openfn ${jobsPath}/wf-errors.json -S "{ \\"data\\": { \\"number\\": 2 } }"`,
   async (t) => {
@@ -169,8 +148,8 @@ test.serial(
   }
 );
 
-test.serial(
-  `openfn ${jobsPath}/wf-errors.json -S "{ \\"data\\": { \\"number\\": 32 } }"`,
+test.serial.only(
+  `openfn ${jobsPath}/wf-errors.json -iS "{ \\"data\\": { \\"number\\": 32 } }"`,
   async (t) => {
     const { err } = await run(t.title);
     t.falsy(err);
@@ -189,7 +168,7 @@ test.serial(
             severity: 'fail',
             source: 'runtime',
           },
-          jobId: 'start',
+          stepId: 'start',
           message: 'abort',
           type: 'JobError',
         },

integration-tests/cli/test/fixtures/circular.json

@@ -1,14 +1,16 @@
 {
-  "jobs": [
-    {
-      "id": "a",
-      "expression": "x",
-      "next": { "b": true }
-    },
-    {
-      "id": "b",
-      "expression": "x",
-      "next": { "a": true }
-    }
-  ]
+  "workflow": {
+    "steps": [
+      {
+        "id": "a",
+        "expression": "x",
+        "next": { "b": true }
+      },
+      {
+        "id": "b",
+        "expression": "x",
+        "next": { "a": true }
+      }
+    ]
+  }
 }

integration-tests/cli/test/fixtures/invalid-config-path.json

@@ -1,7 +1,10 @@
 {
-  "jobs": [
-    {
-      "configuration": "does-not-exist.json"
-    }
-  ]
+  "workflow": {
+    "steps": [
+      {
+        "configuration": "does-not-exist.json",
+        "expression": "."
+      }
+    ]
+  }
 }

integration-tests/cli/test/fixtures/invalid-exp-path.json

@@ -1,7 +1,9 @@
 {
-  "jobs": [
-    {
-      "expression": "does-not-exist.js"
-    }
-  ]
+  "workflow": {
+    "steps": [
+      {
+        "expression": "does-not-exist.js"
+      }
+    ]
+  }
 }

integration-tests/cli/test/fixtures/invalid-start.json

@@ -1,9 +1,13 @@
 {
-  "start": "nope",
-  "jobs": [
-    {
-      "id": "x",
-      "expression": "fn((state) => state)"
-    }
-  ]
+  "options": {
+    "start": "nope"
+  },
+  "workflow": {
+    "steps": [
+      {
+        "id": "x",
+        "expression": "fn((state) => state)"
+      }
+    ]
+  }
 }

integration-tests/cli/test/fixtures/invalid-syntax.json

@@ -1,7 +1,9 @@
 {
-  "jobs": [
-    {
-      "expression": "invalid.js"
-    }
-  ]
+  "workflow": {
+    "steps": [
+      {
+        "expression": "invalid.js"
+      }
+    ]
+  }
 }

integration-tests/cli/test/fixtures/multiple-inputs.json

@@ -1,18 +1,20 @@
 {
-  "jobs": [
-    {
-      "id": "a",
-      "expression": "x",
-      "next": { "b": true, "c": true }
-    },
-    {
-      "id": "b",
-      "expression": "x",
-      "next": { "c": true }
-    },
-    {
-      "id": "c",
-      "expression": "x"
-    }
-  ]
+  "workflow": {
+    "steps": [
+      {
+        "id": "a",
+        "expression": "x",
+        "next": { "b": true, "c": true }
+      },
+      {
+        "id": "b",
+        "expression": "x",
+        "next": { "c": true }
+      },
+      {
+        "id": "c",
+        "expression": "x"
+      }
+    ]
+  }
 }

integration-tests/cli/test/fixtures/plan.json

@@ -0,0 +1,19 @@
+{
+  "options": {
+    "start": "b"
+  },
+  "workflow": {
+    "steps": [
+      {
+        "id": "a",
+        "adaptor": "common",
+        "expression": "fn((state) => { return state; });"
+      },
+      {
+        "id": "b",
+        "adaptor": "http",
+        "expression": "get('https://jsonplaceholder.typicode.com/todos/1')"
+      }
+    ]
+  }
+}

integration-tests/cli/test/fixtures/wf-array.json

@@ -1,21 +1,23 @@
 {
-  "jobs": [
-    {
-      "id": "a",
-      "adaptor": "common",
-      "expression": "fn((state) => { if (!state.data.items) { state.data.items = []; } return state; });",
-      "next": { "b": true }
-    },
-    {
-      "id": "b",
-      "adaptor": "common",
-      "expression": "fn((state) => { state.data.items.push('b'); return state; });",
-      "next": { "c": true }
-    },
-    {
-      "id": "c",
-      "adaptor": "common",
-      "expression": "fn((state) => { state.data.items.push('c'); return state; });"
-    }
-  ]
+  "workflow": {
+    "steps": [
+      {
+        "id": "a",
+        "adaptor": "common",
+        "expression": "fn((state) => { if (!state.data.items) { state.data.items = []; } return state; });",
+        "next": { "b": true }
+      },
+      {
+        "id": "b",
+        "adaptor": "common",
+        "expression": "fn((state) => { state.data.items.push('b'); return state; });",
+        "next": { "c": true }
+      },
+      {
+        "id": "c",
+        "adaptor": "common",
+        "expression": "fn((state) => { state.data.items.push('c'); return state; });"
+      }
+    ]
+  }
 }

integration-tests/cli/test/fixtures/wf-conditional.json

@@ -1,29 +1,31 @@
 {
-  "start": "start",
-  "jobs": [
-    {
-      "id": "start",
-      "state": {
-        "data": {
-          "number": 1
+  "options": { "start": "start" },
+  "workflow": {
+    "steps": [
+      {
+        "id": "start",
+        "state": {
+          "data": {
+            "number": 1
+          }
+        },
+        "adaptor": "common",
+        "expression": "fn((state) => state);",
+        "next": {
+          "small": { "condition": "state.data.number < 10" },
+          "large": { "condition": "state.data.number >= 10" }
         }
       },
-      "adaptor": "common",
-      "expression": "fn((state) => state);",
-      "next": {
-        "small": { "condition": "state.data.number < 10" },
-        "large": { "condition": "state.data.number >= 10" }
+      {
+        "id": "small",
+        "adaptor": "common",
+        "expression": "fn((state) => { state.data.result = \"small\"; return state; });"
+      },
+      {
+        "id": "large",
+        "adaptor": "common",
+        "expression": "fn((state) => { state.data.result = \"large\"; return state; });"
       }
-    },
-    {
-      "id": "small",
-      "adaptor": "common",
-      "expression": "fn((state) => { state.data.result = \"small\"; return state; });"
-    },
-    {
-      "id": "large",
-      "adaptor": "common",
-      "expression": "fn((state) => { state.data.result = \"large\"; return state; });"
-    }
-  ]
+    ]
+  }
 }