@absolutejs/absolute 0.19.0-beta.775 → 0.19.0-beta.777

package/dist/cli/index.js

@@ -893,9 +893,10 @@ import {
   readdirSync as readdirSync2,
   readFileSync as readFileSync9,
   rmSync as rmSync2,
-  unlinkSync as unlinkSync2
+  unlinkSync as unlinkSync2,
+  writeFileSync as writeFileSync3
 } from "fs";
-import { basename as basename2, join as join6, relative, resolve as resolve8 } from "path";
+import { basename as basename2, dirname as dirname2, join as join6, relative, resolve as resolve8 } from "path";
 var cliTag4 = (color, message) => `\x1B[2m${formatTimestamp()}\x1B[0m ${color}[cli]\x1B[0m ${color}${message}\x1B[0m`, compileBanner = (version2) => {
   const resolvedVersion = version2 || "unknown";
   console.log("");
@@ -1045,6 +1046,47 @@ var cliTag4 = (color, message) => `\x1B[2m${formatTimestamp()}\x1B[0m ${color}[c
     specifiers.push(entry.name);
   }
   return specifiers.sort((a, b) => b.length - a.length);
+}, escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), ensureRelativeModuleSpecifier = (fromFile, toFile) => {
+  const rel = relative(dirname2(fromFile), toFile).replace(/\\/g, "/");
+  return rel.startsWith(".") ? rel : `./${rel}`;
+}, resolvePackageEntryFile = (distDir, packageSpecifiers, specifier) => {
+  const packageSpecifier = packageSpecifiers.find((root) => specifier === root || specifier.startsWith(`${root}/`));
+  if (!packageSpecifier)
+    return null;
+  const packageDir = join6(distDir, "node_modules", ...packageSpecifier.split("/"));
+  const subpath = specifier.slice(packageSpecifier.length);
+  const subPackageDir = subpath ? join6(packageDir, ...subpath.slice(1).split("/")) : null;
+  const resolvedPackageDir = subPackageDir && existsSync9(join6(subPackageDir, "package.json")) ? subPackageDir : packageDir;
+  const packageJsonPath = join6(resolvedPackageDir, "package.json");
+  if (!existsSync9(packageJsonPath))
+    return null;
+  const pkg = JSON.parse(readFileSync9(packageJsonPath, "utf-8"));
+  const exportKey = resolvedPackageDir === subPackageDir ? "." : subpath ? `.${subpath}` : ".";
+  const rootExport = pkg.exports?.[exportKey];
+  const entry = (typeof rootExport === "string" ? rootExport : rootExport?.default) ?? (resolvedPackageDir === subPackageDir || !subpath ? pkg.module ?? pkg.main ?? "index.js" : `.${subpath}`);
+  return join6(resolvedPackageDir, entry);
+}, rewriteRuntimeModuleSpecifiers = (distDir) => {
+  const packageSpecifiers = collectRuntimePackageSpecifiers(distDir);
+  if (packageSpecifiers.length === 0)
+    return;
+  for (const filePath of collectFiles2(distDir)) {
+    if (!/\.(cjs|js|mjs)$/.test(filePath))
+      continue;
+    const source = readFileSync9(filePath, "utf-8");
+    let rewritten = source;
+    for (const specifier of packageSpecifiers) {
+      const pattern = new RegExp(`(from\\s*|import\\s*|import\\(\\s*|require\\(\\s*)(["'])(${escapeRegExp(specifier)}(?:/[^"']+)?)\\2`, "g");
+      rewritten = rewritten.replace(pattern, (match, prefix, quote, fullSpecifier) => {
+        const target = resolvePackageEntryFile(distDir, packageSpecifiers, fullSpecifier);
+        if (!target)
+          return match;
+        return `${prefix}${quote}${ensureRelativeModuleSpecifier(filePath, target)}${quote}`;
+      });
+    }
+    if (rewritten !== source) {
+      writeFileSync3(filePath, rewritten);
+    }
+  }
 }, generateEntrypoint = (distDir, serverEntry, prerenderMap, version2, buildConfig) => {
   const allFiles = collectFiles2(distDir);
   const serverBundleName = `${basename2(serverEntry).replace(/\.[^.]+$/, "")}.js`;
@@ -1094,7 +1136,6 @@ var cliTag4 = (color, message) => `\x1B[2m${formatTimestamp()}\x1B[0m ${color}[c
   });
   const routeEntries = Array.from(pageVarMap.entries()).map(([route, varName]) => `	"${route}": ${varName},`).join(`
 `);
-  const runtimePackageSpecifiers = collectRuntimePackageSpecifiers(distDir);
   const runtimeBuildId = `${version2}-${Date.now().toString(36)}`;
   const runtimeConfigSource = JSON.stringify(buildConfig, (_key, value) => typeof value === "function" || typeof value === "symbol" ? undefined : value, 2);
   return `// Auto-generated compile entrypoint
@@ -1115,7 +1156,6 @@ const RUNTIME_BUILD_ID = ${JSON.stringify(runtimeBuildId)};
 const RUNTIME_CONFIG_SOURCE = ${JSON.stringify(runtimeConfigSource)};
 const ORIGINAL_BUILD_DIR = ${JSON.stringify(resolve8(distDir))};
 const ORIGINAL_BUILD_DIR_NORMALIZED = ORIGINAL_BUILD_DIR.replace(/\\\\/g, "/");
-const RUNTIME_PACKAGE_SPECIFIERS = ${JSON.stringify(runtimePackageSpecifiers)};
 
 // \u2500\u2500 Asset URL \u2192 embedded path map \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500
 const ASSETS: Record<string, string> = {
@@ -1199,7 +1239,6 @@ const materializeRuntimeFiles = async () => {
 	);
 	rewriteRuntimeJsonPaths(runtimeDir, "manifest.json");
 	rewriteRuntimeJsonPaths(runtimeDir, "conventions.json");
-	rewriteRuntimeModuleSpecifiers(runtimeDir);
 	writeFileSync(marker, String(Date.now()));
 
 	return { configPath, runtimeDir };
@@ -1237,62 +1276,6 @@ const rewriteRuntimeJsonPaths = (runtimeDir: string, fileName: string) => {
 	writeFileSync(filePath, JSON.stringify(rewritten, null, "\\t"));
 };
 
-const escapeRegExp = (value: string) =>
-	value.replace(/[.*+?^${"{}"}()|[\\]\\\\]/g, "\\\\$&");
-
-const resolveRuntimePackageEntry = (runtimeDir: string, specifier: string) => {
-	const packageSpecifier = RUNTIME_PACKAGE_SPECIFIERS.find(
-		(root) => specifier === root || specifier.startsWith(root + "/")
-	);
-	if (!packageSpecifier) return specifier;
-
-	const packageDir = join(runtimeDir, "node_modules", ...packageSpecifier.split("/"));
-	const subpath = specifier.slice(packageSpecifier.length);
-	const subPackageDir = subpath ? join(packageDir, ...subpath.slice(1).split("/")) : null;
-	const resolvedPackageDir =
-		subPackageDir && existsSync(join(subPackageDir, "package.json"))
-			? subPackageDir
-			: packageDir;
-	const packageJsonPath = join(resolvedPackageDir, "package.json");
-	if (!existsSync(packageJsonPath)) return pathToFileURL(packageDir).href;
-
-	const pkg = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
-	const exportKey = resolvedPackageDir === subPackageDir ? "." : subpath ? "." + subpath : ".";
-	const rootExport = pkg.exports?.[exportKey];
-	const entry =
-		(typeof rootExport === "string" ? rootExport : rootExport?.default) ??
-		(resolvedPackageDir === subPackageDir || !subpath
-			? (pkg.module ?? pkg.main ?? "index.js")
-			: "." + subpath);
-
-	return pathToFileURL(join(resolvedPackageDir, entry)).href;
-};
-
-const rewriteRuntimeModuleSpecifiers = (runtimeDir: string) => {
-	if (RUNTIME_PACKAGE_SPECIFIERS.length === 0) return;
-
-	for (const [rel] of EMBEDDED_FILES) {
-		if (!/\\.(cjs|js|mjs)$/.test(rel)) continue;
-		const filePath = join(runtimeDir, rel);
-		if (!existsSync(filePath)) continue;
-
-		let source = readFileSync(filePath, "utf-8");
-		let rewritten = source;
-		for (const specifier of RUNTIME_PACKAGE_SPECIFIERS) {
-			const pattern = new RegExp(
-				\`(from\\\\s*|import\\\\s*|import\\\\(\\\\s*|require\\\\(\\\\s*)(["'])(\${escapeRegExp(specifier)}(?:/[^"']+)?)\\\\2\`,
-				"g"
-			);
-			rewritten = rewritten.replace(
-				pattern,
-				(_match, prefix, quote, fullSpecifier) =>
-					\`\${prefix}\${quote}\${resolveRuntimePackageEntry(runtimeDir, fullSpecifier)}\${quote}\`
-			);
-		}
-		if (rewritten !== source) writeFileSync(filePath, rewritten);
-	}
-};
-
 const resolveRuntimeFetch = async () => {
 	const { configPath, runtimeDir } = await materializeRuntimeFiles();
 	process.env.ABSOLUTE_BUILD_DIR = runtimeDir;
@@ -1543,6 +1526,7 @@ console.log(\`
   const prerenderMap = prerenderResult.routes;
   console.log(` \x1B[2m(${prerenderMap.size} pages, ${getDurationString(performance.now() - prerenderStart)})\x1B[0m`);
   copyAngularRuntimePackages(buildConfig, resolvedOutdir);
+  rewriteRuntimeModuleSpecifiers(resolvedOutdir);
   const compileStart = performance.now();
   process.stdout.write(cliTag4("\x1B[36m", "Compiling standalone executable"));
   const entrypointCode = generateEntrypoint(resolvedOutdir, serverEntry, prerenderMap, absoluteVersion, buildConfig);

package/dist/index.js

@@ -5520,12 +5520,9 @@ var compilerCache, cachedTailwindCompile = null, loadTailwindCompile = async ()
   for (const source of sources) {
     if (source.negated)
       continue;
-    const root = resolve2(source.base);
-    if (!absFile.startsWith(`${root}/`) && absFile !== root)
-      continue;
-    const relative2 = absFile.slice(root.length + 1) || "";
-    const glob = new Bun.Glob(source.pattern);
-    if (glob.match(relative2) || glob.match(absFile))
+    const absolutePattern = resolve2(source.base, source.pattern);
+    const glob = new Bun.Glob(absolutePattern);
+    if (glob.match(absFile))
       return true;
   }
   return false;
@@ -5549,12 +5546,25 @@ var compilerCache, cachedTailwindCompile = null, loadTailwindCompile = async ()
   entry.perFileCandidates.set(file, freshCandidates);
   for (const candidate of freshCandidates)
     incrementCandidateCount(entry, candidate);
+}, splitGlobAtFirstMeta = (absolutePattern) => {
+  const firstMetaIndex = absolutePattern.search(/[*?{[]/);
+  if (firstMetaIndex === -1) {
+    return { glob: "", root: absolutePattern };
+  }
+  const lastSlashBeforeMeta = absolutePattern.lastIndexOf("/", firstMetaIndex);
+  return {
+    glob: absolutePattern.slice(lastSlashBeforeMeta + 1),
+    root: absolutePattern.slice(0, lastSlashBeforeMeta) || "/"
+  };
 }, collectFilesForSources = async (sources) => {
   const seen = new Set;
   const collected = [];
   const scans = sources.filter((source) => !source.negated).map(async (source) => {
-    const root = resolve2(source.base);
-    const glob = new Bun.Glob(source.pattern);
+    const absolutePattern = resolve2(source.base, source.pattern);
+    const { glob: relativePattern, root } = splitGlobAtFirstMeta(absolutePattern);
+    if (!relativePattern)
+      return [];
+    const glob = new Bun.Glob(relativePattern);
     const matches = [];
     for await (const relative2 of glob.scan({
       absolute: false,
@@ -26393,5 +26403,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=52CC4E293EDAC09064756E2164756E21
+//# debugId=F5298FBD548286E764756E2164756E21
 //# sourceMappingURL=index.js.map