@tokamakdev/tok 0.1.1-beta.65 → 0.1.1-beta.69

package/dist/vite.d.mts

@@ -1,7 +1,8 @@
 import { type Plugin } from "vite";
 /**
- * Reports the build's tokamak configuration and development server address to
- * `tok`, and makes the entry Worker import the configuration file. Without
- * `TOKAMAK_VITE_OUTPUT`, which `tok` sets, it adds no hooks.
+ * Reports the build's tokamak configuration, and the development server's
+ * address and Worker name, to `tok`, and makes the entry Worker import the
+ * configuration file. Without `TOKAMAK_VITE_OUTPUT`, which `tok` sets, it adds
+ * no hooks.
  */
 export declare function tokamak(): Plugin[];

package/dist/vite.mjs

@@ -3,12 +3,15 @@ import path from "node:path";
 import { normalizePath, runnerImport, } from "vite";
 /** Configuration files tried in order when `tok` names none. */
 const CONFIG_FILES = ["src/tokamak.ts", "src/tokamak.js"];
+/** Wrangler configuration files Cloudflare's plugin tries in order. */
+const WRANGLER_FILES = ["wrangler.jsonc", "wrangler.json", "wrangler.toml"];
 /** The files each output directory's `config.json` was read from, once written. */
 const written = new Map();
 /**
- * Reports the build's tokamak configuration and development server address to
- * `tok`, and makes the entry Worker import the configuration file. Without
- * `TOKAMAK_VITE_OUTPUT`, which `tok` sets, it adds no hooks.
+ * Reports the build's tokamak configuration, and the development server's
+ * address and Worker name, to `tok`, and makes the entry Worker import the
+ * configuration file. Without `TOKAMAK_VITE_OUTPUT`, which `tok` sets, it adds
+ * no hooks.
  */
 export function tokamak() {
     const output = process.env.TOKAMAK_VITE_OUTPUT;
@@ -40,19 +43,27 @@ export function tokamak() {
                     await write();
                 }
             },
-            configureServer(server) {
-                server.httpServer?.on("listening", () => {
+            async configureServer(server) {
+                const httpServer = server.httpServer;
+                if (!httpServer) {
+                    return;
+                }
+                const workerName = await readWorkerName(server.config.root);
+                httpServer.on("listening", () => {
                     const urls = server.resolvedUrls;
-                    writeJson(output, "server.json", { url: urls?.local[0] ?? urls?.network[0] });
+                    writeJson(output, "server.json", { url: urls?.local[0] ?? urls?.network[0], workerName });
                 });
             },
+            async buildApp(builder) {
+                const environments = Object.values(builder.environments);
+                if (file && !environments.some((environment) => buildsEntryWorker(environment.config))) {
+                    throw new Error(`no environment builds the entry Worker to import ${file} into`);
+                }
+            },
         },
         {
             name: "tokamak:entry",
-            // Server environments with a manifest are built from the entry Worker:
-            // Cloudflare's plugin gives one to the entry and prerender Workers, and
-            // Astro to its server and prerender environments.
-            applyToEnvironment: ({ config }) => file !== undefined && config.consumer === "server" && Boolean(config.build.manifest),
+            applyToEnvironment: ({ config }) => file !== undefined && buildsEntryWorker(config),
             async transform(code, id) {
                 if (id === file) {
                     return withoutConfig(this, code);
@@ -105,14 +116,38 @@ async function writeConfig(output, file, config) {
     writeJson(output, "config.json", { file, config: module.config ?? {} });
     return [file, ...dependencies.map(normalizePath)];
 }
+/**
+ * The name of the Worker in the Wrangler configuration file in `root`, found
+ * as Cloudflare's plugin finds it without `configPath`, without the suffix of
+ * the `CLOUDFLARE_ENV` environment.
+ */
+async function readWorkerName(root) {
+    const file = WRANGLER_FILES.map((name) => path.join(root, name)).find((candidate) => fs.existsSync(candidate));
+    if (!file) {
+        return undefined;
+    }
+    const { unstable_readConfig } = await import("wrangler");
+    const worker = unstable_readConfig({ config: file, env: process.env.CLOUDFLARE_ENV }, { hideWarnings: true });
+    return worker.topLevelName ?? worker.name;
+}
+/**
+ * Whether an environment builds from the entry Worker: Cloudflare's plugin
+ * gives a manifest to its entry and prerender Workers, and Astro to its server
+ * and prerender environments.
+ */
+function buildsEntryWorker(config) {
+    return config.consumer === "server" && Boolean(config.build.manifest);
+}
 /** The modules an environment's build starts from. */
 function inputs(build) {
     const { input } = build.rollupOptions;
     return typeof input === "string" ? [input] : Object.values(input ?? {});
 }
 /**
- * `code` without its `export const config = ...` statement, which is blanked
- * so that every other position, and so the source map, is unchanged.
+ * `code` without its `config` export: the `export const config = ...`
+ * statement is blanked, or only its `export` keyword while other statements
+ * mention `config`, so that every other position, and so the source map, is
+ * unchanged.
  */
 function withoutConfig(context, code) {
     const statements = context.parse(code).body;
@@ -120,11 +155,25 @@ function withoutConfig(context, code) {
     if (!statement) {
         return;
     }
-    if (statement.declaration?.declarations?.length !== 1) {
-        context.error("declare config in its own `export const config = ...` statement");
+    const declaration = statement.declaration;
+    if (declaration?.declarations?.length !== 1) {
+        return context.error("declare config in its own `export const config = ...` statement");
+    }
+    const mentioned = statements.some((other) => other !== statement && mentions(other, "config"));
+    const end = mentioned ? declaration.start : statement.end;
+    const blank = code.slice(statement.start, end).replace(/[^\n]/g, " ");
+    return { code: code.slice(0, statement.start) + blank + code.slice(end), map: null };
+}
+/** Whether `node` contains an identifier named `name`, property names included. */
+function mentions(node, name) {
+    if (typeof node !== "object" || node === null) {
+        return false;
+    }
+    const identifier = node;
+    if (identifier.type === "Identifier" && identifier.name === name) {
+        return true;
     }
-    const blank = code.slice(statement.start, statement.end).replace(/[^\n]/g, " ");
-    return { code: code.slice(0, statement.start) + blank + code.slice(statement.end), map: null };
+    return Object.values(node).some((child) => mentions(child, name));
 }
 function exportsConfig(statement) {
     if (statement.type !== "ExportNamedDeclaration") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokamakdev/tok",
-  "version": "0.1.1-beta.65",
+  "version": "0.1.1-beta.69",
   "description": "The tokamak CLI, Vite plugin and app API: build native apps from a Cloudflare Workers codebase",
   "repository": {
     "type": "git",
@@ -36,31 +36,36 @@
   },
   "peerDependencies": {
     "@cloudflare/vite-plugin": "^1.54.0",
-    "vite": "^7.0.0 || ^8.0.0"
+    "vite": "^7.0.0 || ^8.0.0",
+    "wrangler": "^4.126.0"
   },
   "peerDependenciesMeta": {
     "@cloudflare/vite-plugin": {
       "optional": true
+    },
+    "wrangler": {
+      "optional": true
     }
   },
   "devDependencies": {
     "@cloudflare/vite-plugin": "1.62.5",
     "@types/node": "22.19.15",
     "typescript": "5.9.3",
-    "vite": "8.3.2"
+    "vite": "8.3.2",
+    "wrangler": "4.147.0"
   },
   "optionalDependencies": {
-    "@tokamakdev/platform-android-arm64": "0.1.1-beta.65",
-    "@tokamakdev/platform-ios-arm64": "0.1.1-beta.65",
-    "@tokamakdev/platform-ios-simulator-arm64": "0.1.1-beta.65",
-    "@tokamakdev/platform-ios-simulator-x64": "0.1.1-beta.65",
-    "@tokamakdev/platform-macos-arm64": "0.1.1-beta.65",
-    "@tokamakdev/platform-macos-x64": "0.1.1-beta.65",
-    "@tokamakdev/platform-windows-x64": "0.1.1-beta.65",
-    "@tokamakdev/tok-darwin-arm64": "0.1.1-beta.65",
-    "@tokamakdev/tok-darwin-x64": "0.1.1-beta.65",
-    "@tokamakdev/tok-linux-x64": "0.1.1-beta.65",
-    "@tokamakdev/tok-win32-x64": "0.1.1-beta.65"
+    "@tokamakdev/platform-android-arm64": "0.1.1-beta.69",
+    "@tokamakdev/platform-ios-arm64": "0.1.1-beta.69",
+    "@tokamakdev/platform-ios-simulator-arm64": "0.1.1-beta.69",
+    "@tokamakdev/platform-ios-simulator-x64": "0.1.1-beta.69",
+    "@tokamakdev/platform-macos-arm64": "0.1.1-beta.69",
+    "@tokamakdev/platform-macos-x64": "0.1.1-beta.69",
+    "@tokamakdev/platform-windows-x64": "0.1.1-beta.69",
+    "@tokamakdev/tok-darwin-arm64": "0.1.1-beta.69",
+    "@tokamakdev/tok-darwin-x64": "0.1.1-beta.69",
+    "@tokamakdev/tok-linux-x64": "0.1.1-beta.69",
+    "@tokamakdev/tok-win32-x64": "0.1.1-beta.69"
   },
   "publishConfig": {
     "access": "public"