@nx/js 16.8.0-beta.4 → 16.8.0-beta.6

package/src/executors/swc/swc.impl.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.swcExecutor = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const assets_1 = require("../../utils/assets/assets");
 const fs_extra_1 = require("fs-extra");
@@ -50,76 +49,90 @@ function normalizeOptions(options, root, sourceRoot, projectRoot) {
         swcCwd,
         swcrcPath,
     };
-    return Object.assign(Object.assign({}, options), { mainOutputPath: (0, path_1.resolve)(outputPath, options.main.replace(`${projectRoot}/`, '').replace('.ts', '.js')), files,
+    return {
+        ...options,
+        mainOutputPath: (0, path_1.resolve)(outputPath, options.main.replace(`${projectRoot}/`, '').replace('.ts', '.js')),
+        files,
         root,
         sourceRoot,
-        projectRoot, originalProjectRoot: projectRoot, outputPath, tsConfig: (0, path_1.join)(root, options.tsConfig), swcCliOptions });
+        projectRoot,
+        originalProjectRoot: projectRoot,
+        outputPath,
+        tsConfig: (0, path_1.join)(root, options.tsConfig),
+        swcCliOptions,
+    };
 }
-function swcExecutor(_options, context) {
-    return tslib_1.__asyncGenerator(this, arguments, function* swcExecutor_1() {
-        const { sourceRoot, root } = context.projectsConfigurations.projects[context.projectName];
-        const options = normalizeOptions(_options, context.root, sourceRoot, root);
-        const { tmpTsConfig, dependencies } = (0, check_dependencies_1.checkDependencies)(context, options.tsConfig);
-        if (tmpTsConfig) {
-            options.tsConfig = tmpTsConfig;
-        }
-        const swcHelperDependency = (0, compiler_helper_dependency_1.getHelperDependency)(compiler_helper_dependency_1.HelperDependency.swc, options.swcCliOptions.swcrcPath, dependencies, context.projectGraph);
-        if (swcHelperDependency) {
-            dependencies.push(swcHelperDependency);
-        }
-        const inlineProjectGraph = (0, inline_1.handleInliningBuild)(context, options, options.tsConfig);
-        if (!(0, inline_1.isInlineGraphEmpty)(inlineProjectGraph)) {
-            options.projectRoot = '.'; // set to root of workspace to include other libs for type check
-            // remap paths for SWC compilation
-            options.swcCliOptions.srcPath = options.swcCliOptions.swcCwd;
-            options.swcCliOptions.swcCwd = '.';
-            options.swcCliOptions.destPath = options.swcCliOptions.destPath
-                .split('../')
-                .at(-1)
-                .concat('/', options.swcCliOptions.srcPath);
-            // tmp swcrc with dependencies to exclude
-            // - buildable libraries
-            // - other libraries that are not dependent on the current project
-            options.swcCliOptions.swcrcPath = (0, inline_2.generateTmpSwcrc)(inlineProjectGraph, options.swcCliOptions.swcrcPath);
-        }
-        function determineModuleFormatFromSwcrc(absolutePathToSwcrc) {
-            var _a, _b;
-            const swcrc = (0, devkit_1.readJsonFile)(absolutePathToSwcrc);
-            return ((_b = (_a = swcrc.module) === null || _a === void 0 ? void 0 : _a.type) === null || _b === void 0 ? void 0 : _b.startsWith('es')) ? 'esm' : 'cjs';
-        }
-        if (options.watch) {
-            let disposeFn;
-            process.on('SIGINT', () => disposeFn());
-            process.on('SIGTERM', () => disposeFn());
-            return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues((0, compile_swc_1.compileSwcWatch)(context, options, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                const assetResult = yield (0, assets_2.copyAssets)(options, context);
-                const packageJsonResult = yield (0, package_json_1.copyPackageJson)(Object.assign(Object.assign({}, options), { additionalEntryPoints: createEntryPoints(options, context), format: [
-                        determineModuleFormatFromSwcrc(options.swcCliOptions.swcrcPath),
-                    ], 
-                    // As long as d.ts files match their .js counterparts, we don't need to emit them.
-                    // TSC can match them correctly based on file names.
-                    skipTypings: true }), context);
-                removeTmpSwcrc(options.swcCliOptions.swcrcPath);
-                disposeFn = () => {
-                    assetResult === null || assetResult === void 0 ? void 0 : assetResult.stop();
-                    packageJsonResult === null || packageJsonResult === void 0 ? void 0 : packageJsonResult.stop();
-                };
-            }))))));
-        }
-        else {
-            return yield tslib_1.__await(yield yield tslib_1.__await((0, compile_swc_1.compileSwc)(context, options, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                yield (0, assets_2.copyAssets)(options, context);
-                yield (0, package_json_1.copyPackageJson)(Object.assign(Object.assign({}, options), { additionalEntryPoints: createEntryPoints(options, context), format: [
-                        determineModuleFormatFromSwcrc(options.swcCliOptions.swcrcPath),
-                    ], 
-                    // As long as d.ts files match their .js counterparts, we don't need to emit them.
-                    // TSC can match them correctly based on file names.
-                    skipTypings: true, extraDependencies: swcHelperDependency ? [swcHelperDependency] : [] }), context);
-                removeTmpSwcrc(options.swcCliOptions.swcrcPath);
-                (0, inline_1.postProcessInlinedDependencies)(options.outputPath, options.originalProjectRoot, inlineProjectGraph);
-            }))));
-        }
-    });
+async function* swcExecutor(_options, context) {
+    const { sourceRoot, root } = context.projectsConfigurations.projects[context.projectName];
+    const options = normalizeOptions(_options, context.root, sourceRoot, root);
+    const { tmpTsConfig, dependencies } = (0, check_dependencies_1.checkDependencies)(context, options.tsConfig);
+    if (tmpTsConfig) {
+        options.tsConfig = tmpTsConfig;
+    }
+    const swcHelperDependency = (0, compiler_helper_dependency_1.getHelperDependency)(compiler_helper_dependency_1.HelperDependency.swc, options.swcCliOptions.swcrcPath, dependencies, context.projectGraph);
+    if (swcHelperDependency) {
+        dependencies.push(swcHelperDependency);
+    }
+    const inlineProjectGraph = (0, inline_1.handleInliningBuild)(context, options, options.tsConfig);
+    if (!(0, inline_1.isInlineGraphEmpty)(inlineProjectGraph)) {
+        options.projectRoot = '.'; // set to root of workspace to include other libs for type check
+        // remap paths for SWC compilation
+        options.swcCliOptions.srcPath = options.swcCliOptions.swcCwd;
+        options.swcCliOptions.swcCwd = '.';
+        options.swcCliOptions.destPath = options.swcCliOptions.destPath
+            .split('../')
+            .at(-1)
+            .concat('/', options.swcCliOptions.srcPath);
+        // tmp swcrc with dependencies to exclude
+        // - buildable libraries
+        // - other libraries that are not dependent on the current project
+        options.swcCliOptions.swcrcPath = (0, inline_2.generateTmpSwcrc)(inlineProjectGraph, options.swcCliOptions.swcrcPath);
+    }
+    function determineModuleFormatFromSwcrc(absolutePathToSwcrc) {
+        const swcrc = (0, devkit_1.readJsonFile)(absolutePathToSwcrc);
+        return swcrc.module?.type?.startsWith('es') ? 'esm' : 'cjs';
+    }
+    if (options.watch) {
+        let disposeFn;
+        process.on('SIGINT', () => disposeFn());
+        process.on('SIGTERM', () => disposeFn());
+        return yield* (0, compile_swc_1.compileSwcWatch)(context, options, async () => {
+            const assetResult = await (0, assets_2.copyAssets)(options, context);
+            const packageJsonResult = await (0, package_json_1.copyPackageJson)({
+                ...options,
+                additionalEntryPoints: createEntryPoints(options, context),
+                format: [
+                    determineModuleFormatFromSwcrc(options.swcCliOptions.swcrcPath),
+                ],
+                // As long as d.ts files match their .js counterparts, we don't need to emit them.
+                // TSC can match them correctly based on file names.
+                skipTypings: true,
+            }, context);
+            removeTmpSwcrc(options.swcCliOptions.swcrcPath);
+            disposeFn = () => {
+                assetResult?.stop();
+                packageJsonResult?.stop();
+            };
+        });
+    }
+    else {
+        return yield (0, compile_swc_1.compileSwc)(context, options, async () => {
+            await (0, assets_2.copyAssets)(options, context);
+            await (0, package_json_1.copyPackageJson)({
+                ...options,
+                additionalEntryPoints: createEntryPoints(options, context),
+                format: [
+                    determineModuleFormatFromSwcrc(options.swcCliOptions.swcrcPath),
+                ],
+                // As long as d.ts files match their .js counterparts, we don't need to emit them.
+                // TSC can match them correctly based on file names.
+                skipTypings: true,
+                extraDependencies: swcHelperDependency ? [swcHelperDependency] : [],
+            }, context);
+            removeTmpSwcrc(options.swcCliOptions.swcrcPath);
+            (0, inline_1.postProcessInlinedDependencies)(options.outputPath, options.originalProjectRoot, inlineProjectGraph);
+        });
+    }
 }
 exports.swcExecutor = swcExecutor;
 function removeTmpSwcrc(swcrcPath) {
@@ -128,8 +141,7 @@ function removeTmpSwcrc(swcrcPath) {
     }
 }
 function createEntryPoints(options, context) {
-    var _a;
-    if (!((_a = options.additionalEntryPoints) === null || _a === void 0 ? void 0 : _a.length))
+    if (!options.additionalEntryPoints?.length)
         return [];
     return (0, fast_glob_1.sync)(options.additionalEntryPoints, {
         cwd: context.root,

package/src/executors/tsc/lib/batch/build-task-info-per-tsconfig-map.js

@@ -14,7 +14,6 @@ function createTaskInfoPerTsConfigMap(tasksOptions, context, tasks, taskInMemory
 }
 exports.createTaskInfoPerTsConfigMap = createTaskInfoPerTsConfigMap;
 function processTasksAndPopulateTsConfigTaskInfoMap(tsConfigTaskInfoMap, tasksOptions, context, tasks, taskInMemoryTsConfigMap) {
-    var _a;
     for (const taskName of tasks) {
         if (taskTsConfigCache.has(taskName)) {
             continue;
@@ -23,7 +22,7 @@ function processTasksAndPopulateTsConfigTaskInfoMap(tsConfigTaskInfoMap, tasksOp
         if (!tsConfig) {
             continue;
         }
-        let taskOptions = (_a = tasksOptions[taskName]) !== null && _a !== void 0 ? _a : (0, get_task_options_1.getTaskOptions)(taskName, context);
+        let taskOptions = tasksOptions[taskName] ?? (0, get_task_options_1.getTaskOptions)(taskName, context);
         if (taskOptions) {
             const taskInfo = createTaskInfo(taskName, taskOptions, context, tsConfig);
             const tsConfigPath = (0, path_1.join)(context.root, (0, path_1.relative)(context.root, taskOptions.tsConfig)).replace(/\\/g, '/');
@@ -35,10 +34,14 @@ function processTasksAndPopulateTsConfigTaskInfoMap(tsConfigTaskInfoMap, tasksOp
 }
 function createTaskInfo(taskName, taskOptions, context, tsConfig) {
     const target = (0, devkit_1.parseTargetString)(taskName, context.projectGraph);
-    const taskContext = Object.assign(Object.assign({}, context), { 
+    const taskContext = {
+        ...context,
         // batch executors don't get these in the context, we provide them
         // here per task
-        projectName: target.project, targetName: target.target, configurationName: target.configuration });
+        projectName: target.project,
+        targetName: target.target,
+        configurationName: target.configuration,
+    };
     const assetsHandler = new copy_assets_handler_1.CopyAssetsHandler({
         projectDir: taskOptions.projectRoot,
         rootDir: context.root,

package/src/executors/tsc/lib/batch/watch.js

@@ -1,63 +1,56 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.watchTaskProjectsFileChangesForAssets = exports.watchTaskProjectsPackageJsonFileChanges = void 0;
-const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const client_1 = require("nx/src/daemon/client/client");
 const path_1 = require("path");
-function watchTaskProjectsPackageJsonFileChanges(taskInfos, callback) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const projects = [];
-        const packageJsonTaskInfoMap = new Map();
-        taskInfos.forEach((t) => {
-            projects.push(t.context.projectName);
-            packageJsonTaskInfoMap.set((0, path_1.join)(t.options.projectRoot, 'package.json'), t);
-        });
-        const unregisterFileWatcher = yield client_1.daemonClient.registerFileWatcher({ watchProjects: projects }, (err, data) => {
-            var _a;
-            if (err === 'closed') {
-                devkit_1.logger.error(`Watch error: Daemon closed the connection`);
-                process.exit(1);
-            }
-            else if (err) {
-                devkit_1.logger.error(`Watch error: ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : 'Unknown'}`);
-            }
-            else {
-                const changedTasks = [];
-                data.changedFiles.forEach((file) => {
-                    if (packageJsonTaskInfoMap.has(file.path)) {
-                        changedTasks.push(packageJsonTaskInfoMap.get(file.path));
-                    }
-                });
-                if (changedTasks.length) {
-                    callback(changedTasks);
+async function watchTaskProjectsPackageJsonFileChanges(taskInfos, callback) {
+    const projects = [];
+    const packageJsonTaskInfoMap = new Map();
+    taskInfos.forEach((t) => {
+        projects.push(t.context.projectName);
+        packageJsonTaskInfoMap.set((0, path_1.join)(t.options.projectRoot, 'package.json'), t);
+    });
+    const unregisterFileWatcher = await client_1.daemonClient.registerFileWatcher({ watchProjects: projects }, (err, data) => {
+        if (err === 'closed') {
+            devkit_1.logger.error(`Watch error: Daemon closed the connection`);
+            process.exit(1);
+        }
+        else if (err) {
+            devkit_1.logger.error(`Watch error: ${err?.message ?? 'Unknown'}`);
+        }
+        else {
+            const changedTasks = [];
+            data.changedFiles.forEach((file) => {
+                if (packageJsonTaskInfoMap.has(file.path)) {
+                    changedTasks.push(packageJsonTaskInfoMap.get(file.path));
                 }
+            });
+            if (changedTasks.length) {
+                callback(changedTasks);
             }
-        });
-        return () => unregisterFileWatcher();
+        }
     });
+    return () => unregisterFileWatcher();
 }
 exports.watchTaskProjectsPackageJsonFileChanges = watchTaskProjectsPackageJsonFileChanges;
-function watchTaskProjectsFileChangesForAssets(taskInfos) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const unregisterFileWatcher = yield client_1.daemonClient.registerFileWatcher({
-            watchProjects: taskInfos.map((t) => t.context.projectName),
-            includeDependentProjects: true,
-            includeGlobalWorkspaceFiles: true,
-        }, (err, data) => {
-            var _a;
-            if (err === 'closed') {
-                devkit_1.logger.error(`Watch error: Daemon closed the connection`);
-                process.exit(1);
-            }
-            else if (err) {
-                devkit_1.logger.error(`Watch error: ${(_a = err === null || err === void 0 ? void 0 : err.message) !== null && _a !== void 0 ? _a : 'Unknown'}`);
-            }
-            else {
-                taskInfos.forEach((t) => t.assetsHandler.processWatchEvents(data.changedFiles));
-            }
-        });
-        return () => unregisterFileWatcher();
+async function watchTaskProjectsFileChangesForAssets(taskInfos) {
+    const unregisterFileWatcher = await client_1.daemonClient.registerFileWatcher({
+        watchProjects: taskInfos.map((t) => t.context.projectName),
+        includeDependentProjects: true,
+        includeGlobalWorkspaceFiles: true,
+    }, (err, data) => {
+        if (err === 'closed') {
+            devkit_1.logger.error(`Watch error: Daemon closed the connection`);
+            process.exit(1);
+        }
+        else if (err) {
+            devkit_1.logger.error(`Watch error: ${err?.message ?? 'Unknown'}`);
+        }
+        else {
+            taskInfos.forEach((t) => t.assetsHandler.processWatchEvents(data.changedFiles));
+        }
     });
+    return () => unregisterFileWatcher();
 }
 exports.watchTaskProjectsFileChangesForAssets = watchTaskProjectsFileChangesForAssets;

package/src/executors/tsc/lib/get-task-options.js

@@ -13,20 +13,22 @@ function getTaskOptions(taskName, context) {
         tasksOptionsCache.set(taskName, normalizedTaskOptions);
         return normalizedTaskOptions;
     }
-    catch (_a) {
+    catch {
         tasksOptionsCache.set(taskName, null);
         return null;
     }
 }
 exports.getTaskOptions = getTaskOptions;
 function parseTaskInfo(taskName, context) {
-    var _a, _b;
     const target = context.taskGraph.tasks[taskName].target;
     const projectNode = context.projectGraph.nodes[target.project];
-    const targetConfig = (_a = projectNode.data.targets) === null || _a === void 0 ? void 0 : _a[target.target];
+    const targetConfig = projectNode.data.targets?.[target.target];
     const { sourceRoot, root } = projectNode.data;
-    const taskOptions = Object.assign(Object.assign({}, targetConfig.options), (target.configuration
-        ? (_b = targetConfig.configurations) === null || _b === void 0 ? void 0 : _b[target.configuration]
-        : {}));
+    const taskOptions = {
+        ...targetConfig.options,
+        ...(target.configuration
+            ? targetConfig.configurations?.[target.configuration]
+            : {}),
+    };
     return { taskOptions, root, sourceRoot, projectNode, target };
 }

package/src/executors/tsc/lib/get-tsconfig.js

@@ -14,7 +14,6 @@ function getProcessedTaskTsConfigs(tasks, tasksOptions, context) {
 exports.getProcessedTaskTsConfigs = getProcessedTaskTsConfigs;
 const projectTsConfigCache = new Map();
 function generateTaskProjectTsConfig(task, tasksOptions, context, taskInMemoryTsConfigMap) {
-    var _a;
     const { project } = (0, devkit_1.parseTargetString)(task, context.projectGraph);
     if (projectTsConfigCache.has(project)) {
         const { tsConfig, tsConfigPath } = projectTsConfigCache.get(project);
@@ -38,7 +37,8 @@ function generateTaskProjectTsConfig(task, tasksOptions, context, taskInMemoryTs
             projectReferences.push(tsConfigPath);
         }
     }
-    const taskOptions = (_a = tasksOptions[taskWithTscExecutor]) !== null && _a !== void 0 ? _a : (0, get_task_options_1.getTaskOptions)(taskWithTscExecutor, context);
+    const taskOptions = tasksOptions[taskWithTscExecutor] ??
+        (0, get_task_options_1.getTaskOptions)(taskWithTscExecutor, context);
     const tsConfigPath = taskOptions.tsConfig;
     taskInMemoryTsConfigMap[taskWithTscExecutor] = getInMemoryTsConfig(tsConfigPath, taskOptions, projectReferences);
     projectTsConfigCache.set(project, {
@@ -57,16 +57,27 @@ function getDependencyTasksInSameProject(task, context) {
         (0, devkit_1.parseTargetString)(t, context.projectGraph).project === taskProject);
 }
 function getInMemoryTsConfig(tsConfig, taskOptions, projectReferences) {
-    var _a;
     const originalTsConfig = (0, devkit_1.readJsonFile)(tsConfig, {
         allowTrailingComma: true,
         disallowComments: false,
     });
-    const allProjectReferences = Array.from(new Set(((_a = originalTsConfig.references) !== null && _a !== void 0 ? _a : [])
+    const allProjectReferences = Array.from(new Set((originalTsConfig.references ?? [])
         .map((r) => r.path)
         .concat(projectReferences)));
     return {
-        content: JSON.stringify(Object.assign(Object.assign({}, originalTsConfig), { compilerOptions: Object.assign(Object.assign({}, originalTsConfig.compilerOptions), { rootDir: taskOptions.rootDir, outDir: taskOptions.outputPath, composite: true, declaration: true, declarationMap: true, tsBuildInfoFile: (0, path_1.join)(taskOptions.outputPath, 'tsconfig.tsbuildinfo') }), references: allProjectReferences.map((pr) => ({ path: pr })) })),
+        content: JSON.stringify({
+            ...originalTsConfig,
+            compilerOptions: {
+                ...originalTsConfig.compilerOptions,
+                rootDir: taskOptions.rootDir,
+                outDir: taskOptions.outputPath,
+                composite: true,
+                declaration: true,
+                declarationMap: true,
+                tsBuildInfoFile: (0, path_1.join)(taskOptions.outputPath, 'tsconfig.tsbuildinfo'),
+            },
+            references: allProjectReferences.map((pr) => ({ path: pr })),
+        }),
         path: tsConfig.replace(/\\/g, '/'),
     };
 }

package/src/executors/tsc/lib/normalize-options.js

@@ -24,9 +24,16 @@ function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
         }
     }
     const files = (0, assets_1.assetGlobsToFiles)(options.assets, contextRoot, outputPath);
-    return Object.assign(Object.assign({}, options), { root: contextRoot, sourceRoot,
+    return {
+        ...options,
+        root: contextRoot,
+        sourceRoot,
         projectRoot,
         files,
-        outputPath, tsConfig: (0, path_1.join)(contextRoot, options.tsConfig), rootDir, mainOutputPath: (0, path_1.resolve)(outputPath, options.main.replace(`${projectRoot}/`, '').replace('.ts', '.js')) });
+        outputPath,
+        tsConfig: (0, path_1.join)(contextRoot, options.tsConfig),
+        rootDir,
+        mainOutputPath: (0, path_1.resolve)(outputPath, options.main.replace(`${projectRoot}/`, '').replace('.ts', '.js')),
+    };
 }
 exports.normalizeOptions = normalizeOptions;

package/src/executors/tsc/lib/typescript-compilation.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compileTypescriptSolution = void 0;
-const tslib_1 = require("tslib");
 const async_iterable_1 = require("@nx/devkit/src/utils/async-iterable");
 const ts = require("typescript");
 const get_custom_transformers_factory_1 = require("./get-custom-transformers-factory");
@@ -16,15 +15,15 @@ function compileTypescriptSolution(context, watch, logger, hooks, reporters) {
     if (watch) {
         // create an AsyncIterable that doesn't complete, watch mode is only
         // stopped by killing the process
-        return (0, async_iterable_1.createAsyncIterable)(({ next }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            hooks !== null && hooks !== void 0 ? hooks : (hooks = {});
+        return (0, async_iterable_1.createAsyncIterable)(async ({ next }) => {
+            hooks ??= {};
             const callerAfterProjectCompilationCallback = hooks.afterProjectCompilationCallback;
             hooks.afterProjectCompilationCallback = (tsConfig, success) => {
-                callerAfterProjectCompilationCallback === null || callerAfterProjectCompilationCallback === void 0 ? void 0 : callerAfterProjectCompilationCallback(tsConfig, success);
+                callerAfterProjectCompilationCallback?.(tsConfig, success);
                 next({ tsConfig, success });
             };
             compileTSWithWatch(context, logger, hooks, reporters);
-        }));
+        });
     }
     // turn it into an AsyncIterable
     const compilationGenerator = compileTS(context, logger, hooks, reporters);
@@ -40,7 +39,6 @@ function compileTypescriptSolution(context, watch, logger, hooks, reporters) {
 }
 exports.compileTypescriptSolution = compileTypescriptSolution;
 function* compileTS(context, logger, hooks, reporters) {
-    var _a, _b, _c;
     let project;
     const formatDiagnosticsHost = {
         getCurrentDirectory: () => ts.sys.getCurrentDirectory(),
@@ -49,19 +47,17 @@ function* compileTS(context, logger, hooks, reporters) {
     };
     const solutionBuilderHost = ts.createSolutionBuilderHost(getSystem(context), 
     /*createProgram*/ undefined, (diagnostic) => {
-        var _a;
         const formattedDiagnostic = (0, typescript_diagnostic_reporters_1.formatDiagnosticReport)(diagnostic, formatDiagnosticsHost);
         // handles edge case where a wrong a project reference path can't be read
         if (diagnostic.code === TYPESCRIPT_CANNOT_READ_FILE) {
             throw new Error(formattedDiagnostic);
         }
         logger.info(formattedDiagnostic, project.project);
-        (_a = reporters === null || reporters === void 0 ? void 0 : reporters.diagnosticReporter) === null || _a === void 0 ? void 0 : _a.call(reporters, project.project, diagnostic);
+        reporters?.diagnosticReporter?.(project.project, diagnostic);
     }, (diagnostic) => {
-        var _a;
         const formattedDiagnostic = (0, typescript_diagnostic_reporters_1.formatSolutionBuilderStatusReport)(diagnostic);
         logger.info(formattedDiagnostic, project.project);
-        (_a = reporters === null || reporters === void 0 ? void 0 : reporters.solutionBuilderStatusReporter) === null || _a === void 0 ? void 0 : _a.call(reporters, project.project, diagnostic);
+        reporters?.solutionBuilderStatusReporter?.(project.project, diagnostic);
     });
     const rootNames = Object.keys(context);
     const solutionBuilder = ts.createSolutionBuilder(solutionBuilderHost, rootNames, {});
@@ -72,7 +68,7 @@ function* compileTS(context, logger, hooks, reporters) {
             break;
         }
         const projectContext = context[project.project];
-        const projectName = projectContext === null || projectContext === void 0 ? void 0 : projectContext.project;
+        const projectName = projectContext?.project;
         /**
          * This only applies when the deprecated `prepend` option is set to `true`.
          * Skip support.
@@ -83,7 +79,7 @@ function* compileTS(context, logger, hooks, reporters) {
                 `This option is not supported by the batch executor and it's ignored.\n`, project.project);
             continue;
         }
-        (_a = hooks === null || hooks === void 0 ? void 0 : hooks.beforeProjectCompilationCallback) === null || _a === void 0 ? void 0 : _a.call(hooks, project.project);
+        hooks?.beforeProjectCompilationCallback?.(project.project);
         if (project.kind === ts.InvalidatedProjectKind.UpdateOutputFileStamps) {
             logger.info(`Updating output timestamps of project "${projectName}"...\n`, project.project);
             // update output timestamps and mark project as complete
@@ -92,7 +88,7 @@ function* compileTS(context, logger, hooks, reporters) {
             if (success) {
                 logger.info(`Done updating output timestamps of project "${projectName}"...\n`, project.project);
             }
-            (_b = hooks === null || hooks === void 0 ? void 0 : hooks.afterProjectCompilationCallback) === null || _b === void 0 ? void 0 : _b.call(hooks, project.project, success);
+            hooks?.afterProjectCompilationCallback?.(project.project, success);
             yield { success, tsConfig: project.project };
             continue;
         }
@@ -103,7 +99,7 @@ function* compileTS(context, logger, hooks, reporters) {
         if (success) {
             logger.info(`Done compiling TypeScript files for project "${projectName}".\n`, project.project);
         }
-        (_c = hooks === null || hooks === void 0 ? void 0 : hooks.afterProjectCompilationCallback) === null || _c === void 0 ? void 0 : _c.call(hooks, project.project, success);
+        hooks?.afterProjectCompilationCallback?.(project.project, success);
         yield {
             success: status === ts.ExitStatus.Success,
             tsConfig: project.project,
@@ -114,14 +110,14 @@ function compileTSWithWatch(context, logger, hooks, reporters) {
     let project;
     const solutionHost = ts.createSolutionBuilderWithWatchHost(getSystem(context), 
     /*createProgram*/ undefined);
-    if (reporters === null || reporters === void 0 ? void 0 : reporters.diagnosticReporter) {
+    if (reporters?.diagnosticReporter) {
         const originalDiagnosticReporter = solutionHost.reportDiagnostic;
         solutionHost.reportDiagnostic = (diagnostic) => {
             originalDiagnosticReporter(diagnostic);
             reporters.diagnosticReporter(project.project, diagnostic);
         };
     }
-    if (reporters === null || reporters === void 0 ? void 0 : reporters.solutionBuilderStatusReporter) {
+    if (reporters?.solutionBuilderStatusReporter) {
         const originalSolutionBuilderStatusReporter = solutionHost.reportSolutionBuilderStatus;
         solutionHost.reportDiagnostic = (diagnostic) => {
             originalSolutionBuilderStatusReporter(diagnostic);
@@ -130,19 +126,17 @@ function compileTSWithWatch(context, logger, hooks, reporters) {
     }
     const originalWatchStatusReporter = solutionHost.onWatchStatusChange;
     solutionHost.onWatchStatusChange = (diagnostic, newLine, options, errorCount) => {
-        var _a;
         originalWatchStatusReporter(diagnostic, newLine, options, errorCount);
         if (diagnostic.code ===
             TYPESCRIPT_FILE_CHANGE_DETECTED_STARTING_INCREMENTAL_COMPILATION) {
             // there's a change, build invalidated projects
             build();
         }
-        (_a = reporters === null || reporters === void 0 ? void 0 : reporters.watchStatusReporter) === null || _a === void 0 ? void 0 : _a.call(reporters, project === null || project === void 0 ? void 0 : project.project, diagnostic, newLine, options, errorCount);
+        reporters?.watchStatusReporter?.(project?.project, diagnostic, newLine, options, errorCount);
     };
     const rootNames = Object.keys(context);
     const solutionBuilder = ts.createSolutionBuilderWithWatch(solutionHost, rootNames, {});
     const build = () => {
-        var _a, _b;
         while (true) {
             project = solutionBuilder.getNextInvalidatedProject();
             if (!project) {
@@ -160,7 +154,7 @@ function compileTSWithWatch(context, logger, hooks, reporters) {
                     `This option is not supported by the batch executor and it's ignored.`);
                 continue;
             }
-            hooks === null || hooks === void 0 ? void 0 : hooks.beforeProjectCompilationCallback(project.project);
+            hooks?.beforeProjectCompilationCallback(project.project);
             if (project.kind === ts.InvalidatedProjectKind.UpdateOutputFileStamps) {
                 if (projectName) {
                     logger.info(`Updating output timestamps of project "${projectName}"...\n`, project.project);
@@ -171,7 +165,7 @@ function compileTSWithWatch(context, logger, hooks, reporters) {
                 if (projectName && success) {
                     logger.info(`Done updating output timestamps of project "${projectName}"...\n`, project.project);
                 }
-                (_a = hooks === null || hooks === void 0 ? void 0 : hooks.afterProjectCompilationCallback) === null || _a === void 0 ? void 0 : _a.call(hooks, project.project, success);
+                hooks?.afterProjectCompilationCallback?.(project.project, success);
                 continue;
             }
             logger.info(`Compiling TypeScript files for project "${projectName}"...\n`, project.project);
@@ -181,7 +175,7 @@ function compileTSWithWatch(context, logger, hooks, reporters) {
             if (success) {
                 logger.info(`Done compiling TypeScript files for project "${projectName}".\n`, project.project);
             }
-            (_b = hooks === null || hooks === void 0 ? void 0 : hooks.afterProjectCompilationCallback) === null || _b === void 0 ? void 0 : _b.call(hooks, project.project, success);
+            hooks?.afterProjectCompilationCallback?.(project.project, success);
         }
     };
     // initial build
@@ -197,10 +191,13 @@ function compileTSWithWatch(context, logger, hooks, reporters) {
     solutionBuilder.build();
 }
 function getSystem(context) {
-    return Object.assign(Object.assign({}, ts.sys), { readFile(path, encoding) {
+    return {
+        ...ts.sys,
+        readFile(path, encoding) {
             if (context[path]) {
                 return context[path].tsConfig.content;
             }
             return ts.sys.readFile(path, encoding);
-        } });
+        },
+    };
 }