@absolutejs/absolute 0.20.0-beta.178 → 0.20.0-beta.179

package/dist/islands/index.js

@@ -2226,7 +2226,7 @@ import { basename, dirname as dirname3, extname as extname2, join as join6, rela
 var serverCacheRoot2, compiledModuleCache2, originalSourcePathCache, syncIslandGeneration, transpiler, ensureRelativeImportPath = (from, target) => {
   const importPath = relative3(dirname3(from), target).replace(/\\/g, "/");
   return importPath.startsWith(".") ? importPath : `./${importPath}`;
-}, processDirectoryEntries = (entries, dir, targetFileName, stack) => {
+}, escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), replaceQuotedSpecifier = (code, spec, target) => code.replace(new RegExp(`(['"])${escapeRegExp(spec)}\\1`, "g"), (_match, quote) => `${quote}${target}${quote}`), processDirectoryEntries = (entries, dir, targetFileName, stack) => {
   for (const entry of entries) {
     const entryPath = join6(dir, entry.name);
     if (entry.isDirectory())
@@ -2271,18 +2271,21 @@ var serverCacheRoot2, compiledModuleCache2, originalSourcePathCache, syncIslandG
     return null;
   }
   const basePath = resolve4(dirname3(from), spec);
+  const extensions = [
+    ".ts",
+    ".tsx",
+    ".mts",
+    ".cts",
+    ".js",
+    ".jsx",
+    ".mjs",
+    ".cjs",
+    ".json"
+  ];
   const candidates = [
     basePath,
-    `${basePath}.ts`,
-    `${basePath}.js`,
-    `${basePath}.mjs`,
-    `${basePath}.cjs`,
-    `${basePath}.json`,
-    join6(basePath, "index.ts"),
-    join6(basePath, "index.js"),
-    join6(basePath, "index.mjs"),
-    join6(basePath, "index.cjs"),
-    join6(basePath, "index.json")
+    ...extensions.map((extension) => `${basePath}${extension}`),
+    ...extensions.map((extension) => join6(basePath, `index${extension}`))
   ];
   const existResults = await Promise.all(candidates.map((candidate) => Bun.file(candidate).exists()));
   const foundIndex = existResults.indexOf(true);
@@ -2367,7 +2370,7 @@ var serverCacheRoot2, compiledModuleCache2, originalSourcePathCache, syncIslandG
     rewrittenModulePaths.set(spec, ensureRelativeImportPath(getCachedModulePath2(sourcePath), resolvedModuleImport));
   }
   for (const [spec, resolvedModuleImport] of rewrittenModulePaths) {
-    transpiled = transpiled.replaceAll(spec, resolvedModuleImport);
+    transpiled = replaceQuotedSpecifier(transpiled, spec, resolvedModuleImport);
   }
   let compiledCode = compile(transpiled, {
     css: "injected",
@@ -2379,10 +2382,10 @@ var serverCacheRoot2, compiledModuleCache2, originalSourcePathCache, syncIslandG
     hmr: isDevelopmentRuntime()
   }).js.code;
   for (const [spec, compiledChildPath] of childModulePaths) {
-    compiledCode = compiledCode.replaceAll(spec, ensureRelativeImportPath(getCachedModulePath2(sourcePath), compiledChildPath));
+    compiledCode = replaceQuotedSpecifier(compiledCode, spec, ensureRelativeImportPath(getCachedModulePath2(sourcePath), compiledChildPath));
   }
   for (const [spec, resolvedModuleImport] of rewrittenModulePaths) {
-    compiledCode = compiledCode.replaceAll(spec, resolvedModuleImport);
+    compiledCode = replaceQuotedSpecifier(compiledCode, spec, resolvedModuleImport);
   }
   const sourceId = JSON.stringify(relative3(process.cwd(), resolutionSourcePath).replace(/\\/g, "/"));
   const componentName = /export default function ([\w$]+)\s*\(/.exec(compiledCode)?.[1];
@@ -2486,7 +2489,13 @@ var serverCacheRoot3, compiledModuleCache3, syncIslandGeneration2, transpiler2,
   ].join(`
 `) : nonVueLines.join(`
 `);
-}, extractRelativeVueImports = (sourceCode) => Array.from(sourceCode.matchAll(/import\s+[\s\S]+?['"]([^'"]+)['"]/g)).map((match) => match[1]).filter((importPath) => typeof importPath === "string" && importPath.startsWith(".") && importPath.endsWith(".vue")), compileVueServerModule = async (sourcePath) => {
+}, RELATIVE_SPECIFIER_PATTERN, extractRelativeImports = (code) => Array.from(new Set(Array.from(code.matchAll(RELATIVE_SPECIFIER_PATTERN), (match) => match.groups?.spec).filter((spec) => spec !== undefined))), resolveFromSource = (spec, sourcePath) => {
+  try {
+    return Bun.resolveSync(spec, dirname4(sourcePath));
+  } catch {
+    return null;
+  }
+}, compileVueServerModule = async (sourcePath) => {
   syncIslandGeneration2();
   const cachedModulePath = compiledModuleCache3.get(sourcePath);
   if (cachedModulePath)
@@ -2519,10 +2528,10 @@ var serverCacheRoot3, compiledModuleCache3, syncIslandGeneration2, transpiler2,
     ssr: true,
     ssrCssVars: descriptor.cssVars
   }).code : "const ssrRender = () => {};";
-  const childImportPaths = extractRelativeVueImports(compiledScript.content);
-  const compiledChildren = await Promise.all(childImportPaths.map(async (relativeImport) => ({
-    compiledPath: await compileVueServerModule(resolve5(dirname4(sourcePath), relativeImport)),
-    spec: relativeImport
+  const relativeImports = extractRelativeImports(compiledScript.content);
+  const compiledChildren = await Promise.all(relativeImports.filter((spec) => spec.endsWith(".vue")).map(async (spec) => ({
+    compiledPath: await compileVueServerModule(resolve5(dirname4(sourcePath), spec)),
+    spec
   })));
   const strippedScript = stripExports(compiledScript.content);
   const transpiledScript = transpiler2.transformSync(strippedScript);
@@ -2534,10 +2543,22 @@ var serverCacheRoot3, compiledModuleCache3, syncIslandGeneration2, transpiler2,
   ].join(`
 `));
   const compiledModulePath = getCachedModulePath3(sourcePath);
-  let rewritten = assembled;
+  const rewrittenSpecifiers = new Map;
   for (const child of compiledChildren) {
-    rewritten = rewritten.replaceAll(child.spec, ensureRelativeImportPath2(compiledModulePath, child.compiledPath));
+    rewrittenSpecifiers.set(child.spec, ensureRelativeImportPath2(compiledModulePath, child.compiledPath));
   }
+  for (const spec of extractRelativeImports(assembled)) {
+    if (rewrittenSpecifiers.has(spec))
+      continue;
+    const resolvedImport = resolveFromSource(spec, sourcePath);
+    if (!resolvedImport)
+      continue;
+    rewrittenSpecifiers.set(spec, ensureRelativeImportPath2(compiledModulePath, resolvedImport));
+  }
+  const rewritten = assembled.replace(RELATIVE_SPECIFIER_PATTERN, (match, prefix, quote, spec) => {
+    const target = rewrittenSpecifiers.get(spec);
+    return target ? `${prefix}${quote}${target}${quote}` : match;
+  });
   await mkdir3(dirname4(compiledModulePath), { recursive: true });
   await writeIfChanged2(compiledModulePath, rewritten);
   compiledModuleCache3.set(sourcePath, compiledModulePath);
@@ -2551,6 +2572,7 @@ var init_vueServerModule = __esm(() => {
     compiledModuleCache3.clear();
   });
   transpiler2 = new Transpiler({ loader: "ts", target: "browser" });
+  RELATIVE_SPECIFIER_PATTERN = /(\bfrom\s*|\bimport\s*\(\s*|\bimport\s+)(['"])(?<spec>\.{1,2}\/[^'"]*)\2/g;
 });
 
 // src/core/islandMarkupAttributes.ts
@@ -2831,5 +2853,5 @@ export {
   renderIslandMarkup
 };
 
-//# debugId=05077611E3C00F5664756E2164756E21
+//# debugId=33FE6E9626DB36C864756E2164756E21
 //# sourceMappingURL=index.js.map