@take-out/scripts 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@take-out/scripts",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "type": "module",
   "main": "./src/run.ts",
   "sideEffects": false,
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@clack/prompts": "^0.8.2",
-    "@take-out/helpers": "0.1.0",
+    "@take-out/helpers": "0.1.1",
     "picocolors": "^1.1.1"
   },
   "peerDependencies": {

package/src/env-update.ts

@@ -75,10 +75,13 @@ await cmd`sync environment variables from package.json to CI and server configs`
       }
 
       const envExports = Object.entries(envVars)
-        .map(
-          ([key, value]) =>
-            `export const ${key} = ensureEnv('${key}'${typeof value === 'string' ? `, ${JSON.stringify(value)}` : ''})`
-        )
+        .map(([key, value]) => {
+          // $dep: values have no compile-time default — resolved into .env at runtime
+          if (typeof value === 'string' && value.startsWith('$dep:')) {
+            return `export const ${key} = ensureEnv('${key}')`
+          }
+          return `export const ${key} = ensureEnv('${key}'${typeof value === 'string' ? `, ${JSON.stringify(value)}` : ''})`
+        })
         .join('\n')
 
       const newEnvServer = envServer.replace(

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

@@ -3,10 +3,8 @@ import { join } from 'node:path'
 
 import { loadEnv } from './env-load'
 import { getDockerHost } from './get-docker-host'
-import { getZeroVersion } from './zero-get-version'
 
 export async function getTestEnv() {
-  const zeroVersion = getZeroVersion()
   const dockerHost = getDockerHost()
   const devEnv = await loadEnv('development')
   const envPath =
@@ -31,7 +29,6 @@ export async function getTestEnv() {
       ZERO_LOG_LEVEL: 'warn',
     }),
     DO_NOT_TRACK: '1',
-    ZERO_VERSION: zeroVersion,
     ZERO_MUTATE_URL: `http://${dockerHost}:${appPort}/api/zero/push`,
     ZERO_QUERY_URL: `http://${dockerHost}:${appPort}/api/zero/pull`,
     ZERO_UPSTREAM_DB: `${dockerDbBase}/postgres`,

package/src/update-local-env.ts

@@ -5,8 +5,6 @@ import fs from 'node:fs'
 import { cmd } from './cmd'
 
 await cmd`sync auto-generated env vars to local .env file`.run(async ({ path }) => {
-  const { getZeroVersion } = await import('./helpers/zero-get-version')
-
   // skip in CI environments
   if (process.env.CI === 'true') {
     console.info('Skipping bootstrap in CI environment')
@@ -14,7 +12,6 @@ await cmd`sync auto-generated env vars to local .env file`.run(async ({ path })
   }
 
   const ENV_PATH = path.join(process.cwd(), '.env')
-  const ENV_TEMPLATE_PATH = path.join(process.cwd(), '.env.template')
   const ENV_BACKUP_PATH = path.join(process.cwd(), '.env.backup')
   const ENV_TEMP_PATH = path.join(process.cwd(), '.env.tmp')
 
@@ -22,47 +19,44 @@ await cmd`sync auto-generated env vars to local .env file`.run(async ({ path })
   const BEGIN_MARKER = '# ---- BEGIN AUTO-GENERATED (DO NOT EDIT) ----'
   const END_MARKER = '# ---- END AUTO-GENERATED ----'
 
-  function createEnvFromTemplate(): boolean {
-    if (!fs.existsSync(ENV_TEMPLATE_PATH)) {
-      console.info('No .env.template found, skipping .env creation')
-      return false
-    }
-
-    try {
-      fs.copyFileSync(ENV_TEMPLATE_PATH, ENV_PATH)
-      console.info('Created .env from .env.template')
-      return true
-    } catch (error) {
-      console.error('Failed to create .env from .env.template:', error)
-      return false
-    }
-  }
-
   function getAutoGeneratedContent(): string {
-    const zeroVersion = getZeroVersion()
-    if (!zeroVersion) {
-      console.warn('Could not determine Zero version')
+    const packageJsonPath = path.join(process.cwd(), 'package.json')
+    const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'))
+    const envVars = packageJson.env as Record<string, boolean | string>
+
+    if (!envVars || typeof envVars !== 'object') {
+      console.warn('No env section found in package.json')
       return ''
     }
 
-    const lines = [
-      BEGIN_MARKER,
-      `# Generated at: ${new Date().toISOString()}`,
-      `ZERO_VERSION=${zeroVersion}`,
-      END_MARKER,
-    ]
+    const lines: string[] = [BEGIN_MARKER, `# Generated at: ${new Date().toISOString()}`]
+
+    for (const [key, value] of Object.entries(envVars)) {
+      if (typeof value === 'string' && value.startsWith('$dep:')) {
+        // resolve version from dependency
+        const depName = value.slice('$dep:'.length)
+        const version = packageJson.dependencies?.[depName]?.replace(/^[\^~]/, '')
+        if (version) {
+          lines.push(`${key}=${version}`)
+        } else {
+          console.warn(`Could not resolve dependency version for ${depName}`)
+        }
+      } else if (typeof value === 'string' && value !== '') {
+        // non-empty string default
+        lines.push(`${key}=${value}`)
+      }
+      // skip true (required, no default) and "" (no meaningful default)
+    }
 
+    lines.push(END_MARKER)
     return lines.join('\n')
   }
 
   function updateEnvFile(): void {
     // ensure .env exists
     if (!fs.existsSync(ENV_PATH)) {
-      const created = createEnvFromTemplate()
-      if (!created && !fs.existsSync(ENV_PATH)) {
-        fs.writeFileSync(ENV_PATH, '')
-        console.info('Created empty .env file')
-      }
+      fs.writeFileSync(ENV_PATH, '')
+      console.info('Created empty .env file')
     }
 
     try {