@remix-run/assets 0.3.0 → 0.4.1

package/dist/lib/files/config.js

@@ -0,0 +1,219 @@
+import { supportedScriptExtensions } from "../scripts/resolve.js";
+export function defineFileTransform(transform) {
+    return transform;
+}
+const reservedFileExtensions = new Set([...supportedScriptExtensions, '.css', '.map']);
+const defaultMaxRequestTransforms = 5;
+export function normalizeFilesOptions(files) {
+    if (files == null) {
+        return {
+            extensions: [],
+            globalTransforms: [],
+            hasTransforms: false,
+            maxRequestTransforms: defaultMaxRequestTransforms,
+            transforms: new Map(),
+        };
+    }
+    if (!Array.isArray(files.extensions)) {
+        throw new TypeError('files.extensions must be an array');
+    }
+    let normalizedExtensions = [];
+    let seen = new Set();
+    for (let extension of files.extensions) {
+        if (typeof extension !== 'string') {
+            throw new TypeError('files.extensions values must be strings');
+        }
+        let normalizedExtension = extension.trim().toLowerCase();
+        if (!/^\.[A-Za-z0-9_-]+$/.test(normalizedExtension)) {
+            throw new TypeError(`files.extensions values must use ".ext" format. Received "${extension}".`);
+        }
+        if (reservedFileExtensions.has(normalizedExtension)) {
+            throw new TypeError(`files.extensions cannot include compiled asset extensions like "${normalizedExtension}".`);
+        }
+        if (seen.has(normalizedExtension))
+            continue;
+        seen.add(normalizedExtension);
+        normalizedExtensions.push(normalizedExtension);
+    }
+    let transforms = files.transforms ?? {};
+    if (transforms === null || typeof transforms !== 'object' || Array.isArray(transforms)) {
+        throw new TypeError('files.transforms must be an object');
+    }
+    let normalizedTransforms = new Map();
+    for (let [name, transform] of Object.entries(transforms)) {
+        if (!/^[A-Za-z0-9_-]+$/.test(name)) {
+            throw new TypeError(`files.transforms keys must use "transform-name" format. Received "${name}".`);
+        }
+        if (transform === null ||
+            typeof transform !== 'object' ||
+            typeof transform.transform !== 'function') {
+            throw new TypeError(`files.transforms.${name} must define a transform() function`);
+        }
+        if ('param' in transform &&
+            transform.param !== undefined &&
+            transform.param !== true &&
+            transform.param !== 'optional') {
+            throw new TypeError(`files.transforms.${name}.param must be true or "optional"`);
+        }
+        normalizedTransforms.set(name, {
+            ...transform,
+            extensions: normalizeTransformExtensions(transform.extensions, `files.transforms.${name}.extensions`),
+        });
+    }
+    let globalTransforms = files.globalTransforms ?? [];
+    if (!Array.isArray(globalTransforms)) {
+        throw new TypeError('files.globalTransforms must be an array');
+    }
+    let normalizedGlobalTransforms = [];
+    for (let [index, transform] of globalTransforms.entries()) {
+        if (typeof transform === 'function') {
+            normalizedGlobalTransforms.push({ transform });
+            continue;
+        }
+        if (transform === null || typeof transform !== 'object') {
+            throw new TypeError(`files.globalTransforms[${index}] must be a function or object`);
+        }
+        if ('name' in transform && transform.name !== undefined && typeof transform.name !== 'string') {
+            throw new TypeError(`files.globalTransforms[${index}].name must be a string`);
+        }
+        if (typeof transform.transform !== 'function') {
+            throw new TypeError(`files.globalTransforms[${index}] must define a transform() function`);
+        }
+        normalizedGlobalTransforms.push({
+            ...transform,
+            extensions: normalizeTransformExtensions(transform.extensions, `files.globalTransforms[${index}].extensions`),
+        });
+    }
+    let maxRequestTransforms = files.maxRequestTransforms ?? defaultMaxRequestTransforms;
+    if (!Number.isInteger(maxRequestTransforms) || maxRequestTransforms < 1) {
+        throw new TypeError('files.maxRequestTransforms must be a positive integer');
+    }
+    if (files.cache !== undefined) {
+        if (files.cache === null ||
+            typeof files.cache !== 'object' ||
+            typeof files.cache.get !== 'function' ||
+            typeof files.cache.set !== 'function') {
+            throw new TypeError('files.cache must implement the FileStorage interface');
+        }
+    }
+    return {
+        cache: files.cache,
+        extensions: normalizedExtensions,
+        globalTransforms: normalizedGlobalTransforms,
+        hasTransforms: normalizedTransforms.size > 0 || normalizedGlobalTransforms.length > 0,
+        maxRequestTransforms,
+        transforms: normalizedTransforms,
+    };
+}
+function normalizeTransformExtensions(extensions, optionPath) {
+    if (extensions === undefined)
+        return undefined;
+    if (!Array.isArray(extensions)) {
+        throw new TypeError(`${optionPath} must be an array`);
+    }
+    if (extensions.length === 0) {
+        throw new TypeError(`${optionPath} must include at least one extension`);
+    }
+    let normalizedExtensions = [];
+    let seen = new Set();
+    for (let extension of extensions) {
+        if (typeof extension !== 'string') {
+            throw new TypeError(`${optionPath} values must be strings`);
+        }
+        let normalizedExtension = extension.trim().toLowerCase();
+        if (!/^\.[A-Za-z0-9_-]+$/.test(normalizedExtension)) {
+            throw new TypeError(`${optionPath} values must use ".ext" format. Received "${extension}".`);
+        }
+        if (seen.has(normalizedExtension))
+            continue;
+        seen.add(normalizedExtension);
+        normalizedExtensions.push(normalizedExtension);
+    }
+    return normalizedExtensions;
+}
+export function serializeAssetTransformInvocations(transforms, transformsByName, maxTransforms = defaultMaxRequestTransforms) {
+    if (transforms.length > maxTransforms) {
+        throw new TypeError(`Expected at most ${maxTransforms} request transforms`);
+    }
+    return transforms.map((transformInvocation) => normalizeAssetTransformInvocation(transformInvocation, transformsByName, (message) => {
+        throw new TypeError(message);
+    }));
+}
+export function parseAssetTransformInvocations(transformsQuery, transformsByName, maxTransforms = defaultMaxRequestTransforms) {
+    if (transformsQuery.length > maxTransforms) {
+        throw new TypeError(`Expected at most ${maxTransforms} request transforms`);
+    }
+    return transformsQuery.map((transformQuery) => parseSerializedAssetTransformInvocation(transformQuery, transformsByName, (message) => {
+        throw new TypeError(message);
+    }));
+}
+function normalizeAssetTransformInvocation(transformInvocation, transformsByName, onError) {
+    if (typeof transformInvocation === 'string') {
+        if (!/^[A-Za-z0-9_-]+$/.test(transformInvocation)) {
+            return onError('Expected each transform name to use "transform-name" format');
+        }
+        let transform = transformsByName.get(transformInvocation);
+        if (transform === undefined) {
+            return onError(`Unknown file transform "${transformInvocation}"`);
+        }
+        if (transform.param === true) {
+            return onError(`File transform "${transformInvocation}" requires a param`);
+        }
+        return transformInvocation;
+    }
+    if (!Array.isArray(transformInvocation)) {
+        return onError('Expected each transform to be a string name or tuple');
+    }
+    if (transformInvocation.length === 0 || transformInvocation.length > 2) {
+        return onError('Expected each transform tuple to have one or two items');
+    }
+    let [name, rawParam] = transformInvocation;
+    if (typeof name !== 'string' || !/^[A-Za-z0-9_-]+$/.test(name)) {
+        return onError('Expected each transform name to use "transform-name" format');
+    }
+    let transform = transformsByName.get(name);
+    if (transform === undefined) {
+        return onError(`Unknown file transform "${name}"`);
+    }
+    if (transformInvocation.length === 1) {
+        if (transform.param === true) {
+            return onError(`File transform "${name}" requires a param`);
+        }
+        return name;
+    }
+    if (typeof rawParam !== 'string') {
+        return onError(`Invalid param for file transform "${name}": expected a string`);
+    }
+    if (transform.param === undefined) {
+        if (transformInvocation.length === 2) {
+            return onError(`File transform "${name}" does not accept a param`);
+        }
+        return name;
+    }
+    return `${name}:${rawParam}`;
+}
+function parseSerializedAssetTransformInvocation(transformQuery, transformsByName, onError) {
+    let separatorIndex = transformQuery.indexOf(':');
+    let name = separatorIndex === -1 ? transformQuery : transformQuery.slice(0, separatorIndex);
+    let param = separatorIndex === -1 ? undefined : transformQuery.slice(separatorIndex + 1);
+    if (!/^[A-Za-z0-9_-]+$/.test(name)) {
+        return onError('Expected each transform name to use "transform-name" format');
+    }
+    let transform = transformsByName.get(name);
+    if (transform === undefined) {
+        return onError(`Unknown file transform "${name}"`);
+    }
+    if (transform.param === undefined) {
+        if (param !== undefined) {
+            return onError(`File transform "${name}" does not accept a param`);
+        }
+        return name;
+    }
+    if (transform.param === true && param === undefined) {
+        return onError(`File transform "${name}" requires a param`);
+    }
+    if (param === undefined) {
+        return name;
+    }
+    return [name, param];
+}

package/dist/lib/files/store.d.ts

@@ -0,0 +1,31 @@
+export type FileSnapshot = {
+    filePath: string;
+    mtimeNs: bigint;
+    size: bigint;
+};
+export type SourceFileMetadata = {
+    contentType: string;
+    etag: string;
+    extension: string;
+    fingerprint: string | null;
+};
+type SourceFileRecordState = {
+    metadata?: SourceFileMetadata;
+    metadataSnapshot?: FileSnapshot;
+    identityPath: string;
+    invalidationVersion: number;
+    staleMetadata?: SourceFileMetadata;
+    staleMetadataSnapshot?: FileSnapshot;
+};
+export type SourceFileRecord = Readonly<SourceFileRecordState>;
+export type SourceFileStore = {
+    get(identityPath: string): SourceFileRecord;
+    invalidate(identityPath: string, options?: {
+        retainStale: boolean;
+    }): void;
+    invalidateForFileEvent(filePath: string, event: 'add' | 'change' | 'unlink'): void;
+    set(identityPath: string, metadata: SourceFileMetadata, snapshot: FileSnapshot | null): void;
+};
+export declare function createSourceFileStore(): SourceFileStore;
+export {};
+//# sourceMappingURL=store.d.ts.map

package/dist/lib/files/store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../../src/lib/files/store.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG;IACzB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;CAC3B,CAAA;AAED,KAAK,qBAAqB,GAAG;IAC3B,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,gBAAgB,CAAC,EAAE,YAAY,CAAA;IAC/B,YAAY,EAAE,MAAM,CAAA;IACpB,mBAAmB,EAAE,MAAM,CAAA;IAC3B,aAAa,CAAC,EAAE,kBAAkB,CAAA;IAClC,qBAAqB,CAAC,EAAE,YAAY,CAAA;CACrC,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC,qBAAqB,CAAC,CAAA;AAW9D,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,CAAC,YAAY,EAAE,MAAM,GAAG,gBAAgB,CAAA;IAC3C,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;QAAE,WAAW,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAA;IAC1E,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,QAAQ,GAAG,QAAQ,GAAG,IAAI,CAAA;IAClF,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,EAAE,QAAQ,EAAE,YAAY,GAAG,IAAI,GAAG,IAAI,CAAA;CAC7F,CAAA;AAED,wBAAgB,qBAAqB,IAAI,eAAe,CAoEvD"}

package/dist/lib/files/store.js

@@ -0,0 +1,63 @@
+export function createSourceFileStore() {
+    let recordsByIdentityPath = new Map();
+    let invalidationVersionByIdentityPath = new Map();
+    return {
+        get(identityPath) {
+            return getOrCreateRecord(identityPath);
+        },
+        invalidate(identityPath, options = { retainStale: false }) {
+            let record = recordsByIdentityPath.get(identityPath);
+            if (!record)
+                return;
+            invalidateRecord(record, options);
+        },
+        invalidateForFileEvent(filePath, event) {
+            let record = recordsByIdentityPath.get(filePath);
+            if (!record)
+                return;
+            invalidateRecord(record, { retainStale: event === 'change' });
+            if (event === 'unlink') {
+                recordsByIdentityPath.delete(filePath);
+            }
+        },
+        set(identityPath, metadata, snapshot) {
+            let record = recordsByIdentityPath.get(identityPath);
+            if (!record) {
+                record = getOrCreateRecord(identityPath);
+            }
+            record.metadata = metadata;
+            record.metadataSnapshot = snapshot ?? undefined;
+            record.staleMetadata = undefined;
+            record.staleMetadataSnapshot = undefined;
+        },
+    };
+    function invalidateRecord(record, options) {
+        if (!options.retainStale) {
+            record.staleMetadata = undefined;
+            record.staleMetadataSnapshot = undefined;
+        }
+        else if (record.metadata && record.metadataSnapshot) {
+            record.staleMetadata = record.metadata;
+            record.staleMetadataSnapshot = record.metadataSnapshot;
+        }
+        else if (!record.staleMetadata || !record.staleMetadataSnapshot) {
+            record.staleMetadata = undefined;
+            record.staleMetadataSnapshot = undefined;
+        }
+        record.metadata = undefined;
+        record.metadataSnapshot = undefined;
+        record.invalidationVersion += 1;
+        invalidationVersionByIdentityPath.set(record.identityPath, record.invalidationVersion);
+    }
+    function getOrCreateRecord(identityPath) {
+        let existing = recordsByIdentityPath.get(identityPath);
+        if (existing)
+            return existing;
+        let record = {
+            identityPath,
+            invalidationVersion: invalidationVersionByIdentityPath.get(identityPath) ?? 0,
+        };
+        recordsByIdentityPath.set(identityPath, record);
+        return record;
+    }
+}

package/dist/lib/fingerprint.d.ts

@@ -1,7 +1,7 @@
-export declare function hashContent(content: string): Promise<string>;
-export declare function generateFingerprint(options: {
+export declare function hashContent(content: string | Uint8Array<ArrayBufferLike>): Promise<string>;
+export declare function generateFingerprint(args: {
     buildId: string;
-    content: string;
+    content: string | Uint8Array<ArrayBufferLike>;
 }): Promise<string>;
 export declare function parseFingerprintSuffix(pathname: string): {
     pathname: string;

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

@@ -1 +1 @@
-{"version":3,"file":"fingerprint.d.ts","sourceRoot":"","sources":["../../src/lib/fingerprint.ts"],"names":[],"mappings":"AAGA,wBAAsB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAKlE;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE;IACjD,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAElB;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG;IACxD,QAAQ,EAAE,MAAM,CAAA;IAChB,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAA;CACpC,CAyBA;AAED,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAahG;AAED,wBAAgB,iCAAiC,CAAC,oBAAoB,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAE7F"}
+{"version":3,"file":"fingerprint.d.ts","sourceRoot":"","sources":["../../src/lib/fingerprint.ts"],"names":[],"mappings":"AAGA,wBAAsB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAIhG;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC,eAAe,CAAC,CAAA;CAC9C,GAAG,OAAO,CAAC,MAAM,CAAC,CAIlB;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG;IACxD,QAAQ,EAAE,MAAM,CAAA;IAChB,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAA;CACpC,CAyBA;AAED,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAahG;AAED,wBAAgB,iCAAiC,CAAC,oBAAoB,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAE7F"}

package/dist/lib/fingerprint.js

@@ -1,13 +1,13 @@
 const fingerprintedExtensionRE = /^(.+)\.@([A-Za-z0-9_-]+)(\.[^./]+)$/;
 const fingerprintedBasenameRE = /^(.+)\.@([A-Za-z0-9_-]+)$/;
 export async function hashContent(content) {
-    let encoder = new TextEncoder();
-    let data = encoder.encode(content);
-    let hashBuffer = await crypto.subtle.digest('SHA-256', data);
+    let bytes = typeof content === 'string' ? new TextEncoder().encode(content) : Buffer.from(content);
+    let hashBuffer = await crypto.subtle.digest('SHA-256', bytes);
     return Buffer.from(hashBuffer).toString('base64url').slice(0, 6);
 }
-export async function generateFingerprint(options) {
-    return hashContent(JSON.stringify([options.content, options.buildId]));
+export async function generateFingerprint(args) {
+    let content = typeof args.content === 'string' ? args.content : Buffer.from(args.content).toString('base64');
+    return hashContent(JSON.stringify([content, args.buildId]));
 }
 export function parseFingerprintSuffix(pathname) {
     let lastSlashIndex = pathname.lastIndexOf('/');

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

@@ -1 +1 @@
-{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/lib/routes.ts"],"names":[],"mappings":"AAeA,UAAU,WAAW;IACnB,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IACzC,OAAO,EAAE,MAAM,CAAA;CAChB;AAQD,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":"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"}

package/dist/lib/routes.js

@@ -1,4 +1,6 @@
 import { 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)) {
@@ -21,10 +23,10 @@ export function compileRoutes(basePath, routeConfigs) {
         resolveUrlPathname(pathname) {
             let normalizedPathname = normalizePathname(pathname);
             for (let route of compiledRoutes) {
-                let match = route.urlPattern.match(`http://remix.run${normalizedPathname}`);
+                let match = route.urlMatcher.match(`http://remix.run${normalizedPathname}`);
                 if (!match)
                     continue;
-                let relativeFilePath = route.filePattern.href(match.params).replace(/^\/+/, '');
+                let relativeFilePath = createHref(route.filePattern, match.params).replace(/^\/+/, '');
                 return resolveFilePath(route.rootDir, relativeFilePath);
             }
             return null;
@@ -33,10 +35,10 @@ export function compileRoutes(basePath, routeConfigs) {
             let normalizedFilePath = normalizeFilePath(filePath);
             for (let route of compiledRoutes) {
                 let relativeFilePath = getRelativeFilePath(route.rootDir, normalizedFilePath);
-                let match = route.filePattern.ast.pathname.match(relativeFilePath);
+                let match = route.fileMatcher.match(`http://remix.run/${relativeFilePath}`);
                 if (!match)
                     continue;
-                return normalizePathname(route.urlPattern.href(getPathnameParams(route.filePattern, match)));
+                return normalizePathname(createHref(route.urlPattern, match.params));
             }
             return null;
         },
@@ -47,45 +49,51 @@ function compileRoute(route, options) {
     let relativeUrlPattern = normalizePathname(route.urlPattern);
     let urlPatternSource = normalizePathname(`${basePath.replace(/\/+$/, '')}/${relativeUrlPattern.replace(/^\/+/, '')}`);
     let filePatternSource = normalizeFilePattern(route.filePattern);
-    let urlPattern = new RoutePattern(urlPatternSource);
-    let filePattern = new RoutePattern(filePatternSource);
+    let urlPattern = RoutePattern.parse(urlPatternSource);
+    let filePattern = RoutePattern.parse(filePatternSource);
     validateNoUnnamedWildcards(urlPattern, 'URL');
     validateNoUnnamedWildcards(filePattern, 'File');
     validateRoutePatterns(urlPattern, filePattern);
     return {
         rootDir: normalizeFilePath(options.rootDir).replace(/\/+$/, ''),
         urlPattern,
+        urlMatcher: createMatcher(urlPattern),
         filePattern,
+        fileMatcher: createMatcher(stripDotSegments(filePatternSource)),
     };
 }
-function getPathnameParams(pattern, match) {
-    let params = {};
-    for (let param of pattern.ast.pathname.params) {
-        if (param.name === '*')
+function stripDotSegments(pattern) {
+    let segments = [];
+    for (let segment of pattern.split('/')) {
+        if (segment === '' || segment === '.')
             continue;
-        params[param.name] = undefined;
-    }
-    for (let param of match) {
-        if (param.name === '*')
+        if (segment === '..') {
+            segments.pop();
             continue;
-        params[param.name] = param.value;
+        }
+        segments.push(segment);
     }
-    return params;
+    return segments.join('/');
 }
 function validateRoutePatterns(urlPattern, filePattern) {
-    let urlParams = urlPattern.ast.pathname.params.map((param) => `${param.type}:${param.name}`);
-    let fileParams = filePattern.ast.pathname.params.map((param) => `${param.type}:${param.name}`);
+    let urlParams = getPathnameParams(urlPattern);
+    let fileParams = getPathnameParams(filePattern);
     if (urlParams.length !== fileParams.length) {
         throw new Error(`Route patterns must have matching capture structure.\nURL: ${urlPattern}\nFile: ${filePattern}`);
     }
     for (let i = 0; i < urlParams.length; i++) {
-        if (urlParams[i] !== fileParams[i]) {
+        let urlParam = urlParams[i];
+        let fileParam = fileParams[i];
+        if (urlParam.type !== fileParam.type || urlParam.name !== fileParam.name) {
             throw new Error(`Route patterns must have matching capture structure.\nURL: ${urlPattern}\nFile: ${filePattern}`);
         }
     }
 }
 function validateNoUnnamedWildcards(pattern, label) {
-    if (pattern.ast.pathname.params.some((param) => param.type === '*' && param.name === '*')) {
+    if (pattern.pathname.tokens.some((token) => token.type === '*' && token.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 === '*');
+}

package/dist/lib/scripts/compiler.d.ts

@@ -25,6 +25,7 @@ type ScriptCompilerOptions = {
     external: string[];
     fingerprintAssets: boolean;
     isAllowed(absolutePath: string): boolean;
+    isDenied(absolutePath: string): boolean;
     minify: boolean;
     onWatchDirectoriesChange?: (delta: {
         add: string[];

package/dist/lib/scripts/compiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../src/lib/scripts/compiler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../src/lib/scripts/compiler.ts"],"names":[],"mappings":"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"}

package/dist/lib/scripts/compiler.js

@@ -12,6 +12,7 @@ import { resolveModule, resolverExtensionAlias, resolverExtensions, supportedScr
 import { createModuleStore } from "../module-store.js";
 import { createTsconfigTransformOptionsResolver, transformModule } from "./transform.js";
 import { ResolverFactory } from 'oxc-resolver';
+import { isBareImportSpecifier } from "./specifiers.js";
 const supportedScriptExtensionSet = new Set(supportedScriptExtensions);
 const preloadConcurrency = Math.max(1, Math.min(8, os.availableParallelism() - 1));
 export function createScriptCompiler(options) {
@@ -30,8 +31,14 @@ export function createScriptCompiler(options) {
         extensionAlias: resolverExtensionAlias,
         extensions: resolverExtensions,
         mainFields: ['browser', 'module', 'main'],
+        symlinks: false,
         tsconfig: 'auto',
     });
+    let resolveModulePathOptions = {
+        isAllowed: resolvedOptions.isAllowed,
+        isDenied: resolvedOptions.isDenied,
+        routes: resolvedOptions.routes,
+    };
     let resolveInFlightByCacheKey = new Map();
     let emitInFlightByCacheKey = new Map();
     let transformArgs = {
@@ -50,7 +57,9 @@ export function createScriptCompiler(options) {
     let resolveArgs = {
         isAllowed: resolvedOptions.isAllowed,
         isWatchIgnored,
-        resolveModulePath,
+        resolveModulePath(absolutePath) {
+            return resolveModulePath(absolutePath, resolveModulePathOptions);
+        },
         resolverFactory,
         routes: resolvedOptions.routes,
     };
@@ -144,7 +153,7 @@ export function createScriptCompiler(options) {
         return resolveFilePath(resolvedOptions.rootDir, filePath);
     }
     function resolveServedScriptOrThrow(absolutePath) {
-        let resolvedModule = resolveModulePath(absolutePath);
+        let resolvedModule = resolveModulePath(absolutePath, resolveModulePathOptions);
         if (!resolvedModule) {
             throw createAssetServerCompilationError(`File not found: ${absolutePath}`, {
                 code: 'FILE_NOT_FOUND',
@@ -366,10 +375,11 @@ function isTsconfigPath(filePath) {
 function shouldClearResolverCacheForFileEvent(filePath, event) {
     return event !== 'change' || isPackageJsonPath(filePath) || isTsconfigPath(filePath);
 }
-function resolveModulePath(absolutePath) {
+function resolveModulePath(absolutePath, options) {
+    let candidateIdentityPath = normalizeFilePath(absolutePath);
     let resolvedPath;
     try {
-        resolvedPath = normalizeFilePath(fs.realpathSync(normalizeFilePath(absolutePath)));
+        resolvedPath = normalizeFilePath(fs.realpathSync(candidateIdentityPath));
     }
     catch (error) {
         if (isNoEntityError(error))
@@ -380,10 +390,26 @@ function resolveModulePath(absolutePath) {
         return null;
     }
     return {
-        identityPath: resolvedPath,
+        identityPath: getModuleIdentityPath(candidateIdentityPath, resolvedPath, options),
         resolvedPath,
     };
 }
+function getModuleIdentityPath(candidateIdentityPath, resolvedPath, options) {
+    if (candidateIdentityPath === resolvedPath)
+        return resolvedPath;
+    if (!containsNodeModulesPathSegment(candidateIdentityPath))
+        return resolvedPath;
+    if (!options.routes.toUrlPathname(candidateIdentityPath))
+        return resolvedPath;
+    if (!options.isAllowed(candidateIdentityPath))
+        return resolvedPath;
+    if (options.isDenied(resolvedPath))
+        return resolvedPath;
+    return candidateIdentityPath;
+}
+function containsNodeModulesPathSegment(filePath) {
+    return filePath.split('/').includes('node_modules');
+}
 function resolveActualPath(identityPath) {
     try {
         return normalizeFilePath(fs.realpathSync(identityPath));
@@ -394,15 +420,6 @@ function resolveActualPath(identityPath) {
         throw error;
     }
 }
-function isBareImportSpecifier(specifier) {
-    return (!specifier.startsWith('./') &&
-        !specifier.startsWith('../') &&
-        !specifier.startsWith('/') &&
-        !specifier.startsWith('file:') &&
-        !specifier.startsWith('data:') &&
-        !specifier.startsWith('http://') &&
-        !specifier.startsWith('https://'));
-}
 function isNoEntityError(error) {
     return (error instanceof Error &&
         'code' in error &&

package/dist/lib/scripts/resolve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../../src/lib/scripts/resolve.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAMnD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAA;AAM1E,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAEtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAE9C,KAAK,YAAY,GAAG,YAAY,CAAC,iBAAiB,EAAE,cAAc,EAAE,aAAa,CAAC,CAAA;AAElF,eAAO,MAAM,sBAAsB;;;;CAIC,CAAA;AAEpC,eAAO,MAAM,kBAAkB,UAAiD,CAAA;AAChF,eAAO,MAAM,yBAAyB,UAAiD,CAAA;AAGvF,KAAK,cAAc,GAAG;IACpB,OAAO,EAAE,MAAM,CAAA;IACf,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAYD,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,YAAY,EAAE,MAAM,CAAA;IACpB,OAAO,EAAE,cAAc,EAAE,CAAA;IACzB,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,iBAAiB,EAAE,MAAM,CAAA;CAC1B,CAAA;AAED,KAAK,aAAa,GAAG;IACnB,QAAQ,EAAE,cAAc,CAAA;CACzB,GAAG,CACA;IACE,EAAE,EAAE,IAAI,CAAA;IACR,KAAK,EAAE,cAAc,CAAA;CACtB,GACD;IACE,EAAE,EAAE,KAAK,CAAA;IACT,KAAK,EAAE,2BAA2B,CAAA;CACnC,CACJ,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAA;IACxC,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IACzC,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,mBAAmB,GAAG,IAAI,CAAA;IACnE,eAAe,EAAE,eAAe,CAAA;IAChC,MAAM,EAAE,cAAc,CAAA;CACvB,CAAA;AAaD,wBAAsB,aAAa,CACjC,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,iBAAiB,EAC9B,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,aAAa,CAAC,CA0IxB"}
+{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../../src/lib/scripts/resolve.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAMnD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAA;AAM1E,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAEtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAC5E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAG9C,KAAK,YAAY,GAAG,YAAY,CAAC,iBAAiB,EAAE,cAAc,EAAE,aAAa,CAAC,CAAA;AAElF,eAAO,MAAM,sBAAsB;;;;CAIC,CAAA;AAEpC,eAAO,MAAM,kBAAkB,UAAiD,CAAA;AAChF,eAAO,MAAM,yBAAyB,UAAiD,CAAA;AAGvF,KAAK,cAAc,GAAG;IACpB,OAAO,EAAE,MAAM,CAAA;IACf,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAYD,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,YAAY,EAAE,MAAM,CAAA;IACpB,OAAO,EAAE,cAAc,EAAE,CAAA;IACzB,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,iBAAiB,EAAE,MAAM,CAAA;CAC1B,CAAA;AAED,KAAK,aAAa,GAAG;IACnB,QAAQ,EAAE,cAAc,CAAA;CACzB,GAAG,CACA;IACE,EAAE,EAAE,IAAI,CAAA;IACR,KAAK,EAAE,cAAc,CAAA;CACtB,GACD;IACE,EAAE,EAAE,KAAK,CAAA;IACT,KAAK,EAAE,2BAA2B,CAAA;CACnC,CACJ,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAA;IACxC,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IACzC,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,mBAAmB,GAAG,IAAI,CAAA;IACnE,eAAe,EAAE,eAAe,CAAA;IAChC,MAAM,EAAE,cAAc,CAAA;CACvB,CAAA;AAkBD,wBAAsB,aAAa,CACjC,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,iBAAiB,EAC9B,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,aAAa,CAAC,CA+IxB"}