refactor: fix targets

Author: John Doe

packages/nx-plugin/src/executors/cli/executor.ts

@@ -27,10 +27,11 @@ export default async function runAutorunExecutor(
     mergedOptions,
     normalizedContext,
   );
-  const { dryRun, verbose, command } = mergedOptions;
+  const { dryRun, verbose, command, bin } = mergedOptions;
   const commandString = createCliCommandString({
     command,
     args: cliArgumentObject,
+    bin,
   });
   if (verbose) {
     logger.info(`Run CLI executor ${command ?? ''}`);
@@ -41,7 +42,7 @@ export default async function runAutorunExecutor(
   } else {
     try {
       await executeProcess({
-        ...createCliCommandObject({ command, args: cliArgumentObject }),
+        ...createCliCommandObject({ command, args: cliArgumentObject, bin }),
         ...(context.cwd ? { cwd: context.cwd } : {}),
       });
     } catch (error) {

packages/nx-plugin/src/plugin/target/executor-target.ts

@@ -6,15 +6,13 @@ export function createExecutorTarget(options?: {
   bin?: string;
   projectPrefix?: string;
 }): TargetConfiguration<ProjectPrefixOptions> {
-  const { bin = PACKAGE_NAME, projectPrefix } = options ?? {};
+  const { bin, projectPrefix } = options ?? {};
+
   return {
-    executor: `${bin}:cli`,
-    ...(projectPrefix
-      ? {
-          options: {
-            projectPrefix,
-          },
-        }
-      : {}),
+    executor: `${PACKAGE_NAME}:cli`,
+    options: {
+      ...(bin ? { bin } : {}),
+      ...(projectPrefix ? { projectPrefix } : {}),
+    },
   };
 }

packages/nx-plugin/src/plugin/target/executor.target.unit.test.ts

@@ -1,16 +1,22 @@
-import { expect } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { createExecutorTarget } from './executor-target.js';
 
 describe('createExecutorTarget', () => {
   it('should return executor target without project name', () => {
     expect(createExecutorTarget()).toStrictEqual({
       executor: '@code-pushup/nx-plugin:cli',
+      options: {},
     });
   });
 
   it('should use bin if provides', () => {
-    expect(createExecutorTarget({ bin: 'xyz' })).toStrictEqual({
-      executor: 'xyz:cli',
+    expect(
+      createExecutorTarget({ bin: 'packages/cli/src/index.ts' }),
+    ).toStrictEqual({
+      executor: '@code-pushup/nx-plugin:cli',
+      options: {
+        bin: 'packages/cli/src/index.ts',
+      },
     });
   });
 

packages/nx-plugin/src/plugin/target/targets.unit.test.ts

@@ -109,6 +109,7 @@ describe('createTargets', () => {
       expect.objectContaining({
         [targetName]: {
           executor: `${PACKAGE_NAME}:cli`,
+          options: {},
         },
       }),
     );
@@ -133,6 +134,7 @@ describe('createTargets', () => {
     ).resolves.toStrictEqual({
       [DEFAULT_TARGET_NAME]: {
         executor: '@code-pushup/nx-plugin:cli',
+        options: {},
       },
     });
   });
@@ -158,6 +160,7 @@ describe('createTargets', () => {
     ).resolves.toStrictEqual({
       cp: {
         executor: '@code-pushup/nx-plugin:cli',
+        options: {},
       },
     });
   });