@lage-run/cli 0.24.6 → 0.24.7

package/CHANGELOG.json

@@ -2,7 +2,22 @@
   "name": "@lage-run/cli",
   "entries": [
     {
-      "date": "Sun, 08 Dec 2024 00:07:13 GMT",
+      "date": "Mon, 09 Dec 2024 06:21:41 GMT",
+      "version": "0.24.7",
+      "tag": "@lage-run/cli_v0.24.7",
+      "comments": {
+        "patch": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/cli",
+            "commit": "4584a7356e544bd87a0c79180baa9f14cd971baf",
+            "comment": "fixing the outputs so it includes files I/O"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Sun, 08 Dec 2024 00:07:28 GMT",
       "version": "0.24.6",
       "tag": "@lage-run/cli_v0.24.6",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,20 @@
 # Change Log - @lage-run/cli
 
-<!-- This log was last generated on Sun, 08 Dec 2024 00:07:13 GMT and should not be manually modified. -->
+<!-- This log was last generated on Mon, 09 Dec 2024 06:21:41 GMT and should not be manually modified. -->
 
 <!-- Start content -->
 
+## 0.24.7
+
+Mon, 09 Dec 2024 06:21:41 GMT
+
+### Patches
+
+- fixing the outputs so it includes files I/O (kchau@microsoft.com)
+
 ## 0.24.6
 
-Sun, 08 Dec 2024 00:07:13 GMT
+Sun, 08 Dec 2024 00:07:28 GMT
 
 ### Patches
 

package/lib/commands/server/lageService.js

@@ -14,6 +14,8 @@ const _workspacetools = require("workspace-tools");
 const _createTargetGraph = require("../run/createTargetGraph.js");
 const _workerthreadspool = require("@lage-run/worker-threads-pool");
 const _hasher = require("@lage-run/hasher");
+const _getOutputFiles = require("./getOutputFiles.js");
+const _globby = require("@lage-run/globby");
 const _MemoryStream = require("./MemoryStream.js");
 const _runnerPickerOptions = require("../../runnerPickerOptions.js");
 const _filterPipelineDefinitions = require("../run/filterPipelineDefinitions.js");
@@ -186,25 +188,25 @@ async function createLageService({ cwd, serverControls, logger, concurrency, tas
                     pipedStdout.unpipe(writableStdout);
                     pipedStderr.unpipe(writableStderr);
                 });
-                // const globalInputs = target.environmentGlob
-                //   ? glob(target.environmentGlob, { cwd: root, gitignore: true })
-                //   : config.cacheOptions?.environmentGlob
-                //   ? glob(config.cacheOptions?.environmentGlob, { cwd: root, gitignore: true })
-                //   : ["lage.config.js"];
-                // const inputs = (getInputFiles(target, dependencyMap, packageTree) ?? []).concat(globalInputs);
+                const globalInputs = target.environmentGlob ? (0, _globby.glob)(target.environmentGlob, {
+                    cwd: root,
+                    gitignore: true
+                }) : config.cacheOptions?.environmentGlob ? (0, _globby.glob)(config.cacheOptions?.environmentGlob, {
+                    cwd: root,
+                    gitignore: true
+                }) : [
+                    "lage.config.js"
+                ];
+                const inputs = ((0, _hasher.getInputFiles)(target, dependencyMap, packageTree) ?? []).concat(globalInputs);
                 return {
                     packageName: request.packageName,
                     task: request.task,
                     exitCode: 0,
                     hash: "",
-                    // inputs,
-                    // outputs: getOutputFiles(root, target, config.cacheOptions?.outputGlob, packageTree),
-                    // stdout: writableStdout.toString(),
-                    // stderr: writableStderr.toString(),
-                    inputs: [],
-                    outputs: [],
-                    stdout: "",
-                    stderr: "",
+                    inputs,
+                    outputs: (0, _getOutputFiles.getOutputFiles)(root, target, config.cacheOptions?.outputGlob, packageTree),
+                    stdout: writableStdout.toString(),
+                    stderr: writableStderr.toString(),
                     id
                 };
             } catch (e) {

package/lib/commands/server/lageService.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/commands/server/lageService.ts"],"sourcesContent":["import { type ConfigOptions, getConfig, getConcurrency, getMaxWorkersPerTask } from \"@lage-run/config\";\nimport type { Logger } from \"@lage-run/logger\";\nimport type { ILageService } from \"@lage-run/rpc\";\nimport { getTargetId, type TargetGraph } from \"@lage-run/target-graph\";\nimport { type DependencyMap, getPackageInfos, getWorkspaceRoot } from \"workspace-tools\";\nimport { createTargetGraph } from \"../run/createTargetGraph.js\";\nimport { type Readable } from \"stream\";\nimport { type Pool, AggregatedPool } from \"@lage-run/worker-threads-pool\";\nimport { getInputFiles, PackageTree } from \"@lage-run/hasher\";\nimport { createDependencyMap } from \"workspace-tools\";\nimport { getOutputFiles } from \"./getOutputFiles.js\";\nimport { glob } from \"@lage-run/globby\";\nimport { MemoryStream } from \"./MemoryStream.js\";\nimport { runnerPickerOptions } from \"../../runnerPickerOptions.js\";\nimport { filterPipelineDefinitions } from \"../run/filterPipelineDefinitions.js\";\nimport type { TargetRun } from \"@lage-run/scheduler-types\";\nimport { formatDuration, hrToSeconds, hrtimeDiff } from \"@lage-run/format-hrtime\";\n\ninterface LageServiceContext {\n  config: ConfigOptions;\n  targetGraph: TargetGraph;\n  packageTree: PackageTree;\n  dependencyMap: DependencyMap;\n  root: string;\n  pool: Pool;\n}\n\nlet initializedPromise: Promise<LageServiceContext> | undefined;\ninterface ServiceControls {\n  abortController: AbortController;\n  countdownToShutdown: () => void;\n  clearCountdown: () => void;\n}\ninterface InitializeOptions {\n  cwd: string;\n  logger: Logger;\n  serverControls: ServiceControls;\n  concurrency?: number;\n  nodeArg?: string;\n  taskArgs: string[];\n  tasks: string[];\n}\n\nfunction formatBytes(bytes: number) {\n  return `${(bytes / 1024 / 1024).toFixed(2)} MB`;\n}\n\nasync function createInitializedPromise({ cwd, logger, serverControls, nodeArg, taskArgs, concurrency, tasks }: InitializeOptions) {\n  if (initializedPromise) {\n    return initializedPromise;\n  }\n\n  const config = await getConfig(cwd);\n  const root = getWorkspaceRoot(cwd)!;\n  const maxWorkers = getConcurrency(concurrency, config.concurrency);\n\n  logger.info(`Initializing with ${maxWorkers} workers, tasks: ${tasks.join(\", \")}`);\n\n  const { pipeline } = config;\n\n  const packageInfos = getPackageInfos(root);\n\n  const targetGraph = await createTargetGraph({\n    logger,\n    root,\n    dependencies: false,\n    dependents: false,\n    ignore: [],\n    pipeline,\n    repoWideChanges: config.repoWideChanges,\n    scope: undefined,\n    since: undefined,\n    outputs: config.cacheOptions.outputGlob,\n    tasks,\n    packageInfos,\n  });\n\n  const dependencyMap = createDependencyMap(packageInfos, { withDevDependencies: true, withPeerDependencies: false });\n  const packageTree = new PackageTree({\n    root,\n    packageInfos,\n    includeUntracked: true,\n  });\n\n  logger.info(\"Initializing Package Tree\");\n  await packageTree.initialize();\n\n  const filteredPipeline = filterPipelineDefinitions(targetGraph.targets.values(), config.pipeline);\n\n  const pool = new AggregatedPool({\n    logger,\n    maxWorkersByGroup: new Map([...getMaxWorkersPerTask(filteredPipeline, maxWorkers)]),\n    groupBy: ({ target }) => target.task,\n    maxWorkers,\n    script: require.resolve(\"./singleTargetWorker.js\"),\n    workerOptions: {\n      stdout: true,\n      stderr: true,\n      workerData: {\n        runners: {\n          ...runnerPickerOptions(nodeArg, config.npmClient, taskArgs),\n          ...config.runners,\n          shouldCache: false,\n          shouldResetCache: false,\n        },\n      },\n    },\n    workerIdleMemoryLimit: config.workerIdleMemoryLimit,\n  });\n\n  serverControls.abortController.signal.addEventListener(\"abort\", () => {\n    pool?.close();\n  });\n\n  pool?.on(\"freedWorker\", () => {\n    logger.silly(`Max Worker Memory Usage: ${formatBytes(pool?.stats().maxWorkerMemoryUsage)}`);\n  });\n\n  pool?.on(\"idle\", () => {\n    logger.info(\"All workers are idle, shutting down after timeout\");\n    serverControls.countdownToShutdown();\n  });\n\n  return { config, targetGraph, packageTree, dependencyMap, root, pool };\n}\n\n/**\n * Initializes the lageService: the extra \"initializePromise\" ensures only one initialization is done at a time across threads\n * @param cwd\n * @param logger\n * @returns\n */\nasync function initialize(options: InitializeOptions): Promise<LageServiceContext> {\n  initializedPromise = createInitializedPromise(options);\n  return initializedPromise;\n}\n\ninterface CreateLageServiceOptions {\n  cwd: string;\n  serverControls: ServiceControls;\n  logger: Logger;\n  concurrency?: number;\n  tasks: string[];\n}\n\nexport async function createLageService({\n  cwd,\n  serverControls,\n  logger,\n  concurrency,\n  tasks,\n}: CreateLageServiceOptions): Promise<ILageService> {\n  return {\n    async ping() {\n      return { pong: true };\n    },\n\n    async runTarget(request) {\n      if (global.gc) {\n        global.gc();\n      }\n\n      serverControls.clearCountdown();\n\n      // THIS IS A BIG ASSUMPTION; TODO: memoize based on the parameters of the initialize() call\n      // The first request sets up the nodeArg and taskArgs - we are assuming that all requests to run this target are coming from the same\n      // `lage info` call\n      const { config, targetGraph, dependencyMap, packageTree, root, pool } = await initialize({\n        cwd,\n        logger,\n        nodeArg: request.nodeOptions,\n        taskArgs: request.taskArgs,\n        serverControls,\n        concurrency,\n        tasks,\n      });\n\n      const runners = runnerPickerOptions(request.nodeOptions, config.npmClient, request.taskArgs);\n\n      const id = getTargetId(request.packageName, request.task);\n\n      if (!targetGraph.targets.has(id)) {\n        logger.info(`Target not found: ${request.packageName}#${request.task}`);\n        return {\n          packageName: request.packageName,\n          task: request.task,\n          exitCode: 1,\n        };\n      }\n\n      const target = targetGraph.targets.get(id)!;\n      const task = {\n        target,\n        runners,\n      };\n\n      const writableStdout = new MemoryStream();\n      const writableStderr = new MemoryStream();\n      let pipedStdout: Readable;\n      let pipedStderr: Readable;\n\n      const targetRun: TargetRun = {\n        queueTime: process.hrtime(),\n        target,\n        duration: [0, 0],\n        startTime: [0, 0],\n        status: \"queued\",\n        threadId: 0,\n      };\n\n      try {\n        await pool.exec(\n          task,\n          0,\n          (worker, stdout, stderr) => {\n            logger.info(`[${worker.threadId}] ${request.packageName}#${request.task} start`);\n\n            pipedStdout = stdout;\n            pipedStderr = stderr;\n\n            stdout.pipe(writableStdout);\n            stderr.pipe(writableStderr);\n\n            targetRun.threadId = worker.threadId;\n            targetRun.status = \"running\";\n            targetRun.startTime = process.hrtime();\n          },\n          (worker) => {\n            logger.info(`Max Worker Memory Usage: ${formatBytes(pool.stats().maxWorkerMemoryUsage)}`);\n\n            // logger.info the main process memory usage\n            const memoryUsage = process.memoryUsage();\n            logger.info(\n              `Main Process Memory Usage: RSS: ${formatBytes(memoryUsage.rss)} Heap Total: ${formatBytes(\n                memoryUsage.heapTotal\n              )} Heap Used: ${formatBytes(memoryUsage.heapUsed)}`\n            );\n\n            targetRun.status = \"success\";\n            targetRun.duration = hrtimeDiff(targetRun.startTime, process.hrtime());\n\n            logger.info(\n              `[${worker.threadId}] ${request.packageName}#${request.task} end: ${formatDuration(hrToSeconds(targetRun.duration))}`\n            );\n            pipedStdout.unpipe(writableStdout);\n            pipedStderr.unpipe(writableStderr);\n          }\n        );\n\n        // const globalInputs = target.environmentGlob\n        //   ? glob(target.environmentGlob, { cwd: root, gitignore: true })\n        //   : config.cacheOptions?.environmentGlob\n        //   ? glob(config.cacheOptions?.environmentGlob, { cwd: root, gitignore: true })\n        //   : [\"lage.config.js\"];\n        // const inputs = (getInputFiles(target, dependencyMap, packageTree) ?? []).concat(globalInputs);\n\n        return {\n          packageName: request.packageName,\n          task: request.task,\n          exitCode: 0,\n          hash: \"\",\n          // inputs,\n          // outputs: getOutputFiles(root, target, config.cacheOptions?.outputGlob, packageTree),\n          // stdout: writableStdout.toString(),\n          // stderr: writableStderr.toString(),\n          inputs: [],\n          outputs: [],\n          stdout: \"\",\n          stderr: \"\",\n          id,\n        };\n      } catch (e) {\n        return {\n          packageName: request.packageName,\n          task: request.task,\n          exitCode: 1,\n          hash: \"\",\n          inputs: [],\n          outputs: [],\n          stdout: \"\",\n          stderr: e instanceof Error ? e.toString() : \"\",\n          id,\n        };\n      }\n    },\n  };\n}\n"],"names":["createLageService","initializedPromise","formatBytes","bytes","toFixed","createInitializedPromise","cwd","logger","serverControls","nodeArg","taskArgs","concurrency","tasks","config","getConfig","root","getWorkspaceRoot","maxWorkers","getConcurrency","info","join","pipeline","packageInfos","getPackageInfos","targetGraph","createTargetGraph","dependencies","dependents","ignore","repoWideChanges","scope","undefined","since","outputs","cacheOptions","outputGlob","dependencyMap","createDependencyMap","withDevDependencies","withPeerDependencies","packageTree","PackageTree","includeUntracked","initialize","filteredPipeline","filterPipelineDefinitions","targets","values","pool","AggregatedPool","maxWorkersByGroup","Map","getMaxWorkersPerTask","groupBy","target","task","script","require","resolve","workerOptions","stdout","stderr","workerData","runners","runnerPickerOptions","npmClient","shouldCache","shouldResetCache","workerIdleMemoryLimit","abortController","signal","addEventListener","close","on","silly","stats","maxWorkerMemoryUsage","countdownToShutdown","options","ping","pong","runTarget","request","global","gc","clearCountdown","nodeOptions","id","getTargetId","packageName","has","exitCode","get","writableStdout","MemoryStream","writableStderr","pipedStdout","pipedStderr","targetRun","queueTime","process","hrtime","duration","startTime","status","threadId","exec","worker","pipe","memoryUsage","rss","heapTotal","heapUsed","hrtimeDiff","formatDuration","hrToSeconds","unpipe","hash","inputs","e","Error","toString"],"mappings":"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"}
+{"version":3,"sources":["../../../src/commands/server/lageService.ts"],"sourcesContent":["import { type ConfigOptions, getConfig, getConcurrency, getMaxWorkersPerTask } from \"@lage-run/config\";\nimport type { Logger } from \"@lage-run/logger\";\nimport type { ILageService } from \"@lage-run/rpc\";\nimport { getTargetId, type TargetGraph } from \"@lage-run/target-graph\";\nimport { type DependencyMap, getPackageInfos, getWorkspaceRoot } from \"workspace-tools\";\nimport { createTargetGraph } from \"../run/createTargetGraph.js\";\nimport { type Readable } from \"stream\";\nimport { type Pool, AggregatedPool } from \"@lage-run/worker-threads-pool\";\nimport { getInputFiles, PackageTree } from \"@lage-run/hasher\";\nimport { createDependencyMap } from \"workspace-tools\";\nimport { getOutputFiles } from \"./getOutputFiles.js\";\nimport { glob } from \"@lage-run/globby\";\nimport { MemoryStream } from \"./MemoryStream.js\";\nimport { runnerPickerOptions } from \"../../runnerPickerOptions.js\";\nimport { filterPipelineDefinitions } from \"../run/filterPipelineDefinitions.js\";\nimport type { TargetRun } from \"@lage-run/scheduler-types\";\nimport { formatDuration, hrToSeconds, hrtimeDiff } from \"@lage-run/format-hrtime\";\n\ninterface LageServiceContext {\n  config: ConfigOptions;\n  targetGraph: TargetGraph;\n  packageTree: PackageTree;\n  dependencyMap: DependencyMap;\n  root: string;\n  pool: Pool;\n}\n\nlet initializedPromise: Promise<LageServiceContext> | undefined;\ninterface ServiceControls {\n  abortController: AbortController;\n  countdownToShutdown: () => void;\n  clearCountdown: () => void;\n}\ninterface InitializeOptions {\n  cwd: string;\n  logger: Logger;\n  serverControls: ServiceControls;\n  concurrency?: number;\n  nodeArg?: string;\n  taskArgs: string[];\n  tasks: string[];\n}\n\nfunction formatBytes(bytes: number) {\n  return `${(bytes / 1024 / 1024).toFixed(2)} MB`;\n}\n\nasync function createInitializedPromise({ cwd, logger, serverControls, nodeArg, taskArgs, concurrency, tasks }: InitializeOptions) {\n  if (initializedPromise) {\n    return initializedPromise;\n  }\n\n  const config = await getConfig(cwd);\n  const root = getWorkspaceRoot(cwd)!;\n  const maxWorkers = getConcurrency(concurrency, config.concurrency);\n\n  logger.info(`Initializing with ${maxWorkers} workers, tasks: ${tasks.join(\", \")}`);\n\n  const { pipeline } = config;\n\n  const packageInfos = getPackageInfos(root);\n\n  const targetGraph = await createTargetGraph({\n    logger,\n    root,\n    dependencies: false,\n    dependents: false,\n    ignore: [],\n    pipeline,\n    repoWideChanges: config.repoWideChanges,\n    scope: undefined,\n    since: undefined,\n    outputs: config.cacheOptions.outputGlob,\n    tasks,\n    packageInfos,\n  });\n\n  const dependencyMap = createDependencyMap(packageInfos, { withDevDependencies: true, withPeerDependencies: false });\n  const packageTree = new PackageTree({\n    root,\n    packageInfos,\n    includeUntracked: true,\n  });\n\n  logger.info(\"Initializing Package Tree\");\n  await packageTree.initialize();\n\n  const filteredPipeline = filterPipelineDefinitions(targetGraph.targets.values(), config.pipeline);\n\n  const pool = new AggregatedPool({\n    logger,\n    maxWorkersByGroup: new Map([...getMaxWorkersPerTask(filteredPipeline, maxWorkers)]),\n    groupBy: ({ target }) => target.task,\n    maxWorkers,\n    script: require.resolve(\"./singleTargetWorker.js\"),\n    workerOptions: {\n      stdout: true,\n      stderr: true,\n      workerData: {\n        runners: {\n          ...runnerPickerOptions(nodeArg, config.npmClient, taskArgs),\n          ...config.runners,\n          shouldCache: false,\n          shouldResetCache: false,\n        },\n      },\n    },\n    workerIdleMemoryLimit: config.workerIdleMemoryLimit,\n  });\n\n  serverControls.abortController.signal.addEventListener(\"abort\", () => {\n    pool?.close();\n  });\n\n  pool?.on(\"freedWorker\", () => {\n    logger.silly(`Max Worker Memory Usage: ${formatBytes(pool?.stats().maxWorkerMemoryUsage)}`);\n  });\n\n  pool?.on(\"idle\", () => {\n    logger.info(\"All workers are idle, shutting down after timeout\");\n    serverControls.countdownToShutdown();\n  });\n\n  return { config, targetGraph, packageTree, dependencyMap, root, pool };\n}\n\n/**\n * Initializes the lageService: the extra \"initializePromise\" ensures only one initialization is done at a time across threads\n * @param cwd\n * @param logger\n * @returns\n */\nasync function initialize(options: InitializeOptions): Promise<LageServiceContext> {\n  initializedPromise = createInitializedPromise(options);\n  return initializedPromise;\n}\n\ninterface CreateLageServiceOptions {\n  cwd: string;\n  serverControls: ServiceControls;\n  logger: Logger;\n  concurrency?: number;\n  tasks: string[];\n}\n\nexport async function createLageService({\n  cwd,\n  serverControls,\n  logger,\n  concurrency,\n  tasks,\n}: CreateLageServiceOptions): Promise<ILageService> {\n  return {\n    async ping() {\n      return { pong: true };\n    },\n\n    async runTarget(request) {\n      if (global.gc) {\n        global.gc();\n      }\n\n      serverControls.clearCountdown();\n\n      // THIS IS A BIG ASSUMPTION; TODO: memoize based on the parameters of the initialize() call\n      // The first request sets up the nodeArg and taskArgs - we are assuming that all requests to run this target are coming from the same\n      // `lage info` call\n      const { config, targetGraph, dependencyMap, packageTree, root, pool } = await initialize({\n        cwd,\n        logger,\n        nodeArg: request.nodeOptions,\n        taskArgs: request.taskArgs,\n        serverControls,\n        concurrency,\n        tasks,\n      });\n\n      const runners = runnerPickerOptions(request.nodeOptions, config.npmClient, request.taskArgs);\n\n      const id = getTargetId(request.packageName, request.task);\n\n      if (!targetGraph.targets.has(id)) {\n        logger.info(`Target not found: ${request.packageName}#${request.task}`);\n        return {\n          packageName: request.packageName,\n          task: request.task,\n          exitCode: 1,\n        };\n      }\n\n      const target = targetGraph.targets.get(id)!;\n      const task = {\n        target,\n        runners,\n      };\n\n      const writableStdout = new MemoryStream();\n      const writableStderr = new MemoryStream();\n      let pipedStdout: Readable;\n      let pipedStderr: Readable;\n\n      const targetRun: TargetRun = {\n        queueTime: process.hrtime(),\n        target,\n        duration: [0, 0],\n        startTime: [0, 0],\n        status: \"queued\",\n        threadId: 0,\n      };\n\n      try {\n        await pool.exec(\n          task,\n          0,\n          (worker, stdout, stderr) => {\n            logger.info(`[${worker.threadId}] ${request.packageName}#${request.task} start`);\n\n            pipedStdout = stdout;\n            pipedStderr = stderr;\n\n            stdout.pipe(writableStdout);\n            stderr.pipe(writableStderr);\n\n            targetRun.threadId = worker.threadId;\n            targetRun.status = \"running\";\n            targetRun.startTime = process.hrtime();\n          },\n          (worker) => {\n            logger.info(`Max Worker Memory Usage: ${formatBytes(pool.stats().maxWorkerMemoryUsage)}`);\n\n            // logger.info the main process memory usage\n            const memoryUsage = process.memoryUsage();\n            logger.info(\n              `Main Process Memory Usage: RSS: ${formatBytes(memoryUsage.rss)} Heap Total: ${formatBytes(\n                memoryUsage.heapTotal\n              )} Heap Used: ${formatBytes(memoryUsage.heapUsed)}`\n            );\n\n            targetRun.status = \"success\";\n            targetRun.duration = hrtimeDiff(targetRun.startTime, process.hrtime());\n\n            logger.info(\n              `[${worker.threadId}] ${request.packageName}#${request.task} end: ${formatDuration(hrToSeconds(targetRun.duration))}`\n            );\n            pipedStdout.unpipe(writableStdout);\n            pipedStderr.unpipe(writableStderr);\n          }\n        );\n\n        const globalInputs = target.environmentGlob\n          ? glob(target.environmentGlob, { cwd: root, gitignore: true })\n          : config.cacheOptions?.environmentGlob\n          ? glob(config.cacheOptions?.environmentGlob, { cwd: root, gitignore: true })\n          : [\"lage.config.js\"];\n        const inputs = (getInputFiles(target, dependencyMap, packageTree) ?? []).concat(globalInputs);\n\n        return {\n          packageName: request.packageName,\n          task: request.task,\n          exitCode: 0,\n          hash: \"\",\n          inputs,\n          outputs: getOutputFiles(root, target, config.cacheOptions?.outputGlob, packageTree),\n          stdout: writableStdout.toString(),\n          stderr: writableStderr.toString(),\n          id,\n        };\n      } catch (e) {\n        return {\n          packageName: request.packageName,\n          task: request.task,\n          exitCode: 1,\n          hash: \"\",\n          inputs: [],\n          outputs: [],\n          stdout: \"\",\n          stderr: e instanceof Error ? e.toString() : \"\",\n          id,\n        };\n      }\n    },\n  };\n}\n"],"names":["createLageService","initializedPromise","formatBytes","bytes","toFixed","createInitializedPromise","cwd","logger","serverControls","nodeArg","taskArgs","concurrency","tasks","config","getConfig","root","getWorkspaceRoot","maxWorkers","getConcurrency","info","join","pipeline","packageInfos","getPackageInfos","targetGraph","createTargetGraph","dependencies","dependents","ignore","repoWideChanges","scope","undefined","since","outputs","cacheOptions","outputGlob","dependencyMap","createDependencyMap","withDevDependencies","withPeerDependencies","packageTree","PackageTree","includeUntracked","initialize","filteredPipeline","filterPipelineDefinitions","targets","values","pool","AggregatedPool","maxWorkersByGroup","Map","getMaxWorkersPerTask","groupBy","target","task","script","require","resolve","workerOptions","stdout","stderr","workerData","runners","runnerPickerOptions","npmClient","shouldCache","shouldResetCache","workerIdleMemoryLimit","abortController","signal","addEventListener","close","on","silly","stats","maxWorkerMemoryUsage","countdownToShutdown","options","ping","pong","runTarget","request","global","gc","clearCountdown","nodeOptions","id","getTargetId","packageName","has","exitCode","get","writableStdout","MemoryStream","writableStderr","pipedStdout","pipedStderr","targetRun","queueTime","process","hrtime","duration","startTime","status","threadId","exec","worker","pipe","memoryUsage","rss","heapTotal","heapUsed","hrtimeDiff","formatDuration","hrToSeconds","unpipe","globalInputs","environmentGlob","glob","gitignore","inputs","getInputFiles","concat","hash","getOutputFiles","toString","e","Error"],"mappings":";;;;+BAiJsBA;;;eAAAA;;;wBAjJ8D;6BAGtC;gCACwB;mCACpC;mCAEQ;wBACC;gCAEZ;wBACV;8BACQ;qCACO;2CACM;8BAEc;AAWxD,IAAIC;AAgBJ,SAASC,YAAYC,KAAa;IAChC,OAAO,GAAG,AAACA,CAAAA,QAAQ,OAAO,IAAG,EAAGC,OAAO,CAAC,GAAG,GAAG,CAAC;AACjD;AAEA,eAAeC,yBAAyB,EAAEC,GAAG,EAAEC,MAAM,EAAEC,cAAc,EAAEC,OAAO,EAAEC,QAAQ,EAAEC,WAAW,EAAEC,KAAK,EAAqB;IAC/H,IAAIX,oBAAoB;QACtB,OAAOA;IACT;IAEA,MAAMY,SAAS,MAAMC,IAAAA,iBAAS,EAACR;IAC/B,MAAMS,OAAOC,IAAAA,gCAAgB,EAACV;IAC9B,MAAMW,aAAaC,IAAAA,sBAAc,EAACP,aAAaE,OAAOF,WAAW;IAEjEJ,OAAOY,IAAI,CAAC,CAAC,kBAAkB,EAAEF,WAAW,iBAAiB,EAAEL,MAAMQ,IAAI,CAAC,OAAO;IAEjF,MAAM,EAAEC,QAAQ,EAAE,GAAGR;IAErB,MAAMS,eAAeC,IAAAA,+BAAe,EAACR;IAErC,MAAMS,cAAc,MAAMC,IAAAA,oCAAiB,EAAC;QAC1ClB;QACAQ;QACAW,cAAc;QACdC,YAAY;QACZC,QAAQ,EAAE;QACVP;QACAQ,iBAAiBhB,OAAOgB,eAAe;QACvCC,OAAOC;QACPC,OAAOD;QACPE,SAASpB,OAAOqB,YAAY,CAACC,UAAU;QACvCvB;QACAU;IACF;IAEA,MAAMc,gBAAgBC,IAAAA,mCAAmB,EAACf,cAAc;QAAEgB,qBAAqB;QAAMC,sBAAsB;IAAM;IACjH,MAAMC,cAAc,IAAIC,mBAAW,CAAC;QAClC1B;QACAO;QACAoB,kBAAkB;IACpB;IAEAnC,OAAOY,IAAI,CAAC;IACZ,MAAMqB,YAAYG,UAAU;IAE5B,MAAMC,mBAAmBC,IAAAA,oDAAyB,EAACrB,YAAYsB,OAAO,CAACC,MAAM,IAAIlC,OAAOQ,QAAQ;IAEhG,MAAM2B,OAAO,IAAIC,iCAAc,CAAC;QAC9B1C;QACA2C,mBAAmB,IAAIC,IAAI;eAAIC,IAAAA,4BAAoB,EAACR,kBAAkB3B;SAAY;QAClFoC,SAAS,CAAC,EAAEC,MAAM,EAAE,GAAKA,OAAOC,IAAI;QACpCtC;QACAuC,QAAQC,QAAQC,OAAO,CAAC;QACxBC,eAAe;YACbC,QAAQ;YACRC,QAAQ;YACRC,YAAY;gBACVC,SAAS;oBACP,GAAGC,IAAAA,wCAAmB,EAACvD,SAASI,OAAOoD,SAAS,EAAEvD,SAAS;oBAC3D,GAAGG,OAAOkD,OAAO;oBACjBG,aAAa;oBACbC,kBAAkB;gBACpB;YACF;QACF;QACAC,uBAAuBvD,OAAOuD,qBAAqB;IACrD;IAEA5D,eAAe6D,eAAe,CAACC,MAAM,CAACC,gBAAgB,CAAC,SAAS;QAC9DvB,MAAMwB;IACR;IAEAxB,MAAMyB,GAAG,eAAe;QACtBlE,OAAOmE,KAAK,CAAC,CAAC,yBAAyB,EAAExE,YAAY8C,MAAM2B,QAAQC,uBAAuB;IAC5F;IAEA5B,MAAMyB,GAAG,QAAQ;QACflE,OAAOY,IAAI,CAAC;QACZX,eAAeqE,mBAAmB;IACpC;IAEA,OAAO;QAAEhE;QAAQW;QAAagB;QAAaJ;QAAerB;QAAMiC;IAAK;AACvE;AAEA;;;;;CAKC,GACD,eAAeL,WAAWmC,OAA0B;IAClD7E,qBAAqBI,yBAAyByE;IAC9C,OAAO7E;AACT;AAUO,eAAeD,kBAAkB,EACtCM,GAAG,EACHE,cAAc,EACdD,MAAM,EACNI,WAAW,EACXC,KAAK,EACoB;IACzB,OAAO;QACL,MAAMmE;YACJ,OAAO;gBAAEC,MAAM;YAAK;QACtB;QAEA,MAAMC,WAAUC,OAAO;YACrB,IAAIC,OAAOC,EAAE,EAAE;gBACbD,OAAOC,EAAE;YACX;YAEA5E,eAAe6E,cAAc;YAE7B,2FAA2F;YAC3F,qIAAqI;YACrI,mBAAmB;YACnB,MAAM,EAAExE,MAAM,EAAEW,WAAW,EAAEY,aAAa,EAAEI,WAAW,EAAEzB,IAAI,EAAEiC,IAAI,EAAE,GAAG,MAAML,WAAW;gBACvFrC;gBACAC;gBACAE,SAASyE,QAAQI,WAAW;gBAC5B5E,UAAUwE,QAAQxE,QAAQ;gBAC1BF;gBACAG;gBACAC;YACF;YAEA,MAAMmD,UAAUC,IAAAA,wCAAmB,EAACkB,QAAQI,WAAW,EAAEzE,OAAOoD,SAAS,EAAEiB,QAAQxE,QAAQ;YAE3F,MAAM6E,KAAKC,IAAAA,wBAAW,EAACN,QAAQO,WAAW,EAAEP,QAAQ3B,IAAI;YAExD,IAAI,CAAC/B,YAAYsB,OAAO,CAAC4C,GAAG,CAACH,KAAK;gBAChChF,OAAOY,IAAI,CAAC,CAAC,kBAAkB,EAAE+D,QAAQO,WAAW,CAAC,CAAC,EAAEP,QAAQ3B,IAAI,EAAE;gBACtE,OAAO;oBACLkC,aAAaP,QAAQO,WAAW;oBAChClC,MAAM2B,QAAQ3B,IAAI;oBAClBoC,UAAU;gBACZ;YACF;YAEA,MAAMrC,SAAS9B,YAAYsB,OAAO,CAAC8C,GAAG,CAACL;YACvC,MAAMhC,OAAO;gBACXD;gBACAS;YACF;YAEA,MAAM8B,iBAAiB,IAAIC,0BAAY;YACvC,MAAMC,iBAAiB,IAAID,0BAAY;YACvC,IAAIE;YACJ,IAAIC;YAEJ,MAAMC,YAAuB;gBAC3BC,WAAWC,QAAQC,MAAM;gBACzB/C;gBACAgD,UAAU;oBAAC;oBAAG;iBAAE;gBAChBC,WAAW;oBAAC;oBAAG;iBAAE;gBACjBC,QAAQ;gBACRC,UAAU;YACZ;YAEA,IAAI;gBACF,MAAMzD,KAAK0D,IAAI,CACbnD,MACA,GACA,CAACoD,QAAQ/C,QAAQC;oBACftD,OAAOY,IAAI,CAAC,CAAC,CAAC,EAAEwF,OAAOF,QAAQ,CAAC,EAAE,EAAEvB,QAAQO,WAAW,CAAC,CAAC,EAAEP,QAAQ3B,IAAI,CAAC,MAAM,CAAC;oBAE/EyC,cAAcpC;oBACdqC,cAAcpC;oBAEdD,OAAOgD,IAAI,CAACf;oBACZhC,OAAO+C,IAAI,CAACb;oBAEZG,UAAUO,QAAQ,GAAGE,OAAOF,QAAQ;oBACpCP,UAAUM,MAAM,GAAG;oBACnBN,UAAUK,SAAS,GAAGH,QAAQC,MAAM;gBACtC,GACA,CAACM;oBACCpG,OAAOY,IAAI,CAAC,CAAC,yBAAyB,EAAEjB,YAAY8C,KAAK2B,KAAK,GAAGC,oBAAoB,GAAG;oBAExF,4CAA4C;oBAC5C,MAAMiC,cAAcT,QAAQS,WAAW;oBACvCtG,OAAOY,IAAI,CACT,CAAC,gCAAgC,EAAEjB,YAAY2G,YAAYC,GAAG,EAAE,aAAa,EAAE5G,YAC7E2G,YAAYE,SAAS,EACrB,YAAY,EAAE7G,YAAY2G,YAAYG,QAAQ,GAAG;oBAGrDd,UAAUM,MAAM,GAAG;oBACnBN,UAAUI,QAAQ,GAAGW,IAAAA,wBAAU,EAACf,UAAUK,SAAS,EAAEH,QAAQC,MAAM;oBAEnE9F,OAAOY,IAAI,CACT,CAAC,CAAC,EAAEwF,OAAOF,QAAQ,CAAC,EAAE,EAAEvB,QAAQO,WAAW,CAAC,CAAC,EAAEP,QAAQ3B,IAAI,CAAC,MAAM,EAAE2D,IAAAA,4BAAc,EAACC,IAAAA,yBAAW,EAACjB,UAAUI,QAAQ,IAAI;oBAEvHN,YAAYoB,MAAM,CAACvB;oBACnBI,YAAYmB,MAAM,CAACrB;gBACrB;gBAGF,MAAMsB,eAAe/D,OAAOgE,eAAe,GACvCC,IAAAA,YAAI,EAACjE,OAAOgE,eAAe,EAAE;oBAAEhH,KAAKS;oBAAMyG,WAAW;gBAAK,KAC1D3G,OAAOqB,YAAY,EAAEoF,kBACrBC,IAAAA,YAAI,EAAC1G,OAAOqB,YAAY,EAAEoF,iBAAiB;oBAAEhH,KAAKS;oBAAMyG,WAAW;gBAAK,KACxE;oBAAC;iBAAiB;gBACtB,MAAMC,SAAS,AAACC,CAAAA,IAAAA,qBAAa,EAACpE,QAAQlB,eAAeI,gBAAgB,EAAE,AAAD,EAAGmF,MAAM,CAACN;gBAEhF,OAAO;oBACL5B,aAAaP,QAAQO,WAAW;oBAChClC,MAAM2B,QAAQ3B,IAAI;oBAClBoC,UAAU;oBACViC,MAAM;oBACNH;oBACAxF,SAAS4F,IAAAA,8BAAc,EAAC9G,MAAMuC,QAAQzC,OAAOqB,YAAY,EAAEC,YAAYK;oBACvEoB,QAAQiC,eAAeiC,QAAQ;oBAC/BjE,QAAQkC,eAAe+B,QAAQ;oBAC/BvC;gBACF;YACF,EAAE,OAAOwC,GAAG;gBACV,OAAO;oBACLtC,aAAaP,QAAQO,WAAW;oBAChClC,MAAM2B,QAAQ3B,IAAI;oBAClBoC,UAAU;oBACViC,MAAM;oBACNH,QAAQ,EAAE;oBACVxF,SAAS,EAAE;oBACX2B,QAAQ;oBACRC,QAAQkE,aAAaC,QAAQD,EAAED,QAAQ,KAAK;oBAC5CvC;gBACF;YACF;QACF;IACF;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lage-run/cli",
-  "version": "0.24.6",
+  "version": "0.24.7",
   "description": "Command Line Interface for Lage",
   "repository": {
     "type": "git",