@openfn/cli 1.18.2 → 1.18.4

package/dist/index.js

@@ -1136,6 +1136,21 @@ var options11 = [
   removeUnmapped,
   workflowMappings,
   log,
+  // custom output because we don't want defaults or anything
+  {
+    name: "output-path",
+    yargs: {
+      alias: "o",
+      description: "Optionally write the merged project file to a custom location"
+    }
+  },
+  {
+    name: "base",
+    yargs: {
+      alias: "target",
+      description: "Path to the base (target) state file to merge into (ie, what main should be)"
+    }
+  },
   override(force, {
     description: "Force a merge even when workflows are incompatible"
   })

package/dist/process/runner.js

@@ -2127,12 +2127,16 @@ async function handler2(options, logger) {
   const config = workspace.getConfig();
   const { data } = await getProject(cfg, options.projectId);
   const name = options.env || "project";
-  const project = Project3.from("state", data, {
-    config,
-    endpoint: cfg.endpoint,
-    env: name,
-    fetched_at: (/* @__PURE__ */ new Date()).toISOString()
-  });
+  const project = await Project3.from(
+    "state",
+    data,
+    {
+      endpoint: cfg.endpoint,
+      env: name,
+      fetched_at: (/* @__PURE__ */ new Date()).toISOString()
+    },
+    config
+  );
   const projectFileName = project.getIdentifier();
   await fs4.mkdir(`${outputRoot}/.projects`, { recursive: true });
   let stateOutputPath = `${outputRoot}/.projects/${projectFileName}`;
@@ -2312,7 +2316,7 @@ var workflowVersionHandler = async (options, logger) => {
   if (options.workflow) {
     const workflow = activeProject?.getWorkflow(options.workflow);
     if (!workflow) {
-      logger.error(`No workflow found with id/name ${options.workflow}`);
+      logger.error(`No workflow found with id ${options.workflow}`);
       return;
     }
     output.set(workflow.name || workflow.id, workflow.getVersionHash());
@@ -2352,19 +2356,16 @@ var checkoutHandler = async (options, logger) => {
   const { project: _, ...config } = workspace.getConfig();
   let switchProject;
   if (/\.(yaml|json)$/.test(options.projectId)) {
-    const filePath = path13.join(commandPath, options.projectId);
+    const filePath = options.projectId.startsWith("/") ? options.projectId : path13.join(commandPath, options.projectId);
     logger.debug("Loading project from path ", filePath);
-    switchProject = await Project5.from("path", filePath, {
-      config
-    });
+    switchProject = await Project5.from("path", filePath, config);
   } else {
     switchProject = workspace.get(options.projectId);
   }
   if (!switchProject) {
-    logger.error(
-      `Project with id/name ${options.projectId} not found in the workspace`
+    throw new Error(
+      `Project with id ${options.projectId} not found in the workspace`
     );
-    return;
   }
   await rimraf2(path13.join(commandPath, config.workflowRoot ?? "workflows"));
   const files = switchProject.serialize("fs");
@@ -2393,10 +2394,18 @@ var mergeHandler = async (options, logger) => {
     logger.error("Command was run in an invalid openfn workspace");
     return;
   }
-  const targetProject = workspace.getActiveProject();
-  if (!targetProject) {
-    logger.error(`No project currently checked out`);
-    return;
+  let targetProject;
+  if (options.base) {
+    const basePath = path14.resolve(options.base);
+    logger.debug("Loading target project from path", basePath);
+    targetProject = await Project6.from("path", basePath);
+  } else {
+    targetProject = workspace.getActiveProject();
+    if (!targetProject) {
+      logger.error(`No project currently checked out`);
+      return;
+    }
+    logger.debug(`Loading target project from workspace (${targetProject.id})`);
   }
   let sourceProject;
   if (/\.(yaml|json)$/.test(options.projectId)) {
@@ -2404,6 +2413,7 @@ var mergeHandler = async (options, logger) => {
     logger.debug("Loading source project from path ", filePath);
     sourceProject = await Project6.from("path", filePath);
   } else {
+    logger.debug(`Loading source project from workspace ${options.projectId}`);
     sourceProject = workspace.get(options.projectId);
   }
   if (!sourceProject) {
@@ -2418,7 +2428,7 @@ var mergeHandler = async (options, logger) => {
     logger.error("The checked out project has no id");
     return;
   }
-  const finalPath = workspace.getProjectPath(targetProject.id);
+  const finalPath = options.outputPath ?? workspace.getProjectPath(targetProject.id);
   if (!finalPath) {
     logger.error("Path to checked out project not found.");
     return;
@@ -2428,13 +2438,26 @@ var mergeHandler = async (options, logger) => {
     workflowMappings: options.workflowMappings,
     force: options.force
   });
-  const yaml = final.serialize("state", { format: "yaml" });
-  await fs7.writeFile(finalPath, yaml);
+  let outputFormat = workspace.config.formats.project;
+  if (options.outputPath?.endsWith(".json")) {
+    outputFormat = "json";
+  } else if (options.outputPath?.endsWith(".yaml")) {
+    outputFormat = "yaml";
+  }
+  let finalState = final.serialize("state", {
+    format: outputFormat
+  });
+  if (outputFormat === "json") {
+    finalState = JSON.stringify(finalState, null, 2);
+  }
+  await fs7.writeFile(finalPath, finalState);
+  logger.info(`Updated statefile at `, finalPath);
+  logger.info("Checking out merged project to filesystem");
   await handler_default13(
     {
       command: "checkout",
       projectPath: commandPath,
-      projectId: final.id,
+      projectId: options.outputPath ? finalPath : final.id,
       log: options.log
     },
     logger

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/cli",
-  "version": "1.18.2",
+  "version": "1.18.4",
   "description": "CLI devtools for the OpenFn toolchain",
   "engines": {
     "node": ">=18",
@@ -48,12 +48,12 @@
     "ws": "^8.18.3",
     "yargs": "^17.7.2",
     "@openfn/compiler": "1.1.5",
-    "@openfn/deploy": "0.11.3",
     "@openfn/describe-package": "0.1.5",
-    "@openfn/lexicon": "^1.2.5",
+    "@openfn/deploy": "0.11.3",
+    "@openfn/lexicon": "^1.2.6",
     "@openfn/runtime": "1.7.5",
-    "@openfn/logger": "1.0.6",
-    "@openfn/project": "^0.7.1"
+    "@openfn/project": "^0.8.0",
+    "@openfn/logger": "1.0.6"
   },
   "files": [
     "dist",