@take-out/scripts 0.0.29 → 0.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@take-out/scripts",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "type": "module",
   "main": "./src/index.ts",
   "sideEffects": false,
@@ -18,13 +18,13 @@
   "scripts": {
     "lint": "biome check src",
     "lint:fix": "biome check --write src",
-    "typecheck": "TSGO=1 tko run typecheck"
+    "typecheck": "tko run typecheck"
   },
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@take-out/helpers": "0.0.29"
+    "@take-out/helpers": "0.0.31"
   },
   "devDependencies": {
     "vxrn": "*"

package/src/env-update.ts

@@ -31,6 +31,17 @@ const yamlEndMarker = `# ${markerEnd}`
 const jsStartMarker = `// ${markerStart}`
 const jsEndMarker = `// ${markerEnd}`
 
+function replaceYamlSection(
+  content: string,
+  lines: string,
+  options: { indent: string }
+): string {
+  return content.replace(
+    new RegExp(`${yamlStartMarker}(.|\n)*?${yamlEndMarker}`, 'gm'),
+    `${yamlStartMarker}\n${lines}\n${options.indent}${yamlEndMarker}`
+  )
+}
+
 function updateDeployYml() {
   const deployYmlPath = '.github/workflows/ci.yml'
   let deployYml = readFileSync(deployYmlPath, 'utf-8')
@@ -39,16 +50,12 @@ function updateDeployYml() {
     throw new Error(`Markers not found in ${deployYmlPath}`)
   }
 
-  const newlines = `          `
-
+  const indent = `          `
   const envSection = Object.keys(envVars)
-    .map((key) => `${newlines}${key}: \${{ secrets.${key} }}`)
+    .map((key) => `${indent}${key}: \${{ secrets.${key} }}`)
     .join('\n')
 
-  const newDeployYml = deployYml.replace(
-    new RegExp(`${yamlStartMarker}(.|\n)*?${yamlEndMarker}`, 'gm'),
-    `${yamlStartMarker}\n${envSection}\n${newlines}${yamlEndMarker}`
-  )
+  const newDeployYml = replaceYamlSection(deployYml, envSection, { indent })
 
   writeFileSync(deployYmlPath, newDeployYml, 'utf-8')
   console.info('✅ Updated Github workflow')
@@ -111,11 +118,41 @@ function updateEnvServerTs() {
 //   console.info('✅ Updated Dockerfile')
 // }
 
+function updateDockerCompose() {
+  const dockerComposePath = 'src/uncloud/docker-compose.yml'
+
+  let dockerCompose = ''
+  try {
+    dockerCompose = readFileSync(dockerComposePath, 'utf-8')
+  } catch (_error) {
+    // file doesn't exist, skip
+    return
+  }
+
+  if (
+    !dockerCompose.includes(yamlStartMarker) ||
+    !dockerCompose.includes(yamlEndMarker)
+  ) {
+    // no markers, skip
+    return
+  }
+
+  const indent = '      '
+  const envLines = Object.keys(envVars)
+    .map((key) => `${indent}- ${key}=\${${key}:-}`)
+    .join('\n')
+
+  const newDockerCompose = replaceYamlSection(dockerCompose, envLines, { indent })
+
+  writeFileSync(dockerComposePath, newDockerCompose, 'utf-8')
+  console.info('✅ Updated docker-compose.yml')
+}
+
 async function updateAll() {
   try {
     updateDeployYml()
     updateEnvServerTs()
-    // updateDockerfile()
+    updateDockerCompose()
     console.info('✅ All files updated successfully')
   } catch (error: any) {
     console.error('❌ Update failed:', error.message)

package/src/helpers/env-load.ts

@@ -17,7 +17,7 @@ export async function loadEnv(
     if (options?.optional?.includes(key)) {
       continue
     }
-    if (!Environment[key as keyof typeof Environment]) {
+    if (typeof Environment[key as keyof typeof Environment] === 'undefined') {
       console.warn(`Missing key: ${key}`)
     }
   }

package/src/helpers/run.ts

@@ -1,4 +1,5 @@
 import type { ChildProcess } from 'node:child_process'
+import { cpus } from 'node:os'
 import type { Timer } from '@take-out/helpers'
 
 export type ProcessType = ChildProcess | Bun.Subprocess
@@ -268,7 +269,8 @@ export async function printTiming<T>(name: string, fn: () => Promise<T>): Promis
 }
 
 export async function runParallel(
-  tasks: Array<{ name: string; fn: () => Promise<void>; condition?: () => boolean }>
+  tasks: Array<{ name: string; fn: () => Promise<void>; condition?: () => boolean }>,
+  options?: { maxParallelism?: number }
 ) {
   const activeTasks = tasks.filter((task) => !task.condition || task.condition())
 
@@ -276,27 +278,43 @@ export async function runParallel(
     return
   }
 
+  const maxParallelism = options?.maxParallelism ?? cpus().length
   console.info(`\nStarting parallel tasks: ${activeTasks.map((t) => t.name).join(', ')}`)
+  console.info(`Max parallelism: ${maxParallelism}`)
 
   const taskStartTime = Date.now()
 
   try {
-    await Promise.all(
-      activeTasks.map(async (task) => {
-        const startTime = Date.now()
-        try {
-          await task.fn()
+    const results: Promise<void>[] = []
+    const executing: Set<Promise<void>> = new Set()
+
+    for (const task of activeTasks) {
+      const startTime = Date.now()
+      const taskPromise = task.fn().then(
+        () => {
           const duration = Date.now() - startTime
           console.info(
             `\x1b[32m✓\x1b[0m task: \x1b[35m${task.name}\x1b[0m completed in \x1b[33m${formatDuration(duration)}\x1b[0m`
           )
-        } catch (error) {
+          executing.delete(taskPromise)
+        },
+        (error) => {
           const duration = Date.now() - startTime
           console.error(`✗ task: ${task.name} failed after ${formatDuration(duration)}`)
+          executing.delete(taskPromise)
           throw error
         }
-      })
-    )
+      )
+
+      results.push(taskPromise)
+      executing.add(taskPromise)
+
+      if (executing.size >= maxParallelism) {
+        await Promise.race(executing)
+      }
+    }
+
+    await Promise.all(results)
 
     const totalDuration = Date.now() - taskStartTime
     console.info(

package/src/typecheck.ts

@@ -4,13 +4,19 @@
  * @description Run TypeScript compiler for type checking
  */
 
+import { sleep } from '@take-out/helpers'
 import { run } from '@take-out/scripts/helpers/run'
 
 const useTsgo = process.env.TSGO === '1'
 const args = process.argv.slice(2)
 
+// hugely cpu intensive, let the dev server start first before using:
+if (process.env.LAZY_TYPECHECK) {
+  await sleep(6000)
+}
+
 if (useTsgo) {
   await run(`bun tsgo --project ./tsconfig.json --noEmit --preserveWatchOutput ${args}`)
 } else {
-  await run(`tsc --project ./tsconfig.json --noEmit --preserveWatchOutput ${args}`)
+  await run(`bun x tsc --project ./tsconfig.json --noEmit --preserveWatchOutput ${args}`)
 }

package/src/typescript.ts

@@ -1,16 +0,0 @@
-#!/usr/bin/env bun
-
-/**
- * @description Run TypeScript compiler for type checking
- */
-
-import { run } from '@take-out/scripts/helpers/run'
-
-const useTsgo = process.env.TSGO === '1'
-const args = process.argv.slice(2)
-
-if (useTsgo) {
-  await run(`bun tsgo --project ./tsconfig.json --noEmit --preserveWatchOutput ${args}`)
-} else {
-  await run(`tsc --project ./tsconfig.json --noEmit --preserveWatchOutput ${args}`)
-}