@atlaspack/reporter-cli 2.15.1-canary.138 → 2.15.1-canary.139

package/lib/CLIReporter.d.ts

@@ -0,0 +1,5 @@
+import type { ReporterEvent, PluginOptions } from '@atlaspack/types';
+import { Reporter } from '@atlaspack/plugin';
+export declare function _report(event: ReporterEvent, options: PluginOptions): Promise<void>;
+declare const _default: Reporter;
+export default _default;

package/lib/CLIReporter.js

@@ -49,6 +49,8 @@ function _wrapAnsi() {
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// @ts-expect-error TS7016
+
 const THROTTLE_DELAY = 100;
 const seenWarnings = new Set();
 const seenPhases = new Set();
@@ -208,12 +210,15 @@ async function _report(event, options) {
             await writeDiagnostic(options, event.diagnostics, 'red', true);
             break;
           default:
+            // @ts-expect-error TS2339
             throw new Error('Unknown log level ' + event.level);
         }
       }
   }
 }
-async function writeDiagnostic(options, diagnostics, color, isError = false) {
+async function writeDiagnostic(options, diagnostics,
+// @ts-expect-error TS2749
+color, isError = false) {
   let columns = (0, _utils2.getTerminalWidth)().columns;
   let indent = 2;
   let spaceAfter = isError;
@@ -225,7 +230,7 @@ async function writeDiagnostic(options, diagnostics, color, isError = false) {
       hints,
       documentation
     } = await (0, _utils().prettyDiagnostic)(diagnostic, options, columns - indent);
-    // $FlowFixMe[incompatible-use]
+    // @ts-expect-error TS7053
     message = _chalk().default[color](message);
     if (spaceAfter) {
       (0, _render.writeOut)('');
@@ -254,6 +259,8 @@ async function writeDiagnostic(options, diagnostics, color, isError = false) {
     if (documentation) {
       (0, _render.writeOut)(wrapWithIndent(`${emoji.docs} ${_chalk().default.magenta.bold(documentation)}`, hintIndent + 3, hintIndent));
     }
+
+    // @ts-expect-error TS2322
     spaceAfter = stack || codeframe || hints.length > 0 || documentation;
   }
   if (spaceAfter) {
@@ -266,6 +273,8 @@ function wrapWithIndent(string, indent = 0, initialIndent = indent) {
     trim: false
   }), indent, initialIndent);
 }
+
+// @ts-expect-error TS7006
 function indentString(string, indent = 0, initialIndent = indent) {
   return ' '.repeat(initialIndent) + string.replace(/\n/g, '\n' + ' '.repeat(indent));
 }

package/lib/bundleReport.d.ts

@@ -0,0 +1,3 @@
+import type { BundleGraph, FilePath, PackagedBundle } from '@atlaspack/types';
+import type { FileSystem } from '@atlaspack/fs';
+export default function bundleReport(bundleGraph: BundleGraph<PackagedBundle>, fs: FileSystem, projectRoot: FilePath, assetCount?: number): Promise<void>;

package/lib/bundleReport.js

@@ -75,7 +75,9 @@ async function bundleReport(bundleGraph, fs, projectRoot, assetCount = 0) {
     if (assetCount > 0) {
       let largestAssets = bundle.assets.slice(0, assetCount);
       for (let asset of largestAssets) {
-        let columns = [asset == largestAssets[largestAssets.length - 1] ? '└── ' : '├── ', _chalk().default.dim(prettifySize(asset.size)), _chalk().default.dim(_chalk().default.green((0, _utils().prettifyTime)(asset.time)))];
+        let columns = [asset == largestAssets[largestAssets.length - 1] ? '└── ' : '├── ',
+        // @ts-expect-error TS2554
+        _chalk().default.dim(prettifySize(asset.size)), _chalk().default.dim(_chalk().default.green((0, _utils().prettifyTime)(asset.time)))];
         if (asset.filePath !== '') {
           columns[0] += (0, _utils2.formatFilename)(asset.filePath, _chalk().default.reset);
         } else {
@@ -98,6 +100,7 @@ async function bundleReport(bundleGraph, fs, projectRoot, assetCount = 0) {
 
   // Render table
   (0, _render.writeOut)('');
+  // @ts-expect-error TS2345
   (0, _render.table)(COLUMNS, rows);
 }
 function prettifySize(size, isLarge) {

package/lib/emoji.d.ts

@@ -0,0 +1,7 @@
+export declare const progress: string;
+export declare const success: string;
+export declare const error: string;
+export declare const warning: string;
+export declare const info: string;
+export declare const hint: string;
+export declare const docs: string;

package/lib/logLevels.d.ts

@@ -0,0 +1,10 @@
+declare const logLevels: {
+    readonly none: 0;
+    readonly error: 1;
+    readonly warn: 2;
+    readonly info: 3;
+    readonly progress: 3;
+    readonly success: 3;
+    readonly verbose: 4;
+};
+export default logLevels;

package/lib/phaseReport.d.ts

@@ -0,0 +1,3 @@
+export default function phaseReport(phaseStartTimes: {
+    [key: string]: number;
+}): void;

package/lib/render.d.ts

@@ -0,0 +1,14 @@
+import type { Writable } from 'stream';
+import type { PadAlign } from './utils';
+type ColumnType = {
+    align: PadAlign;
+};
+export declare const isTTY: any | boolean | true;
+export declare function _setStdio(stdoutLike: Writable, stderrLike: Writable): void;
+export declare function writeOut(message: string, isError?: boolean): void;
+export declare function persistMessage(message: string): void;
+export declare function updateSpinner(message: string): void;
+export declare function persistSpinner(name: string, status: 'success' | 'error', message: string): void;
+export declare function resetWindow(): void;
+export declare function table(columns: Array<ColumnType>, table: Array<Array<string>>): void;
+export {};

package/lib/render.js

@@ -37,9 +37,7 @@ var emoji = _interopRequireWildcard(require("./emoji"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const isTTY = exports.isTTY =
-// $FlowFixMe
-process.env.NODE_ENV !== 'test' && process.stdout.isTTY;
+const isTTY = exports.isTTY = process.env.NODE_ENV !== 'test' && process.stdout.isTTY;
 let stdout = process.stdout;
 let stderr = process.stderr;
 
@@ -55,7 +53,9 @@ let lineCount = 0;
 let errorLineCount = 0;
 let statusPersisted = false;
 function _setStdio(stdoutLike, stderrLike) {
+  // @ts-expect-error TS2322
   stdout = stdoutLike;
+  // @ts-expect-error TS2322
   stderr = stderrLike;
 }
 let spinner = (0, _ora().default)({

package/lib/utils.d.ts

@@ -0,0 +1,5 @@
+export type PadAlign = 'left' | 'right';
+export declare function getTerminalWidth(): any;
+export declare function pad(text: string, length: number, align?: PadAlign): string;
+export declare function formatFilename(filename: string, color?: (s: string) => string): string;
+export declare function countLines(message: string): number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/reporter-cli",
-  "version": "2.15.1-canary.138+eda07caaf",
+  "version": "2.15.1-canary.139+d2fd84977",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -9,8 +9,9 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "lib/CLIReporter.js",
-  "source": "src/CLIReporter.js",
+  "main": "./lib/CLIReporter.js",
+  "source": "./src/CLIReporter.ts",
+  "types": "./lib/CLIReporter.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
@@ -26,9 +27,9 @@
     }
   },
   "dependencies": {
-    "@atlaspack/plugin": "2.14.5-canary.138+eda07caaf",
-    "@atlaspack/types": "2.14.5-canary.138+eda07caaf",
-    "@atlaspack/utils": "2.14.5-canary.138+eda07caaf",
+    "@atlaspack/plugin": "2.14.5-canary.139+d2fd84977",
+    "@atlaspack/types": "2.14.5-canary.139+d2fd84977",
+    "@atlaspack/utils": "2.14.5-canary.139+d2fd84977",
     "chalk": "^4.1.0",
     "filesize": "^6.1.0",
     "nullthrows": "^1.1.1",
@@ -38,8 +39,11 @@
     "wrap-ansi": "^7.0.0"
   },
   "devDependencies": {
-    "@atlaspack/feature-flags": "2.14.1-canary.206+eda07caaf"
+    "@atlaspack/feature-flags": "2.14.1-canary.207+d2fd84977"
   },
   "type": "commonjs",
-  "gitHead": "eda07caafd2ebb814bbdbfd0ec12fa63124e213f"
-}
+  "scripts": {
+    "check-ts": "tsc --emitDeclarationOnly --rootDir src"
+  },
+  "gitHead": "d2fd849770fe6305e9c694bd97b1bd905abd9d94"
+}

package/src/{CLIReporter.js → CLIReporter.ts}

@@ -1,4 +1,3 @@
-// @flow
 import type {ReporterEvent, PluginOptions} from '@atlaspack/types';
 import type {Diagnostic} from '@atlaspack/diagnostic';
 import type {Color} from 'chalk';
@@ -28,6 +27,7 @@ import {
   persistMessage,
 } from './render';
 import * as emoji from './emoji';
+// @ts-expect-error TS7016
 import wrapAnsi from 'wrap-ansi';
 
 const THROTTLE_DELAY = 100;
@@ -35,7 +35,7 @@ const seenWarnings = new Set();
 const seenPhases = new Set();
 const seenPhasesGen = new Set();
 
-let phaseStartTimes = {};
+let phaseStartTimes: Record<string, any> = {};
 let pendingIncrementalBuild = false;
 let packagingProgress = 0;
 
@@ -63,9 +63,9 @@ let statusThrottle = throttle((message: string) => {
   updateSpinner(message);
 }, THROTTLE_DELAY);
 
-const cacheWriteState: {|
-  startTime: number | null,
-|} = {
+const cacheWriteState: {
+  startTime: number | null;
+} = {
   startTime: null,
 };
 
@@ -247,6 +247,7 @@ export async function _report(
           await writeDiagnostic(options, event.diagnostics, 'red', true);
           break;
         default:
+          // @ts-expect-error TS2339
           throw new Error('Unknown log level ' + event.level);
       }
     }
@@ -256,6 +257,7 @@ export async function _report(
 async function writeDiagnostic(
   options: PluginOptions,
   diagnostics: Array<Diagnostic>,
+  // @ts-expect-error TS2749
   color: Color,
   isError: boolean = false,
 ) {
@@ -265,7 +267,7 @@ async function writeDiagnostic(
   for (let diagnostic of diagnostics) {
     let {message, stack, codeframe, hints, documentation} =
       await prettyDiagnostic(diagnostic, options, columns - indent);
-    // $FlowFixMe[incompatible-use]
+    // @ts-expect-error TS7053
     message = chalk[color](message);
 
     if (spaceAfter) {
@@ -314,6 +316,7 @@ async function writeDiagnostic(
       );
     }
 
+    // @ts-expect-error TS2322
     spaceAfter = stack || codeframe || hints.length > 0 || documentation;
   }
 
@@ -322,7 +325,7 @@ async function writeDiagnostic(
   }
 }
 
-function wrapWithIndent(string, indent = 0, initialIndent = indent) {
+function wrapWithIndent(string: string, indent = 0, initialIndent = indent) {
   let width = getTerminalWidth().columns;
   return indentString(
     wrapAnsi(string.trimEnd(), width - indent, {trim: false}),
@@ -331,14 +334,15 @@ function wrapWithIndent(string, indent = 0, initialIndent = indent) {
   );
 }
 
+// @ts-expect-error TS7006
 function indentString(string, indent = 0, initialIndent = indent) {
   return (
     ' '.repeat(initialIndent) + string.replace(/\n/g, '\n' + ' '.repeat(indent))
   );
 }
 
-export default (new Reporter({
+export default new Reporter({
   report({event, options}) {
     return _report(event, options);
   },
-}): Reporter);
+}) as Reporter;

package/src/{bundleReport.js → bundleReport.ts}

@@ -1,4 +1,3 @@
-// @flow
 import type {BundleGraph, FilePath, PackagedBundle} from '@atlaspack/types';
 import type {FileSystem} from '@atlaspack/fs';
 
@@ -40,7 +39,7 @@ export default async function bundleReport(
             };
           }),
         };
-  let rows = [];
+  let rows: Array<Array<string>> = [];
 
   for (let bundle of bundles) {
     // Add a row for the bundle
@@ -55,6 +54,7 @@ export default async function bundleReport(
       for (let asset of largestAssets) {
         let columns: Array<string> = [
           asset == largestAssets[largestAssets.length - 1] ? '└── ' : '├── ',
+          // @ts-expect-error TS2554
           chalk.dim(prettifySize(asset.size)),
           chalk.dim(chalk.green(prettifyTime(asset.time))),
         ];
@@ -87,10 +87,11 @@ export default async function bundleReport(
 
   // Render table
   writeOut('');
+  // @ts-expect-error TS2345
   table(COLUMNS, rows);
 }
 
-function prettifySize(size, isLarge) {
+function prettifySize(size: number, isLarge: undefined | boolean) {
   let res = filesize(size);
   if (isLarge) {
     return chalk.yellow(emoji.warning + '  ' + res);

package/src/{emoji.js → emoji.ts}

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 // From https://github.com/sindresorhus/is-unicode-supported/blob/8f123916d5c25a87c4f966dcc248b7ca5df2b4ca/index.js
 // This package is ESM-only so it has to be vendored
 function isUnicodeSupported() {

package/src/{logLevels.js → logLevels.ts}

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 const logLevels = {
   none: 0,
   error: 1,
@@ -8,6 +6,6 @@ const logLevels = {
   progress: 3,
   success: 3,
   verbose: 4,
-};
+} as const;
 
 export default logLevels;

package/src/{phaseReport.js → phaseReport.ts}

@@ -1,11 +1,10 @@
-// @flow
 import {prettifyTime} from '@atlaspack/utils';
 import chalk from 'chalk';
 import {writeOut} from './render';
 import invariant from 'assert';
 
-export default function phaseReport(phaseStartTimes: {[string]: number}) {
-  let phaseTimes = {};
+export default function phaseReport(phaseStartTimes: {[key: string]: number}) {
+  let phaseTimes: Record<string, any> = {};
   if (phaseStartTimes['transforming'] && phaseStartTimes['bundling']) {
     phaseTimes['Transforming'] =
       phaseStartTimes['bundling'] - phaseStartTimes['transforming'];

package/src/{render.js → render.ts}

@@ -1,4 +1,3 @@
-// @flow
 import type {Writable} from 'stream';
 
 import readline from 'readline';
@@ -9,12 +8,11 @@ import type {PadAlign} from './utils';
 import {pad, countLines} from './utils';
 import * as emoji from './emoji';
 
-type ColumnType = {|
-  align: PadAlign,
-|};
+type ColumnType = {
+  align: PadAlign;
+};
 
 export const isTTY: any | boolean | true =
-  // $FlowFixMe
   process.env.NODE_ENV !== 'test' && process.stdout.isTTY;
 
 let stdout = process.stdout;
@@ -33,7 +31,9 @@ let errorLineCount = 0;
 let statusPersisted = false;
 
 export function _setStdio(stdoutLike: Writable, stderrLike: Writable) {
+  // @ts-expect-error TS2322
   stdout = stdoutLike;
+  // @ts-expect-error TS2322
   stderr = stderrLike;
 }
 
@@ -42,7 +42,7 @@ let spinner = ora({
   stream: stdout,
   discardStdin: false,
 });
-let persistedMessages = [];
+let persistedMessages: Array<string> = [];
 
 export function writeOut(message: string, isError: boolean = false) {
   let processedMessage = message + '\n';
@@ -132,7 +132,7 @@ export function resetWindow() {
 
 export function table(columns: Array<ColumnType>, table: Array<Array<string>>) {
   // Measure column widths
-  let colWidths = [];
+  let colWidths: Array<number> = [];
   for (let row of table) {
     let i = 0;
     for (let item of row) {

package/src/{utils.js → utils.ts}

@@ -1,4 +1,3 @@
-// @flow
 import path from 'path';
 import chalk from 'chalk';
 import stringWidth from 'string-width';

package/test/{CLIReporter.test.js → CLIReporter.test.ts}

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 import assert from 'assert';
 import sinon from 'sinon';
 import {PassThrough} from 'stream';
@@ -39,13 +37,13 @@ const EMPTY_OPTIONS = {
     assetsPerBundle: 10,
   },
   featureFlags: DEFAULT_FEATURE_FLAGS,
-};
+} as const;
 
 describe('CLIReporter', () => {
-  let originalStdout;
-  let originalStderr;
-  let stdoutOutput;
-  let stderrOutput;
+  let originalStdout: any;
+  let originalStderr: any;
+  let stdoutOutput: any;
+  let stderrOutput: any;
 
   beforeEach(async () => {
     // Stub these out to avoid writing noise to real stdio and to read from these
@@ -57,9 +55,15 @@ describe('CLIReporter', () => {
     stderrOutput = '';
 
     let mockStdout = new PassThrough();
-    mockStdout.on('data', (d) => (stdoutOutput += stripAnsi(d.toString())));
+    mockStdout.on(
+      'data',
+      (d: any) => (stdoutOutput += stripAnsi(d.toString())),
+    );
     let mockStderr = new PassThrough();
-    mockStderr.on('data', (d) => (stderrOutput += stripAnsi(d.toString())));
+    mockStderr.on(
+      'data',
+      (d: any) => (stderrOutput += stripAnsi(d.toString())),
+    );
     _setStdio(mockStdout, mockStderr);
 
     await _report(
@@ -200,7 +204,6 @@ describe('CLIReporter', () => {
     // emit a buildSuccess event to reset the timings and seen phases
     // from the previous test
     process.env['ATLASPACK_SHOW_PHASE_TIMES'] = undefined;
-    // $FlowFixMe
     await _report({type: 'buildSuccess'}, EMPTY_OPTIONS);
 
     process.env['ATLASPACK_SHOW_PHASE_TIMES'] = 'true';
@@ -210,17 +213,16 @@ describe('CLIReporter', () => {
     );
     await _report({type: 'buildProgress', phase: 'bundling'}, EMPTY_OPTIONS);
     await _report(
-      // $FlowFixMe
       {
         type: 'buildProgress',
         phase: 'packaging',
+
         bundle: {
           displayName: 'test',
         },
       },
       EMPTY_OPTIONS,
     );
-    // $FlowFixMe
     await _report({type: 'buildSuccess'}, EMPTY_OPTIONS);
     const expected =
       /Building...\nBundling...\nPackaging & Optimizing...\nTransforming finished in [0-9]ms\nBundling finished in [0-9]ms\nPackaging & Optimizing finished in [0-9]ms/;
@@ -235,17 +237,16 @@ describe('CLIReporter', () => {
     );
     await _report({type: 'buildProgress', phase: 'bundling'}, EMPTY_OPTIONS);
     await _report(
-      // $FlowFixMe
       {
         type: 'buildProgress',
         phase: 'packaging',
+
         bundle: {
           displayName: 'test',
         },
       },
       EMPTY_OPTIONS,
     );
-    // $FlowFixMe
     await _report({type: 'buildSuccess'}, EMPTY_OPTIONS);
 
     assert.equal(

package/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../../tsconfig.json",
+  "include": ["src"]
+}