@take-out/scripts 0.2.6 → 0.2.7

package/package.json

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

package/src/env-update.ts

@@ -146,6 +146,11 @@ await cmd`sync environment variables from package.json to matching files`
       files.push(...expandPattern(p))
     }
 
+    // ensure .env is always processed (may not exist yet for fresh projects)
+    if (!files.includes('.env')) {
+      files.push('.env')
+    }
+
     // markers
     const markerStart = '🔒 start - this is generated by "bun env:update"'
     const markerEnd = '🔒 end - this is generated by "bun env:update"'
@@ -154,7 +159,16 @@ await cmd`sync environment variables from package.json to matching files`
     const jsStart = `// ${markerStart}`
     const jsEnd = `// ${markerEnd}`
 
-    type Strategy = 'yaml-markers' | 'js-markers' | 'dotenv-inline' | 'ts-inline'
+    // .env auto-generated section markers
+    const dotenvSectionStart = '# ---- BEGIN AUTO-GENERATED (DO NOT EDIT) ----'
+    const dotenvSectionEnd = '# ---- END AUTO-GENERATED ----'
+
+    type Strategy =
+      | 'yaml-markers'
+      | 'js-markers'
+      | 'dotenv-section'
+      | 'dotenv-inline'
+      | 'ts-inline'
 
     function detectStrategy(filePath: string, content: string): Strategy | null {
       if (content.includes(yamlStart) && content.includes(yamlEnd)) {
@@ -163,7 +177,11 @@ await cmd`sync environment variables from package.json to matching files`
       if (content.includes(jsStart) && content.includes(jsEnd)) {
         return 'js-markers'
       }
-      if (/^\.env/.test(path.basename(filePath))) {
+      const basename = path.basename(filePath)
+      if (basename === '.env') {
+        return 'dotenv-section'
+      }
+      if (/^\.env/.test(basename)) {
         return 'dotenv-inline'
       }
       if (filePath.endsWith('.ts') && Object.keys(depResolved).length > 0) {
@@ -234,6 +252,39 @@ await cmd`sync environment variables from package.json to matching files`
       return replaceMarkerSection(content, jsStart, jsEnd, envExports)
     }
 
+    function applyDotenvSection(_filePath: string, content: string): string {
+      const lines: string[] = [dotenvSectionStart]
+
+      for (const [key, value] of Object.entries(envVars)) {
+        const dep = resolveDepVersion(value, packageJson.dependencies)
+        if (dep) {
+          lines.push(`${key}=${dep}`)
+        } else if (typeof value === 'string' && value.startsWith('$dep:')) {
+          console.warn(
+            `could not resolve dependency version for ${value.slice('$dep:'.length)}`
+          )
+        } else if (typeof value === 'string' && value !== '') {
+          lines.push(`${key}=${value}`)
+        }
+      }
+
+      lines.push(dotenvSectionEnd)
+      const section = lines.join('\n')
+
+      const beginIndex = content.indexOf(dotenvSectionStart)
+      const endIndex = content.indexOf(dotenvSectionEnd)
+
+      if (beginIndex !== -1 && endIndex !== -1 && endIndex > beginIndex) {
+        const before = content.substring(0, beginIndex).trimEnd()
+        const after = content.substring(endIndex + dotenvSectionEnd.length).trimStart()
+        return [before, section, after].filter(Boolean).join('\n\n')
+      }
+
+      // no existing section — append
+      const trimmed = content.trimEnd()
+      return trimmed ? `${trimmed}\n\n${section}` : section
+    }
+
     function applyDotenvInline(_filePath: string, content: string): string {
       let result = content
       for (const [key, value] of Object.entries(depResolved)) {
@@ -261,6 +312,7 @@ await cmd`sync environment variables from package.json to matching files`
     const strategies: Record<Strategy, (filePath: string, content: string) => string> = {
       'yaml-markers': applyYamlMarkers,
       'js-markers': applyJsMarkers,
+      'dotenv-section': applyDotenvSection,
       'dotenv-inline': applyDotenvInline,
       'ts-inline': applyTsInline,
     }
@@ -272,7 +324,12 @@ await cmd`sync environment variables from package.json to matching files`
       try {
         content = fs.readFileSync(filePath, 'utf-8')
       } catch {
-        continue
+        // allow .env to be created from scratch
+        if (path.basename(filePath) === '.env') {
+          content = ''
+        } else {
+          continue
+        }
       }
 
       const strategy = detectStrategy(filePath, content)

package/src/up.ts

@@ -426,10 +426,14 @@ await cmd`upgrade packages by name or pattern`
 
     await updatePackages(packagesByWorkspace, rootDir, packageJsonFiles)
 
-    // special handling for zero - update ZERO_VERSION in .env
-    if (packagePatterns.includes('@rocicorp/zero')) {
-      console.info('\n🔄 Updating local env for Zero...')
-      await $`bun tko run generate-env`
+    // sync resolved $dep: values (like ZERO_VERSION) to all env targets
+    if (
+      Object.values(packageJson.env || {}).some(
+        (v: any) => typeof v === 'string' && v.startsWith('$dep:')
+      )
+    ) {
+      console.info('\n🔄 Syncing env variables...')
+      await $`bun tko run env-update`
     }
 
     console.info('\n🎉 Dependency update complete!')

package/src/generate-env.ts

@@ -1,145 +0,0 @@
-#!/usr/bin/env bun
-
-import fs from 'node:fs'
-
-import { cmd } from './cmd'
-import { resolveDepVersion } from './helpers/resolve-dep-version'
-
-await cmd`sync auto-generated env vars to local .env file`.run(async ({ path }) => {
-  const ENV_PATH = path.join(process.cwd(), '.env')
-  const ENV_BACKUP_PATH = path.join(process.cwd(), '.env.backup')
-  const ENV_TEMP_PATH = path.join(process.cwd(), '.env.tmp')
-
-  // auto-generated section markers
-  const BEGIN_MARKER = '# ---- BEGIN AUTO-GENERATED (DO NOT EDIT) ----'
-  const END_MARKER = '# ---- END AUTO-GENERATED ----'
-
-  function getAutoGeneratedContent(): string {
-    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: string[] = [BEGIN_MARKER, `# Generated at: ${new Date().toISOString()}`]
-
-    for (const [key, value] of Object.entries(envVars)) {
-      const depVersion = resolveDepVersion(value, packageJson.dependencies)
-      if (depVersion) {
-        lines.push(`${key}=${depVersion}`)
-      } else if (typeof value === 'string' && value.startsWith('$dep:')) {
-        console.warn(
-          `Could not resolve dependency version for ${value.slice('$dep:'.length)}`
-        )
-      } 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)) {
-      fs.writeFileSync(ENV_PATH, '')
-      console.info('Created empty .env file')
-    }
-
-    try {
-      // create backup
-      if (fs.existsSync(ENV_PATH)) {
-        fs.copyFileSync(ENV_PATH, ENV_BACKUP_PATH)
-      }
-
-      const currentContent = fs.readFileSync(ENV_PATH, 'utf-8')
-
-      const beginIndex = currentContent.indexOf(BEGIN_MARKER)
-      const endIndex = currentContent.indexOf(END_MARKER)
-
-      let newContent: string
-
-      if (beginIndex !== -1 && endIndex !== -1 && endIndex > beginIndex) {
-        // replace existing auto-generated section
-        const beforeSection = currentContent.substring(0, beginIndex).trimEnd()
-        const afterSection = currentContent
-          .substring(endIndex + END_MARKER.length)
-          .trimStart()
-
-        newContent = [beforeSection, getAutoGeneratedContent(), afterSection]
-          .filter(Boolean)
-          .join('\n\n')
-      } else if (beginIndex !== -1 || endIndex !== -1) {
-        // malformed markers - preserve content and append new section
-        console.warn('Found malformed auto-generated section, appending new section')
-        newContent = currentContent.trimEnd() + '\n\n' + getAutoGeneratedContent()
-      } else {
-        // no existing section - append to end
-        const trimmedContent = currentContent.trimEnd()
-        newContent = trimmedContent
-          ? trimmedContent + '\n\n' + getAutoGeneratedContent()
-          : getAutoGeneratedContent()
-      }
-
-      // write to temp file first (atomic operation)
-      fs.writeFileSync(ENV_TEMP_PATH, newContent)
-
-      // validate temp file
-      const tempContent = fs.readFileSync(ENV_TEMP_PATH, 'utf-8')
-      if (!tempContent.includes(BEGIN_MARKER) || !tempContent.includes(END_MARKER)) {
-        throw new Error('Generated content validation failed')
-      }
-
-      // atomic replace
-      fs.renameSync(ENV_TEMP_PATH, ENV_PATH)
-
-      if (fs.existsSync(ENV_BACKUP_PATH)) {
-        try {
-          fs.unlinkSync(ENV_BACKUP_PATH)
-        } catch {
-          // ignore cleanup errors
-        }
-      }
-
-      console.info('Updated .env auto-generated section')
-    } catch (error) {
-      console.error('Failed to update .env file:', error)
-
-      // attempt to restore backup
-      if (fs.existsSync(ENV_BACKUP_PATH)) {
-        try {
-          fs.copyFileSync(ENV_BACKUP_PATH, ENV_PATH)
-          console.info('Restored .env from backup')
-        } catch (restoreError) {
-          console.error('Failed to restore backup:', restoreError)
-        }
-      }
-
-      // clean up temp file
-      if (fs.existsSync(ENV_TEMP_PATH)) {
-        try {
-          fs.unlinkSync(ENV_TEMP_PATH)
-        } catch {
-          // ignore cleanup errors
-        }
-      }
-
-      // don't fail the install process
-      process.exit(0)
-    }
-  }
-
-  try {
-    updateEnvFile()
-  } catch (error) {
-    // catch any unexpected errors and exit gracefully
-    console.error('Bootstrap script error:', error)
-    process.exit(0)
-  }
-})