@jsenv/core 32.0.0 → 32.1.0

package/dist/js/v8_coverage.js

@@ -225,11 +225,14 @@ const applyMatching = (pattern, string) => {
       let skipAllowed = true;
       if (remainingPattern[0] === "/") {
         consumePattern(1); // consumes "/"
+        // when remainingPattern was preceeded by "**/"
+        // and remainingString have no "/"
+        // then skip is not allowed, a regular match will be performed
         if (!remainingString.includes("/")) {
           skipAllowed = false;
         }
       }
-      // pattern ending with "**" or "**/" always match remaining string
+      // pattern ending with "**" or "**/" match remaining string
       if (remainingPattern === "") {
         consumeRemainingString();
         return true;
@@ -250,7 +253,7 @@ const applyMatching = (pattern, string) => {
     if (remainingPattern[0] === "*") {
       consumePattern(1); // consumes "*"
       if (remainingPattern === "") {
-        // matches everything except '/'
+        // matches everything except "/"
         const slashIndex = remainingString.indexOf("/");
         if (slashIndex === -1) {
           groups.push({
@@ -304,6 +307,18 @@ const skipUntilMatch = ({
   let index = 0;
   let remainingString = string;
   let longestAttemptRange = null;
+  let isLastAttempt = false;
+  const failure = () => {
+    return {
+      matched: false,
+      patternIndex: longestAttemptRange.patternIndex,
+      index: longestAttemptRange.index + longestAttemptRange.length,
+      groups: longestAttemptRange.groups,
+      group: {
+        string: string.slice(0, longestAttemptRange.index)
+      }
+    };
+  };
   const tryToMatch = () => {
     const matchAttempt = applyMatching(pattern, remainingString);
     if (matchAttempt.matched) {
@@ -327,30 +342,26 @@ const skipUntilMatch = ({
     if (!longestAttemptRange || longestAttemptRange.length < attemptRange.length) {
       longestAttemptRange = attemptRange;
     }
+    if (isLastAttempt) {
+      return failure();
+    }
     const nextIndex = attemptIndex + 1;
-    let canSkip;
     if (nextIndex >= remainingString.length) {
-      canSkip = false;
-    } else if (remainingString[0] === "/" && !canSkipSlash) {
-      canSkip = false;
-    } else {
-      canSkip = true;
+      return failure();
     }
-    if (canSkip) {
-      // search against the next unattempted string
-      index += nextIndex;
-      remainingString = remainingString.slice(nextIndex);
-      return tryToMatch();
-    }
-    return {
-      matched: false,
-      patternIndex: longestAttemptRange.patternIndex,
-      index: longestAttemptRange.index + longestAttemptRange.length,
-      groups: longestAttemptRange.groups,
-      group: {
-        string: string.slice(0, longestAttemptRange.index)
+    if (remainingString[0] === "/") {
+      if (!canSkipSlash) {
+        return failure();
       }
-    };
+      // when it's the last slash, the next attempt is the last
+      if (remainingString.indexOf("/", 1) === -1) {
+        isLastAttempt = true;
+      }
+    }
+    // search against the next unattempted string
+    index += nextIndex;
+    remainingString = remainingString.slice(nextIndex);
+    return tryToMatch();
   };
   return tryToMatch();
 };