fix: update getValueMatches to handle back-to-back separators

qawolf · Sep 11, 2020 · 3c94c7f · 3c94c7f
1 parent f0e5737
commit 3c94c7f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/src/web/isDynamic.ts b/src/web/isDynamic.ts
@@ -182,12 +182,14 @@ export const getValueMatches = (
       addMatchToList();
     } else if (tokenType === 'static' && lastTokenType === 'dynamic') {
       // When we start a new static block after a dynamic block, reset the current
-      // block string, and potentially add the previous split character to it.
-      const lastCharOfPreviousBlock = value[currentPosition - 1];
-      if (SPLIT_CHARACTERS.includes(lastCharOfPreviousBlock)) {
-        currentStaticBlock = lastCharOfPreviousBlock;
-      } else {
-        currentStaticBlock = '';
+      // block string, and potentially add all preceding split characters to it.
+      currentStaticBlock = '';
+      let backwardPosition = currentPosition - 1;
+      let previousCharacter = value[backwardPosition];
+      while (SPLIT_CHARACTERS.includes(previousCharacter)) {
+        if (tokenType === 'static') currentStaticBlock = previousCharacter + currentStaticBlock;
+        backwardPosition -= 1;
+        previousCharacter = value[backwardPosition];
       }
     }
 
@@ -201,11 +203,12 @@ export const getValueMatches = (
     // Keep track of where we are in the original value string
     currentPosition += token.length;
 
-    // Add back in the split-by character
-    const nextCharacter = value[currentPosition];
-    if (SPLIT_CHARACTERS.includes(nextCharacter)) {
+    // Add back in any split-by characters
+    let nextCharacter = value[currentPosition];
+    while (SPLIT_CHARACTERS.includes(nextCharacter)) {
       if (tokenType === 'static') currentStaticBlock += nextCharacter;
       currentPosition += 1;
+      nextCharacter = value[currentPosition];
     }
 
     lastTokenType = tokenType;

diff --git a/test/web/isDynamic.test.ts b/test/web/isDynamic.test.ts
@@ -144,7 +144,7 @@ describe('getValueMatches', () => {
   });
 
   test('multiple matches', () => {
-    const matches = getValueMatches('input-25-red-bj84jd9-_-lastName');
+    const matches = getValueMatches('input-25-red--bj84jd9-_-lastName');
     expect(matches).toMatchInlineSnapshot(`
       Array [
         Object {
@@ -154,15 +154,15 @@ describe('getValueMatches', () => {
           "type": "startsWith",
         },
         Object {
-          "match": "-red-",
+          "match": "-red--",
           "operator": "*=",
           "startPosition": 8,
           "type": "contains",
         },
         Object {
-          "match": "-lastName",
+          "match": "-_-lastName",
           "operator": "$=",
-          "startPosition": 20,
+          "startPosition": 21,
           "type": "endsWith",
         },
       ]