ConfigController minor internal renaming (#6145)

* chore: use unusable<T> generic instead of casting * chore: rename config controller instance properties with 'latest' prefix * chore: remove unnecessary unwrapHook usage
cloudflare · Jun 25, 2024 · abb21a9 · abb21a9
1 parent 6b09f65
commit abb21a9
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 26 deletions.
diff --git a/packages/wrangler/src/__tests__/api/startDevWorker/LocalRuntimeController.test.ts b/packages/wrangler/src/__tests__/api/startDevWorker/LocalRuntimeController.test.ts
@@ -126,7 +126,7 @@ describe("Core", () => {
 
 		const config: StartDevWorkerOptions = {
 			name: "worker",
-			entrypoint: unusable() as FilePath,
+			entrypoint: unusable<FilePath>(),
 			compatibilityFlags: ["nodejs_compat"],
 			compatibilityDate: "2023-10-01",
 		};
@@ -271,7 +271,7 @@ describe("Core", () => {
 
 		const config: StartDevWorkerOptions = {
 			name: "worker",
-			entrypoint: unusable() as FilePath,
+			entrypoint: unusable<FilePath>(),
 		};
 		const bundle: Bundle = {
 			type: "commonjs",
@@ -358,7 +358,7 @@ describe("Core", () => {
 		function update(version: number) {
 			const config: StartDevWorkerOptions = {
 				name: "worker",
-				entrypoint: unusable() as FilePath,
+				entrypoint: unusable<FilePath>(),
 				bindings: {
 					VERSION: { type: "json", value: version },
 				},
@@ -406,7 +406,7 @@ describe("Core", () => {
 
 		const config: StartDevWorkerOptions = {
 			name: "worker",
-			entrypoint: unusable() as FilePath,
+			entrypoint: unusable<FilePath>(),
 			compatibilityDate: disabledDate,
 		};
 		const bundle = makeEsbuildBundle(dedent/*javascript*/ `
@@ -444,7 +444,7 @@ describe("Core", () => {
 
 		const config: StartDevWorkerOptions = {
 			name: "worker",
-			entrypoint: unusable() as FilePath,
+			entrypoint: unusable<FilePath>(),
 		};
 		const bundle = makeEsbuildBundle(dedent/*javascript*/ `
 				export default {
@@ -503,7 +503,7 @@ describe("Bindings", () => {
 
 		const config: StartDevWorkerOptions = {
 			name: "worker",
-			entrypoint: unusable() as FilePath,
+			entrypoint: unusable<FilePath>(),
 			bindings: {
 				TEXT: { type: "plain_text", value: "text" },
 				OBJECT: { type: "json", value: { a: { b: 1 } } },
@@ -543,7 +543,7 @@ describe("Bindings", () => {
 
 		const config: StartDevWorkerOptions = {
 			name: "worker",
-			entrypoint: unusable() as FilePath,
+			entrypoint: unusable<FilePath>(),
 			bindings: {
 				// `wasm-module` bindings aren't allowed in modules workers
 				WASM: { type: "wasm_module", source: { contents: WASM_ADD_MODULE } },
@@ -573,7 +573,7 @@ describe("Bindings", () => {
 
 		const config: StartDevWorkerOptions = {
 			name: "worker",
-			entrypoint: unusable() as FilePath,
+			entrypoint: unusable<FilePath>(),
 			dev: { persist: { path: persist } },
 		};
 		const bundle = makeEsbuildBundle(`export default {
@@ -621,7 +621,7 @@ describe("Bindings", () => {
 
 		const config: StartDevWorkerOptions = {
 			name: "worker",
-			entrypoint: unusable() as FilePath,
+			entrypoint: unusable<FilePath>(),
 			bindings: { NAMESPACE: { type: "kv_namespace", id: "ns" } },
 			dev: { persist: { path: persist } },
 		};
@@ -667,7 +667,7 @@ describe("Bindings", () => {
 
 		let config: StartDevWorkerOptions = {
 			name: "worker",
-			entrypoint: unusable() as FilePath,
+			entrypoint: unusable<FilePath>(),
 			legacy: { site: { bucket: tmp, include: ["*.txt"] } },
 		};
 		const bundle = makeEsbuildBundle(`
@@ -722,7 +722,7 @@ describe("Bindings", () => {
 
 		const config: StartDevWorkerOptions = {
 			name: "worker",
-			entrypoint: unusable() as FilePath,
+			entrypoint: unusable<FilePath>(),
 			bindings: { BUCKET: { type: "r2_bucket", bucket_name: "bucket" } },
 			dev: { persist: { path: persist } },
 		};
@@ -766,7 +766,7 @@ describe("Bindings", () => {
 
 		const config: StartDevWorkerOptions = {
 			name: "worker",
-			entrypoint: unusable() as FilePath,
+			entrypoint: unusable<FilePath>(),
 			bindings: {
 				DB: { type: "d1", database_name: "db-name", database_id: "db" },
 			},
@@ -816,7 +816,7 @@ describe("Bindings", () => {
 		const reportPromise = new DeferredPromise<unknown>();
 		const config: StartDevWorkerOptions = {
 			name: "worker",
-			entrypoint: unusable() as FilePath,
+			entrypoint: unusable<FilePath>(),
 			bindings: {
 				QUEUE: { type: "queue", queue_name: "queue" },
 				BATCH_REPORT: {
@@ -872,7 +872,7 @@ describe("Bindings", () => {
 		const localConnectionString = `postgres://username:password@127.0.0.1:${port}/db`;
 		const config: StartDevWorkerOptions = {
 			name: "worker",
-			entrypoint: unusable() as FilePath,
+			entrypoint: unusable<FilePath>(),
 			bindings: { DB: { type: "hyperdrive", id: "db", localConnectionString } },
 		};
 		const bundle = makeEsbuildBundle(`export default {

diff --git a/packages/wrangler/src/api/startDevWorker/ConfigController.ts b/packages/wrangler/src/api/startDevWorker/ConfigController.ts
@@ -1,6 +1,5 @@
 import assert from "node:assert";
 import { Controller } from "./BaseController";
-import { unwrapHook } from "./utils";
 import type { ControllerEventMap } from "./BaseController";
 import type { ConfigUpdateEvent } from "./events";
 import type { StartDevWorkerOptions } from "./types";
@@ -11,32 +10,30 @@ export type ConfigControllerEventMap = ControllerEventMap & {
 
 type Options = StartDevWorkerOptions;
 export class ConfigController extends Controller<ConfigControllerEventMap> {
-	config?: Options;
+	latestInput?: Options;
+	latestConfig?: Options;
 
 	public set(input: Options) {
-		const config = unwrapHook(input, this.latest);
-
-		this.#updateConfig(config);
+		this.#updateConfig(input);
 	}
 	public patch(input: Partial<Options>) {
 		assert(
-			this.latest,
+			this.latestInput,
 			"Cannot call updateConfig without previously calling setConfig"
 		);
 
 		const config: Options = {
-			...this.latest,
+			...this.latestInput,
 			...input,
 		};
 
 		this.#updateConfig(config);
 	}
 
-	latest?: Options;
 	#updateConfig(input: Options) {
 		const directory = input.directory;
 
-		this.config = {
+		this.latestConfig = {
 			directory,
 			build: {
 				moduleRules: [],
@@ -48,8 +45,8 @@ export class ConfigController extends Controller<ConfigControllerEventMap> {
 			},
 			...input,
 		};
-		this.latest = input;
-		this.emitConfigUpdateEvent(this.config);
+		this.latestInput = input;
+		this.emitConfigUpdateEvent(this.latestConfig);
 	}
 
 	// ******************

diff --git a/packages/wrangler/src/api/startDevWorker/DevEnv.ts b/packages/wrangler/src/api/startDevWorker/DevEnv.ts
@@ -150,7 +150,7 @@ export function createWorkerObject(devEnv: DevEnv): DevWorker {
 			return devEnv.proxy.ready.promise.then(() => undefined);
 		},
 		get config() {
-			return devEnv.config.config;
+			return devEnv.config.latestConfig;
 		},
 		setConfig(config) {
 			return devEnv.config.set(config);