nx 23.1.0-beta.5 → 23.1.0-beta.7

package/dist/src/command-line/init/init-v2.js

@@ -348,7 +348,7 @@ async function runInit(options, baseMeta) {
     }
     else {
         nxCloudChoice = options.interactive
-            ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
+            ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)('init', 'setupNxCloud', false)
             : 'skip';
     }
     if (nxCloudChoice === 'yes') {

package/dist/src/command-line/nx-cloud/connect/connect-to-nx-cloud.d.ts

@@ -9,5 +9,5 @@ export declare function connectToNxCloudCommand(options: {
     generateToken?: boolean;
     checkRemote?: boolean;
 }, command?: string): Promise<boolean>;
-export declare function connectExistingRepoToNxCloudPrompt(command?: string, key?: MessageKey): Promise<MessageOptionKey>;
+export declare function connectExistingRepoToNxCloudPrompt(command?: string, key?: MessageKey, recordCompletion?: boolean): Promise<MessageOptionKey>;
 export declare function connectToNxCloudWithPrompt(command: string): Promise<void>;

package/dist/src/command-line/nx-cloud/connect/connect-to-nx-cloud.js

@@ -180,27 +180,34 @@ async function runConnectToNxCloud(options, command) {
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
-async function connectExistingRepoToNxCloudPrompt(command = 'init', key = 'setupNxCloud') {
-    const res = await nxCloudPrompt(key, utmMediumForCommand(command));
-    await (0, ab_testing_1.recordStat)({
-        command,
-        nxVersion: versions_1.nxVersion,
-        useCloud: res === 'yes',
-        meta: {
-            type: 'complete',
-            setupCloudPrompt: ab_testing_1.messages.codeOfSelectedPromptMessage(key) || '',
-            nxCloudArg: res,
-            nodeVersion: process.versions.node,
-            os: process.platform,
-            packageManager: (0, package_manager_1.detectPackageManager)(),
-            aiAgent: (0, native_1.isAiAgent)(),
-            isCI: (0, is_ci_1.isCI)(),
-        },
-    });
+async function connectExistingRepoToNxCloudPrompt(command = 'init', key = 'setupNxCloud', recordCompletion = true) {
+    const res = await nxCloudPrompt(key, utmContentForCommand(command));
+    // TODO: once legacy init-v1 (the NX_ADD_PLUGINS=false / useInferencePlugins:false path) is
+    // removed, drop this recordStat and the recordCompletion flag entirely - init-v2 records its
+    // own complete, and view-logs should record its own stat, so this shared helper won't record.
+    // init-v2 records its own init "complete" stat, so it opts out here to avoid double-counting.
+    // Other callers (e.g. view-logs, legacy init-v1) rely on this as their only completion event.
+    if (recordCompletion) {
+        await (0, ab_testing_1.recordStat)({
+            command,
+            nxVersion: versions_1.nxVersion,
+            useCloud: res === 'yes',
+            meta: {
+                type: 'complete',
+                setupCloudPrompt: ab_testing_1.messages.codeOfSelectedPromptMessage(key) || '',
+                nxCloudArg: res,
+                nodeVersion: process.versions.node,
+                os: process.platform,
+                packageManager: (0, package_manager_1.detectPackageManager)(),
+                aiAgent: (0, native_1.isAiAgent)(),
+                isCI: (0, is_ci_1.isCI)(),
+            },
+        });
+    }
     return res;
 }
 async function connectToNxCloudWithPrompt(command) {
-    const setNxCloud = await nxCloudPrompt('setupNxCloud', utmMediumForCommand(command));
+    const setNxCloud = await nxCloudPrompt('setupNxCloud', utmContentForCommand(command));
     let useCloud = false;
     if (setNxCloud === 'yes') {
         useCloud = await connectToNxCloudCommand({ generateToken: false }, command);
@@ -229,7 +236,7 @@ async function connectToNxCloudWithPrompt(command) {
         },
     });
 }
-function utmMediumForCommand(command) {
+function utmContentForCommand(command) {
     switch (command) {
         case 'migrate':
             return 'nx-migrate';
@@ -239,7 +246,7 @@ function utmMediumForCommand(command) {
             return 'nx-init';
     }
 }
-async function nxCloudPrompt(key, utmMedium) {
+async function nxCloudPrompt(key, utmContent) {
     const { message, choices, initial, footer, hint } = ab_testing_1.messages.getPrompt(key);
     const promptConfig = {
         name: 'NxCloud',
@@ -249,7 +256,7 @@ async function nxCloudPrompt(key, utmMedium) {
         initial,
     }; // meeroslav: types in enquirer are not up to date
     if (footer) {
-        promptConfig.footer = () => pc.dim(`${footer} ${(0, ab_testing_1.nxCloudHyperlink)(utmMedium)}`);
+        promptConfig.footer = () => pc.dim(`${footer} ${(0, ab_testing_1.nxCloudHyperlink)(utmContent)}`);
     }
     if (hint) {
         promptConfig.hint = () => pc.dim(hint);