@vercel/microfrontends 1.0.1-canary.1 → 1.0.1-canary.3

package/dist/utils/mfe-port.js

@@ -240,16 +240,17 @@ var validateConfigPaths = (applicationConfigsById) => {
         const maybeError = validatePathExpression(path6);
         if (maybeError) {
           errors.push(maybeError);
-        }
-        const existing = pathsByApplicationId.get(path6);
-        if (existing) {
-          existing.applications.push(id);
         } else {
-          pathsByApplicationId.set(path6, {
-            applications: [id],
-            matcher: pathToRegexp2(path6),
-            applicationId: id
-          });
+          const existing = pathsByApplicationId.get(path6);
+          if (existing) {
+            existing.applications.push(id);
+          } else {
+            pathsByApplicationId.set(path6, {
+              applications: [id],
+              matcher: pathToRegexp2(path6),
+              applicationId: id
+            });
+          }
         }
       }
     }
@@ -289,26 +290,38 @@ var validateConfigPaths = (applicationConfigsById) => {
 };
 var PATH_DEFAULT_PATTERN = "[^\\/#\\?]+?";
 function validatePathExpression(path6) {
-  const tokens = parsePathRegexp(path6);
-  for (let i = 0; i < tokens.length; i++) {
-    const token = tokens[i];
-    if (token === void 0) {
-      return `token ${i} in ${path6} is undefined, this shouldn't happen`;
-    }
-    if (typeof token !== "string") {
-      if (token.pattern !== PATH_DEFAULT_PATTERN) {
-        return `Path ${path6} cannot use a regular expression wildcard`;
-      }
-      if (token.prefix !== "/") {
-        return `Wildcard :${token.name} must be immediately after a / in ${path6}`;
-      }
-      if (token.suffix) {
-        return `Wildcard suffix on :${token.name} is not allowed. Suffixes are not supported`;
+  try {
+    const tokens = parsePathRegexp(path6);
+    if (/(?<!\\)\{/.test(path6)) {
+      return `Optional paths are not supported: ${path6}`;
+    }
+    if (/(?<!\\|\()\?/.test(path6)) {
+      return `Optional paths are not supported: ${path6}`;
+    }
+    if (/\/[^/]*(?<!\\):[^/]*(?<!\\):[^/]*/.test(path6)) {
+      return `Only one wildcard is allowed per path segment: ${path6}`;
+    }
+    for (let i = 0; i < tokens.length; i++) {
+      const token = tokens[i];
+      if (token === void 0) {
+        return `token ${i} in ${path6} is undefined, this shouldn't happen`;
       }
-      if (token.modifier && i !== tokens.length - 1) {
-        return `Modifier ${token.modifier} is not allowed on wildcard :${token.name} in ${path6}. Modifiers are only allowed in the last path component`;
+      if (typeof token !== "string") {
+        if (token.pattern !== PATH_DEFAULT_PATTERN && // Allows (a|b|c) and ((?!a|b|c).*) regex
+        // Only limited regex is supported for now, due to performance considerations
+        !/^(?<allowed>[\w]+(?:\|[^|()]+)+)$|^\(\?!(?<disallowed>[\w]+(?:\|[^|()]+)+)\)\.\*$/.test(
+          token.pattern
+        )) {
+          return `Path ${path6} cannot use unsupported regular expression wildcard`;
+        }
+        if (token.modifier && i !== tokens.length - 1) {
+          return `Modifier ${token.modifier} is not allowed on wildcard :${token.name} in ${path6}. Modifiers are only allowed in the last path component`;
+        }
       }
     }
+  } catch (e) {
+    const message = e instanceof Error ? e.message : String(e);
+    return `Path ${path6} could not be parsed into regexp: ${message}`;
   }
   return void 0;
 }
@@ -662,12 +675,8 @@ var MicrofrontendConfigIsomorphic = class {
     const skipValidation = opts?.skipValidation ?? [];
     const c = typeof config === "string" ? parse(config) : config;
     if (isMainConfig(c)) {
-      if (!skipValidation.includes("paths")) {
-        validateConfigPaths(c.applications);
-      }
-      if (!skipValidation.includes("defaultApplication")) {
-        validateConfigDefaultApplication(c.applications);
-      }
+      validateConfigPaths(c.applications);
+      validateConfigDefaultApplication(c.applications);
       if (!skipValidation.includes("deprecatedFields")) {
         validateDeprecatedFields(c);
       }