nx 21.2.0-beta.3 → 21.2.0-beta.5

package/src/hasher/hash-plan-inspector.d.ts

@@ -0,0 +1,25 @@
+import { NxJsonConfiguration } from '../config/nx-json';
+import { ProjectGraph } from '../config/project-graph';
+import type { Target } from '../command-line/run/run';
+import { TargetDependencies } from '../config/nx-json';
+import { TargetDependencyConfig } from '../config/workspace-json-project-json';
+export declare class HashPlanInspector {
+    private projectGraph;
+    private readonly workspaceRootPath;
+    private readonly projectGraphRef;
+    private planner;
+    private inspector;
+    private readonly nxJson;
+    constructor(projectGraph: ProjectGraph, workspaceRootPath?: string, nxJson?: NxJsonConfiguration);
+    init(): Promise<void>;
+    /**
+     * This is a lower level method which will inspect the hash plan for a set of tasks.
+     */
+    inspectHashPlan(projectNames: string[], targets: string[], configuration?: string, overrides?: Object, extraTargetDependencies?: TargetDependencies, excludeTaskDependencies?: boolean): Record<string, string[]>;
+    /**
+     * This inspects tasks involved in the execution of a task, including its dependencies by default.
+     */
+    inspectTask({ project, target, configuration }: Target, parsedArgs?: {
+        [k: string]: any;
+    }, extraTargetDependencies?: Record<string, (TargetDependencyConfig | string)[]>, excludeTaskDependencies?: boolean): Record<string, string[]>;
+}

package/src/hasher/hash-plan-inspector.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HashPlanInspector = void 0;
+const native_1 = require("../native");
+const nx_json_1 = require("../config/nx-json");
+const transform_objects_1 = require("../native/transform-objects");
+const workspace_root_1 = require("../utils/workspace-root");
+const find_project_for_path_1 = require("../project-graph/utils/find-project-for-path");
+const create_task_graph_1 = require("../tasks-runner/create-task-graph");
+const command_line_utils_1 = require("../utils/command-line-utils");
+const workspace_context_1 = require("../utils/workspace-context");
+class HashPlanInspector {
+    constructor(projectGraph, workspaceRootPath = workspace_root_1.workspaceRoot, nxJson) {
+        this.projectGraph = projectGraph;
+        this.workspaceRootPath = workspaceRootPath;
+        this.nxJson = nxJson ?? (0, nx_json_1.readNxJson)(this.workspaceRootPath);
+        this.projectGraphRef = (0, native_1.transferProjectGraph)((0, transform_objects_1.transformProjectGraphForRust)(this.projectGraph));
+        this.planner = new native_1.HashPlanner(this.nxJson, this.projectGraphRef);
+    }
+    async init() {
+        const projectRootMap = (0, find_project_for_path_1.createProjectRootMappings)(this.projectGraph.nodes);
+        const map = Object.fromEntries(projectRootMap.entries());
+        const { externalReferences } = await (0, workspace_context_1.getNxWorkspaceFilesFromContext)(this.workspaceRootPath, map, false);
+        this.inspector = new native_1.HashPlanInspector(externalReferences.allWorkspaceFiles, this.projectGraphRef, externalReferences.projectFiles);
+    }
+    /**
+     * This is a lower level method which will inspect the hash plan for a set of tasks.
+     */
+    inspectHashPlan(projectNames, targets, configuration, overrides = {}, extraTargetDependencies = {}, excludeTaskDependencies = false) {
+        const taskGraph = (0, create_task_graph_1.createTaskGraph)(this.projectGraph, extraTargetDependencies, projectNames, targets, configuration, overrides, excludeTaskDependencies);
+        // Generate task IDs for ALL tasks in the task graph (including dependencies)
+        const taskIds = Object.keys(taskGraph.tasks);
+        const plansReference = this.planner.getPlansReference(taskIds, taskGraph);
+        return this.inspector.inspect(plansReference);
+    }
+    /**
+     * This inspects tasks involved in the execution of a task, including its dependencies by default.
+     */
+    inspectTask({ project, target, configuration }, parsedArgs = {}, extraTargetDependencies = {}, excludeTaskDependencies = false) {
+        // Mirror the exact flow from run-one.ts
+        const { nxArgs, overrides } = (0, command_line_utils_1.splitArgsIntoNxArgsAndOverrides)({
+            ...parsedArgs,
+            configuration: configuration,
+            targets: [target],
+        }, 'run-one', { printWarnings: false }, this.nxJson);
+        // Create task graph exactly like run-one.ts does via createTaskGraphAndRunValidations
+        const taskGraph = (0, create_task_graph_1.createTaskGraph)(this.projectGraph, extraTargetDependencies, [project], nxArgs.targets, nxArgs.configuration, overrides, excludeTaskDependencies);
+        // Generate task IDs for ALL tasks in the task graph (including dependencies)
+        const taskIds = Object.keys(taskGraph.tasks);
+        const plansReference = this.planner.getPlansReference(taskIds, taskGraph);
+        return this.inspector.inspect(plansReference);
+    }
+}
+exports.HashPlanInspector = HashPlanInspector;

package/src/native/index.d.ts

@@ -41,6 +41,11 @@ export declare class FileLock {
   lock(): void
 }
 
+export declare class HashPlanInspector {
+  constructor(allWorkspaceFiles: ExternalObject<Array<FileData>>, projectGraph: ExternalObject<ProjectGraph>, projectFileMap: ExternalObject<Record<string, Array<FileData>>>)
+  inspect(hashPlans: ExternalObject<Record<string, Array<HashInstruction>>>): Record<string, string[]>
+}
+
 export declare class HashPlanner {
   constructor(nxJson: NxJson, projectGraph: ExternalObject<ProjectGraph>)
   getPlans(taskIds: Array<string>, taskGraph: TaskGraph): Record<string, string[]>
@@ -249,8 +254,6 @@ export const IS_WASM: boolean
 
 export declare export declare function logDebug(message: string): void
 
-export declare export declare function logError(message: string): void
-
 /** Stripped version of the NxJson interface for use in rust */
 export interface NxJson {
   namedInputs?: Record<string, Array<JsInputs>>

package/src/native/native-bindings.js

@@ -364,6 +364,7 @@ if (!nativeBinding) {
 module.exports.AppLifeCycle = nativeBinding.AppLifeCycle
 module.exports.ChildProcess = nativeBinding.ChildProcess
 module.exports.FileLock = nativeBinding.FileLock
+module.exports.HashPlanInspector = nativeBinding.HashPlanInspector
 module.exports.HashPlanner = nativeBinding.HashPlanner
 module.exports.HttpRemoteCache = nativeBinding.HttpRemoteCache
 module.exports.ImportResult = nativeBinding.ImportResult
@@ -392,7 +393,6 @@ module.exports.hashFile = nativeBinding.hashFile
 module.exports.installNxConsole = nativeBinding.installNxConsole
 module.exports.IS_WASM = nativeBinding.IS_WASM
 module.exports.logDebug = nativeBinding.logDebug
-module.exports.logError = nativeBinding.logError
 module.exports.parseTaskStatus = nativeBinding.parseTaskStatus
 module.exports.remove = nativeBinding.remove
 module.exports.restoreTerminal = nativeBinding.restoreTerminal

package/src/native/nx.wasi.cjs

@@ -95,46 +95,48 @@ function __napi_rs_initialize_modules(__napiInstance) {
   __napiInstance.exports['__napi_register__NxConsolePreferences_struct_10']?.()
   __napiInstance.exports['__napi_register__NxConsolePreferences_impl_14']?.()
   __napiInstance.exports['__napi_register__log_debug_15']?.()
-  __napiInstance.exports['__napi_register__log_error_16']?.()
-  __napiInstance.exports['__napi_register__IS_WASM_17']?.()
-  __napiInstance.exports['__napi_register__get_binary_target_18']?.()
-  __napiInstance.exports['__napi_register__ImportResult_struct_19']?.()
-  __napiInstance.exports['__napi_register__find_imports_20']?.()
-  __napiInstance.exports['__napi_register__transfer_project_graph_21']?.()
-  __napiInstance.exports['__napi_register__ExternalNode_struct_22']?.()
-  __napiInstance.exports['__napi_register__Target_struct_23']?.()
-  __napiInstance.exports['__napi_register__Project_struct_24']?.()
-  __napiInstance.exports['__napi_register__ProjectGraph_struct_25']?.()
-  __napiInstance.exports['__napi_register__HashPlanner_struct_26']?.()
-  __napiInstance.exports['__napi_register__HashPlanner_impl_30']?.()
-  __napiInstance.exports['__napi_register__HashDetails_struct_31']?.()
-  __napiInstance.exports['__napi_register__HasherOptions_struct_32']?.()
-  __napiInstance.exports['__napi_register__TaskHasher_struct_33']?.()
-  __napiInstance.exports['__napi_register__TaskHasher_impl_36']?.()
-  __napiInstance.exports['__napi_register__Task_struct_37']?.()
-  __napiInstance.exports['__napi_register__TaskTarget_struct_38']?.()
-  __napiInstance.exports['__napi_register__TaskResult_struct_39']?.()
-  __napiInstance.exports['__napi_register__TaskGraph_struct_40']?.()
-  __napiInstance.exports['__napi_register__FileData_struct_41']?.()
-  __napiInstance.exports['__napi_register__InputsInput_struct_42']?.()
-  __napiInstance.exports['__napi_register__FileSetInput_struct_43']?.()
-  __napiInstance.exports['__napi_register__RuntimeInput_struct_44']?.()
-  __napiInstance.exports['__napi_register__EnvironmentInput_struct_45']?.()
-  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_46']?.()
-  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_47']?.()
-  __napiInstance.exports['__napi_register__NxJson_struct_48']?.()
-  __napiInstance.exports['__napi_register__FileLock_struct_49']?.()
-  __napiInstance.exports['__napi_register__FileLock_impl_51']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_struct_52']?.()
-  __napiInstance.exports['__napi_register__WorkspaceContext_impl_63']?.()
-  __napiInstance.exports['__napi_register__WorkspaceErrors_64']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_65']?.()
-  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_66']?.()
-  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_67']?.()
-  __napiInstance.exports['__napi_register__FileMap_struct_68']?.()
-  __napiInstance.exports['__napi_register____test_only_transfer_file_map_69']?.()
+  __napiInstance.exports['__napi_register__IS_WASM_16']?.()
+  __napiInstance.exports['__napi_register__get_binary_target_17']?.()
+  __napiInstance.exports['__napi_register__ImportResult_struct_18']?.()
+  __napiInstance.exports['__napi_register__find_imports_19']?.()
+  __napiInstance.exports['__napi_register__transfer_project_graph_20']?.()
+  __napiInstance.exports['__napi_register__ExternalNode_struct_21']?.()
+  __napiInstance.exports['__napi_register__Target_struct_22']?.()
+  __napiInstance.exports['__napi_register__Project_struct_23']?.()
+  __napiInstance.exports['__napi_register__ProjectGraph_struct_24']?.()
+  __napiInstance.exports['__napi_register__HashPlanInspector_struct_25']?.()
+  __napiInstance.exports['__napi_register__HashPlanInspector_impl_28']?.()
+  __napiInstance.exports['__napi_register__HashPlanner_struct_29']?.()
+  __napiInstance.exports['__napi_register__HashPlanner_impl_33']?.()
+  __napiInstance.exports['__napi_register__HashDetails_struct_34']?.()
+  __napiInstance.exports['__napi_register__HasherOptions_struct_35']?.()
+  __napiInstance.exports['__napi_register__TaskHasher_struct_36']?.()
+  __napiInstance.exports['__napi_register__TaskHasher_impl_39']?.()
+  __napiInstance.exports['__napi_register__Task_struct_40']?.()
+  __napiInstance.exports['__napi_register__TaskTarget_struct_41']?.()
+  __napiInstance.exports['__napi_register__TaskResult_struct_42']?.()
+  __napiInstance.exports['__napi_register__TaskGraph_struct_43']?.()
+  __napiInstance.exports['__napi_register__FileData_struct_44']?.()
+  __napiInstance.exports['__napi_register__InputsInput_struct_45']?.()
+  __napiInstance.exports['__napi_register__FileSetInput_struct_46']?.()
+  __napiInstance.exports['__napi_register__RuntimeInput_struct_47']?.()
+  __napiInstance.exports['__napi_register__EnvironmentInput_struct_48']?.()
+  __napiInstance.exports['__napi_register__ExternalDependenciesInput_struct_49']?.()
+  __napiInstance.exports['__napi_register__DepsOutputsInput_struct_50']?.()
+  __napiInstance.exports['__napi_register__NxJson_struct_51']?.()
+  __napiInstance.exports['__napi_register__FileLock_struct_52']?.()
+  __napiInstance.exports['__napi_register__FileLock_impl_54']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_struct_55']?.()
+  __napiInstance.exports['__napi_register__WorkspaceContext_impl_66']?.()
+  __napiInstance.exports['__napi_register__WorkspaceErrors_67']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFiles_struct_68']?.()
+  __napiInstance.exports['__napi_register__NxWorkspaceFilesExternals_struct_69']?.()
+  __napiInstance.exports['__napi_register__UpdatedWorkspaceFiles_struct_70']?.()
+  __napiInstance.exports['__napi_register__FileMap_struct_71']?.()
+  __napiInstance.exports['__napi_register____test_only_transfer_file_map_72']?.()
 }
 module.exports.FileLock = __napiModule.exports.FileLock
+module.exports.HashPlanInspector = __napiModule.exports.HashPlanInspector
 module.exports.HashPlanner = __napiModule.exports.HashPlanner
 module.exports.ImportResult = __napiModule.exports.ImportResult
 module.exports.NxConsolePreferences = __napiModule.exports.NxConsolePreferences
@@ -152,7 +154,6 @@ module.exports.hashFile = __napiModule.exports.hashFile
 module.exports.installNxConsole = __napiModule.exports.installNxConsole
 module.exports.IS_WASM = __napiModule.exports.IS_WASM
 module.exports.logDebug = __napiModule.exports.logDebug
-module.exports.logError = __napiModule.exports.logError
 module.exports.remove = __napiModule.exports.remove
 module.exports.testOnlyTransferFileMap = __napiModule.exports.testOnlyTransferFileMap
 module.exports.transferProjectGraph = __napiModule.exports.transferProjectGraph

package/src/tasks-runner/run-command.js

@@ -137,7 +137,7 @@ async function getTerminalOutputLifeCycle(initiatingProject, initiatingTasks, pr
                 // @ts-ignore
                 return (chunk, encoding, callback) => {
                     if (isError) {
-                        (0, native_1.logError)(Buffer.isBuffer(chunk)
+                        (0, native_1.logDebug)(Buffer.isBuffer(chunk)
                             ? chunk.toString(encoding)
                             : chunk.toString());
                     }

package/src/utils/workspace-context.d.ts

@@ -1,6 +1,6 @@
 import type { NxWorkspaceFilesExternals } from '../native';
 export declare function setupWorkspaceContext(workspaceRoot: string): void;
-export declare function getNxWorkspaceFilesFromContext(workspaceRoot: string, projectRootMap: Record<string, string>): Promise<import("../native").NxWorkspaceFiles>;
+export declare function getNxWorkspaceFilesFromContext(workspaceRoot: string, projectRootMap: Record<string, string>, useDaemonProcess?: boolean): Promise<import("../native").NxWorkspaceFiles>;
 /**
  * Sync method to get files matching globs from workspace context.
  * NOTE: This method will create the workspace context if it doesn't exist.

package/src/utils/workspace-context.js

@@ -25,8 +25,8 @@ function setupWorkspaceContext(workspaceRoot) {
     perf_hooks_1.performance.mark('workspace-context:end');
     perf_hooks_1.performance.measure('workspace context init', 'workspace-context', 'workspace-context:end');
 }
-async function getNxWorkspaceFilesFromContext(workspaceRoot, projectRootMap) {
-    if ((0, is_on_daemon_1.isOnDaemon)() || !client_1.daemonClient.enabled()) {
+async function getNxWorkspaceFilesFromContext(workspaceRoot, projectRootMap, useDaemonProcess = true) {
+    if (!useDaemonProcess || (0, is_on_daemon_1.isOnDaemon)() || !client_1.daemonClient.enabled()) {
         ensureContextAvailable(workspaceRoot);
         return workspaceContext.getWorkspaceFiles(projectRootMap);
     }