@openfn/cli 0.0.30 → 0.0.31

package/dist/chunk-Q2H7WYJB.js

@@ -0,0 +1,149 @@
+// src/util/expand-adaptors.ts
+var expand_adaptors_default = (names) => names?.map((name) => {
+  if (typeof name === "string") {
+    if (name.startsWith("@openfn/language-")) {
+      return name;
+    }
+    return `@openfn/language-${name}`;
+  }
+  return name;
+});
+
+// src/util/logger.ts
+import actualCreateLogger, { printDuration } from "@openfn/logger";
+import { isValidLogLevel, defaultLogger } from "@openfn/logger";
+var CLI = "cli";
+var COMPILER = "compiler";
+var RUNTIME = "runtime";
+var JOB = "job";
+var namespaces = {
+  [CLI]: "CLI",
+  [RUNTIME]: "R/T",
+  [COMPILER]: "CMP",
+  [JOB]: "JOB"
+};
+var createLogger = (name = "", options) => {
+  const logOptions = options.log;
+  let level = logOptions[name] || logOptions.default || "default";
+  if (options.logJson) {
+    logOptions.json = true;
+  }
+  return actualCreateLogger(namespaces[name] || name, {
+    level,
+    ...logOptions
+  });
+};
+var logger_default = createLogger;
+var createNullLogger = () => createLogger(void 0, { log: { default: "none" } });
+
+// src/util/ensure-opts.ts
+import path from "node:path";
+var defaultLoggerOptions = {
+  default: "default",
+  job: "debug"
+};
+var ERROR_MESSAGE_LOG_LEVEL = "Unknown log level. Valid levels are none, debug, info and default.";
+var ERROR_MESSAGE_LOG_COMPONENT = "Unknown log component. Valid components are cli, compiler, runtime and job.";
+var DEFAULT_REPO_DIR = "/tmp/openfn/repo";
+var componentShorthands = {
+  cmp: "compiler",
+  rt: "runtime",
+  "r/t": "runtime"
+};
+var isValidComponent = (v) => /^(cli|runtime|compiler|job|default)$/i.test(v);
+var ensureLogOpts = (opts) => {
+  const components = {};
+  if (!opts.log && /^(version|test)$/.test(opts.command)) {
+    opts.log = { default: "info" };
+    return opts;
+  } else if (opts.log) {
+    opts.log.forEach((l) => {
+      let component = "";
+      let level = "";
+      if (l.match(/=/)) {
+        const parts = l.split("=");
+        component = parts[0].toLowerCase();
+        if (componentShorthands[component]) {
+          component = componentShorthands[component];
+        }
+        level = parts[1].toLowerCase();
+      } else {
+        component = "default";
+        level = l.toLowerCase();
+      }
+      if (!isValidComponent(component)) {
+        throw new Error(ERROR_MESSAGE_LOG_COMPONENT);
+      }
+      level = level.toLowerCase();
+      if (!isValidLogLevel(level)) {
+        throw new Error(ERROR_MESSAGE_LOG_LEVEL);
+      }
+      components[component] = level;
+    });
+  }
+  opts.log = {
+    ...defaultLoggerOptions,
+    ...components
+  };
+  return opts;
+};
+function ensureOpts(basePath = ".", opts) {
+  const newOpts = {
+    adaptor: opts.adaptor,
+    adaptors: opts.adaptors || [],
+    autoinstall: opts.autoinstall,
+    command: opts.command,
+    expandAdaptors: opts.expandAdaptors !== false,
+    force: opts.force || false,
+    immutable: opts.immutable || false,
+    log: opts.log,
+    logJson: typeof opts.logJson == "boolean" ? opts.logJson : Boolean(process.env.OPENFN_LOG_JSON),
+    compile: Boolean(opts.compile),
+    operation: opts.operation,
+    outputStdout: Boolean(opts.outputStdout),
+    packages: opts.packages,
+    repoDir: opts.repoDir || process.env.OPENFN_REPO_DIR || DEFAULT_REPO_DIR,
+    skipAdaptorValidation: opts.skipAdaptorValidation ?? false,
+    specifier: opts.specifier,
+    stateStdin: opts.stateStdin,
+    strictOutput: opts.strictOutput ?? true,
+    timeout: opts.timeout
+  };
+  const set = (key, value) => {
+    newOpts[key] = opts.hasOwnProperty(key) ? opts[key] : value;
+  };
+  if (opts.useAdaptorsMonorepo) {
+    newOpts.monorepoPath = process.env.OPENFN_ADAPTORS_REPO || "ERR";
+  }
+  let baseDir = basePath;
+  if (basePath.endsWith(".js")) {
+    baseDir = path.dirname(basePath);
+    set("jobPath", basePath);
+  } else {
+    set("jobPath", `${baseDir}/job.js`);
+  }
+  set("statePath", `${baseDir}/state.json`);
+  if (!opts.outputStdout) {
+    set(
+      "outputPath",
+      newOpts.command === "compile" ? `${baseDir}/output.js` : `${baseDir}/output.json`
+    );
+  }
+  ensureLogOpts(newOpts);
+  return newOpts;
+}
+
+export {
+  expand_adaptors_default,
+  printDuration,
+  CLI,
+  COMPILER,
+  RUNTIME,
+  JOB,
+  logger_default,
+  createNullLogger,
+  defaultLogger,
+  DEFAULT_REPO_DIR,
+  ensureLogOpts,
+  ensureOpts
+};

package/dist/index.js

@@ -1,4 +1,8 @@
 #!/usr/bin/env node
+import {
+  DEFAULT_REPO_DIR,
+  expand_adaptors_default
+} from "./chunk-Q2H7WYJB.js";
 
 // src/process/spawn.ts
 import path from "node:path";
@@ -83,92 +87,282 @@ var list = {
   }
 };
 
+// src/util/command-builders.ts
+var build = (opts2, yargs2) => opts2.reduce((_y, o) => yargs2.option(o.name, o.yargs), yargs2);
+var ensure = (command, opts2) => (yargs2) => {
+  yargs2.command = command;
+  opts2.filter((opt) => opt.ensure).forEach((opt) => {
+    opt.ensure(yargs2);
+  });
+};
+var override = (command, yargs2) => {
+  return {
+    ...command,
+    yargs: {
+      ...command.yargs || {},
+      ...yargs2
+    }
+  };
+};
+
+// src/options.ts
+import path2 from "node:path";
+var setDefaultValue = (opts2, key, value) => {
+  const v = opts2[key];
+  if (isNaN(v) && !v) {
+    opts2[key] = value;
+  }
+};
+var adaptors = {
+  name: "adaptors",
+  yargs: {
+    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"
+  },
+  ensure: (opts2) => {
+    if (opts2.adaptors) {
+      if (!Array.isArray(opts2.adaptors)) {
+        opts2.adaptors = [opts2.adaptors];
+      }
+    } else {
+      opts2.adaptors = [];
+    }
+    if (opts2.expandAdaptors) {
+      opts2.adaptors = expand_adaptors_default(opts2.adaptors);
+    }
+    delete opts2.adaptor;
+    delete opts2.a;
+  }
+};
+var autoinstall = {
+  name: "autoinstall",
+  yargs: {
+    alias: ["i"],
+    boolean: true,
+    description: "Auto-install the language adaptor",
+    default: false
+  }
+};
+var compile = {
+  name: "no-compile",
+  yargs: {
+    boolean: true,
+    description: "Disable compilation of the incoming source"
+  },
+  ensure: (opts2) => {
+    setDefaultValue(opts2, "compile", true);
+  }
+};
+var expandAdaptors = {
+  name: "no-expand-adaptors",
+  yargs: {
+    boolean: true,
+    description: "Don't attempt to auto-expand adaptor shorthand names"
+  },
+  ensure: (opts2) => {
+    setDefaultValue(opts2, "expandAdaptors", true);
+  }
+};
+var immutable = {
+  name: "immutable",
+  yargs: {
+    description: "Enforce immutabilty on state object",
+    boolean: true,
+    default: false
+  }
+};
+var getBaseDir = (opts2) => {
+  const basePath = opts2.path ?? ".";
+  if (basePath.endsWith(".js")) {
+    return path2.dirname(basePath);
+  }
+  return basePath;
+};
+var jobPath = {
+  name: "job-path",
+  yargs: {
+    hidden: true
+  },
+  ensure: (opts2) => {
+    const { path: basePath } = opts2;
+    if (basePath?.endsWith(".js")) {
+      opts2.jobPath = basePath;
+    } else {
+      const base = getBaseDir(opts2);
+      setDefaultValue(opts2, "jobPath", path2.join(base, "job.js"));
+    }
+  }
+};
+var logJson = {
+  name: "log-json",
+  yargs: {
+    description: "Output all logs as JSON objects",
+    boolean: true
+  },
+  ensure: () => {
+  }
+};
+var outputStdout = {
+  name: "output-stdout",
+  yargs: {
+    alias: "O",
+    boolean: true,
+    description: "Print output to stdout (instead of a file)"
+  },
+  ensure: (opts2) => {
+    setDefaultValue(opts2, "outputStdout", false);
+  }
+};
+var outputPath = {
+  name: "output-path",
+  yargs: {
+    alias: "o",
+    description: "Path to the output file"
+  },
+  ensure: (opts2) => {
+    if (opts2.command == "compile") {
+      if (opts2.outputPath) {
+        delete opts2.outputStdout;
+      }
+    } else {
+      if (opts2.outputStdout) {
+        delete opts2.outputPath;
+      } else {
+        const base = getBaseDir(opts2);
+        setDefaultValue(opts2, "outputPath", path2.join(base, "output.json"));
+      }
+    }
+    delete opts2.o;
+  }
+};
+var repoDir = {
+  name: "repo-dir",
+  yargs: {
+    description: "Provide a path to the repo root dir",
+    default: process.env.OPENFN_REPO_DIR || DEFAULT_REPO_DIR
+  }
+};
+var strictOutput = {
+  name: "no-strict-output",
+  yargs: {
+    boolean: true,
+    description: "Allow properties other than data to be returned in the output"
+  },
+  ensure: (opts2) => {
+    setDefaultValue(opts2, "strictOutput", true);
+  }
+};
+var skipAdaptorValidation = {
+  name: "skip-adaptor-validation",
+  yargs: {
+    boolean: true,
+    description: "Suppress warning message for jobs which don't use an adaptor",
+    default: false
+  }
+};
+var statePath = {
+  name: "state-path",
+  yargs: {
+    alias: ["s"],
+    description: "Path to the state file"
+  }
+};
+var stateStdin = {
+  name: "state-stdin",
+  yargs: {
+    alias: ["S"],
+    description: "Read state from stdin (instead of a file)"
+  }
+};
+var timeout = {
+  name: "timeout",
+  yargs: {
+    alias: ["t"],
+    number: true,
+    description: "Set the timeout duration (ms). Defaults to 5 minutes.",
+    default: 5 * 60 * 1e3
+  }
+};
+var useAdaptorsMonorepo = {
+  name: "use-adaptors-monorepo",
+  yargs: {
+    alias: ["m"],
+    boolean: true,
+    description: "Load adaptors from the monorepo. The OPENFN_ADAPTORS_REPO env var must be set to a valid path"
+  },
+  ensure: (opts2) => {
+    if (opts2.useAdaptorsMonorepo) {
+      opts2.monorepoPath = process.env.OPENFN_ADAPTORS_REPO || "ERR";
+    }
+  }
+};
+
 // src/execute/command.ts
+var options = [
+  expandAdaptors,
+  adaptors,
+  autoinstall,
+  compile,
+  immutable,
+  jobPath,
+  logJson,
+  outputPath,
+  outputStdout,
+  repoDir,
+  skipAdaptorValidation,
+  statePath,
+  stateStdin,
+  strictOutput,
+  timeout,
+  useAdaptorsMonorepo
+];
 var executeCommand = {
   command: "execute [path]",
   desc: `Run an openfn job. Get more help by running openfn <command> help`,
   aliases: ["$0"],
-  handler: (argv) => {
-    argv.command = "execute";
-  },
-  builder: (yargs2) => {
-    return applyExecuteOptions(yargs2).option("immutable", {
-      boolean: true,
-      description: "Treat state as immutable"
-    }).option("use-adaptors-monorepo", {
-      alias: "m",
-      boolean: true,
-      description: "Load adaptors from the monorepo. The OPENFN_ADAPTORS_REPO env var must be set to a valid path"
-    }).option("autoinstall", {
-      alias: "i",
-      boolean: true,
-      description: "Auto-install the language adaptor"
-    }).option("state-path", {
-      alias: "s",
-      description: "Path to the state file"
-    }).option("state-stdin", {
-      alias: "S",
-      description: "Read state from stdin (instead of a file)"
-    }).option("skip-adaptor-validation", {
-      boolean: true,
-      description: "Skip adaptor validation warnings"
-    }).option("timeout", {
-      alias: "-t",
-      description: "Set the timeout duration in MS"
-    }).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"
-    ).example(
-      "openfn job.js -a common",
-      "Run job.js using @openfn/language-common"
-    ).example(
-      "openfn install -a common",
-      "Install the latest version of language-common to the repo"
-    );
-  }
+  handler: ensure("execute", options),
+  builder: (yargs2) => build(options, yargs2).positional("path", {
+    describe: "The path to load the job from (a .js file or a dir containing a job.js file)",
+    demandOption: true
+  }).example(
+    "openfn foo/job.js",
+    "Reads foo/job.js, looks for state and output in foo"
+  ).example(
+    "openfn job.js -a common",
+    "Run job.js using @openfn/language-common"
+  ).example(
+    "openfn install -a common",
+    "Install the latest version of language-common to the repo"
+  )
 };
-var applyExecuteOptions = (yargs2) => yargs2.positional("path", {
-  describe: "The path to load the job from (a .js file or a dir containing a job.js file)",
-  demandOption: true
-}).option("output-path", {
-  alias: "o",
-  description: "Path to the output file"
-}).option("output-stdout", {
-  alias: "O",
-  boolean: true,
-  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",
-  array: true
-}).option("no-expand", {
-  description: "Don	 attempt to auto-expand adaptor shorthand names",
-  boolean: true
-});
 var command_default = executeCommand;
 
 // src/compile/command.ts
+var options2 = [
+  expandAdaptors,
+  adaptors,
+  jobPath,
+  logJson,
+  override(outputStdout, {
+    default: true
+  }),
+  outputPath,
+  useAdaptorsMonorepo
+];
 var compileCommand = {
   command: "compile [path]",
-  desc: "compile a openfn job and print or save the resulting js",
-  handler: (argv) => {
-    argv.command = "compile";
-  },
-  builder: (yargs2) => {
-    return applyExecuteOptions(yargs2).example(
-      "compile foo/job.js -O",
-      "Compiles foo/job.js and prints the result to stdout"
-    ).example(
-      "compile foo/job.js -o foo/job-compiled.js",
-      "Compiles foo/job.js and saves the result to foo/job-compiled.js"
-    );
-  }
+  desc: "Compile an openfn job and print or save the resulting JavaScript.",
+  handler: ensure("compile", options2),
+  builder: (yargs2) => build(options2, yargs2).positional("path", {
+    describe: "The path to load the job from (a .js file or a dir containing a job.js file)",
+    demandOption: true
+  }).example(
+    "compile foo/job.js -O",
+    "Compiles foo/job.js and prints the result to stdout"
+  ).example(
+    "compile foo/job.js -o foo/job-compiled.js",
+    "Compiles foo/job.js and saves the result to foo/job-compiled.js"
+  )
 };
 var command_default2 = compileCommand;
 

package/dist/process/runner.js

@@ -1,124 +1,19 @@
-// src/util/logger.ts
-import actualCreateLogger, { printDuration } from "@openfn/logger";
-import { isValidLogLevel, defaultLogger } from "@openfn/logger";
-var CLI = "cli";
-var COMPILER = "compiler";
-var RUNTIME = "runtime";
-var JOB = "job";
-var namespaces = {
-  [CLI]: "CLI",
-  [RUNTIME]: "R/T",
-  [COMPILER]: "CMP",
-  [JOB]: "JOB"
-};
-var createLogger = (name = "", options) => {
-  const logOptions = options.log || { json: true };
-  let level = logOptions[name] || logOptions.default || "default";
-  if (options.logJson) {
-    logOptions.json = true;
-  }
-  return actualCreateLogger(namespaces[name] || name, {
-    level,
-    ...logOptions
-  });
-};
-var logger_default = createLogger;
-var createNullLogger = () => createLogger(void 0, { log: { default: "none" } });
+import {
+  CLI,
+  COMPILER,
+  JOB,
+  RUNTIME,
+  createNullLogger,
+  defaultLogger,
+  ensureLogOpts,
+  ensureOpts,
+  expand_adaptors_default,
+  logger_default,
+  printDuration
+} from "../chunk-Q2H7WYJB.js";
 
-// src/util/ensure-opts.ts
-import path from "node:path";
-var defaultLoggerOptions = {
-  default: "default",
-  job: "debug"
-};
-var ERROR_MESSAGE_LOG_LEVEL = "Unknown log level. Valid levels are none, debug, info and default.";
-var ERROR_MESSAGE_LOG_COMPONENT = "Unknown log component. Valid components are cli, compiler, runtime and job.";
-var DEFAULT_REPO_DIR = "/tmp/openfn/repo";
-var componentShorthands = {
-  cmp: "compiler",
-  rt: "runtime",
-  "r/t": "runtime"
-};
-var isValidComponent = (v) => /^(cli|runtime|compiler|job|default)$/i.test(v);
-var ensureLogOpts = (opts) => {
-  const components = {};
-  if (opts.command === "version" || opts.command === "test" && !opts.log) {
-    return { default: "info" };
-  }
-  if (opts.log) {
-    opts.log.forEach((l) => {
-      let component = "";
-      let level = "";
-      if (l.match(/=/)) {
-        const parts = l.split("=");
-        component = parts[0].toLowerCase();
-        if (componentShorthands[component]) {
-          component = componentShorthands[component];
-        }
-        level = parts[1].toLowerCase();
-      } else {
-        component = "default";
-        level = l.toLowerCase();
-      }
-      if (!isValidComponent(component)) {
-        throw new Error(ERROR_MESSAGE_LOG_COMPONENT);
-      }
-      level = level.toLowerCase();
-      if (!isValidLogLevel(level)) {
-        throw new Error(ERROR_MESSAGE_LOG_LEVEL);
-      }
-      components[component] = level;
-    });
-  }
-  return {
-    ...defaultLoggerOptions,
-    ...components
-  };
-};
-function ensureOpts(basePath = ".", opts) {
-  const newOpts = {
-    adaptor: opts.adaptor,
-    adaptors: opts.adaptors || [],
-    autoinstall: opts.autoinstall,
-    command: opts.command,
-    expand: opts.expand !== false,
-    force: opts.force || false,
-    immutable: opts.immutable || false,
-    logJson: typeof opts.logJson == "boolean" ? opts.logJson : Boolean(process.env.OPENFN_LOG_JSON),
-    noCompile: Boolean(opts.noCompile),
-    operation: opts.operation,
-    outputStdout: Boolean(opts.outputStdout),
-    packages: opts.packages,
-    repoDir: opts.repoDir || process.env.OPENFN_REPO_DIR || DEFAULT_REPO_DIR,
-    skipAdaptorValidation: opts.skipAdaptorValidation ?? false,
-    specifier: opts.specifier,
-    stateStdin: opts.stateStdin,
-    strictOutput: opts.strictOutput ?? true,
-    statePath: opts.statePath,
-    timeout: opts.timeout
-  };
-  const set = (key, value) => {
-    newOpts[key] = opts.hasOwnProperty(key) ? opts[key] : value;
-  };
-  if (opts.useAdaptorsMonorepo) {
-    newOpts.monorepoPath = process.env.OPENFN_ADAPTORS_REPO || "ERR";
-  }
-  let baseDir = basePath;
-  if (basePath.endsWith(".js")) {
-    baseDir = path.dirname(basePath);
-    set("jobPath", basePath);
-  } else {
-    set("jobPath", `${baseDir}/job.js`);
-  }
-  if (!opts.outputStdout) {
-    set(
-      "outputPath",
-      newOpts.command === "compile" ? `${baseDir}/output.js` : `${baseDir}/output.json`
-    );
-  }
-  newOpts.log = ensureLogOpts(opts);
-  return newOpts;
-}
+// src/execute/handler.ts
+import { readFile } from "node:fs/promises";
 
 // src/execute/load-state.ts
 import fs from "node:fs/promises";
@@ -150,7 +45,9 @@ var load_state_default = async (opts, log) => {
       log.warn(e);
     }
   }
-  log.info("No state provided - using default state { data: {}, configuration: {}");
+  log.info(
+    "No state provided - using default state { data: {}, configuration: {}"
+  );
   return {
     data: {},
     configuration: {}
@@ -174,11 +71,11 @@ var execute_default = (code, state, opts) => {
 function parseAdaptors(opts) {
   const adaptors = {};
   opts.adaptors.reduce((obj, exp) => {
-    const [module, path5] = exp.split("=");
+    const [module, path4] = exp.split("=");
     const { name, version } = getNameAndVersion(module);
     const info = {};
-    if (path5) {
-      info.path = path5;
+    if (path4) {
+      info.path = path4;
     }
     if (version) {
       info.version = version;
@@ -190,25 +87,17 @@ function parseAdaptors(opts) {
 }
 
 // src/compile/compile.ts
-import fs2 from "node:fs/promises";
 import compile, { preloadAdaptorExports } from "@openfn/compiler";
 import { getModulePath } from "@openfn/runtime";
 var compile_default = async (opts, log) => {
   log.debug("Loading job...");
-  let job;
-  if (opts.noCompile) {
-    log.info("Skipping compilation as noCompile is set");
-    job = fs2.readFile(opts.jobPath, "utf8");
-    log.success(`Loaded job from ${opts.jobPath} (no compilation)`);
+  const compilerOptions = await loadTransformOptions(opts, log);
+  compilerOptions.logger = logger_default(COMPILER, opts);
+  const job = compile(opts.jobSource || opts.jobPath, compilerOptions);
+  if (opts.jobPath) {
+    log.success(`Compiled job from ${opts.jobPath}`);
   } else {
-    const complilerOptions = await loadTransformOptions(opts, log);
-    complilerOptions.logger = logger_default(COMPILER, opts);
-    job = compile(opts.jobSource || opts.jobPath, complilerOptions);
-    if (opts.jobPath) {
-      log.success(`Compiled job from ${opts.jobPath}`);
-    } else {
-      log.success("Compiled job");
-    }
+    log.success("Compiled job");
   }
   return job;
 };
@@ -220,10 +109,10 @@ var stripVersionSpecifier = (specifier) => {
   return specifier;
 };
 var resolveSpecifierPath = async (pattern, repoDir, log) => {
-  const [specifier, path5] = pattern.split("=");
-  if (path5) {
-    log.debug(`Resolved ${specifier} to path: ${path5}`);
-    return path5;
+  const [specifier, path4] = pattern.split("=");
+  if (path4) {
+    log.debug(`Resolved ${specifier} to path: ${path4}`);
+    return path4;
   }
   const repoPath = await getModulePath(specifier, repoDir, log);
   if (repoPath) {
@@ -240,15 +129,15 @@ var loadTransformOptions = async (opts, log) => {
     const [pattern] = opts.adaptors;
     const [specifier] = pattern.split("=");
     log.debug(`Attempting to preload typedefs for ${specifier}`);
-    const path5 = await resolveSpecifierPath(pattern, opts.repoDir, log);
-    if (path5) {
+    const path4 = await resolveSpecifierPath(pattern, opts.repoDir, log);
+    if (path4) {
       try {
-        exports = await preloadAdaptorExports(path5);
+        exports = await preloadAdaptorExports(path4);
         if (exports) {
           log.info(`Loaded typedefs for ${specifier}`);
         }
       } catch (e) {
-        log.error(`Failed to load adaptor typedefs from path ${path5}`);
+        log.error(`Failed to load adaptor typedefs from path ${path4}`);
         log.error(e);
       }
     }
@@ -302,19 +191,6 @@ var serialize_output_default = serializeOutput;
 import { exec } from "node:child_process";
 import treeify from "treeify";
 import { install as rtInstall, loadRepoPkg } from "@openfn/runtime";
-
-// src/util/expand-adaptors.ts
-var nullLogger = createNullLogger();
-var expand_adaptors_default = (names, log = nullLogger) => names?.map((name) => {
-  if (name.startsWith("@openfn/language-")) {
-    return name;
-  }
-  const expanded = `@openfn/language-${name}`;
-  log.debug(`Expanded adaptor ${name} to ${expanded}`);
-  return expanded;
-});
-
-// src/repo/handler.ts
 var install = async (opts, log = defaultLogger) => {
   let { packages, adaptor, repoDir } = opts;
   if (packages) {
@@ -322,7 +198,7 @@ var install = async (opts, log = defaultLogger) => {
     log.success("Installing packages...");
     log.debug("repoDir is set to:", repoDir);
     if (adaptor) {
-      packages = expand_adaptors_default(packages, log);
+      packages = expand_adaptors_default(packages);
     }
     await rtInstall(packages, repoDir, log);
     const duration = log.timer("install");
@@ -421,7 +297,16 @@ var executeHandler = async (options, logger) => {
     }
   }
   const state = await load_state_default(options, logger);
-  const code = await compile_default(options, logger);
+  let code = "";
+  if (options.compile) {
+    code = await compile_default(options, logger);
+  } else {
+    logger.info("Skipping compilation as noCompile is set");
+    if (options.jobPath) {
+      code = await readFile(options.jobPath, "utf8");
+      logger.success(`Loaded job from ${options.jobPath} (no compilation)`);
+    }
+  }
   try {
     const result = await execute_default(code, state, options);
     await serialize_output_default(options, result, logger);
@@ -454,6 +339,7 @@ var handler_default2 = compileHandler;
 var sillyMessage = "Calculating the answer to life, the universe, and everything...";
 var testHandler = async (options, logger) => {
   logger.log("Running test job...");
+  options.compile = true;
   options.jobSource = `const fn = () => state => { console.log('${sillyMessage}'); return state * 2; } ; fn()`;
   delete options.jobPath;
   if (!options.stateStdin) {
@@ -472,28 +358,28 @@ var handler_default3 = testHandler;
 // src/docgen/handler.ts
 import { writeFile as writeFile3 } from "node:fs/promises";
 import { readFileSync, writeFileSync, mkdirSync, rmSync } from "node:fs";
-import path2 from "node:path";
+import path from "node:path";
 import { describePackage } from "@openfn/describe-package";
 import { getNameAndVersion as getNameAndVersion2 } from "@openfn/runtime";
 var RETRY_DURATION = 500;
 var RETRY_COUNT = 20;
 var TIMEOUT_MS = 1e3 * 60;
 var actualDocGen = (specifier) => describePackage(specifier, {});
-var ensurePath = (filePath) => mkdirSync(path2.dirname(filePath), { recursive: true });
-var generatePlaceholder = (path5) => {
-  writeFileSync(path5, `{ "loading": true, "timestamp": ${Date.now()}}`);
+var ensurePath = (filePath) => mkdirSync(path.dirname(filePath), { recursive: true });
+var generatePlaceholder = (path4) => {
+  writeFileSync(path4, `{ "loading": true, "timestamp": ${Date.now()}}`);
 };
 var finish = (logger, resultPath) => {
   logger.success("Done! Docs can be found at:\n");
-  logger.print(`  ${path2.resolve(resultPath)}`);
+  logger.print(`  ${path.resolve(resultPath)}`);
 };
-var generateDocs = async (specifier, path5, docgen, logger) => {
+var generateDocs = async (specifier, path4, docgen, logger) => {
   const result = await docgen(specifier);
-  await writeFile3(path5, JSON.stringify(result, null, 2));
-  finish(logger, path5);
-  return path5;
+  await writeFile3(path4, JSON.stringify(result, null, 2));
+  finish(logger, path4);
+  return path4;
 };
-var waitForDocs = async (docs, path5, logger, retryDuration = RETRY_DURATION) => {
+var waitForDocs = async (docs, path4, logger, retryDuration = RETRY_DURATION) => {
   try {
     if (docs.hasOwnProperty("loading")) {
       logger.info("Docs are being loaded by another process. Waiting.");
@@ -505,19 +391,19 @@ var waitForDocs = async (docs, path5, logger, retryDuration = RETRY_DURATION) =>
             clearInterval(i);
             reject(new Error("Timed out waiting for docs to load"));
           }
-          const updated = JSON.parse(readFileSync(path5, "utf8"));
+          const updated = JSON.parse(readFileSync(path4, "utf8"));
           if (!updated.hasOwnProperty("loading")) {
             logger.info("Docs found!");
             clearInterval(i);
-            resolve(path5);
+            resolve(path4);
           }
           count++;
         }, retryDuration);
       });
     } else {
-      logger.info(`Docs already written to cache at ${path5}`);
-      finish(logger, path5);
-      return path5;
+      logger.info(`Docs already written to cache at ${path4}`);
+      finish(logger, path4);
+      return path4;
     }
   } catch (e) {
     logger.error("Existing doc JSON corrupt. Aborting");
@@ -534,28 +420,28 @@ var docgenHandler = (options, logger, docgen = actualDocGen, retryDuration = RET
     process.exit(9);
   }
   logger.success(`Generating docs for ${specifier}`);
-  const path5 = `${repoDir}/docs/${specifier}.json`;
-  ensurePath(path5);
+  const path4 = `${repoDir}/docs/${specifier}.json`;
+  ensurePath(path4);
   const handleError = () => {
     logger.info("Removing placeholder");
-    rmSync(path5);
+    rmSync(path4);
   };
   try {
-    const existing = readFileSync(path5, "utf8");
+    const existing = readFileSync(path4, "utf8");
     const json = JSON.parse(existing);
     if (json && json.timeout && Date.now() - json.timeout >= TIMEOUT_MS) {
       logger.info(`Expired placeholder found. Removing.`);
-      rmSync(path5);
+      rmSync(path4);
       throw new Error("TIMEOUT");
     }
-    return waitForDocs(json, path5, logger, retryDuration);
+    return waitForDocs(json, path4, logger, retryDuration);
   } catch (e) {
     if (e.message !== "TIMEOUT") {
-      logger.info(`Docs JSON not found at ${path5}`);
+      logger.info(`Docs JSON not found at ${path4}`);
     }
     logger.debug("Generating placeholder");
-    generatePlaceholder(path5);
-    return generateDocs(specifier, path5, docgen, logger).catch((e2) => {
+    generatePlaceholder(path4);
+    return generateDocs(specifier, path4, docgen, logger).catch((e2) => {
       logger.error("Error generating documentation");
       logger.error(e2);
       handleError();
@@ -565,7 +451,7 @@ var docgenHandler = (options, logger, docgen = actualDocGen, retryDuration = RET
 var handler_default4 = docgenHandler;
 
 // src/docs/handler.ts
-import { readFile } from "node:fs/promises";
+import { readFile as readFile2 } from "node:fs/promises";
 import { getNameAndVersion as getNameAndVersion3, getLatestVersion } from "@openfn/runtime";
 var describeFn = (adaptorName, fn) => `## ${fn.name}(${fn.parameters.map(({ name }) => name).join(",")})
 
@@ -603,15 +489,15 @@ var docsHandler = async (options, logger) => {
     logger.success(`Showing docs for ${adaptorName} v${version}`);
   }
   logger.info("Generating/loading documentation...");
-  const path5 = await handler_default4(
+  const path4 = await handler_default4(
     {
       specifier: `${name}@${version}`,
       repoDir
     },
     createNullLogger()
   );
-  if (path5) {
-    const source = await readFile(path5, "utf8");
+  if (path4) {
+    const source = await readFile2(path4, "utf8");
     const data = JSON.parse(source);
     let desc;
     if (operation) {
@@ -633,13 +519,13 @@ var docsHandler = async (options, logger) => {
 var handler_default5 = docsHandler;
 
 // src/util/use-adaptors-repo.ts
-import { readFile as readFile2 } from "node:fs/promises";
-import path3 from "node:path";
+import { readFile as readFile3 } from "node:fs/promises";
+import path2 from "node:path";
 import assert from "node:assert";
 import { getNameAndVersion as getNameAndVersion4 } from "@openfn/runtime";
 var validateMonoRepo = async (repoPath, log) => {
   try {
-    const raw = await readFile2(`${repoPath}/package.json`, "utf8");
+    const raw = await readFile3(`${repoPath}/package.json`, "utf8");
     const pkg = JSON.parse(raw);
     assert(pkg.name === "adaptors");
   } catch (e) {
@@ -658,7 +544,7 @@ var updatePath = (adaptor, repoPath, log) => {
     );
   }
   const shortName = name.replace("@openfn/language-", "");
-  const abspath = path3.resolve(repoPath, "packages", shortName);
+  const abspath = path2.resolve(repoPath, "packages", shortName);
   return `${name}=${abspath}`;
 };
 var useAdaptorsRepo = async (adaptors, repoPath, log) => {
@@ -675,7 +561,7 @@ var use_adaptors_repo_default = useAdaptorsRepo;
 
 // src/util/print-versions.ts
 import { readFileSync as readFileSync2 } from "node:fs";
-import path4 from "node:path";
+import path3 from "node:path";
 import { getNameAndVersion as getNameAndVersion5 } from "@openfn/runtime";
 import { mainSymbols } from "figures";
 var NODE = "node.js";
@@ -685,7 +571,7 @@ var COMPILER2 = "compiler";
 var { triangleRightSmall: t } = mainSymbols;
 var loadVersionFromPath = (adaptorPath) => {
   try {
-    const pkg = JSON.parse(readFileSync2(path4.resolve(adaptorPath, "package.json"), "utf8"));
+    const pkg = JSON.parse(readFileSync2(path3.resolve(adaptorPath, "package.json"), "utf8"));
     return pkg.version;
   } catch (e) {
     return "unknown";
@@ -761,8 +647,9 @@ var handlers = {
   ["repo-list"]: list,
   version: async (opts, logger) => print_versions_default(logger, opts)
 };
+var maybeEnsureOpts = (basePath, options) => /^(execute|compile)$/.test(options.command) ? ensureLogOpts(options) : ensureOpts(basePath, options);
 var parse = async (basePath, options, log) => {
-  const opts = ensureOpts(basePath, options);
+  const opts = maybeEnsureOpts(basePath, options);
   const logger = log || logger_default(CLI, opts);
   if (opts.command === "execute" || opts.command === "test") {
     await print_versions_default(logger, opts);
@@ -780,8 +667,8 @@ var parse = async (basePath, options, log) => {
       opts.monorepoPath,
       logger
     );
-  } else if (opts.adaptors && opts.expand) {
-    opts.adaptors = expand_adaptors_default(opts.adaptors, logger);
+  } else if (opts.adaptors && opts.expandAdaptors) {
+    opts.adaptors = expand_adaptors_default(opts.adaptors);
   }
   if (/^(test|version)$/.test(opts.command) && !opts.repoDir) {
     logger.warn(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/cli",
-  "version": "0.0.30",
+  "version": "0.0.31",
   "description": "CLI devtools for the openfn toolchain.",
   "engines": {
     "node": ">=18",
@@ -43,8 +43,8 @@
     "yargs": "^17.5.1",
     "@openfn/compiler": "0.0.25",
     "@openfn/describe-package": "0.0.14",
-    "@openfn/runtime": "0.0.19",
-    "@openfn/logger": "0.0.10"
+    "@openfn/logger": "0.0.10",
+    "@openfn/runtime": "0.0.19"
   },
   "files": [
     "dist",