@take-out/cli 0.1.39 → 0.1.41

package/src/commands/run.ts

@@ -1,6 +1,6 @@
 import { spawn } from 'node:child_process'
-import { existsSync, readFileSync, statSync } from 'node:fs'
-import { resolve, join, parse } from 'node:path'
+import { existsSync, statSync } from 'node:fs'
+import { join } from 'node:path'
 
 import { defineCommand } from 'citty'
 
@@ -29,10 +29,13 @@ export const runCommand = defineCommand({
 
       // Check if it's a category directory
       if (existsSync(categoryPath) && statSync(categoryPath).isDirectory()) {
-        // Check if --all flag is present
-        const hasAllFlag = secondArg === '--all'
+        // only run all when flags come before any sub-script name
+        const nonFlagArgs = scriptArgs.slice(1).filter((a) => !a.startsWith('--'))
+        const hasSubScript = nonFlagArgs.length > 0
+        const hasAllFlag = secondArg === '--all' && !hasSubScript
+        const hasDefaultAllFlag = scriptArgs.includes('--default-all') && !hasSubScript
 
-        if (hasAllFlag) {
+        if (hasAllFlag || hasDefaultAllFlag) {
           // Run all scripts in this category in parallel
           const { discoverScripts } = await import('../utils/script-utils')
           const { runScriptsInParallel } = await import('../utils/parallel-runner')
@@ -110,7 +113,9 @@ export const runCommand = defineCommand({
 
       if (scriptPath) {
         // Use spawn instead of Bun's $ helper since we're in a compiled context
-        const scriptArgsToPass = scriptArgs.slice(1)
+        const scriptArgsToPass = scriptArgs
+          .slice(1)
+          .filter((a) => a !== '--default-all' && a !== '--all')
         const child = spawn('bun', [scriptPath, ...scriptArgsToPass], {
           stdio: 'inherit',
           shell: false,
@@ -123,44 +128,8 @@ export const runCommand = defineCommand({
       }
     }
 
-    // Fall back to the original run.ts behavior for package.json scripts
-    // Find the project root by looking for package.json with workspaces or takeout field
-    let currentDir = process.cwd()
-    let projectRoot = ''
-
-    while (currentDir !== parse(currentDir).root) {
-      const packageJsonPath = resolve(currentDir, 'package.json')
-      if (existsSync(packageJsonPath)) {
-        try {
-          const pkg = JSON.parse(readFileSync(packageJsonPath, 'utf8'))
-          if (pkg.workspaces || pkg.takeout) {
-            projectRoot = currentDir
-            break
-          }
-        } catch {}
-      }
-      currentDir = resolve(currentDir, '..')
-    }
-
-    if (!projectRoot) {
-      console.error('Could not find project root')
-      process.exit(1)
-    }
-
-    // check if local packages/scripts exists (takeout monorepo), otherwise use installed package
-    const localScriptsPath = resolve(projectRoot, 'packages/scripts/src/run.ts')
-    const scriptPath = existsSync(localScriptsPath)
-      ? localScriptsPath
-      : resolve(projectRoot, 'node_modules/@take-out/scripts/src/run.ts')
-
-    const child = spawn('bun', [scriptPath, ...scriptArgs], {
-      stdio: 'inherit',
-      shell: false,
-    })
-
-    const code = await new Promise<number>((resolve) => {
-      child.on('exit', (code) => resolve(code || 0))
-    })
-    process.exit(code)
+    // fall back to runParallelScripts for package.json scripts (direct import, no subprocess)
+    const { runParallelScripts, parseRunArgs } = await import('@take-out/run')
+    await runParallelScripts(parseRunArgs(scriptArgs))
   },
 })

package/src/utils/parallel-runner.ts

@@ -131,7 +131,7 @@ function runSingleScript(script: ScriptToRun, colorIndex: number): Promise<void>
     const proc = spawn('bun', [script.path, ...(script.args || [])], {
       stdio: ['pipe', 'pipe', 'pipe'],
       shell: false,
-      env: { ...process.env, FORCE_COLOR: '3' } as any,
+      env: { ...process.env, FORCE_COLOR: '3', TKO_IS_RUNNING_ALL: '1' } as any,
       detached: true,
     })
 

package/types/commands/run-all.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-all.d.ts","sourceRoot":"","sources":["../../src/commands/run-all.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,aAAa;;;;;;EA0DxB,CAAA"}
+{"version":3,"file":"run-all.d.ts","sourceRoot":"","sources":["../../src/commands/run-all.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,aAAa;;;;;;EA6CxB,CAAA"}

package/types/commands/run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,UAAU;;;;;;EA+JrB,CAAA"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,UAAU;;;;;;EAgIrB,CAAA"}