Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions code-pushup.preset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ import eslintPlugin, {
} from './packages/plugin-eslint/src/index.js';
import jsPackagesPlugin from './packages/plugin-js-packages/src/index.js';
import jsDocsPlugin from './packages/plugin-jsdocs/src/index.js';
import {
PLUGIN_SLUG,
groups,
} from './packages/plugin-jsdocs/src/lib/constants.js';
import {
lighthouseCategories,
lighthouseGroupRef,
Expand Down Expand Up @@ -185,12 +181,14 @@ export function configureJsDocsPlugin(projectName?: string): CoreConfig {
slug: 'docs',
title: 'Documentation',
description: 'Measures how much of your code is **documented**.',
refs: groups.map(group => ({
weight: 1,
type: 'group',
plugin: PLUGIN_SLUG,
slug: group.slug,
})),
refs: [
{
type: 'group',
plugin: 'jsdocs',
slug: 'documentation-coverage',
weight: 1,
},
],
},
],
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ exports[`PLUGIN collect report with jsdocs-plugin NPM package > should run JSDoc
],
"icon": "folder-docs",
"slug": "jsdocs",
"title": "JSDoc coverage",
"title": "JSDocs coverage",
},
],
}
Expand Down
23 changes: 3 additions & 20 deletions packages/plugin-coverage/src/lib/runner/lcov/lcov-runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ import type { LCOVRecord } from 'parse-lcov';
import type { AuditOutputs, TableColumnObject } from '@code-pushup/models';
import {
type FileCoverage,
aggregateCoverageStats,
capitalize,
exists,
formatAsciiTable,
formatCoveragePercentage,
getGitRoot,
logger,
objectFromEntries,
Expand Down Expand Up @@ -210,7 +212,7 @@ function logLcovRecords(recordsPerReport: Record<string, LCOVRecord[]>): void {
const stats: Record<CoverageType, string> = objectFromEntries(
objectToEntries(groups).map(([type, files = []]) => [
type,
formatCoverageSum(files),
formatCoveragePercentage(aggregateCoverageStats(files)),
]),
);
const report = truncatedPaths[idx] ?? reportPath;
Expand All @@ -222,25 +224,6 @@ function logLcovRecords(recordsPerReport: Record<string, LCOVRecord[]>): void {
logger.newline();
}

function formatCoverageSum(files: FileCoverage[]): string {
const { covered, total } = files.reduce<
Pick<FileCoverage, 'covered' | 'total'>
>(
(acc, file) => ({
covered: acc.covered + file.covered,
total: acc.total + file.total,
}),
{ covered: 0, total: 0 },
);

if (total === 0) {
return 'n/a';
}

const percentage = (covered / total) * 100;
return `${percentage.toFixed(1)}%`;
}

function logMergedRecords(counts: { before: number; after: number }): void {
if (counts.before === counts.after) {
logger.debug(
Expand Down
6 changes: 5 additions & 1 deletion packages/plugin-jsdocs/src/lib/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ import type { Audit, Group } from '@code-pushup/models';
import type { AuditSlug } from './models.js';

export const PLUGIN_SLUG = 'jsdocs';
export const PLUGIN_TITLE = 'JSDocs coverage';
export const PLUGIN_DESCRIPTION = 'Official Code PushUp JSDoc coverage plugin.';
export const PLUGIN_DOCS_URL =
'https://www.npmjs.com/package/@code-pushup/jsdocs-plugin/';

export const AUDITS_MAP: Record<AuditSlug, Audit> = {
'classes-coverage': {
Expand Down Expand Up @@ -46,7 +50,7 @@ export const AUDITS_MAP: Record<AuditSlug, Audit> = {
},
} as const;

export const groups: Group[] = [
export const GROUPS: Group[] = [
{
slug: 'documentation-coverage',
title: 'Documentation coverage',
Expand Down
4 changes: 4 additions & 0 deletions packages/plugin-jsdocs/src/lib/format.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { pluginMetaLogFormatter } from '@code-pushup/utils';
import { PLUGIN_TITLE } from './constants.js';

export const formatMetaLog = pluginMetaLogFormatter(PLUGIN_TITLE);
25 changes: 15 additions & 10 deletions packages/plugin-jsdocs/src/lib/jsdocs-plugin.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import { type PluginConfig, validate } from '@code-pushup/models';
import { type JsDocsPluginConfig, jsDocsPluginConfigSchema } from './config.js';
import { PLUGIN_SLUG, groups } from './constants.js';
import {
GROUPS,
PLUGIN_DESCRIPTION,
PLUGIN_DOCS_URL,
PLUGIN_SLUG,
PLUGIN_TITLE,
} from './constants.js';
import { createRunnerFunction } from './runner/runner.js';
import {
filterAuditsByPluginConfig,
filterGroupsByOnlyAudits,
logAuditsAndGroups,
} from './utils.js';

export const PLUGIN_TITLE = 'JSDoc coverage';

export const PLUGIN_DESCRIPTION = 'Official Code PushUp JSDoc coverage plugin.';

export const PLUGIN_DOCS_URL =
'https://www.npmjs.com/package/@code-pushup/jsdocs-plugin/';

/**
* Instantiates Code PushUp documentation coverage plugin for core config.
*
Expand All @@ -34,14 +34,19 @@ export function jsDocsPlugin(config: JsDocsPluginConfig): PluginConfig {
const jsDocsConfig = validate(jsDocsPluginConfigSchema, config);
const scoreTargets = jsDocsConfig.scoreTargets;

const groups = filterGroupsByOnlyAudits(GROUPS, jsDocsConfig);
const audits = filterAuditsByPluginConfig(jsDocsConfig);

logAuditsAndGroups(audits, groups);

return {
slug: PLUGIN_SLUG,
title: PLUGIN_TITLE,
icon: 'folder-docs',
description: PLUGIN_DESCRIPTION,
docsUrl: PLUGIN_DOCS_URL,
groups: filterGroupsByOnlyAudits(groups, jsDocsConfig),
audits: filterAuditsByPluginConfig(jsDocsConfig),
groups,
audits,
runner: createRunnerFunction(jsDocsConfig),
...(scoreTargets && { scoreTargets }),
};
Expand Down
12 changes: 7 additions & 5 deletions packages/plugin-jsdocs/src/lib/jsdocs-plugin.unit.test.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
import { describe, expect, it, vi } from 'vitest';
import { pluginConfigSchema } from '@code-pushup/models';
import { PLUGIN_SLUG, groups } from './constants.js';
import {
GROUPS,
PLUGIN_DESCRIPTION,
PLUGIN_DOCS_URL,
PLUGIN_SLUG,
PLUGIN_TITLE,
jsDocsPlugin,
} from './jsdocs-plugin.js';
} from './constants.js';
import { jsDocsPlugin } from './jsdocs-plugin.js';
import { createRunnerFunction } from './runner/runner.js';
import {
filterAuditsByPluginConfig,
filterGroupsByOnlyAudits,
} from './utils.js';

vi.mock('./utils.js', () => ({
vi.mock('./utils.js', async () => ({
...(await vi.importActual('./utils.js')),
filterAuditsByPluginConfig: vi.fn().mockReturnValue([
{
slug: 'mock-audit',
Expand Down Expand Up @@ -69,7 +71,7 @@ describe('jsDocsPlugin', () => {
const config = { patterns: ['src/**/*.ts'] };
jsDocsPlugin(config);

expect(filterGroupsByOnlyAudits).toHaveBeenCalledWith(groups, config);
expect(filterGroupsByOnlyAudits).toHaveBeenCalledWith(GROUPS, config);
});

it('should filter audits', async () => {
Expand Down
24 changes: 17 additions & 7 deletions packages/plugin-jsdocs/src/lib/runner/doc-processor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ import type { CoverageType } from './models.js';
import {
createInitialCoverageTypesRecord,
getCoverageTypeFromKind,
logReport,
logSourceFiles,
singularCoverageType,
} from './utils.js';

Expand All @@ -29,7 +31,7 @@ type Node = {

/**
* Gets the variables information from the variable statements
* @param variableStatements - The variable statements to process
* @param variableStatements The variable statements to process
* @returns The variables information with the right methods to get the information
*/
export function getVariablesInformation(
Expand All @@ -54,15 +56,23 @@ export function getVariablesInformation(

/**
* Processes documentation coverage for TypeScript files in the specified path
* @param config - The configuration object containing patterns to include for documentation analysis
* @param config The configuration object containing patterns to include for documentation analysis
* @returns Object containing coverage statistics and undocumented items
*/
export function processJsDocs(
config: JsDocsPluginTransformedConfig,
): Record<CoverageType, FileCoverage[]> {
const project = new Project();
project.addSourceFilesAtPaths(config.patterns);
return getDocumentationReport(project.getSourceFiles());
const sourceFiles = project.getSourceFiles();

logSourceFiles(sourceFiles, config);

const report = getDocumentationReport(sourceFiles);

logReport(report);

return report;
}

export function getAllNodesFromASourceFile(sourceFile: SourceFile) {
Expand All @@ -80,7 +90,7 @@ export function getAllNodesFromASourceFile(sourceFile: SourceFile) {

/**
* Gets the documentation coverage report from the source files
* @param sourceFiles - The source files to process
* @param sourceFiles The source files to process
* @returns The documentation coverage report
*/
export function getDocumentationReport(
Expand All @@ -101,8 +111,8 @@ export function getDocumentationReport(

/**
* Gets the coverage from all nodes of a file
* @param nodes - The nodes to process
* @param filePath - The file path where the nodes are located
* @param nodes The nodes to process
* @param filePath The file path where the nodes are located
* @returns The coverage report for the nodes
*/
function getCoverageFromAllNodesOfFile(nodes: Node[], filePath: string) {
Expand Down Expand Up @@ -145,7 +155,7 @@ function getCoverageFromAllNodesOfFile(nodes: Node[], filePath: string) {

/**
* Gets the nodes from a class
* @param classNodes - The class nodes to process
* @param classNodes The class nodes to process
* @returns The nodes from the class
*/
export function getClassNodes(classNodes: ClassDeclaration[]) {
Expand Down
56 changes: 55 additions & 1 deletion packages/plugin-jsdocs/src/lib/runner/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
import { SyntaxKind } from 'ts-morph';
import { type SourceFile, SyntaxKind } from 'ts-morph';
import {
type FileCoverage,
aggregateCoverageStats,
capitalize,
formatAsciiTable,
formatCoveragePercentage,
logger,
objectToEntries,
pluralize,
pluralizeToken,
toArray,
} from '@code-pushup/utils';
import type { JsDocsPluginTransformedConfig } from '../config.js';
import { SYNTAX_COVERAGE_MAP } from './constants.js';
import type { CoverageType } from './models.js';

Expand Down Expand Up @@ -70,3 +83,44 @@ export function singularCoverageType(type: CoverageType): string {
return 'variable';
}
}

export function logSourceFiles(
sourceFiles: SourceFile[],
config: JsDocsPluginTransformedConfig,
): void {
const patterns = toArray(config.patterns);
logger.info(
`Found ${pluralizeToken('source file', sourceFiles.length)} matching ${pluralize('pattern', patterns.length)} ${patterns.join(' ')}`,
);
}

export function logReport(report: Record<CoverageType, FileCoverage[]>): void {
const typesCount = Object.keys(report).length;
logger.info(
`Collected documentation coverage for ${pluralizeToken('type', typesCount)} of ${pluralize('entity', typesCount)}`,
);
if (!logger.isVerbose()) {
return;
}

logger.debug(
formatAsciiTable({
columns: [
{ key: 'type', label: 'Entity', align: 'left' },
{ key: 'covered', label: 'Hits', align: 'right' },
{ key: 'total', label: 'Found', align: 'right' },
{ key: 'coverage', label: 'Coverage', align: 'right' },
],
rows: objectToEntries(report)
.map(([type, files]) => {
const stats = aggregateCoverageStats(files);
return {
...stats,
type: capitalize(type),
coverage: formatCoveragePercentage(stats),
};
})
.toSorted((a, b) => b.total - a.total),
}),
);
}
31 changes: 30 additions & 1 deletion packages/plugin-jsdocs/src/lib/utils.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import type { Audit, Group } from '@code-pushup/models';
import { logger, pluralizeToken } from '@code-pushup/utils';
import type { JsDocsPluginTransformedConfig } from './config.js';
import { AUDITS_MAP } from './constants.js';
import { AUDITS_MAP, GROUPS } from './constants.js';
import { formatMetaLog } from './format.js';

/**
* Get audits based on the configuration.
Expand Down Expand Up @@ -50,3 +52,30 @@ export function filterGroupsByOnlyAudits(
}))
.filter(group => group.refs.length > 0);
}

export function logAuditsAndGroups(audits: Audit[], groups: Group[]) {
logger.info(
formatMetaLog(
`Created ${pluralizeToken('audit', audits.length)} and ${pluralizeToken('group', groups.length)}`,
),
);
const skippedAudits = Object.keys(AUDITS_MAP).filter(
slug => !audits.some(audit => audit.slug === slug),
);
const skippedGroups = GROUPS.filter(
group => !groups.some(({ slug }) => slug === group.slug),
);
if (skippedAudits.length > 0) {
logger.info(
formatMetaLog(
[
`Skipped ${pluralizeToken('audit', skippedAudits.length)}`,
skippedGroups.length > 0 &&
pluralizeToken('group', skippedGroups.length),
]
.filter(Boolean)
.join(' and '),
),
);
}
}
7 changes: 6 additions & 1 deletion packages/utils/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ export {
uppercase,
} from './lib/case-conversions.js';
export { formatCommandStatus } from './lib/command.js';
export { filesCoverageToTree, type FileCoverage } from './lib/coverage-tree.js';
export {
filesCoverageToTree,
type FileCoverage,
aggregateCoverageStats,
} from './lib/coverage-tree.js';
export { createRunnerFiles } from './lib/create-runner-files.js';
export { dateToUnixTimestamp } from './lib/dates.js';
export { comparePairs, matchArrayItemsByKey, type Diff } from './lib/diff.js';
Expand Down Expand Up @@ -49,6 +53,7 @@ export {
export { filterItemRefsBy } from './lib/filter.js';
export {
formatBytes,
formatCoveragePercentage,
formatDuration,
indentLines,
pluginMetaLogFormatter,
Expand Down
Loading