fixed: falsely detects nested repeats for sibling repeats where one r…

…epeat nodeName starts with the nodeName of another repeat, OpenClinica/enketo-express-oc#260
enketo · Nov 7, 2019 · da785bc · da785bc
1 parent e83e371
commit da785bc
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+[Unreleased]
+---------------------
+##### Fixed
+- Falsely detects nested repeats for sibling repeats where one repeat nodeName starts with the nodeName of another repeat.
+
 [1.8.1] - 2019-11-06
 ---------------------
 ##### Changed

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![coverage-shield-badge-1](https://img.shields.io/badge/coverage-97.64%25-brightgreen.svg)
+![coverage-shield-badge-1](https://img.shields.io/badge/coverage-97.65%25-brightgreen.svg)
 [![npm version](https://badge.fury.io/js/enketo-validate.svg)](http://badge.fury.io/js/enketo-validate) [![Build Status](https://travis-ci.org/enketo/enketo-validate.svg?branch=master)](https://travis-ci.org/enketo/enketo-validate) [![Dependency Status](https://david-dm.org/enketo/enketo-validate/status.svg)](https://david-dm.org/enketo/enketo-validate) [![devDependency Status](https://david-dm.org/enketo/enketo-validate/dev-status.svg)](https://david-dm.org/enketo/enketo-validate?type=dev)
 
 Enketo Validate

diff --git a/src/xform.js b/src/xform.js
@@ -320,7 +320,7 @@ class XForm {
             this.repeats.reverse().forEach( repeat => {
                 const nodeset = repeat.getAttribute( 'nodeset' );
                 // This check will fail if relative nodesets are used (not supported in Enketo any more).
-                if ( repeatPaths.some( repeatPath => repeatPath.startsWith( nodeset ) ) ) {
+                if ( repeatPaths.some( repeatPath => repeatPath.startsWith( nodeset + '/' ) ) ) {
                     const name = nodeset.substring( nodeset.lastIndexOf( '/' ) + 1 );
                     warnings.push( `Repeat "${name}" contains a nested repeat. This not recommended.` );
                 }

diff --git a/test/xform/nested-repeats.xml b/test/xform/nested-repeats.xml
@@ -25,6 +25,12 @@
                         </group>
                     </kids>
                     <gps/>
+                    <repeat jr:template="">
+                        <b/>
+                    </repeat>
+                    <repeat-confusion jr:template="">
+                        <a/>
+                    </repeat-confusion>
                     <orx:meta>
                         <orx:instanceID/>
                     </orx:meta>
@@ -77,5 +83,20 @@
                 </input>
             </group>
         </group>
+        <group ref="/data/repeat">
+            <repeat nodeset="/data/repeat">
+                <input ref="/data/repeat/a">
+                    <label>a</label>
+                </input>
+            </repeat>
+        </group>
+        <!-- not a nested repeat, but in the past was identified as one -->
+        <group ref="/data/repeat-confusion">
+            <repeat nodeset="/data/repeat-confusion">
+                <input ref="/data/repeat-confusion/b">
+                    <label>a</label>
+                </input>
+            </repeat>
+        </group>
     </h:body>
 </h:html>