@openfn/cli 0.0.39 → 0.0.41

package/dist/chunk-UBDWXKSG.js

@@ -0,0 +1,33 @@
+// src/util/expand-adaptors.ts
+var expand = (name) => {
+  if (typeof name === "string") {
+    const [left] = name.split("=");
+    if (left.match("/") || left.endsWith(".js")) {
+      return name;
+    }
+    return `@openfn/language-${name}`;
+  }
+  return name;
+};
+var expand_adaptors_default = (opts) => {
+  const { adaptors, workflow } = opts;
+  if (adaptors) {
+    opts.adaptors = adaptors?.map(expand);
+  }
+  if (workflow) {
+    Object.values(workflow.jobs).forEach((job) => {
+      if (job.adaptor) {
+        job.adaptor = expand(job.adaptor);
+      }
+    });
+  }
+  return opts;
+};
+
+// src/constants.ts
+var DEFAULT_REPO_DIR = "/tmp/openfn/repo";
+
+export {
+  expand_adaptors_default,
+  DEFAULT_REPO_DIR
+};

package/dist/index.js

@@ -2,7 +2,7 @@
 import {
   DEFAULT_REPO_DIR,
   expand_adaptors_default
-} from "./chunk-LV5XDERP.js";
+} from "./chunk-UBDWXKSG.js";
 
 // src/process/spawn.ts
 import path from "node:path";
@@ -34,77 +34,6 @@ function spawn_default(basePath, opts2) {
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 
-// src/repo/command.ts
-var repo = {
-  command: "repo [subcommand]",
-  desc: "Run commands on the module repo (install|clean)",
-  builder: (yargs2) => yargs2.command(clean).command(install).command(pwd).command(list).example("repo install -a http", "Install @openfn/language-http").example("repo clean", "Remove everything from the repo working dir").example("repo pwd", "Print the current repo working dir")
-};
-var install = {
-  command: "install [packages...]",
-  desc: "install one or more packages to the runtime repo",
-  handler: (argv) => {
-    argv.command = "repo-install";
-  },
-  builder: (yargs2) => {
-    return yargs2.option("adaptor", {
-      alias: ["a"],
-      description: "Install an adaptor by passing a shortened version of the name",
-      boolean: true
-    }).example("install axios", "Install the axios npm package to the repo").example(
-      "install -a http",
-      "Install @openfn/language-http adaptor to the repo"
-    ).example(
-      "install @openfn/language-http",
-      "Install the language-http adaptor to the repo"
-    );
-  }
-};
-var clean = {
-  command: "clean",
-  desc: "Removes all modules from the runtime module repo",
-  handler: (argv) => {
-    argv.command = "repo-clean";
-  },
-  builder: (yargs2) => yargs2.option("force", {
-    alias: ["f"],
-    description: "Skip the prompt and force deletion",
-    boolean: true
-  })
-};
-var pwd = {
-  command: "pwd",
-  desc: "Print repo's current working directory",
-  handler: (argv) => {
-    argv.command = "repo-pwd";
-  }
-};
-var list = {
-  command: "list",
-  desc: "Show a report on what is installed in the repo",
-  handler: (argv) => {
-    argv.command = "repo-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) => {
@@ -259,10 +188,10 @@ var outputPath = {
 };
 var repoDir = {
   name: "repo-dir",
-  yargs: {
+  yargs: () => ({
     description: "Provide a path to the repo root dir",
     default: process.env.OPENFN_REPO_DIR || DEFAULT_REPO_DIR
-  }
+  })
 };
 var start = {
   name: "start",
@@ -286,11 +215,11 @@ var strictOutput = {
   }
 };
 var strict = {
-  name: "no-strict",
+  name: "strict",
   yargs: {
     default: false,
     boolean: true,
-    description: "Strict state handling, meaning only state.data is returned from a job."
+    description: "Enables strict state handling, meaning only state.data is returned from a job."
   },
   ensure: (opts2) => {
     if (!opts2.hasOwnProperty("strictOutput")) {
@@ -343,6 +272,85 @@ var useAdaptorsMonorepo = {
   }
 };
 
+// src/util/command-builders.ts
+var expandYargs = (y2) => {
+  if (typeof y2 === "function") {
+    return y2();
+  }
+  return y2;
+};
+var build = (opts2, yargs2) => opts2.reduce((_y, o) => yargs2.option(o.name, expandYargs(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/repo/command.ts
+var repo = {
+  command: "repo [subcommand]",
+  desc: "Run commands on the module repo (install|clean)",
+  builder: (yargs2) => yargs2.command(clean).command(install).command(list).example("repo install -a http", "Install @openfn/language-http").example("repo clean", "Remove everything from the repo working dir")
+};
+var installOptions = [
+  repoDir,
+  override(expandAdaptors, {
+    default: true,
+    hidden: true
+  }),
+  override(adaptors, {
+    description: "Specify which language-adaptor to install (allows short-form names to be used, eg, http)"
+  })
+];
+var install = {
+  command: "install [packages...]",
+  desc: "install one or more packages to the runtime repo. Use -a to pass shorthand adaptor names.",
+  handler: ensure("repo-install", installOptions),
+  builder: (yargs2) => build(installOptions, yargs2).example("install axios", "Install the axios npm package to the repo").example(
+    "install -a http",
+    "Install @openfn/language-http adaptor to the repo"
+  ).example(
+    "install @openfn/language-http",
+    "Install the language-http adaptor to the repo"
+  )
+};
+var clean = {
+  command: "clean",
+  desc: "Removes all modules from the runtime module repo",
+  handler: ensure("repo-clean", [repoDir]),
+  builder: (yargs2) => build(
+    [
+      repoDir,
+      {
+        name: "force",
+        yargs: {
+          alias: ["f"],
+          description: "Skip the prompt and force deletion",
+          boolean: true
+        }
+      }
+    ],
+    yargs2
+  )
+};
+var list = {
+  command: "list",
+  desc: "Show a report on what is installed in the repo",
+  aliases: ["$0"],
+  handler: ensure("repo-list", [repoDir]),
+  builder: (yargs2) => build([repoDir], yargs2)
+};
+
 // src/execute/command.ts
 var options = [
   expandAdaptors,
@@ -383,8 +391,8 @@ Remember to include the adaptor name with -a. Auto install adaptors with the -i
     "openfn foo/job.js",
     "Execute foo/job.js with no adaptor and write the final state to foo/job.json"
   ).example(
-    "openfn workflow.json -ia common",
-    "Execute workflow.json using @openfn/language-commom (with autoinstall enabled)"
+    "openfn workflow.json -i",
+    "Execute workflow.json with autoinstall enabled"
   ).example(
     "openfn job.js -a common --log info",
     "Execute job.js with common adaptor and info-level logging"

package/dist/process/runner.js

@@ -1,20 +1,40 @@
 import {
-  CLI,
-  COMPILER,
-  JOB,
-  RUNTIME,
-  createNullLogger,
-  defaultLogger,
-  ensureLogOpts,
-  ensureOpts,
-  expand_adaptors_default,
-  logger_default,
-  printDuration
-} from "../chunk-LV5XDERP.js";
+  DEFAULT_REPO_DIR,
+  expand_adaptors_default
+} from "../chunk-UBDWXKSG.js";
 
 // src/execute/execute.ts
 import run, { getNameAndVersion } from "@openfn/runtime";
 
+// 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 json = false;
+  let level = logOptions[name] || logOptions.default || "default";
+  if (options.logJson) {
+    json = true;
+  }
+  return actualCreateLogger(namespaces[name] || name, {
+    level,
+    json,
+    ...logOptions
+  });
+};
+var logger_default = createLogger;
+var createNullLogger = () => createLogger(void 0, { log: { default: "none" } });
+
 // src/util/abort.ts
 var AbortError = class extends Error {
   constructor(reason) {
@@ -58,13 +78,13 @@ var execute_default = async (input, state, opts, logger) => {
 };
 function parseAdaptors(opts) {
   const extractInfo = (specifier) => {
-    const [module, path6] = specifier.split("=");
+    const [module, path7] = specifier.split("=");
     const { name, version } = getNameAndVersion(module);
     const info = {
       name
     };
-    if (path6) {
-      info.path = path6;
+    if (path7) {
+      info.path = path7;
     }
     if (version) {
       info.version = version;
@@ -145,16 +165,13 @@ import { exec } from "node:child_process";
 import treeify from "treeify";
 import { install as rtInstall, loadRepoPkg } from "@openfn/runtime";
 var install = async (opts, log = defaultLogger) => {
-  let { packages, adaptor, repoDir } = opts;
-  if (packages) {
+  let { packages, adaptors, repoDir } = opts;
+  const targets = [].concat(packages ?? [], adaptors ?? []);
+  if (targets) {
     log.timer("install");
     log.success("Installing packages...");
     log.debug("repoDir is set to:", repoDir);
-    if (adaptor) {
-      const expanded = expand_adaptors_default({ adaptors: packages });
-      packages = expanded.adaptors;
-    }
-    await rtInstall(packages ?? [], repoDir, log);
+    await rtInstall(targets, repoDir, log);
     const duration = log.timer("install");
     log.success(`Installation complete in ${duration}`);
   }
@@ -269,10 +286,10 @@ var stripVersionSpecifier = (specifier) => {
   return specifier;
 };
 var resolveSpecifierPath = async (pattern, repoDir, log) => {
-  const [specifier, path6] = pattern.split("=");
-  if (path6) {
-    log.debug(`Resolved ${specifier} to path: ${path6}`);
-    return path6;
+  const [specifier, path7] = pattern.split("=");
+  if (path7) {
+    log.debug(`Resolved ${specifier} to path: ${path7}`);
+    return path7;
   }
   const repoPath = await getModulePath(specifier, repoDir, log);
   if (repoPath) {
@@ -289,16 +306,16 @@ var loadTransformOptions = async (opts, log) => {
     const [pattern] = opts.adaptors;
     const [specifier] = pattern.split("=");
     log.debug(`Attempting to preload types for ${specifier}`);
-    const path6 = await resolveSpecifierPath(pattern, opts.repoDir, log);
-    if (path6) {
+    const path7 = await resolveSpecifierPath(pattern, opts.repoDir, log);
+    if (path7) {
       try {
         exports = await preloadAdaptorExports(
-          path6,
+          path7,
           opts.useAdaptorsMonorepo,
           log
         );
       } catch (e) {
-        log.error(`Failed to load adaptor typedefs from path ${path6}`);
+        log.error(`Failed to load adaptor typedefs from path ${path7}`);
         log.error(e);
       }
     }
@@ -494,6 +511,59 @@ Paths inside the workflow are relative to the workflow.json`
   }
 };
 
+// src/util/map-adaptors-to-monorepo.ts
+import { readFile } from "node:fs/promises";
+import path2 from "node:path";
+import assert from "node:assert";
+import { getNameAndVersion as getNameAndVersion2 } from "@openfn/runtime";
+var validateMonoRepo = async (repoPath, log) => {
+  try {
+    const raw = await readFile(`${repoPath}/package.json`, "utf8");
+    const pkg = JSON.parse(raw);
+    assert(pkg.name === "adaptors");
+  } catch (e) {
+    log.error(`ERROR: Adaptors Monorepo not found at ${repoPath}`);
+    process.exit(9);
+  }
+};
+var updatePath = (adaptor, repoPath, log) => {
+  if (adaptor.match("=")) {
+    return adaptor;
+  }
+  const { name, version } = getNameAndVersion2(adaptor);
+  if (version) {
+    log.warn(
+      `Warning: Ignoring version specifier on ${adaptor} as loading from the adaptors monorepo`
+    );
+  }
+  const shortName = name.replace("@openfn/language-", "");
+  const abspath = path2.resolve(repoPath, "packages", shortName);
+  return `${name}=${abspath}`;
+};
+var mapAdaptorsToMonorepo = async (options, log) => {
+  const { adaptors, monorepoPath, workflow } = options;
+  if (monorepoPath) {
+    await validateMonoRepo(monorepoPath, log);
+    log.success(`Loading adaptors from monorepo at ${monorepoPath}`);
+    if (adaptors) {
+      options.adaptors = adaptors.map((a) => {
+        const p = updatePath(a, monorepoPath, log);
+        log.info(`Mapped adaptor ${a} to monorepo: ${p.split("=")[1]}`);
+        return p;
+      });
+    }
+    if (workflow) {
+      Object.values(workflow.jobs).forEach((job) => {
+        if (job.adaptor) {
+          job.adaptor = updatePath(job.adaptor, monorepoPath, log);
+        }
+      });
+    }
+  }
+  return options;
+};
+var map_adaptors_to_monorepo_default = mapAdaptorsToMonorepo;
+
 // src/execute/handler.ts
 var executeHandler = async (options, logger) => {
   const start = new Date().getTime();
@@ -501,6 +571,10 @@ var executeHandler = async (options, logger) => {
   let input = await load_input_default(options, logger);
   if (options.workflow) {
     expand_adaptors_default(options);
+    await map_adaptors_to_monorepo_default(
+      options,
+      logger
+    );
   }
   const { repoDir, monorepoPath, autoinstall } = options;
   if (autoinstall) {
@@ -547,6 +621,13 @@ var handler_default = executeHandler;
 import { writeFile as writeFile2 } from "node:fs/promises";
 var compileHandler = async (options, logger) => {
   await load_input_default(options, logger);
+  if (options.workflow) {
+    expand_adaptors_default(options);
+    await map_adaptors_to_monorepo_default(
+      options,
+      logger
+    );
+  }
   let result = await compile_default(options, logger);
   if (options.workflow) {
     result = JSON.stringify(result);
@@ -612,28 +693,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 path3 from "node:path";
 import { describePackage } from "@openfn/describe-package";
-import { getNameAndVersion as getNameAndVersion2 } from "@openfn/runtime";
+import { getNameAndVersion as getNameAndVersion3 } 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 = (path6) => {
-  writeFileSync(path6, `{ "loading": true, "timestamp": ${Date.now()}}`);
+var ensurePath = (filePath) => mkdirSync(path3.dirname(filePath), { recursive: true });
+var generatePlaceholder = (path7) => {
+  writeFileSync(path7, `{ "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(`  ${path3.resolve(resultPath)}`);
 };
-var generateDocs = async (specifier, path6, docgen, logger) => {
+var generateDocs = async (specifier, path7, docgen, logger) => {
   const result = await docgen(specifier);
-  await writeFile3(path6, JSON.stringify(result, null, 2));
-  finish(logger, path6);
-  return path6;
+  await writeFile3(path7, JSON.stringify(result, null, 2));
+  finish(logger, path7);
+  return path7;
 };
-var waitForDocs = async (docs, path6, logger, retryDuration = RETRY_DURATION) => {
+var waitForDocs = async (docs, path7, logger, retryDuration = RETRY_DURATION) => {
   try {
     if (docs.hasOwnProperty("loading")) {
       logger.info("Docs are being loaded by another process. Waiting.");
@@ -645,19 +726,19 @@ var waitForDocs = async (docs, path6, logger, retryDuration = RETRY_DURATION) =>
             clearInterval(i);
             reject(new Error("Timed out waiting for docs to load"));
           }
-          const updated = JSON.parse(readFileSync(path6, "utf8"));
+          const updated = JSON.parse(readFileSync(path7, "utf8"));
           if (!updated.hasOwnProperty("loading")) {
             logger.info("Docs found!");
             clearInterval(i);
-            resolve(path6);
+            resolve(path7);
           }
           count++;
         }, retryDuration);
       });
     } else {
-      logger.info(`Docs already written to cache at ${path6}`);
-      finish(logger, path6);
-      return path6;
+      logger.info(`Docs already written to cache at ${path7}`);
+      finish(logger, path7);
+      return path7;
     }
   } catch (e) {
     logger.error("Existing doc JSON corrupt. Aborting");
@@ -666,7 +747,7 @@ var waitForDocs = async (docs, path6, logger, retryDuration = RETRY_DURATION) =>
 };
 var docgenHandler = (options, logger, docgen = actualDocGen, retryDuration = RETRY_DURATION) => {
   const { specifier, repoDir } = options;
-  const { version } = getNameAndVersion2(specifier);
+  const { version } = getNameAndVersion3(specifier);
   if (!version) {
     logger.error("Error: No version number detected");
     logger.error("eg, @openfn/language-common@1.7.5");
@@ -674,28 +755,28 @@ var docgenHandler = (options, logger, docgen = actualDocGen, retryDuration = RET
     process.exit(9);
   }
   logger.success(`Generating docs for ${specifier}`);
-  const path6 = `${repoDir}/docs/${specifier}.json`;
-  ensurePath(path6);
+  const path7 = `${repoDir}/docs/${specifier}.json`;
+  ensurePath(path7);
   const handleError = () => {
     logger.info("Removing placeholder");
-    rmSync(path6);
+    rmSync(path7);
   };
   try {
-    const existing = readFileSync(path6, "utf8");
+    const existing = readFileSync(path7, "utf8");
     const json = JSON.parse(existing);
     if (json && json.timeout && Date.now() - json.timeout >= TIMEOUT_MS) {
       logger.info(`Expired placeholder found. Removing.`);
-      rmSync(path6);
+      rmSync(path7);
       throw new Error("TIMEOUT");
     }
-    return waitForDocs(json, path6, logger, retryDuration);
+    return waitForDocs(json, path7, logger, retryDuration);
   } catch (e) {
     if (e.message !== "TIMEOUT") {
-      logger.info(`Docs JSON not found at ${path6}`);
+      logger.info(`Docs JSON not found at ${path7}`);
     }
     logger.debug("Generating placeholder");
-    generatePlaceholder(path6);
-    return generateDocs(specifier, path6, docgen, logger).catch((e2) => {
+    generatePlaceholder(path7);
+    return generateDocs(specifier, path7, docgen, logger).catch((e2) => {
       logger.error("Error generating documentation");
       logger.error(e2);
       handleError();
@@ -705,8 +786,8 @@ var docgenHandler = (options, logger, docgen = actualDocGen, retryDuration = RET
 var handler_default4 = docgenHandler;
 
 // src/docs/handler.ts
-import { readFile } from "node:fs/promises";
-import { getNameAndVersion as getNameAndVersion3, getLatestVersion } from "@openfn/runtime";
+import { readFile as readFile2 } from "node:fs/promises";
+import { getNameAndVersion as getNameAndVersion4, getLatestVersion } from "@openfn/runtime";
 var describeFn = (adaptorName, fn) => `## ${fn.name}(${fn.parameters.map(({ name }) => name).join(",")})
 
 ${fn.description}
@@ -736,7 +817,7 @@ var docsHandler = async (options, logger) => {
   const { adaptor, operation, repoDir } = options;
   const { adaptors } = expand_adaptors_default({ adaptors: [adaptor] });
   const [adaptorName] = adaptors;
-  let { name, version } = getNameAndVersion3(adaptorName);
+  let { name, version } = getNameAndVersion4(adaptorName);
   if (!version) {
     logger.info("No version number provided, looking for latest...");
     version = await getLatestVersion(name);
@@ -744,7 +825,7 @@ var docsHandler = async (options, logger) => {
     logger.success(`Showing docs for ${adaptorName} v${version}`);
   }
   logger.info("Generating/loading documentation...");
-  const path6 = await handler_default4(
+  const path7 = await handler_default4(
     {
       specifier: `${name}@${version}`,
       repoDir
@@ -752,8 +833,8 @@ var docsHandler = async (options, logger) => {
     createNullLogger()
   );
   let didError = false;
-  if (path6) {
-    const source = await readFile(path6, "utf8");
+  if (path7) {
+    const source = await readFile2(path7, "utf8");
     const data = JSON.parse(source);
     let desc;
     if (operation) {
@@ -785,7 +866,7 @@ var handler_default5 = docsHandler;
 // src/metadata/cache.ts
 import { createHash } from "node:crypto";
 import { readFileSync as readFileSync2 } from "node:fs";
-import path3 from "node:path";
+import path4 from "node:path";
 import { writeFile as writeFile4, mkdir } from "node:fs/promises";
 var getPath = (repoDir, key) => `${repoDir}/meta/${key}.json`;
 var sortKeys = (obj) => {
@@ -816,7 +897,7 @@ var get = (repoPath, key) => {
 };
 var set = async (repoPath, key, data) => {
   const fullPath = getPath(repoPath, key);
-  await mkdir(path3.dirname(fullPath), { recursive: true });
+  await mkdir(path4.dirname(fullPath), { recursive: true });
   await writeFile4(fullPath, JSON.stringify(data));
 };
 var cache_default = { get, set, generateKey, getPath, sortKeys };
@@ -899,50 +980,104 @@ var metadataHandler = async (options, logger) => {
 };
 var handler_default6 = metadataHandler;
 
-// src/util/use-adaptors-repo.ts
-import { readFile as readFile2 } from "node:fs/promises";
-import path4 from "node:path";
-import assert from "node:assert";
-import { getNameAndVersion as getNameAndVersion5 } from "@openfn/runtime";
-var validateMonoRepo = async (repoPath, log) => {
-  try {
-    const raw = await readFile2(`${repoPath}/package.json`, "utf8");
-    const pkg = JSON.parse(raw);
-    assert(pkg.name === "adaptors");
-  } catch (e) {
-    log.error(`ERROR: Adaptors Monorepo not found at ${repoPath}`);
-    process.exit(9);
+// src/util/ensure-opts.ts
+import path5 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 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;
 };
-var updatePath = (adaptor, repoPath, log) => {
-  if (adaptor.match("=")) {
-    return adaptor;
+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,
+    timeout: opts.timeout
+  };
+  const set2 = (key, value) => {
+    newOpts[key] = opts.hasOwnProperty(key) ? opts[key] : value;
+  };
+  if (opts.useAdaptorsMonorepo) {
+    newOpts.monorepoPath = process.env.OPENFN_ADAPTORS_REPO || "ERR";
   }
-  const { name, version } = getNameAndVersion5(adaptor);
-  if (version) {
-    log.warn(
-      `Warning: Ignoring version specifier on ${adaptor} as loading from the adaptors monorepo`
+  let baseDir = basePath;
+  if (basePath.endsWith(".js")) {
+    baseDir = path5.dirname(basePath);
+    set2("jobPath", basePath);
+  } else {
+    set2("jobPath", `${baseDir}/job.js`);
+  }
+  set2("statePath", `${baseDir}/state.json`);
+  if (!opts.outputStdout) {
+    set2(
+      "outputPath",
+      newOpts.command === "compile" ? `${baseDir}/output.js` : `${baseDir}/output.json`
     );
   }
-  const shortName = name.replace("@openfn/language-", "");
-  const abspath = path4.resolve(repoPath, "packages", shortName);
-  return `${name}=${abspath}`;
-};
-var useAdaptorsRepo = async (adaptors, repoPath, log) => {
-  await validateMonoRepo(repoPath, log);
-  log.success(`Loading adaptors from monorepo at ${repoPath}`);
-  const updatedAdaptors = adaptors.map((a) => {
-    const p = updatePath(a, repoPath, log);
-    log.info(`Mapped adaptor ${a} to monorepo: ${p.split("=")[1]}`);
-    return p;
-  });
-  return updatedAdaptors;
-};
-var use_adaptors_repo_default = useAdaptorsRepo;
+  ensureLogOpts(newOpts);
+  return newOpts;
+}
 
 // src/util/print-versions.ts
 import { readFileSync as readFileSync3 } from "node:fs";
-import path5 from "node:path";
+import path6 from "node:path";
 import { getNameAndVersion as getNameAndVersion6 } from "@openfn/runtime";
 import { mainSymbols } from "figures";
 var NODE = "node.js";
@@ -952,7 +1087,7 @@ var COMPILER2 = "compiler";
 var { triangleRightSmall: t } = mainSymbols;
 var loadVersionFromPath = (adaptorPath) => {
   try {
-    const pkg = JSON.parse(readFileSync3(path5.resolve(adaptorPath, "package.json"), "utf8"));
+    const pkg = JSON.parse(readFileSync3(path6.resolve(adaptorPath, "package.json"), "utf8"));
     return pkg.version;
   } catch (e) {
     return "unknown";
@@ -1029,7 +1164,7 @@ var handlers = {
   ["repo-list"]: list,
   version: async (opts, logger) => print_versions_default(logger, opts)
 };
-var maybeEnsureOpts = (basePath, options) => /^(execute|compile|test)$/.test(options.command) ? ensureLogOpts(options) : ensureOpts(basePath, options);
+var maybeEnsureOpts = (basePath, options) => /(^(execute|compile|test)$)|(repo-)/.test(options.command) ? ensureLogOpts(options) : ensureOpts(basePath, options);
 var parse = async (basePath, options, log) => {
   const opts = maybeEnsureOpts(basePath, options);
   const logger = log || logger_default(CLI, opts);
@@ -1044,11 +1179,7 @@ var parse = async (basePath, options, log) => {
       logger.error("Set OPENFN_ADAPTORS_REPO to a path pointing to the repo");
       process.exit(9);
     }
-    opts.adaptors = await use_adaptors_repo_default(
-      opts.adaptors,
-      opts.monorepoPath,
-      logger
-    );
+    await map_adaptors_to_monorepo_default(opts, logger);
   } else if (opts.adaptors && opts.expandAdaptors) {
     expand_adaptors_default(opts);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/cli",
-  "version": "0.0.39",
+  "version": "0.0.41",
   "description": "CLI devtools for the openfn toolchain.",
   "engines": {
     "node": ">=18",
@@ -39,7 +39,7 @@
     "@openfn/compiler": "0.0.32",
     "@openfn/describe-package": "0.0.16",
     "@openfn/logger": "0.0.13",
-    "@openfn/runtime": "0.0.24",
+    "@openfn/runtime": "0.0.25",
     "figures": "^5.0.0",
     "rimraf": "^3.0.2",
     "treeify": "^1.1.0",

package/dist/chunk-LV5XDERP.js

@@ -1,165 +0,0 @@
-// src/util/expand-adaptors.ts
-var expand = (name) => {
-  if (typeof name === "string") {
-    const [left] = name.split("=");
-    if (left.match("/") || left.endsWith(".js")) {
-      return name;
-    }
-    return `@openfn/language-${name}`;
-  }
-  return name;
-};
-var expand_adaptors_default = (opts) => {
-  const { adaptors, workflow } = opts;
-  if (adaptors) {
-    opts.adaptors = adaptors?.map(expand);
-  }
-  if (workflow) {
-    Object.values(workflow.jobs).forEach((job) => {
-      if (job.adaptor) {
-        job.adaptor = expand(job.adaptor);
-      }
-    });
-  }
-  return opts;
-};
-
-// 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 json = false;
-  let level = logOptions[name] || logOptions.default || "default";
-  if (options.logJson) {
-    json = true;
-  }
-  return actualCreateLogger(namespaces[name] || name, {
-    level,
-    json,
-    ...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,
-    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
-};