Merge branch 'master' into update-format-lint-config

Author: 72636c

src/api/github/checkRun.ts

@@ -3,6 +3,8 @@ import { Endpoints } from '@octokit/types';
 import fs from 'fs-extra';
 import git from 'isomorphic-git';
 
+import { pluralise } from '../../utils/logging';
+
 type Output = NonNullable<
   Endpoints['POST /repos/{owner}/{repo}/check-runs']['parameters']['output']
 >;
@@ -66,9 +68,7 @@ const suffixTitle = (title: string, inputAnnotations: number): string => {
       ? GITHUB_MAX_ANNOTATIONS
       : inputAnnotations;
 
-  const plural = addedAnnotations === 1 ? '' : 's';
-
-  return `${title} (${addedAnnotations} annotation${plural} added)`;
+  return `${title} (${pluralise(addedAnnotations, 'annotation')} added)`;
 };
 
 /**

src/cli/adapter/eslint.ts

@@ -3,7 +3,7 @@ import path from 'path';
 import chalk from 'chalk';
 import { ESLint, Linter } from 'eslint';
 
-import { Logger } from '../../utils/logging';
+import { Logger, pluralise } from '../../utils/logging';
 
 const symbolForResult = (result: ESLint.LintResult) => {
   if (result.errorCount) {
@@ -52,7 +52,7 @@ export const runESLint = async (
   const end = process.hrtime.bigint();
 
   logger.plain(
-    `Processed ${logger.pluralise(results.length, 'file')} in ${logger.timing(
+    `Processed ${pluralise(results.length, 'file')} in ${logger.timing(
       start,
       end,
     )}.`,

src/cli/adapter/prettier.ts

@@ -4,7 +4,7 @@ import fs from 'fs-extra';
 import { Options, check, format, getFileInfo, resolveConfig } from 'prettier';
 
 import { crawlDirectory } from '../../utils/dir';
-import { Logger } from '../../utils/logging';
+import { Logger, pluralise } from '../../utils/logging';
 import { getConsumerManifest } from '../../utils/manifest';
 
 interface File {
@@ -108,7 +108,7 @@ export const runPrettier = async (
   // and the headache of conflicting `.gitignore` and `.prettierignore` rules.
   const filepaths = await crawlDirectory(directory, '.prettierignore');
 
-  logger.debug(`Discovered ${logger.pluralise(filepaths.length, 'file')}.`);
+  logger.debug(`Discovered ${pluralise(filepaths.length, 'file')}.`);
 
   const result: Result = {
     count: filepaths.length,
@@ -144,23 +144,21 @@ export const runPrettier = async (
   const end = process.hrtime.bigint();
 
   logger.plain(
-    `Processed ${logger.pluralise(
+    `Processed ${pluralise(
       result.count - result.unparsed.length,
       'file',
     )} in ${logger.timing(start, end)}.`,
   );
 
   if (result.touched.length) {
-    logger.plain(
-      `Formatted ${logger.pluralise(result.touched.length, 'file')}:`,
-    );
+    logger.plain(`Formatted ${pluralise(result.touched.length, 'file')}:`);
     for (const filepath of result.touched) {
       logger.warn(filepath);
     }
   }
 
   if (result.errored.length) {
-    logger.plain(`Flagged ${logger.pluralise(result.errored.length, 'file')}:`);
+    logger.plain(`Flagged ${pluralise(result.errored.length, 'file')}:`);
     for (const { err, filepath } of result.errored) {
       logger.warn(filepath, ...(err ? [String(err)] : []));
     }

src/cli/lint/external.ts

@@ -83,7 +83,12 @@ export const externalLint = async (input: Input) => {
 
   const { eslint, prettier, tscOk } = await lint({ ...input, tscOutputStream });
 
-  await createAnnotations(eslint, prettier, tscOk, tscOutputStream);
+  try {
+    await createAnnotations(eslint, prettier, tscOk, tscOutputStream);
+  } catch (err) {
+    log.warn('Failed to annotate results.');
+    log.warn(err);
+  }
 
   if (eslint.ok && prettier.ok && tscOk) {
     return;

src/utils/logging.ts

@@ -11,8 +11,6 @@ export const createLogger = (debug: boolean, ...prefixes: unknown[]) => {
     bold: chalk.bold,
     formatSubtle: chalk.grey,
 
-    pluralise: (count: number, subject: string) =>
-      `${count} ${subject}${count === 1 ? '' : 's'}`,
     timing: (start: bigint, end: bigint) =>
       `${Number((end - start) / BigInt(10_000_000)) / 100}s`,
 
@@ -28,3 +26,6 @@ export const createLogger = (debug: boolean, ...prefixes: unknown[]) => {
 };
 
 export const log = createLogger(false);
+
+export const pluralise = (count: number, subject: string) =>
+  `${count} ${subject}${count === 1 ? '' : 's'}`;