@nrwl/js 13.4.0-beta.2 → 13.4.1

package/executors.json

@@ -10,6 +10,11 @@
       "implementation": "./src/executors/swc/swc.impl",
       "schema": "./src/executors/swc/schema.json",
       "description": "Build a project using SWC"
+    },
+    "node": {
+      "implementation": "./src/executors/node/node.impl",
+      "schema": "./src/executors/node/schema.json",
+      "description": "Build Node.js applications"
     }
   },
   "builders": {
@@ -22,6 +27,11 @@
       "implementation": "./src/executors/swc/compat",
       "schema": "./src/executors/swc/schema.json",
       "description": "Build a project using SWC"
+    },
+    "node": {
+      "implementation": "./src/executors/node/compat",
+      "schema": "./src/executors/node/schema.json",
+      "description": "Build Node.js applications"
     }
   }
 }

package/package.json

@@ -1,18 +1,22 @@
 {
   "name": "@nrwl/js",
-  "version": "13.4.0-beta.2",
+  "version": "13.4.1",
   "main": "src/index.js",
   "generators": "./generators.json",
   "schematics": "./generators.json",
   "executors": "./executors.json",
   "builders": "./executors.json",
   "dependencies": {
-    "@nrwl/workspace": "13.4.0-beta.2",
-    "@nrwl/devkit": "13.4.0-beta.2",
-    "@nrwl/jest": "13.4.0-beta.2",
-    "@nrwl/linter": "13.4.0-beta.2",
+    "@nrwl/workspace": "13.4.1",
+    "@nrwl/devkit": "13.4.1",
+    "@nrwl/jest": "13.4.1",
+    "@nrwl/linter": "13.4.1",
     "chalk": "4.1.0",
-    "js-tokens": "^4.0.0"
+    "js-tokens": "^4.0.0",
+    "rxjs": "^6.5.4",
+    "rxjs-for-await": "0.0.2",
+    "source-map-support": "0.5.19",
+    "tree-kill": "1.2.2"
   },
   "typings": "./src/index.d.ts"
 }

package/src/executors/node/compat.d.ts

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

package/src/executors/node/compat.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const devkit_1 = require("@nrwl/devkit");
+const node_impl_1 = require("./node.impl");
+exports.default = (0, devkit_1.convertNxExecutor)(node_impl_1.default);
+//# sourceMappingURL=compat.js.map

package/src/executors/node/compat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"compat.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/compat.ts"],"names":[],"mappings":";;AAAA,yCAAiD;AACjD,2CAAuC;AAEvC,kBAAe,IAAA,0BAAiB,EAAC,mBAAY,CAAC,CAAC"}

package/src/executors/node/node-with-require-overrides.d.ts

@@ -0,0 +1,5 @@
+declare const Module: any;
+declare const originalLoader: any;
+declare const mappings: any;
+declare const keys: string[];
+declare const fileToRun: string;

package/src/executors/node/node-with-require-overrides.js

@@ -0,0 +1,20 @@
+const Module = require('module');
+const originalLoader = Module._load;
+const mappings = JSON.parse(process.env.NX_MAPPINGS);
+const keys = Object.keys(mappings);
+const fileToRun = process.env.NX_FILE_TO_RUN;
+Module._load = function (request, parent) {
+    if (!parent)
+        return originalLoader.apply(this, arguments);
+    const match = keys.find((k) => request === k);
+    if (match) {
+        const newArguments = [...arguments];
+        newArguments[0] = mappings[match];
+        return originalLoader.apply(this, newArguments);
+    }
+    else {
+        return originalLoader.apply(this, arguments);
+    }
+};
+require(fileToRun);
+//# sourceMappingURL=node-with-require-overrides.js.map

package/src/executors/node/node-with-require-overrides.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"node-with-require-overrides.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/node/node-with-require-overrides.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACjC,MAAM,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC;AAEpC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AACrD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACnC,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;AAE7C,MAAM,CAAC,KAAK,GAAG,UAAU,OAAO,EAAE,MAAM;IACtC,IAAI,CAAC,MAAM;QAAE,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC;IAC9C,IAAI,KAAK,EAAE;QACT,MAAM,YAAY,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC;QACpC,YAAY,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAClC,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;KACjD;SAAM;QACL,OAAO,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;KAC9C;AACH,CAAC,CAAC;AAEF,OAAO,CAAC,SAAS,CAAC,CAAC"}

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

@@ -0,0 +1,5 @@
+import { ExecutorContext } from '@nrwl/devkit';
+import { ExecutorEvent } from '../../utils/schema';
+import { NodeExecutorOptions } from './schema';
+export declare function nodeExecutor(options: NodeExecutorOptions, context: ExecutorContext): AsyncGenerator<ExecutorEvent, void, unknown>;
+export default nodeExecutor;

package/src/executors/node/node.impl.js

@@ -0,0 +1,141 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.nodeExecutor = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const child_process_1 = require("child_process");
+const treeKill = require("tree-kill");
+const util_1 = require("util");
+const project_graph_1 = require("@nrwl/workspace/src/core/project-graph");
+const buildable_libs_utils_1 = require("@nrwl/workspace/src/utilities/buildable-libs-utils");
+let subProcess = null;
+function nodeExecutor(options, context) {
+    return (0, tslib_1.__asyncGenerator)(this, arguments, function* nodeExecutor_1() {
+        var e_1, _a;
+        // for now we only run the executor in the watch mode
+        options.watch = true;
+        process.on('SIGTERM', () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+            yield killProcess();
+            process.exit(128 + 15);
+        }));
+        process.on('SIGINT', () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+            yield killProcess();
+            process.exit(128 + 2);
+        }));
+        process.on('SIGHUP', () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+            yield killProcess();
+            process.exit(128 + 1);
+        }));
+        if (options.waitUntilTargets && options.waitUntilTargets.length > 0) {
+            const results = yield (0, tslib_1.__await)(runWaitUntilTargets(options, context));
+            for (const [i, result] of results.entries()) {
+                if (!result.success) {
+                    throw new Error(`Wait until target failed: ${options.waitUntilTargets[i]}.`);
+                }
+            }
+        }
+        const mappings = calculateResolveMappings(context, options);
+        try {
+            for (var _b = (0, tslib_1.__asyncValues)(startBuild(options, context)), _c; _c = yield (0, tslib_1.__await)(_b.next()), !_c.done;) {
+                const event = _c.value;
+                if (!event.success) {
+                    devkit_1.logger.error('There was an error with the build. See above.');
+                    devkit_1.logger.info(`${event.outfile} was not restarted.`);
+                }
+                yield (0, tslib_1.__await)(handleBuildEvent(event, options, mappings));
+                yield yield (0, tslib_1.__await)(event);
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) yield (0, tslib_1.__await)(_a.call(_b));
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+    });
+}
+exports.nodeExecutor = nodeExecutor;
+function calculateResolveMappings(context, options) {
+    const projectGraph = (0, project_graph_1.readCachedProjectGraph)();
+    const parsed = (0, devkit_1.parseTargetString)(options.buildTarget);
+    const { dependencies } = (0, buildable_libs_utils_1.calculateProjectDependencies)(projectGraph, context.root, parsed.project, parsed.target, parsed.configuration);
+    return dependencies.reduce((m, c) => {
+        m[c.name] = (0, devkit_1.joinPathFragments)(context.root, c.outputs[0]);
+        return m;
+    }, {});
+}
+function runProcess(event, options, mappings) {
+    subProcess = (0, child_process_1.fork)((0, devkit_1.joinPathFragments)(__dirname, 'node-with-require-overrides'), options.args, {
+        execArgv: getExecArgv(options),
+        stdio: 'inherit',
+        env: Object.assign(Object.assign({}, process.env), { NX_FILE_TO_RUN: event.outfile, NX_MAPPINGS: JSON.stringify(mappings) }),
+    });
+}
+function getExecArgv(options) {
+    const args = [
+        '-r',
+        require.resolve('source-map-support/register'),
+        ...options.runtimeArgs,
+    ];
+    if (options.inspect === true) {
+        options.inspect = "inspect" /* Inspect */;
+    }
+    if (options.inspect) {
+        args.push(`--${options.inspect}=${options.host}:${options.port}`);
+    }
+    return args;
+}
+function handleBuildEvent(event, options, mappings) {
+    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        if ((!event.success || options.watch) && subProcess) {
+            yield killProcess();
+        }
+        if (event.success) {
+            runProcess(event, options, mappings);
+        }
+    });
+}
+function killProcess() {
+    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        const promisifiedTreeKill = (0, util_1.promisify)(treeKill);
+        try {
+            yield promisifiedTreeKill(subProcess.pid, 'SIGTERM');
+        }
+        catch (err) {
+            if (Array.isArray(err) && err[0] && err[2]) {
+                const errorMessage = err[2];
+                devkit_1.logger.error(errorMessage);
+            }
+            else if (err.message) {
+                devkit_1.logger.error(err.message);
+            }
+        }
+        finally {
+            subProcess = null;
+        }
+    });
+}
+function startBuild(options, context) {
+    return (0, tslib_1.__asyncGenerator)(this, arguments, function* startBuild_1() {
+        const buildTarget = (0, devkit_1.parseTargetString)(options.buildTarget);
+        yield (0, tslib_1.__await)(yield* (0, tslib_1.__asyncDelegator)((0, tslib_1.__asyncValues)(yield (0, tslib_1.__await)((0, devkit_1.runExecutor)(buildTarget, Object.assign(Object.assign({}, options.buildTargetOptions), { watch: options.watch }), context)))));
+    });
+}
+function runWaitUntilTargets(options, context) {
+    return Promise.all(options.waitUntilTargets.map((waitUntilTarget) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        const target = (0, devkit_1.parseTargetString)(waitUntilTarget);
+        const output = yield (0, devkit_1.runExecutor)(target, {}, context);
+        return new Promise((resolve) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+            let event = yield output.next();
+            // Resolve after first event
+            resolve(event.value);
+            // Continue iterating
+            while (!event.done) {
+                event = yield output.next();
+            }
+        }));
+    })));
+}
+exports.default = nodeExecutor;
+//# sourceMappingURL=node.impl.js.map

package/src/executors/node/node.impl.js.map

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

package/src/executors/node/schema.d.ts

@@ -0,0 +1,16 @@
+export const enum InspectType {
+  Inspect = 'inspect',
+  InspectBrk = 'inspect-brk',
+}
+
+export interface NodeExecutorOptions {
+  inspect: boolean | InspectType;
+  runtimeArgs: string[];
+  args: string[];
+  waitUntilTargets: string[];
+  buildTarget: string;
+  buildTargetOptions: Record<string, any>;
+  host: string;
+  port: number;
+  watch: boolean;
+}

package/src/executors/node/schema.json

@@ -0,0 +1,67 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "cli": "nx",
+  "title": "Node executor",
+  "description": "Execute Nodejs applications",
+  "type": "object",
+  "properties": {
+    "buildTarget": {
+      "type": "string",
+      "description": "The target to run to build you the app"
+    },
+    "buildTargetOptions": {
+      "type": "object",
+      "description": "Additional options to pass into the build target.",
+      "default": {}
+    },
+    "waitUntilTargets": {
+      "type": "array",
+      "description": "The targets to run to before starting the node app",
+      "default": [],
+      "items": {
+        "type": "string"
+      }
+    },
+    "host": {
+      "type": "string",
+      "default": "localhost",
+      "description": "The host to inspect the process on"
+    },
+    "port": {
+      "type": "number",
+      "default": 9229,
+      "description": "The port to inspect the process on. Setting port to 0 will assign random free ports to all forked processes."
+    },
+    "inspect": {
+      "oneOf": [
+        {
+          "type": "string",
+          "enum": ["inspect", "inspect-brk"]
+        },
+        {
+          "type": "boolean"
+        }
+      ],
+      "description": "Ensures the app is starting with debugging",
+      "default": "inspect"
+    },
+    "runtimeArgs": {
+      "type": "array",
+      "description": "Extra args passed to the node process",
+      "default": [],
+      "items": {
+        "type": "string"
+      }
+    },
+    "args": {
+      "type": "array",
+      "description": "Extra args when starting the app",
+      "default": [],
+      "items": {
+        "type": "string"
+      }
+    }
+  },
+  "additionalProperties": false,
+  "required": ["buildTarget"]
+}

package/src/executors/swc/schema.json

@@ -17,11 +17,6 @@
       "type": "string",
       "description": "The path to the Typescript configuration file."
     },
-    "skipTypeCheck": {
-      "type": "boolean",
-      "description": "Whether to skip TypeScript type checking.",
-      "default": false
-    },
     "assets": {
       "type": "array",
       "description": "List of static assets.",
@@ -29,6 +24,16 @@
       "items": {
         "$ref": "#/definitions/assetPattern"
       }
+    },
+    "watch": {
+      "type": "boolean",
+      "description": "Enable re-building when files change.",
+      "default": false
+    },
+    "skipTypeCheck": {
+      "type": "boolean",
+      "description": "Whether to skip TypeScript type checking.",
+      "default": false
     }
   },
   "required": ["main", "outputPath", "tsConfig"],

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

@@ -1,7 +1,5 @@
 import { ExecutorContext } from '@nrwl/devkit';
-import { NormalizedSwcExecutorOptions, SwcExecutorOptions } from './schema';
-export declare function normalizeOptions(options: SwcExecutorOptions, context: ExecutorContext): NormalizedSwcExecutorOptions;
-export declare function swcExecutor(options: SwcExecutorOptions, context: ExecutorContext): Promise<{
-    success: boolean;
-}>;
+import { ExecutorEvent, NormalizedSwcExecutorOptions, SwcExecutorOptions } from '../../utils/schema';
+export declare function normalizeOptions(options: SwcExecutorOptions, contextRoot: string, sourceRoot?: string, projectRoot?: string): NormalizedSwcExecutorOptions;
+export declare function swcExecutor(options: SwcExecutorOptions, context: ExecutorContext): AsyncGenerator<ExecutorEvent, any, undefined>;
 export default swcExecutor;

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

@@ -2,67 +2,41 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.swcExecutor = exports.normalizeOptions = void 0;
 const tslib_1 = require("tslib");
-const app_root_1 = require("@nrwl/tao/src/utils/app-root");
 const assets_1 = require("@nrwl/workspace/src/utilities/assets");
 const path_1 = require("path");
+const rxjs_for_await_1 = require("rxjs-for-await");
+const operators_1 = require("rxjs/operators");
 const check_dependencies_1 = require("../../utils/check-dependencies");
 const compile_swc_1 = require("../../utils/swc/compile-swc");
-const print_diagnostics_1 = require("../../utils/typescript/print-diagnostics");
-const run_type_check_1 = require("../../utils/typescript/run-type-check");
 const update_package_json_1 = require("../../utils/update-package-json");
-function normalizeOptions(options, context) {
-    const outputPath = (0, path_1.join)(context.root, options.outputPath);
+function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
+    const outputPath = (0, path_1.join)(contextRoot, options.outputPath);
     if (options.skipTypeCheck == null) {
         options.skipTypeCheck = false;
     }
-    const files = (0, assets_1.assetGlobsToFiles)(options.assets, context.root, outputPath);
-    return Object.assign(Object.assign({}, options), { files,
-        outputPath, tsConfig: (0, path_1.join)(context.root, options.tsConfig) });
+    if (options.watch == null) {
+        options.watch = false;
+    }
+    const files = (0, assets_1.assetGlobsToFiles)(options.assets, contextRoot, outputPath);
+    return Object.assign(Object.assign({}, options), { swcrcPath: (0, path_1.join)(projectRoot, '.swcrc'), mainOutputPath: (0, path_1.resolve)(outputPath, options.main.replace(`${projectRoot}/`, '').replace('.ts', '.js')), files, root: contextRoot, sourceRoot,
+        projectRoot,
+        outputPath, tsConfig: (0, path_1.join)(contextRoot, options.tsConfig) });
 }
 exports.normalizeOptions = normalizeOptions;
 function swcExecutor(options, context) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
-        const normalizedOptions = normalizeOptions(options, context);
-        const { shouldContinue, tmpTsConfig, projectRoot } = (0, check_dependencies_1.checkDependencies)(context, options.tsConfig);
-        if (!shouldContinue) {
-            return { success: false };
-        }
+    return (0, tslib_1.__asyncGenerator)(this, arguments, function* swcExecutor_1() {
+        const { sourceRoot, root } = context.workspace.projects[context.projectName];
+        const normalizedOptions = normalizeOptions(options, context.root, sourceRoot, root);
+        const { tmpTsConfig, projectRoot } = (0, check_dependencies_1.checkDependencies)(context, options.tsConfig);
         if (tmpTsConfig) {
             normalizedOptions.tsConfig = tmpTsConfig;
         }
-        const tsOptions = {
-            outputPath: normalizedOptions.outputPath,
-            projectName: context.projectName,
-            projectRoot,
-            tsConfig: normalizedOptions.tsConfig,
-        };
-        if (!options.skipTypeCheck) {
-            const ts = yield Promise.resolve().then(() => require('typescript'));
-            // start two promises, one for type checking, one for transpiling
-            return Promise.all([
-                (0, run_type_check_1.runTypeCheck)({
-                    ts,
-                    mode: 'emitDeclarationOnly',
-                    tsConfigPath: tsOptions.tsConfig,
-                    outDir: tsOptions.outputPath.replace(`/${projectRoot}`, ''),
-                    workspaceRoot: app_root_1.appRootPath,
-                }).then((result) => {
-                    const hasErrors = result.errors.length > 0;
-                    if (hasErrors) {
-                        (0, print_diagnostics_1.printDiagnostics)(result);
-                    }
-                    return Promise.resolve({ success: !hasErrors });
-                }),
-                (0, compile_swc_1.compileSwc)(tsOptions, () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
-                    yield updatePackageAndCopyAssets(normalizedOptions, projectRoot);
-                })),
-            ]).then(([typeCheckResult, transpileResult]) => ({
-                success: typeCheckResult.success && transpileResult.success,
-            }));
-        }
-        return (0, compile_swc_1.compileSwc)(tsOptions, () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return yield (0, tslib_1.__await)(yield (0, tslib_1.__await)(yield* (0, tslib_1.__asyncDelegator)((0, tslib_1.__asyncValues)((0, rxjs_for_await_1.eachValueFrom)((0, compile_swc_1.compileSwc)(context, normalizedOptions, () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             yield updatePackageAndCopyAssets(normalizedOptions, projectRoot);
-        }));
+        })).pipe((0, operators_1.map)(({ success }) => ({
+            success,
+            outfile: normalizedOptions.mainOutputPath,
+        }))))))));
     });
 }
 exports.swcExecutor = swcExecutor;

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

@@ -1 +1 @@
-{"version":3,"file":"swc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/swc/swc.impl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"swc.impl.js","sourceRoot":"","sources":["../../../../../../packages/js/src/executors/swc/swc.impl.ts"],"names":[],"mappings":";;;;AACA,iEAI8C;AAC9C,+BAAqC;AACrC,mDAA+C;AAC/C,8CAAqC;AACrC,uEAAmE;AAMnE,6DAAyD;AACzD,yEAAoE;AAEpE,SAAgB,gBAAgB,CAC9B,OAA2B,EAC3B,WAAmB,EACnB,UAAmB,EACnB,WAAoB;IAEpB,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAEzD,IAAI,OAAO,CAAC,aAAa,IAAI,IAAI,EAAE;QACjC,OAAO,CAAC,aAAa,GAAG,KAAK,CAAC;KAC/B;IAED,IAAI,OAAO,CAAC,KAAK,IAAI,IAAI,EAAE;QACzB,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;KACvB;IAED,MAAM,KAAK,GAAsB,IAAA,0BAAiB,EAChD,OAAO,CAAC,MAAM,EACd,WAAW,EACX,UAAU,CACX,CAAC;IAEF,OAAO,gCACF,OAAO,KACV,SAAS,EAAE,IAAA,WAAI,EAAC,WAAW,EAAE,QAAQ,CAAC,EACtC,cAAc,EAAE,IAAA,cAAO,EACrB,UAAU,EACV,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,WAAW,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAClE,EACD,KAAK,EACL,IAAI,EAAE,WAAW,EACjB,UAAU;QACV,WAAW;QACX,UAAU,EACV,QAAQ,EAAE,IAAA,WAAI,EAAC,WAAW,EAAE,OAAO,CAAC,QAAQ,CAAC,GACd,CAAC;AACpC,CAAC;AApCD,4CAoCC;AAED,SAAuB,WAAW,CAChC,OAA2B,EAC3B,OAAwB;;QAExB,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAC7E,MAAM,iBAAiB,GAAG,gBAAgB,CACxC,OAAO,EACP,OAAO,CAAC,IAAI,EACZ,UAAU,EACV,IAAI,CACL,CAAC;QACF,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,GAAG,IAAA,sCAAiB,EACpD,OAAO,EACP,OAAO,CAAC,QAAQ,CACjB,CAAC;QAEF,IAAI,WAAW,EAAE;YACf,iBAAiB,CAAC,QAAQ,GAAG,WAAW,CAAC;SAC1C;QAED,kCAAO,2BAAA,KAAK,CAAC,CAAC,8BAAA,2BAAA,IAAA,8BAAa,EACzB,IAAA,wBAAU,EAAC,OAAO,EAAE,iBAAiB,EAAE,GAAS,EAAE;YAChD,MAAM,0BAA0B,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;QACnE,CAAC,CAAA,CAAC,CAAC,IAAI,CACL,IAAA,eAAG,EACD,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CACd,CAAC;YACC,OAAO;YACP,OAAO,EAAE,iBAAiB,CAAC,cAAc;SACxB,CAAA,CACtB,CACF,CACF,CAAA,CAAA,CAAA,EAAC;IACJ,CAAC;CAAA;AAjCD,kCAiCC;AAED,SAAe,0BAA0B,CACvC,OAAqC,EACrC,WAAmB;;QAEnB,MAAM,IAAA,uBAAc,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACpC,IAAA,uCAAiB,EACf,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,UAAU,EAClB,WAAW,EACX,CAAC,OAAO,CAAC,aAAa,CACvB,CAAC;IACJ,CAAC;CAAA;AAED,kBAAe,WAAW,CAAC"}

package/src/executors/tsc/schema.json

@@ -23,10 +23,22 @@
       "items": {
         "$ref": "#/definitions/assetPattern"
       }
+    },
+    "watch": {
+      "type": "boolean",
+      "description": "Enable re-building when files change.",
+      "default": false
+    },
+    "transformers": {
+      "type": "array",
+      "description": "List of TypeScript Transformer Plugins.",
+      "default": [],
+      "items": {
+        "$ref": "#/definitions/transformerPattern"
+      }
     }
   },
   "required": ["main", "outputPath", "tsConfig"],
-
   "definitions": {
     "assetPattern": {
       "oneOf": [
@@ -60,6 +72,27 @@
           "type": "string"
         }
       ]
+    },
+    "transformerPattern": {
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "name": {
+              "type": "string"
+            },
+            "options": {
+              "type": "object",
+              "additionalProperties": true
+            }
+          },
+          "additionalProperties": false,
+          "required": ["name"]
+        }
+      ]
     }
   }
 }

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

@@ -1,6 +1,5 @@
 import { ExecutorContext } from '@nrwl/devkit';
-import { ExecutorOptions } from '../../utils/schema';
-export declare function tscExecutor(options: ExecutorOptions, context: ExecutorContext): Promise<{
-    success: boolean;
-}>;
+import { ExecutorEvent, ExecutorOptions, NormalizedExecutorOptions } from '../../utils/schema';
+export declare function normalizeOptions(options: ExecutorOptions, contextRoot: string, sourceRoot?: string, projectRoot?: string): NormalizedExecutorOptions;
+export declare function tscExecutor(options: ExecutorOptions, context: ExecutorContext): AsyncGenerator<ExecutorEvent, any, undefined>;
 export default tscExecutor;

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

@@ -1,31 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tscExecutor = void 0;
+exports.tscExecutor = exports.normalizeOptions = void 0;
 const tslib_1 = require("tslib");
 const assets_1 = require("@nrwl/workspace/src/utilities/assets");
 const path_1 = require("path");
+const rxjs_for_await_1 = require("rxjs-for-await");
+const operators_1 = require("rxjs/operators");
 const check_dependencies_1 = require("../../utils/check-dependencies");
-const compile_1 = require("../../utils/compile");
+const compile_typescript_files_1 = require("../../utils/typescript/compile-typescript-files");
 const update_package_json_1 = require("../../utils/update-package-json");
+function normalizeOptions(options, contextRoot, sourceRoot, projectRoot) {
+    const outputPath = (0, path_1.join)(contextRoot, options.outputPath);
+    if (options.watch == null) {
+        options.watch = false;
+    }
+    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), mainOutputPath: (0, path_1.resolve)(outputPath, options.main.replace(`${projectRoot}/`, '').replace('.ts', '.js')) });
+}
+exports.normalizeOptions = normalizeOptions;
 function tscExecutor(options, context) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
-        const normalizedOptions = normalizeOptions(options, context);
-        const { projectRoot, tmpTsConfig, shouldContinue } = (0, check_dependencies_1.checkDependencies)(context, options.tsConfig);
-        if (!shouldContinue) {
-            return { success: false };
-        }
+    return (0, tslib_1.__asyncGenerator)(this, arguments, function* tscExecutor_1() {
+        const { sourceRoot, root } = context.workspace.projects[context.projectName];
+        const normalizedOptions = normalizeOptions(options, context.root, sourceRoot, root);
+        const { projectRoot, tmpTsConfig } = (0, check_dependencies_1.checkDependencies)(context, options.tsConfig);
         if (tmpTsConfig) {
             normalizedOptions.tsConfig = tmpTsConfig;
         }
-        const tsOptions = {
-            outputPath: normalizedOptions.outputPath,
-            projectName: context.projectName,
-            projectRoot,
-            tsConfig: normalizedOptions.tsConfig,
-        };
-        return (0, compile_1.compile)('tsc', context, tsOptions, () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        return yield (0, tslib_1.__await)(yield (0, tslib_1.__await)(yield* (0, tslib_1.__asyncDelegator)((0, tslib_1.__asyncValues)((0, rxjs_for_await_1.eachValueFrom)((0, compile_typescript_files_1.compileTypeScriptFiles)(normalizedOptions, context, () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
             yield updatePackageAndCopyAssets(normalizedOptions, projectRoot);
-        }));
+        })).pipe((0, operators_1.map)(({ success }) => ({
+            success,
+            outfile: normalizedOptions.mainOutputPath,
+        }))))))));
     });
 }
 exports.tscExecutor = tscExecutor;
@@ -35,11 +44,5 @@ function updatePackageAndCopyAssets(options, projectRoot) {
         (0, update_package_json_1.updatePackageJson)(options.main, options.outputPath, projectRoot);
     });
 }
-function normalizeOptions(options, context) {
-    const outputPath = (0, path_1.join)(context.root, options.outputPath);
-    const files = (0, assets_1.assetGlobsToFiles)(options.assets, context.root, outputPath);
-    return Object.assign(Object.assign({}, options), { files,
-        outputPath, tsConfig: (0, path_1.join)(context.root, options.tsConfig) });
-}
 exports.default = tscExecutor;
 //# sourceMappingURL=tsc.impl.js.map