Mar 20, 2022 · Mar 18, 2022 · Mar 18, 2022 · Mar 18, 2022
diff --git a/cli/src/commands/install.js b/cli/src/commands/install.js
 } from '../lib/npm/npmProjectUtils';
 import {getRangeLowerBound} from '../lib/semver';
 import {createStub, pkgHasFlowFiles} from '../lib/stubUtils';
 import {listItem} from '../lib/logger';

 export const name = 'install [explicitLibDefs...]';
 export const description = 'Installs libdefs into the ./flow-typed directory';
              const localFile = fs.readFileSync(defLocalPath, 'utf-8');

              if (!verifySignedCode(localFile) && !overwrite) {
                console.log(
                  colors.bold(
                    '  • %s\n' +
                      '    └> %s\n' +
                      '       %s\n' +
                      '       %s\n' +
                      '       %s\n' +
                      '       %s',
                  ),
                listItem(
                  en,
                  colors.red(
                    `${en} already exists and appears to have been manually written or changed!`,
            const codeSignPreprocessor = signCodeStream(repoVersion);
            await copyFile(def.path, defLocalPath, codeSignPreprocessor);

            console.log(
              colors.bold('  • %s\n' + '    └> %s'),
            listItem(
              en,
              colors.green(
                `.${path.sep}${path.relative(flowProjectRoot, defLocalPath)}`,
              ),
            );
          } else {
            console.log(
              colors.bold('  • %s\n' + '    └> %s'),
            listItem(
              en,
              colors.yellow(
                `Was unable to install ${en}. The env might not exist or there is not a version compatible with your version of flow`,
    );

    if (!overwrite && (await fs.exists(filePath))) {
      console.error(
        '  • %s\n' + '    %s\n    %s\n    └> %s',
      listItem(
        colors.bold(
          colors.red(
            `${terseFilePath} already exists and appears to have been manually ` +
    const codeSignPreprocessor = signCodeStream(repoVersion);
    await copyFile(npmLibDef.path, filePath, codeSignPreprocessor);

    console.log(
      colors.bold('  • %s\n' + '    └> %s'),
      fileName,
      colors.green(`.${path.sep}${terseFilePath}`),
    );
    listItem(fileName, colors.green(`.${path.sep}${terseFilePath}`));

    // Remove any lingering stubs
    console.log(npmLibDef.name);
diff --git a/cli/src/lib/__tests__/logger.js b/cli/src/lib/__tests__/logger.js
 // @flow
 import colors from 'colors';

 import {listItem} from '../logger';

 describe('logger', () => {
  const consoleLog = jest.fn();
  jest.spyOn(console, 'log').mockImplementation(consoleLog);

  beforeEach(() => {
    jest.clearAllMocks();
  });

  describe('listItem', () => {
    it('returns expected result', () => {
      listItem('test', 'a', 'b');

      expect(consoleLog).toHaveBeenCalledWith(
        colors.bold(`  • test
    └> a
       b`),
      );
    });
  });

  describe('list', () => {});
 });
diff --git a/cli/src/lib/logger.js b/cli/src/lib/logger.js
 // @flow
 import colors from 'colors';

 const bulletPoint = `  • `;
 const arrow = `    └> `;
 const genericRowPad = `       `;

 const createListItem = (values: Array<string>): string => {
  const [first, second, ...rest] = values;
  let value = `${bulletPoint}${first}\n`;
  if (second) {
    value += `${arrow}${second}\n`;
  }
  if (rest.length > 0) {
    rest.forEach((r, i) => {
      value += `${genericRowPad}${r}${i === rest.length - 1 ? '' : '\n'}`;
    });
  }
  return colors.bold(value);
 };

 export const listItem = (...values: Array<string>): void => {
  console.log(createListItem(values));
 };
diff --git a/cli/src/lib/stubUtils.js b/cli/src/lib/stubUtils.js
 import {signCode} from './codeSign';
 import {verifySignedCode} from './codeSign';
 import {versionToString} from './semver';
 import {listItem} from './logger';

 export function glob(pattern: string, options: Object): Promise<Array<string>> {
  return new Promise((resolve, reject) =>
      typescriptTypingsContent,
    );
    const terseFilename = path.relative(projectRoot, filename);
    console.log(
      colors.bold('  • %s@%s\n' + '    └> %s'),
      packageName,
      version,
      colors.red(terseFilename),
    );
    listItem(`${packageName}@${version}`, colors.red(terseFilename));
    if (resolutionError) {
      console.log(
        colors.yellow(
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,6 +36,7 @@ import {
		} from '../lib/npm/npmProjectUtils';
		import {getRangeLowerBound} from '../lib/semver';
		import {createStub, pkgHasFlowFiles} from '../lib/stubUtils';
		import {listItem} from '../lib/logger';

		export const name = 'install [explicitLibDefs...]';
		export const description = 'Installs libdefs into the ./flow-typed directory';
Expand DownExpand Up		@@ -273,15 +274,7 @@ async function installEnvLibDefs(
		const localFile = fs.readFileSync(defLocalPath, 'utf-8');

		if (!verifySignedCode(localFile) && !overwrite) {
		console.log(
		colors.bold(
		' • %s\n' +
		' └> %s\n' +
		' %s\n' +
		' %s\n' +
		' %s\n' +
		' %s',
		),
		listItem(
		en,
		colors.red(
		`${en} already exists and appears to have been manually written or changed!`,
Expand DownExpand Up		@@ -312,16 +305,14 @@ async function installEnvLibDefs(
		const codeSignPreprocessor = signCodeStream(repoVersion);
		await copyFile(def.path, defLocalPath, codeSignPreprocessor);

		console.log(
		colors.bold(' • %s\n' + ' └> %s'),
		listItem(
		en,
		colors.green(
		`.${path.sep}${path.relative(flowProjectRoot, defLocalPath)}`,
		),
		);
		} else {
		console.log(
		colors.bold(' • %s\n' + ' └> %s'),
		listItem(
		en,
		colors.yellow(
		`Was unable to install ${en}. The env might not exist or there is not a version compatible with your version of flow`,
Expand DownExpand Up		@@ -703,8 +694,7 @@ async function installNpmLibDef(
		);

		if (!overwrite && (await fs.exists(filePath))) {
		console.error(
		' • %s\n' + ' %s\n %s\n └> %s',
		listItem(
		colors.bold(
		colors.red(
		`${terseFilePath} already exists and appears to have been manually ` +
Expand All		@@ -727,11 +717,7 @@ async function installNpmLibDef(
		const codeSignPreprocessor = signCodeStream(repoVersion);
		await copyFile(npmLibDef.path, filePath, codeSignPreprocessor);

		console.log(
		colors.bold(' • %s\n' + ' └> %s'),
		fileName,
		colors.green(`.${path.sep}${terseFilePath}`),
		);
		listItem(fileName, colors.green(`.${path.sep}${terseFilePath}`));

		// Remove any lingering stubs
		console.log(npmLibDef.name);
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,27 @@
		// @flow
		import colors from 'colors';

		import {listItem} from '../logger';

		describe('logger', () => {
		const consoleLog = jest.fn();
		jest.spyOn(console, 'log').mockImplementation(consoleLog);

		beforeEach(() => {
		jest.clearAllMocks();
		});

		describe('listItem', () => {
		it('returns expected result', () => {
		listItem('test', 'a', 'b');

		expect(consoleLog).toHaveBeenCalledWith(
		colors.bold(` • test
		└> a
		b`),
		);
		});
		});

		describe('list', () => {});
		});
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,24 @@
		// @flow
		import colors from 'colors';

		const bulletPoint = ` • `;
		const arrow = ` └> `;
		const genericRowPad = ` `;

		const createListItem = (values: Array<string>): string => {
		const [first, second, ...rest] = values;
		let value = `${bulletPoint}${first}\n`;
		if (second) {
		value += `${arrow}${second}\n`;
		}
		if (rest.length > 0) {
		rest.forEach((r, i) => {
		value += `${genericRowPad}${r}${i === rest.length - 1 ? '' : '\n'}`;
		});
		}
		return colors.bold(value);
		};

		export const listItem = (...values: Array<string>): void => {
		console.log(createListItem(values));
		};
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,6 +19,7 @@ import {path} from './node';
		import {signCode} from './codeSign';
		import {verifySignedCode} from './codeSign';
		import {versionToString} from './semver';
		import {listItem} from './logger';

		export function glob(pattern: string, options: Object): Promise<Array<string>> {
		return new Promise((resolve, reject) =>
Expand DownExpand Up		@@ -532,12 +533,7 @@ export async function createStub(
		typescriptTypingsContent,
		);
		const terseFilename = path.relative(projectRoot, filename);
		console.log(
		colors.bold(' • %s@%s\n' + ' └> %s'),
		packageName,
		version,
		colors.red(terseFilename),
		);
		listItem(`${packageName}@${version}`, colors.red(terseFilename));
		if (resolutionError) {
		console.log(
		colors.yellow(
Expand Down