@remix-run/assets 0.2.0 → 0.4.0

package/dist/lib/styles/resolve.js

@@ -1,5 +1,6 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
 import { createAssetServerCompilationError, isAssetServerCompilationError, } from "../compilation-error.js";
 import { normalizeFilePath } from "../paths.js";
 export async function resolveStyle(record, transformed, args) {
@@ -9,19 +10,21 @@ export async function resolveStyle(record, transformed, args) {
     for (let unresolved of transformed.unresolvedDependencies) {
         let trackedFile = unresolved.type === 'import'
             ? getTrackedImportFilePath(unresolved.url, transformed.resolvedPath)
-            : null;
+            : getTrackedUrlFilePath(unresolved.url, transformed.resolvedPath);
         if (trackedFile && !args.isWatchIgnored(trackedFile)) {
             trackedFiles.add(trackedFile);
         }
         try {
             let resolved = unresolved.type === 'import'
                 ? resolveImportDependency(unresolved.url, transformed.resolvedPath, unresolved.placeholder, args)
-                : resolveUrlDependency(unresolved.url, unresolved.placeholder);
+                : resolveUrlDependency(unresolved.url, transformed.resolvedPath, unresolved.placeholder, args);
             dependencies.push(resolved);
-            if (resolved.kind === 'local') {
+            if (resolved.kind === 'style' || resolved.kind === 'file') {
                 if (!args.isWatchIgnored(resolved.depPath)) {
                     trackedFiles.add(resolved.depPath);
                 }
+            }
+            if (resolved.kind === 'style') {
                 deps.add(resolved.depPath);
             }
         }
@@ -80,22 +83,16 @@ function resolveImportDependency(url, importerPath, placeholder, args) {
             replacement: url,
         };
     }
-    let { pathname, suffix } = splitUrlSuffix(url);
-    if (pathname.length === 0 || pathname === '#') {
-        return {
-            kind: 'external',
-            placeholder,
-            replacement: url,
-        };
-    }
-    if (pathname.startsWith('/')) {
+    let parsedUrl = parseRelativeUrl(url, importerPath);
+    if (parsedUrl === null) {
         return {
             kind: 'external',
             placeholder,
             replacement: url,
         };
     }
-    let resolvedFilePath = normalizeFilePath(path.resolve(path.dirname(importerPath), pathname));
+    let { hash, resolvedPath, search } = parsedUrl;
+    let resolvedFilePath = resolvedPath;
     let identityPath = resolveExistingFilePath(resolvedFilePath);
     if (!identityPath || !isStyleFilePath(identityPath)) {
         throw createAssetServerCompilationError(`Failed to resolve import "${url}" in ${importerPath}.`, {
@@ -116,16 +113,60 @@ function resolveImportDependency(url, importerPath, placeholder, args) {
     }
     return {
         depPath: identityPath,
-        kind: 'local',
+        kind: 'style',
         placeholder,
-        suffix,
+        suffix: `${search}${hash}`,
     };
 }
-function resolveUrlDependency(url, placeholder) {
+function resolveUrlDependency(url, importerPath, placeholder, args) {
+    if (isExternalUrl(url)) {
+        return {
+            kind: 'external',
+            placeholder,
+            replacement: url,
+        };
+    }
+    let parsedUrl = parseRelativeUrl(url, importerPath);
+    if (parsedUrl === null) {
+        return {
+            kind: 'external',
+            placeholder,
+            replacement: url,
+        };
+    }
+    let { hash, resolvedPath, search } = parsedUrl;
+    let resolvedFilePath = resolvedPath;
+    let identityPath = resolveExistingFilePath(resolvedFilePath);
+    if (!identityPath) {
+        throw createAssetServerCompilationError(`Failed to resolve url("${url}") in ${importerPath}.`, {
+            code: 'URL_RESOLUTION_FAILED',
+        });
+    }
+    if (!args.isServedFilePath(identityPath)) {
+        throw createAssetServerCompilationError(`URL "${url}" in ${importerPath}, resolved to "${identityPath}", is not a supported file asset. ` +
+            `Add the file extension to files.extensions to serve this asset.`, {
+            code: 'URL_NOT_SUPPORTED',
+        });
+    }
+    if (!args.isAllowed(identityPath)) {
+        throw createAssetServerCompilationError(`URL "${url}" in ${importerPath}, resolved to "${identityPath}", is not allowed by the asset server allow/deny configuration. ` +
+            `Add a matching allow rule for this file path or remove a conflicting deny rule for this file path.`, {
+            code: 'URL_NOT_ALLOWED',
+        });
+    }
+    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.`, {
+            code: 'URL_OUTSIDE_FILE_MAP',
+        });
+    }
+    let parsedRequest = parseResolvedFileRequest({ hash, search });
     return {
-        kind: 'external',
+        depPath: identityPath,
+        kind: 'file',
         placeholder,
-        replacement: url,
+        requestTransform: parsedRequest.transform,
+        suffix: parsedRequest.suffix,
     };
 }
 function resolveExistingFilePath(filePath) {
@@ -138,27 +179,39 @@ function resolveExistingFilePath(filePath) {
         throw error;
     }
 }
-function splitUrlSuffix(url) {
-    let queryIndex = url.indexOf('?');
-    let hashIndex = url.indexOf('#');
-    let endIndex = [queryIndex, hashIndex].filter((index) => index >= 0).sort((a, b) => a - b)[0];
-    if (endIndex == null) {
+function parseRelativeUrl(url, importerPath) {
+    if (url.length === 0 || url.startsWith('?') || url.startsWith('/') || isExternalUrl(url)) {
+        return null;
+    }
+    let parsed = new URL(url, pathToFileURL(importerPath));
+    return {
+        hash: parsed.hash,
+        resolvedPath: normalizeFilePath(fileURLToPath(parsed)),
+        search: parsed.search,
+    };
+}
+function parseResolvedFileRequest(url) {
+    let { hash, search } = url;
+    if (search.length === 0) {
         return {
-            pathname: url,
-            suffix: '',
+            suffix: hash,
+            transform: null,
         };
     }
+    let searchParams = new URLSearchParams(search.slice(1));
+    let transform = searchParams.getAll('transform');
+    searchParams.delete('transform');
+    let remainingSearch = searchParams.toString();
     return {
-        pathname: url.slice(0, endIndex),
-        suffix: url.slice(endIndex),
+        suffix: `${remainingSearch.length > 0 ? `?${remainingSearch}` : ''}${hash}`,
+        transform: transform.length > 0 ? transform : null,
     };
 }
 function getTrackedImportFilePath(specifier, importerPath) {
-    let { pathname } = splitUrlSuffix(specifier);
-    if (pathname.startsWith('./') || pathname.startsWith('../')) {
-        return normalizeFilePath(path.resolve(path.dirname(importerPath), pathname));
-    }
-    return null;
+    return parseRelativeUrl(specifier, importerPath)?.resolvedPath ?? null;
+}
+function getTrackedUrlFilePath(url, importerPath) {
+    return parseRelativeUrl(url, importerPath)?.resolvedPath ?? null;
 }
 function isStyleFilePath(filePath) {
     return path.extname(filePath).toLowerCase() === '.css';

package/dist/lib/watch.d.ts

@@ -15,6 +15,8 @@ export type AssetServerWatcher = {
     updateWatchedDirectories(delta: {
         add: readonly string[];
         remove: readonly string[];
+    }, options?: {
+        includeAncestors?: boolean;
     }): void;
 };
 export declare function createAssetServerWatcher(options: AssetServerWatcherOptions): AssetServerWatcher;

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

@@ -1 +1 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/lib/watch.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAI/B,KAAK,yBAAyB,GAAG;IAC/B,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC1B,wBAAwB,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAA;IAC7D,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1E,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,KAAK,qBAAqB,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,CAAA;AACxD,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAA;AAE/D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACtB,iBAAiB,IAAI,SAAS,MAAM,EAAE,CAAA;IACtC,wBAAwB,CAAC,KAAK,EAAE;QAAE,GAAG,EAAE,SAAS,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,GAAG,IAAI,CAAA;CAC7F,CAAA;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,yBAAyB,GAAG,kBAAkB,CAmD/F"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../src/lib/watch.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAA;AAI/B,KAAK,yBAAyB,GAAG;IAC/B,MAAM,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC1B,wBAAwB,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAA;IAC7D,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC1E,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,KAAK,qBAAqB,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,CAAA;AACxD,MAAM,MAAM,eAAe,GAAG,UAAU,CAAC,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAA;AAE/D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACtB,iBAAiB,IAAI,SAAS,MAAM,EAAE,CAAA;IACtC,wBAAwB,CACtB,KAAK,EAAE;QAAE,GAAG,EAAE,SAAS,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,EAC5D,OAAO,CAAC,EAAE;QAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;KAAE,GACvC,IAAI,CAAA;CACR,CAAA;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,yBAAyB,GAAG,kBAAkB,CAiE/F"}

package/dist/lib/watch.js

@@ -7,7 +7,8 @@ export function createAssetServerWatcher(options) {
         ...resolveChokidarWatchOptions(options),
     });
     options.onChokidarWatcherCreated?.(watcher);
-    let watchedDirectories = new Set();
+    let watchedResolutionDirectories = new Set();
+    let watchedFileDirectories = new Set();
     let watchedTargets = new Set();
     for (let event of ['add', 'change', 'unlink']) {
         watcher.on(event, (filePath) => {
@@ -24,15 +25,29 @@ export function createAssetServerWatcher(options) {
         getWatchedTargets() {
             return [...watchedTargets];
         },
-        updateWatchedDirectories(delta) {
-            let nextWatchedDirectories = new Set(watchedDirectories);
+        updateWatchedDirectories(delta, updateOptions = {}) {
+            let includeAncestors = updateOptions.includeAncestors ?? true;
+            let previousDirectories = includeAncestors
+                ? watchedResolutionDirectories
+                : watchedFileDirectories;
+            let nextWatchedDirectories = new Set(previousDirectories);
             for (let directory of delta.add) {
                 nextWatchedDirectories.add(directory);
             }
             for (let directory of delta.remove) {
                 nextWatchedDirectories.delete(directory);
             }
-            let nextTargets = getWatchTargetsForDirectories(options.rootDir, [...nextWatchedDirectories]);
+            if (includeAncestors) {
+                watchedResolutionDirectories = nextWatchedDirectories;
+            }
+            else {
+                watchedFileDirectories = nextWatchedDirectories;
+            }
+            let nextTargets = getWatchTargets({
+                rootDir: options.rootDir,
+                fileDirectories: [...watchedFileDirectories],
+                resolutionDirectories: [...watchedResolutionDirectories],
+            });
             let targetsToAdd = [...nextTargets].filter((target) => !watchedTargets.has(target));
             let targetsToRemove = [...watchedTargets].filter((target) => !nextTargets.has(target));
             if (targetsToRemove.length > 0) {
@@ -41,7 +56,6 @@ export function createAssetServerWatcher(options) {
             if (targetsToAdd.length > 0) {
                 watcher.add(targetsToAdd);
             }
-            watchedDirectories = nextWatchedDirectories;
             watchedTargets = nextTargets;
         },
     };
@@ -58,11 +72,14 @@ function resolveChokidarWatchOptions(options) {
         usePolling: options.poll ?? false,
     };
 }
-function getWatchTargetsForDirectories(rootDir, directories) {
-    let normalizedRootDir = normalizeFilePath(rootDir);
+function getWatchTargets(options) {
+    let normalizedRootDir = normalizeFilePath(options.rootDir);
     let targets = new Set();
     let configAncestors = new Set();
-    for (let directory of directories) {
+    for (let directory of options.fileDirectories) {
+        targets.add(normalizeFilePath(directory).replace(/\/+$/, ''));
+    }
+    for (let directory of options.resolutionDirectories) {
         let normalizedDirectory = normalizeFilePath(directory).replace(/\/+$/, '');
         targets.add(normalizedDirectory);
         if (!isSameOrDescendantPath(normalizedDirectory, normalizedRootDir))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/assets",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "Fetch-based server for compiling browser JS/TS and CSS assets on demand",
   "author": "Michael Jackson <mjijackson@gmail.com>",
   "license": "MIT",
@@ -26,6 +26,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
+    "@oxc-project/runtime": "^0.121.0",
     "chokidar": "^5.0.0",
     "es-module-lexer": "^2.0.0",
     "get-tsconfig": "^4.13.6",
@@ -37,13 +38,17 @@
     "oxc-transform": "^0.121.0",
     "picomatch": "^4.0.4",
     "source-map-js": "^1.2.1",
-    "@remix-run/headers": "0.19.0",
-    "@remix-run/route-pattern": "0.20.1"
+    "@remix-run/file-storage": "0.13.4",
+    "@remix-run/headers": "0.20.0",
+    "@remix-run/mime": "0.4.1",
+    "@remix-run/route-pattern": "0.21.0"
   },
   "devDependencies": {
     "@types/node": "^24.6.0",
     "@types/picomatch": "^4.0.3",
-    "@typescript/native-preview": "7.0.0-dev.20251125.1"
+    "@typescript/native-preview": "7.0.0-dev.20251125.1",
+    "@remix-run/assert": "0.2.0",
+    "@remix-run/test": "0.4.0"
   },
   "keywords": [
     "remix",
@@ -58,7 +63,8 @@
     "bench": "pnpm --dir ./bench run bench",
     "build": "tsgo -p tsconfig.build.json",
     "clean": "git clean -fdX",
-    "test": "node --disable-warning=ExperimentalWarning --test './src/**/*.test.ts'",
+    "test": "remix-test",
+    "test:bun": "bun x --bun remix-test",
     "typecheck": "tsgo --noEmit"
   }
 }

package/src/assets.ts

@@ -1,2 +1,3 @@
 export { createAssetServer } from './lib/asset-server.ts'
+export { defineFileTransform } from './lib/files/config.ts'
 export type { AssetServer, AssetServerOptions } from './lib/asset-server.ts'

package/src/lib/access.ts

@@ -1,6 +1,8 @@
 import { createFileMatcher } from './file-matcher.ts'
+import { isInjectedPackageFilePath } from './injected-packages.ts'
 
 type AccessPolicy = {
+  isDenied(filePath: string): boolean
   isAllowed(filePath: string): boolean
 }
 
@@ -14,10 +16,17 @@ export function createAccessPolicy(options: {
     createFileMatcher(pattern, options.rootDir),
   )
 
+  function isDenied(filePath: string): boolean {
+    if (isInjectedPackageFilePath(filePath)) return false
+    return denyMatchers.length > 0 && denyMatchers.some((matcher) => matcher(filePath))
+  }
+
   return {
+    isDenied,
     isAllowed(filePath) {
+      if (isInjectedPackageFilePath(filePath)) return true
       if (!allowMatchers.some((matcher) => matcher(filePath))) return false
-      if (denyMatchers.length > 0 && denyMatchers.some((matcher) => matcher(filePath))) return false
+      if (isDenied(filePath)) return false
       return true
     },
   }