wrangler 2.4.1 → 2.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.4.1",
+	"version": "2.4.2",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",

package/src/__tests__/type-generation.test.ts

@@ -216,8 +216,9 @@ describe("generateTypes()", () => {
 
 		await runWrangler("types");
 		expect(std.out).toMatchInlineSnapshot(`
-		"declare global {
-			testing_unsafe: any;
+		"export {};
+		declare global {
+			const testing_unsafe: any;
 		}
 		"
 	`);

package/src/type-generation.ts

@@ -15,7 +15,7 @@ export async function generateTypes(
 
 	if (configToDTS.kv_namespaces) {
 		for (const kvNamespace of configToDTS.kv_namespaces) {
-			envTypeStructure.push(`	${kvNamespace.binding}: KVNamespace;`);
+			envTypeStructure.push(`${kvNamespace.binding}: KVNamespace;`);
 		}
 	}
 
@@ -27,70 +27,70 @@ export async function generateTypes(
 				typeof varValue === "number" ||
 				typeof varValue === "boolean"
 			) {
-				envTypeStructure.push(`	${varName}: "${varValue}";`);
+				envTypeStructure.push(`${varName}: "${varValue}";`);
 			}
 			if (typeof varValue === "object" && varValue !== null) {
-				envTypeStructure.push(`	${varName}: ${JSON.stringify(varValue)};`);
+				envTypeStructure.push(`${varName}: ${JSON.stringify(varValue)};`);
 			}
 		}
 	}
 
 	if (configToDTS.durable_objects?.bindings) {
 		for (const durableObject of configToDTS.durable_objects.bindings) {
-			envTypeStructure.push(`	${durableObject.name}: DurableObjectNamespace;`);
+			envTypeStructure.push(`${durableObject.name}: DurableObjectNamespace;`);
 		}
 	}
 
 	if (configToDTS.r2_buckets) {
 		for (const R2Bucket of configToDTS.r2_buckets) {
-			envTypeStructure.push(`	${R2Bucket.binding}: R2Bucket;`);
+			envTypeStructure.push(`${R2Bucket.binding}: R2Bucket;`);
 		}
 	}
 
 	if (configToDTS.d1_databases) {
 		for (const d1 of configToDTS.d1_databases) {
-			envTypeStructure.push(`	${d1.binding}: D1Database;`);
+			envTypeStructure.push(`${d1.binding}: D1Database;`);
 		}
 	}
 
 	if (configToDTS.services) {
 		for (const service of configToDTS.services) {
-			envTypeStructure.push(`	${service.binding}: Fetcher;`);
+			envTypeStructure.push(`${service.binding}: Fetcher;`);
 		}
 	}
 
 	if (configToDTS.dispatch_namespaces) {
 		for (const namespace of configToDTS.dispatch_namespaces) {
-			envTypeStructure.push(`	${namespace.binding}: any;`);
+			envTypeStructure.push(`${namespace.binding}: any;`);
 		}
 	}
 
 	if (configToDTS.logfwdr?.schema) {
-		envTypeStructure.push(`	LOGFWDR_SCHEMA: any;`);
+		envTypeStructure.push(`LOGFWDR_SCHEMA: any;`);
 	}
 
 	if (configToDTS.data_blobs) {
 		for (const dataBlobs in configToDTS.data_blobs) {
-			envTypeStructure.push(`	${dataBlobs}: ArrayBuffer;`);
+			envTypeStructure.push(`${dataBlobs}: ArrayBuffer;`);
 		}
 	}
 
 	if (configToDTS.text_blobs) {
 		for (const textBlobs in configToDTS.text_blobs) {
-			envTypeStructure.push(`	${textBlobs}: string;`);
+			envTypeStructure.push(`${textBlobs}: string;`);
 		}
 	}
 
 	if (configToDTS.unsafe) {
 		for (const unsafe of configToDTS.unsafe.bindings) {
-			envTypeStructure.push(`	${unsafe.name}: any;`);
+			envTypeStructure.push(`${unsafe.name}: any;`);
 		}
 	}
 
 	if (configToDTS.queues) {
 		if (configToDTS.queues.producers) {
 			for (const queue of configToDTS.queues.producers) {
-				envTypeStructure.push(`	${queue.binding}: Queue;`);
+				envTypeStructure.push(`${queue.binding}: Queue;`);
 			}
 		}
 	}
@@ -154,13 +154,13 @@ function writeDTSFile({
 
 	let combinedTypeStrings = "";
 	if (formatType === "modules") {
-		combinedTypeStrings += `interface Env {\n${envTypeStructure.join(
-			"\n"
-		)} \n}\n${modulesTypeStructure.join("\n")}`;
+		combinedTypeStrings += `interface Env {\n${envTypeStructure
+			.map((value) => `\t${value}`)
+			.join("\n")} \n}\n${modulesTypeStructure.join("\n")}`;
 	} else {
-		combinedTypeStrings += `declare global {\n${envTypeStructure.join(
-			"\n"
-		)} \n}\n${modulesTypeStructure.join("\n")}`;
+		combinedTypeStrings += `export {};\ndeclare global {\n${envTypeStructure
+			.map((value) => `\tconst ${value}`)
+			.join("\n")} \n}\n${modulesTypeStructure.join("\n")}`;
 	}
 
 	if (envTypeStructure.length || modulesTypeStructure.length) {

package/wrangler-dist/cli.js

@@ -141160,7 +141160,7 @@ var import_websocket_server = __toESM(require_websocket_server2(), 1);
 var wrapper_default = import_websocket.default;
 
 // package.json
-var version = "2.4.1";
+var version = "2.4.2";
 var package_default = {
   name: "wrangler",
   version,
@@ -162563,67 +162563,67 @@ async function generateTypes(configToDTS, config) {
   const envTypeStructure = [];
   if (configToDTS.kv_namespaces) {
     for (const kvNamespace2 of configToDTS.kv_namespaces) {
-      envTypeStructure.push(`	${kvNamespace2.binding}: KVNamespace;`);
+      envTypeStructure.push(`${kvNamespace2.binding}: KVNamespace;`);
     }
   }
   if (configToDTS.vars) {
     for (const varName in configToDTS.vars) {
       const varValue = configToDTS.vars[varName];
       if (typeof varValue === "string" || typeof varValue === "number" || typeof varValue === "boolean") {
-        envTypeStructure.push(`	${varName}: "${varValue}";`);
+        envTypeStructure.push(`${varName}: "${varValue}";`);
       }
       if (typeof varValue === "object" && varValue !== null) {
-        envTypeStructure.push(`	${varName}: ${JSON.stringify(varValue)};`);
+        envTypeStructure.push(`${varName}: ${JSON.stringify(varValue)};`);
       }
     }
   }
   if (configToDTS.durable_objects?.bindings) {
     for (const durableObject of configToDTS.durable_objects.bindings) {
-      envTypeStructure.push(`	${durableObject.name}: DurableObjectNamespace;`);
+      envTypeStructure.push(`${durableObject.name}: DurableObjectNamespace;`);
     }
   }
   if (configToDTS.r2_buckets) {
     for (const R2Bucket of configToDTS.r2_buckets) {
-      envTypeStructure.push(`	${R2Bucket.binding}: R2Bucket;`);
+      envTypeStructure.push(`${R2Bucket.binding}: R2Bucket;`);
     }
   }
   if (configToDTS.d1_databases) {
     for (const d12 of configToDTS.d1_databases) {
-      envTypeStructure.push(`	${d12.binding}: D1Database;`);
+      envTypeStructure.push(`${d12.binding}: D1Database;`);
     }
   }
   if (configToDTS.services) {
     for (const service of configToDTS.services) {
-      envTypeStructure.push(`	${service.binding}: Fetcher;`);
+      envTypeStructure.push(`${service.binding}: Fetcher;`);
     }
   }
   if (configToDTS.dispatch_namespaces) {
     for (const namespace of configToDTS.dispatch_namespaces) {
-      envTypeStructure.push(`	${namespace.binding}: any;`);
+      envTypeStructure.push(`${namespace.binding}: any;`);
     }
   }
   if (configToDTS.logfwdr?.schema) {
-    envTypeStructure.push(`	LOGFWDR_SCHEMA: any;`);
+    envTypeStructure.push(`LOGFWDR_SCHEMA: any;`);
   }
   if (configToDTS.data_blobs) {
     for (const dataBlobs in configToDTS.data_blobs) {
-      envTypeStructure.push(`	${dataBlobs}: ArrayBuffer;`);
+      envTypeStructure.push(`${dataBlobs}: ArrayBuffer;`);
     }
   }
   if (configToDTS.text_blobs) {
     for (const textBlobs in configToDTS.text_blobs) {
-      envTypeStructure.push(`	${textBlobs}: string;`);
+      envTypeStructure.push(`${textBlobs}: string;`);
     }
   }
   if (configToDTS.unsafe) {
     for (const unsafe of configToDTS.unsafe.bindings) {
-      envTypeStructure.push(`	${unsafe.name}: any;`);
+      envTypeStructure.push(`${unsafe.name}: any;`);
     }
   }
   if (configToDTS.queues) {
     if (configToDTS.queues.producers) {
       for (const queue of configToDTS.queues.producers) {
-        envTypeStructure.push(`	${queue.binding}: Queue;`);
+        envTypeStructure.push(`${queue.binding}: Queue;`);
       }
     }
   }
@@ -162672,16 +162672,13 @@ function writeDTSFile({
   let combinedTypeStrings = "";
   if (formatType === "modules") {
     combinedTypeStrings += `interface Env {
-${envTypeStructure.join(
-      "\n"
-    )} 
+${envTypeStructure.map((value) => `	${value}`).join("\n")} 
 }
 ${modulesTypeStructure.join("\n")}`;
   } else {
-    combinedTypeStrings += `declare global {
-${envTypeStructure.join(
-      "\n"
-    )} 
+    combinedTypeStrings += `export {};
+declare global {
+${envTypeStructure.map((value) => `	const ${value}`).join("\n")} 
 }
 ${modulesTypeStructure.join("\n")}`;
   }