@remix-run/router 0.0.0-experimental-c9f8a7b2 → 0.0.0-experimental-e960cf1a

package/utils.ts

@@ -223,6 +223,17 @@ export interface DetectErrorBoundaryFunction {
   (route: AgnosticRouteObject): boolean;
 }
 
+export interface DataStrategyFunctionArgs {
+  request: Request;
+  matches: AgnosticDataStrategyMatch[];
+  type: "loader" | "action";
+  defaultStrategy(match: AgnosticDataStrategyMatch): Promise<DataResult>;
+}
+
+export interface DataStrategyFunction {
+  (args: DataStrategyFunctionArgs): Promise<DataResult[]>;
+}
+
 /**
  * Function provided by the framework-aware layers to set any framework-specific
  * properties from framework-agnostic properties
@@ -401,6 +412,14 @@ export interface AgnosticRouteMatch<
 export interface AgnosticDataRouteMatch
   extends AgnosticRouteMatch<string, AgnosticDataRouteObject> {}
 
+export type LazyRoutePromise = PromiseLike<AgnosticDataRouteObject> &
+  AgnosticDataRouteObject;
+
+export interface AgnosticDataStrategyMatch
+  extends Omit<AgnosticRouteMatch<string, AgnosticDataRouteObject>, "route"> {
+  route: LazyRoutePromise;
+}
+
 function isIndexRoute(
   route: AgnosticRouteObject
 ): route is AgnosticIndexRouteObject {
@@ -685,7 +704,7 @@ function rankRouteBranches(branches: RouteBranch[]): void {
   );
 }
 
-const paramRe = /^:[\w-]+$/;
+const paramRe = /^:\w+$/;
 const dynamicSegmentValue = 3;
 const indexRouteValue = 2;
 const emptySegmentValue = 1;
@@ -822,7 +841,7 @@ export function generatePath<Path extends string>(
         return stringify(params[star]);
       }
 
-      const keyMatch = segment.match(/^:([\w-]+)(\??)$/);
+      const keyMatch = segment.match(/^:(\w+)(\??)$/);
       if (keyMatch) {
         const [, key, optional] = keyMatch;
         let param = params[key as PathParam<Path>];
@@ -967,13 +986,10 @@ function compilePath(
       .replace(/\/*\*?$/, "") // Ignore trailing / and /*, we'll handle it below
       .replace(/^\/*/, "/") // Make sure it has a leading /
       .replace(/[\\.*+^${}|()[\]]/g, "\\$&") // Escape special regex chars
-      .replace(
-        /\/:([\w-]+)(\?)?/g,
-        (_: string, paramName: string, isOptional) => {
-          params.push({ paramName, isOptional: isOptional != null });
-          return isOptional ? "/?([^\\/]+)?" : "/([^\\/]+)";
-        }
-      );
+      .replace(/\/:(\w+)(\?)?/g, (_: string, paramName: string, isOptional) => {
+        params.push({ paramName, isOptional: isOptional != null });
+        return isOptional ? "/?([^\\/]+)?" : "/([^\\/]+)";
+      });
 
   if (path.endsWith("*")) {
     params.push({ paramName: "*" });