cht-conf 3.15.0 → 3.15.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [3.15.2](https://github.com/medic/cht-conf/compare/v3.15.1...v3.15.2) (2022-12-15)
+
+
+### Bug Fixes
+
+* **#504:** escape whitespaces in path when converting forms ([#523](https://github.com/medic/cht-conf/issues/523)) ([90859ba](https://github.com/medic/cht-conf/commit/90859ba85a2bd4136b051749d826865fa6a76e0a)), closes [#504](https://github.com/medic/cht-conf/issues/504) [#504](https://github.com/medic/cht-conf/issues/504)
+
+## [3.15.1](https://github.com/medic/cht-conf/compare/v3.15.0...v3.15.1) (2022-12-06)
+
+
+### Bug Fixes
+
+* **#123:** Target date default to Now ([#516](https://github.com/medic/cht-conf/issues/516)) ([312219e](https://github.com/medic/cht-conf/commit/312219e8f7d55340513cf0b2be9bdf276762a23a)), closes [#123](https://github.com/medic/cht-conf/issues/123)
+
 # [3.15.0](https://github.com/medic/cht-conf/compare/v3.14.0...v3.15.0) (2022-08-19)
 
 

package/README.md

@@ -330,7 +330,7 @@ Builds brought to you courtesy of GitHub actions.
 
 # Copyright
 
-Copyright 2013-2019 Medic Mobile, Inc. <hello@medicmobile.org>
+Copyright 2013-2022 Medic Mobile, Inc. <hello@medic.org>
 
 # License
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cht-conf",
-  "version": "3.15.0",
+  "version": "3.15.2",
   "description": "Configure CHT deployments",
   "main": "./src/lib/main.js",
   "engines": {

package/src/lib/convert-forms.js

@@ -3,7 +3,7 @@ const { execSync } = require('child_process');
 const argsFormFilter = require('./args-form-filter');
 const exec = require('./exec-promise');
 const fs = require('./sync-fs');
-const { getFormDir } = require('./forms-utils');
+const { getFormDir, escapeWhitespacesInPath } = require('./forms-utils');
 const { info, trace, warn } = require('./log');
 
 const XLS2XFORM = 'xls2xform-medic';
@@ -56,7 +56,8 @@ const execute = async (projectDir, subDirectory, options) => {
     const targetPath = `${fs.withoutExtension(originalSourcePath)}.xml`;
 
     info('Converting form', originalSourcePath, '…');
-    await xls2xform(sourcePath, targetPath);
+  
+    await xls2xform(escapeWhitespacesInPath(sourcePath), escapeWhitespacesInPath(targetPath));
     const hiddenFields = await getHiddenFields(`${fs.withoutExtension(originalSourcePath)}.properties.json`);
     await fixXml(targetPath, hiddenFields, options.transformer, options.enketo);
     trace('Converted form', originalSourcePath);

package/src/lib/forms-utils.js

@@ -95,4 +95,12 @@ module.exports = {
     xml.match(/<model>[^]*<\/model>/)[0]
       .match(/<instance>[^]*<\/instance>/)[0]
       .match(/id="([^"]*)"/)[1],
+
+  /**
+   * Escape whitespaces in a path.
+   * @param {string} path the path string
+   * @returns {string}
+   */
+  escapeWhitespacesInPath: path => path.replace(/(\s+)/g, '\\$1'),
+  
 };

package/src/lib/lineage-constraints.js

@@ -38,7 +38,7 @@ const lineageConstraints = async (repository, parentDoc) => {
 };
 
 /*
-Enforce the whitelist of allowed parents for each contact type
+Enforce the list of allowed parents for each contact type
 Ensure we are not creating a circular hierarchy
 */
 const getHierarchyViolations = (mapTypeToAllowedParents, contactDoc, parentDoc) => {

package/src/nools/target-emitter.js

@@ -23,10 +23,10 @@ function targetEmitter(targets, c, Utils, Target, emit) {
 
 function determineDate(targetConfig, Utils, c, r) {
   if (typeof targetConfig.date === 'function') {
-    return targetConfig.date(c, r);
+    return targetConfig.date(c, r) || Utils.now().getTime();
   }
 
-  if (targetConfig.date === undefined || targetConfig.date === 'now') {
+  if (targetConfig.date === undefined || targetConfig.date === null || targetConfig.date === 'now') {
     return Utils.now().getTime();
   }