fix router bug, rmv types

sjc5 · Oct 24, 2023 · 8921292 · 8921292
1 parent c230da3
commit 8921292
Show file tree

Hide file tree

Showing 20 changed files with 51 additions and 361 deletions.
diff --git a/.changeset/early-readers-rule.md b/.changeset/early-readers-rule.md
diff --git a/.changeset/famous-adults-push.md b/.changeset/famous-adults-push.md
diff --git a/.changeset/large-worms-sparkle.md b/.changeset/large-worms-sparkle.md
diff --git a/.changeset/light-carpets-cough.md b/.changeset/light-carpets-cough.md
diff --git a/.changeset/neat-moles-brush.md b/.changeset/neat-moles-brush.md
diff --git a/.changeset/poor-phones-lie.md b/.changeset/poor-phones-lie.md
diff --git a/.changeset/pre.json b/.changeset/pre.json
diff --git a/.changeset/rude-kiwis-approve.md b/.changeset/rude-kiwis-approve.md
diff --git a/docs/tsconfig.json b/docs/tsconfig.json
@@ -9,8 +9,7 @@
     "skipLibCheck": true,
     "esModuleInterop": true,
     "jsx": "react-jsx",
-    "jsxImportSource": "hono/jsx",
-    "types": ["@hwy-js/dev"]
+    "jsxImportSource": "hono/jsx"
   },
   "exclude": ["node_modules", "dist"]
 }
diff --git a/packages/core/src/router/get-matching-path-data-internal.ts b/packages/core/src/router/get-matching-path-data-internal.ts
@@ -13,7 +13,28 @@ function get_matching_paths_internal(__paths: Array<SemiDecoratedPath>) {
       : x.realSegmentsLength;
 
     // make sure any remaining matches are not longer than the path itself
-    return x.segments.length <= index_adjusted_real_segments_length;
+    const should_move_on =
+      x.segments.length <= index_adjusted_real_segments_length;
+
+    if (!should_move_on) {
+      return false;
+    }
+
+    // now we need to remove ineligible indices
+    if (!x.isIndex) {
+      // if not an index, then you're already confirmed good
+      return true;
+    }
+
+    const truthy_segments_length = x.segments.filter((x) => x.segment).length;
+
+    const path_segments_length = x.path.split("/").filter(Boolean).length;
+
+    if (truthy_segments_length === path_segments_length) {
+      return true;
+    }
+
+    return false;
   });
 
   // if there are multiple matches, filter out the ultimate catch-all

diff --git a/packages/create-hwy/src/get-tsconfig.ts b/packages/create-hwy/src/get-tsconfig.ts
@@ -13,7 +13,6 @@ const ts_config = {
     esModuleInterop: true,
     jsx: "react-jsx",
     jsxImportSource: "hono/jsx",
-    types: ["@hwy-js/dev"],
   },
   exclude: ["node_modules", "dist"],
 };
@@ -22,15 +21,13 @@ const js_config = {
   compilerOptions: {
     jsx: "react-jsx",
     jsxImportSource: "hono/jsx",
-    types: ["@hwy-js/dev"],
   },
 };
 
 const deno_config = {
   compilerOptions: {
     jsx: "react-jsx",
     jsxImportSource: "npm:hono/jsx",
-    types: ["@hwy-js/dev"],
   },
 };
 
@@ -48,21 +45,17 @@ function get_ts_config(options: Options) {
     options.deployment_target === "vercel-lambda"
   ) {
     // @ts-ignore
-    ts_config.compilerOptions.types = ["@hwy-js/dev", "node"];
+    ts_config.compilerOptions.types = ["node"];
   }
 
   if (options.deployment_target === "bun") {
     // @ts-ignore
-    ts_config.compilerOptions.types = ["@hwy-js/dev", "bun-types"];
+    ts_config.compilerOptions.types = ["bun-types"];
   }
 
   if (options.deployment_target === "cloudflare-pages") {
     // @ts-ignore
-    ts_config.compilerOptions.types = [
-      "@hwy-js/dev",
-      "@cloudflare/workers-types",
-      "node",
-    ];
+    ts_config.compilerOptions.types = ["@cloudflare/workers-types", "node"];
   }
 
   return JSON.stringify(ts_config).trim() + "\n";