@take-out/scripts 0.4.1 → 0.4.3-1775691786096

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@take-out/scripts",
-  "version": "0.4.1",
+  "version": "0.4.3-1775691786096",
   "type": "module",
   "main": "./src/cmd.ts",
   "sideEffects": false,
@@ -29,8 +29,8 @@
   },
   "dependencies": {
     "@clack/prompts": "^0.8.2",
-    "@take-out/helpers": "0.4.1",
-    "@take-out/run": "0.4.1",
+    "@take-out/helpers": "0.4.3-1775691786096",
+    "@take-out/run": "0.4.3-1775691786096",
     "picocolors": "^1.1.1"
   }
 }

package/src/env-update.ts

@@ -24,33 +24,27 @@ await cmd`sync environment variables from src/env.ts to matching files`
   .run(async ({ args }) => {
     // import env var definitions from src/env.ts (the single source of truth)
     const envModule = await import(path.resolve('src/env.ts'))
-    const envVars = envModule.envVars as Record<string, string | symbol>
-    const envDeps = (envModule.envDeps || {}) as Record<string, string>
+    const production = envModule.production as Record<string, string | symbol>
+    const versions = (envModule.versions || {}) as Record<string, string>
 
-    if (!envVars || typeof envVars !== 'object') {
-      console.error('no envVars export found in src/env.ts')
+    if (!production || typeof production !== 'object') {
+      console.error('no production export found in src/env.ts')
       process.exit(1)
     }
 
     // the expected symbol from @take-out/env
     const expectedSymbol = Symbol.for('take-out/env/expected')
 
-    // resolve dep versions from package.json dependencies
+    // merge resolved versions into the var registry
     const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf-8'))
-    const depResolved: Record<string, string> = {}
-    for (const [key, depName] of Object.entries(envDeps)) {
-      const version = packageJson.dependencies?.[depName]?.replace(/^[\^~]/, '')
-      if (version) {
-        depResolved[key] = version
-        // add dep-resolved vars to envVars with resolved value
-        envVars[key] = version
-      }
+    const depResolved = { ...versions }
+    for (const [key, value] of Object.entries(versions)) {
+      production[key] = value
     }
 
-    // normalize envVars: expected symbol → true (required), string → string
-    // for compatibility with strategy functions
+    // normalize: expected symbol → required, string → defaultValue
     type EnvEntry = { key: string; required: boolean; defaultValue: string }
-    const entries: EnvEntry[] = Object.entries(envVars)
+    const entries: EnvEntry[] = Object.entries(production)
       .map(([key, value]) => ({
         key,
         required: value === expectedSymbol,

package/src/helpers/env-load.ts

@@ -9,9 +9,25 @@ export async function loadEnv(
   // loads env into process.env
   await vxrnLoadEnv(environment)
 
-  // import src/env.ts to get the env config applied (side effect: populates process.env)
-  const envModule = await import(join(process.cwd(), 'src/env.ts'))
-  const Environment = envModule.server || {}
+  const previousMode = process.env.TAKEOUT_ENV_MODE
+  if (environment === 'development' || environment === 'production') {
+    process.env.TAKEOUT_ENV_MODE = environment
+  } else {
+    delete process.env.TAKEOUT_ENV_MODE
+  }
+
+  let Environment: Record<string, string>
+  try {
+    // import src/env.ts to get the env config applied (side effect: populates process.env)
+    const envModule = await import(join(process.cwd(), 'src/env.ts'))
+    Environment = envModule.server || {}
+  } finally {
+    if (previousMode === undefined) {
+      delete process.env.TAKEOUT_ENV_MODE
+    } else {
+      process.env.TAKEOUT_ENV_MODE = previousMode
+    }
+  }
 
   // validate
   for (const key in Environment) {

package/src/helpers/get-test-env.ts

@@ -22,6 +22,10 @@ export async function getTestEnv() {
     ...serverEnvFallback,
     ...devEnv,
     CI: 'true',
+    // Child test processes may import src/env.ts directly. Keep them pinned to
+    // development mode even when the parent release flow started from
+    // production-flavored env.
+    TAKEOUT_ENV_MODE: 'development',
     ...(!process.env.DEBUG_BACKEND && {
       ZERO_LOG_LEVEL: 'warn',
     }),