piral-core 1.6.2-beta.7367 → 1.6.2-beta.7393

package/lib/utils/routes.js

@@ -1,5 +1,103 @@
-import ptr from 'path-to-regexp';
+const defaultDelimiter = escapeString('/');
+const pathExpr = new RegExp([
+    '(\\\\.)',
+    '([\\/.])?(?:(?:\\:(\\w+)(?:\\(((?:\\\\.|[^\\\\()])+)\\))?|\\(((?:\\\\.|[^\\\\()])+)\\))([+*?])?|(\\*))',
+].join('|'), 'g');
+function escapeString(str) {
+    return str.replace(/([.+*?=^!:${}()[\]|\/\\])/g, '\\$1');
+}
+function escapeGroup(group) {
+    return group.replace(/([=!:$\/()])/g, '\\$1');
+}
+function parse(str) {
+    const tokens = [];
+    let key = 0;
+    let index = 0;
+    let path = '';
+    let res;
+    while ((res = pathExpr.exec(str)) !== null) {
+        const m = res[0];
+        const escaped = res[1];
+        const offset = res.index;
+        path += str.slice(index, offset);
+        index = offset + m.length;
+        // Ignore already escaped sequences.
+        if (escaped) {
+            path += escaped[1];
+            continue;
+        }
+        const next = str[index];
+        const prefix = res[2];
+        const name = res[3];
+        const capture = res[4];
+        const group = res[5];
+        const modifier = res[6];
+        const asterisk = res[7];
+        // Push the current path onto the tokens.
+        if (path) {
+            tokens.push(path);
+            path = '';
+        }
+        const partial = prefix != null && next != null && next !== prefix;
+        const repeat = modifier === '+' || modifier === '*';
+        const optional = modifier === '?' || modifier === '*';
+        const delimiter = res[2] || '/';
+        const pattern = capture || group;
+        tokens.push({
+            name: name || `${key++}`,
+            prefix: prefix || '',
+            delimiter,
+            optional,
+            repeat,
+            partial,
+            asterisk: !!asterisk,
+            pattern: pattern ? escapeGroup(pattern) : asterisk ? '.*' : '[^' + escapeString(delimiter) + ']+?',
+        });
+    }
+    // Match any characters still remaining.
+    if (index < str.length) {
+        path += str.substring(index);
+    }
+    // If the path exists, push it onto the end.
+    if (path) {
+        tokens.push(path);
+    }
+    return tokens;
+}
+function tokensToRegExp(tokens) {
+    let route = '';
+    for (const token of tokens) {
+        if (typeof token === 'string') {
+            route += escapeString(token);
+        }
+        else {
+            const prefix = escapeString(token.prefix);
+            let capture = '(?:' + token.pattern + ')';
+            if (token.repeat) {
+                capture += '(?:' + prefix + capture + ')*';
+            }
+            if (token.optional) {
+                if (!token.partial) {
+                    capture = '(?:' + prefix + '(' + capture + '))?';
+                }
+                else {
+                    capture = prefix + '(' + capture + ')?';
+                }
+            }
+            else {
+                capture = prefix + '(' + capture + ')';
+            }
+            route += capture;
+        }
+    }
+    const endsWithDelimiter = route.slice(-defaultDelimiter.length) === defaultDelimiter;
+    const path = endsWithDelimiter ? route.slice(0, -defaultDelimiter.length) : route;
+    return new RegExp(`^${path}(?:${defaultDelimiter}(?=$))?$`, 'i');
+}
+function stringToRegexp(path) {
+    return tokensToRegExp(parse(path));
+}
 export function createRouteMatcher(path) {
-    return ptr(path);
+    return stringToRegexp(path);
 }
 //# sourceMappingURL=routes.js.map

package/lib/utils/routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/utils/routes.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,gBAAgB,CAAC;AAEjC,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC;AACnB,CAAC"}
+{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../src/utils/routes.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-core",
-  "version": "1.6.2-beta.7367",
+  "version": "1.6.2-beta.7393",
   "description": "The core library for creating a Piral instance.",
   "keywords": [
     "portal",
@@ -61,9 +61,8 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "path-to-regexp": "^1.8.0",
-    "piral-base": "1.6.2-beta.7367",
-    "piral-debug-utils": "1.6.2-beta.7367",
+    "piral-base": "1.6.2-beta.7393",
+    "piral-debug-utils": "1.6.2-beta.7393",
     "zustand": "^3.0.0"
   },
   "devDependencies": {
@@ -83,5 +82,5 @@
     "react-router-dom",
     "tslib"
   ],
-  "gitHead": "8d7ec61c81bdc200aad2233e8b01f41f9f63264b"
+  "gitHead": "75d596d714a582f54071e1799e0ce183dbacbb09"
 }

package/src/utils/routes.ts

@@ -1,5 +1,135 @@
-import ptr from 'path-to-regexp';
+const defaultDelimiter = escapeString('/');
+const pathExpr = new RegExp(
+  [
+    '(\\\\.)',
+    '([\\/.])?(?:(?:\\:(\\w+)(?:\\(((?:\\\\.|[^\\\\()])+)\\))?|\\(((?:\\\\.|[^\\\\()])+)\\))([+*?])?|(\\*))',
+  ].join('|'),
+  'g',
+);
+
+function escapeString(str: string) {
+  return str.replace(/([.+*?=^!:${}()[\]|\/\\])/g, '\\$1');
+}
+
+function escapeGroup(group: string) {
+  return group.replace(/([=!:$\/()])/g, '\\$1');
+}
+
+type Token =
+  | string
+  | {
+      name: string;
+      prefix: string;
+      delimiter: string;
+      optional: boolean;
+      repeat: boolean;
+      partial: boolean;
+      asterisk: boolean;
+      pattern: string;
+    };
+
+function parse(str: string) {
+  const tokens: Array<Token> = [];
+  let key = 0;
+  let index = 0;
+  let path = '';
+  let res: RegExpExecArray;
+
+  while ((res = pathExpr.exec(str)) !== null) {
+    const m = res[0];
+    const escaped = res[1];
+    const offset = res.index;
+    path += str.slice(index, offset);
+    index = offset + m.length;
+
+    // Ignore already escaped sequences.
+    if (escaped) {
+      path += escaped[1];
+      continue;
+    }
+
+    const next = str[index];
+    const prefix = res[2];
+    const name = res[3];
+    const capture = res[4];
+    const group = res[5];
+    const modifier = res[6];
+    const asterisk = res[7];
+
+    // Push the current path onto the tokens.
+    if (path) {
+      tokens.push(path);
+      path = '';
+    }
+
+    const partial = prefix != null && next != null && next !== prefix;
+    const repeat = modifier === '+' || modifier === '*';
+    const optional = modifier === '?' || modifier === '*';
+    const delimiter = res[2] || '/';
+    const pattern = capture || group;
+
+    tokens.push({
+      name: name || `${key++}`,
+      prefix: prefix || '',
+      delimiter,
+      optional,
+      repeat,
+      partial,
+      asterisk: !!asterisk,
+      pattern: pattern ? escapeGroup(pattern) : asterisk ? '.*' : '[^' + escapeString(delimiter) + ']+?',
+    });
+  }
+
+  // Match any characters still remaining.
+  if (index < str.length) {
+    path += str.substring(index);
+  }
+
+  // If the path exists, push it onto the end.
+  if (path) {
+    tokens.push(path);
+  }
+
+  return tokens;
+}
+
+function tokensToRegExp(tokens: Array<Token>) {
+  let route = '';
+
+  for (const token of tokens) {
+    if (typeof token === 'string') {
+      route += escapeString(token);
+    } else {
+      const prefix = escapeString(token.prefix);
+      let capture = '(?:' + token.pattern + ')';
+
+      if (token.repeat) {
+        capture += '(?:' + prefix + capture + ')*';
+      }
+
+      if (token.optional) {
+        if (!token.partial) {
+          capture = '(?:' + prefix + '(' + capture + '))?';
+        } else {
+          capture = prefix + '(' + capture + ')?';
+        }
+      } else {
+        capture = prefix + '(' + capture + ')';
+      }
+
+      route += capture;
+    }
+  }
+
+  const endsWithDelimiter = route.slice(-defaultDelimiter.length) === defaultDelimiter;
+  const path = endsWithDelimiter ? route.slice(0, -defaultDelimiter.length) : route;
+  return new RegExp(`^${path}(?:${defaultDelimiter}(?=$))?$`, 'i');
+}
+
+function stringToRegexp(path: string) {
+  return tokensToRegExp(parse(path));
+}
 
 export function createRouteMatcher(path: string): RegExp {
-  return ptr(path);
+  return stringToRegexp(path);
 }