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

package/dist/build/buildWorker.js

@@ -1551,7 +1551,7 @@ var transpiler2, toJs = (filePath, sourceDir) => {
       return `${filePath}/index.js`;
   }
   return `${filePath}.js`;
-}, stripExports = (code) => code.replace(/export\s+default/, "const script ="), mergeVueImports = (code) => {
+}, mergeVueImports = (code) => {
   const lines = code.split(`
 `);
   const specifierSet = new Set;
@@ -1623,19 +1623,20 @@ const ${localName} = (source) => ${importedName}(
         return content;
       }
     },
+    genDefaultAs: "script",
     id: componentId,
     inlineTemplate: false,
     sourceMap: true
-  }) : { bindings: {}, content: "export default {};", map: undefined };
+  }) : { bindings: {}, content: "const script = {};", map: undefined };
   const typeDependencies = "deps" in compiledScript ? compiledScript.deps ?? [] : [];
   for (const dep of typeDependencies) {
     if (dep in typeDepHashes || !existsSync5(dep))
       continue;
     typeDepHashes[dep] = hashContent(readFileSync6(dep, "utf-8"));
   }
-  const strippedScript = stripExports(compiledScript.content);
+  const scriptCode = compiledScript.content;
   const sourceDir = dirname6(sourceFilePath);
-  const transpiledScript = rewriteRelativeImports(transpiler2.transformSync(strippedScript), sourceDir);
+  const transpiledScript = rewriteRelativeImports(transpiler2.transformSync(scriptCode), sourceDir);
   const generateRenderFunction = (ssr) => {
     const rendered = compiler.compileTemplate({
       compilerOptions: {
@@ -1701,7 +1702,7 @@ if (typeof __VUE_HMR_RUNTIME__ !== 'undefined') {
   const inlineSourceMapFor = (finalContent) => {
     if (!compiledScript.map || !hasScript)
       return "";
-    const remap = buildLineRemap(strippedScript, finalContent);
+    const remap = buildLineRemap(scriptCode, finalContent);
     const mappings = remapGeneratedLines(compiledScript.map.mappings, remap);
     const map = {
       ...compiledScript.map,

package/dist/build.js

@@ -5106,7 +5106,7 @@ import { basename as basename3, dirname as dirname5, extname as extname6, join a
 var serverCacheRoot2, compiledModuleCache2, originalSourcePathCache, syncIslandGeneration, transpiler, ensureRelativeImportPath = (from, target) => {
   const importPath = relative7(dirname5(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 = join10(dir, entry.name);
     if (entry.isDirectory())
@@ -5151,18 +5151,21 @@ var serverCacheRoot2, compiledModuleCache2, originalSourcePathCache, syncIslandG
     return null;
   }
   const basePath = resolve10(dirname5(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`,
-    join10(basePath, "index.ts"),
-    join10(basePath, "index.js"),
-    join10(basePath, "index.mjs"),
-    join10(basePath, "index.cjs"),
-    join10(basePath, "index.json")
+    ...extensions.map((extension) => `${basePath}${extension}`),
+    ...extensions.map((extension) => join10(basePath, `index${extension}`))
   ];
   const existResults = await Promise.all(candidates.map((candidate) => Bun.file(candidate).exists()));
   const foundIndex = existResults.indexOf(true);
@@ -5247,7 +5250,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",
@@ -5259,10 +5262,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(relative7(process.cwd(), resolutionSourcePath).replace(/\\/g, "/"));
   const componentName = /export default function ([\w$]+)\s*\(/.exec(compiledCode)?.[1];
@@ -5358,7 +5361,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, dirname6(sourcePath));
+  } catch {
+    return null;
+  }
+}, compileVueServerModule = async (sourcePath) => {
   syncIslandGeneration2();
   const cachedModulePath = compiledModuleCache3.get(sourcePath);
   if (cachedModulePath)
@@ -5391,10 +5400,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(resolve11(dirname6(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(resolve11(dirname6(sourcePath), spec)),
+    spec
   })));
   const strippedScript = stripExports(compiledScript.content);
   const transpiledScript = transpiler2.transformSync(strippedScript);
@@ -5406,10 +5415,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(dirname6(compiledModulePath), { recursive: true });
   await writeIfChanged2(compiledModulePath, rewritten);
   compiledModuleCache3.set(sourcePath, compiledModulePath);
@@ -5423,6 +5444,7 @@ var init_vueServerModule = __esm(() => {
     compiledModuleCache3.clear();
   });
   transpiler2 = new Transpiler2({ loader: "ts", target: "browser" });
+  RELATIVE_SPECIFIER_PATTERN = /(\bfrom\s*|\bimport\s*\(\s*|\bimport\s+)(['"])(?<spec>\.{1,2}\/[^'"]*)\2/g;
 });
 
 // src/core/islandMarkupAttributes.ts
@@ -5935,7 +5957,7 @@ var init_scanConventions = __esm(() => {
 // src/core/serverOnlyStaticFiles.ts
 import { existsSync as existsSync9, readFileSync as readFileSync8 } from "fs";
 import { isAbsolute as isAbsolute2, join as join12, relative as relative9, sep as sep2 } from "path";
-var STATIC_PLUGIN_DEFAULTS, SERVER_OUTPUTS_FILE = "server-outputs.json", RUNTIME_FILE_NAMES, SERVER_ONLY_PATTERNS, escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), isStringArray = (value) => Array.isArray(value) && value.every((entry) => typeof entry === "string"), readServerOutputs = (buildDir) => {
+var STATIC_PLUGIN_DEFAULTS, SERVER_OUTPUTS_FILE = "server-outputs.json", RUNTIME_FILE_NAMES, SERVER_ONLY_PATTERNS, escapeRegExp2 = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), isStringArray = (value) => Array.isArray(value) && value.every((entry) => typeof entry === "string"), readServerOutputs = (buildDir) => {
   const path = join12(buildDir, SERVER_OUTPUTS_FILE);
   if (!existsSync9(path))
     return [];
@@ -5949,7 +5971,7 @@ var STATIC_PLUGIN_DEFAULTS, SERVER_OUTPUTS_FILE = "server-outputs.json", RUNTIME
   const outputs = readServerOutputs(buildDir);
   if (outputs.length === 0)
     return null;
-  return new RegExp(`^/(?:${outputs.map(escapeRegExp).join("|")})(?:\\.br|\\.gz|\\.map)?$`);
+  return new RegExp(`^/(?:${outputs.map(escapeRegExp2).join("|")})(?:\\.br|\\.gz|\\.map)?$`);
 }, productionStaticIgnorePatterns = (buildDir, serverBundle) => {
   const patterns = [
     ...STATIC_PLUGIN_DEFAULTS,
@@ -5962,7 +5984,7 @@ var STATIC_PLUGIN_DEFAULTS, SERVER_OUTPUTS_FILE = "server-outputs.json", RUNTIME
   const insideBuildDir = bundlePath !== "" && !bundlePath.startsWith("..") && !isAbsolute2(bundlePath);
   if (insideBuildDir) {
     const urlPath = bundlePath.split(sep2).join("/");
-    patterns.push(new RegExp(`^/${escapeRegExp(urlPath)}(?:\\.br|\\.gz|\\.map)?$`));
+    patterns.push(new RegExp(`^/${escapeRegExp2(urlPath)}(?:\\.br|\\.gz|\\.map)?$`));
   }
   return patterns;
 };
@@ -6399,7 +6421,7 @@ var CLIENT_FRAMEWORK_PACKAGES, CLIENT_FRAMEWORKS, isPackageInstalled = (packageN
     vue: config.vueDirectory
   },
   projectRoot
-}), escapeRegExp2 = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), packagePattern = (pattern) => pattern.endsWith("/*") ? `${escapeRegExp2(pattern.slice(0, -1))}.+` : `${escapeRegExp2(pattern)}(?:/.*)?`, missingFrameworkSpecifierPattern = (frameworks) => {
+}), escapeRegExp3 = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), packagePattern = (pattern) => pattern.endsWith("/*") ? `${escapeRegExp3(pattern.slice(0, -1))}.+` : `${escapeRegExp3(pattern)}(?:/.*)?`, missingFrameworkSpecifierPattern = (frameworks) => {
   const alternatives = frameworks.flatMap((framework) => CLIENT_FRAMEWORK_PACKAGES[framework].packages.map(packagePattern));
   return alternatives.length > 0 ? new RegExp(`^(?:${alternatives.join("|")})$`) : null;
 }, frameworkOf = (specifier) => CLIENT_FRAMEWORKS.find((framework) => {
@@ -14353,7 +14375,7 @@ var VALID_FRAMEWORKS, getObjectPropertyName2 = (name) => lazyTypescript.isIdenti
     output = output.slice(0, edit.start) + edit.text + output.slice(edit.end);
   }
   return output;
-}, escapeRegExp3 = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), loaderForPath = (filePath) => {
+}, escapeRegExp4 = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), loaderForPath = (filePath) => {
   if (filePath.endsWith(".tsx"))
     return "tsx";
   if (filePath.endsWith(".jsx"))
@@ -14364,7 +14386,7 @@ var VALID_FRAMEWORKS, getObjectPropertyName2 = (name) => lazyTypescript.isIdenti
   return "ts";
 }, createIslandRegistryDefinitionPlugin = (info) => {
   const registryBase = basename11(info.resolvedRegistryPath).replace(/\.[mc]?[jt]sx?$/, "");
-  const filter = new RegExp(`(^|[/\\\\])${escapeRegExp3(registryBase)}\\.[mc]?[jt]sx?$`);
+  const filter = new RegExp(`(^|[/\\\\])${escapeRegExp4(registryBase)}\\.[mc]?[jt]sx?$`);
   return {
     name: "absolute-island-registry-definitions",
     setup(build) {
@@ -21246,7 +21268,7 @@ import { createHash as createHash5 } from "crypto";
 import { existsSync as existsSync33, readFileSync as readFileSync30 } from "fs";
 import { mkdir as mkdir8, rename, writeFile as writeFile9 } from "fs/promises";
 import { join as join45, resolve as resolve32 } from "path";
-var CACHE_DIR_NAME = "compile-cache", ABSOLUTE_CACHE_DIR_NAME2 = ".absolutejs", CACHE_FORMAT_VERSION = 3, FILE_NAME_HASH_LENGTH = 32, vueCompileCacheEnabled = () => process.env.ABSOLUTE_COMPILE_CACHE !== "0", hashContent = (content) => createHash5("sha256").update(content).digest("hex"), hashParts = (parts) => {
+var CACHE_DIR_NAME = "compile-cache", ABSOLUTE_CACHE_DIR_NAME2 = ".absolutejs", CACHE_FORMAT_VERSION = 4, FILE_NAME_HASH_LENGTH = 32, vueCompileCacheEnabled = () => process.env.ABSOLUTE_COMPILE_CACHE !== "0", hashContent = (content) => createHash5("sha256").update(content).digest("hex"), hashParts = (parts) => {
   const hash = createHash5("sha256");
   for (const part of parts) {
     hash.update(part);
@@ -21512,7 +21534,7 @@ var transpiler5, toJs = (filePath, sourceDir) => {
       return `${filePath}/index.js`;
   }
   return `${filePath}.js`;
-}, stripExports2 = (code) => code.replace(/export\s+default/, "const script ="), mergeVueImports2 = (code) => {
+}, mergeVueImports2 = (code) => {
   const lines = code.split(`
 `);
   const specifierSet = new Set;
@@ -21584,19 +21606,20 @@ const ${localName} = (source) => ${importedName}(
         return content;
       }
     },
+    genDefaultAs: "script",
     id: componentId,
     inlineTemplate: false,
     sourceMap: true
-  }) : { bindings: {}, content: "export default {};", map: undefined };
+  }) : { bindings: {}, content: "const script = {};", map: undefined };
   const typeDependencies = "deps" in compiledScript ? compiledScript.deps ?? [] : [];
   for (const dep of typeDependencies) {
     if (dep in typeDepHashes || !existsSync35(dep))
       continue;
     typeDepHashes[dep] = hashContent(readFileSync32(dep, "utf-8"));
   }
-  const strippedScript = stripExports2(compiledScript.content);
+  const scriptCode = compiledScript.content;
   const sourceDir = dirname28(sourceFilePath);
-  const transpiledScript = rewriteRelativeImports(transpiler5.transformSync(strippedScript), sourceDir);
+  const transpiledScript = rewriteRelativeImports(transpiler5.transformSync(scriptCode), sourceDir);
   const generateRenderFunction = (ssr) => {
     const rendered = compiler.compileTemplate({
       compilerOptions: {
@@ -21662,7 +21685,7 @@ if (typeof __VUE_HMR_RUNTIME__ !== 'undefined') {
   const inlineSourceMapFor = (finalContent) => {
     if (!compiledScript.map || !hasScript)
       return "";
-    const remap = buildLineRemap(strippedScript, finalContent);
+    const remap = buildLineRemap(scriptCode, finalContent);
     const mappings = remapGeneratedLines(compiledScript.map.mappings, remap);
     const map = {
       ...compiledScript.map,
@@ -36307,8 +36330,10 @@ ${code}`;
 }, compileVueTemplate = (descriptor, compiledScript, filePath, componentId) => {
   const compiler = getLoadedVueCompiler();
   const scriptContent = compiledScript.content;
-  if (!descriptor.template)
-    return scriptContent;
+  if (!descriptor.template) {
+    return `${scriptContent}
+export default __script__;`;
+  }
   const isScoped = descriptor.styles.some((style) => style.scoped);
   const templateResult = compiler.compileTemplate({
     compilerOptions: {
@@ -36322,8 +36347,7 @@ ${code}`;
     scoped: isScoped,
     source: descriptor.template.content
   });
-  let code = scriptContent.replace("export default", "const __script__ =");
-  code += `
+  let code = `${scriptContent}
 ${templateResult.code}`;
   code += `
 __script__.render = render;`;
@@ -36375,9 +36399,10 @@ ${code}`;
       realpath: realpathSync9,
       readFile: (file) => isFile(file) ? readFileSync53(file, "utf-8") : undefined
     },
+    genDefaultAs: "__script__",
     id: componentId,
     inlineTemplate: false
-  }) : { bindings: {}, content: "export default {};" };
+  }) : { bindings: {}, content: "const __script__ = {};" };
   const compiledSfcScript = {
     bindings: compiledScript.bindings ?? {},
     content: compiledScript.content
@@ -42212,5 +42237,5 @@ export {
   devBuild
 };
 
-//# debugId=016613A38B1FF09364756E2164756E21
+//# debugId=6F7474A77E6F0F0D64756E2164756E21
 //# sourceMappingURL=build.js.map