@remix-run/assets 0.5.0 → 0.6.0

package/src/lib/routes.ts

@@ -1,186 +1,218 @@
-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'
+import * as fs from 'node:fs'
 
 import {
-  getRelativeFilePath,
   isAbsoluteFilePath,
   normalizeFilePath,
   normalizePathname,
   resolveFilePath,
 } from './paths.ts'
 
-interface AssetRouteDefinition {
-  urlPattern: string
-  filePattern: string
-}
-
-interface RouteConfig {
-  fileMap: Readonly<Record<string, string>>
+interface MountConfig {
+  mounts: Readonly<Record<string, string>>
   rootDir: string
 }
 
-interface CompiledRoute {
-  rootDir: string
-  urlPattern: RoutePattern
-  urlMatcher: Matcher
-  filePattern: RoutePattern
-  fileMatcher: Matcher
+interface CompiledMount {
+  fileRoot: string
+  fileRootValue: string
+  urlRoot: string
+  urlRootKey: string
 }
 
 export interface CompiledRoutes {
   resolveUrlPathname(pathname: string): string | null
+  matchUrlPathname(pathname: string): AssetRouteMatch | null
   toUrlPathname(filePath: string): string | null
+  matchFilePath(filePath: string): AssetRouteMatch | null
 }
 
-function normalizeFilePattern(pattern: string): string {
-  if (isAbsoluteFilePath(pattern)) {
-    throw new Error(
-      `File route patterns must be relative to the asset server root.\nPattern: ${pattern}`,
-    )
-  }
-
-  return normalizePathname(pattern)
+export interface AssetRouteMatch {
+  filePath: string
+  fileRoot: string
+  urlPathname: string
+  urlRoot: string
 }
 
 export function compileRoutes(
   basePath: string,
-  routeConfigs: readonly RouteConfig[],
+  mountConfigs: readonly MountConfig[],
 ): CompiledRoutes {
-  if (routeConfigs.every((routeConfig) => Object.keys(routeConfig.fileMap).length === 0)) {
-    throw new Error('createAssetServer() requires at least one configured fileMap entry.')
-  }
-
-  let compiledRoutes = routeConfigs.flatMap((routeConfig) =>
-    Object.entries(routeConfig.fileMap).map(([urlPattern, filePattern]) =>
-      compileRoute(
-        {
-          filePattern,
-          urlPattern,
-        },
-        {
-          basePath,
-          rootDir: routeConfig.rootDir,
-        },
-      ),
-    ),
-  )
+  let compiledMounts = mountConfigs.flatMap((mountConfig) => {
+    let configMounts = Object.entries(mountConfig.mounts).map(([urlRoot, fileRoot]) =>
+      compileMount(urlRoot, fileRoot, {
+        basePath,
+        rootDir: mountConfig.rootDir,
+      }),
+    )
+    validateNoOverlappingMounts(configMounts)
+    return configMounts
+  })
+  validateNoOverlappingUrlRoots(compiledMounts)
 
   return {
     resolveUrlPathname(pathname) {
-      let normalizedPathname = normalizePathname(pathname)
-
-      for (let route of compiledRoutes) {
-        let match = route.urlMatcher.match(`http://remix.run${normalizedPathname}`)
-        if (!match) continue
-        let relativeFilePath = decodeURIComponent(
-          createHref(route.filePattern, match.params),
-        ).replace(/^\/+/, '')
-        return resolveFilePath(route.rootDir, relativeFilePath)
-      }
-
-      return null
+      return matchUrlPathname(pathname)?.filePath ?? null
     },
+    matchUrlPathname,
     toUrlPathname(filePath) {
-      let normalizedFilePath = normalizeFilePath(filePath)
+      return matchFilePath(filePath)?.urlPathname ?? null
+    },
+    matchFilePath,
+  }
 
-      for (let route of compiledRoutes) {
-        let relativeFilePath = getRelativeFilePath(route.rootDir, normalizedFilePath)
-        let match = route.fileMatcher.match(`http://remix.run/${relativeFilePath}`)
-        if (!match) continue
-        return normalizePathname(createHref(route.urlPattern, match.params))
+  function matchUrlPathname(pathname: string): AssetRouteMatch | null {
+    let normalizedPathname = normalizePathname(pathname)
+
+    for (let mount of compiledMounts) {
+      let relativePathname = getPathWithinRoot(mount.urlRoot, normalizedPathname)
+      if (relativePathname === null) continue
+      let filePath = resolveFilePath(mount.fileRoot, decodeURIComponent(relativePathname))
+      if (getPathWithinRoot(mount.fileRoot, filePath) === null) return null
+
+      return {
+        filePath,
+        fileRoot: mount.fileRootValue,
+        urlPathname: normalizedPathname,
+        urlRoot: mount.urlRoot,
       }
+    }
 
-      return null
-    },
+    return null
+  }
+
+  function matchFilePath(filePath: string): AssetRouteMatch | null {
+    let normalizedFilePath = normalizeFilePath(filePath)
+
+    for (let mount of compiledMounts) {
+      let relativeFilePath = getPathWithinRoot(mount.fileRoot, normalizedFilePath)
+      if (relativeFilePath === null) continue
+      let encodedFilePath = relativeFilePath.split('/').map(encodeURIComponent).join('/')
+
+      return {
+        filePath: normalizedFilePath,
+        fileRoot: mount.fileRootValue,
+        urlPathname: joinUrlPath(mount.urlRoot, encodedFilePath),
+        urlRoot: mount.urlRoot,
+      }
+    }
+
+    return null
   }
 }
 
-function compileRoute(
-  route: AssetRouteDefinition,
+function compileMount(
+  urlRoot: string,
+  fileRoot: string,
   options: {
     basePath: string
     rootDir: string
   },
-): CompiledRoute {
-  let basePath = normalizePathname(options.basePath).replace(/\/+$/, '') || '/'
-  let relativeUrlPattern = normalizePathname(route.urlPattern)
-  let urlPatternSource = normalizePathname(
-    `${basePath.replace(/\/+$/, '')}/${relativeUrlPattern.replace(/^\/+/, '')}`,
-  )
-  let filePatternSource = normalizeFilePattern(route.filePattern)
-
-  let urlPattern = RoutePattern.parse(urlPatternSource)
-  let filePattern = RoutePattern.parse(filePatternSource)
-
-  validateNoUnnamedWildcards(urlPattern, 'URL')
-  validateNoUnnamedWildcards(filePattern, 'File')
-  validateRoutePatterns(urlPattern, filePattern)
+): CompiledMount {
+  if (isAbsoluteFilePath(fileRoot)) {
+    throw new TypeError(`mounts values must be relative to rootDir. Received "${fileRoot}".`)
+  }
 
   return {
-    rootDir: normalizeFilePath(options.rootDir).replace(/\/+$/, ''),
-    urlPattern,
-    urlMatcher: createMatcher(urlPattern),
-    filePattern,
-    fileMatcher: createMatcher(stripDotSegments(filePatternSource)),
+    fileRoot: resolveMountFileRoot(options.rootDir, fileRoot),
+    fileRootValue: fileRoot,
+    urlRoot: joinUrlPath(normalizeMountUrlRoot(options.basePath), normalizeMountUrlRoot(urlRoot)),
+    urlRootKey: urlRoot,
   }
 }
 
-function stripDotSegments(pattern: string): string {
-  let segments: string[] = []
+function normalizeMountUrlRoot(urlRoot: string): string {
+  let normalizedRoot = normalizePathname(urlRoot).replace(/\/+$/, '') || '/'
+  let url = new URL(normalizedRoot, 'http://remix.run')
 
-  for (let segment of pattern.split('/')) {
-    if (segment === '' || segment === '.') continue
-    if (segment === '..') {
-      segments.pop()
-      continue
-    }
-    segments.push(segment)
+  if (
+    url.search !== '' ||
+    url.hash !== '' ||
+    getUrlPathSegmentCount(url.pathname) !== getUrlPathSegmentCount(normalizedRoot)
+  ) {
+    throw new TypeError(
+      `mounts keys must be URL pathnames without query strings, fragments, or encoded dot segments. Received "${urlRoot}".`,
+    )
   }
 
-  return segments.join('/')
+  return url.pathname.replace(/\/+$/, '') || '/'
 }
 
-function validateRoutePatterns(urlPattern: RoutePattern, filePattern: RoutePattern): void {
-  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}`,
-    )
+function resolveMountFileRoot(rootDir: string, fileRoot: string): string {
+  let resolvedRoot = resolveFilePath(rootDir, fileRoot)
+
+  try {
+    resolvedRoot = normalizeFilePath(fs.realpathSync(resolvedRoot))
+  } catch (error) {
+    if (!isUnresolvedPathError(error, resolvedRoot)) throw error
   }
 
-  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}`,
-      )
+  return resolvedRoot.replace(/\/+$/, '') || '/'
+}
+
+function getUrlPathSegmentCount(pathname: string): number {
+  return pathname.split('/').filter((segment) => segment !== '').length
+}
+
+function joinUrlPath(root: string, path: string): string {
+  if (path === '' || path === '/') return normalizeMountUrlRoot(root)
+  return normalizePathname(`${root.replace(/\/+$/, '')}/${path.replace(/^\/+/, '')}`)
+}
+
+function getPathWithinRoot(root: string, value: string): string | null {
+  if (value === root) return ''
+  if (root === '/') return value.slice(1)
+  if (!value.startsWith(`${root}/`)) return null
+  return value.slice(root.length + 1)
+}
+
+function validateNoOverlappingMounts(mounts: readonly CompiledMount[]): void {
+  for (let index = 0; index < mounts.length; index++) {
+    let mount = mounts[index]
+
+    for (let otherIndex = index + 1; otherIndex < mounts.length; otherIndex++) {
+      let otherMount = mounts[otherIndex]
+
+      if (rootsOverlap(mount.fileRoot, otherMount.fileRoot)) {
+        throw new TypeError(
+          `mounts values must not overlap. Received "${mount.fileRootValue}" and "${otherMount.fileRootValue}", resolving to "${mount.fileRoot}" and "${otherMount.fileRoot}".`,
+        )
+      }
     }
   }
 }
 
-function validateNoUnnamedWildcards(pattern: RoutePattern, label: string): void {
-  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 validateNoOverlappingUrlRoots(mounts: readonly CompiledMount[]): void {
+  for (let index = 0; index < mounts.length; index++) {
+    let mount = mounts[index]
+
+    for (let otherIndex = index + 1; otherIndex < mounts.length; otherIndex++) {
+      let otherMount = mounts[otherIndex]
+      if (!rootsOverlap(mount.urlRoot, otherMount.urlRoot)) continue
+
+      throw new TypeError(
+        `mounts keys must not overlap. Received "${mount.urlRootKey}" and "${otherMount.urlRootKey}".`,
+      )
+    }
   }
 }
 
-type PathnameCapture = RoutePatternCapture & { readonly part: 'pathname' }
+function rootsOverlap(root: string, otherRoot: string): boolean {
+  return (
+    root === otherRoot ||
+    root === '/' ||
+    otherRoot === '/' ||
+    root.startsWith(`${otherRoot}/`) ||
+    otherRoot.startsWith(`${root}/`)
+  )
+}
 
-function getPathnameCaptures(pattern: RoutePattern): Array<PathnameCapture> {
-  return getRoutePatternCaptures(pattern).filter(
-    (capture): capture is PathnameCapture => capture.part === 'pathname',
+function isUnresolvedPathError(error: unknown, filePath: string): boolean {
+  // Windows reports UNKNOWN rather than ENOENT when a UNC share cannot be reached.
+  return (
+    error instanceof Error &&
+    'code' in error &&
+    (error.code === 'ENOENT' ||
+      error.code === 'ENOTDIR' ||
+      (error.code === 'UNKNOWN' && filePath.startsWith('//')))
   )
 }

package/src/lib/scripts/compiler.ts

@@ -514,9 +514,9 @@ export function createScriptCompiler(options: ScriptCompilerOptions): ScriptComp
     let stableUrlPathname = resolvedOptions.routes.toUrlPathname(identityPath)
     if (!stableUrlPathname) {
       throw createAssetServerCompilationError(
-        `File ${identityPath} is outside all configured fileMap entries.`,
+        `File ${identityPath} is outside all configured mounts.`,
         {
-          code: 'FILE_OUTSIDE_FILE_MAP',
+          code: 'FILE_OUTSIDE_MOUNTS',
         },
       )
     }

package/src/lib/scripts/resolve.ts

@@ -137,7 +137,7 @@ export async function resolveModule(
       return failResolve(
         createAssetServerCompilationError(
           `Failed to resolve import "${displaySpecifier}" in ${transformed.resolvedPath}. ` +
-            `Ensure it resolves to a file within the configured asset server fileMap, or mark it as external.`,
+            `Ensure it resolves to a file within a configured asset server mount, or mark it as external.`,
           {
             code: 'IMPORT_RESOLUTION_FAILED',
           },
@@ -186,10 +186,10 @@ export async function resolveModule(
     if (!stableUrlPathname) {
       return failResolve(
         createAssetServerCompilationError(
-          `Import "${displaySpecifier}" in ${transformed.resolvedPath}, resolved to "${resolvedImport.identityPath}", is outside all configured fileMap entries. ` +
-            `Add a matching fileMap entry for this file path, or mark this import as external.`,
+          `Import "${displaySpecifier}" in ${transformed.resolvedPath}, resolved to "${resolvedImport.identityPath}", is outside all configured mounts. ` +
+            `Add a matching mount for this file path, or mark this import as external.`,
           {
-            code: 'IMPORT_OUTSIDE_FILE_MAP',
+            code: 'IMPORT_OUTSIDE_MOUNTS',
           },
         ),
         trackedFiles,
@@ -254,7 +254,7 @@ export async function resolveModule(
       return failResolve(
         createAssetServerCompilationError(
           `Failed to resolve accepted HMR dependency "${displaySpecifier}" in ${transformed.resolvedPath}. ` +
-            `Ensure it resolves to a file within the configured asset server fileMap, or mark it as external.`,
+            `Ensure it resolves to a file within a configured asset server mount, or mark it as external.`,
           {
             code: 'IMPORT_RESOLUTION_FAILED',
           },
@@ -303,10 +303,10 @@ export async function resolveModule(
     if (!stableUrlPathname) {
       return failResolve(
         createAssetServerCompilationError(
-          `Accepted HMR dependency "${displaySpecifier}" in ${transformed.resolvedPath}, resolved to "${resolvedImport.identityPath}", is outside all configured fileMap entries. ` +
-            `Add a matching fileMap entry for this file path, or mark this import as external.`,
+          `Accepted HMR dependency "${displaySpecifier}" in ${transformed.resolvedPath}, resolved to "${resolvedImport.identityPath}", is outside all configured mounts. ` +
+            `Add a matching mount for this file path, or mark this import as external.`,
           {
-            code: 'IMPORT_OUTSIDE_FILE_MAP',
+            code: 'IMPORT_OUTSIDE_MOUNTS',
           },
         ),
         trackedFiles,
@@ -462,7 +462,7 @@ async function batchResolveSpecifiers(
           normalizedResolution.importerPath === getInjectedPackageImporterPath()
             ? `Failed to resolve injected import "${specifier}" from asset server.`
             : `Failed to resolve import "${normalizedResolution.specifier}" in ${normalizedResolution.importerPath}. ` +
-                `Ensure it resolves to a file within the configured asset server fileMap, or mark it as external.`,
+                `Ensure it resolves to a file within a configured asset server mount, or mark it as external.`,
           {
             code: 'IMPORT_RESOLUTION_FAILED',
           },

package/src/lib/scripts/transform.ts

@@ -225,9 +225,9 @@ export async function transformModule(
     let stableUrlPathname = args.routes.toUrlPathname(record.identityPath)
     if (!stableUrlPathname) {
       throw createAssetServerCompilationError(
-        `File ${record.identityPath} is outside all configured fileMap entries.`,
+        `File ${record.identityPath} is outside all configured mounts.`,
         {
-          code: 'FILE_OUTSIDE_FILE_MAP',
+          code: 'FILE_OUTSIDE_MOUNTS',
         },
       )
     }

package/src/lib/styles/resolve.ts

@@ -175,9 +175,9 @@ export function resolveServedStyleOrThrow(
   let stableUrlPathname = args.routes.toUrlPathname(identityPath)
   if (!stableUrlPathname) {
     throw createAssetServerCompilationError(
-      `File ${identityPath} is outside all configured fileMap entries.`,
+      `File ${identityPath} is outside all configured mounts.`,
       {
-        code: 'FILE_OUTSIDE_FILE_MAP',
+        code: 'FILE_OUTSIDE_MOUNTS',
       },
     )
   }
@@ -232,10 +232,10 @@ function resolveImportDependency(
 
   if (!args.routes.toUrlPathname(identityPath)) {
     throw createAssetServerCompilationError(
-      `Import "${url}" in ${importerPath}, resolved to "${identityPath}", is outside all configured fileMap entries. ` +
-        `Add a matching fileMap entry for this file path, or mark this import as external.`,
+      `Import "${url}" in ${importerPath}, resolved to "${identityPath}", is outside all configured mounts. ` +
+        `Add a matching mount for this file path, or mark this import as external.`,
       {
-        code: 'IMPORT_OUTSIDE_FILE_MAP',
+        code: 'IMPORT_OUTSIDE_MOUNTS',
       },
     )
   }
@@ -302,10 +302,10 @@ function resolveUrlDependency(
 
   if (!args.routes.toUrlPathname(identityPath)) {
     throw createAssetServerCompilationError(
-      `URL "${url}" in ${importerPath}, resolved to "${identityPath}", is outside all configured fileMap entries. ` +
-        `Add a matching fileMap entry for this file path.`,
+      `URL "${url}" in ${importerPath}, resolved to "${identityPath}", is outside all configured mounts. ` +
+        `Add a matching mount for this file path.`,
       {
-        code: 'URL_OUTSIDE_FILE_MAP',
+        code: 'URL_OUTSIDE_MOUNTS',
       },
     )
   }

package/src/lib/styles/transform.ts

@@ -99,9 +99,9 @@ export async function transformStyle(
     let stableUrlPathname = args.routes.toUrlPathname(record.identityPath)
     if (!stableUrlPathname) {
       throw createAssetServerCompilationError(
-        `File ${record.identityPath} is outside all configured fileMap entries.`,
+        `File ${record.identityPath} is outside all configured mounts.`,
         {
-          code: 'FILE_OUTSIDE_FILE_MAP',
+          code: 'FILE_OUTSIDE_MOUNTS',
         },
       )
     }