@openmrs/esm-form-engine-lib 4.1.1-pre.2348 → 4.1.1-pre.2355

package/dist/components/repeat/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/components/repeat/helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,aAoD7F;AAED,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,UAQjG;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,EAAE,MAAM,WAM7E"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/components/repeat/helpers.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,aAoD7F;AAED,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,UAajG;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,OAAO,EAAE,MAAM,WAM7E"}

package/dist/components/repeat/helpers.js

@@ -45,15 +45,16 @@ export function cloneRepeatField(srcField, value, idSuffix) {
     return clonedField;
 }
 export function updateFieldIdInExpression(expression, index, questionIds) {
-    let uniqueQuestionIds = [
+    const uniqueQuestionIds = [
         ...new Set(questionIds)
     ];
-    uniqueQuestionIds.forEach((id)=>{
-        if (expression.match(id)) {
-            expression = expression.replace(new RegExp(id, 'g'), `${id}_${index}`);
-        }
-    });
-    return expression;
+    if (!uniqueQuestionIds.length) {
+        return expression;
+    }
+    // Sort by length desc so longer ids are tried before their shorter prefixes (e.g. `status_code` before `status`).
+    // Word boundaries keep the match from landing inside a longer identifier; regex metachars in ids are escaped.
+    const pattern = uniqueQuestionIds.slice().sort((a, b)=>b.length - a.length).map((id)=>id.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')).join('|');
+    return expression.replace(new RegExp(`\\b(?:${pattern})\\b`, 'g'), (match)=>`${match}_${index}`);
 }
 export function disableRepeatAddButton(limit, counter) {
     const repeatLimit = Number(limit);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-form-engine-lib",
-  "version": "4.1.1-pre.2348",
+  "version": "4.1.1-pre.2355",
   "description": "React Form Engine for O3",
   "main": "dist/index.js",
   "module": "dist/index.js",

package/src/components/repeat/helpers.ts

@@ -59,13 +59,18 @@ export function cloneRepeatField(srcField: FormField, value: OpenmrsResource, id
 }
 
 export function updateFieldIdInExpression(expression: string, index: number, questionIds: string[]) {
-  let uniqueQuestionIds = [...new Set(questionIds)];
-  uniqueQuestionIds.forEach((id) => {
-    if (expression.match(id)) {
-      expression = expression.replace(new RegExp(id, 'g'), `${id}_${index}`);
-    }
-  });
-  return expression;
+  const uniqueQuestionIds = [...new Set(questionIds)];
+  if (!uniqueQuestionIds.length) {
+    return expression;
+  }
+  // Sort by length desc so longer ids are tried before their shorter prefixes (e.g. `status_code` before `status`).
+  // Word boundaries keep the match from landing inside a longer identifier; regex metachars in ids are escaped.
+  const pattern = uniqueQuestionIds
+    .slice()
+    .sort((a, b) => b.length - a.length)
+    .map((id) => id.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'))
+    .join('|');
+  return expression.replace(new RegExp(`\\b(?:${pattern})\\b`, 'g'), (match) => `${match}_${index}`);
 }
 
 export function disableRepeatAddButton(limit: string | number, counter: number) {