@rainfw/core 0.2.4 → 0.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rainfw/core",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "A TypeScript web framework for Cloudflare Workers",
   "bin": {
     "rainjs": "./cli/index.js"
@@ -62,6 +62,14 @@
     "./client": {
       "types": "./dist/client/hooks.d.ts",
       "import": "./dist/client/hooks.js"
+    },
+    "./client/runtime": {
+      "types": "./dist/client/runtime.d.ts",
+      "import": "./dist/client/runtime.js"
+    },
+    "./client/jsx-runtime": {
+      "types": "./dist/client/jsx-runtime.d.ts",
+      "import": "./dist/client/jsx-runtime.js"
     }
   },
   "devDependencies": {

package/scripts/generate.js

@@ -213,7 +213,80 @@ function getClientFiles(dir, base = "") {
   return files;
 }
 
-function bundleClientFilesSync(clientFiles, srcDir) {
+function ensureRelativeImport(importPath) {
+  return importPath.startsWith(".") ? importPath : `./${importPath}`;
+}
+
+function buildIslandImportLines(index, file, srcDir, entryDir) {
+  const fullPath = path.join(srcDir, file);
+  const content = fs.readFileSync(fullPath, "utf-8");
+  const { named, hasDefault } = detectAllExportsFromContent(content);
+  const islandId = clientFileToIslandId(file);
+
+  const importPath = path
+    .relative(entryDir, path.join(srcDir, file.replace(/\.tsx?$/, "")))
+    .replace(/\\/g, "/");
+  const safeImport = ensureRelativeImport(importPath);
+
+  const specifiers = [];
+  if (hasDefault) specifiers.push(`default as _d${index}`);
+  for (const name of named) specifiers.push(`${name} as _n${index}_${name}`);
+  if (specifiers.length === 0) return [];
+
+  const lines = [];
+  lines.push(`import { ${specifiers.join(", ")} } from "${safeImport}";`);
+  if (hasDefault) {
+    lines.push(`registerIsland("${islandId}:default", _d${index});`);
+  }
+  for (const name of named) {
+    lines.push(`registerIsland("${islandId}:${name}", _n${index}_${name});`);
+  }
+  return lines;
+}
+
+function resolveClientRuntimeImport(fwPkg) {
+  if (fwPkg.startsWith(".") || fwPkg.startsWith("/")) {
+    const entryDir = path.join(PROJECT_ROOT, BUILD_CONFIG.outDir);
+    const runtimePath = path
+      .relative(entryDir, path.join(PROJECT_ROOT, fwPkg, "client/runtime"))
+      .replace(/\\/g, "/");
+    return ensureRelativeImport(runtimePath);
+  }
+  return `${fwPkg}/client/runtime`;
+}
+
+function generateClientEntrySource(clientFiles, srcDir, fwPkg) {
+  const entryDir = path.join(PROJECT_ROOT, BUILD_CONFIG.outDir);
+  const runtimeImport = resolveClientRuntimeImport(fwPkg);
+
+  const lines = [];
+  lines.push(
+    `import { registerIsland, startHydration } from "${runtimeImport}";`,
+  );
+
+  for (let i = 0; i < clientFiles.length; i++) {
+    lines.push(...buildIslandImportLines(i, clientFiles[i], srcDir, entryDir));
+  }
+
+  lines.push("startHydration();");
+  lines.push("");
+
+  return lines.join("\n");
+}
+
+function buildClientEsbuildAliases(fwPkg) {
+  if (fwPkg.startsWith(".") || fwPkg.startsWith("/")) {
+    const clientDir = path.resolve(PROJECT_ROOT, fwPkg, "client");
+    return {
+      "@rainfw/core/jsx-runtime": path.join(clientDir, "jsx-runtime.ts"),
+      "@rainfw/core/client/runtime": path.join(clientDir, "runtime.ts"),
+      "@rainfw/core/client/jsx-runtime": path.join(clientDir, "jsx-runtime.ts"),
+    };
+  }
+  return {};
+}
+
+function bundleClientFilesSync(clientFiles, srcDir, fwPkg) {
   if (clientFiles.length === 0) return [];
   if (!esbuild) {
     console.warn(
@@ -230,33 +303,34 @@ function bundleClientFilesSync(clientFiles, srcDir) {
   }
 
   for (const file of fs.readdirSync(outDir)) {
-    if (file.startsWith("island-")) {
+    if (file.startsWith("island-") || file.startsWith("rain-client-")) {
       fs.unlinkSync(path.join(outDir, file));
     }
   }
 
-  const entryPoints = clientFiles.map((f) => path.join(srcDir, f));
+  const entrySource = generateClientEntrySource(clientFiles, srcDir, fwPkg);
+  const entryDir = path.join(PROJECT_ROOT, BUILD_CONFIG.outDir);
+  if (!fs.existsSync(entryDir)) {
+    fs.mkdirSync(entryDir, { recursive: true });
+  }
+  const clientEntryPath = path.join(entryDir, "client-entry.ts");
+  fs.writeFileSync(clientEntryPath, entrySource);
 
   const result = esbuild.buildSync({
-    entryPoints,
+    entryPoints: [clientEntryPath],
     outdir: outDir,
     bundle: true,
     minify: true,
     format: "esm",
     metafile: true,
-    entryNames: "island-[hash]",
+    entryNames: "rain-client-[hash]",
     write: true,
     treeShaking: true,
     platform: "browser",
     target: ["es2022"],
     jsx: "automatic",
     jsxImportSource: "@rainfw/core",
-    alias: {
-      "@rainfw/core/jsx-runtime": path.resolve(
-        PROJECT_ROOT,
-        "src/framework/client/jsx-runtime.ts",
-      ),
-    },
+    alias: buildClientEsbuildAliases(fwPkg),
     loader: { ".ts": "ts", ".tsx": "tsx" },
   });
 
@@ -816,7 +890,8 @@ function buildAppInitLine(clientScripts, hasConfig) {
 function regenerateClient() {
   const srcDir = path.join(PROJECT_ROOT, "src");
   const clientFiles = getClientFiles(srcDir);
-  const clientScripts = bundleClientFilesSync(clientFiles, srcDir);
+  const fwPkg = BUILD_CONFIG.frameworkPackage;
+  const clientScripts = bundleClientFilesSync(clientFiles, srcDir, fwPkg);
 
   if (!fs.existsSync(ENTRY_FILE)) return;
 
@@ -1052,10 +1127,9 @@ function generate() {
 
   const srcDir = path.join(PROJECT_ROOT, "src");
   const clientFiles = getClientFiles(srcDir);
-  const clientScripts = bundleClientFilesSync(clientFiles, srcDir);
-
   const hasConfig = fs.existsSync(CONFIG_FILE);
   const fwPkg = BUILD_CONFIG.frameworkPackage;
+  const clientScripts = bundleClientFilesSync(clientFiles, srcDir, fwPkg);
   const frameworkImport =
     fwPkg.startsWith(".") || fwPkg.startsWith("/")
       ? relativeImportPath(path.join(PROJECT_ROOT, fwPkg))
@@ -1125,6 +1199,7 @@ module.exports = {
   updateWranglerAliases,
   clientFileToIslandId,
   bundleClientFilesSync,
+  generateClientEntrySource,
   validateNoPageRouteColocation,
   validateNoDuplicateUrls,
   stripRouteGroupSegments,