@absolutejs/absolute 0.19.0-beta.980 → 0.19.0-beta.981

package/dist/index.js

@@ -12043,6 +12043,10 @@ var init_emitAngularRouteMounts = __esm(() => {
 });
 
 // src/build/parseAngularConfigImports.ts
+var exports_parseAngularConfigImports = {};
+__export(exports_parseAngularConfigImports, {
+  parseAngularProvidersImport: () => parseAngularProvidersImport
+});
 import { existsSync as existsSync20, readFileSync as readFileSync14 } from "fs";
 import { dirname as dirname14, isAbsolute as isAbsolute3, join as join25 } from "path";
 import ts6 from "typescript";
@@ -15149,7 +15153,7 @@ export const __ABSOLUTE_PAGE_USES_LEGACY_ANIMATIONS__ = true;
     }
   }
   return allOutputs;
-}, compileAngular = async (entryPoints, outRoot, hmr = false, stylePreprocessors) => {
+}, compileAngular = async (entryPoints, outRoot, hmr = false, stylePreprocessors, providersInjection) => {
   const compiledParent = getFrameworkGeneratedDir("angular");
   if (entryPoints.length === 0) {
     const emptyPaths = [];
@@ -15264,25 +15268,40 @@ export default ${componentClassName};
 export const __ABSOLUTE_PAGE_USES_LEGACY_ANIMATIONS__ = true;
 `;
     }
-    const providersServerPath = join30(compiledParent, "providers", `${toPascal(fileBase)}.providers.js`);
-    if (existsSync23(providersServerPath)) {
-      const rel = relative12(dirname18(rawServerFile), providersServerPath).replace(/\\/g, "/");
-      const specifier = rel.startsWith(".") ? rel : `./${rel}`;
+    const pageInjection = providersInjection?.pagesByFile.get(resolvedEntry);
+    if (providersInjection && pageInjection) {
+      const compiledAppProvidersPath = (() => {
+        const angularDirAbs = resolve25(outRoot);
+        const appSourceAbs = resolve25(providersInjection.appProvidersSource);
+        const rel = relative12(angularDirAbs, appSourceAbs).replace(/\\/g, "/");
+        return join30(compiledParent, rel).replace(/\.[cm]?[tj]sx?$/, ".js");
+      })();
+      const appProvidersSpec = (() => {
+        const rel = relative12(dirname18(rawServerFile), compiledAppProvidersPath).replace(/\\/g, "/");
+        return rel.startsWith(".") ? rel : `./${rel}`;
+      })();
+      const importLines = [
+        `import { appProviders as __abs_globalProviders } from "${appProvidersSpec}";`
+      ];
+      const fragments = ["...__abs_globalProviders"];
+      if (pageInjection.hasRoutes) {
+        importLines.push(`import { provideRouter as __abs_provideRouter, withComponentInputBinding as __abs_withComponentInputBinding, withViewTransitions as __abs_withViewTransitions } from "@angular/router";`);
+        fragments.push("__abs_provideRouter(routes, __abs_withComponentInputBinding(), __abs_withViewTransitions())");
+      }
+      if (pageInjection.basePath !== null) {
+        importLines.push(`import { APP_BASE_HREF as __abs_APP_BASE_HREF } from "@angular/common";`);
+        fragments.push(`{ provide: __abs_APP_BASE_HREF, useValue: ${JSON.stringify(pageInjection.basePath)} }`);
+      }
       rewritten += `
-export { providers } from "${specifier}";
+${importLines.join(`
+`)}
+export const providers = [${fragments.join(", ")}];
 `;
     }
     await traceAngularPhase("wrapper/write-server-output", () => fs5.writeFile(rawServerFile, rewritten, "utf-8"), { entry: resolvedEntry });
     const relativePath = relative12(indexesDir, rawServerFile).replace(/\\/g, "/");
     const normalizedImportPath = relativePath.startsWith(".") ? relativePath : `./${relativePath}`;
-    const manifestKeyForProviders = toPascal(fileBase);
-    const providersServerFilePath = join30(compiledParent, "providers", `${manifestKeyForProviders}.providers.js`);
-    const hasGeneratedProviders = existsSync23(providersServerFilePath);
-    const providersImportPath = hasGeneratedProviders ? (() => {
-      const rel = relative12(indexesDir, providersServerFilePath.replace(/\.js$/, "")).replace(/\\/g, "/");
-      return rel.startsWith(".") ? rel : `./${rel}`;
-    })() : null;
-    const generatedProvidersImport = providersImportPath ? `import { providers as generatedProviders } from '${providersImportPath}';` : "var generatedProviders = null;";
+    const generatedProvidersImport = "var generatedProviders = null;";
     const hmrPreamble = hmr ? `window.__HMR_FRAMEWORK__ = "angular";
 import "${hmrClientPath5}";
 ` : "";
@@ -20345,12 +20364,42 @@ ${content.slice(firstUseIdx)}`;
   const shouldCompileIslandSvelte = svelteDir && islandSvelteSources.length > 0;
   const shouldCompileIslandVue = vueDir && islandVueSources.length > 0;
   const shouldCompileIslandAngular = angularDir && islandAngularSources.length > 0;
-  let angularProvidersFilesToCompile = [];
+  let angularProvidersInjection = undefined;
+  let angularAppProvidersSource = undefined;
   if (shouldCompileAngular && angularDir) {
     await tracePhase("scan/angular-handlers", async () => {
       const { runAngularHandlerScan: runAngularHandlerScan2 } = await Promise.resolve().then(() => (init_runAngularHandlerScan(), exports_runAngularHandlerScan));
+      const { parseAngularProvidersImport: parseAngularProvidersImport2 } = await Promise.resolve().then(() => (init_parseAngularConfigImports(), exports_parseAngularConfigImports));
       const scanResult = runAngularHandlerScan2(projectRoot, angularDir);
-      angularProvidersFilesToCompile = scanResult.providersFiles.map((file5) => file5.outputPath);
+      const providersImport = parseAngularProvidersImport2(projectRoot);
+      if (providersImport) {
+        angularAppProvidersSource = providersImport.absolutePath;
+        const pagesByFile = new Map;
+        const basePathByKey = new Map;
+        for (const call of scanResult.calls) {
+          basePathByKey.set(call.manifestKey, call.mountPath?.endsWith("/*") ? call.mountPath.slice(0, -1) : null);
+        }
+        for (const route of scanResult.pageRoutes) {
+          const basePath = basePathByKey.get(route.manifestKey) ?? null;
+          const normalizedBase = basePath === "/" ? null : basePath;
+          pagesByFile.set(route.pageFile, {
+            basePath: normalizedBase,
+            hasRoutes: route.hasRoutes
+          });
+        }
+        for (const route of scanResult.pageRoutes) {
+          if (pagesByFile.has(route.pageFile))
+            continue;
+          pagesByFile.set(route.pageFile, {
+            basePath: null,
+            hasRoutes: route.hasRoutes
+          });
+        }
+        angularProvidersInjection = {
+          appProvidersSource: providersImport.absolutePath,
+          pagesByFile
+        };
+      }
     });
   }
   const [
@@ -20375,12 +20424,12 @@ ${content.slice(firstUseIdx)}`;
     },
     shouldCompileAngular ? tracePhase("compile/angular", async () => {
       const mod = await Promise.resolve().then(() => (init_compileAngular(), exports_compileAngular));
-      if (angularProvidersFilesToCompile.length > 0 && angularDir) {
+      if (angularAppProvidersSource && angularDir) {
         const { getFrameworkGeneratedDir: getFrameworkGeneratedDir2 } = await Promise.resolve().then(() => (init_generatedDir(), exports_generatedDir));
         const compiledRoot = getFrameworkGeneratedDir2("angular", projectRoot);
-        await Promise.all(angularProvidersFilesToCompile.map((entry) => mod.compileAngularFileJIT(entry, compiledRoot, angularDir, styleTransformConfig)));
+        await mod.compileAngularFileJIT(angularAppProvidersSource, compiledRoot, angularDir, styleTransformConfig);
       }
-      const result = await mod.compileAngular(angularEntries, angularDir, hmr, styleTransformConfig);
+      const result = await mod.compileAngular(angularEntries, angularDir, hmr, styleTransformConfig, angularProvidersInjection);
       if (hmr) {
         try {
           const { primeComponentFingerprint: primeComponentFingerprint2 } = await Promise.resolve().then(() => (init_fastHmrCompiler(), exports_fastHmrCompiler));
@@ -35645,5 +35694,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=D3E1DAEC8C4DD35264756E2164756E21
+//# debugId=76639FC616A4AF9764756E2164756E21
 //# sourceMappingURL=index.js.map