fix: update types

Author: BioPhoton

packages/models/src/index.ts

@@ -136,5 +136,7 @@ export {
 export { uploadConfigSchema, type UploadConfig } from './lib/upload-config.js';
 export {
   artifactGenerationCommandSchema,
-  pluginArtifactOptionsSchema,
+  type Command,
+  type CommandObject,
+  type PluginArtifactOptions,
 } from './lib/configuration.js';

packages/models/src/lib/configuration.ts

@@ -1,16 +1,27 @@
 import { z } from 'zod';
 
+export const commandSchema = z
+  .string({ description: 'Generate artifact files' })
+  .min(1);
+export type Command = z.infer<typeof commandSchema>;
+
+export const commandObjectSchema = z.object({
+  command: z.string({ description: 'Generate artifact files' }).min(1),
+  args: z.array(z.string()).optional(),
+});
+export type CommandObject = z.infer<typeof commandObjectSchema>;
 /**
  * Generic schema for a tool command configuration, reusable across plugins.
  */
 export const artifactGenerationCommandSchema = z.union([
-  z.string({ description: 'Generate artifact files' }).min(1),
-  z.object({
-    command: z.string({ description: 'Generate artifact files' }).min(1),
-    args: z.array(z.string()).optional(),
-  }),
+  commandSchema,
+  commandObjectSchema,
 ]);
 
+export type ArtifactGenerationCommand = z.infer<
+  typeof artifactGenerationCommandSchema
+>;
+
 export const pluginArtifactOptionsSchema = z.object({
   generateArtifactsCommand: artifactGenerationCommandSchema.optional(),
   artifactsPaths: z.union([z.string(), z.array(z.string()).min(1)]),

packages/plugin-bundle-stats/code-pushup.large-angular.config.ts

@@ -1,5 +1,7 @@
-import bundleStatsPlugin, { type GroupingRule } from './src';
-import { BlacklistEntry } from './src/lib/runner/types';
+import bundleStatsPlugin, {
+  type BlacklistEntry,
+  type GroupingRule,
+} from './src/index.js';
 
 const sharedHint =
   'Remove or conditionally load. Supported natively in modern browsers or replace with modern Angular architecture. See: https://blog.angular.io/zone-less-angular-explained-5fa951ce6f6e';
@@ -250,7 +252,7 @@ const config = {
   plugins: [
     await bundleStatsPlugin({
       bundler: 'esbuild',
-      artefactsPath:
+      artifactsPaths:
         './packages/plugin-bundle-stats/mocks/fixtures/stats/angular-large.stats.json',
       selection: {
         excludeOutputs: ['**/*.map', '**/*.d.ts'], // Only exclude source maps as they're not part of runtime bundle

packages/plugin-bundle-stats/src/index.ts

@@ -1,11 +1,15 @@
 import { bundleStatsPlugin } from './lib/bundle-stats-plugin';
 
-export type { BundleStatsOptions, PluginOptions } from './lib/types.js';
+export type {
+  BundleStatsAuditOptions as BundleStatsOptions,
+  PluginOptions,
+} from './lib/types.js';
 export type {
   GroupingRule,
   PatternList,
-  BundleStatsConfig,
+  BundleStatsConfig as BundleStatsConfig,
 } from './lib/runner/types.js';
+export type { BlacklistEntry } from './lib/runner/audits/scoring.js';
 
 export default bundleStatsPlugin;
 export { DEFAULT_GROUPING, DEFAULT_PRUNING } from './lib/constants.js';

packages/plugin-bundle-stats/src/lib/bundle-stats-plugin.ts

@@ -2,19 +2,38 @@ import { createRequire } from 'node:module';
 import type { Audit, PluginConfig } from '@code-pushup/models';
 import { BUNDLE_STATS_PLUGIN_SLUG } from './constants.js';
 import { normalizeBundleStatsOptions } from './normalize.js';
-import { bundleStatsRunner } from './runner/bundle-stats-runner.js';
-import { type BundleStatsConfig } from './runner/types.js';
+import {
+  bundleStatsRunner,
+  mergeAuditConfigs,
+} from './runner/bundle-stats-runner.js';
 import type { PluginOptions } from './types.js';
 
 const PKG = createRequire(import.meta.url)('../../package.json');
 
 export async function bundleStatsPlugin(
   options: PluginOptions,
 ): Promise<PluginConfig> {
-  const { groups = [], audits, ...restOptions } = options;
+  const {
+    groups = [],
+    bundler,
+    artifactsPaths,
+    generateArtifactsCommand,
+    audits,
+    ...pluginOptions
+  } = options;
 
-  const auditConfigs: BundleStatsConfig[] = audits.map(
-    normalizeBundleStatsOptions,
+  const bundleStatsConfigs = mergeAuditConfigs(
+    audits.map(normalizeBundleStatsOptions),
+    pluginOptions,
+  );
+
+  const auditConfigs: Audit[] = bundleStatsConfigs.map(
+    ({ slug, title, description, ..._ }) =>
+      ({
+        slug,
+        title,
+        description,
+      }) satisfies Audit,
   );
 
   return {
@@ -25,18 +44,13 @@ export async function bundleStatsPlugin(
     icon: 'folder-rules',
     description: 'Official Code PushUp Bundle Stats plugin.',
     docsUrl: 'https://npm.im/@code-pushup/bundle-stats-plugin',
-    audits: auditConfigs.map(
-      ({ slug, description, title, ..._ }) =>
-        ({
-          slug,
-          title,
-          description,
-        }) satisfies Audit,
-    ),
-    groups: groups ?? [],
+    audits: auditConfigs,
+    groups,
     runner: await bundleStatsRunner({
-      ...restOptions,
-      audits: auditConfigs,
+      bundler,
+      artifactsPaths,
+      generateArtifactsCommand,
+      bundleStatsConfigs,
     }),
   };
 }

packages/plugin-bundle-stats/src/lib/constants.ts

@@ -1,4 +1,4 @@
-import type { PruningOptions } from './runner/audits/details/tree.js';
+import type { PruningConfig } from './runner/audits/details/tree.js';
 import type { GroupingRule } from './runner/types.js';
 
 /**
@@ -356,7 +356,7 @@ export const DEFAULT_GROUPING: GroupingRule[] = [
  * Default pruning options for bundle stats analysis.
  * These settings control how the bundle tree is simplified and organized.
  */
-export const DEFAULT_PRUNING: PruningOptions = {
+export const DEFAULT_PRUNING: PruningConfig = {
   maxChildren: 10,
   startDepth: 0,
   maxDepth: 4,