cht-conf 3.10.0 → 3.11.0

package/.eslintignore

@@ -1 +1,2 @@
-**/build
+**/build
+test/data/**

package/.releaserc.json

@@ -18,5 +18,5 @@
       }
     ]
   ],
-  "branches": ["master"]
+  "branches": ["main"]
 }

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [3.11.0](https://github.com/medic/cht-conf/compare/v3.10.2...v3.11.0) (2022-04-19)
+
+
+### Features
+
+* **#477:** adds watch-project action ([7a3efc5](https://github.com/medic/cht-conf/commit/7a3efc5efcbd98d8a6b03e801945201ed17ac00f)), closes [#477](https://github.com/medic/cht-conf/issues/477)
+
+## [3.10.2](https://github.com/medic/cht-conf/compare/v3.10.1...v3.10.2) (2022-03-29)
+
+
+### Bug Fixes
+
+* **#371:** allow more characters in form name validation ([265bc48](https://github.com/medic/cht-conf/commit/265bc487d38201e4b3a96ee3d8939c7cba97b5a2)), closes [#371](https://github.com/medic/cht-conf/issues/371) [medic/cht-conf#471](https://github.com/medic/cht-conf/issues/471)
+
+## [3.10.1](https://github.com/medic/cht-conf/compare/v3.10.0...v3.10.1) (2022-02-23)
+
+
+### Bug Fixes
+
+* **#465:** remove process.exit and extraneous require ([058e651](https://github.com/medic/cht-conf/commit/058e65182928cdefdd5bb8fb41849fb9b5164631)), closes [#465](https://github.com/medic/cht-conf/issues/465)
+
 # [3.10.0](https://github.com/medic/cht-conf/compare/v3.9.5...v3.10.0) (2022-02-02)
 
 
@@ -185,7 +206,7 @@ As of this release no docs on the server will be touched unless some configurati
 
 ### New action to bulk-edit contacts
 
-You can now bulk edit contacts at once by providing a CSV. For more information, read [the documentation](https://github.com/medic/cht-conf/blob/master/README.md#editing-contacts-across-the-hierarchy).
+You can now bulk edit contacts at once by providing a CSV. For more information, read [the documentation](https://github.com/medic/cht-conf/blob/main/README.md#editing-contacts-across-the-hierarchy).
 
 [#297](https://github.com/medic/cht-conf/issues/297)
 

package/README.md

@@ -91,6 +91,8 @@ If a different username is required, add the `--user` switch:
 
 	cht --url=https://username:password@example.com:12345
 
+**NB** - When specifying the URL with `--url`, be sure not to specify the CouchDB database name in the URL. The CHT API will find the correct database.
+
 ### Into an archive to be uploaded later
 
     cht --archive
@@ -315,7 +317,7 @@ Breaking| perf(#2): remove reporting rates feature <br/> BREAKING CHANGE: report
 
 ### Releasing betas
 
-1. Checkout `master`
+1. Checkout the default branch, for example `main`
 1. Run `npm version --no-git-tag-version <major>.<minor>.<patch>-beta.1`. This will only update the versions in `package.json` and `package-lock.json`. It will not create a git tag and not create an associated commit.
 1. Run `npm publish --tag beta`. This will publish your beta tag to npm's beta channel.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cht-conf",
-  "version": "3.10.0",
+  "version": "3.11.0",
   "description": "Configure CHT deployments",
   "main": "./src/lib/main.js",
   "engines": {
@@ -8,7 +8,7 @@
   },
   "scripts": {
     "clean": "rm -rf ./build/",
-    "eslint": "eslint src/**/*.js test/*.js test/**/*.js",
+    "eslint": "eslint 'src/**/*.js' test/*.js 'test/**/*.js'",
     "docker-start-couchdb": "npm run docker-stop-couchdb && docker run -d -p 6984:5984 --rm --name cht-conf-couchdb couchdb:2.3.1 && sh test/scripts/wait_for_response_code.sh 6984 200 CouchDB",
     "docker-stop-couchdb": "docker stop cht-conf-couchdb || true",
     "test": "npm run eslint && npm run docker-start-couchdb && npm run clean && mkdir -p build/test && cp -r test/data build/test/data && cd build/test && nyc --reporter=html mocha --forbid-only ../../test/**/*.spec.js && cd ../.. && npm run docker-stop-couchdb",
@@ -37,6 +37,7 @@
   "dependencies": {
     "@hapi/joi": "^16.1.8",
     "@medic/translation-checker": "^1.0.1",
+    "@parcel/watcher": "^2.0.5",
     "canonical-json": "0.0.4",
     "csv-parse": "^4.16.0",
     "dom-compare": "^0.6.0",
@@ -56,12 +57,14 @@
     "pouchdb-core": "^7.2.2",
     "pouchdb-mapreduce": "^7.2.2",
     "properties": "^1.2.1",
+    "queue-promise": "^2.2.1",
     "readline-sync": "^1.4.10",
     "redact-basic-auth": "^1.0.1",
     "request": "^2.88.2",
     "request-promise-native": "^1.0.9",
     "semver": "^6.1.1",
     "svgo": "^1.3.2",
+    "terser-webpack-plugin": "^1.4.3",
     "uuid": "^8.3.2",
     "webpack": "^4.46.0",
     "xmldom": "^0.6.0"
@@ -85,6 +88,7 @@
     "pouchdb-adapter-memory": "^7.2.2",
     "rewire": "^5.0.0",
     "semantic-release": "^18.0.0",
-    "sinon": "^7.3.2"
+    "sinon": "^7.3.2",
+    "fs-extra": "8.1.0"
   }
 }

package/release-notes.md

@@ -134,7 +134,7 @@ As of this release no docs on the server will be touched unless some configurati
 
 ### New action to bulk-edit contacts
 
-You can now bulk edit contacts at once by providing a CSV. For more information, read [the documentation](https://github.com/medic/cht-conf/blob/master/README.md#editing-contacts-across-the-hierarchy).
+You can now bulk edit contacts at once by providing a CSV. For more information, read [the documentation](https://github.com/medic/cht-conf/blob/main/README.md#editing-contacts-across-the-hierarchy).
 
 [#297](https://github.com/medic/cht-conf/issues/297)
 

package/src/bin/index.js

@@ -1,20 +1,22 @@
 #!/usr/bin/env node
 
-const { error } = require('../lib/log');
-require('../cli/check-node-version');
+const { info, error } = require('../lib/log');
+const checkNodeVersion = require('../cli/check-node-version');
 
-const main = require('../lib/main');
+try {
+  checkNodeVersion();
+} catch (e) {
+  error(e.message);
+  process.exitCode = 1;
+}
 
+const main = require('../lib/main');
 (async () => {
-  let returnCode;
   try {
-    returnCode = await main(process.argv, process.env);
-  }
-  catch (e) {
-    error(e);
-    returnCode = 1;
-  }
-  finally {
-    process.exit(returnCode);
+    await main(process.argv, process.env);
+  } catch (e) {
+    info(e); // log the details for debugging
+    error(e.message); // error the message to make it clear
+    process.exitCode = 1; // emit a non-zero exit code for scripting
   }
 })();

package/src/cli/check-node-version.js

@@ -1,10 +1,12 @@
 const MIN_NODE_VERSION = 6;
 const currentNodeVersion = process.versions.node;
 
-if(Number.parseInt(currentNodeVersion.split('.')[0]) < MIN_NODE_VERSION) {
-  console.log(`\x1b[31mYour NodeJS is too old.
-    You are running node version: ${currentNodeVersion}
-    cht-conf requires version:  ${MIN_NODE_VERSION}
-  Please upgrade node to continue.\x1b[0m`);
-  process.exit(1);
-}
+module.exports = () => {
+  const currentMajor = process.versions.node.split('.')[0];
+  if(Number.parseInt(currentMajor) < MIN_NODE_VERSION) {
+    throw new Error(`Your NodeJS is too old.
+      You are running node version: ${currentNodeVersion}
+      cht-conf requires version:  ${MIN_NODE_VERSION}
+    Please upgrade node to continue.`);
+  }
+};

package/src/cli/shell-completion-setup.js

@@ -1,20 +1,17 @@
 const fs = require('../lib/sync-fs');
-const { error } = require('../lib/log');
 
-const supported_shells = ['bash'];
+const SUPPORTED_SHELLS = ['bash'];
 
 module.exports = shell => {
-
-  if (supported_shells.includes(shell)){
+  if (SUPPORTED_SHELLS.includes(shell)){
     const completionFile = `${__dirname}/shell-completion.${shell}`;
     if (fs.exists(completionFile)){
       console.log(fs.read(completionFile));
-      process.exit(0);
+      return;
     }
   } else if (shell === true){
-    error('shell type argument not specified e.g. --shell-completion=bash');
+    throw new Error('shell type argument not specified e.g. --shell-completion=bash');
   } else {
-    error(`completion not yet supported for '${shell}' shell`);
+    throw new Error(`completion not yet supported for '${shell}' shell`);
   }
-  process.exit(1);
 };

package/src/fn/check-git.js

@@ -1,5 +1,5 @@
 const git = require('../lib/git-exec');
-const { info, warn, error } = require('../lib/log');
+const { info, warn } = require('../lib/log');
 const userPrompt = require('../lib/user-prompt');
 const environment = require('../lib/environment');
 
@@ -17,8 +17,7 @@ module.exports = {
           'not staged for commit.');
         warn('Changes untracked or to be committed:\n' + status);
         if (!userPrompt.keyInYN('Are you sure you want to continue?')) {
-          error('User failed to confirm action.');
-          process.exit(1);
+          throw new Error('User aborted execution.');
         }
       }
       info('Fetching git upstream...');
@@ -26,8 +25,7 @@ module.exports = {
       if (syncStatus) {
         warn(syncStatus);
         if (!userPrompt.keyInYN('Are you sure you want to continue?')) {
-          error('User failed to confirm action.');
-          process.exit(1);
+          throw new Error('User aborted execution.');
         }
       }
     }

package/src/fn/compile-app-settings.js

@@ -8,6 +8,21 @@ const parseTargets = require('../lib/parse-targets');
 const { warn } = require('../lib/log');
 const parsePurge = require('../lib/parse-purge');
 const validateAppSettings = require('../lib/validate-app-settings');
+const { APP_SETTINGS_DIR_PATH, APP_SETTINGS_JSON_PATH } = require('../lib/project-paths');
+
+// we can't used named capture groups yet
+const JS_FILE_MATCHER = /^(.+)(\.js)$/; // 2 groups get the file name and extension
+const JSON_FILE_MATCHER = /^(.+)(\.json)$/;
+const configFileMatcher = (fileName) => {
+  const jsFileMatchResult = fileName.match(JS_FILE_MATCHER);
+  // the first element is always the whole matched string, then our first file name group
+  if (jsFileMatchResult) return jsFileMatchResult[1];
+
+  const jsonFileMatchResult = fileName.match(JSON_FILE_MATCHER);
+  if (jsonFileMatchResult) return jsonFileMatchResult[1];
+
+  return null;
+};
 
 const compileAppSettings = async () => {
   const options = parseExtraArgs(environment.extraArgs);
@@ -23,7 +38,7 @@ const compileAppSettings = async () => {
     appSettings = await compileAppSettingsForProject(projectDir, options);
   }
 
-  fs.writeJson(path.join(projectDir, 'app_settings.json'), appSettings);
+  fs.writeJson(path.join(projectDir, APP_SETTINGS_JSON_PATH), appSettings);
 };
 
 const compileAppSettingsForProject = async (projectDir, options) => {
@@ -41,8 +56,8 @@ const compileAppSettingsForProject = async (projectDir, options) => {
 
   const readOptionalJson = path => fs.exists(path) ? fs.readJson(path) : undefined;
   let appSettings;
-  const baseSettingsPath = path.join(projectDir, 'app_settings/base_settings.json');
-  const appSettingsPath = path.join(projectDir, 'app_settings.json');
+  const baseSettingsPath = path.join(projectDir, `${APP_SETTINGS_DIR_PATH}/base_settings.json`);
+  const appSettingsPath = path.join(projectDir, APP_SETTINGS_JSON_PATH);
   const esLintFilePath = path.join(projectDir, '.eslintrc');
 
   // Fail if no eslintrc file is found
@@ -56,10 +71,10 @@ const compileAppSettingsForProject = async (projectDir, options) => {
   if (fs.exists(baseSettingsPath)) {
     // using modular config so should override anything already defined in app_settings.json
     appSettings = fs.readJson(baseSettingsPath);
-    if(appSettings.forms) {
+    if (appSettings.forms) {
       warn('forms should be defined in a separate <config_repo>/app_settings/forms.json file.');
     }
-    if(appSettings.schedules) {
+    if (appSettings.schedules) {
       warn('schedules should be defined in a separate <config_repo>/app_settings/schedules.json file.');
     }
     const formSettings = readOptionalJson(path.join(projectDir, 'app_settings/forms.json'));
@@ -107,7 +122,7 @@ function applyTransforms(app_settings, inherited) {
     rules.forEach(k => {
       const parts = k.split('.');
       let t = target;
-      while(parts.length > 1) {
+      while (parts.length > 1) {
         t = t[parts[0]];
         parts.shift();
       }
@@ -122,7 +137,7 @@ function applyTransforms(app_settings, inherited) {
       .forEach(k => {
         const parts = k.split('.');
         let t = target;
-        while(parts.length > 1) {
+        while (parts.length > 1) {
           t = t[parts[0]];
           parts.shift();
         }
@@ -146,7 +161,7 @@ function applyTransforms(app_settings, inherited) {
       .forEach(k => {
         const parts = k.split('.');
         let t = target;
-        while(parts.length > 1) {
+        while (parts.length > 1) {
           t = t[parts[0]];
           parts.shift();
         }
@@ -178,5 +193,7 @@ const parseExtraArgs = (extraArgs = []) => {
 
 module.exports = {
   requiresInstance: false,
+  APP_SETTINGS_DIR_PATH,
+  configFileMatcher,
   execute: compileAppSettings
 };

package/src/fn/compress-images.js

@@ -1,3 +1,4 @@
+/*eslint node/no-missing-require: "off"*/
 const compressPng = require('../lib/compress-png').execute;
 const compressSvg = require('../lib/compress-svg').execute;
 

package/src/fn/compress-svgs.js

@@ -16,6 +16,6 @@ module.exports = {
           .then(() => svgo.optimize(fs.read(path), { path }))
           .then(result => fs.write(path, result.data))
           .then(() => trace('Compressed', path))
-          .then(() => warn('Make sure you compare the content of your SVG files before merging to the master branch - sometimes optimising can change their contents!')),
+          .then(() => warn('Make sure you compare the content of your SVG files before merging to the default branch - sometimes optimising can change their contents!')),
         Promise.resolve())
 };

package/src/fn/convert-app-forms.js

@@ -1,11 +1,18 @@
-const convertForms = require('../lib/convert-forms');
+const convertForms = require('../lib/convert-forms').execute;
 const environment = require('../lib/environment');
+const { APP_FORMS_PATH } = require('../lib/project-paths');
 
-module.exports = {
-  requiresInstance: false,
-  execute: () => convertForms(environment.pathToProject, 'app', {
+const convertAppForms = (forms) => {
+  return convertForms(environment.pathToProject, 'app', {
     enketo: true,
-    forms: environment.extraArgs,
+    forms: forms,
     transformer: xml => xml.replace('</instance>', '</instance>\n      <instance id="contact-summary"/>'),
-  })
+  });
+};
+
+module.exports = {
+  requiresInstance: false,
+  convertAppForms,
+  APP_FORMS_PATH,
+  execute: () => convertAppForms(environment.extraArgs)
 };

package/src/fn/convert-collect-forms.js

@@ -1,9 +1,16 @@
-const convertForms = require('../lib/convert-forms');
+const convertForms = require('../lib/convert-forms').execute;
 const environment = require('../lib/environment');
+const { COLLECT_FORMS_PATH } = require('../lib/project-paths');
+
+const convertCollectForms = (forms) => {
+  return convertForms(environment.pathToProject, 'collect', {
+    forms: forms,
+  });
+};
 
 module.exports = {
   requiresInstance: false,
-  execute: () => convertForms(environment.pathToProject, 'collect', {
-    forms: environment.extraArgs,
-  })
+  COLLECT_FORMS_PATH,
+  convertCollectForms,
+  execute: () => convertCollectForms(environment.extraArgs)
 };

package/src/fn/convert-contact-forms.js

@@ -1,92 +1,95 @@
-const convertForms = require('../lib/convert-forms');
+const convertForms = require('../lib/convert-forms').execute;
 const environment = require('../lib/environment');
 const fs = require('../lib/sync-fs');
+const { CONTACT_FORMS_PATH } = require('../lib/project-paths');
 
-const execute = () => {
-  const dir = `${environment.pathToProject}/forms/contact`;
+const convertContactForm = (forms) => {
+  const dir = `${environment.pathToProject}/${CONTACT_FORMS_PATH}`;
   const placeTypesJson = `${dir}/place-types.json`;
 
   let PLACE_TYPES;
-  if(fs.exists(placeTypesJson)) {
+  if (fs.exists(placeTypesJson)) {
     PLACE_TYPES = fs.readJson(placeTypesJson);
     Object.keys(PLACE_TYPES)
       .forEach(type => {
-        fs.copy(`${dir}/PLACE_TYPE-create.xlsx`, `${dir}/${type}-create.xlsx`,{ overwrite: false });
+        fs.copy(`${dir}/PLACE_TYPE-create.xlsx`, `${dir}/${type}-create.xlsx`, { overwrite: false });
         fs.copy(`${dir}/PLACE_TYPE-edit.xlsx`, `${dir}/${type}-edit.xlsx`, { overwrite: false });
       });
   }
 
   return convertForms(environment.pathToProject, 'contact', {
-      enketo: true,
-      force_data_node: 'data',
-      forms: environment.extraArgs,
-      transformer: (xml, path) => {
-        const type = path.replace(/.*\/(.*?)(-(create|edit))?\.xml/, '$1');
+    enketo: true,
+    force_data_node: 'data',
+    forms: forms,
+    transformer: (xml, path) => {
+      const type = path.replace(/.*\/(.*?)(-(create|edit))?\.xml/, '$1');
 
-        if(PLACE_TYPES) {
-          xml = xml
-              .replace(/PLACE_TYPE/g, type)
-              .replace(/PLACE_NAME/g, PLACE_TYPES[type]);
-        }
+      if (PLACE_TYPES) {
+        xml = xml
+          .replace(/PLACE_TYPE/g, type)
+          .replace(/PLACE_NAME/g, PLACE_TYPES[type]);
+      }
 
-        // The ordering of elements in the <model> has an arcane affect on the
-        // order that docs are saved in the database when processing a form.
-        // Move the main doc's element down to the bottom.
-        // For templated PLACE_TYPE forms, shifting must be done _after_ templating.
-        if(xml.includes('</inputs>')) {
-          let matchedBlock;
-          const matcher = new RegExp(`\\s*<${type}>[\\s\\S]*</${type}>\\s*(\\r|\\n)`);
+      // The ordering of elements in the <model> has an arcane affect on the
+      // order that docs are saved in the database when processing a form.
+      // Move the main doc's element down to the bottom.
+      // For templated PLACE_TYPE forms, shifting must be done _after_ templating.
+      if (xml.includes('</inputs>')) {
+        let matchedBlock;
+        const matcher = new RegExp(`\\s*<${type}>[\\s\\S]*</${type}>\\s*(\\r|\\n)`);
 
-          xml = xml.replace(matcher, match => {
-            matchedBlock = match;
-            return '\n';
-          });
+        xml = xml.replace(matcher, match => {
+          matchedBlock = match;
+          return '\n';
+        });
 
-          if(matchedBlock) {
-            xml = xml.replace(/<\/inputs>(\r|\n)/, '</inputs>' + matchedBlock);
-          }
+        if (matchedBlock) {
+          xml = xml.replace(/<\/inputs>(\r|\n)/, '</inputs>' + matchedBlock);
         }
+      }
 
-        if(xml.includes('/data/init/custom_place_name')) {
-          let matchedBlock;
-          xml = xml.replace(/\s*<input ref="\/data\/init\/custom_place_name">[^]*?<\/input>/, match => {
-            matchedBlock = match;
-            return '';
-          });
+      if (xml.includes('/data/init/custom_place_name')) {
+        let matchedBlock;
+        xml = xml.replace(/\s*<input ref="\/data\/init\/custom_place_name">[^]*?<\/input>/, match => {
+          matchedBlock = match;
+          return '';
+        });
 
-          if(matchedBlock) {
-            const targetMatcher = new RegExp(`\\s*<input ref="/data/${type}/external_id">\\s*(\\r|\\n)`);
-            xml = xml.replace(targetMatcher, match => matchedBlock + match);
-          }
+        if (matchedBlock) {
+          const targetMatcher = new RegExp(`\\s*<input ref="/data/${type}/external_id">\\s*(\\r|\\n)`);
+          xml = xml.replace(targetMatcher, match => matchedBlock + match);
         }
+      }
 
-        if(xml.includes('ref="/data/contact"')) {
-          const groupRegex = name => new RegExp(`(\\s*)<group(\\s.*)?\\sref="${name}"(\\s.*)?>[^]*?</group>`);
-          let matchedBlock;
+      if (xml.includes('ref="/data/contact"')) {
+        const groupRegex = name => new RegExp(`(\\s*)<group(\\s.*)?\\sref="${name}"(\\s.*)?>[^]*?</group>`);
+        let matchedBlock;
 
-          if(xml.match(groupRegex('/data/init'))) {
-            xml = xml.replace(groupRegex('/data/contact'), match => {
-              matchedBlock = match;
-              return '';
-            });
+        if (xml.match(groupRegex('/data/init'))) {
+          xml = xml.replace(groupRegex('/data/contact'), match => {
+            matchedBlock = match;
+            return '';
+          });
 
-            if(matchedBlock) {
-              const stripTrailingGroup = s => s.replace(/[\r\n\s]*<\/group>$/, '');
-              xml = xml.replace(groupRegex('/data/init'), match => {
-                return stripTrailingGroup(match) +
-                       stripTrailingGroup(matchedBlock).replace(/\n/g, '\n  ') +
-                       '\n        </group>\n      </group>';
-              });
-            }
+          if (matchedBlock) {
+            const stripTrailingGroup = s => s.replace(/[\r\n\s]*<\/group>$/, '');
+            xml = xml.replace(groupRegex('/data/init'), match => {
+              return stripTrailingGroup(match) +
+                stripTrailingGroup(matchedBlock).replace(/\n/g, '\n  ') +
+                '\n        </group>\n      </group>';
+            });
           }
         }
+      }
 
-        return xml;
-      },
-    });
+      return xml;
+    },
+  });
 };
 
 module.exports = {
   requiresInstance: false,
-  execute
+  convertContactForm,
+  CONTACT_FORMS_PATH,
+  execute: () => convertContactForm(environment.extraArgs)
 };

package/src/fn/create-users.js

@@ -4,7 +4,7 @@ const userPrompt = require('../../src/lib/user-prompt');
 const api = require('../lib/api');
 const environment = require('../lib/environment');
 const fs = require('../lib/sync-fs');
-const { info, warn, error } = require('../lib/log');
+const { info, warn } = require('../lib/log');
 
 const nestPrefixedProperties = (obj, name) => {
   const nested = {};
@@ -61,7 +61,7 @@ const getUserInfo = async (user) => {
 
 const execute = async () => {
   const csvPath = `${environment.pathToProject}/users.csv`;
-  if(!fs.exists(csvPath)) {
+  if (!fs.exists(csvPath)) {
     throw new Error(`User csv file not found at ${csvPath}`);
   }
 
@@ -76,11 +76,8 @@ const execute = async () => {
   if (warnings.length) {
     warnings.forEach(warning => warn(warning));
     warn('Are you sure you want to continue?');
-    if(!userPrompt.keyInYN()) {
-      error('User failed to confirm action.');
-      process.exit(1);
-      // stop execution in tests
-      return; // eslint-disable-line no-unreachable
+    if (!userPrompt.keyInYN()) {
+      throw new Error('User aborted execution.');
     }
   }
 

package/src/fn/delete-forms.js

@@ -2,22 +2,23 @@ const environment = require('../lib/environment');
 const { info, warn } = require('../lib/log');
 const pouch = require('../lib/db');
 
+const deleteForms = (forms) => {
+  if (!forms || !forms.length) {
+    warn('No forms specified for deleting.');
+    return;
+  }
+  const db = pouch();
+  return Promise.all(forms.map(formName => {
+    const docId = `form:${formName}`;
+    return db.get(docId)
+      .then(doc => db.remove(doc))
+      .then(() => info('Deleted form:', formName))
+      .catch(e => warn(`Failed to remove form with doc ID ${docId}`, e));
+  }));
+};
+
 module.exports = {
   requiresInstance: true,
-  execute: () => {
-    const db = pouch();
-    const { extraArgs } = environment;
-    if (!extraArgs || !extraArgs.length) {
-      warn('No forms specified for deleting.');
-      return;
-    }
-
-    return Promise.all(extraArgs.map(formName => {
-      const docId = `form:${formName}`;
-      return db.get(docId)
-        .then(doc => db.remove(doc))
-        .then(() => info('Deleted form:', formName))
-        .catch(e => warn(`Failed to remove form with doc ID ${docId}`, e));
-    }));
-  }
+  execute: () => deleteForms(environment.extraArgs),
+  deleteForms,
 };

package/src/fn/move-contacts.js

@@ -7,7 +7,7 @@ const fs = require('../lib/sync-fs');
 const lineageManipulation = require('../lib/lineage-manipulation');
 const lineageConstraints = require('../lib/lineage-constraints');
 const pouch = require('../lib/db');
-const { warn, trace, info, error } = require('../lib/log');
+const { warn, trace, info } = require('../lib/log');
 
 const HIERARCHY_ROOT = 'root';
 const BATCH_SIZE = 10000;
@@ -125,8 +125,7 @@ const prepareDocumentDirectory = ({ docDirectoryPath, force }) => {
     if(userPrompt.keyInYN()) {
       fs.deleteFilesInFolder(docDirectoryPath);
     } else {
-      error('User failed to confirm action.');
-      process.exit(1);
+      throw new Error('User aborted execution.');
     }
   }
 };