@absolutejs/absolute 0.19.0-beta.776 → 0.19.0-beta.778

package/dist/cli/index.js

@@ -893,6 +893,7 @@ import {
   readdirSync as readdirSync2,
   readFileSync as readFileSync9,
   rmSync as rmSync2,
+  statSync,
   unlinkSync as unlinkSync2,
   writeFileSync as writeFileSync3
 } from "fs";
@@ -1024,6 +1025,16 @@ var cliTag4 = (color, message) => `\x1B[2m${formatTimestamp()}\x1B[0m ${color}[c
   for (const specifier of roots) {
     copyPackageToBuild(specifier, outdir, seen);
   }
+}, copyFrameworkRuntimePackages = (buildConfig, outdir) => {
+  const seen = new Set;
+  if (buildConfig.svelteDirectory) {
+    copyPackageToBuild("svelte", outdir, seen);
+  }
+  if (buildConfig.vueDirectory) {
+    copyPackageToBuild("vue", outdir, seen);
+    copyPackageToBuild("@vue/server-renderer", outdir, seen);
+  }
+  copyAngularRuntimePackages(buildConfig, outdir);
 }, collectRuntimePackageSpecifiers = (distDir) => {
   const nodeModulesDir = join6(distDir, "node_modules");
   if (!existsSync9(nodeModulesDir))
@@ -1046,9 +1057,21 @@ 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) => {
+}, ensureRelativeModuleSpecifier = (fromFile, toFile) => {
   const rel = relative(dirname2(fromFile), toFile).replace(/\\/g, "/");
   return rel.startsWith(".") ? rel : `./${rel}`;
+}, pickExportEntry = (value) => {
+  if (typeof value === "string")
+    return value;
+  if (!value || typeof value !== "object")
+    return;
+  const record = value;
+  for (const key of ["bun", "node", "import", "module", "default"]) {
+    const entry = pickExportEntry(record[key]);
+    if (entry)
+      return entry;
+  }
+  return;
 }, resolvePackageEntryFile = (distDir, packageSpecifiers, specifier) => {
   const packageSpecifier = packageSpecifiers.find((root) => specifier === root || specifier.startsWith(`${root}/`));
   if (!packageSpecifier)
@@ -1063,26 +1086,78 @@ var cliTag4 = (color, message) => `\x1B[2m${formatTimestamp()}\x1B[0m ${color}[c
   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}`);
+  const entry = pickExportEntry(rootExport) ?? (resolvedPackageDir === subPackageDir || !subpath ? pkg.module ?? pkg.main ?? "index.js" : `.${subpath}`);
   return join6(resolvedPackageDir, entry);
-}, rewriteRuntimeModuleSpecifiers = (distDir) => {
+}, RUNTIME_JS_EXTENSIONS, MODULE_SPECIFIER_RE, isRuntimeJsFile = (filePath) => RUNTIME_JS_EXTENSIONS.some((extension) => filePath.endsWith(extension)), isNodeModulesPath = (filePath) => filePath.split(/[\\/]/).includes("node_modules"), isFile = (filePath) => {
+  try {
+    return statSync(filePath).isFile();
+  } catch {
+    return false;
+  }
+}, resolveRuntimeJsFile = (candidate) => {
+  if (!candidate)
+    return null;
+  const candidates = [
+    candidate,
+    ...RUNTIME_JS_EXTENSIONS.map((extension) => `${candidate}${extension}`),
+    ...RUNTIME_JS_EXTENSIONS.map((extension) => join6(candidate, `index${extension}`))
+  ];
+  return candidates.find((filePath) => isRuntimeJsFile(filePath) && isFile(filePath)) ?? null;
+}, findContainingRuntimePackageDir = (filePath) => {
+  let dir = dirname2(filePath);
+  while (dir !== dirname2(dir)) {
+    if (isNodeModulesPath(dir) && existsSync9(join6(dir, "package.json"))) {
+      return dir;
+    }
+    dir = dirname2(dir);
+  }
+  return null;
+}, resolvePackageImportEntryFile = (fromFile, specifier) => {
+  if (!specifier.startsWith("#"))
+    return null;
+  const packageDir = findContainingRuntimePackageDir(fromFile);
+  if (!packageDir)
+    return null;
+  const pkg = tryReadNodePackageJson(packageDir);
+  const entry = pickExportEntry(pkg?.imports?.[specifier]);
+  if (!entry)
+    return null;
+  return join6(packageDir, entry);
+}, collectRuntimeRewriteRoots = (distDir) => collectFiles2(distDir).filter((filePath) => isRuntimeJsFile(filePath) && !isNodeModulesPath(filePath)), rewriteRuntimeModuleSpecifiers = (distDir) => {
   const packageSpecifiers = collectRuntimePackageSpecifiers(distDir);
   if (packageSpecifiers.length === 0)
     return;
-  for (const filePath of collectFiles2(distDir)) {
-    if (!/\.(cjs|js|mjs)$/.test(filePath))
+  const pending = collectRuntimeRewriteRoots(distDir);
+  const seen = new Set;
+  const enqueue = (filePath) => {
+    if (!filePath || seen.has(filePath) || !isRuntimeJsFile(filePath))
+      return;
+    if (!isFile(filePath))
+      return;
+    pending.push(filePath);
+  };
+  for (let index = 0;index < pending.length; index += 1) {
+    const filePath = pending[index];
+    if (!filePath || seen.has(filePath))
       continue;
+    seen.add(filePath);
     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}`;
-      });
-    }
+    const rewritten = source.replace(MODULE_SPECIFIER_RE, (match, prefix, quote, specifier) => {
+      if (typeof specifier === "string" && specifier.startsWith(".")) {
+        enqueue(resolveRuntimeJsFile(resolve8(dirname2(filePath), specifier)));
+        return match;
+      }
+      const packageImportTarget = resolveRuntimeJsFile(resolvePackageImportEntryFile(filePath, specifier) ?? "");
+      if (packageImportTarget) {
+        enqueue(packageImportTarget);
+        return `${prefix}${quote}${ensureRelativeModuleSpecifier(filePath, packageImportTarget)}${quote}`;
+      }
+      const target = resolveRuntimeJsFile(resolvePackageEntryFile(distDir, packageSpecifiers, specifier) ?? "");
+      if (!target)
+        return match;
+      enqueue(target);
+      return `${prefix}${quote}${ensureRelativeModuleSpecifier(filePath, target)}${quote}`;
+    });
     if (rewritten !== source) {
       writeFileSync3(filePath, rewritten);
     }
@@ -1525,7 +1600,7 @@ console.log(\`
   });
   const prerenderMap = prerenderResult.routes;
   console.log(` \x1B[2m(${prerenderMap.size} pages, ${getDurationString(performance.now() - prerenderStart)})\x1B[0m`);
-  copyAngularRuntimePackages(buildConfig, resolvedOutdir);
+  copyFrameworkRuntimePackages(buildConfig, resolvedOutdir);
   rewriteRuntimeModuleSpecifiers(resolvedOutdir);
   const compileStart = performance.now();
   process.stdout.write(cliTag4("\x1B[36m", "Compiling standalone executable"));
@@ -1575,6 +1650,8 @@ var init_compile = __esm(() => {
   init_telemetryEvent();
   init_utils();
   jsxDevRuntimeCompatPath2 = resolveJsxDevRuntimeCompatPath2();
+  RUNTIME_JS_EXTENSIONS = [".js", ".mjs", ".cjs"];
+  MODULE_SPECIFIER_RE = /(from\s*|import\s*|import\(\s*|require\(\s*)(["'])([^"']+)\2/g;
   FRAMEWORK_EXTERNALS = [
     "react",
     "react/jsx-runtime",

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