@absolutejs/absolute 0.19.0-beta.756 → 0.19.0-beta.758

package/dist/cli/index.js

@@ -33,7 +33,10 @@ var getDurationString = (duration) => {
   } else if (duration < MILLISECONDS_IN_A_MINUTE) {
     durationString = `${(duration / MILLISECONDS_IN_A_SECOND).toFixed(TIME_PRECISION)}s`;
   } else {
-    durationString = `${(duration / MILLISECONDS_IN_A_MINUTE).toFixed(TIME_PRECISION)}m`;
+    const totalSeconds = Math.round(duration / MILLISECONDS_IN_A_SECOND);
+    const minutes = Math.floor(totalSeconds / 60);
+    const seconds = totalSeconds % 60;
+    durationString = seconds === 0 ? `${minutes}m` : `${minutes}m ${seconds}s`;
   }
   return durationString;
 };

package/dist/index.js

@@ -3151,7 +3151,10 @@ var getDurationString = (duration) => {
   } else if (duration < MILLISECONDS_IN_A_MINUTE) {
     durationString = `${(duration / MILLISECONDS_IN_A_SECOND).toFixed(TIME_PRECISION)}s`;
   } else {
-    durationString = `${(duration / MILLISECONDS_IN_A_MINUTE).toFixed(TIME_PRECISION)}m`;
+    const totalSeconds = Math.round(duration / MILLISECONDS_IN_A_SECOND);
+    const minutes = Math.floor(totalSeconds / 60);
+    const seconds = totalSeconds % 60;
+    durationString = seconds === 0 ? `${minutes}m` : `${minutes}m ${seconds}s`;
   }
   return durationString;
 };
@@ -43690,6 +43693,7 @@ var init_lowerDeferSyntax = __esm(() => {
 // src/build/compileAngular.ts
 var exports_compileAngular = {};
 __export(exports_compileAngular, {
+  compileAngularFiles: () => compileAngularFiles,
   compileAngularFileJIT: () => compileAngularFileJIT,
   compileAngularFile: () => compileAngularFile,
   compileAngular: () => compileAngular
@@ -43697,15 +43701,7 @@ __export(exports_compileAngular, {
 import { existsSync as existsSync16, readFileSync as readFileSync10, promises as fs2 } from "fs";
 import { join as join15, basename as basename7, sep as sep3, dirname as dirname11, resolve as resolve19, relative as relative9 } from "path";
 import ts2 from "typescript";
-import { createHash as createHash2 } from "crypto";
-var computeConfigHash = () => {
-  try {
-    const content = readFileSync10("./tsconfig.json", "utf-8");
-    return createHash2("md5").update(content).digest("hex");
-  } catch {
-    return "";
-  }
-}, readTsconfigPathAliases = () => {
+var readTsconfigPathAliases = () => {
   try {
     const configPath2 = resolve19(process.cwd(), "tsconfig.json");
     const config = ts2.readConfigFile(configPath2, ts2.sys.readFile).config;
@@ -43856,6 +43852,21 @@ ${registrations}
   if (fileName.startsWith(outDir))
     return fileName.substring(outDir.length + 1);
   return fileName;
+}, hasJsLikeExtension = (path2) => /\.(js|ts|mjs|cjs)$/.test(path2), rewriteRelativeJsSpecifier = (importerOutputPath, specifier, outputFiles) => {
+  if (specifier.endsWith(".ts"))
+    return specifier.replace(/\.ts$/, ".js");
+  if (hasJsLikeExtension(specifier))
+    return specifier;
+  const importerDir = dirname11(importerOutputPath);
+  const fileCandidate = resolve19(importerDir, `${specifier}.js`);
+  if (outputFiles?.has(fileCandidate) || existsSync16(fileCandidate)) {
+    return `${specifier}.js`;
+  }
+  const indexCandidate = resolve19(importerDir, specifier, "index.js");
+  if (outputFiles?.has(indexCandidate) || existsSync16(indexCandidate)) {
+    return `${specifier}/index.js`;
+  }
+  return `${specifier}.js`;
 }, isRelativeModuleSpecifier = (specifier) => specifier.startsWith("./") || specifier.startsWith("../"), extractLocalImportSpecifiers = (source, fileName) => {
   const sourceFile = ts2.createSourceFile(fileName, source, ts2.ScriptTarget.Latest, true, ts2.ScriptKind.TS);
   const specifiers = [];
@@ -43896,7 +43907,7 @@ ${registrations}
   if (typeof hostSource === "string")
     return hostSource;
   return fs2.readFile(fileName, "utf-8");
-}, precomputeAotResourceTransforms = async (inputPath, readFile4, stylePreprocessors) => {
+}, precomputeAotResourceTransforms = async (inputPaths, readFile4, stylePreprocessors) => {
   const transformedSources = new Map;
   const visited = new Set;
   const transformFile = async (filePath) => {
@@ -43916,70 +43927,59 @@ ${registrations}
         await transformFile(resolvedImport);
     }));
   };
-  await transformFile(inputPath);
+  await Promise.all(inputPaths.map((inputPath) => transformFile(inputPath)));
   return transformedSources;
-}, compileAngularFile = async (inputPath, outDir, stylePreprocessors) => {
-  const islandMetadataExports = buildIslandMetadataExports(readFileSync10(inputPath, "utf-8"));
+}, compileAngularFiles = async (inputPaths, outDir, stylePreprocessors) => {
+  const islandMetadataByOutputPath = new Map(inputPaths.map((inputPath) => {
+    const outputPath = resolve19(join15(outDir, relative9(process.cwd(), resolve19(inputPath)).replace(/\.[cm]?[tj]sx?$/, ".js")));
+    return [
+      outputPath,
+      buildIslandMetadataExports(readFileSync10(inputPath, "utf-8"))
+    ];
+  }));
   const { readConfiguration, performCompilation, EmitFlags } = await import("@angular/compiler-cli");
-  const configHash = computeConfigHash();
-  const cached = globalThis.__angularCompilerCache;
-  let host;
-  let options;
-  let tsLibDir;
-  if (cached && cached.configHash === configHash) {
-    ({ host } = cached);
-    options = { ...cached.options, outDir, rootDir: process.cwd() };
-    ({ tsLibDir } = cached);
-    cached.lastUsed = Date.now();
-  } else {
-    const tsPath = __require.resolve("typescript");
-    const tsRootDir = dirname11(tsPath);
-    tsLibDir = tsRootDir.endsWith("lib") ? tsRootDir : resolve19(tsRootDir, "lib");
-    const config = readConfiguration("./tsconfig.json");
-    options = {
-      emitDecoratorMetadata: true,
-      esModuleInterop: true,
-      experimentalDecorators: true,
-      module: ts2.ModuleKind.ESNext,
-      moduleResolution: ts2.ModuleResolutionKind.Bundler,
-      newLine: ts2.NewLineKind.LineFeed,
-      noLib: false,
-      outDir,
-      skipLibCheck: true,
-      target: ts2.ScriptTarget.ES2022,
-      ...config.options
-    };
-    options.target = ts2.ScriptTarget.ES2022;
-    options.experimentalDecorators = true;
-    options.emitDecoratorMetadata = true;
-    options.newLine = ts2.NewLineKind.LineFeed;
-    options.outDir = outDir;
-    options.noEmit = false;
-    options.rootDir = process.cwd();
-    host = ts2.createCompilerHost(options);
-    const originalGetDefaultLibLocation = host.getDefaultLibLocation;
-    host.getDefaultLibLocation = () => tsLibDir || (originalGetDefaultLibLocation ? originalGetDefaultLibLocation() : "");
-    const originalGetDefaultLibFileName = host.getDefaultLibFileName;
-    host.getDefaultLibFileName = (opts) => {
-      const fileName = originalGetDefaultLibFileName ? originalGetDefaultLibFileName(opts) : "lib.d.ts";
-      return basename7(fileName);
-    };
-    const originalGetSourceFile = host.getSourceFile;
-    host.getSourceFile = (fileName, languageVersion, onError2) => {
-      if (fileName.startsWith("lib.") && fileName.endsWith(".d.ts") && tsLibDir) {
-        const resolvedPath = join15(tsLibDir, fileName);
-        return originalGetSourceFile?.call(host, resolvedPath, languageVersion, onError2);
-      }
-      return originalGetSourceFile?.call(host, fileName, languageVersion, onError2);
-    };
-    globalThis.__angularCompilerCache = {
-      configHash,
-      host,
-      lastUsed: Date.now(),
-      options: { ...options },
-      tsLibDir
-    };
-  }
+  const tsPath = __require.resolve("typescript");
+  const tsRootDir = dirname11(tsPath);
+  const tsLibDir = tsRootDir.endsWith("lib") ? tsRootDir : resolve19(tsRootDir, "lib");
+  const config = readConfiguration("./tsconfig.json");
+  const options = {
+    emitDecoratorMetadata: true,
+    esModuleInterop: true,
+    experimentalDecorators: true,
+    module: ts2.ModuleKind.ESNext,
+    moduleResolution: ts2.ModuleResolutionKind.Bundler,
+    newLine: ts2.NewLineKind.LineFeed,
+    noLib: false,
+    outDir,
+    skipLibCheck: true,
+    target: ts2.ScriptTarget.ES2022,
+    ...config.options
+  };
+  options.target = ts2.ScriptTarget.ES2022;
+  options.experimentalDecorators = true;
+  options.emitDecoratorMetadata = true;
+  options.newLine = ts2.NewLineKind.LineFeed;
+  options.outDir = outDir;
+  options.noEmit = false;
+  options.incremental = false;
+  options.tsBuildInfoFile = undefined;
+  options.rootDir = process.cwd();
+  const host = ts2.createCompilerHost(options);
+  const originalGetDefaultLibLocation = host.getDefaultLibLocation;
+  host.getDefaultLibLocation = () => tsLibDir || (originalGetDefaultLibLocation ? originalGetDefaultLibLocation() : "");
+  const originalGetDefaultLibFileName = host.getDefaultLibFileName;
+  host.getDefaultLibFileName = (opts) => {
+    const fileName = originalGetDefaultLibFileName ? originalGetDefaultLibFileName(opts) : "lib.d.ts";
+    return basename7(fileName);
+  };
+  const originalGetSourceFile = host.getSourceFile;
+  host.getSourceFile = (fileName, languageVersion, onError2) => {
+    if (fileName.startsWith("lib.") && fileName.endsWith(".d.ts") && tsLibDir) {
+      const resolvedPath = join15(tsLibDir, fileName);
+      return originalGetSourceFile?.call(host, resolvedPath, languageVersion, onError2);
+    }
+    return originalGetSourceFile?.call(host, fileName, languageVersion, onError2);
+  };
   const emitted = {};
   const resolvedOutDir = resolve19(outDir);
   host.writeFile = (fileName, text) => {
@@ -43987,7 +43987,7 @@ ${registrations}
     emitted[relativePath] = text;
   };
   const originalReadFile = host.readFile;
-  const aotTransformedSources = await precomputeAotResourceTransforms(inputPath, originalReadFile?.bind(host), stylePreprocessors);
+  const aotTransformedSources = await precomputeAotResourceTransforms(inputPaths, originalReadFile?.bind(host), stylePreprocessors);
   host.readFile = (fileName) => {
     const source = originalReadFile ? originalReadFile.call(host, fileName) : undefined;
     if (typeof source !== "string")
@@ -44012,18 +44012,23 @@ ${registrations}
       emitFlags: EmitFlags.Default,
       host,
       options,
-      rootNames: [inputPath]
+      rootNames: inputPaths
     }));
   } finally {
     host.readFile = originalReadFile;
     host.getSourceFile = originalGetSourceFileForCompile;
   }
   throwOnCompilationErrors(diagnostics);
-  const entries = Object.entries(emitted).filter(([fileName]) => fileName.endsWith(".js")).map(([fileName, content]) => {
-    const target = join15(outDir, fileName);
+  const rawEntries = Object.entries(emitted).filter(([fileName]) => fileName.endsWith(".js")).map(([fileName, content]) => ({
+    content,
+    target: join15(outDir, fileName)
+  }));
+  const outputFiles = new Set(rawEntries.map(({ target }) => resolve19(target)));
+  const entries = rawEntries.map(({ content, target }) => {
     let processedContent = content.replace(/from\s+(['"])(\.\.?\/[^'"]+)(\1)/g, (match, quote, path2) => {
-      if (!path2.match(/\.(js|ts|mjs|cjs)$/)) {
-        return `from ${quote}${path2}.js${quote}`;
+      const rewritten = rewriteRelativeJsSpecifier(target, path2, outputFiles);
+      if (rewritten !== path2) {
+        return `from ${quote}${rewritten}${quote}`;
       }
       return match;
     });
@@ -44033,13 +44038,13 @@ ${registrations}
       return cleaned ? `import { ${cleaned}, InternalInjectFlags } from '@angular/core'` : `import { InternalInjectFlags } from '@angular/core'`;
     });
     processedContent = processedContent.replace(/\b(?<!Internal)InjectFlags\b/g, "InternalInjectFlags");
-    processedContent += islandMetadataExports;
+    processedContent += islandMetadataByOutputPath.get(resolve19(target)) ?? "";
     return { content: processedContent, target };
   });
   await Promise.all(entries.map(({ target }) => fs2.mkdir(dirname11(target), { recursive: true })));
   await Promise.all(entries.map(({ target, content }) => fs2.writeFile(target, content, "utf-8")));
   return entries.map(({ target }) => target);
-}, jitContentCache, wrapperOutputCache, escapeTemplateContent = (content) => content.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$\{/g, "\\${"), findUncommentedMatch = (source, pattern) => {
+}, compileAngularFile = async (inputPath, outDir, stylePreprocessors) => compileAngularFiles([inputPath], outDir, stylePreprocessors), jitContentCache, wrapperOutputCache, escapeTemplateContent = (content) => content.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$\{/g, "\\${"), findUncommentedMatch = (source, pattern) => {
   const re2 = new RegExp(pattern.source, pattern.flags.includes("g") ? pattern.flags : pattern.flags + "g");
   let match;
   while ((match = re2.exec(source)) !== null) {
@@ -44336,6 +44341,7 @@ ${fields}
   };
   const transpileAndRewrite = (sourceCode, relativeDir, actualPath, importRewrites) => {
     let processedContent = angularTranspiler.transformSync(sourceCode);
+    const outputPath = toOutputPath(actualPath);
     const rewriteBareImport = (prefix, specifier, suffix) => {
       const rewritten = importRewrites.get(specifier);
       if (rewritten) {
@@ -44350,11 +44356,9 @@ ${fields}
     processedContent = processedContent.replace(/(import\s+['"])([^'"]+)(['"])/g, (_, prefix, specifier, suffix) => rewriteBareImport(prefix, specifier, suffix));
     processedContent = processedContent.replace(/(import\(\s*['"])([^'"]+)(['"]\s*\))/g, (_, prefix, specifier, suffix) => rewriteBareImport(prefix, specifier, suffix));
     processedContent = processedContent.replace(/from\s+(['"])(\.\.?\/[^'"]+)(\1)/g, (match, quote, path2) => {
-      if (!path2.match(/\.(js|ts|mjs|cjs)$/)) {
-        return `from ${quote}${path2}.js${quote}`;
-      }
-      if (path2.endsWith(".ts")) {
-        return `from ${quote}${path2.replace(/\.ts$/, ".js")}${quote}`;
+      const rewritten = rewriteRelativeJsSpecifier(outputPath, path2);
+      if (rewritten !== path2) {
+        return `from ${quote}${rewritten}${quote}`;
       }
       return match;
     });
@@ -44448,11 +44452,12 @@ export const __ABSOLUTE_PAGE_USES_LEGACY_ANIMATIONS__ = true;
   const compiledRoot = compiledParent;
   const indexesDir = join15(compiledParent, "indexes");
   await fs2.mkdir(indexesDir, { recursive: true });
+  const aotOutputs = hmr ? [] : await compileAngularFiles(entryPoints.map((entry) => resolve19(entry)), compiledRoot, stylePreprocessors);
   const compileTasks = entryPoints.map(async (entry) => {
     const resolvedEntry = resolve19(entry);
     const relativeEntry = relative9(outRoot, resolvedEntry).replace(/\.[tj]s$/, ".js");
-    const compileEntry = () => hmr ? compileAngularFileJIT(resolvedEntry, compiledRoot, outRoot, stylePreprocessors) : compileAngularFile(resolvedEntry, compiledRoot, stylePreprocessors);
-    let outputs = await compileEntry();
+    const compileEntry = () => compileAngularFileJIT(resolvedEntry, compiledRoot, outRoot, stylePreprocessors);
+    let outputs = hmr ? await compileEntry() : aotOutputs;
     const fileBase = basename7(resolvedEntry).replace(/\.[tj]s$/, "");
     const jsName = `${fileBase}.js`;
     const compiledFallbackPaths = [
@@ -44479,7 +44484,7 @@ export const __ABSOLUTE_PAGE_USES_LEGACY_ANIMATIONS__ = true;
       rawServerFile = resolveRawServerFile([]);
     }
     if (rawServerFile && !existsSync16(rawServerFile)) {
-      outputs = await compileEntry();
+      outputs = hmr ? await compileEntry() : aotOutputs;
       rawServerFile = resolveRawServerFile(outputs);
     }
     if (!rawServerFile || !existsSync16(rawServerFile)) {
@@ -58560,5 +58565,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=101D5DB96668BF8564756E2164756E21
+//# debugId=6AC746B610DD2DD564756E2164756E21
 //# sourceMappingURL=index.js.map