create-nodejs-fn 0.0.1 → 0.0.3

package/README.md

@@ -162,27 +162,33 @@ Visit `http://localhost:5173/clock` to see a dynamically generated image with th
 
 ## 🪄 The Black Magic Revealed
 
-### 1️⃣ Transparent Proxy Generation via AST Transformation
+### 1️⃣ Extract `nodejsFn` Contents (Clip & Crop)
 
-Uses `ts-morph` to **statically analyze** `*.container.ts` files.
-Detects exported functions and **auto-generates proxy functions with identical type signatures**.
+The plugin uses `ts-morph` to **statically analyze** `*.container.ts` files and **extracts the function bodies** wrapped in `nodejsFn()`.
 
 ```typescript
 // Your code (clock.container.ts)
 export const renderClock = nodejsFn(async () => {
-  // Node.js native processing...
+  const canvas = createCanvas(600, 200);
+  // ... Node.js native processing
   return pngDataUrl;
 });
 
-// 🧙 The plugin auto-generates a proxy
-// → Types fully preserved! IDE autocomplete works!
-// → Calls are routed to the container via RPC!
+// 🧙 Plugin extracts the inner function from nodejsFn()
+// → Only the function body is clipped out for the container!
 ```
 
-### 2️⃣ Container Management via Durable Objects
+### 2️⃣ Bundle & Build Docker Image
+
+The extracted functions are **bundled with esbuild** and combined with an auto-generated **Dockerfile** to create a Docker image.
+
+- Functions are bundled as a Cap'n Proto RPC server
+- Native dependencies specified in `external` are auto-extracted to `package.json`
+- Dockerfile is auto-generated and image is built
 
-Uses Cloudflare **Durable Objects** to manage container connections.
-Stateful, with multi-instance routing support!
+### 3️⃣ Deploy as Cloudflare Containers
+
+The generated Docker image is **bundled as Cloudflare Containers**, with **Durable Objects** managing the container lifecycle.
 
 ```typescript
 // Route to specific instances with containerKey
@@ -195,11 +201,21 @@ export const renderClock = nodejsFn(
 );
 ```
 
-### 3️⃣ Fully Automated Build with esbuild + Docker
+### 4️⃣ Auto-Replace Imports with Container Calls
+
+Imports to `*.container.ts` files are **automatically replaced with proxy module imports** by the Vite plugin.
+
+```typescript
+// Your code
+import { renderClock } from "./clock.container";
+
+// 🧙 Plugin auto-transforms this!
+// → Actually imports a generated proxy function
+// → Calls are transparently converted to Container RPC!
+// → Types are fully preserved! IDE autocomplete works!
+```
 
-- Bundles container server code with **esbuild**
-- **Auto-generates Dockerfile**
-- Native deps specified in `external` are auto-extracted to `package.json`
+**Result**: Code that looks like normal function calls actually executes inside Docker containers!
 
 
 ## ⚙️ Plugin Options
@@ -259,11 +275,13 @@ project/
 │   ├── clock.container.ts        # Your code
 │   ├── index.ts                  # Worker entry
 │   └── __generated__/            # 🧙 Auto-generated magic
-│       ├── create-nodejs-fn.ts         # RPC client & type definitions
-│       ├── create-nodejs-fn.do.ts      # Durable Object class
-│       ├── create-nodejs-fn.context.ts # Container key resolution
-│       ├── create-nodejs-fn.runtime.ts # nodejsFn / containerKey helpers
-│       └── proxy.src__clock.container.ts # Proxy functions
+│       ├── create-nodejs-fn.ts            # RPC client & type definitions
+│       ├── create-nodejs-fn.do.ts         # Durable Object class
+│       ├── create-nodejs-fn.context.ts    # Container key resolution
+│       ├── create-nodejs-fn.runtime.ts    # nodejsFn / containerKey helpers
+│       ├── create-nodejs-fn-stub-batch.ts # Cap'n Proto RPC batch client
+│       └── __proxies__/
+│           └── p-XXXXXXXX.ts              # Proxy functions (hashed)
 │
 └── .create-nodejs-fn/            # 🐳 Container build artifacts
     ├── Dockerfile                # Auto-generated

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "create-nodejs-fn",
-  "version": "0.0.1",
-  "description": "Vite plugin to enable calling Node.js-dependent functions directly from Cloudflare Workers",
+  "version": "0.0.3",
+  "description": "Vite plugin to enable calling Node.js-dependent functions directly from Cloudflare Workers!!",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -37,11 +37,12 @@
     "dist"
   ],
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/inaridiy/create-nodejs-fn.git"
+    "url": "https://github.com/inaridiy/create-nodejs-fn.git"
   },
   "bugs": {
     "url": "https://github.com/inaridiy/create-nodejs-fn/issues"

package/dist/cli.d.ts

@@ -1 +0,0 @@
-#!/usr/bin/env node

package/dist/cli.js

@@ -1,356 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-
-// src/cli.ts
-var import_node_fs2 = __toESM(require("fs"));
-var import_node_path2 = __toESM(require("path"));
-var import_node_url = require("url");
-var import_promises = __toESM(require("readline/promises"));
-var import_gunshi = require("gunshi");
-
-// src/fs-utils.ts
-var import_node_fs = __toESM(require("fs"));
-var import_node_path = __toESM(require("path"));
-function ensureDir(p) {
-  import_node_fs.default.mkdirSync(p, { recursive: true });
-}
-function writeFileIfChanged(filePath, content) {
-  ensureDir(import_node_path.default.dirname(filePath));
-  const current = import_node_fs.default.existsSync(filePath) ? import_node_fs.default.readFileSync(filePath, "utf8") : null;
-  if (current === content) return;
-  import_node_fs.default.writeFileSync(filePath, content);
-}
-
-// src/cli.ts
-var import_meta = {};
-var moduleDir = typeof __dirname === "string" ? __dirname : import_node_path2.default.dirname((0, import_node_url.fileURLToPath)(import_meta.url));
-var pkgJsonPath = import_node_path2.default.resolve(moduleDir, "../package.json");
-var pkg = import_node_fs2.default.existsSync(pkgJsonPath) ? JSON.parse(import_node_fs2.default.readFileSync(pkgJsonPath, "utf8")) : { version: "0.0.0" };
-var VERSION = pkg.version ?? "0.0.0";
-var initCommand = (0, import_gunshi.define)({
-  name: "init",
-  description: "Interactively scaffold create-nodejs-fn files",
-  args: {
-    yes: {
-      type: "boolean",
-      short: "y",
-      description: "Use defaults and skip prompts"
-    },
-    force: {
-      type: "boolean",
-      short: "f",
-      description: "Overwrite existing files without asking"
-    }
-  },
-  run: async (ctx) => {
-    const yes = Boolean(ctx.values.yes);
-    const force = Boolean(ctx.values.force);
-    await runInit({ yes, force });
-  }
-});
-async function runInit(opts) {
-  const cwd = process.cwd();
-  const defaults = await gatherDefaults(cwd);
-  const prompter = createPrompter(opts.yes);
-  const answers = {
-    name: await prompter.text("Worker name", defaults.name),
-    main: normalizeEntry(await prompter.text("Entry file", defaults.main)),
-    className: await prompter.text("Container class name", defaults.className),
-    binding: await prompter.text("Durable Object binding", defaults.binding),
-    image: await prompter.text("Container image path", defaults.image),
-    compatibilityDate: await prompter.text("Compatibility date", defaults.compatibilityDate),
-    maxInstances: await prompter.number("Max container instances", defaults.maxInstances)
-  };
-  const results = [];
-  if (await ensureDockerfile(cwd, opts, prompter)) {
-    results.push(".create-nodejs-fn/Dockerfile");
-  }
-  if (updateGitignore(cwd)) {
-    results.push(".gitignore");
-  }
-  if (ensureGeneratedDir(cwd)) {
-    results.push("src/__generated__/");
-  }
-  const wranglerResult = await writeWranglerJsonc(cwd, answers, opts, prompter);
-  if (wranglerResult) {
-    results.push("wrangler.jsonc");
-  }
-  if (ensureEntryExportsDo(cwd, answers, opts)) {
-    results.push(answers.main);
-  }
-  prompter.close();
-  if (results.length === 0) {
-    console.log("All files already up to date. Nothing to do.");
-    return;
-  }
-  console.log("Updated:");
-  for (const r of results) {
-    console.log(`  - ${r}`);
-  }
-}
-async function ensureDockerfile(cwd, opts, prompter) {
-  const dockerfilePath = import_node_path2.default.join(cwd, ".create-nodejs-fn", "Dockerfile");
-  const dockerDir = import_node_path2.default.dirname(dockerfilePath);
-  ensureDir(dockerDir);
-  if (import_node_fs2.default.existsSync(dockerfilePath) && !opts.force) {
-    const overwrite = await prompter.confirm(
-      "Dockerfile already exists. Overwrite it?",
-      false
-    );
-    if (!overwrite) return false;
-  }
-  const content = [
-    "# create-nodejs-fn container image",
-    "# Generated by `create-nodejs-fn init`. The build step will refresh this file.",
-    "FROM node:20-slim",
-    "WORKDIR /app",
-    "RUN corepack enable",
-    "# Dependencies are injected via the generated package.json during build.",
-    "COPY package.json ./",
-    "RUN pnpm install --prod --no-frozen-lockfile",
-    "# The server bundle is generated at build time.",
-    "COPY ./server.mjs ./server.mjs",
-    "ENV NODE_ENV=production",
-    "EXPOSE 8080",
-    'CMD ["node", "./server.mjs"]',
-    ""
-  ].join("\n");
-  writeFileIfChanged(dockerfilePath, content);
-  return true;
-}
-function updateGitignore(cwd) {
-  const target = import_node_path2.default.join(cwd, ".gitignore");
-  const existing = import_node_fs2.default.existsSync(target) ? import_node_fs2.default.readFileSync(target, "utf8").split(/\r?\n/) : [];
-  const block = [
-    "# create-nodejs-fn",
-    ".create-nodejs-fn/*",
-    "!.create-nodejs-fn/Dockerfile",
-    "src/__generated__"
-  ];
-  const lines = [...existing];
-  const present = new Set(lines);
-  const missing = block.filter((line) => !present.has(line));
-  const changed = missing.length > 0;
-  if (changed) {
-    if (lines.length && lines[lines.length - 1] !== "") {
-      lines.push("");
-    }
-    for (const line of block) {
-      if (!present.has(line)) {
-        lines.push(line);
-      }
-    }
-  }
-  if (changed) {
-    const cleaned = trimBlankDuplicates(lines).join("\n");
-    import_node_fs2.default.writeFileSync(target, cleaned.endsWith("\n") ? cleaned : `${cleaned}
-`);
-  }
-  return changed;
-}
-function ensureGeneratedDir(cwd) {
-  const dir = import_node_path2.default.join(cwd, "src", "__generated__");
-  if (import_node_fs2.default.existsSync(dir)) return false;
-  ensureDir(dir);
-  return true;
-}
-async function writeWranglerJsonc(cwd, answers, opts, prompter) {
-  const target = import_node_path2.default.join(cwd, "wrangler.jsonc");
-  const exists = import_node_fs2.default.existsSync(target);
-  if (exists && !opts.force) {
-    const proceed = await prompter.confirm("wrangler.jsonc already exists. Merge updates?", true);
-    if (!proceed) return false;
-  }
-  const existing = exists ? readJsonc(target) : {};
-  const merged = mergeWranglerConfig(existing, answers);
-  writeFileIfChanged(target, `${JSON.stringify(merged, null, 2)}
-`);
-  return true;
-}
-function readJsonc(filePath) {
-  try {
-    const raw = import_node_fs2.default.readFileSync(filePath, "utf8");
-    const withoutBlock = raw.replace(/\/\*[\s\S]*?\*\//g, "");
-    const withoutLine = withoutBlock.replace(/(^|[^:])\/\/.*$/gm, "$1");
-    return JSON.parse(withoutLine);
-  } catch {
-    return {};
-  }
-}
-function mergeWranglerConfig(base, answers) {
-  const out = { ...base };
-  out.$schema = out.$schema ?? "node_modules/wrangler/config-schema.json";
-  out.name = out.name ?? answers.name;
-  out.main = out.main ?? (answers.main.startsWith("./") ? answers.main : `./${answers.main}`);
-  out.compatibility_date = out.compatibility_date ?? answers.compatibilityDate;
-  const flags = Array.isArray(out.compatibility_flags) ? out.compatibility_flags : [];
-  if (!flags.includes("nodejs_compat")) flags.push("nodejs_compat");
-  out.compatibility_flags = flags;
-  const containers = Array.isArray(out.containers) ? [...out.containers] : [];
-  const containerIdx = containers.findIndex((c) => c?.class_name === answers.className);
-  const containerEntry = {
-    class_name: answers.className,
-    image: answers.image,
-    max_instances: answers.maxInstances
-  };
-  if (containerIdx >= 0) {
-    containers[containerIdx] = { ...containers[containerIdx], ...containerEntry };
-  } else {
-    containers.push(containerEntry);
-  }
-  out.containers = containers;
-  const durable = typeof out.durable_objects === "object" && out.durable_objects !== null ? { ...out.durable_objects } : {};
-  const bindings = Array.isArray(durable.bindings) ? [...durable.bindings] : [];
-  const bindingIdx = bindings.findIndex((b) => b?.name === answers.binding);
-  const bindingEntry = { name: answers.binding, class_name: answers.className };
-  if (bindingIdx >= 0) {
-    bindings[bindingIdx] = { ...bindings[bindingIdx], ...bindingEntry };
-  } else {
-    bindings.push(bindingEntry);
-  }
-  durable.bindings = bindings;
-  out.durable_objects = durable;
-  const migrations = Array.isArray(out.migrations) ? [...out.migrations] : [];
-  const migIdx = migrations.findIndex((m) => m?.tag === "v1");
-  const ensureNewSqlite = (entry) => {
-    const classes = Array.isArray(entry.new_sqlite_classes) ? [...entry.new_sqlite_classes] : [];
-    if (!classes.includes(answers.className)) classes.push(answers.className);
-    entry.new_sqlite_classes = classes;
-    return entry;
-  };
-  if (migIdx >= 0) {
-    migrations[migIdx] = ensureNewSqlite({ ...migrations[migIdx], tag: migrations[migIdx].tag ?? "v1" });
-  } else {
-    migrations.push(ensureNewSqlite({ tag: "v1" }));
-  }
-  out.migrations = migrations;
-  return out;
-}
-function ensureEntryExportsDo(cwd, answers, opts) {
-  const entryRel = answers.main.startsWith("./") ? answers.main.slice(2) : answers.main;
-  const entryAbs = import_node_path2.default.join(cwd, entryRel);
-  ensureDir(import_node_path2.default.dirname(entryAbs));
-  const doAbs = import_node_path2.default.join(cwd, "src", "__generated__", "create-nodejs-fn.do.ts");
-  const doRel = import_node_path2.default.relative(import_node_path2.default.dirname(entryAbs), doAbs).replace(/\\/g, "/").replace(/\.ts$/, "");
-  const exportLine = `export { ${answers.className} } from "${doRel.startsWith(".") ? doRel : `./${doRel}`}";`;
-  if (import_node_fs2.default.existsSync(entryAbs)) {
-    const content = import_node_fs2.default.readFileSync(entryAbs, "utf8");
-    if (content.includes(exportLine) || content.match(new RegExp(`export\\s+\\{\\s*${answers.className}\\s*\\}.*create-nodejs-fn\\.do`))) {
-      return false;
-    }
-    const next = content.endsWith("\n") ? `${content}${exportLine}
-` : `${content}
-${exportLine}
-`;
-    writeFileIfChanged(entryAbs, next);
-    return true;
-  }
-  const template = `${exportLine}
-`;
-  writeFileIfChanged(entryAbs, template);
-  return true;
-}
-async function gatherDefaults(cwd) {
-  const pkgPath = import_node_path2.default.join(cwd, "package.json");
-  const pkgJson = import_node_fs2.default.existsSync(pkgPath) ? JSON.parse(import_node_fs2.default.readFileSync(pkgPath, "utf8")) : {};
-  return {
-    name: pkgJson.name ?? import_node_path2.default.basename(cwd),
-    main: "src/index.ts",
-    className: "NodejsFnContainer",
-    binding: "NODEJS_FN",
-    image: "./.create-nodejs-fn/Dockerfile",
-    compatibilityDate: defaultCompatibilityDate(),
-    maxInstances: 10
-  };
-}
-function defaultCompatibilityDate() {
-  const d = /* @__PURE__ */ new Date();
-  const yyyy = d.getUTCFullYear();
-  const mm = `${d.getUTCMonth() + 1}`.padStart(2, "0");
-  const dd = `${d.getUTCDate()}`.padStart(2, "0");
-  return `${yyyy}-${mm}-${dd}`;
-}
-function normalizeEntry(input) {
-  if (!input) return "src/index.ts";
-  const withSlash = input.startsWith("./") ? input : `./${input}`;
-  return withSlash.replace(/\\/g, "/");
-}
-function createPrompter(skip) {
-  if (skip || !process.stdin.isTTY) {
-    return {
-      text: async (_message, defaultValue) => defaultValue,
-      number: async (_message, defaultValue) => defaultValue,
-      confirm: async (_message, defaultValue = false) => defaultValue,
-      close: () => {
-      }
-    };
-  }
-  const rl = import_promises.default.createInterface({
-    input: process.stdin,
-    output: process.stdout
-  });
-  return {
-    async text(message, defaultValue) {
-      const answer = await rl.question(formatPrompt(message, defaultValue));
-      return answer.trim() || defaultValue;
-    },
-    async number(message, defaultValue) {
-      const answer = await rl.question(formatPrompt(message, String(defaultValue)));
-      const parsed = Number.parseInt(answer.trim(), 10);
-      return Number.isFinite(parsed) ? parsed : defaultValue;
-    },
-    async confirm(message, defaultValue = false) {
-      const suffix = defaultValue ? " [Y/n] " : " [y/N] ";
-      const answer = (await rl.question(`${message}${suffix}`)).trim().toLowerCase();
-      if (!answer) return defaultValue;
-      return answer.startsWith("y");
-    },
-    close() {
-      rl.close();
-    }
-  };
-}
-function formatPrompt(message, defaultValue) {
-  const suffix = defaultValue !== void 0 && defaultValue !== null ? ` (${defaultValue})` : "";
-  return `${message}${suffix}: `;
-}
-function trimBlankDuplicates(lines) {
-  const out = [];
-  for (const line of lines) {
-    if (line === "" && out.length > 0 && out[out.length - 1] === "") continue;
-    out.push(line);
-  }
-  return out;
-}
-async function main() {
-  await (0, import_gunshi.cli)(process.argv.slice(2), initCommand, {
-    name: "create-nodejs-fn",
-    version: VERSION
-  });
-}
-main().catch((err) => {
-  console.error(err);
-  process.exitCode = 1;
-});

package/dist/index.d.ts

@@ -1,36 +0,0 @@
-import { Plugin } from 'vite';
-
-type DockerOptions = {
-    baseImage?: string;
-    systemPackages?: string[];
-    preInstallCommands?: string[];
-    postInstallCommands?: string[];
-    env?: Record<string, string>;
-    extraLines?: string[];
-};
-type Opts = {
-    files?: string[];
-    generatedDir?: string;
-    binding?: string;
-    className?: string;
-    containerPort?: number;
-    external?: string[];
-    docker?: DockerOptions;
-    /**
-     * Worker env vars to forward into the container via Container.envVars.
-     * Accepts an array of names (same name) or a map of containerName -> workerEnvKey.
-     */
-    workerEnvVars?: string[] | Record<string, string>;
-    /**
-     * Automatically rebuild containers in local dev when *.container.ts files change. default: true
-     */
-    autoRebuildContainers?: boolean;
-    /**
-     * Debounce duration in milliseconds for container rebuilds during dev. default: 200
-     */
-    rebuildDebounceMs?: number;
-};
-
-declare function createNodejsFnPlugin(opts?: Opts): Plugin;
-
-export { createNodejsFnPlugin };