@firtoz/worker-helper 1.4.0 → 1.5.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @firtoz/worker-helper
 
+## 1.5.1
+
+### Patch Changes
+
+- [#60](https://github.com/firtoz/fullstack-toolkit/pull/60) [`f887a36`](https://github.com/firtoz/fullstack-toolkit/commit/f887a3683bfc1e3db3db0e399c1494755af4008c) Thanks [@firtoz](https://github.com/firtoz)! - `prepareEnvFiles` no longer copies `.env.example` / `.env.local.example` to real env files when `CI` or `GITHUB_ACTIONS` is set, so CI typegen does not create or rely on generated `.env` files.
+
+## 1.5.0
+
+### Minor Changes
+
+- [`894ee47`](https://github.com/firtoz/fullstack-toolkit/commit/894ee4775393f4c536397e7db869ccfb31d3f045) Thanks [@firtoz](https://github.com/firtoz)! - Allow passing extra arguments to `wrangler types` via cf-typegen. Any arguments after the directory are forwarded to the wrangler command (e.g. `--env-interface WebAppEnv`, `-c wrangler.jsonc`).
+
 ## 1.4.0
 
 ### Minor Changes

package/README.md

@@ -54,6 +54,20 @@ cd your-worker-package
 bun run cf-typegen
 ```
 
+Any arguments after the directory are passed through to `wrangler types`. For example, to use a custom env interface or config:
+
+```bash
+bun run cf-typegen -- --env-interface WebAppEnv
+# or with a custom config path
+bun run cf-typegen -- -c wrangler.jsonc --env-interface WebAppEnv
+```
+
+When invoking the script directly, pass the directory first, then extra args:
+
+```bash
+bun --cwd ../../packages/worker-helper cf-typegen $(pwd) --env-interface WebAppEnv
+```
+
 **Output:**
 ```
 Running CF typegen for: /path/to/your-worker

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@firtoz/worker-helper",
-	"version": "1.4.0",
+	"version": "1.5.1",
 	"description": "Type-safe Web Worker helper with Zod validation and Cloudflare Workers utilities (cf-typegen)",
 	"main": "./src/index.ts",
 	"module": "./src/index.ts",
@@ -67,8 +67,8 @@
 		"zod": "^4.3.6"
 	},
 	"devDependencies": {
-		"@types/node": "^25.2.3",
+		"@types/node": "^25.5.0",
 		"@firtoz/maybe-error": "^1.5.2",
-		"bun-types": "^1.3.9"
+		"bun-types": "^1.3.11"
 	}
 }

package/src/cf-typegen.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-import { execSync } from "node:child_process";
+import { spawnSync } from "node:child_process";
 import * as fs from "node:fs";
 import path from "node:path";
 import process from "node:process";
@@ -9,8 +9,10 @@ import {
 } from "./cf-typegen-discovery";
 import { prepareEnvFiles } from "./utils/prepare-env";
 
-// Use the current working directory
+// First arg: directory (cwd). Remaining args: passed through to `wrangler types`.
 const cwd = process.argv[2];
+const extraWranglerArgs = process.argv.slice(3);
+
 if (!cwd || !fs.existsSync(cwd)) {
 	console.error(
 		"Please specify a directory as the first parameter. Usually $(pwd).",
@@ -39,9 +41,9 @@ function runWranglerTypes() {
 		console.log(`  Found ${allConfigs.length} wrangler config(s) in workspace`);
 	}
 
-	// Build the command with multiple -c flags
+	// Build args for wrangler types: multiple -c flags, --env-file, then any extra args
 	// The first config should be the current directory's wrangler.jsonc
-	const configFlags = ["-c wrangler.jsonc"];
+	const args: string[] = ["types", "-c", "wrangler.jsonc"];
 
 	// Add other configs (relative to cwd for better readability)
 	const currentWranglerJsonc = path.join(cwd, "wrangler.jsonc");
@@ -58,27 +60,27 @@ function runWranglerTypes() {
 		}
 		// Make path relative to cwd
 		const relativePath = path.relative(cwd, configPath);
-		configFlags.push(`-c ${relativePath}`);
+		args.push("-c", relativePath);
 	}
 
 	for (const envFile of envFiles) {
-		configFlags.push(`--env-file ${envFile}`);
+		args.push("--env-file", envFile);
 	}
 
-	const command = `wrangler types ${configFlags.join(" ")}`;
+	args.push(...extraWranglerArgs);
 
+	const command = `wrangler ${args.join(" ")}`;
 	console.log(`  Command: ${command}`);
 
-	try {
-		execSync(command, {
-			cwd,
-			stdio: "inherit",
-		});
-		console.log("✓ Wrangler types generated with all workspace bindings");
-	} catch {
+	const result = spawnSync("wrangler", args, {
+		cwd,
+		stdio: "inherit",
+	});
+	if (result.status !== 0) {
 		console.error("Failed to run wrangler types");
 		process.exit(1);
 	}
+	console.log("✓ Wrangler types generated with all workspace bindings");
 }
 
 // Run all steps

package/src/utils/prepare-env.ts

@@ -1,10 +1,17 @@
 import * as fs from "node:fs";
 import path from "node:path";
+import process from "node:process";
+
+function isCiEnvironment(): boolean {
+	return Boolean(process.env.CI) || process.env.GITHUB_ACTIONS === "true";
+}
 
 /**
  * Ensures a .env and .env.local file exists in the target directory.
  * If it doesn't exist, copies from .env.example and .env.local.example.
  *
+ * In CI, does not create those files — typegen uses `.env.example` / `.env.local.example` only when real files are absent.
+ *
  * @param targetDir - The directory where the .env and .env.local files should exist
  * @returns An array of the files that were created or already existed
  */
@@ -21,7 +28,9 @@ export function prepareEnvFiles(targetDir: string): string[] {
 	let envExists = fs.existsSync(envPath);
 	let envLocalExists = fs.existsSync(envLocalPath);
 
-	if (exampleEnvExists) {
+	const allowCopies = !isCiEnvironment();
+
+	if (allowCopies && exampleEnvExists) {
 		if (!envExists) {
 			fs.cpSync(exampleEnvPath, envPath);
 
@@ -30,7 +39,7 @@ export function prepareEnvFiles(targetDir: string): string[] {
 		}
 	}
 
-	if (exampleLocalEnvExists) {
+	if (allowCopies && exampleLocalEnvExists) {
 		if (!envLocalExists) {
 			fs.cpSync(exampleEnvLocalPath, envLocalPath);