@openfn/cli 0.0.16 → 0.0.19

package/dist/index.js

@@ -103,6 +103,9 @@ var executeCommand = {
     }).option("no-compile", {
       boolean: true,
       description: "Skip compilation"
+    }).option("no-strict-output", {
+      boolean: true,
+      description: "Allow properties other than data to be returned in the output."
     }).example(
       "openfn foo/job.js",
       "Reads foo/job.js, looks for state and output in foo"
@@ -124,7 +127,7 @@ var applyExecuteOptions = (yargs2) => yargs2.positional("path", {
 }).option("output-stdout", {
   alias: "O",
   boolean: true,
-  description: "Print output to stdout (intead of a file)"
+  description: "Print output to stdout (instead of a file)"
 }).option("adaptors", {
   alias: ["a", "adaptor"],
   description: "A language adaptor to use for the job. Short-form names are allowed. Can include an explicit path to a local adaptor build.",

package/dist/process/runner.js

@@ -82,6 +82,7 @@ function ensureOpts(basePath = ".", opts) {
     outputStdout: Boolean(opts.outputStdout),
     packages: opts.packages,
     stateStdin: opts.stateStdin,
+    strictOutput: opts.strictOutput ?? true,
     immutable: opts.immutable || false
   };
   const set = (key, value) => {
@@ -105,9 +106,6 @@ function ensureOpts(basePath = ".", opts) {
   return newOpts;
 }
 
-// src/execute/handler.ts
-import { writeFile } from "node:fs/promises";
-
 // src/execute/load-state.ts
 import fs from "node:fs/promises";
 var load_state_default = async (opts, log) => {
@@ -251,6 +249,38 @@ var loadTransformOptions = async (opts, log) => {
   return options;
 };
 
+// src/execute/serialize-output.ts
+import { writeFile } from "node:fs/promises";
+import stringify from "fast-safe-stringify";
+var serializeOutput = async (options, result, logger) => {
+  let output = result;
+  if (output && (output.configuration || output.data)) {
+    const { data, configuration, ...rest } = result;
+    if (options.strictOutput !== false) {
+      output = { data };
+    } else {
+      output = {
+        data,
+        ...rest
+      };
+    }
+  }
+  if (output === void 0) {
+    output = "";
+  } else {
+    output = stringify(output, void 0, 2);
+  }
+  if (options.outputStdout) {
+    logger.success(`Result: `);
+    logger.success(output);
+  } else if (options.outputPath) {
+    logger.success(`Writing output to ${options.outputPath}`);
+    await writeFile(options.outputPath, output);
+  }
+  return output;
+};
+var serialize_output_default = serializeOutput;
+
 // src/repo/handler.ts
 import { exec } from "node:child_process";
 import treeify from "treeify";
@@ -269,18 +299,18 @@ var expand_adaptors_default = (names, log = nullLogger) => names == null ? void
 
 // src/repo/handler.ts
 var install = async (opts, log = defaultLogger) => {
-  log.timer("install");
   let { packages, adaptor, repoDir } = opts;
-  log.success("Installing packages...");
   if (packages) {
+    log.timer("install");
+    log.success("Installing packages...");
     log.debug("repoDir is set to:", repoDir);
     if (adaptor) {
       packages = expand_adaptors_default(packages, log);
     }
     await rtInstall(packages, repoDir, log);
+    const duration = log.timer("install");
+    log.success(`Installation complete in ${duration}`);
   }
-  const duration = log.timer("install");
-  log.success(`Installation complete in ${duration}`);
 };
 var clean = async (options, logger) => {
   if (options.repoDir) {
@@ -335,23 +365,25 @@ var list = async (options, logger) => {
 };
 
 // src/execute/handler.ts
+var getAutoinstallTargets = (options) => {
+  var _a;
+  if (options.autoinstall && options.adaptors) {
+    return (_a = options.adaptors) == null ? void 0 : _a.filter((a) => !/=/.test(a));
+  }
+  return [];
+};
 var executeHandler = async (options, logger) => {
   const start = new Date().getTime();
-  if (options.autoinstall) {
+  const autoInstallTargets = getAutoinstallTargets(options);
+  if (autoInstallTargets.length) {
     const { repoDir } = options;
     logger.info("Auto-installing language adaptors");
-    await install({ packages: options.adaptors, repoDir }, logger);
+    await install({ packages: autoInstallTargets, repoDir }, logger);
   }
   const state = await load_state_default(options, logger);
   const code = await compile_default(options, logger);
   const result = await execute_default(code, state, options);
-  if (options.outputStdout) {
-    logger.success(`Result: `);
-    logger.success(result);
-  } else {
-    logger.success(`Writing output to ${options.outputPath}`);
-    await writeFile(options.outputPath, JSON.stringify(result, null, 4));
-  }
+  await serialize_output_default(options, result, logger);
   const duration = printDuration(new Date().getTime() - start);
   logger.success(`Done in ${duration}! \u2728`);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/cli",
-  "version": "0.0.16",
+  "version": "0.0.19",
   "description": "CLI devtools for the openfn toolchain.",
   "engines": {
     "node": ">=16",
@@ -28,7 +28,7 @@
     "@types/mock-fs": "^4.13.1",
     "@types/node": "^17.0.45",
     "@types/yargs": "^17.0.12",
-    "ava": "^4.2.0",
+    "ava": "5.1.0",
     "mock-fs": "^5.1.4",
     "ts-node": "^10.8.1",
     "tslib": "^2.4.0",
@@ -36,9 +36,10 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@openfn/compiler": "^0.0.15",
-    "@openfn/logger": "^0.0.6",
-    "@openfn/runtime": "^0.0.11",
+    "@openfn/compiler": "^0.0.18",
+    "@openfn/logger": "^0.0.7",
+    "@openfn/runtime": "^0.0.12",
+    "fast-safe-stringify": "^2.1.1",
     "rimraf": "^3.0.2",
     "treeify": "^1.1.0",
     "yargs": "^17.5.1"