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

package/dist/angular/server.js

@@ -328,7 +328,7 @@ var ISLAND_BOOTSTRAP_MANIFEST_KEY = "AbsoluteIslandBootstrap", LEGACY_ISLAND_BOO
       islands[framework] = entries;
   }
   return islands;
-}, getIslandManifestKey = (framework, component) => `Island${toIslandFrameworkSegment(framework)}${component}`;
+}, getIslandManifestKey = (framework, component) => `Island${toIslandFrameworkSegment(framework)}${component}`, ISLAND_STYLE_PREFIX = "IslandStyle", getIslandStyleManifestEntries = (manifest) => Object.entries(manifest).filter(([key]) => key.startsWith(ISLAND_STYLE_PREFIX)), getIslandStyleManifestKey = (framework, component) => `${ISLAND_STYLE_PREFIX}${toIslandFrameworkSegment(framework)}${component}`;
 
 // src/core/islandPageContext.ts
 var ISLAND_MARKER = 'data-island="true"', MANIFEST_MARKER = "__ABSOLUTE_MANIFEST__", ISLAND_STATE_MARKER = "__ABS_ISLAND_STATE__", CLOSING_HEAD_TAG = "</head>", warnedMissingBootstrap = false, warnIfBootstrapMissing = (manifest) => {
@@ -365,12 +365,27 @@ var ISLAND_MARKER = 'data-island="true"', MANIFEST_MARKER = "__ABSOLUTE_MANIFEST
     browserManifest[key] = value;
   }
   return browserManifest;
-}, buildIslandsHeadMarkup = (manifest) => {
+}, ISLAND_MARKER_TAG, ISLAND_FRAMEWORKS, readMarkerAttribute = (tag, name) => new RegExp(`\\b${name}="([^"]*)"`).exec(tag)?.[1]?.replaceAll("&quot;", '"').replaceAll("&lt;", "<").replaceAll("&gt;", ">").replaceAll("&amp;", "&"), toIslandFramework = (value) => ISLAND_FRAMEWORKS.find((framework) => framework === value), collectRenderedIslandStyleKeys = (html) => {
+  const keys = new Set;
+  for (const [tag] of html.matchAll(ISLAND_MARKER_TAG)) {
+    const framework = toIslandFramework(readMarkerAttribute(tag, "data-framework"));
+    const component = readMarkerAttribute(tag, "data-component");
+    if (framework && component)
+      keys.add(getIslandStyleManifestKey(framework, component));
+  }
+  return keys;
+}, buildIslandStyleLinks = (manifest, html) => {
+  if (html === undefined)
+    return "";
+  const renderedKeys = collectRenderedIslandStyleKeys(html);
+  return getIslandStyleManifestEntries(manifest).filter(([key]) => renderedKeys.has(key)).filter(([, href]) => !html.includes(`href="${href}"`)).map(([key, href]) => `<link rel="stylesheet" href="${href}" data-island-style="${key}"${nonceAttr()}>`).join("");
+}, buildIslandsHeadMarkup = (manifest, html) => {
+  const styleLinks = buildIslandStyleLinks(manifest, html);
   const manifestScript = `<script${nonceAttr()}>window.__ABSOLUTE_MANIFEST__ = ${escapeScriptContent(JSON.stringify(toBrowserManifest(manifest)))}</script>`;
   const islandStateScript = `<script${nonceAttr()}>window.__ABS_ISLAND_STATE__ = ${escapeScriptContent(JSON.stringify(globalThis.__ABS_ISLAND_STATE__ ?? {}))}</script>`;
   const bootstrapPath = getIslandBootstrapPath(manifest);
   const bootstrapScript = bootstrapPath ? `<script${nonceAttr()} type="module" src="${bootstrapPath}"></script>` : "";
-  return `${manifestScript}${islandStateScript}${bootstrapScript}`;
+  return `${styleLinks}${manifestScript}${islandStateScript}${bootstrapScript}`;
 }, injectHeadMarkup = (html, markup) => {
   const closingHeadIndex = html.indexOf("</head>");
   if (closingHeadIndex >= 0) {
@@ -552,7 +567,7 @@ var ISLAND_MARKER = 'data-island="true"', MANIFEST_MARKER = "__ABSOLUTE_MANIFEST
     return html;
   }
   warnIfBootstrapMissing(manifest);
-  return injectHeadMarkup(html, buildIslandsHeadMarkup(manifest));
+  return injectHeadMarkup(html, buildIslandsHeadMarkup(manifest, html));
 }, injectIslandPageContextStream = (stream, options) => {
   const manifest = globalThis.__absoluteManifest;
   if (!manifest)
@@ -576,6 +591,13 @@ var init_islandPageContext = __esm(() => {
   init_logger();
   MANIFEST_BUILD_DIR_KEY = Symbol.for("absolutejs.islandManifestBuildDir");
   WINDOWS_ABSOLUTE_PATH = /^[A-Za-z]:[\\/]|^\\\\/;
+  ISLAND_MARKER_TAG = /<[^>]*\bdata-island="true"[^>]*>/g;
+  ISLAND_FRAMEWORKS = [
+    "react",
+    "svelte",
+    "vue",
+    "angular"
+  ];
 });
 
 // src/core/routeAssets.ts
@@ -918,6 +940,12 @@ var CONVENTIONS_KEY = "__absoluteConventions", isConventionsMap = (value) => Boo
     logConventionRenderError(framework, "error", renderError);
   }
   return null;
+}, isPageRequest = (request) => {
+  if (request.headers.get("hx-request") === "true")
+    return true;
+  if (request.headers.get("sec-fetch-dest") === "document")
+    return true;
+  return (request.headers.get("accept") ?? "").includes("text/html");
 }, renderConventionError = async (framework, pageName, error) => {
   const errorProps = buildErrorProps(error);
   const frameworkResponse = await tryFrameworkErrorConvention(framework, pageName, errorProps, error);
@@ -929,12 +957,6 @@ var CONVENTIONS_KEY = "__absoluteConventions", isConventionsMap = (value) => Boo
       return htmlResponse;
   }
   return null;
-}, isPageRequest = (request) => {
-  if (request.headers.get("hx-request") === "true")
-    return true;
-  if (request.headers.get("sec-fetch-dest") === "document")
-    return true;
-  return (request.headers.get("accept") ?? "").includes("text/html");
 }, renderStaticRouteError = async (request, error) => {
   if (!isPageRequest(request))
     return null;
@@ -3192,7 +3214,7 @@ import { basename as basename3, dirname as dirname3, extname as extname2, join a
 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())
@@ -3237,18 +3259,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);
@@ -3333,7 +3358,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",
@@ -3345,10 +3370,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];
@@ -3408,9 +3433,9 @@ var createVueCompiler = async () => {
 // src/core/vueServerModule.ts
 import { readFileSync as readFileSync4, realpathSync } from "fs";
 import { mkdir as mkdir3 } from "fs/promises";
-import { dirname as dirname4, join as join7, relative as relative4, resolve as resolve5 } from "path";
+import { basename as basename4, dirname as dirname4, join as join7, relative as relative4, resolve as resolve5 } from "path";
 var {Transpiler } = globalThis.Bun;
-var ISLAND_COMPONENT_ID_LENGTH = 8, serverCacheRoot3, compiledModuleCache3, syncIslandGeneration2, transpiler2, ensureRelativeImportPath2 = (from, target) => {
+var serverCacheRoot3, compiledModuleCache3, syncIslandGeneration2, transpiler2, ensureRelativeImportPath2 = (from, target) => {
   const importPath = relative4(dirname4(from), target).replace(/\\/g, "/");
   return importPath.startsWith(".") ? importPath : `./${importPath}`;
 }, getCachedModulePath3 = (sourcePath) => {
@@ -3444,7 +3469,13 @@ var ISLAND_COMPONENT_ID_LENGTH = 8, serverCacheRoot3, compiledModuleCache3, sync
   ].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)
@@ -3452,7 +3483,7 @@ var ISLAND_COMPONENT_ID_LENGTH = 8, serverCacheRoot3, compiledModuleCache3, sync
   const compiler = await loadVueCompiler();
   const source = await Bun.file(sourcePath).text();
   const { descriptor } = compiler.parse(source, { filename: sourcePath });
-  const componentId = Bun.hash(sourcePath).toString(BASE_36_RADIX).slice(0, ISLAND_COMPONENT_ID_LENGTH);
+  const componentId = toKebab(basename4(sourcePath, ".vue"));
   const hasScript = descriptor.script || descriptor.scriptSetup;
   const compiledScript = hasScript ? compiler.compileScript(descriptor, {
     fs: {
@@ -3477,10 +3508,10 @@ var ISLAND_COMPONENT_ID_LENGTH = 8, serverCacheRoot3, compiledModuleCache3, sync
     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);
@@ -3492,17 +3523,28 @@ var ISLAND_COMPONENT_ID_LENGTH = 8, serverCacheRoot3, compiledModuleCache3, sync
   ].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);
   return compiledModulePath;
 };
 var init_vueServerModule = __esm(() => {
-  init_constants();
   init_isFile();
   serverCacheRoot3 = join7(process.cwd(), ".absolutejs", "islands", "vue");
   compiledModuleCache3 = new Map;
@@ -3510,6 +3552,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/islands.ts
@@ -5599,7 +5642,7 @@ __export(exports_compileAngular, {
   invalidateAngularJitCache: () => invalidateAngularJitCache
 });
 import { existsSync as existsSync5, readFileSync as readFileSync6, promises as fs } from "fs";
-import { join as join9, basename as basename4, sep, dirname as dirname5, resolve as resolve6, relative as relative5 } from "path";
+import { join as join9, basename as basename5, sep, dirname as dirname5, resolve as resolve6, relative as relative5 } from "path";
 var {Glob } = globalThis.Bun;
 var atomicWriteSequence = 0, writeTextFileAtomically = async (path, content) => {
   const temporaryPath = `${path}.tmp.${process.pid}.${atomicWriteSequence++}`;
@@ -5981,7 +6024,7 @@ var atomicWriteSequence = 0, writeTextFileAtomically = async (path, content) =>
   const originalGetDefaultLibFileName = host.getDefaultLibFileName;
   host.getDefaultLibFileName = (opts) => {
     const fileName = originalGetDefaultLibFileName ? originalGetDefaultLibFileName(opts) : "lib.d.ts";
-    return basename4(fileName);
+    return basename5(fileName);
   };
   const originalGetSourceFile = host.getSourceFile;
   host.getSourceFile = (fileName, languageVersion, onError) => {
@@ -6422,7 +6465,7 @@ ${fields}
   };
   const toOutputPath = (sourcePath) => {
     const inputDir = dirname5(sourcePath);
-    const fileBase = basename4(sourcePath).replace(/\.[cm]?[tj]sx?$/, ".js");
+    const fileBase = basename5(sourcePath).replace(/\.[cm]?[tj]sx?$/, ".js");
     if (inputDir === outDir || inputDir.startsWith(`${outDir}${sep}`)) {
       return join9(inputDir, fileBase);
     }
@@ -6478,7 +6521,7 @@ ${fields}
       const inputDir = dirname5(resolved);
       const relativeDir = inputDir.startsWith(baseDir) ? inputDir.substring(baseDir.length + 1) : inputDir;
       const targetDir = join9(outDir, relativeDir);
-      const targetPath = join9(targetDir, basename4(resolved));
+      const targetPath = join9(targetDir, basename5(resolved));
       await fs.mkdir(targetDir, { recursive: true });
       await fs.copyFile(resolved, targetPath);
       allOutputs.push(targetPath);
@@ -6493,7 +6536,7 @@ ${fields}
     const inlined = await inlineResources(sourceCode, dirname5(actualPath), stylePreprocessors);
     sourceCode = inlineTemplateAndLowerDeferSync(inlined.source, dirname5(actualPath)).source;
     const inputDir = dirname5(actualPath);
-    const fileBase = basename4(actualPath).replace(/\.[cm]?[tj]sx?$/, ".js");
+    const fileBase = basename5(actualPath).replace(/\.[cm]?[tj]sx?$/, ".js");
     const targetPath = toOutputPath(actualPath);
     const targetDir = dirname5(targetPath);
     const relativeDir = relative5(outDir, targetDir).replace(/\\/g, "/");
@@ -6622,7 +6665,7 @@ export const __ABSOLUTE_PAGE_USES_LEGACY_ANIMATIONS__ = true;
     let outputs = hmr ? await traceAngularPhase("jit/compile-entry", compileEntry, {
       entry: resolvedEntry
     }) : aotOutputs;
-    const fileBase = basename4(resolvedEntry).replace(/\.[tj]s$/, "");
+    const fileBase = basename5(resolvedEntry).replace(/\.[tj]s$/, "");
     const jsName = `${fileBase}.js`;
     const compiledFallbackPaths = [
       join9(compiledRoot, relativeEntry),
@@ -7075,6 +7118,18 @@ var provideDeterministicEnv = (options = {}) => {
     }
   ];
 };
+// src/utils/requestRenderUrl.ts
+var requestRenderUrl = (request) => {
+  if (!request)
+    return;
+  try {
+    const parsed = new URL(request.url);
+    return `${parsed.pathname.replace(/\/{2,}/g, "/")}${parsed.search}`;
+  } catch {
+    return;
+  }
+};
+
 // src/angular/pageHandler.ts
 init_constants();
 init_islandPageContext();
@@ -7086,7 +7141,7 @@ init_registerClientScript();
 init_angularDeps();
 import { AsyncLocalStorage as AsyncLocalStorage5 } from "async_hooks";
 import { lstat, mkdir as mkdir4, readlink, symlink } from "fs/promises";
-import { basename as basename5, dirname as dirname6, join as join10, resolve as resolve7 } from "path";
+import { basename as basename6, dirname as dirname6, join as join10, resolve as resolve7 } from "path";
 
 // src/angular/animationProviders.ts
 init_resolveAngularPackage();
@@ -7728,7 +7783,7 @@ var resolveRuntimeAngularModulePath = async (pagePath) => {
   await Promise.resolve().then(() => init_compileAngular());
   const cacheBuster = createAngularRuntimeCacheBuster();
   const outputs = await compileAngularFileJIT(pagePath, outDir, process.cwd(), undefined, cacheBuster);
-  const expectedFileName = basename5(pagePath).replace(/\.ts$/, ".js");
+  const expectedFileName = basename6(pagePath).replace(/\.ts$/, ".js");
   const runtimePagePath = outputs.find((output) => output.endsWith(`/${expectedFileName}`)) ?? outputs.find((output) => output.endsWith(`\\${expectedFileName}`)) ?? outputs[0] ?? pagePath;
   return {
     cacheBuster,
@@ -7748,16 +7803,7 @@ var withHtmlContentType = (responseInit = {}) => {
   }
   return { ...responseInit, headers };
 };
-var resolveRequestRenderUrl = (request) => {
-  if (!request)
-    return "/";
-  try {
-    const parsed = new URL(request.url);
-    return `${parsed.pathname}${parsed.search}`;
-  } catch {
-    return "/";
-  }
-};
+var resolveRequestRenderUrl = (request) => requestRenderUrl(request) ?? "/";
 var angularSsrContext = new AsyncLocalStorage5;
 setSsrContextGetter(() => angularSsrContext.getStore());
 var handleAngularPageRequest = async (input) => {
@@ -7902,5 +7948,5 @@ export {
   withPendingTask
 };
 
-//# debugId=3FD4269B8E368DF764756E2164756E21
+//# debugId=985E5EB495A207FA64756E2164756E21
 //# sourceMappingURL=server.js.map