@openfn/cli 0.0.14 → 0.0.15

package/dist/index.js

@@ -170,7 +170,7 @@ var command_default3 = {
 // src/cli.ts
 var cmd = yargs(hideBin(process.argv)).command(command_default).command(command_default2).command(install).command(repo).command(command_default3).option("log", {
   alias: ["l"],
-  description: "Set the default log level to none, trace, info or default",
+  description: "Set the default log level to none, default, info or debug",
   array: true
 }).alias("v", "version").help();
 

package/dist/process/runner.js

@@ -30,6 +30,7 @@ var defaultLoggerOptions = {
 };
 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",
@@ -71,13 +72,13 @@ var ensureLogOpts = (opts) => {
 function ensureOpts(basePath = ".", opts) {
   const newOpts = {
     adaptor: opts.adaptor,
-    adaptors: opts.adaptors,
+    adaptors: opts.adaptors || [],
     autoinstall: opts.autoinstall,
     command: opts.command,
     force: opts.force || false,
-    repoDir: opts.repoDir || process.env.OPENFN_REPO_DIR,
+    repoDir: opts.repoDir || process.env.OPENFN_REPO_DIR || DEFAULT_REPO_DIR,
     noCompile: Boolean(opts.noCompile),
-    expand: Boolean(opts.expand),
+    expand: opts.expand !== false,
     outputStdout: Boolean(opts.outputStdout),
     packages: opts.packages,
     stateStdin: opts.stateStdin,
@@ -142,7 +143,7 @@ var load_state_default = async (opts, log) => {
 };
 
 // src/execute/execute.ts
-import run from "@openfn/runtime";
+import run, { getNameAndVersion } from "@openfn/runtime";
 var execute_default = (code, state, opts) => {
   return run(code, state, {
     immutableState: opts.immutable,
@@ -150,16 +151,23 @@ var execute_default = (code, state, opts) => {
     jobLogger: logger_default(JOB, opts),
     linker: {
       repo: opts.repoDir,
-      modulePaths: parseAdaptors(opts)
+      modules: parseAdaptors(opts)
     }
   });
 };
 function parseAdaptors(opts) {
-  var _a;
   const adaptors = {};
-  (_a = opts.adaptors) == null ? void 0 : _a.reduce((obj, exp) => {
+  opts.adaptors.reduce((obj, exp) => {
     const [module, path2] = exp.split("=");
-    obj[module] = path2;
+    const { name, version } = getNameAndVersion(module);
+    const info = {};
+    if (path2) {
+      info.path = path2;
+    }
+    if (version) {
+      info.version = version;
+    }
+    obj[name] = info;
     return obj;
   }, adaptors);
   return adaptors;
@@ -201,18 +209,18 @@ var resolveSpecifierPath = async (pattern, repoDir, log) => {
     log.debug(`Resolved ${specifier} to path: ${path2}`);
     return path2;
   }
-  const repoPath = await getModulePath(specifier, repoDir);
+  const repoPath = await getModulePath(specifier, repoDir, log);
   if (repoPath) {
-    log.debug(`Resolved ${specifier} to repo module`);
     return repoPath;
   }
   return null;
 };
 var loadTransformOptions = async (opts, log) => {
+  var _a;
   const options = {
     logger: log
   };
-  if (opts.adaptors) {
+  if ((_a = opts.adaptors) == null ? void 0 : _a.length) {
     let exports;
     const [pattern] = opts.adaptors;
     const [specifier] = pattern.split("=");
@@ -230,7 +238,7 @@ var loadTransformOptions = async (opts, log) => {
       }
     }
     if (!exports || exports.length === 0) {
-      console.warn(`WARNING: no module exports found for ${pattern}`);
+      log.debug(`No module exports found for ${pattern}`);
     }
     options["add-imports"] = {
       adaptor: {
@@ -301,13 +309,15 @@ var pwd = async (options, logger) => {
 var getDependencyList = async (options, _logger) => {
   const pkg = await loadRepoPkg(options.repoDir);
   const result = {};
-  Object.keys(pkg.dependencies).forEach((key) => {
-    const [name, version] = key.split("_");
-    if (!result[name]) {
-      result[name] = [];
-    }
-    result[name].push(version);
-  });
+  if (pkg) {
+    Object.keys(pkg.dependencies).forEach((key) => {
+      const [name, version] = key.split("_");
+      if (!result[name]) {
+        result[name] = [];
+      }
+      result[name].push(version);
+    });
+  }
   return result;
 };
 var list = async (options, logger) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/cli",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "description": "CLI devtools for the openfn toolchain.",
   "engines": {
     "node": ">=16",
@@ -36,9 +36,9 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@openfn/compiler": "^0.0.13",
-    "@openfn/logger": "^0.0.5",
-    "@openfn/runtime": "^0.0.10",
+    "@openfn/compiler": "^0.0.14",
+    "@openfn/logger": "^0.0.6",
+    "@openfn/runtime": "^0.0.11",
     "rimraf": "^3.0.2",
     "treeify": "^1.1.0",
     "yargs": "^17.5.1"