@absolutejs/absolute 0.19.0-beta.832 → 0.19.0-beta.834

package/dist/angular/server.js

@@ -3433,21 +3433,34 @@ ${registrations}
   if (fileName.startsWith(outDir))
     return fileName.substring(outDir.length + 1);
   return fileName;
-}, hasJsLikeExtension = (path) => /\.(js|ts|mjs|cjs)$/.test(path), rewriteRelativeJsSpecifier = (importerOutputPath, specifier, outputFiles) => {
-  if (specifier.endsWith(".ts"))
-    return specifier.replace(/\.ts$/, ".js");
-  if (hasJsLikeExtension(specifier))
-    return specifier;
+}, hasJsLikeExtension = (path) => /\.(js|ts|mjs|cjs)$/.test(path), splitSpecifierAndQuery = (specifier) => {
+  const separator = specifier.indexOf("?");
+  if (separator === -1) {
+    return {
+      path: specifier,
+      query: ""
+    };
+  }
+  return {
+    path: specifier.substring(0, separator),
+    query: specifier.substring(separator)
+  };
+}, rewriteRelativeJsSpecifier = (importerOutputPath, specifier, outputFiles) => {
+  const { path, query } = splitSpecifierAndQuery(specifier);
+  if (path.endsWith(".ts"))
+    return `${path.replace(/\.ts$/, ".js")}${query}`;
+  if (hasJsLikeExtension(path))
+    return `${path}${query}`;
   const importerDir = dirname3(importerOutputPath);
-  const fileCandidate = resolve5(importerDir, `${specifier}.js`);
+  const fileCandidate = resolve5(importerDir, `${path}.js`);
   if (outputFiles?.has(fileCandidate) || existsSync4(fileCandidate)) {
-    return `${specifier}.js`;
+    return `${path}.js${query}`;
   }
-  const indexCandidate = resolve5(importerDir, specifier, "index.js");
+  const indexCandidate = resolve5(importerDir, path, "index.js");
   if (outputFiles?.has(indexCandidate) || existsSync4(indexCandidate)) {
-    return `${specifier}/index.js`;
+    return `${path}/index.js${query}`;
   }
-  return `${specifier}.js`;
+  return `${path}.js${query}`;
 }, isRelativeModuleSpecifier = (specifier) => specifier.startsWith("./") || specifier.startsWith("../"), extractLocalImportSpecifiers = (source, fileName) => {
   const sourceFile = ts.createSourceFile(fileName, source, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
   const specifiers = [];
@@ -3963,7 +3976,7 @@ ${fields}
     deferSlots: inlinedTemplate.deferSlots,
     source: result
   };
-}, compileAngularFileJIT = async (inputPath, outDir, rootDir, stylePreprocessors) => {
+}, compileAngularFileJIT = async (inputPath, outDir, rootDir, stylePreprocessors, cacheBuster) => {
   const entryPath = resolve5(inputPath);
   const allOutputs = [];
   const visited = new Set;
@@ -4017,13 +4030,18 @@ ${fields}
     const fileBase = basename3(sourcePath).replace(/\.[cm]?[tj]sx?$/, ".js");
     return join5(outDir, relativeDir, fileBase);
   };
+  const withCacheBuster = (specifier) => {
+    if (!cacheBuster)
+      return specifier;
+    return specifier.includes("?") ? `${specifier}&t=${cacheBuster}` : `${specifier}?t=${cacheBuster}`;
+  };
   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) {
-        return `${prefix}${rewritten}${suffix}`;
+        return `${prefix}${withCacheBuster(rewritten)}${suffix}`;
       }
       if (specifier.startsWith(".") || specifier.startsWith("/")) {
         return `${prefix}${specifier}${suffix}`;
@@ -4091,20 +4109,20 @@ ${fields}
       if (!resolved2)
         return null;
       const relativeImport = relative3(targetDir, toOutputPath(resolved2)).replace(/\\/g, "/").replace(/\.js$/, "");
-      importRewrites.set(specifier, relativeImport.startsWith(".") ? relativeImport : `./${relativeImport}`);
+      const relativeRewrite = relativeImport.startsWith(".") ? relativeImport : `./${relativeImport}`;
+      importRewrites.set(specifier, relativeRewrite);
       return resolved2;
     }).filter((path) => Boolean(path));
     const contentHash = Bun.hash(sourceCode).toString(BASE_36_RADIX);
     const cacheKey = actualPath;
-    if (jitContentCache.get(cacheKey) === contentHash && existsSync4(targetPath)) {
-      allOutputs.push(targetPath);
-    } else {
+    const shouldWriteFile = cacheBuster ? true : jitContentCache.get(cacheKey) !== contentHash || !existsSync4(targetPath);
+    if (shouldWriteFile) {
       const processedContent = transpileAndRewrite(sourceCode, relativeDir, actualPath, importRewrites);
       await fs.mkdir(targetDir, { recursive: true });
       await fs.writeFile(targetPath, processedContent, "utf-8");
-      allOutputs.push(targetPath);
       jitContentCache.set(cacheKey, contentHash);
     }
+    allOutputs.push(targetPath);
     await Promise.all(localImportPaths.map((importPath) => transpileFile(importPath)));
   };
   await transpileFile(inputPath);
@@ -4596,6 +4614,7 @@ 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 { pathToFileURL } from "url";
 
 // src/core/islandPageContext.ts
 init_constants();
@@ -5463,6 +5482,7 @@ var ensureAngularCompiler = () => {
 };
 var readAngularPageModule = (value) => isRecord5(value) ? value : null;
 var resolveAngularSsrOutDir = () => process.env.ABSOLUTE_ANGULAR_SSR_OUTDIR ?? join6(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");
@@ -5486,14 +5506,30 @@ var ensureAngularSsrNodeModules = async (outDir) => {
 };
 var resolveRuntimeAngularModulePath = async (pagePath) => {
   if (!pagePath.endsWith(".ts")) {
-    return pagePath;
+    return {
+      path: pagePath,
+      cacheBuster: undefined
+    };
   }
   const outDir = resolveAngularSsrOutDir();
   await ensureAngularSsrNodeModules(outDir);
   const { compileAngularFileJIT: compileAngularFileJIT2 } = await Promise.resolve().then(() => (init_compileAngular(), exports_compileAngular));
-  const outputs = await compileAngularFileJIT2(pagePath, outDir, process.cwd());
+  const cacheBuster = createAngularRuntimeCacheBuster();
+  const outputs = await compileAngularFileJIT2(pagePath, outDir, process.cwd(), undefined, cacheBuster);
   const expectedFileName = basename4(pagePath).replace(/\.ts$/, ".js");
-  return outputs.find((output) => output.endsWith(`/${expectedFileName}`)) ?? outputs.find((output) => output.endsWith(`\\${expectedFileName}`)) ?? outputs[0] ?? pagePath;
+  const runtimePagePath = outputs.find((output) => output.endsWith(`/${expectedFileName}`)) ?? outputs.find((output) => output.endsWith(`\\${expectedFileName}`)) ?? outputs[0] ?? pagePath;
+  return {
+    path: runtimePagePath,
+    cacheBuster
+  };
+};
+var buildRuntimeModuleSpecifier = (modulePath, cacheBuster) => {
+  if (!cacheBuster) {
+    return modulePath;
+  }
+  const moduleUrl = new URL(pathToFileURL(modulePath).href);
+  moduleUrl.searchParams.set("t", cacheBuster);
+  return moduleUrl.href;
 };
 var withHtmlContentType = (responseInit = {}) => {
   const headers = new Headers(responseInit.headers);
@@ -5548,7 +5584,7 @@ var handleAngularPageRequest = async (input) => {
       const renderPageResponse = async () => {
         const baseDeps = await getAngularDeps();
         const runtimePagePath = await resolveRuntimeAngularModulePath(resolvedPagePath);
-        const importedPageModule = await import(runtimePagePath);
+        const importedPageModule = await import(buildRuntimeModuleSpecifier(runtimePagePath.path, runtimePagePath.cacheBuster));
         const pageModule = readAngularPageModule(importedPageModule);
         if (!pageModule) {
           throw new Error(`Invalid Angular page module: ${resolvedPagePath}`);
@@ -5619,5 +5655,5 @@ export {
   ABSOLUTE_HTTP_TRANSFER_CACHE_SKIP_HEADER
 };
 
-//# debugId=CADCACE62BD9DB2664756E2164756E21
+//# debugId=4DB1DFC9A3ADCF1564756E2164756E21
 //# sourceMappingURL=server.js.map