fix

aspect-build · Oct 2, 2024 · e0b00bf · e0b00bf
1 parent 2ae08ff
commit e0b00bf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/ts/private/ts_project.bzl b/ts/private/ts_project.bzl
@@ -234,12 +234,18 @@ See https://github.com/aspect-build/rules_ts/issues/361 for more details.
         args = ctx.actions.args()
         args.add_all(common_args)
 
+        args.add("--noEmit")
+
+        env = {
+            "BAZEL_BINDIR": ctx.bin_dir.path,
+        }
+
         if supports_workers:
             args.use_param_file("@%s", use_always = True)
             args.set_param_file_format("multiline")
             args.add("--bazelValidationFile", typecheck_output.short_path)
-
-        args.add("--noEmit")
+        else:
+            env["JS_BINARY__STDOUT_OUTPUT_FILE"] = typecheck_output.path
 
         ctx.actions.run(
             executable = executable,
@@ -253,10 +259,7 @@ See https://github.com/aspect-build/rules_ts/issues/361 for more details.
                 ctx.label,
                 tsconfig_path,
             ),
-            env = {
-                "BAZEL_BINDIR": ctx.bin_dir.path,
-                "JS_BINARY__STDOUT_OUTPUT_FILE": typecheck_output.path,
-            },
+            env = env,
         )
     else:
         typecheck_outs.extend(output_types)

diff --git a/ts/private/ts_project_worker.js b/ts/private/ts_project_worker.js
@@ -310,7 +310,7 @@ function createFilesystemTree(root, inputs) {
         if (typeof node == "object" && node[Type] == TYPE.SYMLINK) {
            return parents.join(path.sep);
         }
-        
+
         return undefined;
     }
 
@@ -881,9 +881,11 @@ async function emit(request) {
     debug(`# Beginning new work`);
     debug(`arguments: ${request.arguments.join(' ')}`)
 
-    const validationPath = request.arguments[request.arguments.indexOf('--bazelValidationFile') + 1]
-    fs.writeFileSync(path.resolve(process.cwd(), validationPath), '');
-
+    if (request.arguments.includes('--bazelValidationFile')) {
+        const [, validationPath] = request.arguments.splice(request.arguments.indexOf('--bazelValidationFile'), 2);
+        fs.writeFileSync(path.resolve(process.cwd(), validationPath), '');
+    }
+
     const inputs = Object.fromEntries(
         request.inputs.map(input => [
             input.path,
@@ -946,22 +948,22 @@ async function emit(request) {
     const diagnostics = ts.getPreEmitDiagnostics(program, undefined, cancellationToken).concat(result?.diagnostics);
     timingEnd('diagnostics');
 
-    const succeded = diagnostics.length === 0;
+    const succeeded = diagnostics.length === 0;
 
-    if (!succeded) {
+    if (!succeeded) {
         request.output.write(worker.formatDiagnostics(diagnostics));
         VERBOSE && worker.printFSTree()
     }
 
     if (ts.performance && ts.performance.isEnabled()) {
         ts.performance.forEachMeasure((name, duration) => request.output.write(`${name} time: ${duration}\n`));
     }
- 
+
     worker.previousInputs = inputs;
     worker.postRun();
 
     debug(`# Finished the work`);
-    return succeded ? 0 : 1;
+    return succeeded ? 0 : 1;
 }
 
 
@@ -998,7 +1000,7 @@ if (require.main === module && worker_protocol.isPersistentWorker(process.argv))
     const args = fs.readFileSync(p).toString().trim().split('\n');
 
     if (args.includes('--bazelValidationFile')) {
-        const [, validationPath] = args.splice(args.indexOf('--bazelValidationFile'), 2);    
+        const [, validationPath] = args.splice(args.indexOf('--bazelValidationFile'), 2);
         fs.writeFileSync(path.resolve(process.cwd(), validationPath), '');
     }