@openfn/cli 1.15.2 → 1.16.1

package/dist/index.js

@@ -134,6 +134,29 @@ var ensureLogOpts = (opts2) => {
 };
 var ensure_log_opts_default = ensureLogOpts;
 
+// src/util/get-cli-option-object.ts
+function getCLIOptionObject(arg) {
+  if (isObject(arg)) {
+    return arg;
+  } else if (typeof arg === "string") {
+    try {
+      const p = JSON.parse(arg);
+      if (isObject(p))
+        return p;
+    } catch (e) {
+    }
+    return Object.fromEntries(
+      arg.split(",").map((pair) => {
+        const [k, v] = pair.split("=");
+        return [k.trim(), v.trim()];
+      })
+    );
+  }
+}
+function isObject(arg) {
+  return typeof arg === "object" && arg !== null && !Array.isArray(arg);
+}
+
 // src/options.ts
 var setDefaultValue = (opts2, key2, value2) => {
   const v = opts2[key2];
@@ -543,6 +566,21 @@ var workflow = {
     description: "Name of the workflow to execute"
   }
 };
+var removeUnmapped = {
+  name: "remove-unmapped",
+  yargs: {
+    boolean: true,
+    description: "Removes all workflows that didn't get mapped from the final project after merge"
+  }
+};
+var workflowMappings = {
+  name: "workflow-mappings",
+  yargs: {
+    type: "string",
+    coerce: getCLIOptionObject,
+    description: "A manual object mapping of which workflows in source and target should be matched for a merge."
+  }
+};
 
 // src/util/command-builders.ts
 import c from "chalk";
@@ -1083,9 +1121,24 @@ var checkoutCommand = {
 };
 var command_default12 = checkoutCommand;
 
+// src/merge/command.ts
+var options11 = [
+  projectName,
+  projectPath,
+  removeUnmapped,
+  workflowMappings
+];
+var mergeCommand = {
+  command: "merge [project-name]",
+  describe: "Merges the specified project into the checked out project",
+  handler: ensure("merge", options11),
+  builder: (yargs2) => build(options11, yargs2)
+};
+var command_default13 = mergeCommand;
+
 // src/cli.ts
 var y = yargs(hideBin(process.argv));
-var cmd = y.command(command_default7).command(command_default3).command(command_default2).command(command_default4).command(install).command(repo).command(command_default10).command(command_default6).command(command_default).command(command_default8).command(command_default5).command(command_default9).command(command_default11).command(command_default12).command({
+var cmd = y.command(command_default7).command(command_default3).command(command_default2).command(command_default4).command(install).command(repo).command(command_default10).command(command_default6).command(command_default).command(command_default8).command(command_default5).command(command_default9).command(command_default11).command(command_default12).command(command_default13).command({
   command: "version",
   describe: "Show the currently installed version of the CLI, compiler and runtime.",
   handler: (argv) => {

package/dist/process/runner.js

@@ -127,14 +127,14 @@ var callApollo = async (apolloBaseUrl, serviceName, payload, logger) => {
     });
   });
 };
-var loadPayload = async (logger, path14) => {
-  if (!path14) {
+var loadPayload = async (logger, path15) => {
+  if (!path15) {
     logger.warn("No JSON payload provided");
     logger.warn("Most apollo services require JSON to be uploaded");
     return {};
   }
-  if (path14.endsWith(".json")) {
-    const str = await readFile(path14, "utf8");
+  if (path15.endsWith(".json")) {
+    const str = await readFile(path15, "utf8");
     const json = JSON.parse(str);
     logger.debug("Loaded JSON payload");
     return json;
@@ -256,13 +256,13 @@ var execute_default = async (plan, input, opts, logger) => {
 };
 function parseAdaptors(plan) {
   const extractInfo = (specifier) => {
-    const [module, path14] = specifier.split("=");
+    const [module, path15] = specifier.split("=");
     const { name, version } = getNameAndVersion(module);
     const info = {
       name
     };
-    if (path14) {
-      info.path = path14;
+    if (path15) {
+      info.path = path15;
     }
     if (version) {
       info.version = version;
@@ -522,10 +522,10 @@ var stripVersionSpecifier = (specifier) => {
   return specifier;
 };
 var resolveSpecifierPath = async (pattern, repoDir, log) => {
-  const [specifier, path14] = pattern.split("=");
-  if (path14) {
-    log.debug(`Resolved ${specifier} to path: ${path14}`);
-    return path14;
+  const [specifier, path15] = pattern.split("=");
+  if (path15) {
+    log.debug(`Resolved ${specifier} to path: ${path15}`);
+    return path15;
   }
   const repoPath = await getModulePath(specifier, repoDir, log);
   if (repoPath) {
@@ -544,12 +544,12 @@ var loadTransformOptions = async (opts, log) => {
       let exports;
       const [specifier] = adaptorInput.split("=");
       log.debug(`Trying to preload types for ${specifier}`);
-      const path14 = await resolveSpecifierPath(adaptorInput, opts.repoDir, log);
-      if (path14) {
+      const path15 = await resolveSpecifierPath(adaptorInput, opts.repoDir, log);
+      if (path15) {
         try {
-          exports = await preloadAdaptorExports(path14, log);
+          exports = await preloadAdaptorExports(path15, log);
         } catch (e) {
-          log.error(`Failed to load adaptor typedefs from path ${path14}`);
+          log.error(`Failed to load adaptor typedefs from path ${path15}`);
           log.error(e);
         }
       }
@@ -1001,8 +1001,8 @@ var loadXPlan = async (plan, options, logger, defaultName = "") => {
 };
 
 // src/util/assert-path.ts
-var assert_path_default = (path14) => {
-  if (!path14) {
+var assert_path_default = (path15) => {
+  if (!path15) {
     console.error("ERROR: no path provided!");
     console.error("\nUsage:");
     console.error("  open path/to/job");
@@ -1688,20 +1688,20 @@ var RETRY_COUNT = 20;
 var TIMEOUT_MS = 1e3 * 60;
 var actualDocGen = (specifier) => describePackage(specifier, {});
 var ensurePath = (filePath) => mkdirSync(path7.dirname(filePath), { recursive: true });
-var generatePlaceholder = (path14) => {
-  writeFileSync(path14, `{ "loading": true, "timestamp": ${Date.now()}}`);
+var generatePlaceholder = (path15) => {
+  writeFileSync(path15, `{ "loading": true, "timestamp": ${Date.now()}}`);
 };
 var finish = (logger, resultPath) => {
   logger.success("Done! Docs can be found at:\n");
   logger.print(`  ${path7.resolve(resultPath)}`);
 };
-var generateDocs = async (specifier, path14, docgen, logger) => {
+var generateDocs = async (specifier, path15, docgen, logger) => {
   const result = await docgen(specifier);
-  await writeFile5(path14, JSON.stringify(result, null, 2));
-  finish(logger, path14);
-  return path14;
+  await writeFile5(path15, JSON.stringify(result, null, 2));
+  finish(logger, path15);
+  return path15;
 };
-var waitForDocs = async (docs, path14, logger, retryDuration = RETRY_DURATION) => {
+var waitForDocs = async (docs, path15, logger, retryDuration = RETRY_DURATION) => {
   try {
     if (docs.hasOwnProperty("loading")) {
       logger.info("Docs are being loaded by another process. Waiting.");
@@ -1713,19 +1713,19 @@ var waitForDocs = async (docs, path14, logger, retryDuration = RETRY_DURATION) =
             clearInterval(i);
             reject(new Error("Timed out waiting for docs to load"));
           }
-          const updated = JSON.parse(readFileSync(path14, "utf8"));
+          const updated = JSON.parse(readFileSync(path15, "utf8"));
           if (!updated.hasOwnProperty("loading")) {
             logger.info("Docs found!");
             clearInterval(i);
-            resolve(path14);
+            resolve(path15);
           }
           count++;
         }, retryDuration);
       });
     } else {
-      logger.info(`Docs already written to cache at ${path14}`);
-      finish(logger, path14);
-      return path14;
+      logger.info(`Docs already written to cache at ${path15}`);
+      finish(logger, path15);
+      return path15;
     }
   } catch (e) {
     logger.error("Existing doc JSON corrupt. Aborting");
@@ -1742,28 +1742,28 @@ var docgenHandler = (options, logger, docgen = actualDocGen, retryDuration = RET
     process.exit(9);
   }
   logger.success(`Generating docs for ${specifier}`);
-  const path14 = `${repoDir}/docs/${specifier}.json`;
-  ensurePath(path14);
+  const path15 = `${repoDir}/docs/${specifier}.json`;
+  ensurePath(path15);
   const handleError2 = () => {
     logger.info("Removing placeholder");
-    rmSync(path14);
+    rmSync(path15);
   };
   try {
-    const existing = readFileSync(path14, "utf8");
+    const existing = readFileSync(path15, "utf8");
     const json = JSON.parse(existing);
     if (json && json.timeout && Date.now() - json.timeout >= TIMEOUT_MS) {
       logger.info(`Expired placeholder found. Removing.`);
-      rmSync(path14);
+      rmSync(path15);
       throw new Error("TIMEOUT");
     }
-    return waitForDocs(json, path14, logger, retryDuration);
+    return waitForDocs(json, path15, logger, retryDuration);
   } catch (e) {
     if (e.message !== "TIMEOUT") {
-      logger.info(`Docs JSON not found at ${path14}`);
+      logger.info(`Docs JSON not found at ${path15}`);
     }
     logger.debug("Generating placeholder");
-    generatePlaceholder(path14);
-    return generateDocs(specifier, path14, docgen, logger).catch((e2) => {
+    generatePlaceholder(path15);
+    return generateDocs(specifier, path15, docgen, logger).catch((e2) => {
       logger.error("Error generating documentation");
       logger.error(e2);
       handleError2();
@@ -1814,7 +1814,7 @@ var docsHandler = async (options, logger) => {
     logger.success(`Showing docs for ${adaptorName} v${version}`);
   }
   logger.info("Generating/loading documentation...");
-  const path14 = await handler_default7(
+  const path15 = await handler_default7(
     {
       specifier: `${name}@${version}`,
       repoDir
@@ -1823,8 +1823,8 @@ var docsHandler = async (options, logger) => {
     createNullLogger()
   );
   let didError = false;
-  if (path14) {
-    const source = await readFile4(path14, "utf8");
+  if (path15) {
+    const source = await readFile4(path15, "utf8");
     const data = JSON.parse(source);
     let desc;
     if (operation) {
@@ -2274,7 +2274,7 @@ var handler_default10 = pullHandler;
 import { Workspace } from "@openfn/project";
 import path11 from "path";
 var projectsHandler = async (options, logger) => {
-  const commandPath = path11.resolve(process.cwd(), options.projectPath ?? ".");
+  const commandPath = path11.resolve(options.projectPath ?? ".");
   const workspace = new Workspace(commandPath);
   if (!workspace.valid) {
     logger.error("Command was run in an invalid openfn workspace");
@@ -2300,7 +2300,7 @@ import path12 from "path";
 import fs6 from "fs";
 import { rimraf as rimraf2 } from "rimraf";
 var checkoutHandler = async (options, logger) => {
-  const commandPath = path12.resolve(process.cwd(), options.projectPath ?? ".");
+  const commandPath = path12.resolve(options.projectPath ?? ".");
   const workspace = new Workspace2(commandPath);
   if (!workspace.valid) {
     logger.error("Command was run in an invalid openfn workspace");
@@ -2309,7 +2309,7 @@ var checkoutHandler = async (options, logger) => {
   const switchProject = workspace.get(options.projectName);
   if (!switchProject) {
     logger.error(
-      `Project with id ${options.projectName} not found in the workspace`
+      `Project with id/name ${options.projectName} not found in the workspace`
     );
     return;
   }
@@ -2330,9 +2330,65 @@ var checkoutHandler = async (options, logger) => {
 };
 var handler_default12 = checkoutHandler;
 
+// src/merge/handler.ts
+import Project5, { Workspace as Workspace3 } from "@openfn/project";
+import path13 from "path";
+import { promises as fs7 } from "fs";
+var mergeHandler = async (options, logger) => {
+  const commandPath = path13.resolve(options.projectPath ?? ".");
+  const workspace = new Workspace3(commandPath);
+  if (!workspace.valid) {
+    logger.error("Command was run in an invalid openfn workspace");
+    return;
+  }
+  const checkedProject = workspace.getActiveProject();
+  if (!checkedProject) {
+    logger.error(`No project currently checked out`);
+    return;
+  }
+  const mProject = workspace.get(options.projectName);
+  if (!mProject) {
+    logger.error(
+      `Project with id/name ${options.projectName} not found in the workspace`
+    );
+    return;
+  }
+  if (checkedProject.name === mProject.name) {
+    logger.error("Merging into the same project not allowed");
+    return;
+  }
+  if (!checkedProject.name) {
+    logger.error("The checked out project has no name/id");
+    return;
+  }
+  const finalPath = workspace.getProjectPath(checkedProject.name);
+  if (!finalPath) {
+    logger.error("Path to checked out project not found.");
+    return;
+  }
+  const final = Project5.merge(mProject, checkedProject, {
+    removeUnmapped: options.removeUnmapped,
+    workflowMappings: options.workflowMappings
+  });
+  const yaml = final.serialize("state", { format: "yaml" });
+  await fs7.writeFile(finalPath, yaml);
+  await handler_default12(
+    {
+      command: "checkout",
+      projectPath: commandPath,
+      projectName: final.name || ""
+    },
+    logger
+  );
+  logger.success(
+    `Project ${mProject.name} has been merged into Project ${checkedProject.name} successfully`
+  );
+};
+var handler_default13 = mergeHandler;
+
 // src/util/print-versions.ts
 import { readFileSync as readFileSync2 } from "node:fs";
-import path13 from "node:path";
+import path14 from "node:path";
 import url from "node:url";
 import { getNameAndVersion as getNameAndVersion7 } from "@openfn/runtime";
 import { mainSymbols } from "figures";
@@ -2344,7 +2400,7 @@ var { triangleRightSmall: t } = mainSymbols;
 var loadVersionFromPath = (adaptorPath) => {
   try {
     const pkg = JSON.parse(
-      readFileSync2(path13.resolve(adaptorPath, "package.json"), "utf8")
+      readFileSync2(path14.resolve(adaptorPath, "package.json"), "utf8")
     );
     return pkg.version;
   } catch (e) {
@@ -2379,7 +2435,7 @@ var printVersions = async (logger, options = {}, includeComponents = false) => {
     ...[NODE, CLI2, RUNTIME2, COMPILER2, longestAdaptorName].map((s) => s.length)
   );
   const prefix = (str) => `         ${t} ${str.padEnd(longest + 4, " ")}`;
-  const dirname3 = path13.dirname(url.fileURLToPath(import.meta.url));
+  const dirname3 = path14.dirname(url.fileURLToPath(import.meta.url));
   const pkg = JSON.parse(readFileSync2(`${dirname3}/../../package.json`, "utf8"));
   const { version, dependencies } = pkg;
   const compilerVersion = dependencies["@openfn/compiler"];
@@ -2434,6 +2490,7 @@ var handlers = {
   pull: handler_default10,
   projects: handler_default11,
   checkout: handler_default12,
+  merge: handler_default13,
   ["collections-get"]: handler_default4.get,
   ["collections-set"]: handler_default4.set,
   ["collections-remove"]: handler_default4.remove,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/cli",
-  "version": "1.15.2",
+  "version": "1.16.1",
   "description": "CLI devtools for the OpenFn toolchain",
   "engines": {
     "node": ">=18",
@@ -47,13 +47,13 @@
     "undici": "7.12.0",
     "ws": "^8.18.3",
     "yargs": "^17.7.2",
-    "@openfn/compiler": "1.1.4",
+    "@openfn/compiler": "1.1.5",
     "@openfn/deploy": "0.11.3",
-    "@openfn/logger": "1.0.6",
     "@openfn/lexicon": "^1.2.3",
-    "@openfn/project": "^0.4.0",
+    "@openfn/describe-package": "0.1.5",
+    "@openfn/project": "^0.5.0",
     "@openfn/runtime": "1.7.3",
-    "@openfn/describe-package": "0.1.5"
+    "@openfn/logger": "1.0.6"
   },
   "files": [
     "dist",