cht-conf 6.5.1 → 6.5.2

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [6.5.2](https://github.com/medic/cht-conf/compare/v6.5.1...v6.5.2) (2026-08-10)
+
+
+### Bug Fixes
+
+* **#832:** fix contact form xml parsing when init has sub-group ([#835](https://github.com/medic/cht-conf/issues/835)) ([e4a11ce](https://github.com/medic/cht-conf/commit/e4a11ced5a48019718299600a122fcd70067b38a))
+
 ## [6.5.1](https://github.com/medic/cht-conf/compare/v6.5.0...v6.5.1) (2026-07-15)
 
 

package/package.json

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

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

@@ -2,6 +2,23 @@ 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 { getNode, XPATH_BODY } = require('../lib/forms-utils');
+
+const getBodyGroup = (xmlDoc, ref) => getNode(xmlDoc, `${XPATH_BODY}//group[@ref="${ref}"]`);
+
+/**
+ * Renders the contact fields on the init page instead of on a page of their own, by making the
+ * <contact> body group the last child of the <init> group. Only the body group is moved: the
+ * contact data must stay at /data/contact for the webapp to save the doc correctly.
+ */
+const moveContactGroupIntoInit = (xmlDoc) => {
+  const initGroup = getBodyGroup(xmlDoc, '/data/init');
+  const contactGroup = getBodyGroup(xmlDoc, '/data/contact');
+
+  if (initGroup && contactGroup) {
+    initGroup.appendChild(contactGroup);
+  }
+};
 
 const convertContactForm = (forms) => {
   const dir = `${environment.pathToProject}/${CONTACT_FORMS_PATH}`;
@@ -20,6 +37,7 @@ const convertContactForm = (forms) => {
   return convertForms(environment.pathToProject, 'contact', {
     enketo: true,
     forms: forms,
+    domTransformer: moveContactGroupIntoInit,
     transformer: (xml, path) => {
       const type = path.replace(/.*\/(.*?)(-(create|edit))?\.xml.swp$/, '$1');
 
@@ -60,27 +78,6 @@ const convertContactForm = (forms) => {
         }
       }
 
-      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 (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;
     },
   });

package/src/lib/convert-forms/index.js

@@ -53,7 +53,7 @@ const execute = async (projectDir, subDirectory, options = {}) => {
     try {
       await xls2xform(escapeWhitespacesInPath(sourcePath), escapeWhitespacesInPath(xmlSwpPath), xls);
       const hiddenFields = await getHiddenFields(`${fs.withoutExtension(sourcePath)}.properties.json`);
-      fixXml(xmlSwpPath, hiddenFields, options.transformer, options.enketo);
+      fixXml(xmlSwpPath, hiddenFields, options);
     } catch (e) {
       nodeFs.rmSync(xmlSwpPath, { force: true });
       throw e;
@@ -123,7 +123,7 @@ const xls2xform = async (sourcePath, targetPath, xlsxFileName) => {
 
 // here we fix the form content in arcane ways.  Seeing as we have out own fork
 // of pyxform, we should probably be doing this fixing there.
-const fixXml = (path, hiddenFields, transformer, enketo) => {
+const fixXml = (path, hiddenFields, { transformer, domTransformer, enketo } = {}) => {
   // This is not how you should modify XML, but we have reasonable control over
   // the input and so far this works OK.  Keep an eye on the tests, and any
   // future changes to the output of xls2xform.
@@ -159,6 +159,10 @@ const fixXml = (path, hiddenFields, transformer, enketo) => {
   addRepeatCount(xmlDoc);
   handleDbDocRefs(xmlDoc);
 
+  if (domTransformer) {
+    domTransformer(xmlDoc, path);
+  }
+
   const xmlString = serializer.serializeToString(xmlDoc);
   xml = xmlFormat(xmlString, {
     collapseContent: true,