@remix-run/assets 0.4.2 → 0.4.4

package/dist/lib/routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/lib/routes.ts"],"names":[],"mappings":"AAiBA,UAAU,WAAW;IACnB,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IACzC,OAAO,EAAE,MAAM,CAAA;CAChB;AAUD,MAAM,WAAW,cAAc;IAC7B,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;IACnD,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;CAC/C;AAYD,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,SAAS,WAAW,EAAE,GACnC,cAAc,CA8ChB"}
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/lib/routes.ts"],"names":[],"mappings":"AAqBA,UAAU,WAAW;IACnB,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IACzC,OAAO,EAAE,MAAM,CAAA;CAChB;AAUD,MAAM,WAAW,cAAc;IAC7B,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;IACnD,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;CAC/C;AAYD,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,SAAS,WAAW,EAAE,GACnC,cAAc,CAgDhB"}

package/dist/lib/routes.js

@@ -1,4 +1,4 @@
-import { RoutePattern } from '@remix-run/route-pattern';
+import { getRoutePatternCaptures, RoutePattern, } from '@remix-run/route-pattern';
 import { createHref } from '@remix-run/route-pattern/href';
 import { createMatcher } from '@remix-run/route-pattern/match';
 import { getRelativeFilePath, isAbsoluteFilePath, normalizeFilePath, normalizePathname, resolveFilePath, } from "./paths.js";
@@ -26,7 +26,7 @@ export function compileRoutes(basePath, routeConfigs) {
                 let match = route.urlMatcher.match(`http://remix.run${normalizedPathname}`);
                 if (!match)
                     continue;
-                let relativeFilePath = createHref(route.filePattern, match.params).replace(/^\/+/, '');
+                let relativeFilePath = decodeURIComponent(createHref(route.filePattern, match.params)).replace(/^\/+/, '');
                 return resolveFilePath(route.rootDir, relativeFilePath);
             }
             return null;
@@ -76,24 +76,24 @@ function stripDotSegments(pattern) {
     return segments.join('/');
 }
 function validateRoutePatterns(urlPattern, filePattern) {
-    let urlParams = getPathnameParams(urlPattern);
-    let fileParams = getPathnameParams(filePattern);
-    if (urlParams.length !== fileParams.length) {
+    let urlCaptures = getPathnameCaptures(urlPattern);
+    let fileCaptures = getPathnameCaptures(filePattern);
+    if (urlCaptures.length !== fileCaptures.length) {
         throw new Error(`Route patterns must have matching capture structure.\nURL: ${urlPattern}\nFile: ${filePattern}`);
     }
-    for (let i = 0; i < urlParams.length; i++) {
-        let urlParam = urlParams[i];
-        let fileParam = fileParams[i];
-        if (urlParam.type !== fileParam.type || urlParam.name !== fileParam.name) {
+    for (let i = 0; i < urlCaptures.length; i++) {
+        let urlCapture = urlCaptures[i];
+        let fileCapture = fileCaptures[i];
+        if (urlCapture.type !== fileCapture.type || urlCapture.name !== fileCapture.name) {
             throw new Error(`Route patterns must have matching capture structure.\nURL: ${urlPattern}\nFile: ${filePattern}`);
         }
     }
 }
 function validateNoUnnamedWildcards(pattern, label) {
-    if (pattern.pathname.tokens.some((token) => token.type === '*' && token.name === '*')) {
+    if (getRoutePatternCaptures(pattern).some((capture) => capture.part === 'pathname' && capture.type === '*' && capture.name === '*')) {
         throw new Error(`${label} route patterns must use named wildcards for reversible mapping.\nPattern: ${pattern}`);
     }
 }
-function getPathnameParams(pattern) {
-    return pattern.pathname.tokens.filter((token) => token.type === ':' || token.type === '*');
+function getPathnameCaptures(pattern) {
+    return getRoutePatternCaptures(pattern).filter((capture) => capture.part === 'pathname');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/assets",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "Fetch-based server for compiling browser JS/TS and CSS assets on demand",
   "author": "Michael Jackson <mjijackson@gmail.com>",
   "license": "MIT",
@@ -38,17 +38,17 @@
     "oxc-transform": "^0.121.0",
     "picomatch": "^4.0.4",
     "source-map-js": "^1.2.1",
-    "@remix-run/file-storage": "0.13.6",
-    "@remix-run/mime": "0.4.1",
-    "@remix-run/route-pattern": "0.22.0",
-    "@remix-run/headers": "0.21.1"
+    "@remix-run/headers": "0.21.1",
+    "@remix-run/file-storage": "0.13.7",
+    "@remix-run/route-pattern": "0.23.0",
+    "@remix-run/mime": "0.4.2"
   },
   "devDependencies": {
     "@types/node": "^24.6.0",
     "@types/picomatch": "^4.0.3",
     "@typescript/native-preview": "7.0.0-dev.20251125.1",
-    "@remix-run/assert": "0.2.1",
-    "@remix-run/test": "0.4.2"
+    "@remix-run/assert": "0.3.0",
+    "@remix-run/test": "0.5.0"
   },
   "keywords": [
     "remix",

package/src/lib/routes.ts

@@ -1,4 +1,8 @@
-import { RoutePattern } from '@remix-run/route-pattern'
+import {
+  getRoutePatternCaptures,
+  RoutePattern,
+  type RoutePatternCapture,
+} from '@remix-run/route-pattern'
 import { createHref } from '@remix-run/route-pattern/href'
 import { createMatcher, type Matcher } from '@remix-run/route-pattern/match'
 
@@ -73,7 +77,9 @@ export function compileRoutes(
       for (let route of compiledRoutes) {
         let match = route.urlMatcher.match(`http://remix.run${normalizedPathname}`)
         if (!match) continue
-        let relativeFilePath = createHref(route.filePattern, match.params).replace(/^\/+/, '')
+        let relativeFilePath = decodeURIComponent(
+          createHref(route.filePattern, match.params),
+        ).replace(/^\/+/, '')
         return resolveFilePath(route.rootDir, relativeFilePath)
       }
 
@@ -140,18 +146,18 @@ function stripDotSegments(pattern: string): string {
 }
 
 function validateRoutePatterns(urlPattern: RoutePattern, filePattern: RoutePattern): void {
-  let urlParams = getPathnameParams(urlPattern)
-  let fileParams = getPathnameParams(filePattern)
-  if (urlParams.length !== fileParams.length) {
+  let urlCaptures = getPathnameCaptures(urlPattern)
+  let fileCaptures = getPathnameCaptures(filePattern)
+  if (urlCaptures.length !== fileCaptures.length) {
     throw new Error(
       `Route patterns must have matching capture structure.\nURL: ${urlPattern}\nFile: ${filePattern}`,
     )
   }
 
-  for (let i = 0; i < urlParams.length; i++) {
-    let urlParam = urlParams[i]
-    let fileParam = fileParams[i]
-    if (urlParam.type !== fileParam.type || urlParam.name !== fileParam.name) {
+  for (let i = 0; i < urlCaptures.length; i++) {
+    let urlCapture = urlCaptures[i]
+    let fileCapture = fileCaptures[i]
+    if (urlCapture.type !== fileCapture.type || urlCapture.name !== fileCapture.name) {
       throw new Error(
         `Route patterns must have matching capture structure.\nURL: ${urlPattern}\nFile: ${filePattern}`,
       )
@@ -160,17 +166,21 @@ function validateRoutePatterns(urlPattern: RoutePattern, filePattern: RoutePatte
 }
 
 function validateNoUnnamedWildcards(pattern: RoutePattern, label: string): void {
-  if (pattern.pathname.tokens.some((token) => token.type === '*' && token.name === '*')) {
+  if (
+    getRoutePatternCaptures(pattern).some(
+      (capture) => capture.part === 'pathname' && capture.type === '*' && capture.name === '*',
+    )
+  ) {
     throw new Error(
       `${label} route patterns must use named wildcards for reversible mapping.\nPattern: ${pattern}`,
     )
   }
 }
 
-type PathnameParam = Extract<RoutePattern['pathname']['tokens'][number], { type: ':' | '*' }>
+type PathnameCapture = RoutePatternCapture & { readonly part: 'pathname' }
 
-function getPathnameParams(pattern: RoutePattern): Array<PathnameParam> {
-  return pattern.pathname.tokens.filter(
-    (token): token is PathnameParam => token.type === ':' || token.type === '*',
+function getPathnameCaptures(pattern: RoutePattern): Array<PathnameCapture> {
+  return getRoutePatternCaptures(pattern).filter(
+    (capture): capture is PathnameCapture => capture.part === 'pathname',
   )
 }