@smoothbricks/cli 0.10.9 → 0.10.10

package/src/wrangler/{deploy-environment.ts → deploy-stage.ts}

@@ -4,19 +4,19 @@ import { readFile, rm, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import typia from 'typia';
 import { type CloudflareClient, CloudflareRestClient } from './cloudflare.js';
+import { parseDevVarsExample } from './prepare-env.js';
 import {
-  type ConfiguredEnvironmentResourcePlan,
+  type ConfiguredStageResourcePlan,
+  type DeploymentStage,
   derivePullRequestWranglerConfig,
-  type EnvironmentToken,
-  environmentResourceName,
-  hasExactEnvironmentSegment,
-  isPullRequestEnvironment,
-  parseEnvironmentToken,
-  planConfiguredEnvironmentResources,
+  hasExactStageSegment,
+  isPullRequestStage,
+  parseDeploymentStage,
+  planConfiguredStageResources,
   planPullRequestResources,
-  pullRequestEnvironment,
-} from './environment.js';
-import { parseDevVarsExample } from './prepare-env.js';
+  pullRequestStage,
+  stageResourceName,
+} from './stage.js';
 
 export interface ProcessResult {
   exitCode: number;
@@ -56,8 +56,8 @@ export interface WranglerCommandDependencies {
   processEnv?: NodeJS.ProcessEnv;
 }
 
-export interface DeployEnvironmentResult {
-  environment: EnvironmentToken;
+export interface DeployStageResult {
+  stage: DeploymentStage;
   workerName: string;
   action: 'deployed' | 'activated' | 'remote-cache-hit';
   versionTag?: string;
@@ -65,12 +65,12 @@ export interface DeployEnvironmentResult {
 
 const isUnknownRecord = typia.createIs<Record<string, unknown>>();
 
-export async function deployEnvironment(
+export async function deployStage(
   cwd: string,
-  environmentValue: string,
+  stageValue: string,
   dependencies: WranglerCommandDependencies = {},
-): Promise<DeployEnvironmentResult> {
-  const environment = parseEnvironmentToken(environmentValue);
+): Promise<DeployStageResult> {
+  const stage = parseDeploymentStage(stageValue);
   const processEnv = dependencies.processEnv ?? process.env;
   const accountId = processEnv.CLOUDFLARE_ACCOUNT_ID;
   const apiToken = processEnv.CLOUDFLARE_API_TOKEN;
@@ -92,12 +92,12 @@ export async function deployEnvironment(
   let temporaryConfigPath: string | undefined;
   let temporarySecretsPath: string | undefined;
   try {
-    if (isPullRequestEnvironment(environment)) {
-      const staging = planConfiguredEnvironmentResources(committedToml, 'staging');
+    if (isPullRequestStage(stage)) {
+      const staging = planConfiguredStageResources(committedToml, 'staging');
       if (!staging.workerName.endsWith('-staging')) {
         throw new Error('[env.staging].name must end with the exact suffix -staging.');
       }
-      const workerName = environmentResourceName(staging.workerName.slice(0, -'-staging'.length), environment);
+      const workerName = stageResourceName(staging.workerName.slice(0, -'-staging'.length), stage);
       const firstDeployment = !(await cloudflare.listWorkerScripts()).some((script) => script.id === workerName);
       if (firstDeployment && missingSecrets.length > 0) {
         throw new Error(
@@ -105,7 +105,7 @@ export async function deployEnvironment(
         );
       }
       const liveNamespaces = await cloudflare.listKvNamespaces();
-      const plan = planPullRequestResources(committedToml, environment, liveNamespaces);
+      const plan = planPullRequestResources(committedToml, stage, liveNamespaces);
       const derivedIds = new Map<string, string>();
       const byTitle = new Map(liveNamespaces.map((namespace) => [namespace.title, namespace]));
       for (const namespace of plan.kvNamespaces) {
@@ -122,7 +122,7 @@ export async function deployEnvironment(
         derivedIds.set(namespace.stagingId, live.id);
       }
       const derivedToml = derivePullRequestWranglerConfig(committedToml, {
-        environment,
+        stage: stage,
         accountId,
         kvNamespaceIds: derivedIds,
       });
@@ -132,10 +132,10 @@ export async function deployEnvironment(
     }
 
     const toml = configPath === committedConfigPath ? committedToml : await readFile(configPath, 'utf8');
-    const plan = planConfiguredEnvironmentResources(toml, environment);
-    const workerExists = await reconcileEnvironmentResources(plan, cloudflare);
+    const plan = planConfiguredStageResources(toml, stage);
+    const workerExists = await reconcileStageResources(plan, cloudflare);
     const versionTag = nxTaskVersionTag(processEnv);
-    const commandContext = { cwd, configPath, environment, workerName: plan.workerName };
+    const commandContext = { cwd, configPath, stage, workerName: plan.workerName };
 
     if (versionTag && workerExists) {
       const versions = await wranglerJson(runner, ['versions', 'list', '--name', plan.workerName, '--json'], cwd);
@@ -146,7 +146,7 @@ export async function deployEnvironment(
       );
       const versionId = findVersionIdByTag(versions, versionTag);
       if (versionId && isFullCurrentDeployment(deployments, versionId)) {
-        return { environment, workerName: plan.workerName, action: 'remote-cache-hit', versionTag };
+        return { stage, workerName: plan.workerName, action: 'remote-cache-hit', versionTag };
       }
       if (versionId) {
         await wrangler(
@@ -161,16 +161,16 @@ export async function deployEnvironment(
             '--config',
             configPath,
             '--env',
-            environment,
+            stage,
             '--yes',
           ],
           cwd,
         );
-        return { environment, workerName: plan.workerName, action: 'activated', versionTag };
+        return { stage, workerName: plan.workerName, action: 'activated', versionTag };
       }
     }
 
-    const deployArgs = ['deploy', '--config', commandContext.configPath, '--env', commandContext.environment];
+    const deployArgs = ['deploy', '--config', commandContext.configPath, '--env', commandContext.stage];
     if (versionTag) deployArgs.push('--tag', versionTag);
     if (Object.keys(secretValues).length > 0) {
       temporarySecretsPath = join(cwd, `.wrangler-secrets.smoo-${process.pid}-${randomUUID()}.json`);
@@ -179,7 +179,7 @@ export async function deployEnvironment(
     }
     await wrangler(runner, deployArgs, cwd);
     return {
-      environment,
+      stage,
       workerName: commandContext.workerName,
       action: 'deployed',
       ...(versionTag ? { versionTag } : {}),
@@ -194,7 +194,7 @@ export async function deployEnvironment(
   }
 }
 export interface CleanupResult {
-  environment: `pr${number}`;
+  stage: `pr${number}`;
   deleted: {
     workers: number;
     routes: number;
@@ -211,7 +211,7 @@ export async function cleanupPullRequest(
   prNumber: number,
   dependencies: WranglerCommandDependencies = {},
 ): Promise<CleanupResult> {
-  const environment = pullRequestEnvironment(prNumber);
+  const stage = pullRequestStage(prNumber);
   const processEnv = dependencies.processEnv ?? process.env;
   const cloudflare =
     dependencies.cloudflare ??
@@ -231,36 +231,36 @@ export async function cleanupPullRequest(
   };
 
   for (const domain of await cloudflare.listWorkerDomains()) {
-    if (!hasExactEnvironmentSegment(domain.hostname, environment)) continue;
+    if (!hasExactStageSegment(domain.hostname, stage)) continue;
     await cloudflare.deleteWorkerDomain(domain.id);
     deleted.domains += 1;
   }
 
   for (const zone of await cloudflare.listZones()) {
     for (const route of await cloudflare.listWorkerRoutes(zone.id)) {
-      if (!hasExactEnvironmentSegment(route.pattern, environment)) continue;
+      if (!hasExactStageSegment(route.pattern, stage)) continue;
       await cloudflare.deleteWorkerRoute(zone.id, route.id);
       deleted.routes += 1;
     }
     for (const record of await cloudflare.listDnsRecords(zone.id)) {
-      if (!hasExactEnvironmentSegment(record.name, environment)) continue;
+      if (!hasExactStageSegment(record.name, stage)) continue;
       await cloudflare.deleteDnsRecord(zone.id, record.id);
       deleted.dnsRecords += 1;
     }
   }
 
   for (const script of await cloudflare.listWorkerScripts()) {
-    if (!hasExactEnvironmentSegment(script.id, environment)) continue;
+    if (!hasExactStageSegment(script.id, stage)) continue;
     await cloudflare.deleteWorkerScript(script.id);
     deleted.workers += 1;
   }
   for (const namespace of await cloudflare.listKvNamespaces()) {
-    if (!hasExactEnvironmentSegment(namespace.title, environment)) continue;
+    if (!hasExactStageSegment(namespace.title, stage)) continue;
     await cloudflare.deleteKvNamespace(namespace.id);
     deleted.kvNamespaces += 1;
   }
   for (const bucket of await cloudflare.listR2Buckets()) {
-    if (!hasExactEnvironmentSegment(bucket.name, environment)) continue;
+    if (!hasExactStageSegment(bucket.name, stage)) continue;
     for (const key of await cloudflare.listR2Objects(bucket.name)) {
       await cloudflare.deleteR2Object(bucket.name, key);
       deleted.r2Objects += 1;
@@ -268,11 +268,11 @@ export async function cleanupPullRequest(
     await cloudflare.deleteR2Bucket(bucket.name);
     deleted.r2Buckets += 1;
   }
-  return { environment, deleted };
+  return { stage, deleted };
 }
 
-async function reconcileEnvironmentResources(
-  plan: ConfiguredEnvironmentResourcePlan,
+async function reconcileStageResources(
+  plan: ConfiguredStageResourcePlan,
   cloudflare: CloudflareClient,
 ): Promise<boolean> {
   const namespaces = await cloudflare.listKvNamespaces();
@@ -364,7 +364,7 @@ export function nxTaskVersionTag(environment: NodeJS.ProcessEnv): string | undef
     environment.NX_TASK_TARGET_PROJECT !== undefined ||
     environment.NX_TASK_TARGET_TARGET !== undefined;
   if (!underNx) return undefined;
-  if (!hash) throw new Error('NX_TASK_HASH is required when deploy-environment runs under Nx.');
+  if (!hash) throw new Error('NX_TASK_HASH is required when deploy-stage runs under Nx.');
   if (/^(?:0|[1-9][0-9]*)$/.test(hash)) {
     return `nx-${hash}`;
   }

package/src/wrangler/{environment.test.ts → stage.test.ts}

@@ -1,12 +1,12 @@
 import { describe, expect, it } from 'bun:test';
 import {
   derivePullRequestWranglerConfig,
-  environmentDomain,
-  environmentResourceName,
   planPullRequestResources,
-  pullRequestEnvironment,
+  pullRequestStage,
   rateLimitNamespaceId,
-} from './environment.js';
+  stageDomain,
+  stageResourceName,
+} from './stage.js';
 
 const APP_FIXTURE = `name = "conloca-app"
 compatibility_date = "2026-05-06"
@@ -103,21 +103,21 @@ const DERIVED_IDS = new Map([
   ['kv-mail-staging-id', 'kv-mail-pr123-id'],
 ]);
 
-describe('Wrangler environment convention', () => {
+describe('Wrangler deployment stage convention', () => {
   it('validates pull-request numbers and derives generic names', () => {
-    expect(pullRequestEnvironment(123)).toBe('pr123');
-    expect(() => pullRequestEnvironment(0)).toThrow(/1 through 999999999/);
-    expect(() => pullRequestEnvironment(1.5)).toThrow(/integer/);
-    expect(() => pullRequestEnvironment(1_000_000_000)).toThrow(/1 through 999999999/);
-    expect(environmentDomain('pr123', 'conloca.com')).toBe('pr123.conloca.com');
-    expect(environmentDomain('production', 'conloca.com')).toBe('conloca.com');
-    expect(environmentResourceName('conloca-app', 'staging')).toBe('conloca-app-staging');
-    expect(environmentResourceName('conloca-app', 'production')).toBe('conloca-app');
+    expect(pullRequestStage(123)).toBe('pr123');
+    expect(() => pullRequestStage(0)).toThrow(/1 through 999999999/);
+    expect(() => pullRequestStage(1.5)).toThrow(/integer/);
+    expect(() => pullRequestStage(1_000_000_000)).toThrow(/1 through 999999999/);
+    expect(stageDomain('pr123', 'conloca.com')).toBe('pr123.conloca.com');
+    expect(stageDomain('production', 'conloca.com')).toBe('conloca.com');
+    expect(stageResourceName('conloca-app', 'staging')).toBe('conloca-app-staging');
+    expect(stageResourceName('conloca-app', 'production')).toBe('conloca-app');
   });
 
   it('derives the app staging block without changing inherited/static semantics', () => {
     const derived = derivePullRequestWranglerConfig(APP_FIXTURE, {
-      environment: 'pr123',
+      stage: 'pr123',
       accountId: 'account-1',
       kvNamespaceIds: new Map<string, string>(),
     });
@@ -141,7 +141,7 @@ describe('Wrangler environment convention', () => {
     expect(plan.r2Buckets).toEqual([{ binding: 'MEDIA', bucketName: 'conloca-media-pr123' }]);
 
     const derived = derivePullRequestWranglerConfig(BACKEND_FIXTURE, {
-      environment: 'pr123',
+      stage: 'pr123',
       accountId: 'account-1',
       kvNamespaceIds: DERIVED_IDS,
     });

package/src/wrangler/{environment.ts → stage.ts}

@@ -3,50 +3,50 @@ import { getStaticTOMLValue, parseTOML } from 'toml-eslint-parser';
 import typia from 'typia';
 import { cloneEnvBlock } from './prepare-env.js';
 
-export type EnvironmentToken = 'staging' | 'production' | `pr${number}`;
+export type DeploymentStage = 'staging' | 'production' | `pr${number}`;
 
 const MAX_PULL_REQUEST_NUMBER = 999_999_999;
-const ENVIRONMENT_PATTERN = /^(?:staging|production|pr[1-9][0-9]{0,8})$/;
+const STAGE_PATTERN = /^(?:staging|production|pr[1-9][0-9]{0,8})$/;
 
-export function pullRequestEnvironment(prNumber: number): `pr${number}` {
+export function pullRequestStage(prNumber: number): `pr${number}` {
   if (!Number.isInteger(prNumber) || prNumber < 1 || prNumber > MAX_PULL_REQUEST_NUMBER) {
     throw new Error(`Pull request number must be an integer from 1 through ${MAX_PULL_REQUEST_NUMBER}.`);
   }
   return `pr${prNumber}`;
 }
 
-export function parseEnvironmentToken(value: string): EnvironmentToken {
-  if (!ENVIRONMENT_PATTERN.test(value)) {
+export function parseDeploymentStage(value: string): DeploymentStage {
+  if (!STAGE_PATTERN.test(value)) {
     throw new Error(
-      'Environment must be exactly staging, production, or pr followed by an integer from 1 through 999999999.',
+      'Deployment stage must be exactly staging, production, or pr followed by an integer from 1 through 999999999.',
     );
   }
   if (value === 'staging' || value === 'production') return value;
-  return pullRequestEnvironment(Number(value.slice(2)));
+  return pullRequestStage(Number(value.slice(2)));
 }
 
-export function isPullRequestEnvironment(environment: EnvironmentToken): environment is `pr${number}` {
-  return environment.startsWith('pr');
+export function isPullRequestStage(stage: DeploymentStage): stage is `pr${number}` {
+  return stage.startsWith('pr');
 }
 
-export function environmentDomain(environment: string, zone: string): string {
-  const token = parseEnvironmentToken(environment);
+export function stageDomain(stage: string, zone: string): string {
+  const token = parseDeploymentStage(stage);
   if (!zone || zone.startsWith('.') || zone.endsWith('.')) {
     throw new Error('Zone must be a non-empty DNS name without leading or trailing dots.');
   }
   return token === 'production' ? zone : `${token}.${zone}`;
 }
 
-export function environmentResourceName(base: string, environment: string): string {
-  const token = parseEnvironmentToken(environment);
+export function stageResourceName(base: string, stage: string): string {
+  const token = parseDeploymentStage(stage);
   if (!base) {
     throw new Error('Resource base name must not be empty.');
   }
   return token === 'production' ? base : `${base}-${token}`;
 }
 
-export function hasExactEnvironmentSegment(value: string, environment: `pr${number}`): boolean {
-  const escaped = environment.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+export function hasExactStageSegment(value: string, stage: `pr${number}`): boolean {
+  const escaped = stage.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
   return new RegExp(`(?:^|[-.])${escaped}(?=$|[-.])`).test(value);
 }
 
@@ -90,32 +90,29 @@ export interface PullRequestKvResource {
 }
 
 export interface PullRequestResourcePlan {
-  environment: `pr${number}`;
+  stage: `pr${number}`;
   workerName: string;
   workerBaseName: string;
   kvNamespaces: PullRequestKvResource[];
   r2Buckets: R2Binding[];
   routes: Array<{ pattern: string; zoneName?: string; customDomain: boolean }>;
 }
-export interface ConfiguredEnvironmentResourcePlan {
-  environment: EnvironmentToken;
+export interface ConfiguredStageResourcePlan {
+  stage: DeploymentStage;
   workerName: string;
   kvNamespaces: KvBinding[];
   r2Buckets: R2Binding[];
   routes: Array<{ pattern: string; zoneName?: string; customDomain: boolean }>;
 }
 
-export function planConfiguredEnvironmentResources(
-  toml: string,
-  environment: EnvironmentToken,
-): ConfiguredEnvironmentResourcePlan {
-  const block = parseRoot(toml).env?.[environment];
+export function planConfiguredStageResources(toml: string, stage: DeploymentStage): ConfiguredStageResourcePlan {
+  const block = parseRoot(toml).env?.[stage];
   if (!isWranglerEnvironment(block)) {
-    throw new Error(`Wrangler configuration must declare [env.${environment}].`);
+    throw new Error(`Wrangler configuration must declare [env.${stage}].`);
   }
-  const workerName = requiredString(block, 'name', `[env.${environment}]`);
+  const workerName = requiredString(block, 'name', `[env.${stage}]`);
   return {
-    environment,
+    stage,
     workerName,
     kvNamespaces: readKvBindings(block.kv_namespaces),
     r2Buckets: readRows(block.r2_buckets).map((row) => {
@@ -155,10 +152,10 @@ function stagingWorkerName(staging: WranglerEnvironment): { workerName: string;
 
 export function planPullRequestResources(
   toml: string,
-  environment: `pr${number}`,
+  stage: `pr${number}`,
   liveNamespaces: LiveKvNamespace[],
 ): PullRequestResourcePlan {
-  parseEnvironmentToken(environment);
+  parseDeploymentStage(stage);
   const staging = stagingEnvironment(toml);
   const { workerBaseName } = stagingWorkerName(staging);
   const namespaceById = new Map(liveNamespaces.map((namespace) => [namespace.id, namespace]));
@@ -169,7 +166,7 @@ export function planPullRequestResources(
         `Staging KV binding ${binding} references namespace ${id}, which is absent from the account listing.`,
       );
     }
-    const title = replaceExactToken(stagingNamespace.title, 'staging', environment);
+    const title = replaceExactToken(stagingNamespace.title, 'staging', stage);
     if (title === stagingNamespace.title) {
       throw new Error(`Staging KV namespace title ${stagingNamespace.title} has no exact staging segment.`);
     }
@@ -178,20 +175,20 @@ export function planPullRequestResources(
   const r2Buckets = readRows(staging.r2_buckets).map((row) => {
     const binding = requiredString(row, 'binding', 'R2 binding');
     const stagingBucket = requiredString(row, 'bucket_name', `R2 binding ${binding}`);
-    const bucketName = replaceExactToken(stagingBucket, 'staging', environment);
+    const bucketName = replaceExactToken(stagingBucket, 'staging', stage);
     if (bucketName === stagingBucket) {
       throw new Error(`Staging R2 bucket ${stagingBucket} has no exact staging segment.`);
     }
     return { binding, bucketName };
   });
   const routes = readRows(staging.routes).map((row) => ({
-    pattern: replaceHostnameLabel(requiredString(row, 'pattern', 'route'), environment),
+    pattern: replaceHostnameLabel(requiredString(row, 'pattern', 'route'), stage),
     ...(typeof row.zone_name === 'string' ? { zoneName: row.zone_name } : {}),
     customDomain: row.custom_domain === true,
   }));
   return {
-    environment,
-    workerName: environmentResourceName(workerBaseName, environment),
+    stage,
+    workerName: stageResourceName(workerBaseName, stage),
     workerBaseName,
     kvNamespaces,
     r2Buckets,
@@ -200,20 +197,20 @@ export function planPullRequestResources(
 }
 
 export interface DerivePullRequestConfigOptions {
-  environment: `pr${number}`;
+  stage: `pr${number}`;
   accountId: string;
   kvNamespaceIds: ReadonlyMap<string, string>;
 }
 
 export function derivePullRequestWranglerConfig(toml: string, options: DerivePullRequestConfigOptions): string {
-  const environment = options.environment;
-  parseEnvironmentToken(environment);
+  const stage = options.stage;
+  parseDeploymentStage(stage);
   if (!options.accountId) {
     throw new Error('Cloudflare account id is required to derive rate-limit namespaces.');
   }
   const staging = stagingEnvironment(toml);
   const { workerBaseName } = stagingWorkerName(staging);
-  const cloned = cloneEnvBlock(toml, 'staging', environment);
+  const cloned = cloneEnvBlock(toml, 'staging', stage);
   const program = parseTOML(cloned);
   const rootValue: unknown = getStaticTOMLValue(program);
   if (!isWranglerRoot(rootValue)) {
@@ -223,7 +220,7 @@ export function derivePullRequestWranglerConfig(toml: string, options: DerivePul
   const edits: Array<{ start: number; end: number; value: string }> = [];
 
   for (const table of program.body[0].body) {
-    if (table.type !== 'TOMLTable' || table.resolvedKey[0] !== 'env' || table.resolvedKey[1] !== environment) {
+    if (table.type !== 'TOMLTable' || table.resolvedKey[0] !== 'env' || table.resolvedKey[1] !== stage) {
       continue;
     }
     const tableValue = valueAtPath(root, table.resolvedKey);
@@ -238,7 +235,7 @@ export function derivePullRequestWranglerConfig(toml: string, options: DerivePul
         tableValue,
         key,
         current,
-        environment,
+        stage,
         workerBaseName,
         options.accountId,
         options.kvNamespaceIds,
@@ -262,29 +259,29 @@ function deriveFieldValue(
   table: Record<string, unknown>,
   key: string,
   current: unknown,
-  environment: `pr${number}`,
+  stage: `pr${number}`,
   workerBaseName: string,
   accountId: string,
   kvNamespaceIds: ReadonlyMap<string, string>,
 ): unknown {
   const section = path[0];
   if (path.length === 0 && key === 'name') {
-    return environmentResourceName(workerBaseName, environment);
+    return stageResourceName(workerBaseName, stage);
   }
   if (section === 'routes' && key === 'pattern' && typeof current === 'string') {
-    return replaceHostnameLabel(current, environment);
+    return replaceHostnameLabel(current, stage);
   }
   if (section === 'vars' && typeof current === 'string') {
     if (key === 'ENVIRONMENT') {
-      return environment;
+      return stage;
     }
     if (key === 'AUTH_KEYS_INSTANCE_NAME') {
-      return replaceExactToken(current, 'staging', environment);
+      return replaceExactToken(current, 'staging', stage);
     }
-    return replaceHostnameLabel(current, environment);
+    return replaceHostnameLabel(current, stage);
   }
   if (section === 'send_email' && key === 'allowed_sender_addresses' && Array.isArray(current)) {
-    return current.map((value) => (typeof value === 'string' ? replaceHostnameLabel(value, environment) : value));
+    return current.map((value) => (typeof value === 'string' ? replaceHostnameLabel(value, stage) : value));
   }
   if (section === 'kv_namespaces' && key === 'id' && typeof current === 'string') {
     const derived = kvNamespaceIds.get(current);
@@ -294,11 +291,11 @@ function deriveFieldValue(
     return derived;
   }
   if (section === 'r2_buckets' && key === 'bucket_name' && typeof current === 'string') {
-    return replaceExactToken(current, 'staging', environment);
+    return replaceExactToken(current, 'staging', stage);
   }
   if (section === 'ratelimits' && key === 'namespace_id') {
     const bindingName = requiredString(table, 'name', 'Rate-limit binding');
-    return rateLimitNamespaceId(accountId, workerBaseName, environment, bindingName);
+    return rateLimitNamespaceId(accountId, workerBaseName, stage, bindingName);
   }
   return current;
 }
@@ -306,17 +303,17 @@ function deriveFieldValue(
 export function rateLimitNamespaceId(
   accountId: string,
   workerBaseName: string,
-  environment: string,
+  stage: string,
   bindingName: string,
 ): string {
-  const token = parseEnvironmentToken(environment);
+  const token = parseDeploymentStage(stage);
   const digest = createHash('sha256').update(`${accountId}:${workerBaseName}:${token}:${bindingName}`).digest();
   const value = digest.readUInt32BE(0) & 0x7fff_ffff;
   return String(value === 0 ? 1 : value);
 }
 
-function replaceHostnameLabel(value: string, environment: `pr${number}`): string {
-  return value.replace(/(^|[.@/])staging(?=\.)/g, `$1${environment}`);
+function replaceHostnameLabel(value: string, stage: `pr${number}`): string {
+  return value.replace(/(^|[.@/])staging(?=\.)/g, `$1${stage}`);
 }
 
 function replaceExactToken(value: string, from: string, to: string): string {

package/dist/wrangler/deploy-environment.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"deploy-environment.d.ts","sourceRoot":"","sources":["../../src/wrangler/deploy-environment.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,gBAAgB,EAAwB,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAGL,KAAK,gBAAgB,EAQtB,MAAM,kBAAkB,CAAC;AAG1B,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CACtH;AAED,qBAAa,gBAAiB,YAAW,aAAa;IAC9C,GAAG,CACP,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,GACrD,OAAO,CAAC,aAAa,CAAC,CAcxB;CACF;AAED,MAAM,WAAW,2BAA2B;IAC1C,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CAChC;AAED,MAAM,WAAW,uBAAuB;IACtC,WAAW,EAAE,gBAAgB,CAAC;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,UAAU,GAAG,WAAW,GAAG,kBAAkB,CAAC;IACtD,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAID,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,MAAM,EACX,gBAAgB,EAAE,MAAM,EACxB,YAAY,GAAE,2BAAgC,GAC7C,OAAO,CAAC,uBAAuB,CAAC,CA2HlC;AACD,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,KAAK,MAAM,EAAE,CAAC;IAC3B,OAAO,EAAE;QACP,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;QAChB,YAAY,EAAE,MAAM,CAAC;QACrB,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CACH;AAED,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,YAAY,GAAE,2BAAgC,GAC7C,OAAO,CAAC,aAAa,CAAC,CA2DxB;AAwFD,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,GAAG,SAAS,CAgBnF;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAuB7E;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAelF"}

package/dist/wrangler/environment.d.ts

@@ -1,58 +0,0 @@
-export type EnvironmentToken = 'staging' | 'production' | `pr${number}`;
-export declare function pullRequestEnvironment(prNumber: number): `pr${number}`;
-export declare function parseEnvironmentToken(value: string): EnvironmentToken;
-export declare function isPullRequestEnvironment(environment: EnvironmentToken): environment is `pr${number}`;
-export declare function environmentDomain(environment: string, zone: string): string;
-export declare function environmentResourceName(base: string, environment: string): string;
-export declare function hasExactEnvironmentSegment(value: string, environment: `pr${number}`): boolean;
-export interface KvBinding {
-    binding: string;
-    id: string;
-}
-export interface R2Binding {
-    binding: string;
-    bucketName: string;
-}
-export interface LiveKvNamespace {
-    id: string;
-    title: string;
-}
-export interface PullRequestKvResource {
-    binding: string;
-    stagingId: string;
-    stagingTitle: string;
-    title: string;
-}
-export interface PullRequestResourcePlan {
-    environment: `pr${number}`;
-    workerName: string;
-    workerBaseName: string;
-    kvNamespaces: PullRequestKvResource[];
-    r2Buckets: R2Binding[];
-    routes: Array<{
-        pattern: string;
-        zoneName?: string;
-        customDomain: boolean;
-    }>;
-}
-export interface ConfiguredEnvironmentResourcePlan {
-    environment: EnvironmentToken;
-    workerName: string;
-    kvNamespaces: KvBinding[];
-    r2Buckets: R2Binding[];
-    routes: Array<{
-        pattern: string;
-        zoneName?: string;
-        customDomain: boolean;
-    }>;
-}
-export declare function planConfiguredEnvironmentResources(toml: string, environment: EnvironmentToken): ConfiguredEnvironmentResourcePlan;
-export declare function planPullRequestResources(toml: string, environment: `pr${number}`, liveNamespaces: LiveKvNamespace[]): PullRequestResourcePlan;
-export interface DerivePullRequestConfigOptions {
-    environment: `pr${number}`;
-    accountId: string;
-    kvNamespaceIds: ReadonlyMap<string, string>;
-}
-export declare function derivePullRequestWranglerConfig(toml: string, options: DerivePullRequestConfigOptions): string;
-export declare function rateLimitNamespaceId(accountId: string, workerBaseName: string, environment: string, bindingName: string): string;
-//# sourceMappingURL=environment.d.ts.map

package/dist/wrangler/environment.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../src/wrangler/environment.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,gBAAgB,GAAG,SAAS,GAAG,YAAY,GAAG,KAAK,MAAM,EAAE,CAAC;AAKxE,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,CAKtE;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAQrE;AAED,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,gBAAgB,GAAG,WAAW,IAAI,KAAK,MAAM,EAAE,CAEpG;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAM3E;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAMjF;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,MAAM,EAAE,GAAG,OAAO,CAG7F;AAgBD,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,EAAE,EAAE,MAAM,CAAC;CACZ;AACD,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB;AAMD,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,uBAAuB;IACtC,WAAW,EAAE,KAAK,MAAM,EAAE,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,qBAAqB,EAAE,CAAC;IACtC,SAAS,EAAE,SAAS,EAAE,CAAC;IACvB,MAAM,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;CAC9E;AACD,MAAM,WAAW,iCAAiC;IAChD,WAAW,EAAE,gBAAgB,CAAC;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,SAAS,EAAE,CAAC;IAC1B,SAAS,EAAE,SAAS,EAAE,CAAC;IACvB,MAAM,EAAE,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;CAC9E;AAED,wBAAgB,kCAAkC,CAChD,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,gBAAgB,GAC5B,iCAAiC,CAoBnC;AAyBD,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,KAAK,MAAM,EAAE,EAC1B,cAAc,EAAE,eAAe,EAAE,GAChC,uBAAuB,CAwCzB;AAED,MAAM,WAAW,8BAA8B;IAC7C,WAAW,EAAE,KAAK,MAAM,EAAE,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7C;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,8BAA8B,GAAG,MAAM,CAkD7G;AAgDD,wBAAgB,oBAAoB,CAClC,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,MAAM,CAKR"}