Force merge by default (#1095)

* force merge by default

In the CLI, we only force merge when the user asks us to. But here in project, we prefer to force merge. If you ask to merge two projects, we just merge them. Why woulldn't we? Add safeguads in the application, not down in the API

If it feels like a strange default its because the CLI should be doing all the force stuff, not the Project, but there we go

* force where needed

* update integration test

Author: josephjclark

integration-tests/cli/test/project.test.ts

@@ -152,12 +152,14 @@ test.serial('merge a project', async (t) => {
       'utf8'
     ).then((str) => str.trim());
 
-  // assert the intial step code
+  // assert the initial step code
   const initial = await readStep();
   t.is(initial, '// TODO');
 
   // Run the merge
-  await run(`openfn merge hello-world-staging -p ${projectsPath}`);
+  const { stdout } = await run(
+    `openfn merge hello-world-staging -p ${projectsPath} --force`
+  );
 
   // Check the step is updated
   const merged = await readStep();

packages/cli/src/merge/handler.ts

@@ -51,7 +51,6 @@ const mergeHandler = async (options: MergeOptions, logger: Logger) => {
     return;
   }
 
-  // TODO pick options from the terminal
   const final = Project.merge(sourceProject, targetProject, {
     removeUnmapped: options.removeUnmapped,
     workflowMappings: options.workflowMappings,

packages/project/src/merge/merge-project.ts

@@ -31,6 +31,7 @@ export function merge(
   const defaultOptions: MergeProjectOptions = {
     workflowMappings: {},
     removeUnmapped: false,
+    force: true,
   };
   options = defaultsDeep<MergeProjectOptions>(options, defaultOptions);
 

packages/project/test/project.test.ts

@@ -165,9 +165,12 @@ test('incompatible-merge: should throw error when merge is incompatible', (t) =>
 
   const sourceProject = new Project({ workflows: [source] });
   const targetProject = new Project({ workflows: [target] });
-  t.throws(() => Project.merge(sourceProject, targetProject), {
-    message: `The below workflows can't be merged directly without losing data\nWorkflow → Workflow\nPass --force to force the merge anyway`,
-  });
+  t.throws(
+    () => Project.merge(sourceProject, targetProject, { force: false }),
+    {
+      message: `The below workflows can't be merged directly without losing data\nWorkflow → Workflow\nPass --force to force the merge anyway`,
+    }
+  );
 });
 
 test('incompatible-merge-force: should ignore incompatiblity and merge when forced', (t) => {