@lage-run/scheduler 0.3.13 → 0.4.0

package/CHANGELOG.json

@@ -2,7 +2,55 @@
   "name": "@lage-run/scheduler",
   "entries": [
     {
-      "date": "Mon, 03 Oct 2022 19:57:12 GMT",
+      "date": "Tue, 04 Oct 2022 03:38:40 GMT",
+      "tag": "@lage-run/scheduler_v0.4.0",
+      "version": "0.4.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/scheduler",
+            "commit": "34e76ae75fc56a1374115e630a7dfc81b1fa6ead",
+            "comment": "Brand new scheduler (ported p-graph over)"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/scheduler",
+            "comment": "Bump @lage-run/worker-threads-pool to v0.1.6",
+            "commit": "34e76ae75fc56a1374115e630a7dfc81b1fa6ead"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/scheduler",
+            "comment": "Bump @lage-run/scheduler-types to v0.1.4",
+            "commit": "34e76ae75fc56a1374115e630a7dfc81b1fa6ead"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 03 Oct 2022 20:41:25 GMT",
+      "tag": "@lage-run/scheduler_v0.3.14",
+      "version": "0.3.14",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@lage-run/scheduler",
+            "comment": "Bump @lage-run/worker-threads-pool to v0.1.5",
+            "commit": "68c7fda6d0c1757b353d406b21223295c9830767"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/scheduler",
+            "comment": "Bump @lage-run/scheduler-types to v0.1.3",
+            "commit": "68c7fda6d0c1757b353d406b21223295c9830767"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 03 Oct 2022 19:57:28 GMT",
       "tag": "@lage-run/scheduler_v0.3.13",
       "version": "0.3.13",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,31 @@
 # Change Log - @lage-run/scheduler
 
-This log was last generated on Mon, 03 Oct 2022 19:57:12 GMT and should not be manually modified.
+This log was last generated on Tue, 04 Oct 2022 03:38:40 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.4.0
+
+Tue, 04 Oct 2022 03:38:40 GMT
+
+### Minor changes
+
+- Brand new scheduler (ported p-graph over) (kchau@microsoft.com)
+- Bump @lage-run/worker-threads-pool to v0.1.6
+- Bump @lage-run/scheduler-types to v0.1.4
+
+## 0.3.14
+
+Mon, 03 Oct 2022 20:41:25 GMT
+
+### Patches
+
+- Bump @lage-run/worker-threads-pool to v0.1.5
+- Bump @lage-run/scheduler-types to v0.1.3
+
 ## 0.3.13
 
-Mon, 03 Oct 2022 19:57:12 GMT
+Mon, 03 Oct 2022 19:57:28 GMT
 
 ### Patches
 

package/lib/SimpleScheduler.d.ts

@@ -3,9 +3,10 @@ import { WrappedTarget } from "./WrappedTarget";
 import type { AbortSignal } from "abort-controller";
 import type { CacheProvider, TargetHasher } from "@lage-run/cache";
 import type { Logger } from "@lage-run/logger";
-import type { SchedulerRunSummary, TargetScheduler } from "@lage-run/scheduler-types";
-import type { TargetGraph } from "@lage-run/target-graph";
-import type { TargetRunnerPicker } from "./runners/TargetRunnerPicker";
+import type { TargetGraph, Target } from "@lage-run/target-graph";
+import type { TargetScheduler, SchedulerRunSummary } from "@lage-run/scheduler-types";
+import type { Pool } from "@lage-run/worker-threads-pool";
+import type { TargetRunnerPickerOptions } from "./runners/TargetRunnerPicker";
 export interface SimpleSchedulerOptions {
     logger: Logger;
     concurrency: number;
@@ -14,9 +15,9 @@ export interface SimpleSchedulerOptions {
     hasher: TargetHasher;
     shouldCache: boolean;
     shouldResetCache: boolean;
-    runnerPicker: {
-        pick: TargetRunnerPicker["pick"];
-    };
+    runners: TargetRunnerPickerOptions;
+    maxWorkersPerTask: Map<string, number>;
+    pool?: Pool;
 }
 /**
  * Simple scheduler that runs all targets in a promise graph using p-graph library.
@@ -32,9 +33,12 @@ export interface SimpleSchedulerOptions {
  */
 export declare class SimpleScheduler implements TargetScheduler {
     private options;
-    wrappedTargets: Map<string, WrappedTarget>;
+    targetRuns: Map<string, WrappedTarget>;
+    targetsByPriority: Target[];
     abortController: AbortController;
     abortSignal: AbortSignal;
+    dependencies: [string, string][];
+    pool: Pool;
     constructor(options: SimpleSchedulerOptions);
     /**
      * The job of the run method is to:
@@ -47,6 +51,14 @@ export declare class SimpleScheduler implements TargetScheduler {
      * @returns
      */
     run(root: string, targetGraph: TargetGraph): Promise<SchedulerRunSummary>;
+    /**
+     * Used by consumers of the scheduler to notify that the inputs to the target has changed
+     * @param targetId
+     */
+    onTargetChange(targetId: string): void;
+    getReadyTargets(): WrappedTarget[];
+    isAllDone(): boolean;
+    scheduleReadyTargets(): Promise<any[] | undefined>;
     /**
      * Abort the scheduler using the abort controller.
      */

package/lib/SimpleScheduler.js

@@ -1,13 +1,11 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SimpleScheduler = void 0;
 const abort_controller_1 = require("abort-controller");
 const categorizeTargetRuns_1 = require("./categorizeTargetRuns");
+const target_graph_1 = require("@lage-run/target-graph");
 const WrappedTarget_1 = require("./WrappedTarget");
-const p_graph_1 = __importDefault(require("p-graph"));
+const worker_threads_pool_1 = require("@lage-run/worker-threads-pool");
 /**
  * Simple scheduler that runs all targets in a promise graph using p-graph library.
  *
@@ -22,10 +20,25 @@ const p_graph_1 = __importDefault(require("p-graph"));
  */
 class SimpleScheduler {
     constructor(options) {
+        var _a;
         this.options = options;
-        this.wrappedTargets = new Map();
+        this.targetRuns = new Map();
+        this.targetsByPriority = [];
         this.abortController = new abort_controller_1.AbortController();
         this.abortSignal = this.abortController.signal;
+        this.dependencies = [];
+        this.pool =
+            (_a = options.pool) !== null && _a !== void 0 ? _a : new worker_threads_pool_1.WorkerPool({
+                maxWorkers: options.concurrency,
+                script: require.resolve("./workers/targetWorker"),
+                workerOptions: {
+                    stdout: true,
+                    stderr: true,
+                    workerData: {
+                        runners: options.runners,
+                    },
+                },
+            });
     }
     /**
      * The job of the run method is to:
@@ -39,12 +52,13 @@ class SimpleScheduler {
      */
     async run(root, targetGraph) {
         const startTime = process.hrtime();
-        const { concurrency, continueOnError, logger, cacheProvider, shouldCache, shouldResetCache, hasher, runnerPicker } = this.options;
+        const { continueOnError, logger, cacheProvider, shouldCache, shouldResetCache, hasher } = this.options;
+        const { pool, abortController } = this;
         const { dependencies, targets } = targetGraph;
-        const pGraphNodes = new Map();
-        const pGraphEdges = dependencies;
+        this.dependencies = dependencies;
+        this.targetsByPriority = (0, target_graph_1.sortTargetsByPriority)([...targets.values()]);
         for (const target of targets.values()) {
-            const wrappedTarget = new WrappedTarget_1.WrappedTarget({
+            const targetRun = new WrappedTarget_1.WrappedTarget({
                 target,
                 root,
                 logger,
@@ -53,39 +67,27 @@ class SimpleScheduler {
                 shouldCache,
                 shouldResetCache,
                 continueOnError,
-                abortController: this.abortController,
-            });
-            this.wrappedTargets.set(target.id, wrappedTarget);
-            pGraphNodes.set(target.id, {
-                /**
-                 * Picks the runner, and run the wrapped target with the runner
-                 */
-                run: async () => {
-                    if (this.abortSignal.aborted) {
-                        return;
-                    }
-                    const runner = runnerPicker.pick(target);
-                    return this.wrappedTargets.get(target.id).run(runner);
-                },
-                priority: target.priority,
+                abortController,
+                pool,
             });
+            if (target.id === (0, target_graph_1.getStartTargetId)()) {
+                targetRun.status = "success";
+            }
+            this.targetRuns.set(target.id, targetRun);
         }
         let results = "failed";
         let error;
         let duration = [0, 0];
         let targetRunByStatus;
         try {
-            await (0, p_graph_1.default)(pGraphNodes, pGraphEdges).run({
-                concurrency,
-                continue: continueOnError,
-            });
+            await this.scheduleReadyTargets();
         }
         catch (e) {
             error = e instanceof Error ? e.message : String(e);
         }
         finally {
             duration = process.hrtime(startTime);
-            targetRunByStatus = (0, categorizeTargetRuns_1.categorizeTargetRuns)([...this.wrappedTargets.values()]);
+            targetRunByStatus = (0, categorizeTargetRuns_1.categorizeTargetRuns)([...this.targetRuns.values()]);
             if (targetRunByStatus.failed.length +
                 targetRunByStatus.aborted.length +
                 targetRunByStatus.pending.length +
@@ -94,15 +96,98 @@ class SimpleScheduler {
                 results = "success";
             }
         }
+        await this.pool.close();
         return {
             targetRunByStatus,
-            targetRuns: this.wrappedTargets,
+            targetRuns: this.targetRuns,
             duration,
             startTime,
             results,
             error,
         };
     }
+    /**
+     * Used by consumers of the scheduler to notify that the inputs to the target has changed
+     * @param targetId
+     */
+    onTargetChange(targetId) {
+        const queue = [targetId];
+        while (queue.length > 0) {
+            const current = queue.shift();
+            const targetRun = this.targetRuns.get(current);
+            if (targetRun.status !== "pending") {
+                targetRun.status = "pending";
+                const dependents = targetRun.target.dependents;
+                for (const dependent of dependents) {
+                    queue.push(dependent);
+                }
+            }
+        }
+        this.scheduleReadyTargets();
+    }
+    getReadyTargets() {
+        var _a, _b, _c;
+        const { maxWorkersPerTask, concurrency } = this.options;
+        const readyTargets = [];
+        const runningTargets = this.targetsByPriority.filter((target) => this.targetRuns.get(target.id).status === "running");
+        const runningTargetsCountByTask = {};
+        for (const target of runningTargets) {
+            runningTargetsCountByTask[target.task] =
+                typeof runningTargetsCountByTask[target.task] !== "number" ? 1 : runningTargetsCountByTask[target.task]++;
+        }
+        for (const target of this.targetsByPriority) {
+            if (target.id === (0, target_graph_1.getStartTargetId)()) {
+                continue;
+            }
+            const targetRun = this.targetRuns.get(target.id);
+            const targetDeps = targetRun.target.dependencies;
+            // filter all dependencies for those that are "ready"
+            const ready = targetDeps.every((dep) => {
+                const fromTarget = this.targetRuns.get(dep);
+                return fromTarget.status === "success" || fromTarget.status === "skipped" || dep === (0, target_graph_1.getStartTargetId)();
+            });
+            const maxWorkers = (_a = maxWorkersPerTask.get(target.task)) !== null && _a !== void 0 ? _a : concurrency;
+            if (ready && targetRun.status === "pending" && ((_b = runningTargetsCountByTask[target.task]) !== null && _b !== void 0 ? _b : 0) < maxWorkers) {
+                readyTargets.push(targetRun);
+                runningTargetsCountByTask[target.task] = ((_c = runningTargetsCountByTask[target.task]) !== null && _c !== void 0 ? _c : 0) + 1;
+            }
+        }
+        return readyTargets;
+    }
+    isAllDone() {
+        for (const t of this.targetRuns.values()) {
+            if (t.status !== "skipped" && t.status !== "success" && t.target.id !== (0, target_graph_1.getStartTargetId)()) {
+                return false;
+            }
+        }
+        return true;
+    }
+    async scheduleReadyTargets() {
+        if (this.isAllDone() || this.abortSignal.aborted) {
+            return;
+        }
+        const promises = [];
+        for (const nextTarget of this.getReadyTargets()) {
+            promises.push(nextTarget
+                .run()
+                .then(() => {
+                return this.scheduleReadyTargets();
+            })
+                .catch((e) => {
+                var _a;
+                // if a continue option is set, this merely records what errors have been encountered
+                // it'll continue down the execution until all the tasks that still works
+                if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.continueOnError) {
+                    return this.scheduleReadyTargets();
+                }
+                else {
+                    // immediately reject, if not using "continue" option
+                    throw e;
+                }
+            }));
+        }
+        return await Promise.all(promises);
+    }
     /**
      * Abort the scheduler using the abort controller.
      */
@@ -111,4 +196,5 @@ class SimpleScheduler {
     }
 }
 exports.SimpleScheduler = SimpleScheduler;
+encodeURI;
 //# sourceMappingURL=SimpleScheduler.js.map

package/lib/SimpleScheduler.js.map

@@ -1 +1 @@
-{"version":3,"file":"SimpleScheduler.js","sourceRoot":"","sources":["../src/SimpleScheduler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SimpleScheduler.js","sourceRoot":"","sources":["../src/SimpleScheduler.ts"],"names":[],"mappings":"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"}

package/lib/WrappedTarget.d.ts

@@ -1,9 +1,10 @@
-import type { Logger } from "@lage-run/logger";
-import type { TargetHasher } from "@lage-run/cache";
 import type { AbortController } from "abort-controller";
 import type { CacheProvider } from "@lage-run/cache";
+import type { Pool } from "@lage-run/worker-threads-pool";
+import type { TargetHasher } from "@lage-run/cache";
+import type { TargetRun, TargetStatus } from "@lage-run/scheduler-types";
 import type { Target } from "@lage-run/target-graph";
-import type { TargetRun, TargetRunner, TargetStatus } from "@lage-run/scheduler-types";
+import type { Logger } from "@lage-run/logger";
 export interface WrappedTargetOptions {
     root: string;
     target: Target;
@@ -14,6 +15,7 @@ export interface WrappedTargetOptions {
     shouldResetCache: boolean;
     continueOnError: boolean;
     abortController: AbortController;
+    pool: Pool;
 }
 /**
  * Wraps a target with additional functionality:
@@ -39,7 +41,7 @@ export declare class WrappedTarget implements TargetRun {
         cacheHit: boolean;
     }>;
     saveCache(hash: string | null): Promise<void>;
-    run(runner: TargetRunner): Promise<void>;
+    run(): Promise<void>;
     /**
      * A JSON representation of this wrapped target, suitable for serialization in tests.
      *

package/lib/WrappedTarget.js

@@ -4,10 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WrappedTarget = void 0;
+const bufferTransform_1 = require("./bufferTransform");
+const getLageOutputCacheLocation_1 = require("./getLageOutputCacheLocation");
 const formatDuration_1 = require("./formatDuration");
 const logger_1 = require("@lage-run/logger");
-const createCachedOutputTransform_1 = require("./createCachedOutputTransform");
 const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const promises_1 = require("fs/promises");
 /**
  * Wraps a target with additional functionality:
  * 1. Caching
@@ -50,7 +53,7 @@ class WrappedTarget {
             status: "failed",
             duration: (0, formatDuration_1.hrToSeconds)(this.duration),
         });
-        if (!this.options.continueOnError) {
+        if (!this.options.continueOnError && this.options.abortController) {
             this.options.abortController.abort();
         }
     }
@@ -85,8 +88,8 @@ class WrappedTarget {
         logger.verbose(`hash put ${hash}`, { target });
         await cacheProvider.put(hash, target);
     }
-    async run(runner) {
-        const { target, logger, shouldCache, abortController } = this.options;
+    async run() {
+        const { target, logger, shouldCache, abortController, pool } = this.options;
         this.onStart();
         const abortSignal = abortController.signal;
         if (abortSignal.aborted) {
@@ -101,7 +104,7 @@ class WrappedTarget {
             }
             // skip if cache hit!
             if (cacheHit) {
-                const cachedOutputFile = (0, createCachedOutputTransform_1.getLageOutputCacheLocation)(this.target, hash !== null && hash !== void 0 ? hash : "");
+                const cachedOutputFile = (0, getLageOutputCacheLocation_1.getLageOutputCacheLocation)(this.target, hash !== null && hash !== void 0 ? hash : "");
                 if (fs_1.default.existsSync(cachedOutputFile)) {
                     const cachedOutput = fs_1.default.createReadStream(cachedOutputFile, "utf8");
                     this.options.logger.verbose(">> Replaying cached output", { target });
@@ -116,22 +119,38 @@ class WrappedTarget {
                 this.onSkipped(hash);
                 return;
             }
-            /**
-             * TargetRunner should run() a target. The promise resolves if successful, or rejects otherwise (aborted or failed).
-             */
-            // TODO: instead of passing a hash, pass in the stderr/stdout transformer streams
-            await runner.run(target, abortSignal, hash
-                ? {
-                    stdout: (0, createCachedOutputTransform_1.createCachedOutputTransform)(target, hash),
-                    stderr: (0, createCachedOutputTransform_1.createCachedOutputTransform)(target, hash),
-                }
-                : undefined);
-            if (cacheEnabled) {
+            let releaseStdout;
+            let releaseStderr;
+            const bufferStdout = (0, bufferTransform_1.bufferTransform)();
+            const bufferStderr = (0, bufferTransform_1.bufferTransform)();
+            await pool.exec({ target }, (_worker, stdout, stderr) => {
+                stdout.pipe(bufferStdout.transform);
+                stderr.pipe(bufferStderr.transform);
+                const releaseStdoutStream = logger.stream(logger_1.LogLevel.verbose, stdout, { target });
+                releaseStdout = () => {
+                    releaseStdoutStream();
+                    stdout.unpipe(bufferStdout.transform);
+                };
+                const releaseStderrStream = logger.stream(logger_1.LogLevel.verbose, stderr, { target });
+                releaseStderr = () => {
+                    releaseStderrStream();
+                    stderr.unpipe(bufferStderr.transform);
+                };
+            }, () => {
+                releaseStdout();
+                releaseStderr();
+            }, abortSignal);
+            if (cacheEnabled && hash) {
                 await this.saveCache(hash);
+                const outputLocation = (0, getLageOutputCacheLocation_1.getLageOutputCacheLocation)(this.target, hash);
+                const outputPath = path_1.default.dirname(outputLocation);
+                await (0, promises_1.mkdir)(outputPath, { recursive: true });
+                await (0, promises_1.writeFile)(outputLocation, bufferStdout.buffer + bufferStderr.buffer);
             }
             this.onComplete();
         }
         catch (e) {
+            logger.error(String(e), { target });
             if (abortSignal.aborted) {
                 this.onAbort();
             }

package/lib/WrappedTarget.js.map

@@ -1 +1 @@
-{"version":3,"file":"WrappedTarget.js","sourceRoot":"","sources":["../src/WrappedTarget.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WrappedTarget.js","sourceRoot":"","sources":["../src/WrappedTarget.ts"],"names":[],"mappings":";;;;;;AAAA,uDAAoD;AACpD,6EAA0E;AAC1E,qDAA+C;AAC/C,6CAA4C;AAE5C,4CAAoB;AACpB,gDAAwB;AACxB,0CAA+C;AAuB/C;;;;;;GAMG;AACH,MAAa,aAAa;IAMxB,YAAmB,OAA6B;QAA7B,YAAO,GAAP,OAAO,CAAsB;QALhD,cAAS,GAAqB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACrC,aAAQ,GAAqB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAKlC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED,OAAO;QACL,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IAClF,CAAC;IAED,OAAO;QACL,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;QAClC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IAClF,CAAC;IAED,UAAU;QACR,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE;YAClC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ;SACxB,CAAC,CAAC;IACL,CAAC;IAED,MAAM;QACJ,IAAI,CAAC,MAAM,GAAG,QAAQ,CAAC;QACvB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE;YACjC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,QAAQ;YAChB,QAAQ,EAAE,IAAA,4BAAW,EAAC,IAAI,CAAC,QAAQ,CAAC;SACrC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,IAAI,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE;YACjE,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;SACtC;IACH,CAAC;IAED,SAAS,CAAC,IAAmB;QAC3B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC/C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE;YAClC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,IAAA,4BAAW,EAAC,IAAI,CAAC,QAAQ,CAAC;YACpC,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAC/C,IAAI,IAAI,GAAkB,IAAI,CAAC;QAC/B,IAAI,QAAQ,GAAG,KAAK,CAAC;QAErB,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAE/D,IAAI,WAAW,IAAI,MAAM,CAAC,KAAK,EAAE;YAC/B,IAAI,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAEjC,IAAI,IAAI,IAAI,CAAC,gBAAgB,EAAE;gBAC7B,QAAQ,GAAG,MAAM,aAAa,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;aACpD;SACF;QAED,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,IAAmB;QACjC,IAAI,CAAC,IAAI,EAAE;YACT,OAAO;SACR;QAED,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QACvD,MAAM,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAE/C,MAAM,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAE5E,IAAI,CAAC,OAAO,EAAE,CAAC;QACf,MAAM,WAAW,GAAG,eAAe,CAAC,MAAM,CAAC;QAE3C,IAAI,WAAW,CAAC,OAAO,EAAE;YACvB,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAO;SACR;QAED,IAAI;YACF,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;YAEjD,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,IAAI,WAAW,IAAI,IAAI,CAAC;YACzD,IAAI,YAAY,EAAE;gBAChB,MAAM,CAAC,OAAO,CAAC,SAAS,IAAI,gBAAgB,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;aACrE;YAED,qBAAqB;YACrB,IAAI,QAAQ,EAAE;gBACZ,MAAM,gBAAgB,GAAG,IAAA,uDAA0B,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE,CAAC,CAAC;gBAE7E,IAAI,YAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;oBACnC,MAAM,YAAY,GAAG,YAAE,CAAC,gBAAgB,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;oBACnE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,4BAA4B,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;oBACtE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAQ,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;oBAEvE,OAAO,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;wBACzC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;4BAC5B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;4BACrB,OAAO,EAAE,CAAC;wBACZ,CAAC,CAAC,CAAC;oBACL,CAAC,CAAC,CAAC;iBACJ;gBAED,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBACrB,OAAO;aACR;YAED,IAAI,aAAkB,CAAC;YACvB,IAAI,aAAkB,CAAC;YAEvB,MAAM,YAAY,GAAG,IAAA,iCAAe,GAAE,CAAC;YACvC,MAAM,YAAY,GAAG,IAAA,iCAAe,GAAE,CAAC;YAEvC,MAAM,IAAI,CAAC,IAAI,CACb,EAAE,MAAM,EAAE,EACV,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;gBAC1B,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;gBACpC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;gBAEpC,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;gBAEhF,aAAa,GAAG,GAAG,EAAE;oBACnB,mBAAmB,EAAE,CAAC;oBACtB,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;gBACxC,CAAC,CAAC;gBAEF,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,iBAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;gBAEhF,aAAa,GAAG,GAAG,EAAE;oBACnB,mBAAmB,EAAE,CAAC;oBACtB,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;gBACxC,CAAC,CAAC;YACJ,CAAC,EACD,GAAG,EAAE;gBACH,aAAa,EAAE,CAAC;gBAChB,aAAa,EAAE,CAAC;YAClB,CAAC,EACD,WAAW,CACZ,CAAC;YAEF,IAAI,YAAY,IAAI,IAAI,EAAE;gBACxB,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;gBAC3B,MAAM,cAAc,GAAG,IAAA,uDAA0B,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBACrE,MAAM,UAAU,GAAG,cAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;gBAChD,MAAM,IAAA,gBAAK,EAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC7C,MAAM,IAAA,oBAAS,EAAC,cAAc,EAAE,YAAY,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;aAC5E;YAED,IAAI,CAAC,UAAU,EAAE,CAAC;SACnB;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;YAEpC,IAAI,WAAW,CAAC,OAAO,EAAE;gBACvB,IAAI,CAAC,OAAO,EAAE,CAAC;aAChB;iBAAM;gBACL,IAAI,CAAC,MAAM,EAAE,CAAC;aACf;YAED,MAAM,CAAC,CAAC;SACT;IACH,CAAC;IAED;;;;;;OAMG;IACH,MAAM;QACJ,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;YACtB,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC;IACJ,CAAC;CACF;AAnMD,sCAmMC"}

package/lib/bufferTransform.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="node" />
+import { Transform } from "stream";
+export declare function bufferTransform(): {
+    readonly buffer: string;
+    transform: Transform;
+};

package/lib/bufferTransform.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.bufferTransform = void 0;
+const stream_1 = require("stream");
+function bufferTransform() {
+    const chunks = [];
+    return {
+        get buffer() {
+            return chunks.join("");
+        },
+        transform: new stream_1.Transform({
+            transform(chunk, encoding, callback) {
+                chunks.push(chunk.toString());
+                callback();
+            },
+        }),
+    };
+}
+exports.bufferTransform = bufferTransform;
+//# sourceMappingURL=bufferTransform.js.map

package/lib/bufferTransform.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bufferTransform.js","sourceRoot":"","sources":["../src/bufferTransform.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AAEnC,SAAgB,eAAe;IAC7B,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,OAAO;QACL,IAAI,MAAM;YACR,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACzB,CAAC;QACD,SAAS,EAAE,IAAI,kBAAS,CAAC;YACvB,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ;gBACjC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC9B,QAAQ,EAAE,CAAC;YACb,CAAC;SACF,CAAC;KACH,CAAC;AACJ,CAAC;AAdD,0CAcC"}

package/lib/getLageOutputCacheLocation.d.ts

@@ -0,0 +1,2 @@
+import type { Target } from "@lage-run/target-graph";
+export declare function getLageOutputCacheLocation(target: Target, hash: string): string;

package/lib/getLageOutputCacheLocation.js

@@ -0,0 +1,13 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLageOutputCacheLocation = void 0;
+const path_1 = __importDefault(require("path"));
+function getLageOutputCacheLocation(target, hash) {
+    const outputPath = path_1.default.join(target.cwd, "node_modules/.cache/lage/output/");
+    return path_1.default.join(outputPath, hash + ".txt");
+}
+exports.getLageOutputCacheLocation = getLageOutputCacheLocation;
+//# sourceMappingURL=getLageOutputCacheLocation.js.map

package/lib/getLageOutputCacheLocation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getLageOutputCacheLocation.js","sourceRoot":"","sources":["../src/getLageOutputCacheLocation.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AAExB,SAAgB,0BAA0B,CAAC,MAAc,EAAE,IAAY;IACrE,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,kCAAkC,CAAC,CAAC;IAC7E,OAAO,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,GAAG,MAAM,CAAC,CAAC;AAC9C,CAAC;AAHD,gEAGC"}

package/lib/runners/NpmScriptRunner.d.ts

@@ -1,9 +1,7 @@
-import type { Logger } from "@lage-run/logger";
-import type { TargetCaptureStreams, TargetRunner } from "@lage-run/scheduler-types";
+import type { TargetRunner } from "@lage-run/scheduler-types";
 import type { AbortSignal } from "abort-controller";
 import type { Target } from "@lage-run/target-graph";
 export interface NpmScriptRunnerOptions {
-    logger: Logger;
     taskArgs: string[];
     nodeOptions: string;
     npmCmd: string;
@@ -33,5 +31,5 @@ export declare class NpmScriptRunner implements TargetRunner {
     private getNpmArgs;
     private hasNpmScript;
     private validateOptions;
-    run(target: Target, abortSignal?: AbortSignal, captureStreams?: TargetCaptureStreams): Promise<void>;
+    run(target: Target, abortSignal?: AbortSignal): Promise<void>;
 }

package/lib/runners/NpmScriptRunner.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NpmScriptRunner = void 0;
 const fs_1 = require("fs");
 const path_1 = require("path");
-const logger_1 = require("@lage-run/logger");
 const promises_1 = require("fs/promises");
 const child_process_1 = require("child_process");
 /**
@@ -45,9 +44,9 @@ class NpmScriptRunner {
             throw new Error(`NPM Script Runner: ${this.options.npmCmd} does not exist`);
         }
     }
-    async run(target, abortSignal, captureStreams = {}) {
+    async run(target, abortSignal) {
         var _a;
-        const { logger, nodeOptions, npmCmd, taskArgs } = this.options;
+        const { nodeOptions, npmCmd, taskArgs } = this.options;
         let childProcess;
         // By convention, do not run anything if there is no script for this task defined in package.json (counts as "success")
         if (!(await this.hasNpmScript(target))) {
@@ -65,7 +64,7 @@ class NpmScriptRunner {
                 abortSignal.removeEventListener("abort", abortSignalHandler);
                 if (childProcess && !childProcess.killed) {
                     const pid = childProcess.pid;
-                    logger.verbose(`Abort signal detected, attempting to killing process id ${pid}`, { target, pid });
+                    process.stdout.write(`Abort signal detected, attempting to killing process id ${pid}\n`);
                     childProcess.kill("SIGTERM");
                     // wait for "gracefulKillTimeout" to make sure everything is terminated via SIGKILL
                     const t = setTimeout(() => {
@@ -107,20 +106,14 @@ class NpmScriptRunner {
                 if (code === 0) {
                     return resolve();
                 }
-                reject();
+                reject(new Error(`NPM Script Runner: ${npmCmd} ${npmRunArgs.join(" ")} exited with code ${code}`));
             };
             const { pid } = childProcess;
-            logger.verbose(`Running ${[npmCmd, ...npmRunArgs].join(" ")}, pid: ${pid}`, { target, pid });
-            let stdout = childProcess.stdout;
-            let stderr = childProcess.stderr;
-            if (captureStreams.stdout) {
-                stdout = stdout.pipe(captureStreams.stdout);
-            }
-            if (captureStreams.stderr) {
-                stderr = stderr.pipe(captureStreams.stderr);
-            }
-            logger.stream(logger_1.LogLevel.verbose, stdout, { target, pid });
-            logger.stream(logger_1.LogLevel.verbose, stderr, { target, pid });
+            process.stdout.write(`Running ${[npmCmd, ...npmRunArgs].join(" ")}, pid: ${pid}\n`);
+            const stdout = childProcess.stdout;
+            const stderr = childProcess.stderr;
+            stdout.pipe(process.stdout);
+            stderr.pipe(process.stderr);
             childProcess.on("exit", handleChildProcessExit);
             childProcess.on("error", () => handleChildProcessExit(1));
         });

package/lib/runners/NpmScriptRunner.js.map

@@ -1 +1 @@
-{"version":3,"file":"NpmScriptRunner.js","sourceRoot":"","sources":["../../src/runners/NpmScriptRunner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"NpmScriptRunner.js","sourceRoot":"","sources":["../../src/runners/NpmScriptRunner.ts"],"names":[],"mappings":"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"}

package/lib/runners/TargetRunnerPicker.d.ts

@@ -1,8 +1,9 @@
 import type { Target } from "@lage-run/target-graph";
 import type { TargetRunner } from "@lage-run/scheduler-types";
-interface TargetRunnerPickerOptions {
-    runners: {
-        [key: string]: TargetRunner;
+export interface TargetRunnerPickerOptions {
+    [key: string]: {
+        script: string;
+        options: any;
     };
 }
 export declare class TargetRunnerPicker {
@@ -10,4 +11,3 @@ export declare class TargetRunnerPicker {
     constructor(options: TargetRunnerPickerOptions);
     pick(target: Target): TargetRunner;
 }
-export {};

package/lib/runners/TargetRunnerPicker.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TargetRunnerPicker = void 0;
+const path_1 = __importDefault(require("path"));
 const target_graph_1 = require("@lage-run/target-graph");
 const NoOpRunner_1 = require("./NoOpRunner");
 class TargetRunnerPicker {
@@ -14,8 +18,19 @@ class TargetRunnerPicker {
         if (!target.type) {
             target.type = "npmScript";
         }
-        if (this.options.runners[target.type]) {
-            return this.options.runners[target.type];
+        if (this.options[target.type]) {
+            const config = this.options[target.type];
+            const { script, options } = config;
+            // eslint-disable-next-line @typescript-eslint/no-var-requires
+            const runnerModule = require(script);
+            const base = path_1.default.basename(script);
+            const runnerName = base.replace(path_1.default.extname(base), "");
+            const runner = typeof runnerModule[runnerName] === "function"
+                ? runnerModule[runnerName]
+                : runnerModule.default === "function"
+                    ? runnerModule.default
+                    : runnerModule;
+            return new runner(options);
         }
         throw new Error(`No runner found for target ${target.id}`);
     }

package/lib/runners/TargetRunnerPicker.js.map

@@ -1 +1 @@
-{"version":3,"file":"TargetRunnerPicker.js","sourceRoot":"","sources":["../../src/runners/TargetRunnerPicker.ts"],"names":[],"mappings":";;;AAAA,yDAA0D;AAC1D,6CAA0C;AAQ1C,MAAa,kBAAkB;IAC7B,YAAoB,OAAkC;QAAlC,YAAO,GAAP,OAAO,CAA2B;IAAG,CAAC;IAE1D,IAAI,CAAC,MAAc;QACjB,IAAI,MAAM,CAAC,EAAE,KAAK,IAAA,+BAAgB,GAAE,EAAE;YACpC,OAAO,uBAAU,CAAC;SACnB;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;YAChB,MAAM,CAAC,IAAI,GAAG,WAAW,CAAC;SAC3B;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACrC,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SAC1C;QAED,MAAM,IAAI,KAAK,CAAC,8BAA8B,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;IAC7D,CAAC;CACF;AAlBD,gDAkBC"}
+{"version":3,"file":"TargetRunnerPicker.js","sourceRoot":"","sources":["../../src/runners/TargetRunnerPicker.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,yDAA0D;AAC1D,6CAA0C;AAQ1C,MAAa,kBAAkB;IAC7B,YAAoB,OAAkC;QAAlC,YAAO,GAAP,OAAO,CAA2B;IAAG,CAAC;IAE1D,IAAI,CAAC,MAAc;QACjB,IAAI,MAAM,CAAC,EAAE,KAAK,IAAA,+BAAgB,GAAE,EAAE;YACpC,OAAO,uBAAU,CAAC;SACnB;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;YAChB,MAAM,CAAC,IAAI,GAAG,WAAW,CAAC;SAC3B;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACzC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;YAEnC,8DAA8D;YAC9D,MAAM,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;YAErC,MAAM,IAAI,GAAG,cAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACnC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,cAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;YAExD,MAAM,MAAM,GACV,OAAO,YAAY,CAAC,UAAU,CAAC,KAAK,UAAU;gBAC5C,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC;gBAC1B,CAAC,CAAC,YAAY,CAAC,OAAO,KAAK,UAAU;oBACrC,CAAC,CAAC,YAAY,CAAC,OAAO;oBACtB,CAAC,CAAC,YAAY,CAAC;YAEnB,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC;SAC5B;QAED,MAAM,IAAI,KAAK,CAAC,8BAA8B,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;IAC7D,CAAC;CACF;AAlCD,gDAkCC"}

package/lib/runners/WorkerRunner.d.ts

@@ -1,22 +1,6 @@
-/// <reference types="node" />
-import { WorkerPool } from "@lage-run/worker-threads-pool";
 import type { AbortSignal } from "abort-controller";
-import type { Logger } from "@lage-run/logger";
-import type { Target, TargetConfig } from "@lage-run/target-graph";
+import type { Target } from "@lage-run/target-graph";
 import type { TargetRunner } from "@lage-run/scheduler-types";
-import type { Worker } from "worker_threads";
-import type { Readable } from "stream";
-export interface WorkerRunnerOptions {
-    logger: Logger;
-    workerTargetConfigs: Record<string, TargetConfig>;
-    nodeOptions?: string;
-}
-export interface PoolOptions {
-    id: string;
-    options: Record<string, any>;
-    script: string;
-    nodeOptions: string;
-}
 /**
  * Creates a workerpool per target task definition of "type: worker"
  *
@@ -34,8 +18,7 @@ export interface PoolOptions {
  *       type: "worker",
  *       options: {
  *         worker: "workers/lint.js",
- *         maxWorkers: 15,
- *         minWorkers: 2,
+ *         maxWorkers: 15
  *       }
  *     }
  *   }
@@ -44,19 +27,16 @@ export interface PoolOptions {
  *
  * ```js
  * // worker.js
- * const { WorkerRunner } = require("@lage-run/scheduler");
- * WorkerRunner.register({
- * })
+ * module.exports = async function lint({ target, abortSignal }) {
+ *  if (abortSignal.aborted) {
+ *    return;
+ *  }
+ *
+ *  // Do work here - but be sure to have a way to abort via the `abortSignal`
+ * }
  * ```
  */
 export declare class WorkerRunner implements TargetRunner {
-    private options;
-    private pools;
     static gracefulKillTimeout: number;
-    constructor(options: WorkerRunnerOptions);
-    getPoolOptions(target: Target): PoolOptions;
-    ensurePool(poolOptions: PoolOptions): WorkerPool;
-    captureStream(target: Target, _worker?: Worker, stdout?: Readable, stderr?: Readable): () => void;
     run(target: Target, abortSignal?: AbortSignal): Promise<void>;
-    cleanup(): Promise<void>;
 }

package/lib/runners/WorkerRunner.js

@@ -1,12 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkerRunner = void 0;
-const logger_1 = require("@lage-run/logger");
-const worker_threads_pool_1 = require("@lage-run/worker-threads-pool");
-const os_1 = __importDefault(require("os"));
 /**
  * Creates a workerpool per target task definition of "type: worker"
  *
@@ -24,8 +18,7 @@ const os_1 = __importDefault(require("os"));
  *       type: "worker",
  *       options: {
  *         worker: "workers/lint.js",
- *         maxWorkers: 15,
- *         minWorkers: 2,
+ *         maxWorkers: 15
  *       }
  *     }
  *   }
@@ -34,100 +27,26 @@ const os_1 = __importDefault(require("os"));
  *
  * ```js
  * // worker.js
- * const { WorkerRunner } = require("@lage-run/scheduler");
- * WorkerRunner.register({
- * })
+ * module.exports = async function lint({ target, abortSignal }) {
+ *  if (abortSignal.aborted) {
+ *    return;
+ *  }
+ *
+ *  // Do work here - but be sure to have a way to abort via the `abortSignal`
+ * }
  * ```
  */
 class WorkerRunner {
-    constructor(options) {
-        this.options = options;
-        this.pools = {};
-    }
-    getPoolOptions(target) {
-        var _a, _b, _c, _d, _e;
-        const { task } = target;
-        const { workerTargetConfigs } = this.options;
-        let id = "";
-        let options = {};
-        let script = "";
-        if (workerTargetConfigs[target.id]) {
-            id = target.id;
-            script = (_a = workerTargetConfigs[target.id].options) === null || _a === void 0 ? void 0 : _a.worker;
-            options = (_b = workerTargetConfigs[target.id].options) !== null && _b !== void 0 ? _b : {};
-        }
-        else if (workerTargetConfigs[task]) {
-            id = task;
-            script = (_c = workerTargetConfigs[task].options) === null || _c === void 0 ? void 0 : _c.worker;
-            options = (_d = workerTargetConfigs[task].options) !== null && _d !== void 0 ? _d : {};
-        }
-        return {
-            id,
-            script,
-            options,
-            nodeOptions: (_e = workerTargetConfigs[id].options) === null || _e === void 0 ? void 0 : _e.nodeOptions,
-        };
-    }
-    ensurePool(poolOptions) {
-        var _a;
-        const { id, script, options } = poolOptions;
-        if (!this.pools[id]) {
-            const pool = new worker_threads_pool_1.WorkerPool({
-                maxWorkers: (_a = options.maxWorkers) !== null && _a !== void 0 ? _a : os_1.default.cpus().length,
-                script,
-                workerOptions: {
-                    stdout: true,
-                    stderr: true,
-                },
-            });
-            this.pools[id] = pool;
-        }
-        return this.pools[id];
-    }
-    captureStream(target, _worker, stdout, stderr) {
-        const { logger } = this.options;
-        const onData = (data) => logger.log(logger_1.LogLevel.info, data, { target });
-        if (stdout) {
-            stdout.setEncoding("utf-8");
-            stdout.on("data", onData);
-        }
-        if (stderr) {
-            stderr.setEncoding("utf-8");
-            stderr.on("data", onData);
-        }
-        return () => {
-            if (stdout) {
-                stdout.off("data", onData);
-            }
-            if (stderr) {
-                stderr.off("data", onData);
-            }
-        };
-    }
     async run(target, abortSignal) {
-        if (abortSignal) {
-            if (abortSignal.aborted) {
-                return;
-            }
-            const abortSignalHandler = () => {
-                abortSignal.removeEventListener("abort", abortSignalHandler);
-                this.cleanup();
-            };
-            abortSignal.addEventListener("abort", abortSignalHandler);
-        }
-        const poolOptions = this.getPoolOptions(target);
-        const pool = this.ensurePool(poolOptions);
-        let cleanupStreams;
-        await pool.exec({ target }, (worker, stdout, stderr) => {
-            cleanupStreams = this.captureStream(target, worker, stdout, stderr);
-        }, () => {
-            cleanupStreams();
-        });
-    }
-    async cleanup() {
-        for (const pool of Object.values(this.pools)) {
-            await pool.close();
+        var _a, _b, _c, _d;
+        if (!((_a = target.options) === null || _a === void 0 ? void 0 : _a.worker)) {
+            throw new Error('WorkerRunner: "worker" configuration is required - e.g. { type: "worker", worker: "./worker.js" }');
         }
+        const scriptFile = (_c = (_b = target.options) === null || _b === void 0 ? void 0 : _b.worker) !== null && _c !== void 0 ? _c : (_d = target.options) === null || _d === void 0 ? void 0 : _d.script;
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const scriptModule = require(scriptFile);
+        const runFn = typeof scriptModule.default === "function" ? scriptModule.default : scriptModule;
+        await runFn({ target, abortSignal });
     }
 }
 exports.WorkerRunner = WorkerRunner;

package/lib/runners/WorkerRunner.js.map

@@ -1 +1 @@
-{"version":3,"file":"WorkerRunner.js","sourceRoot":"","sources":["../../src/runners/WorkerRunner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"WorkerRunner.js","sourceRoot":"","sources":["../../src/runners/WorkerRunner.ts"],"names":[],"mappings":";;;AAIA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,MAAa,YAAY;IAGvB,KAAK,CAAC,GAAG,CAAC,MAAc,EAAE,WAAyB;;QACjD,IAAI,CAAC,CAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,MAAM,CAAA,EAAE;YAC3B,MAAM,IAAI,KAAK,CAAC,mGAAmG,CAAC,CAAC;SACtH;QAED,MAAM,UAAU,GAAG,MAAA,MAAA,MAAM,CAAC,OAAO,0CAAE,MAAM,mCAAI,MAAA,MAAM,CAAC,OAAO,0CAAE,MAAM,CAAC;QAEpE,8DAA8D;QAC9D,MAAM,YAAY,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QACzC,MAAM,KAAK,GAAG,OAAO,YAAY,CAAC,OAAO,KAAK,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC;QAE/F,MAAM,KAAK,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;IACvC,CAAC;;AAfH,oCAgBC;AAfQ,gCAAmB,GAAG,IAAI,CAAC"}

package/lib/workers/targetWorker.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/workers/targetWorker.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const worker_threads_pool_1 = require("@lage-run/worker-threads-pool");
+const TargetRunnerPicker_1 = require("../runners/TargetRunnerPicker");
+const worker_threads_1 = require("worker_threads");
+function setup(options) {
+    const { runners } = options;
+    const runnerPicker = new TargetRunnerPicker_1.TargetRunnerPicker(runners);
+    return {
+        runnerPicker,
+    };
+}
+const { runnerPicker } = setup(worker_threads_1.workerData);
+async function run(data, abortSignal) {
+    const runner = runnerPicker.pick(data.target);
+    await runner.run(data.target, abortSignal);
+}
+(0, worker_threads_pool_1.registerWorker)(run);
+//# sourceMappingURL=targetWorker.js.map

package/lib/workers/targetWorker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"targetWorker.js","sourceRoot":"","sources":["../../src/workers/targetWorker.ts"],"names":[],"mappings":";;AAAA,uEAA+D;AAC/D,sEAAmE;AACnE,mDAA4C;AAQ5C,SAAS,KAAK,CAAC,OAAgC;IAC7C,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAE5B,MAAM,YAAY,GAAG,IAAI,uCAAkB,CAAC,OAAO,CAAC,CAAC;IAErD,OAAO;QACL,YAAY;KACb,CAAC;AACJ,CAAC;AAED,MAAM,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,2BAAU,CAAC,CAAC;AAE3C,KAAK,UAAU,GAAG,CAAC,IAAS,EAAE,WAAyB;IACrD,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9C,MAAM,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAC7C,CAAC;AAED,IAAA,oCAAc,EAAC,GAAG,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lage-run/scheduler",
-  "version": "0.3.13",
+  "version": "0.4.0",
   "description": "Scheduler for Lage",
   "repository": {
     "url": "https://github.com/microsoft/lage"
@@ -18,14 +18,14 @@
     "@lage-run/target-graph": "^0.4.2",
     "@lage-run/logger": "^1.2.0",
     "@lage-run/cache": "^0.1.16",
-    "@lage-run/worker-threads-pool": "^0.1.4",
+    "@lage-run/worker-threads-pool": "^0.1.6",
     "p-graph": "^1.1.1",
     "p-profiler": "^0.2.1",
     "abort-controller": "^3.0.0",
     "workspace-tools": "^0.28.0"
   },
   "devDependencies": {
-    "@lage-run/scheduler-types": "^0.1.2",
+    "@lage-run/scheduler-types": "^0.1.4",
     "@lage-run/monorepo-fixture": "*",
     "@types/workerpool": "6.1.0",
     "monorepo-scripts": "*"

package/lib/createCachedOutputTransform.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="node" />
-import type { Target } from "@lage-run/target-graph";
-import { Transform } from "stream";
-export declare function getLageOutputCacheLocation(target: Target, hash: string): string;
-export declare function createCachedOutputTransform(target: Target, hash: string): Transform;

package/lib/createCachedOutputTransform.js

@@ -1,37 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createCachedOutputTransform = exports.getLageOutputCacheLocation = void 0;
-const stream_1 = require("stream");
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-function getLageOutputCacheLocation(target, hash) {
-    const outputPath = path_1.default.join(target.cwd, "node_modules/.cache/lage/output/");
-    return path_1.default.join(outputPath, hash + ".txt");
-}
-exports.getLageOutputCacheLocation = getLageOutputCacheLocation;
-function createCachedOutputTransform(target, hash) {
-    const outputFile = getLageOutputCacheLocation(target, hash);
-    const outputPath = path_1.default.dirname(outputFile);
-    if (!fs_1.default.existsSync(outputFile)) {
-        fs_1.default.mkdirSync(outputPath, { recursive: true });
-        const writeStream = fs_1.default.createWriteStream(path_1.default.join(outputPath, hash + ".txt"));
-        const transform = new stream_1.Transform({
-            transform(chunk, encoding, callback) {
-                writeStream.write(chunk);
-                callback(null, chunk);
-            },
-        });
-        return transform;
-    }
-    const transform = new stream_1.Transform({
-        transform(chunk, encoding, callback) {
-            callback(null, chunk);
-        },
-    });
-    return transform;
-}
-exports.createCachedOutputTransform = createCachedOutputTransform;
-//# sourceMappingURL=createCachedOutputTransform.js.map

package/lib/createCachedOutputTransform.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"createCachedOutputTransform.js","sourceRoot":"","sources":["../src/createCachedOutputTransform.ts"],"names":[],"mappings":";;;;;;AACA,mCAAmC;AACnC,4CAAoB;AACpB,gDAAwB;AAExB,SAAgB,0BAA0B,CAAC,MAAc,EAAE,IAAY;IACrE,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,kCAAkC,CAAC,CAAC;IAC7E,OAAO,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,GAAG,MAAM,CAAC,CAAC;AAC9C,CAAC;AAHD,gEAGC;AAED,SAAgB,2BAA2B,CAAC,MAAc,EAAE,IAAY;IACtE,MAAM,UAAU,GAAG,0BAA0B,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC5D,MAAM,UAAU,GAAG,cAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAE5C,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;QAC9B,YAAE,CAAC,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,MAAM,WAAW,GAAG,YAAE,CAAC,iBAAiB,CAAC,cAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC;QAE/E,MAAM,SAAS,GAAG,IAAI,kBAAS,CAAC;YAC9B,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ;gBACjC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBACzB,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACxB,CAAC;SACF,CAAC,CAAC;QAEH,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,SAAS,GAAG,IAAI,kBAAS,CAAC;QAC9B,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ;YACjC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACxB,CAAC;KACF,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACnB,CAAC;AAzBD,kEAyBC"}