@openfn/cli 0.4.0 → 0.4.2

package/README.md

@@ -180,7 +180,7 @@ Example config file:
 
   // Optional: defaults to OpenFn.org's API, can be overridden or set with
   // `OPENFN_ENDPOINT` env var
-  "endpoint": "https://app.openfn.org/api/provision"
+  "endpoint": "https://app.openfn.org"
 }
 ```
 
@@ -261,30 +261,28 @@ To see an example workflow, run the test command with `openfn test`.
 
 A workflow has a structure like this (better documentation is coming soon):
 
-```
-
-{
-"start": "a", // optionally specify the start node (defaults to jobs[0])
-"jobs": [
+```json
 {
-"id": "a",
-"expression": "fn((state) => state)", // code or a path
-"adaptor": "@openfn/language-common@1.75", // specifiy the adaptor to use (version optional)
-"data": {}, // optionally pre-populate the data object (this will be overriden by keys in in previous state)
-"configuration": {}, // Use this to pass credentials
-"next": {
-// This object defines which jobs to call next
-// All edges returning true will run
-// If there are no next edges, the workflow will end
-"b": true,
-"c": {
-"condition": "!state.error" // Not that this is an expression, not a function
+  "start": "a", // optionally specify the start node (defaults to jobs[0])
+  "jobs": [
+    {
+      "id": "a",
+      "expression": "fn((state) => state)", // code or a path
+      "adaptor": "@openfn/language-common@1.75", // specifiy the adaptor to use (version optional)
+      "data": {}, // optionally pre-populate the data object (this will be overriden by keys in in previous state)
+      "configuration": {}, // Use this to pass credentials
+      "next": {
+        // This object defines which jobs to call next
+        // All edges returning true will run
+        // If there are no next edges, the workflow will end
+        "b": true,
+        "c": {
+          "condition": "!state.error" // Not that this is an expression, not a function
+        }
+      }
+    }
+  ]
 }
-}
-},
-]
-}
-
 ```
 
 ## Compilation

package/dist/process/runner.js

@@ -1083,16 +1083,32 @@ import path5 from "path";
 import fs3 from "node:fs/promises";
 import {
   getConfig as getConfig2,
-  getState,
-  mergeSpecIntoState,
-  getSpec
+  getProject,
+  getSpec,
+  getStateFromProjectPayload
 } from "@openfn/deploy";
 async function pullHandler(options, logger) {
   try {
     assert_path_default(options.projectId);
     const config = mergeOverrides2(await getConfig2(options.configPath), options);
-    logger.always("Downloading project yaml and state from instance");
-    const state = await getState(config.statePath);
+    logger.always("Downloading existing project state (as JSON) from the server.");
+    const { data: project } = await getProject(config, options.projectId);
+    if (!project) {
+      logger.error("ERROR: Project not found.");
+      logger.warn(
+        "Please check the UUID and verify your endpoint and apiKey in your config."
+      );
+      process.exitCode = 1;
+      process.exit(1);
+    }
+    const state = getStateFromProjectPayload(project);
+    await fs3.writeFile(
+      path5.resolve(config.statePath),
+      JSON.stringify(state, null, 2)
+    );
+    logger.always(
+      "Downloading the project spec (as YAML) from the server."
+    );
     const url2 = new URL(
       `api/provision/yaml?id=${options.projectId}`,
       config.endpoint
@@ -1104,22 +1120,24 @@ async function pullHandler(options, logger) {
         Accept: "application/json"
       }
     });
+    if (res.status != 200) {
+      logger.error("ERROR: Project spec not retrieved.");
+      logger.warn(
+        "No YAML representation of this project could be retrieved from the server."
+      );
+      process.exitCode = 1;
+      process.exit(1);
+    }
     const resolvedPath = path5.resolve(config.specPath);
     logger.debug("reading spec from", resolvedPath);
     await fs3.writeFile(resolvedPath, res.body);
-    const spec = await getSpec(config.specPath);
-    logger.debug("validated spec: ", spec);
+    const spec = await getSpec(resolvedPath);
     if (spec.errors.length > 0) {
       logger.error("ERROR: invalid spec");
       logger.error(spec.errors);
       process.exitCode = 1;
       process.exit(1);
     }
-    const nextState = mergeSpecIntoState(state, spec.doc);
-    await fs3.writeFile(
-      path5.resolve(config.statePath),
-      JSON.stringify(nextState, null, 2)
-    );
     logger.success("Project pulled successfully");
     process.exitCode = 0;
     return true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/cli",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "CLI devtools for the openfn toolchain.",
   "engines": {
     "node": ">=18",
@@ -44,11 +44,11 @@
     "rimraf": "^3.0.2",
     "treeify": "^1.1.0",
     "yargs": "^17.7.2",
-    "@openfn/compiler": "0.0.36",
-    "@openfn/deploy": "0.2.6",
+    "@openfn/compiler": "0.0.37",
+    "@openfn/deploy": "0.2.8",
     "@openfn/describe-package": "0.0.18",
-    "@openfn/logger": "0.0.17",
-    "@openfn/runtime": "0.0.30"
+    "@openfn/logger": "0.0.18",
+    "@openfn/runtime": "0.0.32"
   },
   "files": [
     "dist",