Merge fc411fa into 2f8d78e

Author: BioPhoton

packages/core/src/lib/upload.ts

@@ -14,6 +14,7 @@ export type UploadOptions = { upload?: UploadConfig } & {
 /**
  * Uploads collected audits to the portal
  * @param options
+ * @param uploadFn
  */
 export async function upload(
   options: UploadOptions,

packages/nx-plugin/README.md

@@ -4,7 +4,8 @@
 
 #### Init
 
-Install JS packages and register plugin
+Install JS packages and register plugin.
+See [init docs](./src/generators/init/README.md) for details
 
 Examples:
 
@@ -13,7 +14,8 @@ Examples:
 
 #### Configuration
 
-Adds a `code-pushup` target to your `project.json`
+Adds a `code-pushup` target to your `project.json`.
+See [configuration docs](./src/generators/configuration/README.md) for details
 
 Examples:
 

packages/nx-plugin/mock/fixtures/env.ts

@@ -0,0 +1,7 @@
+export const ENV = {
+  CP_SERVER: 'https://portal.code.pushup.dev',
+  CP_ORGANIZATION: 'code-pushup',
+  CP_PROJECT: 'utils',
+  CP_API_KEY: '23456789098765432345678909876543',
+  CP_TIMEOUT: '9',
+};

packages/nx-plugin/package.json

@@ -5,7 +5,9 @@
   "dependencies": {
     "@nx/devkit": "^17.1.3",
     "tslib": "2.6.2",
-    "nx": "^17.1.3"
+    "nx": "^17.1.3",
+    "@code-pushup/models": "*",
+    "zod": "^3.22.4"
   },
   "type": "commonjs",
   "main": "./src/index.js",

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

@@ -0,0 +1,60 @@
+export function createCliCommand(
+  command: string,
+  args: Record<string, unknown>,
+): string {
+  return `npx @code-pushup/cli ${command} ${objectToCliArgs(args).join(' ')}`;
+}
+
+type ArgumentValue = number | string | boolean | string[];
+export type CliArgsObject<T extends object = Record<string, ArgumentValue>> =
+  T extends never
+    ? // eslint-disable-next-line @typescript-eslint/naming-convention
+      Record<string, ArgumentValue | undefined> | { _: string }
+    : T;
+// @TODO import from @code-pushup/utils => get rid of poppins for cjs support
+// eslint-disable-next-line sonarjs/cognitive-complexity
+export function objectToCliArgs<
+  T extends object = Record<string, ArgumentValue>,
+>(params?: CliArgsObject<T>): string[] {
+  if (!params) {
+    return [];
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+  return Object.entries(params).flatMap(([key, value]) => {
+    // process/file/script
+    if (key === '_') {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+      return Array.isArray(value) ? value : [`${value}`];
+    }
+    const prefix = key.length === 1 ? '-' : '--';
+    // "-*" arguments (shorthands)
+    if (Array.isArray(value)) {
+      return value.map(v => `${prefix}${key}="${v}"`);
+    }
+
+    if (typeof value === 'object') {
+      return Object.entries(value as Record<string, unknown>).map(
+        ([k, v]) => `${prefix}${key}.${k}="${v?.toString()}"`,
+      );
+    }
+
+    if (typeof value === 'string') {
+      return [`${prefix}${key}="${value}"`];
+    }
+
+    if (typeof value === 'number') {
+      return [`${prefix}${key}=${value}`];
+    }
+
+    if (typeof value === 'boolean') {
+      return [`${prefix}${value ? '' : 'no-'}${key}`];
+    }
+
+    if (value === undefined) {
+      return [];
+    }
+
+    throw new Error(`Unsupported type ${typeof value} for key ${key}`);
+  });
+}

packages/nx-plugin/src/executors/internal/cli.unit.test.ts

@@ -0,0 +1,84 @@
+import { describe, expect, it } from 'vitest';
+import { createCliCommand, objectToCliArgs } from './cli';
+
+describe('objectToCliArgs', () => {
+  it('should empty params', () => {
+    const result = objectToCliArgs();
+    expect(result).toEqual([]);
+  });
+
+  it('should handle the "_" argument as script', () => {
+    const params = { _: 'bin.js' };
+    const result = objectToCliArgs(params);
+    expect(result).toEqual(['bin.js']);
+  });
+
+  it('should handle the "_" argument with multiple values', () => {
+    const params = { _: ['bin.js', '--help'] };
+    const result = objectToCliArgs(params);
+    expect(result).toEqual(['bin.js', '--help']);
+  });
+
+  it('should handle shorthands arguments', () => {
+    const params = {
+      e: `test`,
+    };
+    const result = objectToCliArgs(params);
+    expect(result).toEqual([`-e="${params.e}"`]);
+  });
+
+  it('should handle string arguments', () => {
+    const params = { name: 'Juanita' };
+    const result = objectToCliArgs(params);
+    expect(result).toEqual(['--name="Juanita"']);
+  });
+
+  it('should handle number arguments', () => {
+    const params = { parallel: 5 };
+    const result = objectToCliArgs(params);
+    expect(result).toEqual(['--parallel=5']);
+  });
+
+  it('should handle boolean arguments', () => {
+    const params = { progress: true };
+    const result = objectToCliArgs(params);
+    expect(result).toEqual(['--progress']);
+  });
+
+  it('should handle negated boolean arguments', () => {
+    const params = { progress: false };
+    const result = objectToCliArgs(params);
+    expect(result).toEqual(['--no-progress']);
+  });
+
+  it('should handle array of string arguments', () => {
+    const params = { format: ['json', 'md'] };
+    const result = objectToCliArgs(params);
+    expect(result).toEqual(['--format="json"', '--format="md"']);
+  });
+
+  it('should handle objects', () => {
+    const params = { format: { json: 'simple' } };
+    const result = objectToCliArgs(params);
+    expect(result).toStrictEqual(['--format.json="simple"']);
+  });
+
+  it('should handle objects with undefined', () => {
+    const params = { format: undefined };
+    const result = objectToCliArgs(params);
+    expect(result).toStrictEqual([]);
+  });
+
+  it('should throw error for unsupported type', () => {
+    expect(() => objectToCliArgs({ param: Symbol('') })).toThrow(
+      'Unsupported type',
+    );
+  });
+});
+
+describe('createCliCommand', () => {
+  it('should create command out of command name and an object for arguments', () => {
+    const result = createCliCommand('autorun', { verbose: true });
+    expect(result).toBe('npx @code-pushup/cli autorun --verbose');
+  });
+});

packages/nx-plugin/src/executors/internal/config.integration.test.ts

@@ -0,0 +1,45 @@
+import { MockInstance, describe, expect } from 'vitest';
+import { ENV } from '../../../mock/fixtures/env';
+import { uploadConfig } from './config';
+import * as env from './env';
+
+describe('uploadConfig', () => {
+  let parseEnvSpy: MockInstance<[], NodeJS.ProcessEnv>;
+  let processEnvSpy: MockInstance<[], NodeJS.ProcessEnv>;
+
+  beforeAll(() => {
+    processEnvSpy = vi.spyOn(process, 'env', 'get').mockReturnValue({});
+    parseEnvSpy = vi.spyOn(env, 'parseEnv');
+  });
+
+  afterAll(() => {
+    processEnvSpy.mockRestore();
+    parseEnvSpy.mockRestore();
+  });
+
+  it('should call parseEnv function with values from process.env', () => {
+    processEnvSpy.mockReturnValue(ENV);
+    expect(
+      uploadConfig(
+        {},
+        {
+          workspaceRoot: 'workspaceRoot',
+          projectConfig: {
+            name: 'my-app',
+            root: 'root',
+          },
+        },
+      ),
+    ).toEqual(
+      expect.objectContaining({
+        server: ENV.CP_SERVER,
+        apiKey: ENV.CP_API_KEY,
+        organization: ENV.CP_ORGANIZATION,
+        project: ENV.CP_PROJECT,
+      }),
+    );
+
+    expect(parseEnvSpy).toHaveBeenCalledTimes(1);
+    expect(parseEnvSpy).toHaveBeenCalledWith(ENV);
+  });
+});

packages/nx-plugin/src/executors/internal/config.ts

@@ -0,0 +1,69 @@
+import { join } from 'node:path';
+import type { PersistConfig, UploadConfig } from '@code-pushup/models';
+import { parseEnv } from './env';
+import {
+  BaseNormalizedExecutorContext,
+  GlobalExecutorOptions,
+  ProjectExecutorOnlyOptions,
+} from './types';
+
+export function globalConfig(
+  options: Partial<GlobalExecutorOptions>,
+  context: BaseNormalizedExecutorContext,
+): Required<GlobalExecutorOptions> {
+  const { projectConfig } = context;
+  const { root: projectRoot = '' } = projectConfig ?? {};
+  // For better debugging use `--verbose --no-progress` as default
+  const { verbose, progress, config } = options;
+  return {
+    verbose: !!verbose,
+    progress: !!progress,
+    config: config ?? join(projectRoot, 'code-pushup.config.ts'),
+  };
+}
+
+export function persistConfig(
+  options: Partial<PersistConfig & ProjectExecutorOnlyOptions>,
+  context: BaseNormalizedExecutorContext,
+): Partial<PersistConfig> {
+  const { projectConfig, workspaceRoot } = context;
+
+  const { name: projectName = '' } = projectConfig ?? {};
+  const {
+    format,
+    outputDir = join(workspaceRoot, '.code-pushup', projectName), // always in <root>/.code-pushup/<project-name>,
+    filename,
+  } = options;
+
+  return {
+    outputDir,
+    ...(format ? { format } : {}),
+    ...(filename ? { filename } : {}),
+  };
+}
+
+export function uploadConfig(
+  options: Partial<UploadConfig & ProjectExecutorOnlyOptions>,
+  context: BaseNormalizedExecutorContext,
+): Partial<UploadConfig> {
+  const { projectConfig, workspaceRoot } = context;
+
+  const { name: projectName } = projectConfig ?? {};
+  const { projectPrefix, server, apiKey, organization, project, timeout } =
+    options;
+  const applyPrefix = workspaceRoot === '.';
+  const prefix = projectPrefix ? `${projectPrefix}-` : '';
+  return {
+    ...(projectName
+      ? {
+          project: applyPrefix ? `${prefix}${projectName}` : projectName, // provide correct project
+        }
+      : {}),
+    ...parseEnv(process.env),
+    ...Object.fromEntries(
+      Object.entries({ server, apiKey, organization, project, timeout }).filter(
+        ([_, v]) => v !== undefined,
+      ),
+    ),
+  };
+}