nx 19.7.0-canary.20240821-2065033 → 19.7.0-canary.20240823-1824267

package/src/utils/legacy-task-history.js

@@ -0,0 +1,87 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.taskHistoryFile = void 0;
+exports.getHistoryForHashes = getHistoryForHashes;
+exports.writeTaskRunsToHistory = writeTaskRunsToHistory;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const cache_directory_1 = require("./cache-directory");
+const taskRunKeys = [
+    'project',
+    'target',
+    'configuration',
+    'hash',
+    'code',
+    'status',
+    'start',
+    'end',
+];
+let taskHistory = undefined;
+let taskHashToIndicesMap = new Map();
+async function getHistoryForHashes(hashes) {
+    if (taskHistory === undefined) {
+        loadTaskHistoryFromDisk();
+    }
+    const result = {};
+    for (let hash of hashes) {
+        const indices = taskHashToIndicesMap.get(hash);
+        if (!indices) {
+            result[hash] = [];
+        }
+        else {
+            result[hash] = indices.map((index) => taskHistory[index]);
+        }
+    }
+    return result;
+}
+async function writeTaskRunsToHistory(taskRuns) {
+    if (taskHistory === undefined) {
+        loadTaskHistoryFromDisk();
+    }
+    const serializedLines = [];
+    for (let taskRun of taskRuns) {
+        const serializedLine = taskRunKeys.map((key) => taskRun[key]).join(',');
+        serializedLines.push(serializedLine);
+        recordTaskRunInMemory(taskRun);
+    }
+    if (!(0, fs_1.existsSync)(exports.taskHistoryFile)) {
+        (0, fs_1.writeFileSync)(exports.taskHistoryFile, `${taskRunKeys.join(',')}\n`);
+    }
+    (0, fs_1.appendFileSync)(exports.taskHistoryFile, serializedLines.join('\n') + '\n');
+}
+exports.taskHistoryFile = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'task-history.csv');
+function loadTaskHistoryFromDisk() {
+    taskHashToIndicesMap.clear();
+    taskHistory = [];
+    if (!(0, fs_1.existsSync)(exports.taskHistoryFile)) {
+        return;
+    }
+    const fileContent = (0, fs_1.readFileSync)(exports.taskHistoryFile, 'utf8');
+    if (!fileContent) {
+        return;
+    }
+    const lines = fileContent.split('\n');
+    // if there are no lines or just the header, return
+    if (lines.length <= 1) {
+        return;
+    }
+    const contentLines = lines.slice(1).filter((l) => l.trim() !== '');
+    // read the values from csv format where each header is a key and the value is the value
+    for (let line of contentLines) {
+        const values = line.trim().split(',');
+        const run = {};
+        taskRunKeys.forEach((header, index) => {
+            run[header] = values[index];
+        });
+        recordTaskRunInMemory(run);
+    }
+}
+function recordTaskRunInMemory(taskRun) {
+    const index = taskHistory.push(taskRun) - 1;
+    if (taskHashToIndicesMap.has(taskRun.hash)) {
+        taskHashToIndicesMap.get(taskRun.hash).push(index);
+    }
+    else {
+        taskHashToIndicesMap.set(taskRun.hash, [index]);
+    }
+}

package/src/utils/logger.js

@@ -36,7 +36,7 @@ exports.logger = {
         console.error(...s);
     },
     verbose: (...s) => {
-        if (process.env.NX_VERBOSE_LOGGING) {
+        if (process.env.NX_VERBOSE_LOGGING === 'true') {
             console.log(...s);
         }
     },

package/src/utils/package-json.d.ts

@@ -42,6 +42,9 @@ export interface PackageJson {
         optional: boolean;
     }>;
     resolutions?: Record<string, string>;
+    pnpm?: {
+        overrides?: PackageOverride;
+    };
     overrides?: PackageOverride;
     bin?: Record<string, string> | string;
     workspaces?: string[] | {

package/src/utils/task-history.d.ts

@@ -1,8 +1,6 @@
-declare const taskRunKeys: readonly ["project", "target", "configuration", "hash", "code", "status", "start", "end"];
-export type TaskRun = Record<(typeof taskRunKeys)[number], string>;
-export declare function getHistoryForHashes(hashes: string[]): Promise<{
-    [hash: string]: TaskRun[];
-}>;
-export declare function writeTaskRunsToHistory(taskRuns: TaskRun[]): Promise<void>;
-export declare const taskHistoryFile: string;
-export {};
+import { NxTaskHistory, TaskRun } from '../native';
+export declare class TaskHistory {
+    taskHistory: NxTaskHistory;
+    getFlakyTasks(hashes: string[]): Promise<string[]>;
+    recordTaskRuns(taskRuns: TaskRun[]): Promise<void>;
+}

package/src/utils/task-history.js

@@ -1,97 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.taskHistoryFile = void 0;
-exports.getHistoryForHashes = getHistoryForHashes;
-exports.writeTaskRunsToHistory = writeTaskRunsToHistory;
-const fs_1 = require("fs");
-const path_1 = require("path");
+exports.TaskHistory = void 0;
 const client_1 = require("../daemon/client/client");
 const is_on_daemon_1 = require("../daemon/is-on-daemon");
-const cache_directory_1 = require("./cache-directory");
-const taskRunKeys = [
-    'project',
-    'target',
-    'configuration',
-    'hash',
-    'code',
-    'status',
-    'start',
-    'end',
-];
-let taskHistory = undefined;
-let taskHashToIndicesMap = new Map();
-async function getHistoryForHashes(hashes) {
-    if ((0, is_on_daemon_1.isOnDaemon)() || !client_1.daemonClient.enabled()) {
-        if (taskHistory === undefined) {
-            loadTaskHistoryFromDisk();
+const native_1 = require("../native");
+const db_connection_1 = require("./db-connection");
+class TaskHistory {
+    constructor() {
+        this.taskHistory = new native_1.NxTaskHistory((0, db_connection_1.getDbConnection)());
+    }
+    async getFlakyTasks(hashes) {
+        if ((0, is_on_daemon_1.isOnDaemon)() || !client_1.daemonClient.enabled()) {
+            return this.taskHistory.getFlakyTasks(hashes);
         }
-        const result = {};
-        for (let hash of hashes) {
-            const indices = taskHashToIndicesMap.get(hash);
-            if (!indices) {
-                result[hash] = [];
-            }
-            else {
-                result[hash] = indices.map((index) => taskHistory[index]);
-            }
-        }
-        return result;
+        return await client_1.daemonClient.getFlakyTasks(hashes);
     }
-    return await client_1.daemonClient.getTaskHistoryForHashes(hashes);
-}
-async function writeTaskRunsToHistory(taskRuns) {
-    if ((0, is_on_daemon_1.isOnDaemon)() || !client_1.daemonClient.enabled()) {
-        if (taskHistory === undefined) {
-            loadTaskHistoryFromDisk();
-        }
-        const serializedLines = [];
-        for (let taskRun of taskRuns) {
-            const serializedLine = taskRunKeys.map((key) => taskRun[key]).join(',');
-            serializedLines.push(serializedLine);
-            recordTaskRunInMemory(taskRun);
-        }
-        if (!(0, fs_1.existsSync)(exports.taskHistoryFile)) {
-            (0, fs_1.writeFileSync)(exports.taskHistoryFile, `${taskRunKeys.join(',')}\n`);
+    async recordTaskRuns(taskRuns) {
+        if ((0, is_on_daemon_1.isOnDaemon)() || !client_1.daemonClient.enabled()) {
+            return this.taskHistory.recordTaskRuns(taskRuns);
         }
-        (0, fs_1.appendFileSync)(exports.taskHistoryFile, serializedLines.join('\n') + '\n');
-    }
-    else {
-        await client_1.daemonClient.writeTaskRunsToHistory(taskRuns);
-    }
-}
-exports.taskHistoryFile = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'task-history.csv');
-function loadTaskHistoryFromDisk() {
-    taskHashToIndicesMap.clear();
-    taskHistory = [];
-    if (!(0, fs_1.existsSync)(exports.taskHistoryFile)) {
-        return;
-    }
-    const fileContent = (0, fs_1.readFileSync)(exports.taskHistoryFile, 'utf8');
-    if (!fileContent) {
-        return;
-    }
-    const lines = fileContent.split('\n');
-    // if there are no lines or just the header, return
-    if (lines.length <= 1) {
-        return;
-    }
-    const contentLines = lines.slice(1).filter((l) => l.trim() !== '');
-    // read the values from csv format where each header is a key and the value is the value
-    for (let line of contentLines) {
-        const values = line.trim().split(',');
-        const run = {};
-        taskRunKeys.forEach((header, index) => {
-            run[header] = values[index];
-        });
-        recordTaskRunInMemory(run);
-    }
-}
-function recordTaskRunInMemory(taskRun) {
-    const index = taskHistory.push(taskRun) - 1;
-    if (taskHashToIndicesMap.has(taskRun.hash)) {
-        taskHashToIndicesMap.get(taskRun.hash).push(index);
-    }
-    else {
-        taskHashToIndicesMap.set(taskRun.hash, [index]);
+        return client_1.daemonClient.recordTaskRuns(taskRuns);
     }
 }
+exports.TaskHistory = TaskHistory;

package/src/utils/workspace-context.js

@@ -19,7 +19,7 @@ let workspaceContext;
 function setupWorkspaceContext(workspaceRoot) {
     const { WorkspaceContext } = require('../native');
     perf_hooks_1.performance.mark('workspace-context');
-    workspaceContext = new WorkspaceContext(workspaceRoot, (0, cache_directory_1.cacheDirectoryForWorkspace)(workspaceRoot));
+    workspaceContext = new WorkspaceContext(workspaceRoot, (0, cache_directory_1.workspaceDataDirectoryForWorkspace)(workspaceRoot));
     perf_hooks_1.performance.mark('workspace-context:end');
     perf_hooks_1.performance.measure('workspace context init', 'workspace-context', 'workspace-context:end');
 }

package/src/daemon/server/handle-get-task-history.d.ts

@@ -1,4 +0,0 @@
-export declare function handleGetTaskHistoryForHashes(hashes: string[]): Promise<{
-    response: string;
-    description: string;
-}>;

package/src/daemon/server/handle-get-task-history.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleGetTaskHistoryForHashes = handleGetTaskHistoryForHashes;
-const task_history_1 = require("../../utils/task-history");
-async function handleGetTaskHistoryForHashes(hashes) {
-    const history = await (0, task_history_1.getHistoryForHashes)(hashes);
-    return {
-        response: JSON.stringify(history),
-        description: 'handleGetTaskHistoryForHashes',
-    };
-}

package/src/daemon/server/handle-write-task-runs-to-history.d.ts

@@ -1,5 +0,0 @@
-import { TaskRun } from '../../utils/task-history';
-export declare function handleWriteTaskRunsToHistory(taskRuns: TaskRun[]): Promise<{
-    response: string;
-    description: string;
-}>;

package/src/daemon/server/handle-write-task-runs-to-history.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleWriteTaskRunsToHistory = handleWriteTaskRunsToHistory;
-const task_history_1 = require("../../utils/task-history");
-async function handleWriteTaskRunsToHistory(taskRuns) {
-    await (0, task_history_1.writeTaskRunsToHistory)(taskRuns);
-    return {
-        response: 'true',
-        description: 'handleWriteTaskRunsToHistory',
-    };
-}