@nrwl/workspace 12.10.0-beta.6 → 13.0.0-beta.3

package/src/core/project-graph/build-project-graph.js

@@ -0,0 +1,221 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildProjectGraphUsingProjectFileMap = exports.buildProjectGraph = void 0;
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nrwl/devkit");
+const app_root_1 = require("@nrwl/tao/src/utils/app-root");
+const path_1 = require("path");
+const perf_hooks_1 = require("perf_hooks");
+const assert_workspace_validity_1 = require("../assert-workspace-validity");
+const file_utils_1 = require("../file-utils");
+const normalize_nx_json_1 = require("../normalize-nx-json");
+const nx_deps_cache_1 = require("../nx-deps/nx-deps-cache");
+const build_dependencies_1 = require("./build-dependencies");
+const build_nodes_1 = require("./build-nodes");
+const fs_1 = require("fs");
+const os = require("os");
+const build_explicit_typescript_and_package_json_dependencies_1 = require("./build-dependencies/build-explicit-typescript-and-package-json-dependencies");
+function buildProjectGraph(projectGraphVersion = '4.0') {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const workspaceJson = file_utils_1.readWorkspaceJson();
+        const { projectFileMap, allWorkspaceFiles } = file_utils_1.createProjectFileMap(workspaceJson);
+        const cacheEnabled = process.env.NX_CACHE_PROJECT_GRAPH !== 'false';
+        let cache = cacheEnabled ? nx_deps_cache_1.readCache() : null;
+        return (yield buildProjectGraphUsingProjectFileMap(workspaceJson, projectFileMap, allWorkspaceFiles, cache, cacheEnabled, projectGraphVersion)).projectGraph;
+    });
+}
+exports.buildProjectGraph = buildProjectGraph;
+function buildProjectGraphUsingProjectFileMap(workspaceJson, projectFileMap, allWorkspaceFiles, cache, shouldWriteCache, projectGraphVersion) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const nxJson = file_utils_1.readNxJson();
+        assert_workspace_validity_1.assertWorkspaceValidity(workspaceJson, nxJson);
+        const normalizedNxJson = normalize_nx_json_1.normalizeNxJson(nxJson);
+        const packageJsonDeps = readCombinedDeps();
+        const rootTsConfig = readRootTsConfig();
+        let filesToProcess = projectFileMap;
+        let cachedFileData = {};
+        if (cache &&
+            !nx_deps_cache_1.shouldRecomputeWholeGraph(cache, packageJsonDeps, workspaceJson, normalizedNxJson, rootTsConfig)) {
+            const fromCache = nx_deps_cache_1.extractCachedFileData(projectFileMap, cache);
+            filesToProcess = fromCache.filesToProcess;
+            cachedFileData = fromCache.cachedFileData;
+        }
+        const context = createContext(workspaceJson, normalizedNxJson, projectFileMap, filesToProcess);
+        let projectGraph = yield buildProjectGraphUsingContext(context, cachedFileData, projectGraphVersion);
+        const projectGraphCache = nx_deps_cache_1.createCache(nxJson, packageJsonDeps, projectGraph, rootTsConfig);
+        if (shouldWriteCache) {
+            nx_deps_cache_1.writeCache(projectGraphCache);
+        }
+        projectGraph.allWorkspaceFiles = allWorkspaceFiles;
+        return {
+            projectGraph,
+            projectGraphCache,
+        };
+    });
+}
+exports.buildProjectGraphUsingProjectFileMap = buildProjectGraphUsingProjectFileMap;
+function readCombinedDeps() {
+    const json = devkit_1.readJsonFile(path_1.join(app_root_1.appRootPath, 'package.json'));
+    return Object.assign(Object.assign({}, json.dependencies), json.devDependencies);
+}
+function buildProjectGraphUsingContext(ctx, cachedFileData, projectGraphVersion) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        perf_hooks_1.performance.mark('build project graph:start');
+        const builder = new devkit_1.ProjectGraphBuilder();
+        build_nodes_1.buildWorkspaceProjectNodes(ctx, builder);
+        build_nodes_1.buildNpmPackageNodes(builder);
+        for (const proj of Object.keys(cachedFileData)) {
+            for (const f of builder.graph.nodes[proj].data.files) {
+                const cached = cachedFileData[proj][f.file];
+                if (cached) {
+                    f.deps = cached.deps;
+                }
+            }
+        }
+        yield buildExplicitDependencies(ctx, builder);
+        build_dependencies_1.buildImplicitProjectDependencies(ctx, builder);
+        builder.setVersion(projectGraphVersion);
+        const initProjectGraph = builder.getUpdatedProjectGraph();
+        const r = updateProjectGraphWithPlugins(ctx, initProjectGraph);
+        perf_hooks_1.performance.mark('build project graph:end');
+        perf_hooks_1.performance.measure('build project graph', 'build project graph:start', 'build project graph:end');
+        return r;
+    });
+}
+function buildExplicitDependencies(ctx, builder) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        let totalNumOfFilesToProcess = totalNumberOfFilesToProcess(ctx);
+        // using workers has an overhead, so we only do it when the number of
+        // files we need to process is >= 100
+        if (totalNumOfFilesToProcess < 100) {
+            return buildExplicitDependenciesWithoutWorkers(ctx, builder);
+        }
+        else {
+            return buildExplicitDependenciesUsingWorkers(ctx, totalNumOfFilesToProcess, builder);
+        }
+    });
+}
+function totalNumberOfFilesToProcess(ctx) {
+    let totalNumOfFilesToProcess = 0;
+    Object.values(ctx.filesToProcess).forEach((t) => (totalNumOfFilesToProcess += t.length));
+    return totalNumOfFilesToProcess;
+}
+function splitFilesIntoBins(ctx, totalNumOfFilesToProcess, numberOfWorkers) {
+    // we want to have numberOfWorkers * 5 bins
+    const filesPerBin = Math.round(totalNumOfFilesToProcess / numberOfWorkers / 5) + 1;
+    const bins = [];
+    let currentProjectFileMap = {};
+    let currentNumberOfFiles = 0;
+    for (const source of Object.keys(ctx.filesToProcess)) {
+        for (const f of Object.values(ctx.filesToProcess[source])) {
+            if (!currentProjectFileMap[source])
+                currentProjectFileMap[source] = [];
+            currentProjectFileMap[source].push(f);
+            currentNumberOfFiles++;
+            if (currentNumberOfFiles >= filesPerBin) {
+                bins.push(currentProjectFileMap);
+                currentProjectFileMap = {};
+                currentNumberOfFiles = 0;
+            }
+        }
+    }
+    bins.push(currentProjectFileMap);
+    return bins;
+}
+function createWorkerPool(numberOfWorkers) {
+    const res = [];
+    for (let i = 0; i < numberOfWorkers; ++i) {
+        res.push(new (require('worker_threads').Worker)(path_1.join(__dirname, './project-graph-worker.js'), {
+            env: process.env,
+        }));
+    }
+    return res;
+}
+function buildExplicitDependenciesWithoutWorkers(ctx, builder) {
+    build_explicit_typescript_and_package_json_dependencies_1.buildExplicitTypescriptAndPackageJsonDependencies(ctx.workspace, builder.graph, ctx.filesToProcess).forEach((r) => {
+        builder.addExplicitDependency(r.sourceProjectName, r.sourceProjectFile, r.targetProjectName);
+    });
+}
+function buildExplicitDependenciesUsingWorkers(ctx, totalNumOfFilesToProcess, builder) {
+    const numberOfWorkers = os.cpus().length - 1;
+    const bins = splitFilesIntoBins(ctx, totalNumOfFilesToProcess, numberOfWorkers);
+    const workers = createWorkerPool(numberOfWorkers);
+    let numberOfExpectedResponses = bins.length;
+    return new Promise((res, reject) => {
+        for (let w of workers) {
+            w.on('message', (explicitDependencies) => {
+                explicitDependencies.forEach((r) => {
+                    builder.addExplicitDependency(r.sourceProjectName, r.sourceProjectFile, r.targetProjectName);
+                });
+                if (bins.length > 0) {
+                    w.postMessage({ filesToProcess: bins.shift() });
+                }
+                // we processed all the bins
+                if (--numberOfExpectedResponses === 0) {
+                    for (let w of workers) {
+                        w.terminate();
+                    }
+                    res(null);
+                }
+            });
+            w.on('error', reject);
+            w.on('exit', (code) => {
+                if (code !== 0) {
+                    reject(new Error(`Unable to complete project graph creation. Worker stopped with exit code: ${code}`));
+                }
+            });
+            w.postMessage({
+                workspace: ctx.workspace,
+                projectGraph: builder.graph,
+            });
+            w.postMessage({ filesToProcess: bins.shift() });
+        }
+    });
+}
+function createContext(workspaceJson, nxJson, fileMap, filesToProcess) {
+    const projects = Object.keys(workspaceJson.projects).reduce((map, projectName) => {
+        map[projectName] = Object.assign(Object.assign({}, workspaceJson.projects[projectName]), nxJson.projects[projectName]);
+        return map;
+    }, {});
+    return {
+        workspace: Object.assign(Object.assign(Object.assign({}, workspaceJson), nxJson), { projects }),
+        fileMap,
+        filesToProcess,
+    };
+}
+function updateProjectGraphWithPlugins(context, initProjectGraph) {
+    return (context.workspace.plugins || []).reduce((graph, path) => {
+        try {
+            const pluginPath = require.resolve(path, {
+                paths: [app_root_1.appRootPath],
+            });
+            const pluginModule = require(pluginPath);
+            if (!pluginModule.processProjectGraph) {
+                return graph;
+            }
+            return pluginModule.processProjectGraph(graph, context);
+        }
+        catch (e) {
+            const message = `Failed to process the project graph with "${path}". This will error in the future!`;
+            if (process.env.NX_VERBOSE_LOGGING === 'true') {
+                console.error(e);
+                devkit_1.logger.error(message);
+                return graph;
+            }
+            else {
+                devkit_1.logger.warn(message);
+                devkit_1.logger.warn(`Run with NX_VERBOSE_LOGGING=true to see the error.`);
+            }
+            return graph;
+        }
+    }, initProjectGraph);
+}
+function readRootTsConfig() {
+    for (const tsConfigName of ['tsconfig.base.json', 'tsconfig.json']) {
+        const tsConfigPath = path_1.join(app_root_1.appRootPath, tsConfigName);
+        if (fs_1.existsSync(tsConfigPath)) {
+            return devkit_1.readJsonFile(tsConfigPath);
+        }
+    }
+}
+//# sourceMappingURL=build-project-graph.js.map

package/src/core/project-graph/build-project-graph.js.map

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

package/src/core/project-graph/daemon/cache.d.ts

@@ -1,14 +1,6 @@
-/**
- * Because daemon server utilities will be executed across completely different processes,
- * it is not possible for us to cache valuable metadata in memory. We therefore
- * instead leverage the existing node_modules/.cache/nx directory to create a new
- * file called daemon.json in order to track things such as the background processes
- * created by this utility so that they can be cleaned up appropriately.
- */
-export interface DaemonJson {
-    serverLogOutputFile: string;
-    backgroundProcessId: number;
+export interface DaemonProcessJson {
+    processId: number;
 }
-export declare function readDaemonJsonCache(): Promise<DaemonJson | null>;
-export declare function writeDaemonJsonCache(daemonJson: DaemonJson): Promise<void>;
-export declare function deleteDaemonJsonCache(): void;
+export declare function writeDaemonJsonProcessCache(daemonJson: DaemonProcessJson): Promise<void>;
+export declare function safelyCleanUpExistingProcess(): Promise<void>;
+export declare function getDaemonProcessId(): number | null;

package/src/core/project-graph/daemon/cache.js

@@ -1,33 +1,56 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteDaemonJsonCache = exports.writeDaemonJsonCache = exports.readDaemonJsonCache = void 0;
+exports.getDaemonProcessId = exports.safelyCleanUpExistingProcess = exports.writeDaemonJsonProcessCache = void 0;
 const tslib_1 = require("tslib");
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
-const nx_deps_cache_1 = require("../../nx-deps/nx-deps-cache");
-const daemonJsonPath = path_1.join(nx_deps_cache_1.nxDepsDir, 'daemon.json');
-function readDaemonJsonCache() {
+const tmp_dir_1 = require("./tmp-dir");
+const serverProcessJsonPath = path_1.join(tmp_dir_1.DAEMON_DIR_FOR_CURRENT_WORKSPACE, 'server-process.json');
+function readDaemonProcessJsonCache() {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        nx_deps_cache_1.ensureCacheDirectory();
-        if (!fs_extra_1.existsSync(daemonJsonPath)) {
+        if (!fs_extra_1.existsSync(serverProcessJsonPath)) {
             return null;
         }
-        return yield fs_extra_1.readJson(daemonJsonPath);
+        return yield fs_extra_1.readJson(serverProcessJsonPath);
     });
 }
-exports.readDaemonJsonCache = readDaemonJsonCache;
-function writeDaemonJsonCache(daemonJson) {
+function deleteDaemonJsonProcessCache() {
+    try {
+        fs_extra_1.unlinkSync(serverProcessJsonPath);
+    }
+    catch (_a) { }
+}
+function writeDaemonJsonProcessCache(daemonJson) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        nx_deps_cache_1.ensureCacheDirectory();
-        yield fs_extra_1.writeJson(daemonJsonPath, daemonJson);
+        yield fs_extra_1.writeJson(serverProcessJsonPath, daemonJson);
     });
 }
-exports.writeDaemonJsonCache = writeDaemonJsonCache;
-function deleteDaemonJsonCache() {
+exports.writeDaemonJsonProcessCache = writeDaemonJsonProcessCache;
+function safelyCleanUpExistingProcess() {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const daemonProcessJson = yield readDaemonProcessJsonCache();
+        if (daemonProcessJson && daemonProcessJson.processId) {
+            try {
+                process.kill(daemonProcessJson.processId);
+            }
+            catch (_a) { }
+        }
+        deleteDaemonJsonProcessCache();
+    });
+}
+exports.safelyCleanUpExistingProcess = safelyCleanUpExistingProcess;
+// Must be sync for the help output use case
+function getDaemonProcessId() {
+    if (!fs_extra_1.existsSync(serverProcessJsonPath)) {
+        return null;
+    }
     try {
-        fs_extra_1.unlinkSync(daemonJsonPath);
+        const daemonProcessJson = require(serverProcessJsonPath);
+        return daemonProcessJson.processId;
+    }
+    catch (_a) {
+        return null;
     }
-    catch (_a) { }
 }
-exports.deleteDaemonJsonCache = deleteDaemonJsonCache;
+exports.getDaemonProcessId = getDaemonProcessId;
 //# sourceMappingURL=cache.js.map

package/src/core/project-graph/daemon/cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/daemon/cache.ts"],"names":[],"mappings":";;;;AAAA,uCAAuE;AACvE,+BAA4B;AAC5B,+DAA8E;AAc9E,MAAM,cAAc,GAAG,WAAI,CAAC,yBAAS,EAAE,aAAa,CAAC,CAAC;AAEtD,SAAsB,mBAAmB;;QACvC,oCAAoB,EAAE,CAAC;QACvB,IAAI,CAAC,qBAAU,CAAC,cAAc,CAAC,EAAE;YAC/B,OAAO,IAAI,CAAC;SACb;QACD,OAAO,MAAM,mBAAQ,CAAC,cAAc,CAAC,CAAC;IACxC,CAAC;CAAA;AAND,kDAMC;AAED,SAAsB,oBAAoB,CACxC,UAAsB;;QAEtB,oCAAoB,EAAE,CAAC;QACvB,MAAM,oBAAS,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;IAC9C,CAAC;CAAA;AALD,oDAKC;AAED,SAAgB,qBAAqB;IACnC,IAAI;QACF,qBAAU,CAAC,cAAc,CAAC,CAAC;KAC5B;IAAC,WAAM,GAAE;AACZ,CAAC;AAJD,sDAIC"}
+{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/daemon/cache.ts"],"names":[],"mappings":";;;;AAAA,uCAAuE;AACvE,+BAA4B;AAC5B,uCAA6D;AAM7D,MAAM,qBAAqB,GAAG,WAAI,CAChC,0CAAgC,EAChC,qBAAqB,CACtB,CAAC;AAEF,SAAe,0BAA0B;;QACvC,IAAI,CAAC,qBAAU,CAAC,qBAAqB,CAAC,EAAE;YACtC,OAAO,IAAI,CAAC;SACb;QACD,OAAO,MAAM,mBAAQ,CAAC,qBAAqB,CAAC,CAAC;IAC/C,CAAC;CAAA;AAED,SAAS,4BAA4B;IACnC,IAAI;QACF,qBAAU,CAAC,qBAAqB,CAAC,CAAC;KACnC;IAAC,WAAM,GAAE;AACZ,CAAC;AAED,SAAsB,2BAA2B,CAC/C,UAA6B;;QAE7B,MAAM,oBAAS,CAAC,qBAAqB,EAAE,UAAU,CAAC,CAAC;IACrD,CAAC;CAAA;AAJD,kEAIC;AAED,SAAsB,4BAA4B;;QAChD,MAAM,iBAAiB,GAAG,MAAM,0BAA0B,EAAE,CAAC;QAC7D,IAAI,iBAAiB,IAAI,iBAAiB,CAAC,SAAS,EAAE;YACpD,IAAI;gBACF,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;aAC3C;YAAC,WAAM,GAAE;SACX;QACD,4BAA4B,EAAE,CAAC;IACjC,CAAC;CAAA;AARD,oEAQC;AAED,4CAA4C;AAC5C,SAAgB,kBAAkB;IAChC,IAAI,CAAC,qBAAU,CAAC,qBAAqB,CAAC,EAAE;QACtC,OAAO,IAAI,CAAC;KACb;IACD,IAAI;QACF,MAAM,iBAAiB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;QACzD,OAAO,iBAAiB,CAAC,SAAS,CAAC;KACpC;IAAC,WAAM;QACN,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAVD,gDAUC"}

package/src/core/project-graph/daemon/client/client.js

@@ -3,53 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProjectGraphFromServer = exports.isServerAvailable = exports.stop = exports.startInCurrentProcess = exports.startInBackground = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const app_root_1 = require("@nrwl/tao/src/utils/app-root");
 const child_process_1 = require("child_process");
-const fs_extra_1 = require("fs-extra");
-const path_1 = require("path");
-const tmp_1 = require("tmp");
-const cache_1 = require("../cache");
+const fs_1 = require("fs");
 const net_1 = require("net");
-const socket_utils_1 = require("../socket-utils");
 const perf_hooks_1 = require("perf_hooks");
-const fs_1 = require("fs");
+const cache_1 = require("../cache");
+const socket_utils_1 = require("../socket-utils");
+const tmp_dir_1 = require("../tmp-dir");
 function startInBackground() {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        /**
-         * For now, while the daemon is an opt-in feature, we will log to stdout when
-         * starting the server, as well as providing a reference to where any subsequent
-         * log files can be found.
-         */
-        const tmpDirPrefix = `nx-daemon--${devkit_1.normalizePath(app_root_1.appRootPath).replace(
-        // Replace the occurrences of / in the unix-style normalized path with a -
-        new RegExp(escapeRegExp('/'), 'g'), '-')}`;
-        const serverLogOutputDir = tmp_1.dirSync({
-            prefix: tmpDirPrefix,
-        }).name;
-        const serverLogOutputFile = path_1.join(serverLogOutputDir, 'nx-daemon.log');
-        fs_extra_1.ensureFileSync(serverLogOutputFile);
-        // Clean up any existing orphaned background process before creating a new one
-        const cachedDaemonJson = yield cache_1.readDaemonJsonCache();
-        if (cachedDaemonJson) {
-            if (cachedDaemonJson.backgroundProcessId) {
-                process.kill(cachedDaemonJson.backgroundProcessId);
-            }
-        }
+        yield cache_1.safelyCleanUpExistingProcess();
         devkit_1.logger.info(`NX Daemon Server - Starting in a background process...`);
-        devkit_1.logger.log(`  Logs from the Daemon process can be found here: ${serverLogOutputFile}\n`);
+        devkit_1.logger.log(`  Logs from the Daemon process can be found here: ${tmp_dir_1.DAEMON_OUTPUT_LOG_FILE}\n`);
         try {
-            const backgroundProcess = child_process_1.spawn(process.execPath, ['../server/start.js', serverLogOutputFile], {
+            const out = fs_1.openSync(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE, 'a');
+            const err = fs_1.openSync(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE, 'a');
+            const backgroundProcess = child_process_1.spawn(process.execPath, ['../server/start.js'], {
                 cwd: __dirname,
-                stdio: 'ignore',
+                stdio: ['ignore', out, err],
                 detached: true,
             });
             backgroundProcess.unref();
             // Persist metadata about the background process so that it can be cleaned up later if needed
-            const daemonJson = {
-                backgroundProcessId: backgroundProcess.pid,
-                serverLogOutputFile: serverLogOutputFile,
-            };
-            yield cache_1.writeDaemonJsonCache(daemonJson);
+            yield cache_1.writeDaemonJsonProcessCache({
+                processId: backgroundProcess.pid,
+            });
             /**
              * Ensure the server is actually available to connect to via IPC before resolving
              */
@@ -71,7 +49,7 @@ function startInBackground() {
 exports.startInBackground = startInBackground;
 function startInCurrentProcess() {
     devkit_1.logger.info(`NX Daemon Server - Starting in the current process...`);
-    child_process_1.spawnSync(process.execPath, ['./start.js'], {
+    child_process_1.spawnSync(process.execPath, ['../server/start.js'], {
         cwd: __dirname,
         stdio: 'inherit',
     });
@@ -85,10 +63,6 @@ function stop() {
     });
 }
 exports.stop = stop;
-// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#escaping
-function escapeRegExp(string) {
-    return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
-}
 /**
  * As noted in the comments above the createServer() call, in order to reliably (meaning it works
  * cross-platform) check whether or not the server is availabe to request a project graph from we
@@ -99,21 +73,20 @@ function escapeRegExp(string) {
  */
 function isServerAvailable() {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        try {
-            const socket = net_1.connect(socket_utils_1.FULL_OS_SOCKET_PATH);
-            return new Promise((resolve) => {
-                socket.on('connect', () => {
+        return new Promise((resolve) => {
+            try {
+                const socket = net_1.connect(socket_utils_1.FULL_OS_SOCKET_PATH, () => {
                     socket.destroy();
                     resolve(true);
                 });
-                socket.on('error', () => {
+                socket.once('error', () => {
                     resolve(false);
                 });
-            });
-        }
-        catch (_a) {
-            return Promise.resolve(false);
-        }
+            }
+            catch (err) {
+                resolve(false);
+            }
+        });
     });
 }
 exports.isServerAvailable = isServerAvailable;
@@ -154,19 +127,23 @@ function getProjectGraphFromServer() {
              */
             socket.on('connect', () => {
                 socket.write('REQUEST_PROJECT_GRAPH_PAYLOAD');
-                let serializedProjectGraph = '';
+                let serializedProjectGraphResult = '';
                 socket.on('data', (data) => {
-                    serializedProjectGraph += data.toString();
+                    serializedProjectGraphResult += data.toString();
                 });
                 socket.on('end', () => {
                     try {
                         perf_hooks_1.performance.mark('json-parse-start');
-                        const projectGraph = JSON.parse(serializedProjectGraph);
+                        const projectGraphResult = socket_utils_1.deserializeResult(serializedProjectGraphResult);
                         perf_hooks_1.performance.mark('json-parse-end');
-                        perf_hooks_1.performance.measure('deserialize graph on the client', 'json-parse-start', 'json-parse-end');
+                        perf_hooks_1.performance.measure('deserialize graph result on the client', 'json-parse-start', 'json-parse-end');
+                        if (projectGraphResult.error) {
+                            devkit_1.logger.error(`NX Daemon Client - The server returned an Error`);
+                            return reject(projectGraphResult.error);
+                        }
                         devkit_1.logger.info('NX Daemon Client - Resolved ProjectGraph');
                         perf_hooks_1.performance.measure('total for getProjectGraphFromServer()', 'getProjectGraphFromServer-start', 'json-parse-end');
-                        return resolve(projectGraph);
+                        return resolve(projectGraphResult.projectGraph);
                     }
                     catch (_a) {
                         devkit_1.logger.error('NX Daemon Client - Error: Could not deserialize the ProjectGraph');

package/src/core/project-graph/daemon/client/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/client.ts"],"names":[],"mappings":"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"}

package/src/core/project-graph/daemon/client/exec-is-server-available.d.ts

@@ -0,0 +1 @@
+export {};

package/src/core/project-graph/daemon/client/exec-is-server-available.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const client_1 = require("./client");
+(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    try {
+        console.log(yield client_1.isServerAvailable());
+    }
+    catch (_a) {
+        console.log(false);
+    }
+}))();
+//# sourceMappingURL=exec-is-server-available.js.map

package/src/core/project-graph/daemon/client/exec-is-server-available.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"exec-is-server-available.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/exec-is-server-available.ts"],"names":[],"mappings":";;;AAAA,qCAA6C;AAE7C,CAAC,GAAS,EAAE;IACV,IAAI;QACF,OAAO,CAAC,GAAG,CAAC,MAAM,0BAAiB,EAAE,CAAC,CAAC;KACxC;IAAC,WAAM;QACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;KACpB;AACH,CAAC,CAAA,CAAC,EAAE,CAAC"}

package/src/core/project-graph/daemon/client/generate-help-output.d.ts

@@ -0,0 +1 @@
+export declare function generateDaemonHelpOutput(): string;

package/src/core/project-graph/daemon/client/generate-help-output.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateDaemonHelpOutput = void 0;
+const child_process_1 = require("child_process");
+const cache_1 = require("../cache");
+const tmp_dir_1 = require("../tmp-dir");
+function generateDaemonHelpOutput() {
+    var _a;
+    /**
+     * A workaround for cases such as yargs output where we need to synchronously
+     * get the value of this async operation.
+     */
+    const res = child_process_1.spawnSync(process.execPath, ['./exec-is-server-available.js'], {
+        cwd: __dirname,
+    });
+    const isServerAvailable = ((_a = res === null || res === void 0 ? void 0 : res.stdout) === null || _a === void 0 ? void 0 : _a.toString().trim()) === 'true';
+    if (!isServerAvailable) {
+        return '';
+    }
+    const pid = cache_1.getDaemonProcessId();
+    return `Nx Daemon is currently running:
+  - Logs: ${tmp_dir_1.DAEMON_OUTPUT_LOG_FILE}${pid
+        ? `
+  - Process ID: ${pid}`
+        : ''}`;
+}
+exports.generateDaemonHelpOutput = generateDaemonHelpOutput;
+//# sourceMappingURL=generate-help-output.js.map

package/src/core/project-graph/daemon/client/generate-help-output.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate-help-output.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/generate-help-output.ts"],"names":[],"mappings":";;;AAAA,iDAA0C;AAC1C,oCAA8C;AAC9C,wCAAoD;AAEpD,SAAgB,wBAAwB;;IACtC;;;OAGG;IACH,MAAM,GAAG,GAAG,yBAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,+BAA+B,CAAC,EAAE;QACzE,GAAG,EAAE,SAAS;KACf,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,CAAA,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,0CAAE,QAAQ,GAAG,IAAI,EAAE,MAAK,MAAM,CAAC;IACpE,IAAI,CAAC,iBAAiB,EAAE;QACtB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,GAAG,GAAG,0BAAkB,EAAE,CAAC;IACjC,OAAO;YACG,gCAAsB,GAC9B,GAAG;QACD,CAAC,CAAC;kBACU,GAAG,EAAE;QACjB,CAAC,CAAC,EACN,EAAE,CAAC;AACL,CAAC;AAtBD,4DAsBC"}

package/src/core/project-graph/daemon/server/logger.d.ts

@@ -0,0 +1,19 @@
+/**
+ * To improve the overall readibility of the logs, we categorize things by "trigger":
+ *
+ * - [REQUEST] meaning that the current set of actions were triggered by a client request to the server
+ * - [WATCHER] meaning the the current set of actions were triggered by handling changes to the workspace files
+ *
+ * We keep those two "triggers" left aligned at the top level and then indent subsequent logs so that there is a
+ * logical hierarchy/grouping.
+ */
+declare class ServerLogger {
+    log(...s: unknown[]): void;
+    requestLog(...s: unknown[]): void;
+    watcherLog(...s: unknown[]): void;
+    nestedLog(...s: unknown[]): void;
+    private formatLogMessage;
+    private getNow;
+}
+export declare const serverLogger: ServerLogger;
+export {};

package/src/core/project-graph/daemon/server/logger.js

@@ -0,0 +1,41 @@
+"use strict";
+/**
+ * To improve the overall readibility of the logs, we categorize things by "trigger":
+ *
+ * - [REQUEST] meaning that the current set of actions were triggered by a client request to the server
+ * - [WATCHER] meaning the the current set of actions were triggered by handling changes to the workspace files
+ *
+ * We keep those two "triggers" left aligned at the top level and then indent subsequent logs so that there is a
+ * logical hierarchy/grouping.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serverLogger = void 0;
+class ServerLogger {
+    log(...s) {
+        console.log(this.formatLogMessage(`${s
+            .map((val) => {
+            if (typeof val === 'string') {
+                return val;
+            }
+            return JSON.stringify(val);
+        })
+            .join(' ')}`));
+    }
+    requestLog(...s) {
+        this.log(`[REQUEST]: ${s.join(' ')}`);
+    }
+    watcherLog(...s) {
+        this.log(`[WATCHER]: ${s.join(' ')}`);
+    }
+    nestedLog(...s) {
+        this.log(`  ${s.join(' ')}`);
+    }
+    formatLogMessage(message) {
+        return `[NX Daemon Server] - ${this.getNow()} - ${message}`;
+    }
+    getNow() {
+        return new Date(Date.now()).toISOString();
+    }
+}
+exports.serverLogger = new ServerLogger();
+//# sourceMappingURL=logger.js.map

package/src/core/project-graph/daemon/server/logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/server/logger.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAEH,MAAM,YAAY;IAChB,GAAG,CAAC,GAAG,CAAY;QACjB,OAAO,CAAC,GAAG,CACT,IAAI,CAAC,gBAAgB,CACnB,GAAG,CAAC;aACD,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACX,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;gBAC3B,OAAO,GAAG,CAAC;aACZ;YACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,CAAC,EAAE,CACf,CACF,CAAC;IACJ,CAAC;IAED,UAAU,CAAC,GAAG,CAAY;QACxB,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACxC,CAAC;IAED,UAAU,CAAC,GAAG,CAAY;QACxB,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACxC,CAAC;IAED,SAAS,CAAC,GAAG,CAAY;QACvB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC/B,CAAC;IAEO,gBAAgB,CAAC,OAAe;QACtC,OAAO,wBAAwB,IAAI,CAAC,MAAM,EAAE,MAAM,OAAO,EAAE,CAAC;IAC9D,CAAC;IAEO,MAAM;QACZ,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IAC5C,CAAC;CACF;AAEY,QAAA,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC"}