add category

Author: BioPhoton

code-pushup.config.ts

@@ -1,15 +1,15 @@
 import 'dotenv/config';
-import {z} from 'zod';
+import { z } from 'zod';
 import {
   coverageCoreConfigNx,
   eslintCoreConfigNx,
   jsPackagesCoreConfig,
   lighthouseCoreConfig,
   typescriptPluginConfigNx,
 } from './code-pushup.preset.js';
-import type {CoreConfig} from './packages/models/src/index.js';
-import {BASIC_CHECKES} from './packages/plugin-typescript/src/lib/constants';
-import {mergeConfigs} from './packages/utils/src/index.js';
+import type { CoreConfig } from './packages/models/src/index.js';
+import { BASIC_CHECKES } from './packages/plugin-typescript/src/lib/constants';
+import { mergeConfigs } from './packages/utils/src/index.js';
 
 // load upload configuration from environment
 const envSchema = z.object({
@@ -18,7 +18,7 @@ const envSchema = z.object({
   CP_ORGANIZATION: z.string().min(1),
   CP_PROJECT: z.string().min(1),
 });
-const {data: env} = await envSchema.safeParseAsync(process.env);
+const { data: env } = await envSchema.safeParseAsync(process.env);
 
 const config: CoreConfig = {
   ...(env && {

code-pushup.preset.ts

@@ -1,7 +1,5 @@
 import type {
-  Audit,
   CategoryConfig,
-  CategoryRef,
   CoreConfig,
 } from './packages/models/src/index.js';
 import coveragePlugin, {
@@ -16,7 +14,7 @@ import lighthousePlugin, {
   lighthouseGroupRef,
 } from './packages/plugin-lighthouse/src/index.js';
 import { typescriptPlugin } from './packages/plugin-typescript/src';
-import { AUDITS as tsAudits } from './packages/plugin-typescript/src/lib/generated/audits';
+import { AUDITS } from './packages/plugin-typescript/src/lib/generated/audits';
 import { TypescriptPluginOptions } from './packages/plugin-typescript/src/lib/typescript-plugin';
 
 export const jsPackagesCategories: CategoryConfig[] = [
@@ -139,21 +137,18 @@ export const typescriptPluginConfigNx = async (
 ): Promise<CoreConfig> => {
   return {
     plugins: [await typescriptPlugin(options)],
-    /*...(supportedAuditSlugs.length > 0 ? {
-      categories: [
-        {
-          slug: 'typescript',
-          title: 'Typescript',
-          refs: supportedAuditSlugs
-            .map(({slug}) => ({
-              plugin: 'typescript',
-              type: 'audit' as const,
-              slug,
-              weight: 1
-            }))
-        }
-      ]
-    } : {})*/
+    categories: [
+      {
+        slug: 'typescript',
+        title: 'Typescript',
+        refs: AUDITS.map(({ slug }) => ({
+          plugin: 'typescript',
+          type: 'audit' as const,
+          slug,
+          weight: 1,
+        })),
+      },
+    ],
   };
 };
 

packages/plugin-typescript/src/lib/runner/runner.ts

@@ -7,6 +7,7 @@ import type {
   RunnerFunction,
 } from '@code-pushup/models';
 import type { TypescriptPluginOptions } from '../config.js';
+import { AUDITS } from '../generated/audits.js';
 import type { AuditSlug } from '../types.js';
 import { getDiagnostics } from './typescript-runner.js';
 import {
@@ -53,10 +54,11 @@ export function createRunnerFunction(
         >,
       );
 
-    return Object.values(result).map(({ slug, details }) => {
+    return AUDITS.map(audit => {
+      const { details } = result[audit.slug as AuditSlug] ?? {};
       const issues = details?.issues ?? [];
       return {
-        slug,
+        ...audit,
         score: issues.length === 0 ? 1 : 0,
         value: issues.length,
         ...(issues.length > 0 ? { details } : {}),