@nx/js 16.4.0-beta.0 → 16.4.0-beta.10

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

@@ -0,0 +1,195 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compileBatchTypescript = void 0;
+const devkit_1 = require("@nx/devkit");
+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");
+const typescript_diagnostic_reporters_1 = require("./typescript-diagnostic-reporters");
+// https://github.com/microsoft/TypeScript/blob/d45012c5e2ab122919ee4777a7887307c5f4a1e0/src/compiler/diagnosticMessages.json#L4050-L4053
+// Typescript diagnostic message for 5083: Cannot read file '{0}'.
+const TYPESCRIPT_CANNOT_READ_FILE = 5083;
+// https://github.com/microsoft/TypeScript/blob/d45012c5e2ab122919ee4777a7887307c5f4a1e0/src/compiler/diagnosticMessages.json#L4211-4214
+// Typescript diagnostic message for 6032: File change detected. Starting incremental compilation...
+const TYPESCRIPT_FILE_CHANGE_DETECTED_STARTING_INCREMENTAL_COMPILATION = 6032;
+function compileBatchTypescript(tsConfigTaskInfoMap, taskGraph, watch, postProjectCompilationCallback) {
+    const timeNow = Date.now();
+    const defaultResults = Object.keys(taskGraph.tasks).reduce((acc, task) => {
+        acc[task] = { success: true, startTime: timeNow, terminalOutput: '' };
+        return acc;
+    }, {});
+    let tearDown;
+    return {
+        iterator: (0, async_iterable_1.createAsyncIterable)(({ next, done }) => {
+            if (watch) {
+                compileTSWithWatch(tsConfigTaskInfoMap, postProjectCompilationCallback);
+                tearDown = () => {
+                    done();
+                };
+            }
+            else {
+                const compilationResults = compileTS(tsConfigTaskInfoMap, postProjectCompilationCallback);
+                next(Object.assign(Object.assign({}, defaultResults), compilationResults));
+                done();
+            }
+        }),
+        close: () => tearDown === null || tearDown === void 0 ? void 0 : tearDown(),
+    };
+}
+exports.compileBatchTypescript = compileBatchTypescript;
+function compileTSWithWatch(tsConfigTaskInfoMap, postProjectCompilationCallback) {
+    const formatDiagnosticsHost = {
+        getCurrentDirectory: () => ts.sys.getCurrentDirectory(),
+        getNewLine: () => ts.sys.newLine,
+        getCanonicalFileName: (filename) => ts.sys.useCaseSensitiveFileNames ? filename : filename.toLowerCase(),
+    };
+    const solutionHost = ts.createSolutionBuilderWithWatchHost(ts.sys, 
+    /*createProgram*/ undefined, (diagnostic) => {
+        const formattedDiagnostic = (0, typescript_diagnostic_reporters_1.formatDiagnosticReport)(diagnostic, formatDiagnosticsHost);
+        devkit_1.logger.info(formattedDiagnostic);
+    }, (diagnostic) => {
+        const formattedDiagnostic = (0, typescript_diagnostic_reporters_1.formatSolutionBuilderStatusReport)(diagnostic);
+        devkit_1.logger.info(formattedDiagnostic);
+    }, (diagnostic, newLine) => {
+        const formattedDiagnostic = (0, typescript_diagnostic_reporters_1.formatWatchStatusReport)(diagnostic, newLine);
+        devkit_1.logger.info(formattedDiagnostic);
+        if (diagnostic.code ===
+            TYPESCRIPT_FILE_CHANGE_DETECTED_STARTING_INCREMENTAL_COMPILATION) {
+            // there's a change, build invalidated projects
+            build();
+        }
+    });
+    const rootNames = Object.keys(tsConfigTaskInfoMap);
+    const solutionBuilder = ts.createSolutionBuilderWithWatch(solutionHost, rootNames, {});
+    const build = () => {
+        while (true) {
+            const project = solutionBuilder.getNextInvalidatedProject();
+            if (!project) {
+                break;
+            }
+            const taskInfo = tsConfigTaskInfoMap[project.project];
+            if (project.kind === ts.InvalidatedProjectKind.UpdateOutputFileStamps) {
+                // update output timestamps and mark project as complete
+                project.done();
+                continue;
+            }
+            /**
+             * This only applies when the deprecated `prepend` option is set to `true`.
+             * Skip support.
+             */
+            if (project.kind === ts.InvalidatedProjectKind.UpdateBundle) {
+                devkit_1.logger.warn(`The project ${taskInfo.context.projectName} ` +
+                    `is using the deprecated "prepend" Typescript compiler option. ` +
+                    `This option is not supported by the batch executor and it's ignored.`);
+                continue;
+            }
+            // build and mark project as complete
+            project.done(undefined, undefined, (0, get_custom_transformers_factory_1.getCustomTrasformersFactory)(taskInfo.options.transformers)(project.getProgram()));
+            postProjectCompilationCallback(taskInfo);
+        }
+    };
+    // initial build
+    build();
+    /**
+     * This is a workaround to get the TS file watching to kick off. It won't
+     * build twice since the `build` call above will mark invalidated projects
+     * as completed and then, the implementation of the `solutionBuilder.build`
+     * skips them.
+     * We can't rely solely in `solutionBuilder.build()` because it doesn't
+     * accept custom transformers.
+     */
+    solutionBuilder.build();
+    return solutionHost;
+}
+function compileTS(tsConfigTaskInfoMap, postProjectCompilationCallback) {
+    var _a;
+    const results = {};
+    let terminalOutput;
+    const logInfo = (text) => {
+        devkit_1.logger.info(text);
+        terminalOutput += `${text}\n`;
+    };
+    const logWarn = (text) => {
+        devkit_1.logger.warn(text);
+        terminalOutput += `${text}\n`;
+    };
+    const formatDiagnosticsHost = {
+        getCurrentDirectory: () => ts.sys.getCurrentDirectory(),
+        getNewLine: () => ts.sys.newLine,
+        getCanonicalFileName: (filename) => ts.sys.useCaseSensitiveFileNames ? filename : filename.toLowerCase(),
+    };
+    const solutionBuilderHost = ts.createSolutionBuilderHost(ts.sys, 
+    /*createProgram*/ undefined, (diagnostic) => {
+        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) {
+            Object.values(tsConfigTaskInfoMap).forEach((taskInfo) => {
+                var _a, _b;
+                var _c;
+                (_a = results[_c = taskInfo.task]) !== null && _a !== void 0 ? _a : (results[_c] = { success: false, terminalOutput: '' });
+                results[taskInfo.task].success = false;
+                results[taskInfo.task].terminalOutput = `${(_b = results[taskInfo.task]) === null || _b === void 0 ? void 0 : _b.terminalOutput}${formattedDiagnostic}`;
+            });
+        }
+        logInfo(formattedDiagnostic);
+    }, (diagnostic) => {
+        const formattedDiagnostic = (0, typescript_diagnostic_reporters_1.formatSolutionBuilderStatusReport)(diagnostic);
+        logInfo(formattedDiagnostic);
+    });
+    const rootNames = Object.keys(tsConfigTaskInfoMap);
+    const solutionBuilder = ts.createSolutionBuilder(solutionBuilderHost, rootNames, {});
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+        const project = solutionBuilder.getNextInvalidatedProject();
+        if (!project) {
+            break;
+        }
+        const startTime = Date.now();
+        terminalOutput = '';
+        const taskInfo = tsConfigTaskInfoMap[project.project];
+        const projectName = (_a = taskInfo === null || taskInfo === void 0 ? void 0 : taskInfo.context) === null || _a === void 0 ? void 0 : _a.projectName;
+        if (project.kind === ts.InvalidatedProjectKind.UpdateOutputFileStamps) {
+            if (projectName) {
+                logInfo(`Updating output timestamps of project "${projectName}"...`);
+            }
+            // update output timestamps and mark project as complete
+            const status = project.done();
+            if (projectName && status === ts.ExitStatus.Success) {
+                logInfo(`Done updating output timestamps of project "${projectName}"...`);
+            }
+            if (taskInfo) {
+                results[taskInfo.task] = {
+                    success: status === ts.ExitStatus.Success,
+                    terminalOutput,
+                    startTime,
+                    endTime: Date.now(),
+                };
+            }
+            continue;
+        }
+        /**
+         * This only applies when the deprecated `prepend` option is set to `true`.
+         * Skip support.
+         */
+        if (project.kind === ts.InvalidatedProjectKind.UpdateBundle) {
+            logWarn(`The project ${taskInfo.context.projectName} ` +
+                `is using the deprecated "prepend" Typescript compiler option. ` +
+                `This option is not supported by the batch executor and it's ignored.`);
+            continue;
+        }
+        logInfo(`Compiling TypeScript files for project "${projectName}"...`);
+        // build and mark project as complete
+        const status = project.done(undefined, undefined, (0, get_custom_transformers_factory_1.getCustomTrasformersFactory)(taskInfo.options.transformers)(project.getProgram()));
+        postProjectCompilationCallback(taskInfo);
+        if (status === ts.ExitStatus.Success) {
+            logInfo(`Done compiling TypeScript files for project "${projectName}".`);
+        }
+        results[taskInfo.task] = {
+            success: status === ts.ExitStatus.Success,
+            terminalOutput,
+            startTime,
+            endTime: Date.now(),
+        };
+    }
+    return results;
+}

package/src/executors/tsc/lib/batch/typescript-diagnostic-reporters.d.ts

@@ -0,0 +1,4 @@
+import * as ts from 'typescript';
+export declare function formatDiagnosticReport(diagnostic: ts.Diagnostic, host: ts.FormatDiagnosticsHost): string;
+export declare function formatSolutionBuilderStatusReport(diagnostic: ts.Diagnostic): string;
+export declare function formatWatchStatusReport(diagnostic: ts.Diagnostic, newLine: string): string;

package/src/executors/tsc/lib/batch/typescript-diagnostic-reporters.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatWatchStatusReport = exports.formatSolutionBuilderStatusReport = exports.formatDiagnosticReport = void 0;
+const ts = require("typescript");
+// adapted from TS default diagnostic reporter
+function formatDiagnosticReport(diagnostic, host) {
+    const diagnostics = new Array(1);
+    diagnostics[0] = diagnostic;
+    const formattedDiagnostic = '\n' +
+        ts.formatDiagnosticsWithColorAndContext(diagnostics, host) +
+        host.getNewLine();
+    diagnostics[0] = undefined;
+    return formattedDiagnostic;
+}
+exports.formatDiagnosticReport = formatDiagnosticReport;
+// adapted from TS default solution builder status reporter
+function formatSolutionBuilderStatusReport(diagnostic) {
+    let formattedDiagnostic = `[${formatColorAndReset(getLocaleTimeString(), ForegroundColorEscapeSequences.Grey)}] `;
+    formattedDiagnostic += `${ts.flattenDiagnosticMessageText(diagnostic.messageText, ts.sys.newLine)}${ts.sys.newLine + ts.sys.newLine}`;
+    return formattedDiagnostic;
+}
+exports.formatSolutionBuilderStatusReport = formatSolutionBuilderStatusReport;
+// adapted from TS default watch status reporter
+function formatWatchStatusReport(diagnostic, newLine) {
+    let output = `[${formatColorAndReset(getLocaleTimeString(), ForegroundColorEscapeSequences.Grey)}] `;
+    output += `${ts.flattenDiagnosticMessageText(diagnostic.messageText, ts.sys.newLine)}${newLine + newLine}`;
+    return output;
+}
+exports.formatWatchStatusReport = formatWatchStatusReport;
+function formatColorAndReset(text, formatStyle) {
+    const resetEscapeSequence = '\u001b[0m';
+    return formatStyle + text + resetEscapeSequence;
+}
+function getLocaleTimeString() {
+    return new Date().toLocaleTimeString();
+}
+var ForegroundColorEscapeSequences;
+(function (ForegroundColorEscapeSequences) {
+    ForegroundColorEscapeSequences["Grey"] = "\u001B[90m";
+    ForegroundColorEscapeSequences["Red"] = "\u001B[91m";
+    ForegroundColorEscapeSequences["Yellow"] = "\u001B[93m";
+    ForegroundColorEscapeSequences["Blue"] = "\u001B[94m";
+    ForegroundColorEscapeSequences["Cyan"] = "\u001B[96m";
+})(ForegroundColorEscapeSequences || (ForegroundColorEscapeSequences = {}));

package/src/executors/tsc/lib/batch/watch.d.ts

@@ -0,0 +1,3 @@
+import type { TaskInfo } from './types';
+export declare function watchTaskProjectsPackageJsonFileChanges(taskInfos: TaskInfo[], callback: (changedTaskInfos: TaskInfo[]) => void): Promise<() => void>;
+export declare function watchTaskProjectsFileChangesForAssets(taskInfos: TaskInfo[]): Promise<() => void>;

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

@@ -0,0 +1,63 @@
+"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);
+                }
+            }
+        });
+        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();
+    });
+}
+exports.watchTaskProjectsFileChangesForAssets = watchTaskProjectsFileChangesForAssets;

package/src/executors/tsc/lib/get-custom-transformers-factory.d.ts

@@ -0,0 +1,3 @@
+import * as ts from 'typescript';
+import type { TransformerEntry } from '../../../utils/typescript/types';
+export declare function getCustomTrasformersFactory(transformers: TransformerEntry[]): (program: ts.Program) => ts.CustomTransformers;

package/src/executors/tsc/lib/get-custom-transformers-factory.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCustomTrasformersFactory = void 0;
+const load_ts_transformers_1 = require("../../../utils/typescript/load-ts-transformers");
+function getCustomTrasformersFactory(transformers) {
+    const { compilerPluginHooks } = (0, load_ts_transformers_1.loadTsTransformers)(transformers);
+    return (program) => ({
+        before: compilerPluginHooks.beforeHooks.map((hook) => hook(program)),
+        after: compilerPluginHooks.afterHooks.map((hook) => hook(program)),
+        afterDeclarations: compilerPluginHooks.afterDeclarationsHooks.map((hook) => hook(program)),
+    });
+}
+exports.getCustomTrasformersFactory = getCustomTrasformersFactory;

package/src/executors/tsc/lib/index.d.ts

@@ -0,0 +1,2 @@
+export * from './get-custom-transformers-factory';
+export * from './normalize-options';

package/src/executors/tsc/lib/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./get-custom-transformers-factory"), exports);
+tslib_1.__exportStar(require("./normalize-options"), exports);

package/src/executors/tsc/lib/normalize-options.d.ts

@@ -0,0 +1,2 @@
+import type { ExecutorOptions, NormalizedExecutorOptions } from '../../../utils/schema';
+export declare function normalizeOptions(options: ExecutorOptions, contextRoot: string, sourceRoot: string, projectRoot: string): NormalizedExecutorOptions;

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

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeOptions = void 0;
+const path_1 = require("path");
+const assets_1 = require("../../../utils/assets/assets");
+function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
+    const outputPath = (0, path_1.join)(contextRoot, options.outputPath);
+    const rootDir = options.rootDir
+        ? (0, path_1.join)(contextRoot, options.rootDir)
+        : (0, path_1.join)(contextRoot, projectRoot);
+    if (options.watch == null) {
+        options.watch = false;
+    }
+    // TODO: put back when inlining story is more stable
+    // if (options.external == null) {
+    //   options.external = 'all';
+    // } else if (Array.isArray(options.external) && options.external.length === 0) {
+    //   options.external = 'none';
+    // }
+    if (Array.isArray(options.external) && options.external.length > 0) {
+        const firstItem = options.external[0];
+        if (firstItem === 'all' || firstItem === 'none') {
+            options.external = firstItem;
+        }
+    }
+    const files = (0, assets_1.assetGlobsToFiles)(options.assets, contextRoot, outputPath);
+    return Object.assign(Object.assign({}, 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')) });
+}
+exports.normalizeOptions = normalizeOptions;

package/src/executors/tsc/tsc.batch-impl.d.ts

@@ -0,0 +1,4 @@
+import type { ExecutorContext, TaskGraph } from '@nx/devkit';
+import type { ExecutorOptions } from '../../utils/schema';
+export declare function tscBatchExecutor(taskGraph: TaskGraph, inputs: Record<string, ExecutorOptions>, overrides: ExecutorOptions, context: ExecutorContext): AsyncGenerator<import("../../../../../build/packages/nx/src/tasks-runner/batch/batch-messages").BatchResults, any, undefined>;
+export default tscBatchExecutor;

package/src/executors/tsc/tsc.batch-impl.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tscBatchExecutor = void 0;
+const tslib_1 = require("tslib");
+const fs_1 = require("fs");
+const update_package_json_1 = require("../../utils/package-json/update-package-json");
+const batch_1 = require("./lib/batch");
+function tscBatchExecutor(taskGraph, inputs, overrides, context) {
+    return tslib_1.__asyncGenerator(this, arguments, function* tscBatchExecutor_1() {
+        const tasksOptions = (0, batch_1.normalizeTasksOptions)(inputs, context);
+        let shouldWatch = false;
+        Object.values(tasksOptions).forEach((taskOptions) => {
+            if (taskOptions.clean) {
+                (0, fs_1.rmSync)(taskOptions.outputPath, { force: true, recursive: true });
+            }
+            if (taskOptions.watch) {
+                shouldWatch = true;
+            }
+        });
+        const tsConfigTaskInfoMap = {};
+        (0, batch_1.buildTaskInfoPerTsConfigMap)(tsConfigTaskInfoMap, tasksOptions, context, Object.keys(taskGraph.tasks), shouldWatch);
+        const typescriptCompilation = (0, batch_1.compileBatchTypescript)(tsConfigTaskInfoMap, taskGraph, shouldWatch, (taskInfo) => {
+            taskInfo.assetsHandler.processAllAssetsOnceSync();
+            (0, update_package_json_1.updatePackageJson)(taskInfo.options, taskInfo.context, taskInfo.projectGraphNode, taskInfo.buildableProjectNodeDependencies);
+        });
+        if (shouldWatch) {
+            const taskInfos = Object.values(tsConfigTaskInfoMap);
+            const watchAssetsChangesDisposer = yield tslib_1.__await((0, batch_1.watchTaskProjectsFileChangesForAssets)(taskInfos));
+            const watchProjectsChangesDisposer = yield tslib_1.__await((0, batch_1.watchTaskProjectsPackageJsonFileChanges)(taskInfos, (changedTaskInfos) => {
+                for (const t of changedTaskInfos) {
+                    (0, update_package_json_1.updatePackageJson)(t.options, t.context, t.projectGraphNode, t.buildableProjectNodeDependencies);
+                }
+            }));
+            const handleTermination = (exitCode) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                yield typescriptCompilation.close();
+                watchAssetsChangesDisposer();
+                watchProjectsChangesDisposer();
+                process.exit(exitCode);
+            });
+            process.on('SIGINT', () => handleTermination(128 + 2));
+            process.on('SIGTERM', () => handleTermination(128 + 15));
+        }
+        return yield tslib_1.__await(yield tslib_1.__await(yield* tslib_1.__asyncDelegator(tslib_1.__asyncValues(typescriptCompilation.iterator))));
+    });
+}
+exports.tscBatchExecutor = tscBatchExecutor;
+exports.default = tscBatchExecutor;

package/src/executors/tsc/tsc.impl.d.ts

@@ -1,7 +1,6 @@
 import { ExecutorContext } from '@nx/devkit';
 import type { TypeScriptCompilationOptions } from '@nx/workspace/src/utilities/typescript/compilation';
 import { ExecutorOptions, NormalizedExecutorOptions } from '../../utils/schema';
-export declare function normalizeOptions(options: ExecutorOptions, contextRoot: string, sourceRoot: string, projectRoot: string): NormalizedExecutorOptions;
 export declare function createTypeScriptCompilationOptions(normalizedOptions: NormalizedExecutorOptions, context: ExecutorContext): TypeScriptCompilationOptions;
 export declare function tscExecutor(_options: ExecutorOptions, context: ExecutorContext): AsyncGenerator<import("../../utils/typescript/compile-typescript-files").TypescriptCompilationResult, any, undefined>;
 export default tscExecutor;

package/src/executors/tsc/tsc.impl.js

@@ -1,51 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tscExecutor = exports.createTypeScriptCompilationOptions = exports.normalizeOptions = void 0;
+exports.tscExecutor = exports.createTypeScriptCompilationOptions = void 0;
 const tslib_1 = require("tslib");
-const assets_1 = require("../../utils/assets/assets");
-const path_1 = require("path");
 const copy_assets_handler_1 = require("../../utils/assets/copy-assets-handler");
 const check_dependencies_1 = require("../../utils/check-dependencies");
 const compiler_helper_dependency_1 = require("../../utils/compiler-helper-dependency");
 const inline_1 = require("../../utils/inline");
 const update_package_json_1 = require("../../utils/package-json/update-package-json");
 const compile_typescript_files_1 = require("../../utils/typescript/compile-typescript-files");
-const load_ts_transformers_1 = require("../../utils/typescript/load-ts-transformers");
 const watch_for_single_file_changes_1 = require("../../utils/watch-for-single-file-changes");
-function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
-    const outputPath = (0, path_1.join)(contextRoot, options.outputPath);
-    const rootDir = options.rootDir
-        ? (0, path_1.join)(contextRoot, options.rootDir)
-        : projectRoot;
-    if (options.watch == null) {
-        options.watch = false;
-    }
-    // TODO: put back when inlining story is more stable
-    // if (options.external == null) {
-    //   options.external = 'all';
-    // } else if (Array.isArray(options.external) && options.external.length === 0) {
-    //   options.external = 'none';
-    // }
-    if (Array.isArray(options.external) && options.external.length > 0) {
-        const firstItem = options.external[0];
-        if (firstItem === 'all' || firstItem === 'none') {
-            options.external = firstItem;
-        }
-    }
-    const files = (0, assets_1.assetGlobsToFiles)(options.assets, contextRoot, outputPath);
-    return Object.assign(Object.assign({}, 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')) });
-}
-exports.normalizeOptions = normalizeOptions;
+const lib_1 = require("./lib");
 function createTypeScriptCompilationOptions(normalizedOptions, context) {
-    const { compilerPluginHooks } = (0, load_ts_transformers_1.loadTsTransformers)(normalizedOptions.transformers);
-    const getCustomTransformers = (program) => ({
-        before: compilerPluginHooks.beforeHooks.map((hook) => hook(program)),
-        after: compilerPluginHooks.afterHooks.map((hook) => hook(program)),
-        afterDeclarations: compilerPluginHooks.afterDeclarationsHooks.map((hook) => hook(program)),
-    });
     return {
         outputPath: normalizedOptions.outputPath,
         projectName: context.projectName,
@@ -54,14 +19,14 @@ function createTypeScriptCompilationOptions(normalizedOptions, context) {
         tsConfig: normalizedOptions.tsConfig,
         watch: normalizedOptions.watch,
         deleteOutputPath: normalizedOptions.clean,
-        getCustomTransformers,
+        getCustomTransformers: (0, lib_1.getCustomTrasformersFactory)(normalizedOptions.transformers),
     };
 }
 exports.createTypeScriptCompilationOptions = createTypeScriptCompilationOptions;
 function tscExecutor(_options, context) {
     return tslib_1.__asyncGenerator(this, arguments, function* tscExecutor_1() {
         const { sourceRoot, root } = context.projectsConfigurations.projects[context.projectName];
-        const options = normalizeOptions(_options, context.root, sourceRoot, root);
+        const options = (0, lib_1.normalizeOptions)(_options, context.root, sourceRoot, root);
         const { projectRoot, tmpTsConfig, target, dependencies } = (0, check_dependencies_1.checkDependencies)(context, _options.tsConfig);
         if (tmpTsConfig) {
             options.tsConfig = tmpTsConfig;
@@ -103,4 +68,3 @@ function tscExecutor(_options, context) {
 }
 exports.tscExecutor = tscExecutor;
 exports.default = tscExecutor;
-//# sourceMappingURL=tsc.impl.js.map

package/src/executors/verdaccio/compat.js

@@ -3,4 +3,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const devkit_1 = require("@nx/devkit");
 const verdaccio_impl_1 = require("./verdaccio.impl");
 exports.default = (0, devkit_1.convertNxExecutor)(verdaccio_impl_1.verdaccioExecutor);
-//# sourceMappingURL=compat.js.map

package/src/executors/verdaccio/verdaccio.impl.d.ts

@@ -7,5 +7,6 @@ import { VerdaccioExecutorSchema } from './schema';
  */
 export declare function verdaccioExecutor(options: VerdaccioExecutorSchema, context: ExecutorContext): Promise<{
     success: boolean;
+    port: number;
 }>;
 export default verdaccioExecutor;

package/src/executors/verdaccio/verdaccio.impl.js

@@ -5,6 +5,8 @@ const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 const fs_extra_1 = require("fs-extra");
 const child_process_1 = require("child_process");
+const detectPort = require("detect-port");
+const path_1 = require("path");
 let childProcess;
 /**
  * - set npm and yarn to use local registry
@@ -19,8 +21,12 @@ function verdaccioExecutor(options, context) {
         catch (e) {
             throw new Error('Verdaccio is not installed. Please run `npm install verdaccio` or `yarn add verdaccio`');
         }
-        if (options.clear && options.storage && (0, fs_extra_1.existsSync)(options.storage)) {
-            (0, fs_extra_1.removeSync)(options.storage);
+        if (options.storage) {
+            options.storage = (0, path_1.resolve)(context.root, options.storage);
+            if (options.clear && (0, fs_extra_1.existsSync)(options.storage)) {
+                (0, fs_extra_1.rmSync)(options.storage, { recursive: true, force: true });
+                console.log(`Cleared local registry storage folder ${options.storage}`);
+            }
         }
         const cleanupFunctions = options.location === 'none' ? [] : [setupNpm(options), setupYarn(options)];
         const processExitListener = (signal) => {
@@ -36,16 +42,23 @@ function verdaccioExecutor(options, context) {
         process.on('SIGINT', processExitListener);
         process.on('SIGHUP', processExitListener);
         try {
-            yield startVerdaccio(options);
+            const port = yield detectPort(options.port);
+            if (port !== options.port) {
+                devkit_1.logger.info(`Port ${options.port} was occupied. Using port ${port}.`);
+                options.port = port;
+            }
+            yield startVerdaccio(options, context.root);
         }
         catch (e) {
-            devkit_1.logger.error('Failed to start verdaccio: ' + e.toString());
+            devkit_1.logger.error('Failed to start verdaccio: ' + (e === null || e === void 0 ? void 0 : e.toString()));
             return {
                 success: false,
+                port: options.port,
             };
         }
         return {
             success: true,
+            port: options.port,
         };
     });
 }
@@ -53,23 +66,13 @@ exports.verdaccioExecutor = verdaccioExecutor;
 /**
  * Fork the verdaccio process: https://verdaccio.org/docs/verdaccio-programmatically/#using-fork-from-child_process-module
  */
-function startVerdaccio(options) {
+function startVerdaccio(options, workspaceRoot) {
     return new Promise((resolve, reject) => {
-        childProcess = (0, child_process_1.fork)(require.resolve('verdaccio/bin/verdaccio'), createVerdaccioOptions(options), {
-            env: Object.assign(Object.assign({}, process.env), { VERDACCIO_HANDLE_KILL_SIGNALS: 'true' }),
-            stdio: ['inherit', 'pipe', 'pipe', 'ipc'],
-        });
-        childProcess.stdout.on('data', (data) => {
-            process.stdout.write(data);
-        });
-        childProcess.stderr.on('data', (data) => {
-            if (data.includes('VerdaccioWarning') ||
-                data.includes('DeprecationWarning')) {
-                process.stdout.write(data);
-            }
-            else {
-                reject(data);
-            }
+        childProcess = (0, child_process_1.fork)(require.resolve('verdaccio/bin/verdaccio'), createVerdaccioOptions(options, workspaceRoot), {
+            env: Object.assign(Object.assign(Object.assign({}, process.env), { VERDACCIO_HANDLE_KILL_SIGNALS: 'true' }), (options.storage
+                ? { VERDACCIO_STORAGE_PATH: options.storage }
+                : {})),
+            stdio: 'inherit',
         });
         childProcess.on('error', (err) => {
             reject(err);
@@ -87,13 +90,13 @@ function startVerdaccio(options) {
         });
     });
 }
-function createVerdaccioOptions(options) {
+function createVerdaccioOptions(options, workspaceRoot) {
     const verdaccioArgs = [];
     if (options.port) {
         verdaccioArgs.push('--listen', options.port.toString());
     }
     if (options.config) {
-        verdaccioArgs.push('--config', options.config);
+        verdaccioArgs.push('--config', (0, path_1.join)(workspaceRoot, options.config));
     }
     return verdaccioArgs;
 }
@@ -164,4 +167,3 @@ function setupYarn(options) {
     };
 }
 exports.default = verdaccioExecutor;
-//# sourceMappingURL=verdaccio.impl.js.map

package/src/generators/convert-to-swc/convert-to-swc.js

@@ -61,4 +61,3 @@ function checkSwcDependencies(tree, projectConfiguration) {
 }
 exports.default = convertToSwcGenerator;
 exports.convertToSwcSchematic = (0, devkit_1.convertNxGenerator)(convertToSwcGenerator);
-//# sourceMappingURL=convert-to-swc.js.map

package/src/generators/init/init.js

@@ -112,4 +112,3 @@ function initGenerator(tree, schema) {
 exports.initGenerator = initGenerator;
 exports.default = initGenerator;
 exports.initSchematic = (0, devkit_1.convertNxGenerator)(initGenerator);
-//# sourceMappingURL=init.js.map