@remix-run/assets 0.1.0 → 0.2.0

package/dist/lib/compilation-error.d.ts

@@ -1,6 +1,6 @@
-type AssetServerCompilationErrorCode = 'MODULE_NOT_FOUND' | 'MODULE_NOT_ALLOWED' | 'MODULE_OUTSIDE_FILE_MAP' | 'MODULE_COMMONJS_NOT_SUPPORTED' | 'MODULE_TRANSFORM_FAILED' | 'MODULE_EMIT_FAILED' | 'IMPORT_RESOLUTION_FAILED' | 'IMPORT_NOT_SUPPORTED' | 'IMPORT_NOT_ALLOWED' | 'IMPORT_OUTSIDE_FILE_MAP';
+type AssetServerCompilationErrorCode = 'FILE_NOT_FOUND' | 'FILE_NOT_ALLOWED' | 'FILE_OUTSIDE_FILE_MAP' | 'COMMONJS_NOT_SUPPORTED' | 'TRANSFORM_FAILED' | 'EMIT_FAILED' | 'IMPORT_RESOLUTION_FAILED' | 'IMPORT_NOT_SUPPORTED' | 'IMPORT_NOT_ALLOWED' | 'IMPORT_OUTSIDE_FILE_MAP';
 /**
- * Internal error used by the request-time module compilation pipeline.
+ * Internal error used by the request-time asset compilation pipeline.
  */
 export declare class AssetServerCompilationError extends Error {
     code: AssetServerCompilationErrorCode;

package/dist/lib/compilation-error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compilation-error.d.ts","sourceRoot":"","sources":["../../src/lib/compilation-error.ts"],"names":[],"mappings":"AAAA,KAAK,+BAA+B,GAChC,kBAAkB,GAClB,oBAAoB,GACpB,yBAAyB,GACzB,+BAA+B,GAC/B,yBAAyB,GACzB,oBAAoB,GACpB,0BAA0B,GAC1B,sBAAsB,GACtB,oBAAoB,GACpB,yBAAyB,CAAA;AAE7B;;GAEG;AACH,qBAAa,2BAA4B,SAAQ,KAAK;IACpD,IAAI,EAAE,+BAA+B,CAAA;IAErC,YACE,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;QACP,KAAK,CAAC,EAAE,OAAO,CAAA;QACf,IAAI,EAAE,+BAA+B,CAAA;KACtC,EAKF;CACF;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,2BAA2B,CAEtC;AAED;;;;;;;;GAQG;AACH,wBAAgB,iCAAiC,CAC/C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IACP,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,IAAI,EAAE,+BAA+B,CAAA;CACtC,GACA,2BAA2B,CAE7B"}
+{"version":3,"file":"compilation-error.d.ts","sourceRoot":"","sources":["../../src/lib/compilation-error.ts"],"names":[],"mappings":"AAAA,KAAK,+BAA+B,GAChC,gBAAgB,GAChB,kBAAkB,GAClB,uBAAuB,GACvB,wBAAwB,GACxB,kBAAkB,GAClB,aAAa,GACb,0BAA0B,GAC1B,sBAAsB,GACtB,oBAAoB,GACpB,yBAAyB,CAAA;AAE7B;;GAEG;AACH,qBAAa,2BAA4B,SAAQ,KAAK;IACpD,IAAI,EAAE,+BAA+B,CAAA;IAErC,YACE,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;QACP,KAAK,CAAC,EAAE,OAAO,CAAA;QACf,IAAI,EAAE,+BAA+B,CAAA;KACtC,EAKF;CACF;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,2BAA2B,CAEtC;AAED;;;;;;;;GAQG;AACH,wBAAgB,iCAAiC,CAC/C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IACP,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,IAAI,EAAE,+BAA+B,CAAA;CACtC,GACA,2BAA2B,CAE7B"}

package/dist/lib/compilation-error.js

@@ -1,5 +1,5 @@
 /**
- * Internal error used by the request-time module compilation pipeline.
+ * Internal error used by the request-time asset compilation pipeline.
  */
 export class AssetServerCompilationError extends Error {
     code;

package/dist/lib/file-matcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-matcher.d.ts","sourceRoot":"","sources":["../../src/lib/file-matcher.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,WAAW,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAA;AAEvD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IACP,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAA;CAClB,GACL,WAAW,CA0Bb"}
+{"version":3,"file":"file-matcher.d.ts","sourceRoot":"","sources":["../../src/lib/file-matcher.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,WAAW,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAA;AAEvD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IACP,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAA;CAClB,GACL,WAAW,CA2Bb"}

package/dist/lib/file-matcher.js

@@ -1,5 +1,5 @@
 import * as fs from 'node:fs';
-import * as path from 'node:path';
+import picomatch from 'picomatch';
 import { normalizeFilePath, resolveFilePath } from "./paths.js";
 export function createFileMatcher(pattern, rootDir, options = {}) {
     let resolvedPatternPath = resolveFilePath(rootDir, pattern);
@@ -26,7 +26,8 @@ export function createFileMatcher(pattern, rootDir, options = {}) {
         }
         return (filePath) => filePath === resolvedPatternPath;
     }
-    return (filePath) => path.posix.matchesGlob(filePath, resolvedPatternPath);
+    let globMatcher = picomatch(resolvedPatternPath, { dot: true });
+    return (filePath) => globMatcher(filePath);
 }
 function isSameOrDescendantPath(filePath, directoryPath) {
     let normalizedDirectoryPath = directoryPath.replace(/\/+$/, '');

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

@@ -0,0 +1,41 @@
+export type ModuleTracking = {
+    trackedFiles: readonly string[];
+    trackedDirectories?: readonly string[];
+};
+export type ModuleWatchEvent = 'change' | 'add' | 'unlink';
+export type FileSnapshot = {
+    mtimeNs: bigint;
+    size: bigint;
+};
+export type ModuleSnapshot = ReadonlyMap<string, FileSnapshot>;
+type ModuleRecordState<transformed, resolved, emitted> = {
+    identityPath: string;
+    invalidationVersion: number;
+    transformed?: transformed;
+    resolved?: resolved;
+    emitted?: emitted;
+    emittedSnapshot?: ModuleSnapshot;
+    staleEmitted?: emitted;
+    staleEmittedSnapshot?: ModuleSnapshot;
+    trackedFiles: ReadonlySet<string>;
+    trackedDirectories: ReadonlySet<string>;
+};
+export type ModuleRecord<transformed, resolved, emitted> = Readonly<ModuleRecordState<transformed, resolved, emitted>>;
+export type ModuleStore<transformed, resolved, emitted> = {
+    get(identityPath: string): ModuleRecord<transformed, resolved, emitted>;
+    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;
+    clearResolved(identityPath: string, tracking: readonly ModuleTracking[]): void;
+    setEmitted(identityPath: string, emitted: emitted, snapshot: ModuleSnapshot | null): void;
+    invalidateForFileEvent(filePath: string, event: ModuleWatchEvent): void;
+    invalidateAll(): void;
+};
+export declare function createModuleStore<transformed, resolved, emitted>(options?: {
+    onWatchDirectoriesChange?: (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

@@ -0,0 +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"}

package/dist/lib/{scripts/store.js → module-store.js}

@@ -1,4 +1,4 @@
-import { getFilePathDirectory } from "../paths.js";
+import { getFilePathDirectory } from "./paths.js";
 export function createModuleStore(options = {}) {
     let recordsByIdentityPath = new Map();
     let recordsByTrackedFile = new Map();
@@ -12,12 +12,12 @@ export function createModuleStore(options = {}) {
                 identityPath,
                 invalidationVersion: 0,
                 trackedFiles: new Set(),
-                trackedResolutions: [],
+                trackedDirectories: new Set(),
             };
             recordsByIdentityPath.set(identityPath, record);
             return record;
         },
-        setTransformFailure(identityPath, failure) {
+        clearTransformed(identityPath, tracking) {
             let record = getOrCreateMutableRecord(identityPath);
             record.transformed = undefined;
             record.resolved = undefined;
@@ -25,12 +25,9 @@ export function createModuleStore(options = {}) {
             record.emittedSnapshot = undefined;
             record.staleEmitted = undefined;
             record.staleEmittedSnapshot = undefined;
-            setTracking(record, {
-                trackedFiles: failure.trackedFiles,
-                trackedResolutions: [],
-            });
+            setTracking(record, tracking);
         },
-        setTransformed(identityPath, transformed) {
+        setTransformed(identityPath, transformed, tracking) {
             let record = getOrCreateMutableRecord(identityPath);
             record.transformed = transformed;
             record.resolved = undefined;
@@ -38,34 +35,25 @@ export function createModuleStore(options = {}) {
             record.emittedSnapshot = undefined;
             record.staleEmitted = undefined;
             record.staleEmittedSnapshot = undefined;
-            setTracking(record, {
-                trackedFiles: transformed.trackedFiles,
-                trackedResolutions: [],
-            });
+            setTracking(record, tracking);
         },
-        setResolved(identityPath, resolved) {
+        setResolved(identityPath, resolved, tracking) {
             let record = getOrCreateMutableRecord(identityPath);
             record.resolved = resolved;
             record.emitted = undefined;
             record.emittedSnapshot = undefined;
             record.staleEmitted = undefined;
             record.staleEmittedSnapshot = undefined;
-            setTracking(record, {
-                trackedFiles: resolved.trackedFiles,
-                trackedResolutions: resolved.trackedResolutions,
-            });
+            setTracking(record, tracking);
         },
-        setResolveFailure(identityPath, failure) {
+        clearResolved(identityPath, tracking) {
             let record = getOrCreateMutableRecord(identityPath);
             record.resolved = undefined;
             record.emitted = undefined;
             record.emittedSnapshot = undefined;
             record.staleEmitted = undefined;
             record.staleEmittedSnapshot = undefined;
-            setTracking(record, {
-                trackedFiles: failure.trackedFiles,
-                trackedResolutions: failure.trackedResolutions,
-            });
+            setTracking(record, tracking);
         },
         setEmitted(identityPath, emitted, snapshot) {
             let record = getOrCreateMutableRecord(identityPath);
@@ -78,7 +66,7 @@ export function createModuleStore(options = {}) {
             let affected = new Set(recordsByTrackedFile.get(filePath) ?? []);
             if (event !== 'change') {
                 for (let record of recordsByIdentityPath.values()) {
-                    if (record.trackedResolutions.some((tracked) => mayAffectTrackedResolution(tracked, filePath))) {
+                    if (matchesTrackedDirectory(record.trackedDirectories, filePath)) {
                         affected.add(record.identityPath);
                     }
                 }
@@ -109,7 +97,7 @@ export function createModuleStore(options = {}) {
             identityPath,
             invalidationVersion: 0,
             trackedFiles: new Set(),
-            trackedResolutions: [],
+            trackedDirectories: new Set(),
         };
         recordsByIdentityPath.set(identityPath, record);
         return record;
@@ -136,8 +124,9 @@ export function createModuleStore(options = {}) {
     function setTracking(record, tracking) {
         let previousWatchedDirectories = getWatchedDirectories(record);
         removeIndexes(record);
-        record.trackedFiles = new Set(tracking.trackedFiles);
-        record.trackedResolutions = [...tracking.trackedResolutions];
+        let normalizedTracking = mergeTracking(tracking);
+        record.trackedFiles = normalizedTracking.trackedFiles;
+        record.trackedDirectories = normalizedTracking.trackedDirectories;
         for (let trackedFile of record.trackedFiles) {
             addToIndexedSet(recordsByTrackedFile, trackedFile, record.identityPath);
         }
@@ -146,10 +135,7 @@ export function createModuleStore(options = {}) {
         emitWatchDirectoryDelta(delta);
     }
     function clearTracking(record) {
-        setTracking(record, {
-            trackedFiles: [],
-            trackedResolutions: [],
-        });
+        setTracking(record, []);
     }
     function removeIndexes(record) {
         for (let trackedFile of record.trackedFiles) {
@@ -206,23 +192,39 @@ function removeFromIndexedSet(map, key, value) {
         map.delete(key);
     }
 }
-function mayAffectTrackedResolution(trackedResolution, filePath) {
-    return (trackedResolution.candidatePaths.includes(filePath) ||
-        trackedResolution.candidatePrefixes.some((prefix) => filePath.startsWith(prefix)));
+function matchesTrackedDirectory(trackedDirectories, filePath) {
+    for (let trackedDirectory of trackedDirectories) {
+        if (filePath === trackedDirectory || filePath.startsWith(`${trackedDirectory}/`))
+            return true;
+    }
+    return false;
+}
+function normalizeTrackedDirectory(trackedDirectory) {
+    return trackedDirectory.replace(/\/+$/, '') || '/';
+}
+function mergeTracking(tracking) {
+    let trackedFiles = new Set();
+    let trackedDirectories = new Set();
+    for (let fragment of tracking) {
+        for (let trackedFile of fragment.trackedFiles) {
+            trackedFiles.add(trackedFile);
+        }
+        for (let trackedDirectory of fragment.trackedDirectories ?? []) {
+            trackedDirectories.add(normalizeTrackedDirectory(trackedDirectory));
+        }
+    }
+    return {
+        trackedFiles,
+        trackedDirectories,
+    };
 }
 function getWatchedDirectories(record) {
     let watchedDirectories = new Set();
     for (let trackedFile of record.trackedFiles) {
         watchedDirectories.add(getFilePathDirectory(trackedFile));
     }
-    for (let trackedResolution of record.trackedResolutions) {
-        for (let candidatePath of trackedResolution.candidatePaths) {
-            watchedDirectories.add(getFilePathDirectory(candidatePath));
-        }
-        for (let candidatePrefix of trackedResolution.candidatePrefixes) {
-            let directoryPath = candidatePrefix.replace(/\/+$/, '') || '/';
-            watchedDirectories.add(directoryPath);
-        }
+    for (let trackedDirectory of record.trackedDirectories) {
+        watchedDirectories.add(trackedDirectory);
     }
     return watchedDirectories;
 }

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

@@ -1,28 +1,29 @@
 import type { CompiledRoutes } from '../routes.ts';
-import type { ScriptsTarget } from '../asset-server.ts';
+import type { ResolvedScriptTarget } from '../target.ts';
+import type { ModuleWatchEvent } from '../module-store.ts';
 import type { EmittedAsset } from './emit.ts';
-type ModuleCompileResult = {
+type ScriptCompileResult = {
     code: EmittedAsset;
     fingerprint: string | null;
     sourceMap: EmittedAsset | null;
 };
-type ModuleGetResult = {
-    type: 'module';
-    module: ModuleCompileResult;
+type ScriptGetResult = {
+    script: ScriptCompileResult;
+    type: 'script';
 } | {
     type: 'not-modified';
     etag: string;
 };
-type ModuleGetOptions = {
+type ScriptGetOptions = {
     ifNoneMatch: string | null;
     isSourceMapRequest: boolean;
     requestedFingerprint: string | null;
 };
-type ModuleCompilerOptions = {
+type ScriptCompilerOptions = {
     buildId?: string;
     define?: Record<string, string>;
     external: string[];
-    fingerprintModules: boolean;
+    fingerprintAssets: boolean;
     isAllowed(absolutePath: string): boolean;
     minify: boolean;
     onWatchDirectoriesChange?: (delta: {
@@ -33,14 +34,13 @@ type ModuleCompilerOptions = {
     routes: CompiledRoutes;
     sourceMapSourcePaths: 'absolute' | 'url';
     sourceMaps?: 'external' | 'inline';
-    target?: ScriptsTarget;
+    target?: ResolvedScriptTarget;
     watchIgnore?: readonly string[];
     watchMode: boolean;
 };
-type ModuleWatchEvent = 'add' | 'change' | 'unlink';
-type ModuleCompiler = {
-    getModule(filePath: string, options: ModuleGetOptions): Promise<ModuleGetResult>;
-    getPreloadUrls(filePath: string | readonly string[]): Promise<string[]>;
+type ScriptCompiler = {
+    getScript(filePath: string, options: ScriptGetOptions): Promise<ScriptGetResult>;
+    getPreloadLayers(filePath: string | readonly string[]): Promise<string[][]>;
     getHref(filePath: string): Promise<string>;
     handleFileEvent(filePath: string, event: ModuleWatchEvent): Promise<void>;
     parseRequestPathname(pathname: string): ParsedRequestPathname | null;
@@ -51,8 +51,8 @@ type ParsedRequestPathname = {
     isSourceMapRequest: boolean;
     requestedFingerprint: string | null;
 };
-export declare function createModuleCompiler(options: ModuleCompilerOptions): ModuleCompiler;
-export declare function createResponseForModule(result: ModuleCompileResult, options: {
+export declare function createScriptCompiler(options: ScriptCompilerOptions): ScriptCompiler;
+export declare function createResponseForScript(result: ScriptCompileResult, options: {
     cacheControl: string;
     ifNoneMatch: string | null;
     isSourceMapRequest: boolean;

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

@@ -9,18 +9,18 @@ import { formatFingerprintedPathname, getFingerprintRequestCacheControl, parseFi
 import { emitResolvedModule } from "./emit.js";
 import { normalizeFilePath, resolveFilePath } from "../paths.js";
 import { resolveModule, resolverExtensionAlias, resolverExtensions, supportedScriptExtensions, } from "./resolve.js";
-import { createModuleStore } from "./store.js";
+import { createModuleStore } from "../module-store.js";
 import { createTsconfigTransformOptionsResolver, transformModule } from "./transform.js";
 import { ResolverFactory } from 'oxc-resolver';
 const supportedScriptExtensionSet = new Set(supportedScriptExtensions);
 const preloadConcurrency = Math.max(1, Math.min(8, os.availableParallelism() - 1));
-export function createModuleCompiler(options) {
+export function createScriptCompiler(options) {
     let resolvedOptions = {
         ...options,
         externalSet: new Set(options.external),
         watchIgnoreMatchers: (options.watchIgnore ?? []).map((pattern) => createFileMatcher(pattern, options.rootDir)),
     };
-    let store = createModuleStore({
+    let scriptStore = createModuleStore({
         onWatchDirectoriesChange: options.onWatchDirectoriesChange,
     });
     let tsconfigTransformOptionsResolver = createTsconfigTransformOptionsResolver();
@@ -55,22 +55,22 @@ export function createModuleCompiler(options) {
         routes: resolvedOptions.routes,
     };
     return {
-        async getModule(filePath, getOptions) {
-            let resolvedModule = resolveServedModuleOrThrow(resolveInputFilePath(filePath));
-            let record = store.get(resolvedModule.identityPath);
-            let notModified = getNotModifiedModule(record, getOptions);
+        async getScript(filePath, getOptions) {
+            let resolvedModule = resolveServedScriptOrThrow(resolveInputFilePath(filePath));
+            let record = scriptStore.get(resolvedModule.identityPath);
+            let notModified = getNotModifiedScript(record, getOptions);
             if (notModified)
                 return notModified;
-            let emitted = await getOrCreateEmittedModule(record);
+            let emitted = await getOrCreateEmittedScript(record);
             return {
-                type: 'module',
-                module: toModuleCompileResult(emitted),
+                script: toScriptCompileResult(emitted),
+                type: 'script',
             };
         },
-        async getPreloadUrls(filePath) {
+        async getPreloadLayers(filePath) {
             let resolvedEntries = [];
             let seen = new Set();
-            for (let resolvedModule of (Array.isArray(filePath) ? filePath : [filePath]).map((nextPath) => resolveServedModuleOrThrow(resolveInputFilePath(nextPath)))) {
+            for (let resolvedModule of (Array.isArray(filePath) ? filePath : [filePath]).map((nextPath) => resolveServedScriptOrThrow(resolveInputFilePath(nextPath)))) {
                 if (seen.has(resolvedModule.identityPath))
                     continue;
                 seen.add(resolvedModule.identityPath);
@@ -78,13 +78,14 @@ export function createModuleCompiler(options) {
             }
             let visited = new Set(resolvedEntries);
             let queue = [...resolvedEntries];
-            let urls = [];
+            let layers = [];
             while (queue.length > 0) {
                 let frontier = queue;
                 queue = [];
-                let resolvedModules = await getOrCreateResolvedModules(frontier.map((identityPath) => store.get(identityPath)));
+                let resolvedModules = await getOrCreateResolvedScripts(frontier.map((identityPath) => scriptStore.get(identityPath)));
+                let layer = [];
                 for (let resolvedModule of resolvedModules) {
-                    urls.push(getServedUrlForResolvedModule(resolvedModule));
+                    layer.push(getServedUrlForResolvedScript(resolvedModule));
                     for (let dep of resolvedModule.deps) {
                         if (visited.has(dep))
                             continue;
@@ -92,11 +93,12 @@ export function createModuleCompiler(options) {
                         queue.push(dep);
                     }
                 }
+                layers.push(layer);
             }
-            return urls;
+            return layers;
         },
         async getHref(filePath) {
-            let resolvedModule = resolveServedModuleOrThrow(resolveInputFilePath(filePath));
+            let resolvedModule = resolveServedScriptOrThrow(resolveInputFilePath(filePath));
             return getServedUrl(resolvedModule.identityPath);
         },
         async handleFileEvent(filePath, event) {
@@ -108,21 +110,21 @@ export function createModuleCompiler(options) {
             }
             if (isTsconfigPath(normalizedFilePath)) {
                 tsconfigTransformOptionsResolver.clear();
-                store.invalidateAll();
+                scriptStore.invalidateAll();
                 return;
             }
             if (isPackageJsonPath(normalizedFilePath)) {
-                store.invalidateAll();
+                scriptStore.invalidateAll();
                 return;
             }
-            store.invalidateForFileEvent(normalizedFilePath, event);
+            scriptStore.invalidateForFileEvent(normalizedFilePath, event);
         },
         parseRequestPathname(pathname) {
             let parsedPathname = parseServedPathname(pathname);
             let filePath = resolvedOptions.routes.resolveUrlPathname(parsedPathname.stablePathname);
             if (!filePath)
                 return null;
-            if (resolvedOptions.fingerprintModules && parsedPathname.requestedFingerprint === null)
+            if (resolvedOptions.fingerprintAssets && parsedPathname.requestedFingerprint === null)
                 return null;
             return {
                 cacheControl: getFingerprintRequestCacheControl(parsedPathname.requestedFingerprint),
@@ -141,21 +143,21 @@ export function createModuleCompiler(options) {
         }
         return resolveFilePath(resolvedOptions.rootDir, filePath);
     }
-    function resolveServedModuleOrThrow(absolutePath) {
+    function resolveServedScriptOrThrow(absolutePath) {
         let resolvedModule = resolveModulePath(absolutePath);
         if (!resolvedModule) {
-            throw createAssetServerCompilationError(`Module not found: ${absolutePath}`, {
-                code: 'MODULE_NOT_FOUND',
+            throw createAssetServerCompilationError(`File not found: ${absolutePath}`, {
+                code: 'FILE_NOT_FOUND',
             });
         }
         if (!resolvedOptions.isAllowed(resolvedModule.identityPath)) {
-            throw createAssetServerCompilationError(`Module is not allowed: ${resolvedModule.identityPath}`, {
-                code: 'MODULE_NOT_ALLOWED',
+            throw createAssetServerCompilationError(`File is not allowed: ${resolvedModule.identityPath}`, {
+                code: 'FILE_NOT_ALLOWED',
             });
         }
         return resolvedModule;
     }
-    function getNotModifiedModule(record, options) {
+    function getNotModifiedScript(record, options) {
         let current = getNotModifiedResult(record.emitted, options);
         if (current)
             return current;
@@ -164,10 +166,10 @@ export function createModuleCompiler(options) {
         }
         return getNotModifiedResult(record.staleEmitted, options);
     }
-    async function getOrCreateResolvedModules(records) {
-        return mapWithConcurrency(records, preloadConcurrency, (record) => getOrCreateResolvedModule(record));
+    async function getOrCreateResolvedScripts(records) {
+        return mapWithConcurrency(records, preloadConcurrency, (record) => getOrCreateResolvedScript(record));
     }
-    async function getOrCreateResolvedModule(record) {
+    async function getOrCreateResolvedScript(record) {
         if (record.resolved)
             return record.resolved;
         let cacheKey = getRecordCacheKey(record);
@@ -176,7 +178,7 @@ export function createModuleCompiler(options) {
             return existing;
         let promise = (async () => {
             let startedVersion = record.invalidationVersion;
-            let transformedModule = await getOrCreateTransformedModule(record);
+            let transformedModule = await getOrCreateTransformedScript(record);
             if (resolvedOptions.watchMode &&
                 transformedModule.unresolvedImports.some((unresolved) => isBareImportSpecifier(unresolved.specifier))) {
                 resolverFactory.clearCache();
@@ -184,12 +186,14 @@ export function createModuleCompiler(options) {
             let resolveModuleResult = await resolveModule(record, transformedModule, resolveArgs);
             if (!resolveModuleResult.ok) {
                 if (isFresh(record, startedVersion)) {
-                    store.setResolveFailure(record.identityPath, resolveModuleResult.tracking);
+                    scriptStore.clearResolved(record.identityPath, [resolveModuleResult.tracking]);
                 }
                 throw resolveModuleResult.error;
             }
             if (isFresh(record, startedVersion)) {
-                store.setResolved(record.identityPath, resolveModuleResult.value);
+                scriptStore.setResolved(record.identityPath, resolveModuleResult.value, [
+                    resolveModuleResult.tracking,
+                ]);
             }
             return resolveModuleResult.value;
         })();
@@ -203,25 +207,25 @@ export function createModuleCompiler(options) {
             }
         }
     }
-    async function getOrCreateTransformedModule(record) {
+    async function getOrCreateTransformedScript(record) {
         if (record.transformed)
             return record.transformed;
         let startedVersion = record.invalidationVersion;
         let transformModuleResult = await transformModule(record, transformArgs);
         if (!transformModuleResult.ok) {
             if (isFresh(record, startedVersion)) {
-                store.setTransformFailure(record.identityPath, {
-                    trackedFiles: transformModuleResult.trackedFiles,
-                });
+                scriptStore.clearTransformed(record.identityPath, [transformModuleResult.tracking]);
             }
             throw transformModuleResult.error;
         }
         if (isFresh(record, startedVersion)) {
-            store.setTransformed(record.identityPath, transformModuleResult.value);
+            scriptStore.setTransformed(record.identityPath, transformModuleResult.value, [
+                transformModuleResult.tracking,
+            ]);
         }
         return transformModuleResult.value;
     }
-    async function getOrCreateEmittedModule(record) {
+    async function getOrCreateEmittedScript(record) {
         if (record.emitted)
             return record.emitted;
         let cacheKey = getRecordCacheKey(record);
@@ -230,7 +234,7 @@ export function createModuleCompiler(options) {
             return existing;
         let promise = (async () => {
             let startedVersion = record.invalidationVersion;
-            let resolvedModule = await getOrCreateResolvedModule(record);
+            let resolvedModule = await getOrCreateResolvedScript(record);
             let emitResolvedModuleResult = await emitResolvedModule(resolvedModule, {
                 getServedUrl,
                 sourceMaps: resolvedOptions.sourceMaps,
@@ -239,7 +243,7 @@ export function createModuleCompiler(options) {
                 throw emitResolvedModuleResult.error;
             }
             if (isFresh(record, startedVersion)) {
-                store.setEmitted(record.identityPath, emitResolvedModuleResult.value, createModuleSnapshot(resolvedModule.trackedFiles));
+                scriptStore.setEmitted(record.identityPath, emitResolvedModuleResult.value, createModuleSnapshot(resolvedModule.trackedFiles));
             }
             return emitResolvedModuleResult.value;
         })();
@@ -254,10 +258,10 @@ export function createModuleCompiler(options) {
         }
     }
     async function getServedUrl(identityPath) {
-        return getServedUrlForResolvedModule(await getOrCreateResolvedModule(store.get(identityPath)));
+        return getServedUrlForResolvedScript(await getOrCreateResolvedScript(scriptStore.get(identityPath)));
     }
-    function getServedUrlForResolvedModule(resolvedModule) {
-        return formatFingerprintedPathname(resolvedModule.stableUrlPathname, resolvedOptions.fingerprintModules ? resolvedModule.fingerprint : null);
+    function getServedUrlForResolvedScript(resolvedModule) {
+        return formatFingerprintedPathname(resolvedModule.stableUrlPathname, resolvedOptions.fingerprintAssets ? resolvedModule.fingerprint : null);
     }
     function isWatchIgnored(filePath) {
         return resolvedOptions.watchIgnoreMatchers.some((matcher) => matcher(filePath));
@@ -346,7 +350,7 @@ async function mapWithConcurrency(items, concurrency, mapper) {
     await Promise.all(Array.from({ length: Math.min(concurrency, items.length) }, () => worker()));
     return results;
 }
-function toModuleCompileResult(emittedModule) {
+function toScriptCompileResult(emittedModule) {
     return {
         code: emittedModule.code,
         fingerprint: emittedModule.fingerprint,
@@ -405,7 +409,7 @@ function isNoEntityError(error) {
         (error.code === 'ENOENT' ||
             error.code === 'ENOTDIR'));
 }
-export function createResponseForModule(result, options) {
+export function createResponseForScript(result, options) {
     let body;
     let etag;
     let contentType;

package/dist/lib/scripts/emit.js

@@ -56,8 +56,8 @@ async function createEmittedAsset(content) {
 function toEmitError(error, identityPath) {
     if (isAssetServerCompilationError(error))
         return error;
-    return createAssetServerCompilationError(`Failed to emit module ${identityPath}. ${error instanceof Error ? error.message : String(error)}`, {
+    return createAssetServerCompilationError(`Failed to emit script ${identityPath}. ${error instanceof Error ? error.message : String(error)}`, {
         cause: error,
-        code: 'MODULE_EMIT_FAILED',
+        code: 'EMIT_FAILED',
     });
 }