@remix-run/assets 0.1.0 → 0.3.0

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

@@ -1,8 +1,10 @@
 import type { ResolverFactory } from 'oxc-resolver';
 import type { AssetServerCompilationError } from '../compilation-error.ts';
+import type { ModuleRecord, ModuleTracking } from '../module-store.ts';
 import type { CompiledRoutes } from '../routes.ts';
-import type { ModuleRecord } from './store.ts';
 import type { ResolveModuleResult, TransformedModule } from './transform.ts';
+import type { EmittedModule } from './emit.ts';
+type ScriptRecord = ModuleRecord<TransformedModule, ResolvedModule, EmittedModule>;
 export declare const resolverExtensionAlias: {
     '.js': string[];
     '.jsx': string[];
@@ -16,38 +18,26 @@ type ResolvedImport = {
     quote?: '"' | "'" | '`';
     start: number;
 };
-type RelativeImportResolution = {
-    candidatePaths: readonly string[];
-    candidatePrefixes: readonly string[];
-    specifier: string;
-};
-export type TrackedResolution = RelativeImportResolution & {
-    resolvedIdentityPath: string | null;
-};
 export type ResolvedModule = {
     deps: string[];
     fingerprint: string | null;
     identityPath: string;
     imports: ResolvedImport[];
     trackedFiles: string[];
-    trackedResolutions: TrackedResolution[];
     rawCode: string;
     resolvedPath: string;
     sourceMap: string | null;
     stableUrlPathname: string;
 };
-export type ResolutionFailureState = {
-    trackedFiles: readonly string[];
-    trackedResolutions: readonly TrackedResolution[];
-};
 type ResolveResult = {
+    tracking: ModuleTracking;
+} & ({
     ok: true;
     value: ResolvedModule;
 } | {
     ok: false;
     error: AssetServerCompilationError;
-    tracking: ResolutionFailureState;
-};
+});
 export type ResolveArgs = {
     isAllowed(absolutePath: string): boolean;
     isWatchIgnored(filePath: string): boolean;
@@ -55,6 +45,6 @@ export type ResolveArgs = {
     resolverFactory: ResolverFactory;
     routes: CompiledRoutes;
 };
-export declare function resolveModule(record: ModuleRecord, transformed: TransformedModule, args: ResolveArgs): Promise<ResolveResult>;
+export declare function resolveModule(record: ScriptRecord, transformed: TransformedModule, args: ResolveArgs): Promise<ResolveResult>;
 export {};
 //# sourceMappingURL=resolve.d.ts.map

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;AAE1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAE5E,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;AAED,KAAK,wBAAwB,GAAG;IAC9B,cAAc,EAAE,SAAS,MAAM,EAAE,CAAA;IACjC,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAA;IACpC,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,wBAAwB,GAAG;IACzD,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAA;CACpC,CAAA;AAED,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,kBAAkB,EAAE,iBAAiB,EAAE,CAAA;IACvC,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,iBAAiB,EAAE,MAAM,CAAA;CAC1B,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAA;IAC/B,kBAAkB,EAAE,SAAS,iBAAiB,EAAE,CAAA;CACjD,CAAA;AAED,KAAK,aAAa,GACd;IACE,EAAE,EAAE,IAAI,CAAA;IACR,KAAK,EAAE,cAAc,CAAA;CACtB,GACD;IACE,EAAE,EAAE,KAAK,CAAA;IACT,KAAK,EAAE,2BAA2B,CAAA;IAClC,QAAQ,EAAE,sBAAsB,CAAA;CACjC,CAAA;AAEL,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;AAQD,wBAAsB,aAAa,CACjC,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,iBAAiB,EAC9B,IAAI,EAAE,WAAW,GAChB,OAAO,CAAC,aAAa,CAAC,CAyIxB"}
+{"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"}

package/dist/lib/scripts/resolve.js

@@ -1,6 +1,7 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { createAssetServerCompilationError, isAssetServerCompilationError, } from "../compilation-error.js";
+import { getInjectedPackageNameForSpecifier, getInjectedPackageImporterPath, restoreAuthoredInjectedPackageSpecifier, } from "../injected-packages.js";
 import { normalizeFilePath } from "../paths.js";
 export const resolverExtensionAlias = {
     '.js': ['.js', '.ts', '.tsx', '.jsx'],
@@ -28,30 +29,31 @@ export async function resolveModule(record, transformed, args) {
     let importsWithPaths = [];
     let deps = new Set();
     for (let unresolved of transformed.unresolvedImports) {
-        let trackedResolution = getTrackedRelativeImportResolution(transformed.importerDir, unresolved.specifier, args.isWatchIgnored);
+        let displaySpecifier = getDisplayImportSpecifier(unresolved.specifier);
+        let trackedResolution = getTrackedRelativeImportResolution(transformed.importerDir, displaySpecifier, args.isWatchIgnored);
         let resolvedSpec = resolvedImports.get(unresolved.specifier);
         if (!resolvedSpec?.absolutePath) {
-            return failResolve(createAssetServerCompilationError(`Failed to resolve import "${unresolved.specifier}" in ${transformed.resolvedPath}. ` +
+            return failResolve(createAssetServerCompilationError(`Failed to resolve import "${displaySpecifier}" in ${transformed.resolvedPath}. ` +
                 `Ensure it resolves to a file within the configured asset server fileMap, or mark it as external.`, {
                 code: 'IMPORT_RESOLUTION_FAILED',
             }), trackedFiles, trackedResolutions, transformed.resolvedPath, { isWatchIgnored: args.isWatchIgnored, trackedResolution });
         }
         let resolvedImport = args.resolveModulePath(resolvedSpec.absolutePath);
         if (!resolvedImport) {
-            return failResolve(createAssetServerCompilationError(`Resolved import "${unresolved.specifier}" in ${transformed.resolvedPath} is not a supported script module. ` +
+            return failResolve(createAssetServerCompilationError(`Import "${displaySpecifier}" in ${transformed.resolvedPath}, resolved to "${resolvedSpec.absolutePath}", is not a supported script file. ` +
                 `Supported extensions are ${supportedScriptExtensions.join(', ')}.`, {
                 code: 'IMPORT_NOT_SUPPORTED',
             }), trackedFiles, trackedResolutions, transformed.resolvedPath, { isWatchIgnored: args.isWatchIgnored, trackedResolution });
         }
         if (!args.isAllowed(resolvedImport.identityPath)) {
-            return failResolve(createAssetServerCompilationError(`Resolved import "${unresolved.specifier}" in ${transformed.resolvedPath} is not allowed by the asset server allow/deny configuration. ` +
-                `Add a matching allow rule, remove a conflicting deny rule, or mark this import as external.`, {
+            return failResolve(createAssetServerCompilationError(`Import "${displaySpecifier}" in ${transformed.resolvedPath}, resolved to "${resolvedImport.identityPath}", is not allowed by the asset server allow/deny configuration. ` +
+                `Add a matching allow rule for this file path, remove a conflicting deny rule for this file path, or mark this import as external.`, {
                 code: 'IMPORT_NOT_ALLOWED',
             }), trackedFiles, trackedResolutions, transformed.resolvedPath, { isWatchIgnored: args.isWatchIgnored, trackedResolution });
         }
         let stableUrlPathname = args.routes.toUrlPathname(resolvedImport.identityPath);
         if (!stableUrlPathname) {
-            return failResolve(createAssetServerCompilationError(`Resolved import "${unresolved.specifier}" in ${transformed.resolvedPath} is outside all configured fileMap entries. ` +
+            return failResolve(createAssetServerCompilationError(`Import "${displaySpecifier}" in ${transformed.resolvedPath}, resolved to "${resolvedImport.identityPath}", is outside all configured fileMap entries. ` +
                 `Add a matching fileMap entry for this file path, or mark this import as external.`, {
                 code: 'IMPORT_OUTSIDE_FILE_MAP',
             }), trackedFiles, trackedResolutions, transformed.resolvedPath, { isWatchIgnored: args.isWatchIgnored, trackedResolution });
@@ -78,13 +80,13 @@ export async function resolveModule(record, transformed, args) {
     }
     return {
         ok: true,
+        tracking: toResolveTracking(trackedFiles, trackedResolutions),
         value: {
             deps: [...deps],
             fingerprint: transformed.fingerprint,
             identityPath: record.identityPath,
             imports: importsWithPaths,
             trackedFiles: [...trackedFiles],
-            trackedResolutions,
             rawCode: transformed.rawCode,
             resolvedPath: transformed.resolvedPath,
             sourceMap: transformed.sourceMap,
@@ -164,10 +166,13 @@ async function batchResolveSpecifiers(specifiers, importerPath, resolverFactory)
         return resolvedBySpecifier;
     try {
         for (let specifier of specifiers) {
-            let resolutionResult = await resolverFactory.resolveFileAsync(importerPath, specifier);
+            let normalizedResolution = normalizeSpecifierResolution(specifier, importerPath);
+            let resolutionResult = await resolverFactory.resolveFileAsync(normalizedResolution.importerPath, normalizedResolution.specifier);
             if (resolutionResult.error) {
-                throw createAssetServerCompilationError(`Failed to resolve import "${specifier}" in ${importerPath}. ` +
-                    `Ensure it resolves to a file within the configured asset server fileMap, or mark it as external.`, {
+                throw createAssetServerCompilationError(normalizedResolution.importerPath === getInjectedPackageImporterPath()
+                    ? `Failed to resolve injected import "${specifier}" from asset server.`
+                    : `Failed to resolve import "${normalizedResolution.specifier}" in ${normalizedResolution.importerPath}. ` +
+                        `Ensure it resolves to a file within the configured asset server fileMap, or mark it as external.`, {
                     code: 'IMPORT_RESOLUTION_FAILED',
                 });
             }
@@ -199,14 +204,42 @@ function getUniqueSpecifiers(unresolvedImports) {
 function formatUnknownError(error) {
     return error instanceof Error ? error.message : String(error);
 }
+function normalizeSpecifierResolution(specifier, importerPath) {
+    let authoredInjectedPackageSpecifier = restoreAuthoredInjectedPackageSpecifier(specifier);
+    if (authoredInjectedPackageSpecifier) {
+        return {
+            importerPath,
+            specifier: authoredInjectedPackageSpecifier,
+        };
+    }
+    if (getInjectedPackageNameForSpecifier(specifier)) {
+        return {
+            importerPath: getInjectedPackageImporterPath(),
+            specifier,
+        };
+    }
+    return {
+        importerPath,
+        specifier,
+    };
+}
+function getDisplayImportSpecifier(specifier) {
+    return restoreAuthoredInjectedPackageSpecifier(specifier) ?? specifier;
+}
 function failResolve(error, trackedFiles, trackedResolutions, importerPath, options = {}) {
     return {
         ok: false,
         error: toResolveError(error, importerPath),
-        tracking: {
-            trackedFiles: [...trackedFiles],
-            trackedResolutions: appendFailedTrackedResolution(trackedResolutions, options.trackedResolution),
-        },
+        tracking: toResolveTracking(trackedFiles, appendFailedTrackedResolution(trackedResolutions, options.trackedResolution)),
+    };
+}
+function toResolveTracking(trackedFiles, trackedResolutions) {
+    return {
+        trackedFiles: [
+            ...trackedFiles,
+            ...trackedResolutions.flatMap((trackedResolution) => trackedResolution.candidatePaths),
+        ],
+        trackedDirectories: trackedResolutions.flatMap((trackedResolution) => trackedResolution.candidatePrefixes),
     };
 }
 function appendFailedTrackedResolution(trackedResolutions, trackedResolution) {

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

@@ -1,8 +1,11 @@
 import type { TsConfigJsonResolved } from 'get-tsconfig';
 import type { AssetServerCompilationError } from '../compilation-error.ts';
+import type { ModuleRecord, ModuleTracking } from '../module-store.ts';
 import type { CompiledRoutes } from '../routes.ts';
-import type { ScriptsTarget } from '../asset-server.ts';
-import type { ModuleRecord } from './store.ts';
+import type { EmittedModule } from './emit.ts';
+import type { ResolvedScriptTarget } from '../target.ts';
+import type { ResolvedModule } from './resolve.ts';
+type ScriptRecord = ModuleRecord<TransformedModule, ResolvedModule, EmittedModule>;
 export type ResolveModuleResult = {
     identityPath: string;
     resolvedPath: string;
@@ -25,16 +28,15 @@ export type TransformedModule = {
     trackedFiles: string[];
     unresolvedImports: UnresolvedImport[];
 };
-export type TransformFailureState = {
-    trackedFiles: readonly string[];
-};
 type TransformResult = {
+    tracking: ModuleTracking;
+} & ({
     ok: true;
     value: TransformedModule;
-} | ({
+} | {
     ok: false;
     error: AssetServerCompilationError;
-} & TransformFailureState);
+});
 type TsconfigTransformOptions = {
     trackedFiles: string[];
     tsconfigRaw?: TsConfigJsonResolved;
@@ -50,13 +52,13 @@ export type TransformArgs = {
     routes: CompiledRoutes;
     sourceMapSourcePaths: 'absolute' | 'url';
     sourceMaps: 'external' | 'inline' | null;
-    target: ScriptsTarget | null;
+    target: ResolvedScriptTarget | null;
     tsconfigTransformOptionsResolver: TsconfigTransformOptionsResolver;
 };
 export declare function createTsconfigTransformOptionsResolver(): {
     clear(): void;
     getTransformOptions(filePath: string, isWatchIgnored: (filePath: string) => boolean): TsconfigTransformOptions;
 };
-export declare function transformModule(record: ModuleRecord, args: TransformArgs): Promise<TransformResult>;
+export declare function transformModule(record: ScriptRecord, args: TransformArgs): Promise<TransformResult>;
 export {};
 //# sourceMappingURL=transform.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../src/lib/scripts/transform.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAS,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAQ/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAA;AAG1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AA6B9C,MAAM,MAAM,mBAAmB,GAAG;IAChC,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,KAAK,gBAAgB,GAAG;IACtB,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;IACnB,iBAAiB,EAAE,MAAM,EAAE,CAAA;IAC3B,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,iBAAiB,EAAE,MAAM,CAAA;IACzB,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,iBAAiB,EAAE,gBAAgB,EAAE,CAAA;CACtC,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAA;CAChC,CAAA;AAED,KAAK,eAAe,GAChB;IACE,EAAE,EAAE,IAAI,CAAA;IACR,KAAK,EAAE,iBAAiB,CAAA;CACzB,GACD,CAAC;IACC,EAAE,EAAE,KAAK,CAAA;IACT,KAAK,EAAE,2BAA2B,CAAA;CACnC,GAAG,qBAAqB,CAAC,CAAA;AAE9B,KAAK,wBAAwB,GAAG;IAC9B,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,WAAW,CAAC,EAAE,oBAAoB,CAAA;CACnC,CAAA;AAED,KAAK,gCAAgC,GAAG,UAAU,CAAC,OAAO,sCAAsC,CAAC,CAAA;AAEjG,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAA;IACrC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;IAChC,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IACzC,MAAM,EAAE,OAAO,CAAA;IACf,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;IACtD,MAAM,EAAE,cAAc,CAAA;IACtB,oBAAoB,EAAE,UAAU,GAAG,KAAK,CAAA;IACxC,UAAU,EAAE,UAAU,GAAG,QAAQ,GAAG,IAAI,CAAA;IACxC,MAAM,EAAE,aAAa,GAAG,IAAI,CAAA;IAC5B,gCAAgC,EAAE,gCAAgC,CAAA;CACnE,CAAA;AAED,wBAAgB,sCAAsC;;;EAkCrD;AAED,wBAAsB,eAAe,CACnC,MAAM,EAAE,YAAY,EACpB,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,eAAe,CAAC,CAiH1B"}
+{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../../src/lib/scripts/transform.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAS,oBAAoB,EAAE,MAAM,cAAc,CAAA;AAS/D,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAA;AAO1E,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAEtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAElD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAC9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAA;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAElD,KAAK,YAAY,GAAG,YAAY,CAAC,iBAAiB,EAAE,cAAc,EAAE,aAAa,CAAC,CAAA;AA4BlF,MAAM,MAAM,mBAAmB,GAAG;IAChC,YAAY,EAAE,MAAM,CAAA;IACpB,YAAY,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,KAAK,gBAAgB,GAAG;IACtB,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,CAAC,EAAE,GAAG,GAAG,GAAG,GAAG,GAAG,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;IACnB,iBAAiB,EAAE,MAAM,EAAE,CAAA;IAC3B,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,EAAE,MAAM,CAAA;IACpB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;IACxB,iBAAiB,EAAE,MAAM,CAAA;IACzB,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,iBAAiB,EAAE,gBAAgB,EAAE,CAAA;CACtC,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,QAAQ,EAAE,cAAc,CAAA;CACzB,GAAG,CACA;IACE,EAAE,EAAE,IAAI,CAAA;IACR,KAAK,EAAE,iBAAiB,CAAA;CACzB,GACD;IACE,EAAE,EAAE,KAAK,CAAA;IACT,KAAK,EAAE,2BAA2B,CAAA;CACnC,CACJ,CAAA;AAED,KAAK,wBAAwB,GAAG;IAC9B,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,WAAW,CAAC,EAAE,oBAAoB,CAAA;CACnC,CAAA;AAED,KAAK,gCAAgC,GAAG,UAAU,CAAC,OAAO,sCAAsC,CAAC,CAAA;AAEjG,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;IACtB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,CAAA;IACrC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;IAChC,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAA;IACzC,MAAM,EAAE,OAAO,CAAA;IACf,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAA;IACtD,MAAM,EAAE,cAAc,CAAA;IACtB,oBAAoB,EAAE,UAAU,GAAG,KAAK,CAAA;IACxC,UAAU,EAAE,UAAU,GAAG,QAAQ,GAAG,IAAI,CAAA;IACxC,MAAM,EAAE,oBAAoB,GAAG,IAAI,CAAA;IACnC,gCAAgC,EAAE,gCAAgC,CAAA;CACnE,CAAA;AAED,wBAAgB,sCAAsC;;;EAkCrD;AAED,wBAAsB,eAAe,CACnC,MAAM,EAAE,YAAY,EACpB,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,eAAe,CAAC,CA6H1B"}

package/dist/lib/scripts/transform.js

@@ -2,12 +2,15 @@ import * as fs from 'node:fs';
 import * as fsp from 'node:fs/promises';
 import * as path from 'node:path';
 import { getTsconfig } from 'get-tsconfig';
+import MagicString from 'magic-string';
 import { minify } from 'oxc-minify';
+import { parseSync, visitorKeys } from 'oxc-parser';
 import { transform as oxcTransform } from 'oxc-transform';
 import { init as esModuleLexerInit, parse as esModuleLexer } from 'es-module-lexer';
 import { isCommonJS, mayContainCommonJSModuleGlobals } from "./cjs-check.js";
 import { createAssetServerCompilationError, isAssetServerCompilationError, } from "../compilation-error.js";
 import { generateFingerprint } from "../fingerprint.js";
+import { maskAuthoredInjectedPackageSpecifier, mayContainInjectedPackageSpecifier, restoreAuthoredInjectedPackageSpecifier, } from "../injected-packages.js";
 import { normalizeFilePath } from "../paths.js";
 import { composeSourceMaps, rewriteSourceMapSources, stringifySourceMap } from "../source-maps.js";
 const scriptModuleTypes = [
@@ -63,10 +66,12 @@ export async function transformModule(record, args) {
     if (!resolvedPath) {
         return {
             ok: false,
-            error: createAssetServerCompilationError(`Module not found: ${record.identityPath}`, {
-                code: 'MODULE_NOT_FOUND',
+            error: createAssetServerCompilationError(`File not found: ${record.identityPath}`, {
+                code: 'FILE_NOT_FOUND',
             }),
-            trackedFiles: args.isWatchIgnored(record.identityPath) ? [] : [record.identityPath],
+            tracking: {
+                trackedFiles: args.isWatchIgnored(record.identityPath) ? [] : [record.identityPath],
+            },
         };
     }
     let transformOptions = args.tsconfigTransformOptionsResolver.getTransformOptions(resolvedPath, args.isWatchIgnored);
@@ -82,17 +87,21 @@ export async function transformModule(record, args) {
         if (isNoEntityError(error)) {
             return {
                 ok: false,
-                error: createAssetServerCompilationError(`Module not found: ${resolvedPath}`, {
+                error: createAssetServerCompilationError(`File not found: ${resolvedPath}`, {
                     cause: error,
-                    code: 'MODULE_NOT_FOUND',
+                    code: 'FILE_NOT_FOUND',
                 }),
-                trackedFiles,
+                tracking: {
+                    trackedFiles,
+                },
             };
         }
         return {
             ok: false,
             error: toTransformFailedError(error, resolvedPath),
-            trackedFiles,
+            tracking: {
+                trackedFiles,
+            },
         };
     }
     try {
@@ -102,25 +111,28 @@ export async function transformModule(record, args) {
             sourceMaps: args.sourceMaps ?? undefined,
             target: args.target ?? undefined,
         });
-        analysis.unresolvedImports = analysis.unresolvedImports.filter((unresolved) => !args.externalSet.has(unresolved.specifier));
+        analysis.unresolvedImports = analysis.unresolvedImports.filter((unresolved) => !args.externalSet.has(getDisplayImportSpecifier(unresolved.specifier)));
         if (mayContainCommonJSModuleGlobals(sourceText) && isCommonJS(analysis.rawCode)) {
             throw createAssetServerCompilationError(`CommonJS module detected: ${resolvedPath}. ` +
                 `This module uses CommonJS (require/module.exports) which is not supported. ` +
                 `Please use an ESM-compatible module.`, {
-                code: 'MODULE_COMMONJS_NOT_SUPPORTED',
+                code: 'COMMONJS_NOT_SUPPORTED',
             });
         }
         let stableUrlPathname = args.routes.toUrlPathname(record.identityPath);
         if (!stableUrlPathname) {
-            throw createAssetServerCompilationError(`Module ${record.identityPath} is outside all configured fileMap entries.`, {
-                code: 'MODULE_OUTSIDE_FILE_MAP',
+            throw createAssetServerCompilationError(`File ${record.identityPath} is outside all configured fileMap entries.`, {
+                code: 'FILE_OUTSIDE_FILE_MAP',
             });
         }
         let sourceMap = analysis.sourceMap
-            ? rewriteSourceMapSources(analysis.sourceMap, resolvedPath, stableUrlPathname, args.sourceMapSourcePaths)
+            ? rewriteSourceMapSources(analysis.sourceMap, resolvedPath, stableUrlPathname, args.sourceMapSourcePaths, sourceText)
             : null;
         return {
             ok: true,
+            tracking: {
+                trackedFiles,
+            },
             value: {
                 fingerprint: args.buildId === null
                     ? null
@@ -146,7 +158,9 @@ export async function transformModule(record, args) {
         return {
             ok: false,
             error: toTransformFailedError(error, resolvedPath),
-            trackedFiles,
+            tracking: {
+                trackedFiles,
+            },
         };
     }
 }
@@ -167,17 +181,18 @@ function isPackageImportSpecifier(specifier) {
     return !specifier.startsWith('./') && !specifier.startsWith('../') && !specifier.startsWith('/');
 }
 async function analyzeModuleSource(sourceText, resolvedPath, transformOptions, options) {
+    let maskedSourceText = maskAuthoredInjectedPackageImports(sourceText, resolvedPath);
     let transformResult;
     try {
-        transformResult = await oxcTransform(resolvedPath, sourceText, getTransformOptions(resolvedPath, transformOptions, options));
+        transformResult = await oxcTransform(resolvedPath, maskedSourceText, getTransformOptions(resolvedPath, transformOptions, options));
         assertNoCompilerErrors(transformResult.errors, resolvedPath, 'transform');
     }
     catch (error) {
         if (isAssetServerCompilationError(error))
             throw error;
-        throw createAssetServerCompilationError(`Failed to transform module ${resolvedPath}. ${formatUnknownError(error)}`, {
+        throw createAssetServerCompilationError(`Failed to transform script ${resolvedPath}. ${formatUnknownError(error)}`, {
             cause: error,
-            code: 'MODULE_TRANSFORM_FAILED',
+            code: 'TRANSFORM_FAILED',
         });
     }
     let rawCode = transformResult.code.trimEnd();
@@ -213,9 +228,9 @@ async function minifyModule(rawCode, resolvedPath, target, sourceMaps) {
     catch (error) {
         if (isAssetServerCompilationError(error))
             throw error;
-        throw createAssetServerCompilationError(`Failed to minify module ${resolvedPath}. ${formatUnknownError(error)}`, {
+        throw createAssetServerCompilationError(`Failed to minify script ${resolvedPath}. ${formatUnknownError(error)}`, {
             cause: error,
-            code: 'MODULE_TRANSFORM_FAILED',
+            code: 'TRANSFORM_FAILED',
         });
     }
 }
@@ -256,7 +271,7 @@ function getJsxOptions(resolvedPath, compilerOptions) {
     if (jsx === 'preserve' || jsx === 'react-native') {
         throw createAssetServerCompilationError(`Unsupported tsconfig compilerOptions.jsx = "${jsx}" for ${resolvedPath}. ` +
             `Asset server must compile JSX to browser-runnable JavaScript.`, {
-            code: 'MODULE_TRANSFORM_FAILED',
+            code: 'TRANSFORM_FAILED',
         });
     }
     if (jsx === 'react-jsx' || jsx === 'react-jsxdev') {
@@ -293,8 +308,8 @@ function getStringOption(compilerOptions, key) {
 function assertNoCompilerErrors(errors, resolvedPath, operation) {
     if (!errors || errors.length === 0)
         return;
-    throw createAssetServerCompilationError(`Failed to ${operation} module ${resolvedPath}. ${errors[0].message ?? 'Unknown error'}`, {
-        code: 'MODULE_TRANSFORM_FAILED',
+    throw createAssetServerCompilationError(`Failed to ${operation} script ${resolvedPath}. ${errors[0].message ?? 'Unknown error'}`, {
+        code: 'TRANSFORM_FAILED',
     });
 }
 async function getUnresolvedImportsFromLexer(rawCode) {
@@ -314,6 +329,78 @@ async function getUnresolvedImportsFromLexer(rawCode) {
     }
     return unresolvedImports;
 }
+function getDisplayImportSpecifier(specifier) {
+    return restoreAuthoredInjectedPackageSpecifier(specifier) ?? specifier;
+}
+function maskAuthoredInjectedPackageImports(sourceText, resolvedPath) {
+    if (!mayContainInjectedPackageSpecifier(sourceText)) {
+        return sourceText;
+    }
+    let parseResult = parseSync(resolvedPath, sourceText, {
+        lang: getSourceLanguageForPath(resolvedPath),
+        sourceType: 'module',
+    });
+    if (parseResult.errors.length > 0) {
+        return sourceText;
+    }
+    let replacements = [];
+    walkAst(parseResult.program, (node) => {
+        if (node.type !== 'ImportDeclaration' &&
+            node.type !== 'ExportAllDeclaration' &&
+            node.type !== 'ExportNamedDeclaration' &&
+            node.type !== 'ImportExpression') {
+            return;
+        }
+        let source = 'source' in node ? node.source : null;
+        if (!isStringLiteralNode(source))
+            return;
+        let maskedSpecifier = maskAuthoredInjectedPackageSpecifier(source.value);
+        if (maskedSpecifier == null)
+            return;
+        replacements.push({
+            end: source.end - 1,
+            specifier: maskedSpecifier,
+            start: source.start + 1,
+        });
+    });
+    if (replacements.length === 0)
+        return sourceText;
+    let rewrittenSource = new MagicString(sourceText);
+    for (let replacement of replacements) {
+        rewrittenSource.overwrite(replacement.start, replacement.end, replacement.specifier);
+    }
+    return rewrittenSource.toString();
+}
+function walkAst(node, visit) {
+    visit(node);
+    let keys = visitorKeys[node.type];
+    if (!keys)
+        return;
+    let walkableNode = node;
+    for (let key of keys) {
+        let value = walkableNode[key];
+        if (Array.isArray(value)) {
+            for (let child of value) {
+                if (isAstNode(child)) {
+                    walkAst(child, visit);
+                }
+            }
+            continue;
+        }
+        if (isAstNode(value)) {
+            walkAst(value, visit);
+        }
+    }
+}
+function isAstNode(value) {
+    return typeof value === 'object' && value !== null && 'type' in value;
+}
+function isStringLiteralNode(node) {
+    return (node?.type === 'Literal' &&
+        typeof node.start === 'number' &&
+        typeof node.end === 'number' &&
+        typeof node.value === 'string');
+}
 function getStaticImportSpecifier(source, imported) {
     if (imported.n != null) {
         return imported.n;
@@ -352,9 +439,9 @@ function formatUnknownError(error) {
 function toTransformFailedError(error, resolvedPath) {
     if (isAssetServerCompilationError(error))
         return error;
-    return createAssetServerCompilationError(`Failed to transform module ${resolvedPath}. ${formatUnknownError(error)}`, {
+    return createAssetServerCompilationError(`Failed to transform script ${resolvedPath}. ${formatUnknownError(error)}`, {
         cause: error,
-        code: 'MODULE_TRANSFORM_FAILED',
+        code: 'TRANSFORM_FAILED',
     });
 }
 function isNoEntityError(error) {

package/dist/lib/source-maps.d.ts

@@ -1,4 +1,4 @@
 export declare function composeSourceMaps(rewriteSourceMap: string, transformSourceMap: string): string;
-export declare function rewriteSourceMapSources(sourceMap: string, resolvedPath: string, stableUrlPathname: string, sourceMapSourcePaths: 'absolute' | 'url'): string;
+export declare function rewriteSourceMapSources(sourceMap: string, resolvedPath: string, stableUrlPathname: string, sourceMapSourcePaths: 'absolute' | 'url', sourceContent?: string): string;
 export declare function stringifySourceMap(map: unknown): string | null;
 //# sourceMappingURL=source-maps.d.ts.map

package/dist/lib/source-maps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"source-maps.d.ts","sourceRoot":"","sources":["../../src/lib/source-maps.ts"],"names":[],"mappings":"AAIA,wBAAgB,iBAAiB,CAAC,gBAAgB,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,MAAM,CA2C9F;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,MAAM,EACzB,oBAAoB,EAAE,UAAU,GAAG,KAAK,GACvC,MAAM,CAMR;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAK9D"}
+{"version":3,"file":"source-maps.d.ts","sourceRoot":"","sources":["../../src/lib/source-maps.ts"],"names":[],"mappings":"AAIA,wBAAgB,iBAAiB,CAAC,gBAAgB,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,MAAM,CA2C9F;AAED,wBAAgB,uBAAuB,CACrC,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,MAAM,EACzB,oBAAoB,EAAE,UAAU,GAAG,KAAK,EACxC,aAAa,CAAC,EAAE,MAAM,GACrB,MAAM,CASR;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAQ9D"}

package/dist/lib/source-maps.js

@@ -38,11 +38,14 @@ export function composeSourceMaps(rewriteSourceMap, transformSourceMap) {
     }
     return JSON.stringify(generator.toJSON());
 }
-export function rewriteSourceMapSources(sourceMap, resolvedPath, stableUrlPathname, sourceMapSourcePaths) {
+export function rewriteSourceMapSources(sourceMap, resolvedPath, stableUrlPathname, sourceMapSourcePaths, sourceContent) {
     let json = JSON.parse(sourceMap);
     json.sources = [
         sourceMapSourcePaths === 'absolute' ? normalizeFilePath(resolvedPath) : stableUrlPathname,
     ];
+    if (sourceContent !== undefined) {
+        json.sourcesContent = [sourceContent];
+    }
     return JSON.stringify(json);
 }
 export function stringifySourceMap(map) {
@@ -50,6 +53,9 @@ export function stringifySourceMap(map) {
         return null;
     if (typeof map === 'string')
         return map;
+    if (map instanceof Uint8Array) {
+        return Buffer.from(map).toString('utf8');
+    }
     if (typeof map === 'object' && map !== null)
         return JSON.stringify(map);
     return String(map);

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

@@ -0,0 +1,52 @@
+import type { CompiledRoutes } from '../routes.ts';
+import type { ResolvedStyleTarget } from '../target.ts';
+import type { EmittedAsset } from './emit.ts';
+type StyleCompileResult = {
+    code: EmittedAsset;
+    fingerprint: string | null;
+    sourceMap: EmittedAsset | null;
+};
+type StyleGetResult = {
+    style: StyleCompileResult;
+    type: 'style';
+} | {
+    etag: string;
+    type: 'not-modified';
+};
+type StyleGetOptions = {
+    ifNoneMatch: string | null;
+    isSourceMapRequest: boolean;
+    requestedFingerprint: string | null;
+};
+type StyleCompilerOptions = {
+    buildId?: string;
+    fingerprintAssets: boolean;
+    isAllowed(absolutePath: string): boolean;
+    minify: boolean;
+    onWatchDirectoriesChange?: (delta: {
+        add: string[];
+        remove: string[];
+    }) => void;
+    rootDir: string;
+    routes: CompiledRoutes;
+    sourceMapSourcePaths: 'absolute' | 'url';
+    sourceMaps?: 'external' | 'inline';
+    targets?: ResolvedStyleTarget;
+    watchIgnore?: readonly string[];
+};
+type StyleCompiler = {
+    getHref(filePath: string): Promise<string>;
+    getPreloadLayers(filePath: string | readonly string[]): Promise<string[][]>;
+    getStyle(filePath: string, options: StyleGetOptions): Promise<StyleGetResult>;
+    handleFileEvent(filePath: string, event: 'add' | 'change' | 'unlink'): Promise<void>;
+};
+export declare function createStyleCompiler(options: StyleCompilerOptions): StyleCompiler;
+export declare function isStyleFilePath(filePath: string): boolean;
+export declare function createResponseForStyle(result: StyleCompileResult, options: {
+    cacheControl: string;
+    ifNoneMatch: string | null;
+    isSourceMapRequest: boolean;
+    method: string;
+}): Response;
+export {};
+//# sourceMappingURL=compiler.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../../../src/lib/styles/compiler.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAEvD,OAAO,KAAK,EAAE,YAAY,EAAgB,MAAM,WAAW,CAAA;AAS3D,KAAK,kBAAkB,GAAG;IACxB,IAAI,EAAE,YAAY,CAAA;IAClB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,SAAS,EAAE,YAAY,GAAG,IAAI,CAAA;CAC/B,CAAA;AAED,KAAK,cAAc,GACf;IACE,KAAK,EAAE,kBAAkB,CAAA;IACzB,IAAI,EAAE,OAAO,CAAA;CACd,GACD;IACE,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,cAAc,CAAA;CACrB,CAAA;AAEL,KAAK,eAAe,GAAG;IACrB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,kBAAkB,EAAE,OAAO,CAAA;IAC3B,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAA;CACpC,CAAA;AAED,KAAK,oBAAoB,GAAG;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAA;IACxC,MAAM,EAAE,OAAO,CAAA;IACf,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,GAAG,EAAE,MAAM,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,EAAE,CAAA;KAAE,KAAK,IAAI,CAAA;IAC/E,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,cAAc,CAAA;IACtB,oBAAoB,EAAE,UAAU,GAAG,KAAK,CAAA;IACxC,UAAU,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAA;IAClC,OAAO,CAAC,EAAE,mBAAmB,CAAA;IAC7B,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAChC,CAAA;AAED,KAAK,aAAa,GAAG;IACnB,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAC1C,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;IAC3E,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7E,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACrF,CAAA;AAKD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,aAAa,CAiOhF;AAkED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,kBAAkB,EAC1B,OAAO,EAAE;IACP,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,kBAAkB,EAAE,OAAO,CAAA;IAC3B,MAAM,EAAE,MAAM,CAAA;CACf,GACA,QAAQ,CA6BV"}