@openfn/cli 0.0.40 → 0.0.41

package/dist/process/runner.js

@@ -511,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();
@@ -518,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) {
@@ -564,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);
@@ -629,20 +693,20 @@ 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 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, path7, docgen, logger) => {
   const result = await docgen(specifier);
@@ -683,7 +747,7 @@ var waitForDocs = async (docs, path7, 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");
@@ -722,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}
@@ -753,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);
@@ -770,7 +834,7 @@ var docsHandler = async (options, logger) => {
   );
   let didError = false;
   if (path7) {
-    const source = await readFile(path7, "utf8");
+    const source = await readFile2(path7, "utf8");
     const data = JSON.parse(source);
     let desc;
     if (operation) {
@@ -802,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) => {
@@ -833,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 };
@@ -917,7 +981,7 @@ var metadataHandler = async (options, logger) => {
 var handler_default6 = metadataHandler;
 
 // src/util/ensure-opts.ts
-import path4 from "node:path";
+import path5 from "node:path";
 var defaultLoggerOptions = {
   default: "default",
   job: "debug"
@@ -995,7 +1059,7 @@ function ensureOpts(basePath = ".", opts) {
   }
   let baseDir = basePath;
   if (basePath.endsWith(".js")) {
-    baseDir = path4.dirname(basePath);
+    baseDir = path5.dirname(basePath);
     set2("jobPath", basePath);
   } else {
     set2("jobPath", `${baseDir}/job.js`);
@@ -1011,47 +1075,6 @@ function ensureOpts(basePath = ".", opts) {
   return newOpts;
 }
 
-// src/util/use-adaptors-repo.ts
-import { readFile as readFile2 } from "node:fs/promises";
-import path5 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);
-  }
-};
-var updatePath = (adaptor, repoPath, log) => {
-  if (adaptor.match("=")) {
-    return adaptor;
-  }
-  const { name, version } = getNameAndVersion5(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 = path5.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;
-
 // src/util/print-versions.ts
 import { readFileSync as readFileSync3 } from "node:fs";
 import path6 from "node:path";
@@ -1156,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.40",
+  "version": "0.0.41",
   "description": "CLI devtools for the openfn toolchain.",
   "engines": {
     "node": ">=18",