@openfn/cli 1.8.5 → 1.8.6

package/dist/index.js

@@ -56,8 +56,8 @@ var expand_adaptors_default = (input) => {
   const plan = input;
   Object.values(plan.workflow.steps).forEach((step) => {
     const job = step;
-    if (job.adaptor) {
-      job.adaptor = expand(job.adaptor);
+    if (job.adaptors) {
+      job.adaptors = job.adaptors.map(expand);
     }
   });
   return plan;

package/dist/process/runner.js

@@ -269,10 +269,10 @@ function parseAdaptors(plan) {
   const adaptors = {};
   Object.values(plan.workflow.steps).forEach((step) => {
     const job = step;
-    if (job.adaptor) {
-      const { name, ...maybeVersionAndPath } = extractInfo(job.adaptor);
+    job.adaptors?.forEach((adaptor) => {
+      const { name, ...maybeVersionAndPath } = extractInfo(adaptor);
       adaptors[name] = maybeVersionAndPath;
-    }
+    });
   });
   return adaptors;
 }
@@ -307,9 +307,9 @@ var getAutoinstallTargets = (plan) => {
   const adaptors = {};
   Object.values(plan.workflow.steps).forEach((step) => {
     const job = step;
-    if (job.adaptor && !/=/.test(job.adaptor)) {
-      adaptors[job.adaptor] = true;
-    }
+    job.adaptors?.filter((adaptor) => !/=/.test(adaptor)).forEach((adaptor) => {
+      adaptors[adaptor] = true;
+    });
   });
   return Object.keys(adaptors);
 };
@@ -443,11 +443,9 @@ var compileWorkflow = async (plan, opts, log) => {
   for (const step of plan.workflow.steps) {
     const job = step;
     const jobOpts = {
-      ...opts
+      ...opts,
+      adaptors: job.adaptors ?? opts.adaptors
     };
-    if (job.adaptor) {
-      jobOpts.adaptors = [job.adaptor];
-    }
     if (job.expression) {
       job.expression = await compileJob(
         job.expression,
@@ -483,33 +481,32 @@ var loadTransformOptions = async (opts, log) => {
     logger: log || logger_default(COMPILER, opts)
   };
   if (opts.adaptors?.length && opts.ignoreImports != true) {
-    let exports;
-    const [pattern] = opts.adaptors;
-    const [specifier] = pattern.split("=");
-    log.debug(`Trying to preload types for ${specifier}`);
-    const path9 = await resolveSpecifierPath(pattern, opts.repoDir, log);
-    if (path9) {
-      try {
-        exports = await preloadAdaptorExports(
-          path9,
-          opts.useAdaptorsMonorepo,
-          log
-        );
-      } catch (e) {
-        log.error(`Failed to load adaptor typedefs from path ${path9}`);
-        log.error(e);
+    const adaptorsConfig = [];
+    for (const adaptorInput of opts.adaptors) {
+      let exports;
+      const [specifier] = adaptorInput.split("=");
+      log.debug(`Trying to preload types for ${specifier}`);
+      const path9 = await resolveSpecifierPath(adaptorInput, opts.repoDir, log);
+      if (path9) {
+        try {
+          exports = await preloadAdaptorExports(path9, log);
+        } catch (e) {
+          log.error(`Failed to load adaptor typedefs from path ${path9}`);
+          log.error(e);
+        }
       }
-    }
-    if (!exports || exports.length === 0) {
-      log.debug(`No module exports found for ${pattern}`);
-    }
-    options["add-imports"] = {
-      ignore: opts.ignoreImports,
-      adaptor: {
+      if (!exports || exports.length === 0) {
+        log.debug(`No module exports found for ${adaptorInput}`);
+      }
+      adaptorsConfig.push({
         name: stripVersionSpecifier(specifier),
         exports,
         exportAll: true
-      }
+      });
+    }
+    options["add-imports"] = {
+      ignore: opts.ignoreImports,
+      adaptors: adaptorsConfig
     };
   }
   return options;
@@ -653,8 +650,8 @@ var expand_adaptors_default = (input) => {
   const plan = input;
   Object.values(plan.workflow.steps).forEach((step) => {
     const job = step;
-    if (job.adaptor) {
-      job.adaptor = expand(job.adaptor);
+    if (job.adaptors) {
+      job.adaptors = job.adaptors.map(expand);
     }
   });
   return plan;
@@ -699,8 +696,10 @@ var mapAdaptorsToMonorepo = (monorepoPath = "", input = [], log) => {
     const plan = input;
     Object.values(plan.workflow.steps).forEach((step) => {
       const job = step;
-      if (job.adaptor) {
-        job.adaptor = updatePath(job.adaptor, monorepoPath, log);
+      if (job.adaptors) {
+        job.adaptors = job.adaptors.map(
+          (a) => updatePath(a, monorepoPath, log)
+        );
       }
     });
     return plan;
@@ -767,13 +766,11 @@ var loadExpression = async (options, logger) => {
   try {
     const expression = await fs3.readFile(expressionPath, "utf8");
     const name = path4.parse(expressionPath).name;
-    const step = { expression };
-    if (options.adaptors) {
-      const [adaptor] = options.adaptors;
-      if (adaptor) {
-        step.adaptor = adaptor;
-      }
-    }
+    const step = {
+      expression,
+      // The adaptor should have been expanded nicely already, so we don't need intervene here
+      adaptors: options.adaptors ?? []
+    };
     const wfOptions = {};
     maybeAssign(options, wfOptions, ["timeout"]);
     const plan = {
@@ -868,6 +865,16 @@ var importExpressions = async (plan, rootDir, log) => {
     }
   }
 };
+var ensureAdaptors = (plan) => {
+  Object.values(plan.workflow.steps).forEach((step) => {
+    const job = step;
+    if (job.adaptor) {
+      job.adaptors = [job.adaptor];
+      delete job.adaptor;
+    }
+    job.adaptors ??= [];
+  });
+};
 var loadXPlan = async (plan, options, logger, defaultName = "") => {
   if (!plan.options) {
     plan.options = {};
@@ -875,6 +882,7 @@ var loadXPlan = async (plan, options, logger, defaultName = "") => {
   if (!plan.workflow.name && defaultName) {
     plan.workflow.name = defaultName;
   }
+  ensureAdaptors(plan);
   await importExpressions(plan, options.baseDir, logger);
   if (options.expandAdaptors) {
     expand_adaptors_default(plan);
@@ -944,7 +952,7 @@ var assertStepStructure = (step, index) => {
     "name",
     "next",
     "previous",
-    "adaptor",
+    "adaptors",
     "expression",
     "state",
     "configuration",
@@ -955,7 +963,7 @@ var assertStepStructure = (step, index) => {
       throw new Error(`Invalid key "${key}" in step ${step.id || index}`);
     }
   }
-  if ("adaptor" in step && !("expression" in step)) {
+  if (step.adaptors?.length && !("expression" in step)) {
     throw new Error(
       `Step ${step.id ?? index} with an adaptor must also have an expression`
     );
@@ -1646,13 +1654,11 @@ var loadVersionFromPath = (adaptorPath) => {
 };
 var printVersions = async (logger, options = {}, includeComponents = false) => {
   const { adaptors, logJson } = options;
-  let adaptor = "";
-  if (adaptors && adaptors.length) {
-    adaptor = adaptors[0];
-  }
-  let adaptorVersion;
-  let adaptorName = "";
-  if (adaptor) {
+  let longestAdaptorName = "";
+  const adaptorList = [];
+  adaptors?.forEach((adaptor) => {
+    let adaptorVersion;
+    let adaptorName = "";
     if (adaptor.match("=")) {
       const [namePart, pathPart] = adaptor.split("=");
       adaptorVersion = loadVersionFromPath(pathPart);
@@ -1665,9 +1671,13 @@ var printVersions = async (logger, options = {}, includeComponents = false) => {
       adaptorName = name;
       adaptorVersion = version2 || "latest";
     }
-  }
+    adaptorList.push([adaptorName, adaptorVersion]);
+    if (adaptorName.length > longestAdaptorName.length) {
+      longestAdaptorName = adaptorName;
+    }
+  });
   const longest = Math.max(
-    ...[NODE, CLI2, RUNTIME2, COMPILER2, adaptorName].map((s) => s.length)
+    ...[NODE, CLI2, RUNTIME2, COMPILER2, longestAdaptorName].map((s) => s.length)
   );
   const prefix = (str) => `         ${t} ${str.padEnd(longest + 4, " ")}`;
   const dirname = path8.dirname(url.fileURLToPath(import.meta.url));
@@ -1687,8 +1697,10 @@ var printVersions = async (logger, options = {}, includeComponents = false) => {
       output.versions.runtime = runtimeVersion;
       output.versions.compiler = compilerVersion;
     }
-    if (adaptorName) {
-      output.versions[adaptorName] = adaptorVersion;
+    if (adaptorList.length) {
+      for (const [name, version2] of adaptorList) {
+        output.versions[name] = version2;
+      }
     }
   } else {
     output = `Versions:
@@ -1699,9 +1711,11 @@ ${prefix(CLI2)}${version}`;
 ${prefix(RUNTIME2)}${runtimeVersion}
 ${prefix(COMPILER2)}${compilerVersion}`;
     }
-    if (adaptorName) {
-      output += `
-${prefix(adaptorName)}${adaptorVersion}`;
+    if (adaptorList.length) {
+      for (const [name, version2] of adaptorList) {
+        output += `
+${prefix(name)}${version2}`;
+      }
     }
   }
   logger.always(output);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/cli",
-  "version": "1.8.5",
+  "version": "1.8.6",
   "description": "CLI devtools for the openfn toolchain.",
   "engines": {
     "node": ">=18",
@@ -47,11 +47,11 @@
     "treeify": "^1.1.0",
     "ws": "^8.18.0",
     "yargs": "^17.7.2",
-    "@openfn/compiler": "0.3.3",
+    "@openfn/compiler": "0.4.0",
+    "@openfn/deploy": "0.8.0",
     "@openfn/describe-package": "0.1.2",
     "@openfn/logger": "1.0.2",
-    "@openfn/deploy": "0.8.0",
-    "@openfn/runtime": "1.4.2"
+    "@openfn/runtime": "1.5.0"
   },
   "files": [
     "dist",