@astrojs/cloudflare 11.0.5 → 11.1.0

package/dist/utils/generate-routes-json.js

@@ -96,6 +96,28 @@ class PathTrie {
             this.dfs(childNode, [...path, segment], allPaths);
         }
     }
+    /**
+     * The reduce function is used to remove unnecessary paths from the trie.
+     * It receives a trie node to compare with the current node.
+     */
+    reduce(compNode, node) {
+        if (node.hasWildcardChild || compNode.hasWildcardChild)
+            return;
+        for (const [segment, childNode] of node.children) {
+            if (childNode.children.size === 0)
+                continue;
+            const compChildNode = compNode.children.get(segment);
+            if (compChildNode === undefined) {
+                childNode.hasWildcardChild = true;
+                continue;
+            }
+            this.reduce(compChildNode, childNode);
+        }
+    }
+    reduceAllPaths(compTrie) {
+        this.reduce(compTrie.root, this.root);
+        return this;
+    }
     getAllPaths() {
         const allPaths = [];
         this.dfs(this.root, [], allPaths);
@@ -181,7 +203,6 @@ export async function createRoutesFile(_config, logger, routes, pages, redirects
     for (const includePath of includePaths) {
         includeTrie.insert(includePath);
     }
-    const [deduplicatedIncludePaths, includedPathsHaveWildcard] = includeTrie.getAllPaths();
     const excludeTrie = new PathTrie();
     for (const excludePath of excludePaths) {
         /**
@@ -193,7 +214,12 @@ export async function createRoutesFile(_config, logger, routes, pages, redirects
             continue;
         excludeTrie.insert(excludePath);
     }
-    const [deduplicatedExcludePaths, _excludedPathsHaveWildcard] = excludeTrie.getAllPaths();
+    const [deduplicatedIncludePaths, includedPathsHaveWildcard] = includeTrie
+        .reduceAllPaths(excludeTrie)
+        .getAllPaths();
+    const [deduplicatedExcludePaths, _excludedPathsHaveWildcard] = excludeTrie
+        .reduceAllPaths(includeTrie)
+        .getAllPaths();
     /**
      * Cloudflare allows no more than 100 include/exclude rules combined
      * https://developers.cloudflare.com/pages/functions/routing/#limits

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@astrojs/cloudflare",
   "description": "Deploy your site to Cloudflare Workers/Pages",
-  "version": "11.0.5",
+  "version": "11.1.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "author": "withastro",
@@ -51,8 +51,8 @@
     "rollup": "^4.21.3",
     "strip-ansi": "^7.1.0",
     "vite": "^5.4.6",
-    "@astrojs/test-utils": "0.0.1",
-    "astro-scripts": "0.0.14"
+    "astro-scripts": "0.0.14",
+    "@astrojs/test-utils": "0.0.1"
   },
   "publishConfig": {
     "provenance": true