@absolutejs/absolute 0.19.0-beta.846 → 0.19.0-beta.848

package/dist/angular/server.js

@@ -1430,11 +1430,53 @@ ${contents}` : contents, normalizePostcssModule = (mod) => {
       code: await compileStyleSource(path, content, language, config)
     };
   }
-}), compileStyleFileIfNeeded = async (filePath, config) => {
-  if (!isPreprocessableStylePath(filePath)) {
-    return runPostcss(await readFile(filePath, "utf-8"), filePath, config);
+}), CSS_IMPORT_PATTERN, resolveCssImportsAsync = async (content, baseDir, visited) => {
+  const matches = Array.from(content.matchAll(CSS_IMPORT_PATTERN));
+  if (matches.length === 0)
+    return content;
+  let cursor = 0;
+  const parts = [];
+  for (const match of matches) {
+    const importPath = match[1];
+    if (importPath === undefined)
+      continue;
+    const start = match.index ?? 0;
+    const end = start + match[0].length;
+    parts.push(content.slice(cursor, start));
+    const fullPath = isAbsolute(importPath) ? importPath : resolve3(baseDir, importPath);
+    if (visited.has(fullPath) || !existsSync3(fullPath)) {
+      parts.push(visited.has(fullPath) ? "" : match[0]);
+      cursor = end;
+      continue;
+    }
+    const nextVisited = new Set(visited);
+    nextVisited.add(fullPath);
+    const imported = await readFile(fullPath, "utf-8");
+    parts.push(await resolveCssImportsAsync(imported, dirname(fullPath), nextVisited));
+    cursor = end;
   }
-  return compileStyleSource(filePath, undefined, undefined, config);
+  parts.push(content.slice(cursor));
+  return parts.join("");
+}, compileStyleFileIfNeeded = async (filePath, config) => {
+  if (!isPreprocessableStylePath(filePath)) {
+    const raw = await readFile(filePath, "utf-8");
+    const processed = await runPostcss(raw, filePath, config);
+    return resolveCssImportsAsync(processed, dirname(filePath), new Set([filePath]));
+  }
+  const compiled = await compileStyleSource(filePath, undefined, undefined, config);
+  return resolveCssImportsAsync(compiled, dirname(filePath), new Set([filePath]));
+}, resolveCssImportsSync = (content, baseDir, visited) => {
+  return content.replace(CSS_IMPORT_PATTERN, (match, importPath) => {
+    const fullPath = isAbsolute(importPath) ? importPath : resolve3(baseDir, importPath);
+    if (visited.has(fullPath))
+      return "";
+    if (!existsSync3(fullPath))
+      return match;
+    const nextVisited = new Set(visited);
+    nextVisited.add(fullPath);
+    const imported = readFileSync3(fullPath, "utf-8");
+    return resolveCssImportsSync(imported, dirname(fullPath), nextVisited);
+  });
 }, compileStyleFileIfNeededSync = (filePath, config) => {
   const rawContents = readFileSync3(filePath, "utf-8");
   const language = getStyleLanguage(filePath);
@@ -1452,7 +1494,7 @@ ${contents}` : contents, normalizePostcssModule = (mod) => {
     }
     const contents = withAdditionalData(rawContents, options.additionalData);
     const loadPaths = normalizeLoadPaths(filePath, options.loadPaths);
-    return sass.compileString(contents, {
+    const compiled = sass.compileString(contents, {
       importers: [
         createSassImporter(filePath, loadPaths, language, config)
       ],
@@ -1461,6 +1503,7 @@ ${contents}` : contents, normalizePostcssModule = (mod) => {
       syntax: language === "sass" ? "indented" : "scss",
       url: new URL(`file://${filePath}`)
     }).css;
+    return resolveCssImportsSync(compiled, dirname(filePath), new Set([filePath]));
   }
   if (language === "less") {
     throw new Error(`Unable to compile ${filePath}: Less styleUrl preprocessing is async-only. Import the Less file from a bundled entrypoint or use SCSS/CSS for Angular styleUrl.`);
@@ -1468,7 +1511,7 @@ ${contents}` : contents, normalizePostcssModule = (mod) => {
   if (language === "stylus") {
     throw new Error(`Unable to compile ${filePath}: Stylus styleUrl preprocessing is async-only. Import the Stylus file from a bundled entrypoint or use SCSS/CSS for Angular styleUrl.`);
   }
-  return rawContents;
+  return resolveCssImportsSync(rawContents, dirname(filePath), new Set([filePath]));
 }, getCssOutputExtension = (filePath) => isPreprocessableStylePath(filePath) ? ".css" : extname(filePath);
 var init_stylePreprocessor = __esm(() => {
   CSS_EXTENSION_PATTERN = /\.css$/i;
@@ -1481,6 +1524,7 @@ var init_stylePreprocessor = __esm(() => {
   styleDependencyGraph = new Map;
   styleOutputHashes = new Map;
   stylePreprocessorPlugin = createStylePreprocessorPlugin();
+  CSS_IMPORT_PATTERN = /@import\s+["']([^"']+)["']\s*;?/g;
 });
 
 // src/core/svelteServerModule.ts
@@ -3306,6 +3350,16 @@ var init_lowerDeferSyntax = __esm(() => {
   init_constants();
 });
 
+// src/utils/generatedDir.ts
+var exports_generatedDir = {};
+__export(exports_generatedDir, {
+  getGeneratedRoot: () => getGeneratedRoot,
+  getFrameworkGeneratedDir: () => getFrameworkGeneratedDir
+});
+import { join as join5 } from "path";
+var GENERATED_DIR_NAME = "generated", ABSOLUTE_CACHE_DIR_NAME = ".absolutejs", getGeneratedRoot = (projectRoot = process.cwd()) => join5(projectRoot, ABSOLUTE_CACHE_DIR_NAME, GENERATED_DIR_NAME), getFrameworkGeneratedDir = (framework, projectRoot = process.cwd()) => join5(getGeneratedRoot(projectRoot), framework);
+var init_generatedDir = () => {};
+
 // src/build/compileAngular.ts
 var exports_compileAngular = {};
 __export(exports_compileAngular, {
@@ -3315,7 +3369,7 @@ __export(exports_compileAngular, {
   compileAngular: () => compileAngular
 });
 import { existsSync as existsSync4, readFileSync as readFileSync4, promises as fs } from "fs";
-import { join as join5, basename as basename3, sep, dirname as dirname3, resolve as resolve5, relative as relative3 } from "path";
+import { join as join6, basename as basename3, sep, dirname as dirname3, resolve as resolve5, relative as relative3 } from "path";
 import ts from "typescript";
 var traceAngularPhase = async (name, fn, metadata) => {
   const tracePhase = globalThis.__absoluteBuildTracePhase;
@@ -3357,10 +3411,10 @@ var traceAngularPhase = async (name, fn, metadata) => {
     `${candidate}.tsx`,
     `${candidate}.js`,
     `${candidate}.jsx`,
-    join5(candidate, "index.ts"),
-    join5(candidate, "index.tsx"),
-    join5(candidate, "index.js"),
-    join5(candidate, "index.jsx")
+    join6(candidate, "index.ts"),
+    join6(candidate, "index.tsx"),
+    join6(candidate, "index.js"),
+    join6(candidate, "index.jsx")
   ];
   return candidates.find((file) => existsSync4(file));
 }, createLegacyAngularAnimationUsageResolver = (rootDir) => {
@@ -3549,10 +3603,10 @@ ${registrations}
     `${basePath}.tsx`,
     `${basePath}.mts`,
     `${basePath}.cts`,
-    join5(basePath, "index.ts"),
-    join5(basePath, "index.tsx"),
-    join5(basePath, "index.mts"),
-    join5(basePath, "index.cts")
+    join6(basePath, "index.ts"),
+    join6(basePath, "index.tsx"),
+    join6(basePath, "index.mts"),
+    join6(basePath, "index.cts")
   ];
   return candidates.map((candidate) => resolve5(candidate)).find((candidate) => existsSync4(candidate) && !candidate.endsWith(".d.ts")) ?? null;
 }, readFileForAotTransform = async (fileName, readFile2) => {
@@ -3578,15 +3632,15 @@ ${registrations}
   const paths = [];
   const templateUrlMatch = findUncommentedMatch(source, /templateUrl\s*:\s*['"]([^'"]+)['"]/);
   if (templateUrlMatch?.[1])
-    paths.push(join5(fileDir, templateUrlMatch[1]));
+    paths.push(join6(fileDir, templateUrlMatch[1]));
   const styleUrlMatch = findUncommentedMatch(source, /styleUrl\s*:\s*['"]([^'"]+)['"]/);
   if (styleUrlMatch?.[1])
-    paths.push(join5(fileDir, styleUrlMatch[1]));
+    paths.push(join6(fileDir, styleUrlMatch[1]));
   const styleUrlsMatch = findUncommentedMatch(source, /styleUrls\s*:\s*\[([^\]]+)\]/);
   const urlMatches = styleUrlsMatch?.[1]?.match(/['"]([^'"]+)['"]/g);
   if (urlMatches) {
     for (const urlMatch of urlMatches) {
-      paths.push(join5(fileDir, urlMatch.replace(/['"]/g, "")));
+      paths.push(join6(fileDir, urlMatch.replace(/['"]/g, "")));
     }
   }
   return paths.map((path) => resolve5(path));
@@ -3620,7 +3674,7 @@ ${registrations}
     safeStableStringify(stylePreprocessors ?? null)
   ].join("\x00");
   const cacheKey = Bun.hash(cacheInput).toString(BASE_36_RADIX);
-  return join5(process.cwd(), ".absolutejs", "cache", "angular-resources", `${cacheKey}.json`);
+  return join6(process.cwd(), ".absolutejs", "cache", "angular-resources", `${cacheKey}.json`);
 }, precomputeAotResourceTransforms = async (inputPaths, readFile2, stylePreprocessors) => {
   const transformedSources = new Map;
   const visited = new Set;
@@ -3666,7 +3720,7 @@ ${registrations}
   return { stats, transformedSources };
 }, compileAngularFiles = async (inputPaths, outDir, stylePreprocessors) => {
   const islandMetadataByOutputPath = await traceAngularPhase("aot/island-metadata", () => new Map(inputPaths.map((inputPath) => {
-    const outputPath = resolve5(join5(outDir, relative3(process.cwd(), resolve5(inputPath)).replace(/\.[cm]?[tj]sx?$/, ".js")));
+    const outputPath = resolve5(join6(outDir, relative3(process.cwd(), resolve5(inputPath)).replace(/\.[cm]?[tj]sx?$/, ".js")));
     return [
       outputPath,
       buildIslandMetadataExports(readFileSync4(inputPath, "utf-8"))
@@ -3713,7 +3767,7 @@ ${registrations}
   const originalGetSourceFile = host.getSourceFile;
   host.getSourceFile = (fileName, languageVersion, onError) => {
     if (fileName.startsWith("lib.") && fileName.endsWith(".d.ts") && tsLibDir) {
-      const resolvedPath = join5(tsLibDir, fileName);
+      const resolvedPath = join6(tsLibDir, fileName);
       return originalGetSourceFile?.call(host, resolvedPath, languageVersion, onError);
     }
     return originalGetSourceFile?.call(host, fileName, languageVersion, onError);
@@ -3768,7 +3822,7 @@ ${registrations}
   const entries = await traceAngularPhase("aot/postprocess-emitted-js", () => {
     const rawEntries = Object.entries(emitted).filter(([fileName]) => fileName.endsWith(".js")).map(([fileName, content]) => ({
       content,
-      target: join5(outDir, fileName)
+      target: join6(outDir, fileName)
     }));
     const outputFiles = new Set(rawEntries.map(({ target }) => resolve5(target)));
     return rawEntries.map(({ content, target }) => {
@@ -3943,7 +3997,7 @@ ${fields}
 }, inlineTemplateAndLowerDefer = async (source, fileDir) => {
   const templateUrlMatch = findUncommentedMatch(source, /templateUrl\s*:\s*['"]([^'"]+)['"]/);
   if (templateUrlMatch?.[1]) {
-    const templatePath = join5(fileDir, templateUrlMatch[1]);
+    const templatePath = join6(fileDir, templateUrlMatch[1]);
     if (!existsSync4(templatePath)) {
       throw new Error(`Unable to inline Angular templateUrl "${templateUrlMatch[1]}": file not found at ${templatePath}`);
     }
@@ -3974,7 +4028,7 @@ ${fields}
 }, inlineTemplateAndLowerDeferSync = (source, fileDir) => {
   const templateUrlMatch = findUncommentedMatch(source, /templateUrl\s*:\s*['"]([^'"]+)['"]/);
   if (templateUrlMatch?.[1]) {
-    const templatePath = join5(fileDir, templateUrlMatch[1]);
+    const templatePath = join6(fileDir, templateUrlMatch[1]);
     if (!existsSync4(templatePath)) {
       throw new Error(`Unable to inline Angular templateUrl "${templateUrlMatch[1]}": file not found at ${templatePath}`);
     }
@@ -4011,7 +4065,7 @@ ${fields}
     return source;
   const stylePromises = urlMatches.map((urlMatch) => {
     const styleUrl = urlMatch.replace(/['"]/g, "");
-    return readAndEscapeFile(join5(fileDir, styleUrl), stylePreprocessors);
+    return readAndEscapeFile(join6(fileDir, styleUrl), stylePreprocessors);
   });
   const results = await Promise.all(stylePromises);
   const inlinedStyles = results.filter(Boolean).map((escaped) => `\`${escaped}\``);
@@ -4022,7 +4076,7 @@ ${fields}
   const styleUrlMatch = findUncommentedMatch(source, /styleUrl\s*:\s*['"]([^'"]+)['"]/);
   if (!styleUrlMatch?.[1])
     return source;
-  const escaped = await readAndEscapeFile(join5(fileDir, styleUrlMatch[1]), stylePreprocessors);
+  const escaped = await readAndEscapeFile(join6(fileDir, styleUrlMatch[1]), stylePreprocessors);
   if (!escaped)
     return source;
   return source.slice(0, styleUrlMatch.index) + `styles: [\`${escaped}\`]` + source.slice(styleUrlMatch.index + styleUrlMatch[0].length);
@@ -4057,10 +4111,10 @@ ${fields}
       `${candidate}.tsx`,
       `${candidate}.js`,
       `${candidate}.jsx`,
-      join5(candidate, "index.ts"),
-      join5(candidate, "index.tsx"),
-      join5(candidate, "index.js"),
-      join5(candidate, "index.jsx")
+      join6(candidate, "index.ts"),
+      join6(candidate, "index.tsx"),
+      join6(candidate, "index.js"),
+      join6(candidate, "index.jsx")
     ];
     return candidates.find((file) => existsSync4(file));
   };
@@ -4087,7 +4141,7 @@ ${fields}
     const inputDir = dirname3(sourcePath);
     const relativeDir = inputDir.startsWith(baseDir) ? inputDir.substring(baseDir.length + 1) : inputDir;
     const fileBase = basename3(sourcePath).replace(/\.[cm]?[tj]sx?$/, ".js");
-    return join5(outDir, relativeDir, fileBase);
+    return join6(outDir, relativeDir, fileBase);
   };
   const withCacheBuster = (specifier) => {
     if (!cacheBuster)
@@ -4145,7 +4199,7 @@ ${fields}
     const inputDir = dirname3(actualPath);
     const relativeDir = inputDir.startsWith(baseDir) ? inputDir.substring(baseDir.length + 1) : inputDir;
     const fileBase = basename3(actualPath).replace(/\.[cm]?[tj]sx?$/, ".js");
-    const targetDir = join5(outDir, relativeDir);
+    const targetDir = join6(outDir, relativeDir);
     const targetPath = toOutputPath(actualPath);
     const localImports = [];
     const importRewrites = new Map;
@@ -4199,13 +4253,13 @@ export const __ABSOLUTE_PAGE_USES_LEGACY_ANIMATIONS__ = true;
   }
   return allOutputs;
 }, compileAngular = async (entryPoints, outRoot, hmr = false, stylePreprocessors) => {
-  const compiledParent = join5(outRoot, "generated");
+  const compiledParent = getFrameworkGeneratedDir("angular");
   if (entryPoints.length === 0) {
     const emptyPaths = [];
     return { clientPaths: [...emptyPaths], serverPaths: [...emptyPaths] };
   }
   const compiledRoot = compiledParent;
-  const indexesDir = join5(compiledParent, "indexes");
+  const indexesDir = join6(compiledParent, "indexes");
   await traceAngularPhase("setup/create-indexes-dir", () => fs.mkdir(indexesDir, { recursive: true }));
   const aotOutputs = hmr ? [] : await traceAngularPhase("aot/compile-files", () => compileAngularFiles(entryPoints.map((entry) => resolve5(entry)), compiledRoot, stylePreprocessors), { entries: entryPoints.length });
   const usesLegacyAngularAnimations = await traceAngularPhase("setup/legacy-animation-resolver", () => createLegacyAngularAnimationUsageResolver(outRoot));
@@ -4219,9 +4273,9 @@ export const __ABSOLUTE_PAGE_USES_LEGACY_ANIMATIONS__ = true;
     const fileBase = basename3(resolvedEntry).replace(/\.[tj]s$/, "");
     const jsName = `${fileBase}.js`;
     const compiledFallbackPaths = [
-      join5(compiledRoot, relativeEntry),
-      join5(compiledRoot, "pages", jsName),
-      join5(compiledRoot, jsName)
+      join6(compiledRoot, relativeEntry),
+      join6(compiledRoot, "pages", jsName),
+      join6(compiledRoot, jsName)
     ].map((file) => resolve5(file));
     const resolveRawServerFile = (candidatePaths) => {
       const normalizedCandidates = [
@@ -4266,7 +4320,7 @@ export const __ABSOLUTE_PAGE_USES_LEGACY_ANIMATIONS__ = true;
     const usesLegacyAnimations = await traceAngularPhase("wrapper/detect-legacy-animations", () => usesLegacyAngularAnimations(resolvedEntry), { entry: resolvedEntry });
     const serverContentHash = Bun.hash(original).toString(BASE_36_RADIX);
     const cachedWrapper = wrapperOutputCache.get(resolvedEntry);
-    const clientFile = join5(indexesDir, jsName);
+    const clientFile = join6(indexesDir, jsName);
     if (hmr && cachedWrapper && cachedWrapper.serverHash === serverContentHash && existsSync4(clientFile) && (usesLegacyAnimations || !original.includes("__ABSOLUTE_PAGE_USES_LEGACY_ANIMATIONS__")) && (!usesLegacyAnimations || original.includes("__ABSOLUTE_PAGE_USES_LEGACY_ANIMATIONS__"))) {
       return {
         clientPath: clientFile,
@@ -4501,9 +4555,10 @@ var init_compileAngular = __esm(() => {
   init_sourceMetadata();
   init_lowerDeferSyntax();
   init_stylePreprocessor();
+  init_generatedDir();
   devClientDir = resolveDevClientDir();
-  hmrClientPath = join5(devClientDir, "hmrClient.ts").replace(/\\/g, "/");
-  hmrRuntimePath = join5(devClientDir, "handlers", "angularRuntime.ts").replace(/\\/g, "/");
+  hmrClientPath = join6(devClientDir, "hmrClient.ts").replace(/\\/g, "/");
+  hmrRuntimePath = join6(devClientDir, "handlers", "angularRuntime.ts").replace(/\\/g, "/");
   jitContentCache = new Map;
   wrapperOutputCache = new Map;
 });
@@ -4673,7 +4728,7 @@ init_constants();
 import { AsyncLocalStorage as AsyncLocalStorage3 } from "async_hooks";
 import { mkdir as mkdir2, symlink } from "fs/promises";
 import { tmpdir } from "os";
-import { basename as basename4, dirname as dirname4, join as join6, resolve as resolve6 } from "path";
+import { basename as basename4, dirname as dirname4, join as join7, resolve as resolve6 } from "path";
 import { pathToFileURL } from "url";
 
 // src/core/islandPageContext.ts
@@ -5493,11 +5548,11 @@ var ensureAngularCompiler = () => {
   return compilerImportPromise;
 };
 var readAngularPageModule = (value) => isRecord5(value) ? value : null;
-var resolveAngularSsrOutDir = () => process.env.ABSOLUTE_ANGULAR_SSR_OUTDIR ?? join6(tmpdir(), "absolutejs", "generated", "angular-ssr");
+var resolveAngularSsrOutDir = () => process.env.ABSOLUTE_ANGULAR_SSR_OUTDIR ?? join7(tmpdir(), "absolutejs", "generated", "angular-ssr");
 var createAngularRuntimeCacheBuster = () => `${Date.now().toString(BASE_36_RADIX)}.${Math.random().toString(BASE_36_RADIX).substring(2, RANDOM_ID_END_INDEX)}`;
 var ensureAngularSsrNodeModules = async (outDir) => {
   const outRoot = resolve6(dirname4(dirname4(outDir)));
-  const nodeModulesLink = join6(outRoot, "node_modules");
+  const nodeModulesLink = join7(outRoot, "node_modules");
   if (process.env.ABSOLUTE_ANGULAR_SSR_OUTDIR) {
     return;
   }
@@ -5667,5 +5722,5 @@ export {
   ABSOLUTE_HTTP_TRANSFER_CACHE_SKIP_HEADER
 };
 
-//# debugId=5D5DF5C464BA5C9964756E2164756E21
+//# debugId=D5BF3A75AD36D96464756E2164756E21
 //# sourceMappingURL=server.js.map