rbxts-orchestra 0.1.3 → 0.2.0

package/dist/run.js

@@ -32,7 +32,7 @@ var import_yargs = __toESM(require("yargs"));
 // package.json
 var package_default = {
   name: "rbxts-orchestra",
-  version: "0.1.3",
+  version: "0.2.0",
   description: "A build orchestrator.",
   main: "src/index.ts",
   bin: {
@@ -54,7 +54,7 @@ var package_default = {
     compile: "tsc",
     format: "prettier . --check",
     "format:fix": "prettier . --write",
-    lint: "eslint .",
+    lint: "eslint ./src",
     "lint:fix": "eslint . --fix",
     start: "ts-node ./bin/run.ts",
     "start:node": "node ./bin/run",
@@ -80,7 +80,7 @@ var package_default = {
     consola: "^3.2.3",
     jiti: "^2.6.1",
     picocolors: "^1.0.1",
-    "rbxts-orchestra": "^0.1.0",
+    "rbxts-orchestra": "^0.1.3",
     yargs: "^17.7.2"
   }
 };
@@ -123,7 +123,7 @@ var Orchestra = class _Orchestra {
         this.environment = environmentName;
       }
     }
-    (0, import_assert.default)(this.environment, `Orchestra confiag is invalid, no default or otherwise valid environments provided`);
+    (0, import_assert.default)(this.environment, `Orchestra config is invalid, no default or otherwise valid environments provided`);
   }
   static async fromDirectory(directoryPath) {
     return await _Orchestra.fromFileConfig((0, import_path.resolve)(directoryPath, ORCHESTRA_CONFIG_FILENAME));
@@ -136,15 +136,41 @@ var Orchestra = class _Orchestra {
   }
   environment;
   async runScripts(scriptName, argv2) {
-    await this.resolveConfig(this.config.scripts?.prepare)?.(this, void 0, argv2);
-    await this.resolveConfig(this.config.scripts?.[scriptName])?.(this, void 0, argv2);
+    const firstScript = this.findFirstScript(scriptName);
+    if (!firstScript) return false;
+    let skipPrepare = false;
+    if (typeof firstScript !== "function") skipPrepare = firstScript[0].skipPrepare;
+    if (!skipPrepare) await this.runScript(this.resolveConfig(this.config.scripts?.prepare), void 0, argv2);
+    await this.runScript(this.resolveConfig(this.config.scripts?.[scriptName]), void 0, argv2);
     for (const place of this.config.places) {
-      await this.resolveConfig(place.scripts[scriptName])?.(this, place, argv2);
+      await this.runScript(this.resolveConfig(place.scripts?.[scriptName]), place, argv2);
     }
+    return true;
   }
   resolveConfig(config) {
     return resolveValue(config, this);
   }
+  findFirstScript(targetScriptName) {
+    if (this.config.scripts) {
+      for (const [scriptName, script] of Object.entries(this.config.scripts)) {
+        if (targetScriptName == scriptName) return this.resolveConfig(script);
+      }
+    }
+    for (const place of Object.values(this.config.places)) {
+      if (!place.scripts) continue;
+      for (const [scriptName, script] of Object.entries(place.scripts)) {
+        if (targetScriptName == scriptName) return this.resolveConfig(script);
+      }
+    }
+    return void 0;
+  }
+  async runScript(script, place, argv2 = []) {
+    if (!script) return [false, void 0];
+    let callback;
+    if (typeof script === "function") callback = script;
+    else callback = script[1];
+    return [true, await callback(this, place, argv2)];
+  }
 };
 
 // src/commands/runScript.ts
@@ -173,10 +199,15 @@ async function handler(argv2) {
     logger.error(`Failed to find config file at ${argv2.config}`);
     process2.exit(1);
   });
-  await orchestra.runScripts(argv2.script, delimitedArgv).catch((code) => {
-    logger.error(`Failed to run script: exit code ${code}`);
-    process2.exit(code);
+  const anyScriptRan = await orchestra.runScripts(argv2.script, delimitedArgv).catch((err) => {
+    const formattedErr = typeof err == "number" ? `exit code ${err}` : err;
+    logger.error(`Failed to run script: ${formattedErr}`);
+    process2.exit(typeof err == "number" ? err : 1);
   });
+  if (!anyScriptRan) {
+    logger.error(`No scripts by the name of "${argv2.script}" found`);
+    process2.exit(1);
+  }
 }
 
 // src/commands/index.ts

package/dist/src/commands/runScript.js

@@ -30,9 +30,14 @@ export async function handler(argv) {
         logger.error(`Failed to find config file at ${argv.config}`);
         process.exit(1);
     });
-    await orchestra.runScripts(argv.script, delimitedArgv).catch((code) => {
-        logger.error(`Failed to run script: exit code ${code}`);
-        process.exit(code);
+    const anyScriptRan = await orchestra.runScripts(argv.script, delimitedArgv).catch((err) => {
+        const formattedErr = typeof err == "number" ? `exit code ${err}` : err;
+        logger.error(`Failed to run script: ${formattedErr}`);
+        process.exit(typeof err == "number" ? err : 1);
     });
+    if (!anyScriptRan) {
+        logger.error(`No scripts by the name of "${argv.script}" found`);
+        process.exit(1);
+    }
 }
 //# sourceMappingURL=runScript.js.map

package/dist/src/commands/runScript.js.map

@@ -1 +1 @@
-{"version":3,"file":"runScript.js","sourceRoot":"","sources":["../../../src/commands/runScript.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAGxC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AAOpE,MAAM,CAAC,MAAM,OAAO,GAAG,cAAc,CAAC;AACtC,MAAM,CAAC,MAAM,QAAQ,GAAG,iDAAiD,CAAC;AAE1E,MAAM,UAAU,OAAO,CAAC,KAAoB;IAC3C,OAAO,KAAK;SACV,UAAU,CAAC,QAAQ,EAAE;QACrB,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,aAAa;KAC1B,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE;QACjB,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,mCAAmC;QAChD,OAAO,EAAE,GAAG,yBAAyB,EAAE;KACvC,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;QACnC,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,KAAK,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAiC;IAC9D,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC;IACpE,MAAM,aAAa,GAAG,cAAc,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACjG,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;QACxE,MAAM,CAAC,KAAK,CAAC,iCAAiC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QAC7D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;QACrE,MAAM,CAAC,KAAK,CAAC,mCAAmC,IAAI,EAAE,CAAC,CAAC;QACxD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"runScript.js","sourceRoot":"","sources":["../../../src/commands/runScript.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAGxC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,SAAS,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AAOpE,MAAM,CAAC,MAAM,OAAO,GAAG,cAAc,CAAC;AACtC,MAAM,CAAC,MAAM,QAAQ,GAAG,iDAAiD,CAAC;AAE1E,MAAM,UAAU,OAAO,CAAC,KAAoB;IAC3C,OAAO,KAAK;SACV,UAAU,CAAC,QAAQ,EAAE;QACrB,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,aAAa;KAC1B,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE;QACjB,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,mCAAmC;QAChD,OAAO,EAAE,GAAG,yBAAyB,EAAE;KACvC,CAAC;SACD,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAa,EAAE,EAAE;QACnC,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,KAAK,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,KAAK,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAiC;IAC9D,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC;IACpE,MAAM,aAAa,GAAG,cAAc,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACjG,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;QACxE,MAAM,CAAC,KAAK,CAAC,iCAAiC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QAC7D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjB,CAAC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QACzF,MAAM,YAAY,GAAG,OAAO,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,aAAa,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;QACvE,MAAM,CAAC,KAAK,CAAC,yBAAyB,YAAY,EAAE,CAAC,CAAC;QACtD,OAAO,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,YAAY,EAAE,CAAC;QACnB,MAAM,CAAC,KAAK,CAAC,8BAA8B,IAAI,CAAC,MAAM,SAAS,CAAC,CAAC;QACjE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjB,CAAC;AACF,CAAC"}

package/dist/src/helpers/script.d.ts

@@ -8,6 +8,14 @@ interface SpawnConfig {
      * Whether to ignore a non-zero exit code
      */
     ignoreNonZeroExitCode: boolean;
+    /**
+     * Whether to skip the prepare script before running this process
+     */
+    skipPrepare: boolean;
+    /**
+     * Additional arguments to pass to the process
+     */
+    argv: string[];
 }
 export declare function sh<E extends Environments>(cmd: string, config?: Partial<SpawnConfig>): Value<E, Script<E>>;
 export declare function script<E extends Environments>(path: string, config?: Partial<SpawnConfig>): Value<E, Script<E>>;

package/dist/src/helpers/script.js

@@ -1,9 +1,10 @@
 import { spawn } from "child_process";
 import { resolve } from "path";
-import { val } from "../orchestra/config";
 const DEFAULT_SPAWN_CONFIG = {
     waitForExit: true,
     ignoreNonZeroExitCode: false,
+    skipPrepare: false,
+    argv: [],
 };
 function generateEnv(orchestra, place) {
     return {
@@ -20,9 +21,9 @@ export function sh(cmd, config = {}) {
         ...DEFAULT_SPAWN_CONFIG,
         ...config,
     };
-    return val((orchestra, place, argv = []) => {
+    const scriptCallback = (orchestra, place, argv = []) => {
         return new Promise((resolvePromise, reject) => {
-            const child = spawn(`${cmd}`, argv, {
+            const child = spawn(`${cmd}`, [...argv, ...fullConfig.argv], {
                 cwd: place ? resolve(orchestra.resolveConfig(place.rootDir)) : undefined,
                 stdio: "inherit",
                 env: generateEnv(orchestra, place),
@@ -38,7 +39,13 @@ export function sh(cmd, config = {}) {
                 resolvePromise();
             }
         });
-    });
+    };
+    return () => [
+        {
+            skipPrepare: fullConfig.skipPrepare,
+        },
+        scriptCallback,
+    ];
 }
 export function script(path, config = {}) {
     return sh(`${resolve(path)}`, config);

package/dist/src/helpers/script.js.map

@@ -1 +1 @@
-{"version":3,"file":"script.js","sourceRoot":"","sources":["../../../src/helpers/script.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAqC,GAAG,EAAS,MAAM,qBAAqB,CAAC;AAcpF,MAAM,oBAAoB,GAAgB;IACzC,WAAW,EAAE,IAAI;IACjB,qBAAqB,EAAE,KAAK;CAC5B,CAAC;AAEF,SAAS,WAAW,CACnB,SAAuB,EACvB,KAAsB;IAEtB,OAAO;QACN,GAAG,OAAO,CAAC,GAAG;QACd,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC;QAC3B,cAAc,EAAE,SAAS,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC;QACvE,YAAY,EAAE,SAAS,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC;QACnE,QAAQ,EAAE,KAAK,IAAI,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE;QACrE,aAAa,EAAE,KAAK,IAAI,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE;KAC/E,CAAC;AACH,CAAC;AAED,MAAM,UAAU,EAAE,CAAyB,GAAW,EAAE,SAA+B,EAAE;IACxF,MAAM,UAAU,GAAG;QAClB,GAAG,oBAAoB;QACvB,GAAG,MAAM;KACT,CAAC;IAEF,OAAO,GAAG,CAAC,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,GAAG,EAAE,EAAE,EAAE;QAC1C,OAAO,IAAI,OAAO,CAAC,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE;YAC7C,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,GAAG,EAAE,EAAE,IAAI,EAAE;gBACnC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;gBACxE,KAAK,EAAE,SAAS;gBAChB,GAAG,EAAE,WAAW,CAAC,SAAS,EAAE,KAAK,CAAC;aAClC,CAAC,CAAC;YAEH,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC;gBAC5B,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;oBACzB,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB;wBAAE,MAAM,CAAC,IAAI,CAAC,CAAC;oBAClE,cAAc,EAAE,CAAC;gBAClB,CAAC,CAAC,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACP,cAAc,EAAE,CAAC;YAClB,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC;AACD,MAAM,UAAU,MAAM,CAAyB,IAAY,EAAE,SAA+B,EAAE;IAC7F,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC"}
+{"version":3,"file":"script.js","sourceRoot":"","sources":["../../../src/helpers/script.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAwB/B,MAAM,oBAAoB,GAAgB;IACzC,WAAW,EAAE,IAAI;IACjB,qBAAqB,EAAE,KAAK;IAC5B,WAAW,EAAE,KAAK;IAClB,IAAI,EAAE,EAAE;CACR,CAAC;AAEF,SAAS,WAAW,CACnB,SAAuB,EACvB,KAAsB;IAEtB,OAAO;QACN,GAAG,OAAO,CAAC,GAAG;QACd,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC;QAC3B,cAAc,EAAE,SAAS,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC;QACvE,YAAY,EAAE,SAAS,CAAC,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC;QACnE,QAAQ,EAAE,KAAK,IAAI,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE;QACrE,aAAa,EAAE,KAAK,IAAI,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,QAAQ,EAAE;KAC/E,CAAC;AACH,CAAC;AAED,MAAM,UAAU,EAAE,CAAyB,GAAW,EAAE,SAA+B,EAAE;IACxF,MAAM,UAAU,GAAG;QAClB,GAAG,oBAAoB;QACvB,GAAG,MAAM;KACT,CAAC;IAEF,MAAM,cAAc,GAAc,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,GAAG,EAAE,EAAE,EAAE;QACjE,OAAO,IAAI,OAAO,CAAO,CAAC,cAAc,EAAE,MAAM,EAAE,EAAE;YACnD,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,GAAG,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE;gBAC5D,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;gBACxE,KAAK,EAAE,SAAS;gBAChB,GAAG,EAAE,WAAW,CAAC,SAAS,EAAE,KAAK,CAAC;aAClC,CAAC,CAAC;YACH,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC;gBAC5B,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;oBACzB,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,qBAAqB;wBAAE,MAAM,CAAC,IAAI,CAAC,CAAC;oBAClE,cAAc,EAAE,CAAC;gBAClB,CAAC,CAAC,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACP,cAAc,EAAE,CAAC;YAClB,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,GAAG,EAAE,CAAC;QACZ;YACC,WAAW,EAAE,UAAU,CAAC,WAAW;SACnC;QACD,cAAc;KACd,CAAC;AACH,CAAC;AACD,MAAM,UAAU,MAAM,CAAyB,IAAY,EAAE,SAA+B,EAAE;IAC7F,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;AACvC,CAAC"}

package/dist/src/orchestra/config.d.ts

@@ -19,7 +19,11 @@ export declare function val<E extends Environments, T>(value: T): Value<E, T>;
  * Environment-based value helper
  */
 export declare function env<V extends Record<string, unknown>>(values: V): <E extends { [K in keyof V]: EnvironmentConfig; }>(orchestra: Orchestra<E>) => V[keyof V];
-export type Script<E extends Environments> = (orchestra: Orchestra<E>, place?: PlaceConfig<E>, argv?: string[]) => Promise<void> | void;
+export interface ScriptConfig {
+    skipPrepare: boolean;
+}
+export type ScriptCallback<E extends Environments, T = void> = (orchestra: Orchestra<E>, place?: PlaceConfig<E>, argv?: string[]) => Promise<T> | T;
+export type Script<E extends Environments, T = void> = [ScriptConfig, ScriptCallback<E, T>] | ScriptCallback<E, T>;
 /**
  * A configuration for a place managed by an Orchestra
  */

package/dist/src/orchestra/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/orchestra/config.ts"],"names":[],"mappings":"AAYA;;GAEG;AACH,MAAM,UAAU,YAAY,CAA4B,KAAuB,EAAE,SAAuB;IACvG,OAAO,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAE,KAAqB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAChF,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,GAAG,CAA4B,KAAQ;IACtD,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC;AACpB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,GAAG,CAAoC,MAAS;IAC/D,OAAO,CAAkD,SAAuB,EAAc,EAAE;QAC/F,OAAO,MAAM,CAAC,SAAS,CAAC,WAAsB,CAAC,CAAC;IACjD,CAAC,CAAC;AACH,CAAC;AA8ED;;GAEG;AACH,MAAM,UAAU,eAAe,CAA+B,UAA8B;IAC3F,OAAO,UAAU,CAAC;AACnB,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/orchestra/config.ts"],"names":[],"mappings":"AAYA;;GAEG;AACH,MAAM,UAAU,YAAY,CAA4B,KAAuB,EAAE,SAAuB;IACvG,OAAO,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAE,KAAqB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAChF,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,GAAG,CAA4B,KAAQ;IACtD,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC;AACpB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,GAAG,CAAoC,MAAS;IAC/D,OAAO,CAAkD,SAAuB,EAAc,EAAE;QAC/F,OAAO,MAAM,CAAC,SAAS,CAAC,WAAsB,CAAC,CAAC;IACjD,CAAC,CAAC;AACH,CAAC;AAoFD;;GAEG;AACH,MAAM,UAAU,eAAe,CAA+B,UAA8B;IAC3F,OAAO,UAAU,CAAC;AACnB,CAAC"}

package/dist/src/orchestra/orchestra.d.ts

@@ -6,6 +6,8 @@ export declare class Orchestra<E extends Environments> {
     static fromFileConfig(filePath: string): Promise<Orchestra<never>>;
     readonly environment: keyof E;
     constructor(config: OrchestraConfig<E>);
-    runScripts(scriptName: string, argv?: string[]): Promise<void>;
+    runScripts(scriptName: string, argv?: string[]): Promise<boolean>;
     resolveConfig<T>(config: MaybeValue<E, T>): T;
+    private findFirstScript;
+    private runScript;
 }

package/dist/src/orchestra/orchestra.js

@@ -29,17 +29,52 @@ export class Orchestra {
                 this.environment = environmentName;
             }
         }
-        assert(this.environment, `Orchestra confiag is invalid, no default or otherwise valid environments provided`);
+        assert(this.environment, `Orchestra config is invalid, no default or otherwise valid environments provided`);
     }
     async runScripts(scriptName, argv) {
-        await this.resolveConfig(this.config.scripts?.prepare)?.(this, undefined, argv);
-        await this.resolveConfig(this.config.scripts?.[scriptName])?.(this, undefined, argv);
+        const firstScript = this.findFirstScript(scriptName);
+        if (!firstScript)
+            return false;
+        let skipPrepare = false;
+        if (typeof firstScript !== "function")
+            skipPrepare = firstScript[0].skipPrepare;
+        if (!skipPrepare)
+            await this.runScript(this.resolveConfig(this.config.scripts?.prepare), undefined, argv);
+        await this.runScript(this.resolveConfig(this.config.scripts?.[scriptName]), undefined, argv);
         for (const place of this.config.places) {
-            await this.resolveConfig(place.scripts[scriptName])?.(this, place, argv);
+            await this.runScript(this.resolveConfig(place.scripts?.[scriptName]), place, argv);
         }
+        return true;
     }
     resolveConfig(config) {
         return resolveValue(config, this);
     }
+    findFirstScript(targetScriptName) {
+        if (this.config.scripts) {
+            for (const [scriptName, script] of Object.entries(this.config.scripts)) {
+                if (targetScriptName == scriptName)
+                    return this.resolveConfig(script);
+            }
+        }
+        for (const place of Object.values(this.config.places)) {
+            if (!place.scripts)
+                continue;
+            for (const [scriptName, script] of Object.entries(place.scripts)) {
+                if (targetScriptName == scriptName)
+                    return this.resolveConfig(script);
+            }
+        }
+        return undefined;
+    }
+    async runScript(script, place, argv = []) {
+        if (!script)
+            return [false, undefined];
+        let callback;
+        if (typeof script === "function")
+            callback = script;
+        else
+            callback = script[1];
+        return [true, await callback(this, place, argv)];
+    }
 }
 //# sourceMappingURL=orchestra.js.map

package/dist/src/orchestra/orchestra.js.map

@@ -1 +1 @@
-{"version":3,"file":"orchestra.js","sourceRoot":"","sources":["../../../src/orchestra/orchestra.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAA6C,YAAY,EAAE,MAAM,UAAU,CAAC;AAEnF,MAAM,IAAI,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;AAEpC,MAAM,CAAC,MAAM,yBAAyB,GAAG,qBAAqB,CAAC;AAE/D,MAAM,OAAO,SAAS;IAeO;IAdrB,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,aAAqB;QACtD,OAAO,MAAM,SAAS,CAAC,cAAc,CAAC,OAAO,CAAC,aAAa,EAAE,yBAAyB,CAAC,CAAC,CAAC;IAC1F,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,QAAgB;QAClD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACnD,OAAO,EAAE,IAAI;SACb,CAAC,CAAC;QAEH,OAAO,IAAI,SAAS,CAAC,MAAgC,CAAC,CAAC;IACxD,CAAC;IAEe,WAAW,CAAU;IAErC,YAA4B,MAA0B;QAA1B,WAAM,GAAN,MAAM,CAAoB;QACrD,KAAK,MAAM,CAAC,eAAe,EAAE,iBAAiB,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;YACxF,IAAI,IAAK,CAAC,WAAW;gBAAE,SAAS;YAChC,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,SAAS,CAAC;YACnD,IAAI,iBAAiB,CAAC,OAAO,EAAE,CAAC;gBAC/B,IAAI,CAAC,WAAW,GAAG,eAAe,CAAC;YACpC,CAAC;iBAAM,IAAI,QAAQ,IAAI,iBAAiB,CAAC,OAAO,EAAE,CAAC;gBAClD,IAAI,CAAC,WAAW,GAAG,eAAe,CAAC;YACpC,CAAC;QACF,CAAC;QACD,MAAM,CAAC,IAAK,CAAC,WAAW,EAAE,mFAAmF,CAAC,CAAC;IAChH,CAAC;IAEM,KAAK,CAAC,UAAU,CAAC,UAAkB,EAAE,IAAe;QAC1D,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QAEhF,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;QAErF,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACxC,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC1E,CAAC;IACF,CAAC;IAEM,aAAa,CAAI,MAAwB;QAC/C,OAAO,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACnC,CAAC;CACD"}
+{"version":3,"file":"orchestra.js","sourceRoot":"","sources":["../../../src/orchestra/orchestra.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rbxts-orchestra",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "A build orchestrator.",
   "main": "src/index.ts",
   "bin": {
@@ -22,7 +22,7 @@
     "compile": "tsc",
     "format": "prettier . --check",
     "format:fix": "prettier . --write",
-    "lint": "eslint .",
+    "lint": "eslint ./src",
     "lint:fix": "eslint . --fix",
     "start": "ts-node ./bin/run.ts",
     "start:node": "node ./bin/run",
@@ -48,7 +48,7 @@
     "consola": "^3.2.3",
     "jiti": "^2.6.1",
     "picocolors": "^1.0.1",
-    "rbxts-orchestra": "^0.1.0",
+    "rbxts-orchestra": "^0.1.3",
     "yargs": "^17.7.2"
   }
 }

package/src/commands/runScript.ts

@@ -41,8 +41,14 @@ export async function handler(argv: ArgumentsCamelCase<RunArgv>) {
 		process.exit(1);
 	});
 
-	await orchestra.runScripts(argv.script, delimitedArgv).catch((code) => {
-		logger.error(`Failed to run script: exit code ${code}`);
-		process.exit(code);
+	const anyScriptRan = await orchestra.runScripts(argv.script, delimitedArgv).catch((err) => {
+		const formattedErr = typeof err == "number" ? `exit code ${err}` : err;
+		logger.error(`Failed to run script: ${formattedErr}`);
+		process.exit(typeof err == "number" ? err : 1);
 	});
+
+	if (!anyScriptRan) {
+		logger.error(`No scripts by the name of "${argv.script}" found`);
+		process.exit(1);
+	}
 }

package/src/helpers/script.ts

@@ -1,7 +1,7 @@
 import { spawn } from "child_process";
 import { resolve } from "path";
 
-import { Environments, PlaceConfig, Script, val, Value } from "../orchestra/config";
+import { Environments, PlaceConfig, Script, Value } from "../orchestra/config";
 import { Orchestra } from "../orchestra/orchestra";
 
 interface SpawnConfig {
@@ -13,11 +13,21 @@ interface SpawnConfig {
 	 * Whether to ignore a non-zero exit code
 	 */
 	ignoreNonZeroExitCode: boolean;
+	/**
+	 * Whether to skip the prepare script before running this process
+	 */
+	skipPrepare: boolean;
+	/**
+	 * Additional arguments to pass to the process
+	 */
+	argv: string[];
 }
 
 const DEFAULT_SPAWN_CONFIG: SpawnConfig = {
 	waitForExit: true,
 	ignoreNonZeroExitCode: false,
+	skipPrepare: false,
+	argv: [],
 };
 
 function generateEnv<E extends Environments>(
@@ -40,14 +50,13 @@ export function sh<E extends Environments>(cmd: string, config: Partial<SpawnCon
 		...config,
 	};
 
-	return val((orchestra, place, argv = []) => {
-		return new Promise((resolvePromise, reject) => {
-			const child = spawn(`${cmd}`, argv, {
+	const scriptCallback: Script<E> = (orchestra, place, argv = []) => {
+		return new Promise<void>((resolvePromise, reject) => {
+			const child = spawn(`${cmd}`, [...argv, ...fullConfig.argv], {
 				cwd: place ? resolve(orchestra.resolveConfig(place.rootDir)) : undefined,
 				stdio: "inherit",
 				env: generateEnv(orchestra, place),
 			});
-
 			if (fullConfig.waitForExit) {
 				child.on("exit", (code) => {
 					if (code !== 0 && !fullConfig.ignoreNonZeroExitCode) reject(code);
@@ -57,7 +66,14 @@ export function sh<E extends Environments>(cmd: string, config: Partial<SpawnCon
 				resolvePromise();
 			}
 		});
-	});
+	};
+
+	return () => [
+		{
+			skipPrepare: fullConfig.skipPrepare,
+		},
+		scriptCallback,
+	];
 }
 export function script<E extends Environments>(path: string, config: Partial<SpawnConfig> = {}): Value<E, Script<E>> {
 	return sh(`${resolve(path)}`, config);

package/src/orchestra/config.ts

@@ -33,11 +33,17 @@ export function env<V extends Record<string, unknown>>(values: V) {
 	};
 }
 
-export type Script<E extends Environments> = (
+export interface ScriptConfig {
+	skipPrepare: boolean;
+}
+
+export type ScriptCallback<E extends Environments, T = void> = (
 	orchestra: Orchestra<E>,
 	place?: PlaceConfig<E>,
 	argv?: string[],
-) => Promise<void> | void;
+) => Promise<T> | T;
+
+export type Script<E extends Environments, T = void> = [ScriptConfig, ScriptCallback<E, T>] | ScriptCallback<E, T>;
 
 /**
  * A configuration for a place managed by an Orchestra

package/src/orchestra/orchestra.ts

@@ -2,7 +2,7 @@ import assert from "assert";
 import { createJiti } from "jiti";
 import { resolve } from "path";
 
-import { Environments, MaybeValue, OrchestraConfig, resolveValue } from "./config";
+import { Environments, MaybeValue, OrchestraConfig, resolveValue, Script, ScriptCallback, PlaceConfig } from "./config";
 
 const jiti = createJiti(__filename);
 
@@ -33,20 +33,57 @@ export class Orchestra<E extends Environments> {
 				this.environment = environmentName;
 			}
 		}
-		assert(this!.environment, `Orchestra confiag is invalid, no default or otherwise valid environments provided`);
+		assert(this!.environment, `Orchestra config is invalid, no default or otherwise valid environments provided`);
 	}
 
-	public async runScripts(scriptName: string, argv?: string[]) {
-		await this.resolveConfig(this.config.scripts?.prepare)?.(this, undefined, argv);
+	public async runScripts(scriptName: string, argv?: string[]): Promise<boolean> {
+		const firstScript = this.findFirstScript(scriptName);
+		if (!firstScript) return false;
 
-		await this.resolveConfig(this.config.scripts?.[scriptName])?.(this, undefined, argv);
+		let skipPrepare = false;
+		if (typeof firstScript !== "function") skipPrepare = firstScript[0].skipPrepare;
+		if (!skipPrepare) await this.runScript(this.resolveConfig(this.config.scripts?.prepare), undefined, argv);
+
+		await this.runScript(this.resolveConfig(this.config.scripts?.[scriptName]), undefined, argv);
 
 		for (const place of this.config.places) {
-			await this.resolveConfig(place.scripts[scriptName])?.(this, place, argv);
+			await this.runScript(this.resolveConfig(place.scripts?.[scriptName]), place, argv);
 		}
+
+		return true;
 	}
 
 	public resolveConfig<T>(config: MaybeValue<E, T>): T {
 		return resolveValue(config, this);
 	}
+
+	private findFirstScript(targetScriptName: string): Script<E, unknown> | undefined {
+		if (this.config.scripts) {
+			for (const [scriptName, script] of Object.entries(this.config.scripts)) {
+				if (targetScriptName == scriptName) return this.resolveConfig(script);
+			}
+		}
+
+		for (const place of Object.values(this.config.places)) {
+			if (!place.scripts) continue;
+			for (const [scriptName, script] of Object.entries(place.scripts)) {
+				if (targetScriptName == scriptName) return this.resolveConfig(script);
+			}
+		}
+
+		return undefined;
+	}
+
+	private async runScript<T>(
+		script?: Script<E, T>,
+		place?: PlaceConfig<E>,
+		argv: string[] = [],
+	): Promise<[boolean, T | undefined]> {
+		if (!script) return [false, undefined];
+		let callback: ScriptCallback<E, T>;
+		if (typeof script === "function") callback = script;
+		else callback = script[1];
+
+		return [true, await callback(this, place, argv)];
+	}
 }