@springbrand/space 0.2.0-alpha.14 → 0.2.0-alpha.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@springbrand/space",
-  "version": "0.2.0-alpha.14",
+  "version": "0.2.0-alpha.16",
   "type": "module",
   "files": [
     "src",
@@ -10,28 +10,21 @@
     "access": "public"
   },
   "exports": {
-    ".": "./src/index.ts",
-    "./deployment-contract": "./src/space/deployment-contract.ts",
-    "./deploy-engine": "./src/space/deploy-engine.ts",
-    "./lazy-space-do": "./src/space/durable-object.ts",
-    "./preview-headers": "./src/space/preview-headers.ts"
+    ".": "./src/index.ts"
   },
   "dependencies": {
     "@cloudflare/shell": "0.4.3",
-    "@cloudflare/worker-bundler": "0.0.4",
+    "@cloudflare/worker-bundler": "0.2.3",
     "isomorphic-git": "1.38.6"
   },
   "devDependencies": {
     "@cloudflare/vitest-pool-workers": "^0.20.1",
     "@cloudflare/workers-types": "^4.20251008.0",
-    "esbuild": "0.28.1",
     "typescript": "^7.0.2",
     "vitest": "^4.1.10"
   },
   "scripts": {
-    "build": "node build.mjs",
     "check": "tsc --noEmit",
-    "pretest": "pnpm build",
     "test": "vitest run"
   }
 }

package/src/index.ts

@@ -1,5 +1,5 @@
 // ── Durable Object classes ────────────────────────────────────────
-export { SpaceDO } from "./space/default-durable-object";
+export { SpaceDO } from "./space/durable-object";
 
 // ── RPC surface ───────────────────────────────────────────────────
 export type {
@@ -22,14 +22,14 @@ export { SPACE_RESERVED_PREFIXES } from "./space/durable-object";
 export {
   deploymentRuntimeConfigSource,
   RUNTIME_CONFIG_ASSET_PATH,
-} from "./space/deployment-contract";
+} from "./space/deploy-engine";
 export type {
   BranchDeploymentBundle,
   DeploymentAsset,
   DeploymentBundle,
   DeploymentRuntimeConfig,
   SpaceDeploymentResult,
-} from "./space/deployment-contract";
+} from "./space/deploy-engine";
 
 // ── Preview hardening ─────────────────────────────────────────────
 export { stripPreviewSecurityHeaders, STRIPPED_PREVIEW_HEADERS } from "./space/preview-headers";

package/src/space/deploy-engine.ts

@@ -1,3 +1,5 @@
+import type { Git } from "@cloudflare/shell/git"
+import type { FileSystem } from "@cloudflare/shell"
 import {
   createWorker,
   inferContentType,
@@ -5,15 +7,6 @@ import {
   type AssetConfig,
   type Modules,
 } from "@cloudflare/worker-bundler"
-import {
-  deploymentRuntimeConfigSource,
-  RUNTIME_CONFIG_ASSET_PATH,
-  type BranchDeploymentBundle,
-  type DeployContext,
-  type DeploymentAsset,
-  type DeploymentRuntimeConfig,
-  type SpaceDeploymentResult,
-} from "./deployment-contract"
 import { globInfos } from "./fileinfo"
 import {
   parseWranglerConfig,
@@ -21,17 +14,6 @@ import {
   WranglerConfigError,
 } from "./wrangler-config"
 
-export {
-  deploymentRuntimeConfigSource,
-  RUNTIME_CONFIG_ASSET_PATH,
-  type BranchDeploymentBundle,
-  type DeployContext,
-  type DeploymentAsset,
-  type DeploymentBundle,
-  type DeploymentRuntimeConfig,
-  type SpaceDeploymentResult,
-} from "./deployment-contract"
-
 // ─── Deploy Engine ──────────────────────────────────────────────────────────
 
 /** Shared JSON response helper for the internal deploy command handlers. */
@@ -42,6 +24,53 @@ function jsonResponse(data: unknown, status: number = 200): Response {
   })
 }
 
+export interface DeployContext {
+  sql: SqlStorage
+  git: Git
+  fs: FileSystem
+  assetBucket?: R2Bucket
+  assetPrefix?: string
+}
+
+export interface DeploymentBundle {
+  branch: string
+  commitHash: string
+  workerModules: {
+    mainModule: string
+    modules: Record<string, string | Record<string, unknown>>
+    compatibilityDate: string
+  }
+  staticAssets: DeploymentAsset[]
+  assetConfig: AssetConfig | undefined
+  runtimeConfig: DeploymentRuntimeConfig | undefined
+}
+
+export type BranchDeploymentBundle = DeploymentBundle
+
+export interface DeploymentRuntimeConfig {
+  apiBaseUrl: string
+}
+
+export interface SpaceDeploymentResult {
+  branch: string
+  commit_hash: string
+  main_module: string
+  has_assets: boolean
+  compatibility_date: string
+  deployed_at: string
+  asset_root: string | null
+}
+
+export const RUNTIME_CONFIG_ASSET_PATH = "/.springbrand/runtime-config.js"
+
+export interface DeploymentAsset {
+  path: string
+  sourcePath: string | null
+  contentType: string | undefined
+  etag: string
+  size: number
+}
+
 type AssetWriter = (
   asset: Omit<DeploymentAsset, "etag">,
   bytes: Uint8Array,
@@ -407,6 +436,10 @@ function normalizeRuntimeConfig(
   return { apiBaseUrl: url.toString() }
 }
 
+export function deploymentRuntimeConfigSource(config: DeploymentRuntimeConfig): string {
+  return `globalThis.__APP_CONFIG__=Object.freeze(${JSON.stringify(config)});`
+}
+
 async function buildWebsite(
   sourceFiles: Record<string, string>,
   config: ParsedWranglerConfig,

package/src/space/durable-object.ts

@@ -2,12 +2,14 @@ import { DurableObject } from "cloudflare:workers"
 import { type FileSystem, type FileInfo } from "@cloudflare/shell"
 import { type Git, type GitLogEntry, type GitStatusEntry } from "@cloudflare/shell/git"
 import type { Env } from "../env"
-import type {
-  BranchDeploymentBundle,
-  DeploymentRuntimeConfig,
-  DeployContext,
-  SpaceDeploymentResult,
-} from "./deployment-contract"
+import {
+  buildBranchDeployment,
+  handleDeployCommand,
+  type BranchDeploymentBundle,
+  type DeploymentRuntimeConfig,
+  type DeployContext,
+  type SpaceDeploymentResult,
+} from "./deploy-engine"
 import { globInfos, readDirInfos, toFileInfo } from "./fileinfo"
 import {
   buildInspectorWrapperSource,
@@ -59,9 +61,6 @@ export type {
 /** The complete capability a host holds over one Space. */
 export type SpaceStub = SpaceWorkspacePort & SpaceControlPort & SpaceAppPort
 
-export type DeployEngine = typeof import("@springbrand/space/deploy-engine")
-export type DeployEngineLoader = () => Promise<DeployEngine>
-
 // ─── Inspector result types ────────────────────────────────────────────────
 // These mirror the shapes returned by the wrapper-subclass injected into
 // the dynamic worker (see `inspector-wrapper.ts`). Re-exported at the
@@ -111,7 +110,7 @@ const isReservedPath = isReservedSpacePath
 // Commits/deploys are mirrored to a per-app Cloudflare Artifacts repo
 // (see artifacts-sync.ts), which is the durable source of truth for history.
 
-export abstract class SpaceDOBase extends DurableObject<Env>
+export class SpaceDO extends DurableObject<Env>
   implements SpaceWorkspacePort, SpaceControlPort, SpaceAppPort {
   private backend!: SpaceFsBackend
   private initializationPromise: Promise<void> | null = null
@@ -134,8 +133,6 @@ export abstract class SpaceDOBase extends DurableObject<Env>
     super(ctx, env)
   }
 
-  protected abstract loadDeployEngine(): Promise<DeployEngine>
-
   private async flushCheckpoint(): Promise<void> {
     await this.backend.flushCheckpoint()
   }
@@ -1113,7 +1110,6 @@ export abstract class SpaceDOBase extends DurableObject<Env>
   ): Promise<SpaceDeploymentResult> {
     await this.ensureInit()
     return this.lane(async () => {
-      const { handleDeployCommand } = await this.loadDeployEngine()
       // The deploy engine reads the full branch tree, so ensure the Artifacts
       // base is materialized into the overlay first.
       await this.materializeAll()
@@ -1153,7 +1149,6 @@ export abstract class SpaceDOBase extends DurableObject<Env>
   ): Promise<BranchDeploymentBundle> {
     await this.ensureInit()
     await this.materializeAll()
-    const { buildBranchDeployment } = await this.loadDeployEngine()
     return buildBranchDeployment(
       {
         sql: this.ctx.storage.sql,
@@ -1170,7 +1165,6 @@ export abstract class SpaceDOBase extends DurableObject<Env>
 
   async undeploy(branch: string): Promise<unknown> {
     await this.ensureInit()
-    const { handleDeployCommand } = await this.loadDeployEngine()
     const fakeRequest = new Request("http://internal/?cmd=undeploy", {
       method: "POST",
       headers: { "Content-Type": "application/json" },
@@ -1189,7 +1183,6 @@ export abstract class SpaceDOBase extends DurableObject<Env>
 
   async listDeployments(): Promise<unknown> {
     await this.ensureInit()
-    const { handleDeployCommand } = await this.loadDeployEngine()
     const fakeRequest = new Request("http://internal/?cmd=list_deployments")
     const ctx: DeployContext = {
       sql: this.ctx.storage.sql,
@@ -1202,7 +1195,6 @@ export abstract class SpaceDOBase extends DurableObject<Env>
 
   async getDeployment(branch: string): Promise<unknown> {
     await this.ensureInit()
-    const { handleDeployCommand } = await this.loadDeployEngine()
     const fakeRequest = new Request(`http://internal/?cmd=get_deployment&branch=${encodeURIComponent(branch)}`)
     const ctx: DeployContext = {
       sql: this.ctx.storage.sql,
@@ -1400,7 +1392,6 @@ export abstract class SpaceDOBase extends DurableObject<Env>
 
     const cmd = new URL(request.url).searchParams.get("cmd")
     if (cmd && ["deploy", "get_deployment", "list_deployments", "undeploy"].includes(cmd)) {
-      const { handleDeployCommand } = await this.loadDeployEngine()
       const deployCtx: DeployContext = {
         sql: this.ctx.storage.sql,
         git: this.git,
@@ -1415,14 +1406,6 @@ export abstract class SpaceDOBase extends DurableObject<Env>
   }
 }
 
-export function createSpaceDO(loadDeployEngine: DeployEngineLoader): typeof SpaceDOBase {
-  return class SpaceDO extends SpaceDOBase {
-    protected loadDeployEngine(): Promise<DeployEngine> {
-      return loadDeployEngine()
-    }
-  }
-}
-
 // ─── Facet naming ───────────────────────────────────────────────────────────
 
 function facetNameForApp(branch: string): string {

package/src/space/workspace-port.ts

@@ -2,7 +2,7 @@ import type {
   BranchDeploymentBundle,
   DeploymentRuntimeConfig,
   SpaceDeploymentResult,
-} from "./deployment-contract";
+} from "./deploy-engine";
 
 /**
  * The production Workspace contract a Space must satisfy.

package/src/space/default-durable-object.ts

@@ -1,13 +0,0 @@
-import {
-  createSpaceDO,
-  type DeployEngine,
-} from "./durable-object"
-
-let deployEnginePromise: Promise<DeployEngine> | undefined
-
-const DefaultSpaceDO = createSpaceDO(
-  () => deployEnginePromise ??= import("@springbrand/space/deploy-engine"),
-)
-
-export const SpaceDO = DefaultSpaceDO
-export type SpaceDO = InstanceType<typeof DefaultSpaceDO>

package/src/space/deployment-contract.ts

@@ -1,54 +0,0 @@
-import type { FileSystem } from "@cloudflare/shell"
-import type { Git } from "@cloudflare/shell/git"
-import type { AssetConfig } from "@cloudflare/worker-bundler"
-
-export interface DeployContext {
-  sql: SqlStorage
-  git: Git
-  fs: FileSystem
-  assetBucket?: R2Bucket
-  assetPrefix?: string
-}
-
-export interface DeploymentBundle {
-  branch: string
-  commitHash: string
-  workerModules: {
-    mainModule: string
-    modules: Record<string, string | Record<string, unknown>>
-    compatibilityDate: string
-  }
-  staticAssets: DeploymentAsset[]
-  assetConfig: AssetConfig | undefined
-  runtimeConfig: DeploymentRuntimeConfig | undefined
-}
-
-export type BranchDeploymentBundle = DeploymentBundle
-
-export interface DeploymentRuntimeConfig {
-  apiBaseUrl: string
-}
-
-export interface SpaceDeploymentResult {
-  branch: string
-  commit_hash: string
-  main_module: string
-  has_assets: boolean
-  compatibility_date: string
-  deployed_at: string
-  asset_root: string | null
-}
-
-export interface DeploymentAsset {
-  path: string
-  sourcePath: string | null
-  contentType: string | undefined
-  etag: string
-  size: number
-}
-
-export const RUNTIME_CONFIG_ASSET_PATH = "/.springbrand/runtime-config.js"
-
-export function deploymentRuntimeConfigSource(config: DeploymentRuntimeConfig): string {
-  return `globalThis.__APP_CONFIG__=Object.freeze(${JSON.stringify(config)});`
-}

package/src/space/runtime/deploy-engine.d.ts

@@ -1 +0,0 @@
-export * from "@springbrand/space/deploy-engine"