@absolutejs/absolute 0.19.0-beta.700 → 0.19.0-beta.702

package/dist/build.js

@@ -366,11 +366,7 @@ var defineIslandComponent = (component, options) => ({
 var init_islands = () => {};
 
 // src/build/islandEntries.ts
-import {
-  mkdirSync,
-  rmSync,
-  writeFileSync
-} from "fs";
+import { mkdirSync, rmSync, writeFileSync } from "fs";
 import { dirname, extname as extname2, join, relative, resolve } from "path";
 import ts from "typescript";
 var frameworks, isRecord2 = (value) => typeof value === "object" && value !== null, resolveRegistryExport = (mod) => {
@@ -379,7 +375,7 @@ var frameworks, isRecord2 = (value) => typeof value === "object" && value !== nu
   if (isRecord2(mod.default))
     return mod.default;
   throw new Error("Island registry module must export `islandRegistry` or a default registry object.");
-}, normalizeImportPath = (wrapperPath, targetPath) => {
+}, hasSvelteImport = (source) => /from\s+['"][^'"]+\.svelte['"]/.test(source), normalizeImportPath = (wrapperPath, targetPath) => {
   const importPath = relative(dirname(wrapperPath), targetPath).replace(/\\/g, "/");
   return importPath.startsWith(".") ? importPath : `./${importPath}`;
 }, isIdentifier = (value) => /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(value), resolveIslandSourcePath = (registryPath, sourcePath) => {
@@ -409,7 +405,13 @@ var frameworks, isRecord2 = (value) => typeof value === "object" && value !== nu
       source
     });
   }
-}, addRegistryEntries = (frameworkNode, framework, imports, references) => {
+}, createRegistryEntryValue = (reference) => ({
+  component: reference.source,
+  export: reference.export,
+  source: reference.source
+}), addRegistryEntries = (frameworkNode, framework, imports, definitions, registry) => {
+  const frameworkRegistry = registry[framework] ?? {};
+  registry[framework] = frameworkRegistry;
   for (const property of frameworkNode.properties) {
     if (!ts.isPropertyAssignment(property) && !ts.isShorthandPropertyAssignment(property))
       continue;
@@ -422,13 +424,23 @@ var frameworks, isRecord2 = (value) => typeof value === "object" && value !== nu
     const reference = imports.get(initializer.text);
     if (!reference)
       continue;
-    references.set(`${framework}:${componentName}`, reference);
+    frameworkRegistry[componentName] = createRegistryEntryValue(reference);
+    definitions.push({
+      buildReference: reference,
+      component: componentName,
+      framework
+    });
   }
-}, processDefineIslandRegistry = (node, imports, references) => {
+}, processDefineIslandRegistry = (node, imports, definitions, registry) => {
   const [firstArg] = node.arguments;
   if (!firstArg || !ts.isObjectLiteralExpression(firstArg))
     return;
-  const validFrameworks = ["react", "svelte", "vue", "angular"];
+  const validFrameworks = [
+    "react",
+    "svelte",
+    "vue",
+    "angular"
+  ];
   for (const property of firstArg.properties) {
     if (!ts.isPropertyAssignment(property))
       continue;
@@ -440,13 +452,27 @@ var frameworks, isRecord2 = (value) => typeof value === "object" && value !== nu
       continue;
     if (!ts.isObjectLiteralExpression(property.initializer))
       continue;
-    addRegistryEntries(property.initializer, framework, imports, references);
+    addRegistryEntries(property.initializer, framework, imports, definitions, registry);
   }
-}, walkRegistryNode = (node, imports, references) => {
+}, walkRegistryNode = (node, imports, definitions, registry) => {
   if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && node.expression.text === "defineIslandRegistry") {
-    processDefineIslandRegistry(node, imports, references);
+    processDefineIslandRegistry(node, imports, definitions, registry);
+  }
+  ts.forEachChild(node, (child) => walkRegistryNode(child, imports, definitions, registry));
+}, hasIslandRegistryNamedExport = (sourceFile) => {
+  for (const statement of sourceFile.statements) {
+    if (ts.isVariableStatement(statement) && statement.modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword) && statement.declarationList.declarations.some((declaration) => ts.isIdentifier(declaration.name) && declaration.name.text === "islandRegistry")) {
+      return true;
+    }
+    if (!ts.isExportDeclaration(statement) || !statement.exportClause)
+      continue;
+    if (!ts.isNamedExports(statement.exportClause))
+      continue;
+    if (statement.exportClause.elements.some((element) => element.name.text === "islandRegistry")) {
+      return true;
+    }
   }
-  ts.forEachChild(node, (child) => walkRegistryNode(child, imports, references));
+  return false;
 }, collectImportDeclarations = (sourceFile, registryPath, imports) => {
   for (const statement of sourceFile.statements) {
     if (!ts.isImportDeclaration(statement) || !ts.isStringLiteral(statement.moduleSpecifier))
@@ -458,13 +484,36 @@ var frameworks, isRecord2 = (value) => typeof value === "object" && value !== nu
     collectDefaultImport(imports, importClause, source);
     collectNamedImports(imports, importClause, source);
   }
-}, extractRegistryImportReferences = (registrySource, registryPath) => {
+}, parseIslandRegistryBuildInfo = (registrySource, registryPath) => {
   const sourceFile = ts.createSourceFile(registryPath, registrySource, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
   const imports = new Map;
-  const references = new Map;
+  const definitions = [];
+  const registry = {};
   collectImportDeclarations(sourceFile, registryPath, imports);
-  walkRegistryNode(sourceFile, imports, references);
-  return references;
+  walkRegistryNode(sourceFile, imports, definitions, registry);
+  return {
+    definitions,
+    hasNamedExport: hasIslandRegistryNamedExport(sourceFile),
+    registry
+  };
+}, loadDynamicIslandRegistryBuildInfo = async (resolvedRegistryPath) => {
+  const registryModule = await import(resolvedRegistryPath);
+  const registry = resolveRegistryExport(registryModule);
+  const definitions = frameworks.flatMap((framework) => {
+    const frameworkRegistry = registry[framework];
+    if (!isRecord2(frameworkRegistry))
+      return [];
+    return Object.entries(frameworkRegistry).map(([component, value]) => ({
+      buildReference: getIslandBuildReference(value),
+      component,
+      framework
+    }));
+  });
+  return {
+    definitions,
+    hasNamedExport: isRecord2(registryModule.islandRegistry),
+    registry
+  };
 }, createRegistryImportCode = (wrapperPath, registryPath, hasNamedExport) => {
   const normalizedPath = normalizeImportPath(wrapperPath, registryPath);
   if (hasNamedExport) {
@@ -552,34 +601,29 @@ export default component;
   const resolvedRegistryPath = resolve(registryPath);
   const registrySource = Bun.file(resolvedRegistryPath);
   const registrySourceText = await registrySource.text();
-  const registryModule = await import(resolvedRegistryPath);
-  const registry = resolveRegistryExport(registryModule);
-  const parsedBuildReferences = extractRegistryImportReferences(registrySourceText, resolvedRegistryPath);
-  const definitions = frameworks.flatMap((framework) => {
-    const frameworkRegistry = registry[framework];
-    if (!isRecord2(frameworkRegistry))
-      return [];
-    return Object.entries(frameworkRegistry).map(([component, value]) => ({
-      buildReference: getIslandBuildReference(value) ?? parsedBuildReferences.get(`${framework}:${component}`) ?? null,
-      component,
-      framework
-    }));
-  });
+  const parsedInfo = parseIslandRegistryBuildInfo(registrySourceText, resolvedRegistryPath);
+  if (parsedInfo.definitions.length > 0) {
+    return {
+      definitions: parsedInfo.definitions,
+      hasNamedExport: parsedInfo.hasNamedExport,
+      registry: parsedInfo.registry,
+      resolvedRegistryPath
+    };
+  }
+  if (hasSvelteImport(registrySourceText)) {
+    throw new Error("Unable to statically analyze the island registry. Registries that import .svelte files must use defineIslandRegistry({ ... }) with direct imported component references.");
+  }
+  const dynamicInfo = await loadDynamicIslandRegistryBuildInfo(resolvedRegistryPath);
   return {
-    definitions,
-    hasNamedExport: isRecord2(registryModule.islandRegistry),
-    registry,
+    definitions: dynamicInfo.definitions,
+    hasNamedExport: dynamicInfo.hasNamedExport,
+    registry: dynamicInfo.registry,
     resolvedRegistryPath
   };
 };
 var init_islandEntries = __esm(() => {
   init_islands();
-  frameworks = [
-    "react",
-    "svelte",
-    "vue",
-    "angular"
-  ];
+  frameworks = ["react", "svelte", "vue", "angular"];
 });
 
 // src/build/generateReactIndexes.ts
@@ -3019,10 +3063,13 @@ var islandSequence = 0, resolvedServerComponentCache, resolvedServerBuildCompone
   const loadPromise = loadAndCompileServerBuildComponent(buildReferencePath);
   resolvedServerBuildComponentCache.set(buildReferencePath, loadPromise);
   return loadPromise;
-}, loadServerImportComponent = async (resolvedComponent) => {
+}, loadServerImportComponent = async (resolvedComponent, exportName) => {
   const resolvedModulePath = resolvedComponent.startsWith(".") ? new URL(resolvedComponent, import.meta.url).pathname : resolvedComponent;
   const importTarget = resolvedModulePath.endsWith(".svelte") ? await compileSvelteServerModule(resolvedModulePath) : resolvedModulePath;
   const loadedModule = await import(importTarget);
+  if (exportName && exportName !== "default" && exportName in loadedModule) {
+    return loadedModule[exportName];
+  }
   return "default" in loadedModule ? loadedModule.default : loadedModule;
 }, resolveIslandComponent = async (component) => {
   const buildReference = getIslandBuildReference(component);
@@ -3030,6 +3077,9 @@ var islandSequence = 0, resolvedServerComponentCache, resolvedServerBuildCompone
   if (buildReferencePath?.endsWith(".svelte")) {
     return loadServerBuildComponent(buildReferencePath);
   }
+  if (buildReferencePath) {
+    return loadServerImportComponent(buildReferencePath, buildReference?.export);
+  }
   const resolvedComponent = getIslandComponent(component);
   if (typeof resolvedComponent !== "string") {
     return resolvedComponent;
@@ -49450,5 +49500,5 @@ export {
   build
 };
 
-//# debugId=0A7D6E8A4383D37264756E2164756E21
+//# debugId=2F504DCD19D0582A64756E2164756E21
 //# sourceMappingURL=build.js.map