@sitecore-jss/sitecore-jss-nextjs 22.4.0-canary.5 → 22.4.0-canary.6

package/dist/cjs/middleware/redirects-middleware.js

@@ -159,13 +159,13 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
             return modifyRedirects.length
                 ? modifyRedirects.find((redirect) => {
                     // Modify the redirect pattern to ignore the language prefix in the path
-                    redirect.pattern = redirect.pattern.replace(RegExp(`^[^]?/${language}/`, 'gi'), '');
+                    // And escapes non-special "?" characters in a string or regex.
+                    redirect.pattern = this.escapeNonSpecialQuestionMarks(redirect.pattern.replace(RegExp(`^[^]?/${language}/`, 'gi'), ''));
                     // Prepare the redirect pattern as a regular expression, making it more flexible for matching URLs
                     redirect.pattern = `/^\/${redirect.pattern
                         .replace(/^\/|\/$/g, '') // Removes leading and trailing slashes
                         .replace(/^\^\/|\/\$$/g, '') // Removes unnecessary start (^) and end ($) anchors
                         .replace(/^\^|\$$/g, '') // Further cleans up anchors
-                        .replace(/(?<!\\)\?/g, '\\?') // Escapes question marks in the pattern
                         .replace(/\$\/gi$/g, '')}[\/]?$/i`; // Ensures the pattern allows an optional trailing slash
                     /**
                      * This line checks whether the current URL query string (and all its possible permutations)
@@ -288,5 +288,45 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
             (0, regex_parser_1.default)(pattern).test(`/${locale}${normalizedPath}${query}`),
         ].some(Boolean));
     }
+    /**
+     * Escapes non-special "?" characters in a string or regex.
+     *
+     * - For regular strings, it escapes all unescaped "?" characters by adding a backslash (`\`).
+     * - For regex patterns (strings enclosed in `/.../`), it analyzes each "?" to determine if it has special meaning
+     *   (e.g., `?` in `(abc)?`, `.*?`) or is just a literal character. Only literal "?" characters are escaped.
+     * @param {string} input - The input string or regex pattern.
+     * @returns {string} - The modified string or regex with non-special "?" characters escaped.
+     **/
+    escapeNonSpecialQuestionMarks(input) {
+        const regexPattern = /(?<!\\)\?/g; // Find unescaped "?" characters
+        const isRegex = input.startsWith('/') && input.endsWith('/'); // Check if the string is a regex
+        if (!isRegex) {
+            // If not a regex, escape all unescaped "?" characters
+            return input.replace(regexPattern, '\\?');
+        }
+        // If it's a regex, analyze each "?" character
+        let result = '';
+        let lastIndex = 0;
+        let match;
+        while ((match = regexPattern.exec(input)) !== null) {
+            const index = match.index; // Position of "?" in the string
+            const before = input.slice(0, index).replace(/\s+$/, ''); // Context before "?"
+            const lastChar = before.slice(-1); // Last character before "?"
+            // Determine if the "?" is a special regex symbol
+            const isSpecialRegexSymbol = /[\.\*\+\)\[\]]$/.test(lastChar);
+            if (isSpecialRegexSymbol) {
+                // If it's special, keep it as is
+                result += input.slice(lastIndex, index + 1);
+            }
+            else {
+                // If it's not special, escape it
+                result += input.slice(lastIndex, index) + '\\?';
+            }
+            lastIndex = index + 1;
+        }
+        // Append the remaining part of the string
+        result += input.slice(lastIndex);
+        return result;
+    }
 }
 exports.RedirectsMiddleware = RedirectsMiddleware;

package/dist/esm/middleware/redirects-middleware.js

@@ -153,13 +153,13 @@ export class RedirectsMiddleware extends MiddlewareBase {
             return modifyRedirects.length
                 ? modifyRedirects.find((redirect) => {
                     // Modify the redirect pattern to ignore the language prefix in the path
-                    redirect.pattern = redirect.pattern.replace(RegExp(`^[^]?/${language}/`, 'gi'), '');
+                    // And escapes non-special "?" characters in a string or regex.
+                    redirect.pattern = this.escapeNonSpecialQuestionMarks(redirect.pattern.replace(RegExp(`^[^]?/${language}/`, 'gi'), ''));
                     // Prepare the redirect pattern as a regular expression, making it more flexible for matching URLs
                     redirect.pattern = `/^\/${redirect.pattern
                         .replace(/^\/|\/$/g, '') // Removes leading and trailing slashes
                         .replace(/^\^\/|\/\$$/g, '') // Removes unnecessary start (^) and end ($) anchors
                         .replace(/^\^|\$$/g, '') // Further cleans up anchors
-                        .replace(/(?<!\\)\?/g, '\\?') // Escapes question marks in the pattern
                         .replace(/\$\/gi$/g, '')}[\/]?$/i`; // Ensures the pattern allows an optional trailing slash
                     /**
                      * This line checks whether the current URL query string (and all its possible permutations)
@@ -282,4 +282,44 @@ export class RedirectsMiddleware extends MiddlewareBase {
             regexParser(pattern).test(`/${locale}${normalizedPath}${query}`),
         ].some(Boolean));
     }
+    /**
+     * Escapes non-special "?" characters in a string or regex.
+     *
+     * - For regular strings, it escapes all unescaped "?" characters by adding a backslash (`\`).
+     * - For regex patterns (strings enclosed in `/.../`), it analyzes each "?" to determine if it has special meaning
+     *   (e.g., `?` in `(abc)?`, `.*?`) or is just a literal character. Only literal "?" characters are escaped.
+     * @param {string} input - The input string or regex pattern.
+     * @returns {string} - The modified string or regex with non-special "?" characters escaped.
+     **/
+    escapeNonSpecialQuestionMarks(input) {
+        const regexPattern = /(?<!\\)\?/g; // Find unescaped "?" characters
+        const isRegex = input.startsWith('/') && input.endsWith('/'); // Check if the string is a regex
+        if (!isRegex) {
+            // If not a regex, escape all unescaped "?" characters
+            return input.replace(regexPattern, '\\?');
+        }
+        // If it's a regex, analyze each "?" character
+        let result = '';
+        let lastIndex = 0;
+        let match;
+        while ((match = regexPattern.exec(input)) !== null) {
+            const index = match.index; // Position of "?" in the string
+            const before = input.slice(0, index).replace(/\s+$/, ''); // Context before "?"
+            const lastChar = before.slice(-1); // Last character before "?"
+            // Determine if the "?" is a special regex symbol
+            const isSpecialRegexSymbol = /[\.\*\+\)\[\]]$/.test(lastChar);
+            if (isSpecialRegexSymbol) {
+                // If it's special, keep it as is
+                result += input.slice(lastIndex, index + 1);
+            }
+            else {
+                // If it's not special, escape it
+                result += input.slice(lastIndex, index) + '\\?';
+            }
+            lastIndex = index + 1;
+        }
+        // Append the remaining part of the string
+        result += input.slice(lastIndex);
+        return result;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-nextjs",
-  "version": "22.4.0-canary.5",
+  "version": "22.4.0-canary.6",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -73,9 +73,9 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^22.4.0-canary.5",
-    "@sitecore-jss/sitecore-jss-dev-tools": "^22.4.0-canary.5",
-    "@sitecore-jss/sitecore-jss-react": "^22.4.0-canary.5",
+    "@sitecore-jss/sitecore-jss": "^22.4.0-canary.6",
+    "@sitecore-jss/sitecore-jss-dev-tools": "^22.4.0-canary.6",
+    "@sitecore-jss/sitecore-jss-react": "^22.4.0-canary.6",
     "@vercel/kv": "^0.2.1",
     "prop-types": "^15.8.1",
     "regex-parser": "^2.2.11",
@@ -83,7 +83,7 @@
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "3b5b7802c66adebfc32ffce00ad32cbf4f6657ee",
+  "gitHead": "7b4705679a487ac6a21b5a53a55cdb5da5c20904",
   "files": [
     "dist",
     "types",

package/types/middleware/redirects-middleware.d.ts

@@ -65,4 +65,14 @@ export declare class RedirectsMiddleware extends MiddlewareBase {
      * @returns {string | undefined} - return query string if any of the query permutations match the provided pattern, undefined otherwise.
      */
     private isPermutedQueryMatch;
+    /**
+     * Escapes non-special "?" characters in a string or regex.
+     *
+     * - For regular strings, it escapes all unescaped "?" characters by adding a backslash (`\`).
+     * - For regex patterns (strings enclosed in `/.../`), it analyzes each "?" to determine if it has special meaning
+     *   (e.g., `?` in `(abc)?`, `.*?`) or is just a literal character. Only literal "?" characters are escaped.
+     * @param {string} input - The input string or regex pattern.
+     * @returns {string} - The modified string or regex with non-special "?" characters escaped.
+     **/
+    private escapeNonSpecialQuestionMarks;
 }