@remix-run/assets 0.4.4 → 0.6.0

package/dist/lib/loaders.d.ts

@@ -0,0 +1,57 @@
+type ModuleFloat16Array = typeof globalThis extends {
+    Float16Array: {
+        prototype: infer array;
+    };
+} ? array : never;
+type ModuleTypedArray = Uint8Array | Uint8ClampedArray | Uint16Array | Uint32Array | Int8Array | Int16Array | Int32Array | BigUint64Array | BigInt64Array | ModuleFloat16Array | Float32Array | Float64Array;
+type ModuleLoadSource = string | ArrayBuffer | ModuleTypedArray;
+/**
+ * Synchronously loads a module or delegates to the next configured loader.
+ *
+ * Loaders follow Node's synchronous `load` hook signature and chaining contract. The asset server
+ * passes them JavaScript after its TypeScript/JavaScript transform and before HMR analysis and
+ * minification. Each loader must delegate to `nextLoad` or return `shortCircuit: true`.
+ *
+ * @param url Resolved `file:` URL for the module being compiled.
+ * @param context Format, conditions, attributes, and public asset URL for this load.
+ * @param nextLoad Next loader in the chain, ending with the asset server's compiled JavaScript.
+ * @returns A Node-compatible load result containing ES module source.
+ */
+export type ModuleLoader = (url: string, context: ModuleLoadContext, nextLoad: NextModuleLoader) => ModuleLoadResult;
+/**
+ * Continues loading through the remaining loader chain.
+ *
+ * Omitted context fields retain their current values.
+ *
+ * @param url Current module URL. Loaders cannot change this URL.
+ * @param context Context fields to override for the remainder of this load.
+ * @returns The source produced by the remaining loaders or the asset compiler.
+ */
+export type NextModuleLoader = (url: string, context?: Partial<ModuleLoadContext>) => ModuleLoadResult;
+/** State passed through a module loader chain. */
+export interface ModuleLoadContext {
+    /** Package export conditions used while compiling this module. */
+    conditions: string[];
+    /** Current module format. Asset-server loaders must ultimately return `'module'`. */
+    format: string | null | undefined;
+    /** Import attributes supplied by the previous loader. Authored import attributes are unsupported. */
+    importAttributes: Record<string, string | undefined>;
+    /**
+     * Stable public URL path used to request this module from the asset server.
+     *
+     * Unlike Node's standard load context, this field is provided so loaders can use the browser
+     * module identity rather than its private filesystem URL.
+     */
+    moduleUrl?: string;
+}
+/** Source returned by a module loader. */
+export interface ModuleLoadResult {
+    /** Loaded module format. Must be `'module'` for asset-server scripts. */
+    format: string | null | undefined;
+    /** Whether this result intentionally ends the loader chain without calling `nextLoad`. */
+    shortCircuit?: boolean;
+    /** Compiled JavaScript source, optionally rewritten by the loader. */
+    source?: ModuleLoadSource;
+}
+export {};
+//# sourceMappingURL=loaders.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"loaders.d.ts","sourceRoot":"","sources":["../../src/lib/loaders.ts"],"names":[],"mappings":"AAAA,KAAK,kBAAkB,GAAG,OAAO,UAAU,SAAS;IAClD,YAAY,EAAE;QAAE,SAAS,EAAE,MAAM,KAAK,CAAA;KAAE,CAAA;CACzC,GACG,KAAK,GACL,KAAK,CAAA;AAET,KAAK,gBAAgB,GACjB,UAAU,GACV,iBAAiB,GACjB,WAAW,GACX,WAAW,GACX,SAAS,GACT,UAAU,GACV,UAAU,GACV,cAAc,GACd,aAAa,GACb,kBAAkB,GAClB,YAAY,GACZ,YAAY,CAAA;AAEhB,KAAK,gBAAgB,GAAG,MAAM,GAAG,WAAW,GAAG,gBAAgB,CAAA;AAE/D;;;;;;;;;;;GAWG;AACH,MAAM,MAAM,YAAY,GAAG,CACzB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,iBAAiB,EAC1B,QAAQ,EAAE,gBAAgB,KACvB,gBAAgB,CAAA;AAErB;;;;;;;;GAQG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAC7B,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,KACjC,gBAAgB,CAAA;AAErB,kDAAkD;AAClD,MAAM,WAAW,iBAAiB;IAChC,kEAAkE;IAClE,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,qFAAqF;IACrF,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IACjC,qGAAqG;IACrG,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;IACpD;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,0CAA0C;AAC1C,MAAM,WAAW,gBAAgB;IAC/B,yEAAyE;IACzE,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IACjC,0FAA0F;IAC1F,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,sEAAsE;IACtE,MAAM,CAAC,EAAE,gBAAgB,CAAA;CAC1B"}

package/dist/lib/loaders.js

@@ -0,0 +1 @@
+export {};

package/dist/lib/module-store.d.ts

@@ -8,11 +8,21 @@ export type FileSnapshot = {
     size: bigint;
 };
 export type ModuleSnapshot = ReadonlyMap<string, FileSnapshot>;
+type ModuleLinksState = {
+    acceptedDependencies: ReadonlySet<string>;
+    dependencies: ReadonlySet<string>;
+};
 type ModuleRecordState<transformed, resolved, emitted> = {
+    emittedVersion?: number;
+    hmrUpdateTimestamp?: number;
     identityPath: string;
     invalidationVersion: number;
     transformed?: transformed;
+    transformedVersion?: number;
     resolved?: resolved;
+    resolvedVersion?: number;
+    lastResolved?: resolved;
+    links: ModuleLinksState;
     emitted?: emitted;
     emittedSnapshot?: ModuleSnapshot;
     staleEmitted?: emitted;
@@ -23,6 +33,14 @@ type ModuleRecordState<transformed, resolved, emitted> = {
 export type ModuleRecord<transformed, resolved, emitted> = Readonly<ModuleRecordState<transformed, resolved, emitted>>;
 export type ModuleStore<transformed, resolved, emitted> = {
     get(identityPath: string): ModuleRecord<transformed, resolved, emitted>;
+    getAcceptedImporters(identityPath: string): ReadonlySet<string>;
+    getHmrUpdateTimestamp(identityPath: string): number | undefined;
+    getImporters(identityPath: string): ReadonlySet<string>;
+    getLastResolved(identityPath: string): resolved | undefined;
+    isEmittedFresh(record: ModuleRecord<transformed, resolved, emitted>): boolean;
+    isResolvedFresh(record: ModuleRecord<transformed, resolved, emitted>): boolean;
+    isTransformedFresh(record: ModuleRecord<transformed, resolved, emitted>): boolean;
+    setHmrUpdateTimestamp(identityPath: string, timestamp: number): void;
     clearTransformed(identityPath: string, tracking: readonly ModuleTracking[]): void;
     setTransformed(identityPath: string, transformed: transformed, tracking: readonly ModuleTracking[]): void;
     setResolved(identityPath: string, resolved: resolved, tracking: readonly ModuleTracking[]): void;
@@ -32,10 +50,16 @@ export type ModuleStore<transformed, resolved, emitted> = {
     invalidateAll(): void;
 };
 export declare function createModuleStore<transformed, resolved, emitted>(options?: {
+    getAcceptedDependencies?: (resolved: resolved) => readonly string[];
+    getDependencies?: (resolved: resolved) => readonly string[];
     onWatchDirectoriesChange?: (delta: {
         add: string[];
         remove: string[];
     }) => void;
+    onWatchFilesChange?: (delta: {
+        add: string[];
+        remove: string[];
+    }) => void;
 }): ModuleStore<transformed, resolved, emitted>;
 export {};
 //# sourceMappingURL=module-store.d.ts.map

package/dist/lib/module-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module-store.d.ts","sourceRoot":"","sources":["../../src/lib/module-store.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,cAAc,GAAG;IAC3B,YAAY,EAAE,SAAS,MAAM,EAAE,CAAA;IAC/B,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CACvC,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,KAAK,GAAG,QAAQ,CAAA;AAE1D,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,MAAM,MAAM,cAAc,GAAG,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;AAE9D,KAAK,iBAAiB,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,IAAI;IACvD,YAAY,EAAE,MAAM,CAAA;IACpB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,WAAW,CAAC,EAAE,WAAW,CAAA;IACzB,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,eAAe,CAAC,EAAE,cAAc,CAAA;IAChC,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,oBAAoB,CAAC,EAAE,cAAc,CAAA;IACrC,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;IACjC,kBAAkB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CACxC,CAAA;AAED,MAAM,MAAM,YAAY,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,IAAI,QAAQ,CACjE,iBAAiB,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,CAAC,CAClD,CAAA;AAeD,MAAM,MAAM,WAAW,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,IAAI;IACxD,GAAG,CAAC,YAAY,EAAE,MAAM,GAAG,YAAY,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IACvE,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,cAAc,EAAE,GAAG,IAAI,CAAA;IACjF,cAAc,CACZ,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,SAAS,cAAc,EAAE,GAClC,IAAI,CAAA;IACP,WAAW,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,cAAc,EAAE,GAAG,IAAI,CAAA;IAChG,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,cAAc,EAAE,GAAG,IAAI,CAAA;IAC9E,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,GAAG,IAAI,GAAG,IAAI,CAAA;IACzF,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,IAAI,CAAA;IACvE,aAAa,IAAI,IAAI,CAAA;CACtB,CAAA;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,EAC9D,OAAO,GAAE;IACP,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,GAAG,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,KAAK,IAAI,CAAA;CAC3E,GACL,WAAW,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,CAAC,CA4M7C"}
+{"version":3,"file":"module-store.d.ts","sourceRoot":"","sources":["../../src/lib/module-store.ts"],"names":[],"mappings":"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"}

package/dist/lib/module-store.js

@@ -1,8 +1,12 @@
-import { getFilePathDirectory } from "./paths.js";
+import { getFilePathDirectory } from './paths.js';
 export function createModuleStore(options = {}) {
     let recordsByIdentityPath = new Map();
+    let importersByDepPath = new Map();
+    let acceptedImportersByDepPath = new Map();
     let recordsByTrackedFile = new Map();
     let watchDirectoryRefCountByPath = new Map();
+    let watchFileRefCountByPath = new Map();
+    let emptyImporters = new Set();
     return {
         get(identityPath) {
             let existing = recordsByIdentityPath.get(identityPath);
@@ -11,17 +15,46 @@ export function createModuleStore(options = {}) {
             let record = {
                 identityPath,
                 invalidationVersion: 0,
+                links: createEmptyLinks(),
                 trackedFiles: new Set(),
                 trackedDirectories: new Set(),
             };
             recordsByIdentityPath.set(identityPath, record);
             return record;
         },
+        getAcceptedImporters(identityPath) {
+            return acceptedImportersByDepPath.get(identityPath) ?? emptyImporters;
+        },
+        getHmrUpdateTimestamp(identityPath) {
+            return recordsByIdentityPath.get(identityPath)?.hmrUpdateTimestamp;
+        },
+        getImporters(identityPath) {
+            return importersByDepPath.get(identityPath) ?? emptyImporters;
+        },
+        getLastResolved(identityPath) {
+            return recordsByIdentityPath.get(identityPath)?.lastResolved;
+        },
+        isEmittedFresh(record) {
+            return record.emittedVersion === record.invalidationVersion;
+        },
+        isResolvedFresh(record) {
+            return record.resolvedVersion === record.invalidationVersion;
+        },
+        isTransformedFresh(record) {
+            return record.transformedVersion === record.invalidationVersion;
+        },
+        setHmrUpdateTimestamp(identityPath, timestamp) {
+            let record = getOrCreateMutableRecord(identityPath);
+            record.hmrUpdateTimestamp = timestamp;
+        },
         clearTransformed(identityPath, tracking) {
             let record = getOrCreateMutableRecord(identityPath);
             record.transformed = undefined;
+            record.transformedVersion = undefined;
             record.resolved = undefined;
+            record.resolvedVersion = undefined;
             record.emitted = undefined;
+            record.emittedVersion = undefined;
             record.emittedSnapshot = undefined;
             record.staleEmitted = undefined;
             record.staleEmittedSnapshot = undefined;
@@ -30,8 +63,11 @@ export function createModuleStore(options = {}) {
         setTransformed(identityPath, transformed, tracking) {
             let record = getOrCreateMutableRecord(identityPath);
             record.transformed = transformed;
+            record.transformedVersion = record.invalidationVersion;
             record.resolved = undefined;
+            record.resolvedVersion = undefined;
             record.emitted = undefined;
+            record.emittedVersion = undefined;
             record.emittedSnapshot = undefined;
             record.staleEmitted = undefined;
             record.staleEmittedSnapshot = undefined;
@@ -39,17 +75,25 @@ export function createModuleStore(options = {}) {
         },
         setResolved(identityPath, resolved, tracking) {
             let record = getOrCreateMutableRecord(identityPath);
+            removeResolvedIndexes(record);
             record.resolved = resolved;
+            record.resolvedVersion = record.invalidationVersion;
+            record.lastResolved = resolved;
+            record.links = createLinks(resolved);
             record.emitted = undefined;
+            record.emittedVersion = undefined;
             record.emittedSnapshot = undefined;
             record.staleEmitted = undefined;
             record.staleEmittedSnapshot = undefined;
             setTracking(record, tracking);
+            addResolvedIndexes(record);
         },
         clearResolved(identityPath, tracking) {
             let record = getOrCreateMutableRecord(identityPath);
             record.resolved = undefined;
+            record.resolvedVersion = undefined;
             record.emitted = undefined;
+            record.emittedVersion = undefined;
             record.emittedSnapshot = undefined;
             record.staleEmitted = undefined;
             record.staleEmittedSnapshot = undefined;
@@ -58,6 +102,7 @@ export function createModuleStore(options = {}) {
         setEmitted(identityPath, emitted, snapshot) {
             let record = getOrCreateMutableRecord(identityPath);
             record.emitted = emitted;
+            record.emittedVersion = record.invalidationVersion;
             record.emittedSnapshot = snapshot ?? undefined;
             record.staleEmitted = undefined;
             record.staleEmittedSnapshot = undefined;
@@ -73,19 +118,28 @@ export function createModuleStore(options = {}) {
             }
             for (let identityPath of affected) {
                 let record = recordsByIdentityPath.get(identityPath);
-                if (record)
-                    invalidateRecord(record, { retainStale: event === 'change' });
+                if (record) {
+                    if (event === 'change') {
+                        invalidateContent(record, { retainStale: true });
+                    }
+                    else {
+                        invalidateGraph(record);
+                    }
+                }
             }
             if (event === 'unlink') {
                 let deletedRecord = recordsByIdentityPath.get(filePath);
                 if (deletedRecord) {
+                    if (!affected.has(filePath)) {
+                        invalidateGraph(deletedRecord);
+                    }
                     clearTracking(deletedRecord);
                 }
             }
         },
         invalidateAll() {
             for (let record of recordsByIdentityPath.values()) {
-                invalidateRecord(record, { retainStale: false });
+                invalidateGraph(record);
             }
         },
     };
@@ -96,13 +150,14 @@ export function createModuleStore(options = {}) {
         let record = {
             identityPath,
             invalidationVersion: 0,
+            links: createEmptyLinks(),
             trackedFiles: new Set(),
             trackedDirectories: new Set(),
         };
         recordsByIdentityPath.set(identityPath, record);
         return record;
     }
-    function invalidateRecord(record, options) {
+    function invalidateContent(record, options) {
         if (!options.retainStale) {
             record.staleEmitted = undefined;
             record.staleEmittedSnapshot = undefined;
@@ -115,14 +170,39 @@ export function createModuleStore(options = {}) {
             record.staleEmitted = undefined;
             record.staleEmittedSnapshot = undefined;
         }
-        record.emitted = undefined;
-        record.emittedSnapshot = undefined;
-        record.resolved = undefined;
-        record.transformed = undefined;
         record.invalidationVersion += 1;
     }
+    function invalidateGraph(record) {
+        record.hmrUpdateTimestamp = undefined;
+        invalidateContent(record, { retainStale: false });
+    }
+    function createLinks(resolved) {
+        return {
+            acceptedDependencies: new Set(options.getAcceptedDependencies?.(resolved) ?? []),
+            dependencies: new Set(options.getDependencies?.(resolved) ?? []),
+        };
+    }
+    function createEmptyLinks() {
+        return {
+            acceptedDependencies: new Set(),
+            dependencies: new Set(),
+        };
+    }
+    function addResolvedIndexes(record) {
+        for (let depPath of record.links.dependencies) {
+            addToIndexedSet(importersByDepPath, depPath, record.identityPath);
+        }
+        for (let depPath of record.links.acceptedDependencies) {
+            addToIndexedSet(acceptedImportersByDepPath, depPath, record.identityPath);
+        }
+    }
+    function removeResolvedIndexes(record) {
+        removeFromIndexedSets(importersByDepPath, record.identityPath);
+        removeFromIndexedSets(acceptedImportersByDepPath, record.identityPath);
+    }
     function setTracking(record, tracking) {
         let previousWatchedDirectories = getWatchedDirectories(record);
+        let previousWatchedFiles = new Set(record.trackedFiles);
         removeIndexes(record);
         let normalizedTracking = mergeTracking(tracking);
         record.trackedFiles = normalizedTracking.trackedFiles;
@@ -131,8 +211,10 @@ export function createModuleStore(options = {}) {
             addToIndexedSet(recordsByTrackedFile, trackedFile, record.identityPath);
         }
         let nextWatchedDirectories = getWatchedDirectories(record);
-        let delta = updateWatchDirectoryRefCounts(previousWatchedDirectories, nextWatchedDirectories);
-        emitWatchDirectoryDelta(delta);
+        let directoryDelta = updateWatchDirectoryRefCounts(previousWatchedDirectories, nextWatchedDirectories);
+        let fileDelta = updateWatchFileRefCounts(previousWatchedFiles, record.trackedFiles);
+        emitWatchDirectoryDelta(directoryDelta);
+        emitWatchFileDelta(fileDelta);
     }
     function clearTracking(record) {
         setTracking(record, []);
@@ -170,6 +252,34 @@ export function createModuleStore(options = {}) {
         }
         return { add, remove };
     }
+    function updateWatchFileRefCounts(previousWatchedFiles, nextWatchedFiles) {
+        let add = [];
+        let remove = [];
+        for (let file of previousWatchedFiles) {
+            if (nextWatchedFiles.has(file))
+                continue;
+            let previousCount = watchFileRefCountByPath.get(file);
+            if (!previousCount)
+                continue;
+            if (previousCount === 1) {
+                watchFileRefCountByPath.delete(file);
+                remove.push(file);
+            }
+            else {
+                watchFileRefCountByPath.set(file, previousCount - 1);
+            }
+        }
+        for (let file of nextWatchedFiles) {
+            if (previousWatchedFiles.has(file))
+                continue;
+            let previousCount = watchFileRefCountByPath.get(file) ?? 0;
+            watchFileRefCountByPath.set(file, previousCount + 1);
+            if (previousCount === 0) {
+                add.push(file);
+            }
+        }
+        return { add, remove };
+    }
     function emitWatchDirectoryDelta(delta) {
         if (!options.onWatchDirectoriesChange)
             return;
@@ -177,6 +287,13 @@ export function createModuleStore(options = {}) {
             return;
         options.onWatchDirectoriesChange(delta);
     }
+    function emitWatchFileDelta(delta) {
+        if (!options.onWatchFilesChange)
+            return;
+        if (delta.add.length === 0 && delta.remove.length === 0)
+            return;
+        options.onWatchFilesChange(delta);
+    }
 }
 function addToIndexedSet(map, key, value) {
     let existing = map.get(key) ?? new Set();
@@ -192,6 +309,14 @@ function removeFromIndexedSet(map, key, value) {
         map.delete(key);
     }
 }
+function removeFromIndexedSets(map, value) {
+    for (let [key, values] of map) {
+        values.delete(value);
+        if (values.size === 0) {
+            map.delete(key);
+        }
+    }
+}
 function matchesTrackedDirectory(trackedDirectories, filePath) {
     for (let trackedDirectory of trackedDirectories) {
         if (filePath === trackedDirectory || filePath.startsWith(`${trackedDirectory}/`))

package/dist/lib/routes.d.ts

@@ -1,11 +1,19 @@
-interface RouteConfig {
-    fileMap: Readonly<Record<string, string>>;
+interface MountConfig {
+    mounts: Readonly<Record<string, string>>;
     rootDir: string;
 }
 export interface CompiledRoutes {
     resolveUrlPathname(pathname: string): string | null;
+    matchUrlPathname(pathname: string): AssetRouteMatch | null;
     toUrlPathname(filePath: string): string | null;
+    matchFilePath(filePath: string): AssetRouteMatch | null;
 }
-export declare function compileRoutes(basePath: string, routeConfigs: readonly RouteConfig[]): CompiledRoutes;
+export interface AssetRouteMatch {
+    filePath: string;
+    fileRoot: string;
+    urlPathname: string;
+    urlRoot: string;
+}
+export declare function compileRoutes(basePath: string, mountConfigs: readonly MountConfig[]): CompiledRoutes;
 export {};
 //# sourceMappingURL=routes.d.ts.map

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/lib/routes.ts"],"names":[],"mappings":"AASA,UAAU,WAAW;IACnB,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IACxC,OAAO,EAAE,MAAM,CAAA;CAChB;AASD,MAAM,WAAW,cAAc;IAC7B,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;IACnD,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CAAA;IAC1D,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;IAC9C,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CAAA;CACxD;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,SAAS,WAAW,EAAE,GACnC,cAAc,CA8DhB"}

package/dist/lib/routes.js

@@ -1,99 +1,143 @@
-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";
-function normalizeFilePattern(pattern) {
-    if (isAbsoluteFilePath(pattern)) {
-        throw new Error(`File route patterns must be relative to the asset server root.\nPattern: ${pattern}`);
-    }
-    return normalizePathname(pattern);
-}
-export function compileRoutes(basePath, routeConfigs) {
-    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,
-    })));
+import * as fs from 'node:fs';
+import { isAbsoluteFilePath, normalizeFilePath, normalizePathname, resolveFilePath, } from './paths.js';
+export function compileRoutes(basePath, mountConfigs) {
+    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);
-            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));
-            }
-            return null;
+            return matchFilePath(filePath)?.urlPathname ?? null;
         },
+        matchFilePath,
     };
+    function matchUrlPathname(pathname) {
+        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;
+    }
+    function matchFilePath(filePath) {
+        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, options) {
-    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);
+function compileMount(urlRoot, fileRoot, options) {
+    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) {
-    let segments = [];
-    for (let segment of pattern.split('/')) {
-        if (segment === '' || segment === '.')
-            continue;
-        if (segment === '..') {
-            segments.pop();
-            continue;
-        }
-        segments.push(segment);
+function normalizeMountUrlRoot(urlRoot) {
+    let normalizedRoot = normalizePathname(urlRoot).replace(/\/+$/, '') || '/';
+    let url = new URL(normalizedRoot, 'http://remix.run');
+    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, filePattern) {
-    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, fileRoot) {
+    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) {
+    return pathname.split('/').filter((segment) => segment !== '').length;
+}
+function joinUrlPath(root, path) {
+    if (path === '' || path === '/')
+        return normalizeMountUrlRoot(root);
+    return normalizePathname(`${root.replace(/\/+$/, '')}/${path.replace(/^\/+/, '')}`);
+}
+function getPathWithinRoot(root, value) {
+    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) {
+    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, label) {
-    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) {
+    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}".`);
+        }
     }
 }
-function getPathnameCaptures(pattern) {
-    return getRoutePatternCaptures(pattern).filter((capture) => capture.part === 'pathname');
+function rootsOverlap(root, otherRoot) {
+    return (root === otherRoot ||
+        root === '/' ||
+        otherRoot === '/' ||
+        root.startsWith(`${otherRoot}/`) ||
+        otherRoot.startsWith(`${root}/`));
+}
+function isUnresolvedPathError(error, filePath) {
+    // 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('//'))));
 }