@openfn/cli 1.16.0 → 1.16.2

package/dist/process/runner.js

@@ -2295,7 +2295,7 @@ ${project.workflows.map((w) => "    - " + w.name).join("\n")}`;
 var handler_default11 = projectsHandler;
 
 // src/checkout/handler.ts
-import { Workspace as Workspace2 } from "@openfn/project";
+import Project5, { Workspace as Workspace2 } from "@openfn/project";
 import path12 from "path";
 import fs6 from "fs";
 import { rimraf as rimraf2 } from "rimraf";
@@ -2306,15 +2306,24 @@ var checkoutHandler = async (options, logger) => {
     logger.error("Command was run in an invalid openfn workspace");
     return;
   }
-  const switchProject = workspace.get(options.projectName);
+  const { project: _, ...config } = workspace.getConfig() ?? {};
+  let switchProject;
+  if (/\.(yaml|json)$/.test(options.projectName)) {
+    const filePath = path12.join(commandPath, options.projectName);
+    logger.debug("Loading project from path ", filePath);
+    switchProject = await Project5.from("path", filePath, {
+      config
+    });
+  } else {
+    switchProject = workspace.get(options.projectName);
+  }
   if (!switchProject) {
     logger.error(
       `Project with id/name ${options.projectName} not found in the workspace`
     );
     return;
   }
-  const config = workspace.getConfig();
-  await rimraf2(path12.join(commandPath, config?.workflowRoot || "workflows"));
+  await rimraf2(path12.join(commandPath, config.workflowRoot ?? "workflows"));
   const files = switchProject.serialize("fs");
   for (const f in files) {
     if (files[f]) {
@@ -2331,7 +2340,7 @@ var checkoutHandler = async (options, logger) => {
 var handler_default12 = checkoutHandler;
 
 // src/merge/handler.ts
-import Project5, { Workspace as Workspace3 } from "@openfn/project";
+import Project6, { Workspace as Workspace3 } from "@openfn/project";
 import path13 from "path";
 import { promises as fs7 } from "fs";
 var mergeHandler = async (options, logger) => {
@@ -2341,32 +2350,37 @@ var mergeHandler = async (options, logger) => {
     logger.error("Command was run in an invalid openfn workspace");
     return;
   }
-  const checkedProject = workspace.getActiveProject();
-  if (!checkedProject) {
+  const targetProject = workspace.getActiveProject();
+  if (!targetProject) {
     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`
-    );
+  let sourceProject;
+  if (/\.(yaml|json)$/.test(options.projectName)) {
+    const filePath = path13.join(commandPath, options.projectName);
+    logger.debug("Loading source project from path ", filePath);
+    sourceProject = await Project6.from("path", filePath);
+  } else {
+    sourceProject = workspace.get(options.projectName);
+  }
+  if (!sourceProject) {
+    logger.error(`Project "${options.projectName}" not found in the workspace`);
     return;
   }
-  if (checkedProject.name === mProject.name) {
+  if (targetProject.name === sourceProject.name) {
     logger.error("Merging into the same project not allowed");
     return;
   }
-  if (!checkedProject.name) {
+  if (!targetProject.name) {
     logger.error("The checked out project has no name/id");
     return;
   }
-  const finalPath = workspace.getProjectPath(checkedProject.name);
+  const finalPath = workspace.getProjectPath(targetProject.name);
   if (!finalPath) {
     logger.error("Path to checked out project not found.");
     return;
   }
-  const final = Project5.merge(mProject, checkedProject, {
+  const final = Project6.merge(sourceProject, targetProject, {
     removeUnmapped: options.removeUnmapped,
     workflowMappings: options.workflowMappings
   });
@@ -2381,7 +2395,7 @@ var mergeHandler = async (options, logger) => {
     logger
   );
   logger.success(
-    `Project ${mProject.name} has been merged into Project ${checkedProject.name} successfully`
+    `Project ${sourceProject.name} has been merged into Project ${targetProject.name} successfully`
   );
 };
 var handler_default13 = mergeHandler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/cli",
-  "version": "1.16.0",
+  "version": "1.16.2",
   "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/deploy": "0.11.3",
+    "@openfn/compiler": "1.1.5",
     "@openfn/describe-package": "0.1.5",
-    "@openfn/lexicon": "^1.2.3",
-    "@openfn/logger": "1.0.6",
+    "@openfn/lexicon": "^1.2.4",
+    "@openfn/deploy": "0.11.3",
     "@openfn/runtime": "1.7.3",
-    "@openfn/project": "^0.4.1"
+    "@openfn/project": "^0.5.1",
+    "@openfn/logger": "1.0.6"
   },
   "files": [
     "dist",