feat(comments): add comments support to CLI tool

RyuuGan · Jan 5, 2020 · 3f4ad12 · 3f4ad12
1 parent 776d053
commit 3f4ad12
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/bin/sol-merger.ts b/bin/sol-merger.ts
@@ -8,13 +8,16 @@ import Debug from 'debug';
 import { Merger } from '../lib/merger';
 import { done } from '../utils/done';
 import program from 'commander';
+import { version } from '../package.json';
 
 const debug = Debug('sol-merger:debug');
 
 let inputGlob: string, outputDir: string, append: string;
 
 program
+  .version(`v${version}`, '-v, --version')
   .option('-a, --append [append]', '', /^([a-zA-Z_]+)$/)
+  .option('-c, --with-comments', `Doesn't remove comment from exports`, false)
   .arguments('<glob> [outputDir]')
   .action((_glob, _outputDir) => {
     inputGlob = _glob;
@@ -36,7 +39,8 @@ if (outputDir) {
     : path.join(process.cwd(), outputDir);
 }
 
-debug(outputDir);
+debug('Output directory', outputDir);
+debug('With comments?', program.withComments);
 
 glob(
   inputGlob,
@@ -60,7 +64,7 @@ async function execute(err: Error, files: string[]) {
   }
 
   const promises = files.map(async (file) => {
-    const merger = new Merger({ delimeter: '\n\n' });
+    const merger = new Merger({ delimeter: '\n\n', removeComments: !program.withComments });
     let result: string;
     result = await merger.processFile(file, true);
     let outputFile: string;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
   "license": "BSD-2-Clause",
   "dependencies": {
     "cli-color": "^1.4.0",
-    "commander": "^2.19.0",
+    "commander": "^4.0.1",
     "debug": "^4.1.1",
     "fs-extra": "^8.0.1",
     "glob": "^7.1.2",

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "compileOnSave": false,
   "compilerOptions": {
+    "resolveJsonModule": true,
     "sourceMap": true,
     "declaration": true,
     "outDir": "dist",