@react-router/dev 0.0.0-experimental-208f173a8 → 0.0.0-experimental-8e9d8ef63

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-208f173a8
+ * @react-router/dev v0.0.0-experimental-8e9d8ef63
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -676,12 +676,55 @@ var init_paths = __esm({
   }
 });
 
+// typegen/params.ts
+function parse2(fullpath2) {
+  const result = {};
+  let segments = fullpath2.split("/");
+  segments.forEach((segment) => {
+    const match = segment.match(/^:([\w-]+)(\?)?/);
+    if (!match) return;
+    const param = match[1];
+    const isRequired = match[2] === void 0;
+    result[param] ||= isRequired;
+    return;
+  });
+  const hasSplat = segments.at(-1) === "*";
+  if (hasSplat) result["*"] = true;
+  return result;
+}
+var init_params = __esm({
+  "typegen/params.ts"() {
+    "use strict";
+  }
+});
+
+// typegen/route.ts
+function lineage(routes2, route) {
+  const result = [];
+  while (route) {
+    result.push(route);
+    if (!route.parentId) break;
+    route = routes2[route.parentId];
+  }
+  result.reverse();
+  return result;
+}
+function fullpath(lineage2) {
+  if (lineage2.length === 1 && lineage2[0].id === "root") return "/";
+  return "/" + lineage2.map((route) => route.path?.replace(/^\//, "")?.replace(/\/$/, "")).filter((path9) => path9 !== void 0 && path9 !== "").join("/");
+}
+var init_route = __esm({
+  "typegen/route.ts"() {
+    "use strict";
+  }
+});
+
 // typegen/generate.ts
 function generate2(ctx, route) {
-  const lineage = getRouteLineage(ctx.config.routes, route);
-  const urlpath = lineage.map((route2) => route2.path).join("/");
+  const lineage2 = lineage(ctx.config.routes, route);
+  const fullpath2 = fullpath(lineage2);
   const typesPath = getTypesPath(ctx, route);
-  const parents = lineage.slice(0, -1);
+  const parents = lineage2.slice(0, -1);
   const parentTypeImports = parents.map((parent, i) => {
     const rel = Path3.relative(
       Path3.dirname(typesPath),
@@ -708,7 +751,7 @@ function generate2(ctx, route) {
       file: "${route.file}"
       path: "${route.path}"
       params: {${formatParamProperties(
-    urlpath
+    fullpath2
   )}} & { [key: string]: string | undefined }
       module: Module
       loaderData: T.CreateLoaderData<Module>
@@ -737,46 +780,13 @@ function generate2(ctx, route) {
     }
   `;
 }
-function getRouteLineage(routes2, route) {
-  const result = [];
-  while (route) {
-    result.push(route);
-    if (!route.parentId) break;
-    route = routes2[route.parentId];
-  }
-  result.reverse();
-  return result;
-}
-function formatParamProperties(urlpath) {
-  const params = parseParams(urlpath);
-  const properties = Object.entries(params).map(([name, values]) => {
-    if (values.length === 1) {
-      const isOptional = values[0];
-      return isOptional ? `"${name}"?: string` : `"${name}": string`;
-    }
-    const items = values.map(
-      (isOptional) => isOptional ? "string | undefined" : "string"
-    );
-    return `"${name}": [${items.join(", ")}]`;
-  });
+function formatParamProperties(fullpath2) {
+  const params = parse2(fullpath2);
+  const properties = Object.entries(params).map(
+    ([name, isRequired]) => isRequired ? `"${name}": string` : `"${name}"?: string`
+  );
   return properties.join("; ");
 }
-function parseParams(urlpath) {
-  const result = {};
-  let segments = urlpath.split("/");
-  segments.forEach((segment) => {
-    const match = segment.match(/^:([\w-]+)(\?)?/);
-    if (!match) return;
-    const param = match[1];
-    const isOptional = match[2] !== void 0;
-    result[param] ??= [];
-    result[param].push(isOptional);
-    return;
-  });
-  const hasSplat = segments.at(-1) === "*";
-  if (hasSplat) result["*"] = [false];
-  return result;
-}
 var import_dedent, Path3, Pathe2, noExtension;
 var init_generate = __esm({
   "typegen/generate.ts"() {
@@ -785,6 +795,8 @@ var init_generate = __esm({
     Path3 = __toESM(require("pathe"));
     Pathe2 = __toESM(require("pathe/utils"));
     init_paths();
+    init_params();
+    init_route();
     noExtension = (path9) => Path3.join(Path3.dirname(path9), Pathe2.filename(path9));
   }
 });
@@ -861,11 +873,11 @@ function register(ctx) {
     t2.tsTypeLiteral(
       Object.values(ctx.config.routes).map((route) => {
         if (route.id !== "root" && !route.path) return void 0;
-        const lineage = getRouteLineage2(ctx.config.routes, route);
-        const fullpath = route.id === "root" ? "/" : lineage.map((route2) => route2.path).filter((path9) => path9 !== void 0).join("/");
-        const params = parseParams2(fullpath);
+        const lineage2 = lineage(ctx.config.routes, route);
+        const fullpath2 = fullpath(lineage2);
+        const params = parse2(fullpath2);
         return t2.tsPropertySignature(
-          t2.stringLiteral(fullpath),
+          t2.stringLiteral(fullpath2),
           t2.tsTypeAnnotation(
             t2.tsTypeLiteral(
               Object.entries(params).map(([param, isRequired]) => {
@@ -884,31 +896,6 @@ function register(ctx) {
   );
   return [register2, generate(typeParams).code].join("\n\n");
 }
-function parseParams2(fullpath) {
-  const result = {};
-  let segments = fullpath.split("/");
-  segments.forEach((segment) => {
-    const match = segment.match(/^:([\w-]+)(\?)?/);
-    if (!match) return;
-    const param = match[1];
-    const isRequired = match[2] === void 0;
-    result[param] ||= isRequired;
-    return;
-  });
-  const hasSplat = segments.at(-1) === "*";
-  if (hasSplat) result["*"] = true;
-  return result;
-}
-function getRouteLineage2(routes2, route) {
-  const result = [];
-  while (route) {
-    result.push(route);
-    if (!route.parentId) break;
-    route = routes2[route.parentId];
-  }
-  result.reverse();
-  return result;
-}
 var import_node_fs3, import_dedent2, Path4, import_picocolors3;
 var init_typegen = __esm({
   "typegen/index.ts"() {
@@ -921,6 +908,8 @@ var init_typegen = __esm({
     init_babel();
     init_generate();
     init_paths();
+    init_params();
+    init_route();
   }
 });
 

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-208f173a8
+ * @react-router/dev v0.0.0-experimental-8e9d8ef63
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-208f173a8
+ * @react-router/dev v0.0.0-experimental-8e9d8ef63
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-208f173a8
+ * @react-router/dev v0.0.0-experimental-8e9d8ef63
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-208f173a8
+ * @react-router/dev v0.0.0-experimental-8e9d8ef63
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -667,12 +667,45 @@ function getTypesPath(ctx, route) {
   );
 }
 
+// typegen/params.ts
+function parse2(fullpath2) {
+  const result = {};
+  let segments = fullpath2.split("/");
+  segments.forEach((segment) => {
+    const match = segment.match(/^:([\w-]+)(\?)?/);
+    if (!match) return;
+    const param = match[1];
+    const isRequired = match[2] === void 0;
+    result[param] ||= isRequired;
+    return;
+  });
+  const hasSplat = segments.at(-1) === "*";
+  if (hasSplat) result["*"] = true;
+  return result;
+}
+
+// typegen/route.ts
+function lineage(routes, route) {
+  const result = [];
+  while (route) {
+    result.push(route);
+    if (!route.parentId) break;
+    route = routes[route.parentId];
+  }
+  result.reverse();
+  return result;
+}
+function fullpath(lineage2) {
+  if (lineage2.length === 1 && lineage2[0].id === "root") return "/";
+  return "/" + lineage2.map((route) => route.path?.replace(/^\//, "")?.replace(/\/$/, "")).filter((path7) => path7 !== void 0 && path7 !== "").join("/");
+}
+
 // typegen/generate.ts
 function generate2(ctx, route) {
-  const lineage = getRouteLineage(ctx.config.routes, route);
-  const urlpath = lineage.map((route2) => route2.path).join("/");
+  const lineage2 = lineage(ctx.config.routes, route);
+  const fullpath2 = fullpath(lineage2);
   const typesPath = getTypesPath(ctx, route);
-  const parents = lineage.slice(0, -1);
+  const parents = lineage2.slice(0, -1);
   const parentTypeImports = parents.map((parent, i) => {
     const rel = Path3.relative(
       Path3.dirname(typesPath),
@@ -699,7 +732,7 @@ function generate2(ctx, route) {
       file: "${route.file}"
       path: "${route.path}"
       params: {${formatParamProperties(
-    urlpath
+    fullpath2
   )}} & { [key: string]: string | undefined }
       module: Module
       loaderData: T.CreateLoaderData<Module>
@@ -729,46 +762,13 @@ function generate2(ctx, route) {
   `;
 }
 var noExtension = (path7) => Path3.join(Path3.dirname(path7), Pathe2.filename(path7));
-function getRouteLineage(routes, route) {
-  const result = [];
-  while (route) {
-    result.push(route);
-    if (!route.parentId) break;
-    route = routes[route.parentId];
-  }
-  result.reverse();
-  return result;
-}
-function formatParamProperties(urlpath) {
-  const params = parseParams(urlpath);
-  const properties = Object.entries(params).map(([name, values]) => {
-    if (values.length === 1) {
-      const isOptional = values[0];
-      return isOptional ? `"${name}"?: string` : `"${name}": string`;
-    }
-    const items = values.map(
-      (isOptional) => isOptional ? "string | undefined" : "string"
-    );
-    return `"${name}": [${items.join(", ")}]`;
-  });
+function formatParamProperties(fullpath2) {
+  const params = parse2(fullpath2);
+  const properties = Object.entries(params).map(
+    ([name, isRequired]) => isRequired ? `"${name}": string` : `"${name}"?: string`
+  );
   return properties.join("; ");
 }
-function parseParams(urlpath) {
-  const result = {};
-  let segments = urlpath.split("/");
-  segments.forEach((segment) => {
-    const match = segment.match(/^:([\w-]+)(\?)?/);
-    if (!match) return;
-    const param = match[1];
-    const isOptional = match[2] !== void 0;
-    result[param] ??= [];
-    result[param].push(isOptional);
-    return;
-  });
-  const hasSplat = segments.at(-1) === "*";
-  if (hasSplat) result["*"] = [false];
-  return result;
-}
 
 // typegen/index.ts
 async function watch(rootDirectory, { logger } = {}) {
@@ -838,11 +838,11 @@ function register(ctx) {
     t2.tsTypeLiteral(
       Object.values(ctx.config.routes).map((route) => {
         if (route.id !== "root" && !route.path) return void 0;
-        const lineage = getRouteLineage2(ctx.config.routes, route);
-        const fullpath = route.id === "root" ? "/" : lineage.map((route2) => route2.path).filter((path7) => path7 !== void 0).join("/");
-        const params = parseParams2(fullpath);
+        const lineage2 = lineage(ctx.config.routes, route);
+        const fullpath2 = fullpath(lineage2);
+        const params = parse2(fullpath2);
         return t2.tsPropertySignature(
-          t2.stringLiteral(fullpath),
+          t2.stringLiteral(fullpath2),
           t2.tsTypeAnnotation(
             t2.tsTypeLiteral(
               Object.entries(params).map(([param, isRequired]) => {
@@ -861,31 +861,6 @@ function register(ctx) {
   );
   return [register2, generate(typeParams).code].join("\n\n");
 }
-function parseParams2(fullpath) {
-  const result = {};
-  let segments = fullpath.split("/");
-  segments.forEach((segment) => {
-    const match = segment.match(/^:([\w-]+)(\?)?/);
-    if (!match) return;
-    const param = match[1];
-    const isRequired = match[2] === void 0;
-    result[param] ||= isRequired;
-    return;
-  });
-  const hasSplat = segments.at(-1) === "*";
-  if (hasSplat) result["*"] = true;
-  return result;
-}
-function getRouteLineage2(routes, route) {
-  const result = [];
-  while (route) {
-    result.push(route);
-    if (!route.parentId) break;
-    route = routes[route.parentId];
-  }
-  result.reverse();
-  return result;
-}
 
 // vite/node-adapter.ts
 var import_node_events = require("events");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-208f173a8",
+  "version": "0.0.0-experimental-8e9d8ef63",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -88,7 +88,7 @@
     "set-cookie-parser": "^2.6.0",
     "valibot": "^0.41.0",
     "vite-node": "3.0.0-beta.2",
-    "@react-router/node": "0.0.0-experimental-208f173a8"
+    "@react-router/node": "0.0.0-experimental-8e9d8ef63"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -117,15 +117,15 @@
     "vite": "^6.0.0",
     "wireit": "0.14.9",
     "wrangler": "^3.28.2",
-    "react-router": "^0.0.0-experimental-208f173a8",
-    "@react-router/serve": "0.0.0-experimental-208f173a8"
+    "react-router": "^0.0.0-experimental-8e9d8ef63",
+    "@react-router/serve": "0.0.0-experimental-8e9d8ef63"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0",
     "wrangler": "^3.28.2",
-    "@react-router/serve": "^0.0.0-experimental-208f173a8",
-    "react-router": "^0.0.0-experimental-208f173a8"
+    "@react-router/serve": "^0.0.0-experimental-8e9d8ef63",
+    "react-router": "^0.0.0-experimental-8e9d8ef63"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {