fix: scripts in prescript doesn't working

Author: iamyoki

TODO.md

@@ -3,8 +3,8 @@
 ## Features
 
 - ~~Add pre and post~~
-- Prev and Post support env scripts ...
-- Add env
+- ~~Prev and Post support env scripts ...~~
+- ~~Add env~~
 - Add `init` command
   - Ask user whether use magic to move current scripts to config
   - Ask user where to place the config scripts: package.json ? or scripts.json ?
@@ -21,4 +21,4 @@
 
 - ~~`.better-scriptsrc` not working~~
 
-- scripts in prescript doesn't working
+- ~~scripts in prescript doesn't working~~

lib/commands/defaultCommand.js

@@ -34,13 +34,11 @@ async function promptsAndRun(parsedUserConfig) {
   // Exit if no script value
   if (!script) process.exit(0);
 
-  // Run script
-  runScript(script);
-
-  // Recursive call if have child scripts
-  if (script.scripts) {
-    await promptsAndRun(script.scripts);
-  }
+  // Run script recursively
+  await runScript(script, nextScripts => {
+    console.log('called')
+    return promptsAndRun(nextScripts);
+  });
 }
 
 export async function defaultCommand(argv) {

lib/runScript.js

@@ -3,14 +3,15 @@ import {execSync} from './execSync.js';
 
 /**
  * @param {import('./types.js').Script} script
+ * @param {Promise<import('./types.js').ParsedUserConfig>} next
  */
-export function runScript(script) {
+export async function runScript(script, next) {
   const {prescript, postscript, isPrescript, isPostscript, env} = script;
 
   // prev
   if (prescript) {
     prescript.isPrescript = true;
-    runScript(prescript);
+    await runScript(prescript, next);
   }
 
   // now
@@ -22,8 +23,8 @@ export function runScript(script) {
     : `\n${chalk.bgMagenta.bold(' RUNS ➤ ')} ${chalk.magenta.bold(
         displayName
       )}`;
-
   console.log(logRunMessage);
+
   if (script.command) {
     console.log(chalk.grey(script.command));
     execSync(script.command, {
@@ -35,9 +36,12 @@ export function runScript(script) {
     console.log();
   }
 
+  if (script.scripts && next && typeof next === 'function')
+    await next(script.scripts);
+
   // post
   if (postscript) {
     postscript.isPostscript = true;
-    runScript(postscript);
+    await runScript(postscript, next);
   }
 }

scripts.json

@@ -14,24 +14,5 @@
     "alias": "🔮 Sort Config",
     "command": "node scripts/sort-scripts-config.js",
     "desc": "Sort and format scripts config"
-  },
-  "predev": {
-    "scripts": {
-      "port-3000": {
-        "command": "echo listen on 3000",
-        "env": {
-          "PORT": "3000"
-        }
-      },
-      "port-8000": {
-        "command": "echo listen on 8000",
-        "env": {
-          "PORT": "8000"
-        }
-      }
-    }
-  },
-  "dev": {
-    "command": "echo $PORT"
   }
 }