@openfn/cli 1.17.1 → 1.18.1

package/dist/index.js

@@ -1135,7 +1135,10 @@ var options11 = [
   projectPath,
   removeUnmapped,
   workflowMappings,
-  log
+  log,
+  override(force, {
+    description: "Force a merge even when workflows are incompatible"
+  })
 ];
 var mergeCommand = {
   command: "merge [project-name]",

package/dist/process/runner.js

@@ -2106,36 +2106,39 @@ import { confirm } from "@inquirer/prompts";
 import path9 from "path";
 import fs4 from "node:fs/promises";
 import { getProject } from "@openfn/deploy";
-import Project3 from "@openfn/project";
+import Project3, { Workspace } from "@openfn/project";
 import { rimraf } from "rimraf";
 async function handler2(options, logger) {
   const { OPENFN_API_KEY, OPENFN_ENDPOINT } = process.env;
-  const config = {
+  const cfg = {
     apiKey: options.apiKey,
     endpoint: options.endpoint
   };
   if (!options.apiKey && OPENFN_API_KEY) {
     logger.info("Using OPENFN_API_KEY environment variable");
-    config.apiKey = OPENFN_API_KEY;
+    cfg.apiKey = OPENFN_API_KEY;
   }
   if (!options.endpoint && OPENFN_ENDPOINT) {
     logger.info("Using OPENFN_ENDPOINT environment variable");
-    config.endpoint = OPENFN_ENDPOINT;
+    cfg.endpoint = OPENFN_ENDPOINT;
   }
-  const { data } = await getProject(config, options.projectId);
+  const outputRoot = path9.resolve(options.path || ".");
+  const workspace = new Workspace(outputRoot);
+  const config = workspace.getConfig();
+  const { data } = await getProject(cfg, options.projectId);
   const name = options.env || "project";
   const project = Project3.from("state", data, {
-    endpoint: config.endpoint,
+    config,
+    endpoint: cfg.endpoint,
     env: name,
     fetched_at: (/* @__PURE__ */ new Date()).toISOString()
   });
-  const outputRoot = path9.resolve(options.path || ".");
   const projectFileName = project.getIdentifier();
   await fs4.mkdir(`${outputRoot}/.projects`, { recursive: true });
   let stateOutputPath = `${outputRoot}/.projects/${projectFileName}`;
   const workflowsRoot = path9.resolve(
     outputRoot,
-    project.repo?.workflowRoot ?? "workflows"
+    project.config.dirs.workflows ?? "workflows"
   );
   if (!await confirm({
     message: `This will remove all files in ${path9.resolve(
@@ -2149,7 +2152,7 @@ async function handler2(options, logger) {
   }
   await rimraf(workflowsRoot);
   const state = project?.serialize("state");
-  if (project.repo?.formats.project === "yaml") {
+  if (project.config.formats.project === "yaml") {
     await fs4.writeFile(`${stateOutputPath}.yaml`, state);
   } else {
     await fs4.writeFile(
@@ -2271,11 +2274,11 @@ function pickFirst2(...args) {
 var handler_default10 = pullHandler;
 
 // src/projects/handler.ts
-import { Workspace } from "@openfn/project";
+import { Workspace as Workspace2 } from "@openfn/project";
 import path11 from "path";
 var projectsHandler = async (options, logger) => {
   const commandPath = path11.resolve(options.projectPath ?? ".");
-  const workspace = new Workspace(commandPath);
+  const workspace = new Workspace2(commandPath);
   if (!workspace.valid) {
     logger.error("Command was run in an invalid openfn workspace");
     return;
@@ -2295,11 +2298,11 @@ ${project.workflows.map((w) => "    - " + w.name).join("\n")}`;
 var handler_default11 = projectsHandler;
 
 // src/version/handler.ts
-import { Workspace as Workspace2 } from "@openfn/project";
+import { Workspace as Workspace3 } from "@openfn/project";
 import path12 from "path";
 var workflowVersionHandler = async (options, logger) => {
   const commandPath = path12.resolve(options.projectPath ?? ".");
-  const workspace = new Workspace2(commandPath);
+  const workspace = new Workspace3(commandPath);
   if (!workspace.valid) {
     logger.error("Command was run in an invalid openfn workspace");
     return;
@@ -2335,18 +2338,18 @@ ${final}`);
 var handler_default12 = workflowVersionHandler;
 
 // src/checkout/handler.ts
-import Project5, { Workspace as Workspace3 } from "@openfn/project";
+import Project5, { Workspace as Workspace4 } from "@openfn/project";
 import path13 from "path";
 import fs6 from "fs";
 import { rimraf as rimraf2 } from "rimraf";
 var checkoutHandler = async (options, logger) => {
   const commandPath = path13.resolve(options.projectPath ?? ".");
-  const workspace = new Workspace3(commandPath);
+  const workspace = new Workspace4(commandPath);
   if (!workspace.valid) {
     logger.error("Command was run in an invalid openfn workspace");
     return;
   }
-  const { project: _, ...config } = workspace.getConfig() ?? {};
+  const { project: _, ...config } = workspace.getConfig();
   let switchProject;
   if (/\.(yaml|json)$/.test(options.projectName)) {
     const filePath = path13.join(commandPath, options.projectName);
@@ -2380,12 +2383,12 @@ var checkoutHandler = async (options, logger) => {
 var handler_default13 = checkoutHandler;
 
 // src/merge/handler.ts
-import Project6, { Workspace as Workspace4 } from "@openfn/project";
+import Project6, { Workspace as Workspace5 } from "@openfn/project";
 import path14 from "path";
 import { promises as fs7 } from "fs";
 var mergeHandler = async (options, logger) => {
   const commandPath = path14.resolve(options.projectPath ?? ".");
-  const workspace = new Workspace4(commandPath);
+  const workspace = new Workspace5(commandPath);
   if (!workspace.valid) {
     logger.error("Command was run in an invalid openfn workspace");
     return;
@@ -2422,7 +2425,8 @@ var mergeHandler = async (options, logger) => {
   }
   const final = Project6.merge(sourceProject, targetProject, {
     removeUnmapped: options.removeUnmapped,
-    workflowMappings: options.workflowMappings
+    workflowMappings: options.workflowMappings,
+    force: options.force
   });
   const yaml = final.serialize("state", { format: "yaml" });
   await fs7.writeFile(finalPath, yaml);
@@ -2430,7 +2434,8 @@ var mergeHandler = async (options, logger) => {
     {
       command: "checkout",
       projectPath: commandPath,
-      projectName: final.name || ""
+      projectName: final.name || "",
+      log: options.log
     },
     logger
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfn/cli",
-  "version": "1.17.1",
+  "version": "1.18.1",
   "description": "CLI devtools for the OpenFn toolchain",
   "engines": {
     "node": ">=18",
@@ -50,10 +50,10 @@
     "@openfn/compiler": "1.1.5",
     "@openfn/deploy": "0.11.3",
     "@openfn/describe-package": "0.1.5",
-    "@openfn/lexicon": "^1.2.4",
-    "@openfn/runtime": "1.7.3",
-    "@openfn/project": "^0.6.0",
-    "@openfn/logger": "1.0.6"
+    "@openfn/logger": "1.0.6",
+    "@openfn/project": "^0.7.0",
+    "@openfn/lexicon": "^1.2.5",
+    "@openfn/runtime": "1.7.4"
   },
   "files": [
     "dist",