export-runtime 0.0.9 → 0.0.10

package/bin/generate-types.mjs

@@ -9,25 +9,43 @@ import { fileURLToPath } from "url";
 
 const cwd = process.cwd();
 
-// Read wrangler.toml to find source root
-const wranglerPath = path.join(cwd, "wrangler.toml");
-if (!fs.existsSync(wranglerPath)) {
-  console.error("wrangler.toml not found in", cwd);
+// --- Read package.json for configuration ---
+
+const pkgPath = path.join(cwd, "package.json");
+if (!fs.existsSync(pkgPath)) {
+  console.error("package.json not found in", cwd);
   process.exit(1);
 }
-const wranglerContent = fs.readFileSync(wranglerPath, "utf8");
-const aliasMatch = wranglerContent.match(/"__USER_MODULE__"\s*=\s*"([^"]+)"/);
-if (!aliasMatch) {
-  console.error('Could not find __USER_MODULE__ alias in wrangler.toml');
+
+const pkg = JSON.parse(fs.readFileSync(pkgPath, "utf8"));
+
+// Required fields
+const workerName = pkg.name;
+if (!workerName) {
+  console.error("package.json must have a 'name' field for the Worker name");
+  process.exit(1);
+}
+
+const exportsEntry = pkg.exports;
+if (!exportsEntry) {
+  console.error("package.json must have an 'exports' field pointing to the source entry (e.g., './src' or './src/index.ts')");
   process.exit(1);
 }
 
-// Derive source root directory from the alias (e.g., "./src/index.ts" → "./src")
-const aliasTarget = aliasMatch[1];
-// If alias points to the module map, resolve src dir from it; otherwise derive from file
-const srcDir = aliasTarget.includes(".export-module-map")
-  ? path.resolve(cwd, "src")
-  : path.resolve(cwd, path.dirname(aliasTarget.replace(/^\.\//, "")));
+// Optional: static assets directory
+const assetsDir = pkg.main || null;
+
+// --- Resolve source directory from exports field ---
+
+const exportsPath = path.resolve(cwd, exportsEntry.replace(/^\.\//, ""));
+const srcDir = fs.existsSync(exportsPath) && fs.statSync(exportsPath).isDirectory()
+  ? exportsPath
+  : path.dirname(exportsPath);
+
+if (!fs.existsSync(srcDir)) {
+  console.error(`Source directory not found: ${srcDir}`);
+  process.exit(1);
+}
 
 // --- Discover all source files under srcDir ---
 
@@ -327,7 +345,53 @@ for (const mod of modules) {
 sharedLines.push(`export { getStub };`);
 fs.writeFileSync(sharedModulePath, sharedLines.join("\n") + "\n");
 
+// --- Generate wrangler.toml ---
+
+const wranglerLines = [
+  `# Auto-generated by export-runtime. Do not edit manually.`,
+  `name = "${workerName}"`,
+  `main = "node_modules/export-runtime/entry.js"`,
+  `compatibility_date = "2024-11-01"`,
+  ``,
+];
+
+// Add static assets configuration if main is specified
+if (assetsDir) {
+  const normalizedAssetsDir = assetsDir.startsWith("./") ? assetsDir : `./${assetsDir}`;
+  wranglerLines.push(
+    `[assets]`,
+    `directory = "${normalizedAssetsDir}"`,
+    `binding = "ASSETS"`,
+    `run_worker_first = true`,
+    ``,
+  );
+}
+
+// Add Durable Objects for shared state
+wranglerLines.push(
+  `[durable_objects]`,
+  `bindings = [`,
+  `  { name = "SHARED_EXPORT", class_name = "SharedExportDO" }`,
+  `]`,
+  ``,
+  `[[migrations]]`,
+  `tag = "v1"`,
+  `new_classes = ["SharedExportDO"]`,
+  ``,
+  `[alias]`,
+  `"__USER_MODULE__" = "./.export-module-map.js"`,
+  `"__GENERATED_TYPES__" = "./.export-types.js"`,
+  `"__SHARED_MODULE__" = "./.export-shared.js"`,
+  ``,
+);
+
+const wranglerPath = path.join(cwd, "wrangler.toml");
+fs.writeFileSync(wranglerPath, wranglerLines.join("\n"));
+
+// --- Output summary ---
+
 console.log(`Discovered ${modules.length} module(s): ${modules.map(m => m.routePath || "/").join(", ")}`);
 console.log("Generated type definitions + minified core →", outPath);
 console.log("Generated module map →", moduleMapPath);
 console.log("Generated shared import module →", sharedModulePath);
+console.log("Generated wrangler.toml →", wranglerPath);

package/handler.js

@@ -18,7 +18,12 @@ export const createHandler = (moduleMap, generatedTypes, minifiedCore, coreId, m
   const moduleRoutes = Object.keys(moduleMap); // e.g. ["", "greet", "utils/math"]
   const moduleExportKeys = {};
   for (const [route, mod] of Object.entries(moduleMap)) {
-    moduleExportKeys[route] = Object.keys(mod);
+    const keys = Object.keys(mod);
+    if (keys.includes("default")) {
+      const modulePath = route || "(root)";
+      console.warn(`[export-runtime] WARN: default export in "${modulePath}" is ignored. Use named exports instead.`);
+    }
+    moduleExportKeys[route] = keys.filter(k => k !== "default");
   }
 
   const coreModuleCode = minifiedCore || CORE_CODE;
@@ -154,7 +159,13 @@ export const createHandler = (moduleMap, generatedTypes, minifiedCore, coreId, m
       const cpath = isShared ? sharedCorePath : corePath;
 
       const resolved = resolveRoute(pathname);
-      if (!resolved) return new Response("Not found", { status: 404 });
+      if (!resolved) {
+        // Fallback to static assets if ASSETS binding is available
+        if (env?.ASSETS) {
+          return env.ASSETS.fetch(request);
+        }
+        return new Response("Not found", { status: 404 });
+      }
 
       const { route, exportName } = resolved;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "export-runtime",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "Cloudflare Workers ESM Export Framework Runtime",
   "keywords": [
     "cloudflare",

package/rpc.js

@@ -65,6 +65,8 @@ export function createRpcDispatcher(moduleMap) {
   // path = [route, ...exportPath] — route selects the module, exportPath walks its exports
   const splitPath = (path) => {
     const [route, ...rest] = path;
+    // Reject default export access
+    if (rest[0] === "default") throw new Error("Export not found: default");
     return { exports: resolveModule(route), exportPath: rest };
   };