lopata 0.5.0 → 0.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "lopata",
-	"version": "0.5.0",
+	"version": "0.5.1",
 	"type": "module",
 	"license": "MIT",
 	"repository": {

package/src/config.ts

@@ -80,8 +80,7 @@ export async function loadConfig(path: string, envName?: string): Promise<Wrangl
 	if (path.endsWith('.toml')) {
 		config = parseTOML(raw) as unknown as WranglerConfig
 	} else {
-		// JSON or JSONC — strip single-line comments (// ...) outside strings
-		config = JSON.parse(stripJsoncComments(raw))
+		config = Bun.JSONC.parse(raw) as WranglerConfig
 	}
 	return applyEnvOverrides(config, envName)
 }
@@ -120,46 +119,3 @@ function applyEnvOverrides(config: WranglerConfig, envName?: string): WranglerCo
 	}
 	return merged
 }
-
-// ─── JSONC Comment Stripping ───────────────────────────────────────────────
-
-function stripJsoncComments(input: string): string {
-	let result = ''
-	let i = 0
-	while (i < input.length) {
-		// String literal — copy as-is
-		if (input[i] === '"') {
-			result += '"'
-			i++
-			while (i < input.length && input[i] !== '"') {
-				if (input[i] === '\\') {
-					result += input[i]! + (input[i + 1] ?? '')
-					i += 2
-				} else {
-					result += input[i]!
-					i++
-				}
-			}
-			if (i < input.length) {
-				result += '"'
-				i++
-			}
-			continue
-		}
-		// Single-line comment
-		if (input[i] === '/' && input[i + 1] === '/') {
-			while (i < input.length && input[i] !== '\n') i++
-			continue
-		}
-		// Block comment
-		if (input[i] === '/' && input[i + 1] === '*') {
-			i += 2
-			while (i < input.length && !(input[i] === '*' && input[i + 1] === '/')) i++
-			i += 2
-			continue
-		}
-		result += input[i]!
-		i++
-	}
-	return result
-}

package/src/env.ts

@@ -355,9 +355,6 @@ export function buildEnv(
 		}
 	}
 
-	// Store reference for cloudflare:workers env export
-	setGlobalEnv(env)
-
 	return { env, registry }
 }
 

package/src/generation-manager.ts

@@ -146,10 +146,7 @@ export class GenerationManager {
 	}
 
 	private async _doReload(): Promise<Generation> {
-		// 1. Import fresh worker module using cache-busting query string
-		const workerModule = await import(`${this.workerPath}?v=${Date.now()}`)
-
-		// 1b. Configure executor factory with module/config paths (for isolated mode)
+		// 1. Configure executor factory with module/config paths (for isolated mode)
 		if (this.executorFactory && 'configure' in this.executorFactory) {
 			;(this.executorFactory as any).configure(this.workerPath, this._configPath)
 		}
@@ -157,14 +154,19 @@ export class GenerationManager {
 		// 2. Build new env with fresh binding instances (same underlying DB)
 		const { env, registry } = buildEnv(this.config, this.baseDir, this.executorFactory, this.browserConfig)
 
-		// 3. Wire DO and Workflow class references
-		wireClassRefs(registry, workerModule, env, this.workerRegistry)
-
-		// 4. Update globalEnv for cloudflare:workers env export (main worker only)
+		// 3. Update globalEnv BEFORE importing the worker module so that
+		//    top-level `import { env } from "cloudflare:workers"` sees bindings
+		//    during module evaluation (main worker only).
 		if (this.isMain) {
 			setGlobalEnv(env)
 		}
 
+		// 4. Import fresh worker module using cache-busting query string
+		const workerModule = await import(`${this.workerPath}?v=${Date.now()}`)
+
+		// 5. Wire DO and Workflow class references
+		wireClassRefs(registry, workerModule, env, this.workerRegistry)
+
 		// 5. Validate default export (or service worker fetch handler)
 		const defaultExport = workerModule.default
 		const classBasedExport = isEntrypointClass(defaultExport)