Merge pull request #11 from hankei6km/topic/change-style

Change style

Author: hankei6km

.prettierrc

@@ -2,7 +2,7 @@
   "printWidth": 80,
   "tabWidth": 2,
   "useTabs": false,
-  "semi": true,
+  "semi": false,
   "singleQuote": true,
   "trailingComma": "none",
   "bracketSpacing": true,

jest.config.js

@@ -1,10 +1,10 @@
 module.exports = {
-  roots: ['<rootDir>/src'],
+  roots: ['<rootDir>'],
   testMatch: [
     '**/__tests__/**/*.+(ts|tsx|js)',
     '**/?(*.)+(spec|test).+(ts|tsx|js)'
   ],
   transform: {
     '^.+\\.(ts|tsx)$': 'ts-jest'
   }
-};
+}

src/cli.ts

@@ -1,25 +1,25 @@
-import { Writable } from 'stream';
-import countChars from './count';
+import { Writable } from 'stream'
+import countChars from './count'
 
 type Opts = {
-  filenames: string[];
-  stdout: Writable;
-  stderr: Writable;
-};
+  filenames: string[]
+  stdout: Writable
+  stderr: Writable
+}
 const cli = async ({ filenames, stdout, stderr }: Opts): Promise<number> => {
   try {
-    const len = filenames.length;
+    const len = filenames.length
     for (let i = 0; i < len; i++) {
-      const filename = filenames[i];
-      const count = await countChars(filename);
-      stdout.write(`${filename}: ${count} chars\n`);
+      const filename = filenames[i]
+      const count = await countChars(filename)
+      stdout.write(`${filename}: ${count} chars\n`)
     }
   } catch (err: any) {
-    stderr.write(err.toString());
-    stderr.write('\n');
-    return 1;
+    stderr.write(err.toString())
+    stderr.write('\n')
+    return 1
   }
-  return 0;
-};
+  return 0
+}
 
-export default cli;
+export default cli

src/count.ts

@@ -1,14 +1,14 @@
-import * as fs from 'fs';
+import * as fs from 'fs'
 
 const countChars = async (fileName: string): Promise<number> => {
   return new Promise((resolve, reject) => {
     fs.readFile(fileName, (err, data) => {
       if (err) {
-        reject(err);
-        return;
+        reject(err)
+        return
       }
-      resolve(data.toString('utf-8').length);
-    });
-  });
-};
-export default countChars;
+      resolve(data.toString('utf-8').length)
+    })
+  })
+}
+export default countChars

src/index.ts

@@ -1,2 +1,2 @@
-import countChars from './count';
-export { countChars };
+import countChars from './count'
+export { countChars }

src/main.ts

@@ -1,21 +1,21 @@
 #!/usr/bin/env node
-import yargs from 'yargs';
-import { hideBin } from 'yargs/helpers';
-import cli from './cli';
+import yargs from 'yargs'
+import { hideBin } from 'yargs/helpers'
+import cli from './cli'
 
-(async () => {
+;(async () => {
   const argv = await yargs(hideBin(process.argv))
     .scriptName('count')
     .usage('$0 [FILE]...')
     .example('$0 foo.ts bar.ts', 'count chars in files')
     .demand(1)
-    .help().argv;
+    .help().argv
 
   process.exit(
     await cli({
       filenames: argv._ as string[],
       stdout: process.stdout,
       stderr: process.stderr
     })
-  );
-})();
+  )
+})()

src/cli.test.ts test/cli.spec.tssrc/cli.test.ts renamed to test/cli.spec.ts

@@ -1,52 +1,52 @@
-import { PassThrough } from 'stream';
-import cli from './cli';
+import { PassThrough } from 'stream'
+import cli from '../src/cli'
 
 describe('cli()', () => {
   it('should return stdout with exitcode=0', async () => {
-    const stdout = new PassThrough();
-    const stderr = new PassThrough();
-    const outData = jest.fn();
-    stdout.on('data', outData);
-    const errData = jest.fn();
-    stderr.on('data', errData);
+    const stdout = new PassThrough()
+    const stderr = new PassThrough()
+    const outData = jest.fn()
+    stdout.on('data', outData)
+    const errData = jest.fn()
+    stderr.on('data', errData)
     expect(
       await cli({
         filenames: ['test/assets/test1.txt', 'test/assets/test2.txt'],
         stdout,
         stderr
       })
-    ).toEqual(0);
-    expect(outData.mock.calls.length).toEqual(2);
+    ).toEqual(0)
+    expect(outData.mock.calls.length).toEqual(2)
     expect(outData.mock.calls[0][0].toString('utf8')).toEqual(
       'test/assets/test1.txt: 15 chars\n'
-    );
+    )
     expect(outData.mock.calls[1][0].toString('utf8')).toEqual(
       'test/assets/test2.txt: 17 chars\n'
-    );
-    expect(errData.mock.calls.length).toEqual(0);
-  });
+    )
+    expect(errData.mock.calls.length).toEqual(0)
+  })
   it('should return stderr with exitcode=1', async () => {
-    const stdout = new PassThrough();
-    const stderr = new PassThrough();
-    const outData = jest.fn();
-    stdout.on('data', outData);
-    const errData = jest.fn();
-    stderr.on('data', errData);
+    const stdout = new PassThrough()
+    const stderr = new PassThrough()
+    const outData = jest.fn()
+    stdout.on('data', outData)
+    const errData = jest.fn()
+    stderr.on('data', errData)
     expect(
       await cli({
         filenames: ['test/assets/test1.txt', 'test/assets/fail.txt'],
         stdout,
         stderr
       })
-    ).toEqual(1);
-    expect(outData.mock.calls.length).toEqual(1);
+    ).toEqual(1)
+    expect(outData.mock.calls.length).toEqual(1)
     expect(outData.mock.calls[0][0].toString('utf8')).toEqual(
       'test/assets/test1.txt: 15 chars\n'
-    );
-    expect(errData.mock.calls.length).toEqual(2);
+    )
+    expect(errData.mock.calls.length).toEqual(2)
     expect(errData.mock.calls[0][0].toString('utf8')).toEqual(
       "Error: ENOENT: no such file or directory, open 'test/assets/fail.txt'"
-    );
-    expect(errData.mock.calls[1][0].toString('utf8')).toEqual('\n');
-  });
-});
+    )
+    expect(errData.mock.calls[1][0].toString('utf8')).toEqual('\n')
+  })
+})

src/count.test.ts test/count.spec.tssrc/count.test.ts renamed to test/count.spec.ts

@@ -1,10 +1,10 @@
-import countChars from './count';
+import countChars from '../src/count'
 
 describe('countChars()', () => {
   it('should return count of content', async () => {
-    expect(await countChars('test/assets/test1.txt')).toEqual(15);
-  });
+    expect(await countChars('test/assets/test1.txt')).toEqual(15)
+  })
   it('should reject when file not found', async () => {
-    await expect(countChars('test/assets/fail.txt')).rejects.toThrow('ENOENT:');
-  });
-});
+    await expect(countChars('test/assets/fail.txt')).rejects.toThrow('ENOENT:')
+  })
+})