Bump version

* feat(cli): add verbose (vb) flag that can control output of all file paths to console

* docs(README): add -vb description

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Kim Biesbjerg
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -93,3 +93,5 @@ Options:
                                                       [boolean] [default: false]
   --clean, -c                 Remove obsolete strings when merging
                                                       [boolean] [default: false]
+  --verbose, -vb              If true, prints all processed file paths to console
+                                                      [boolean] [default: true]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@biesbjerg/ngx-translate-extract",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "Extract strings from projects using ngx-translate",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -59,8 +59,7 @@
     "mocha": "3.4.2",
     "ts-node": "3.1.0",
     "tslint": "5.4.3",
-    "tslint-eslint-rules": "4.1.1",
-    "typescript": "2.4.1"
+    "tslint-eslint-rules": "4.1.1"
   },
   "dependencies": {
     "chalk": "2.0.1",
@@ -71,6 +70,7 @@
     "glob": "7.1.2",
     "path": "0.12.7",
     "mkdirp": "0.5.1",
-    "flat": "2.0.1"
+    "flat": "2.0.1",
+    "typescript": "2.4.1"
   }
 }

src/cli/cli.ts

@@ -82,6 +82,12 @@ export const cli = yargs
 		default: false,
 		type: 'boolean'
 	})
+	.option('verbose', {
+		alias: 'vb',
+		describe: 'Log all output to console',
+		default: true,
+		type: 'boolean'
+	})
 	.exitProcess(true)
 	.parse(process.argv);
 

src/cli/tasks/extract.task.ts

@@ -14,6 +14,7 @@ export interface ExtractTaskOptionsInterface {
 	sort?: boolean;
 	clean?: boolean;
 	patterns?: string[];
+	verbose?: boolean;
 }
 
 export class ExtractTask implements TaskInterface {
@@ -22,7 +23,8 @@ export class ExtractTask implements TaskInterface {
 		replace: false,
 		sort: false,
 		clean: false,
-		patterns: []
+		patterns: [],
+		verbose: true
 	};
 
 	protected _parsers: ParserInterface[] = [];
@@ -64,7 +66,7 @@ export class ExtractTask implements TaskInterface {
 		let collection: TranslationCollection = new TranslationCollection();
 		this._input.forEach(dir => {
 			this._readDir(dir, this._options.patterns).forEach(path => {
-				this._out(chalk.gray('- %s'), path);
+				this._options.verbose && this._out(chalk.gray('- %s'), path);
 				const contents: string = fs.readFileSync(path, 'utf-8');
 				this._parsers.forEach((parser: ParserInterface) => {
 					collection = collection.union(parser.extract(contents, path));

src/parsers/directive.parser.ts

@@ -2,7 +2,9 @@ import { ParserInterface } from './parser.interface';
 import { AbstractTemplateParser } from './abstract-template.parser';
 import { TranslationCollection } from '../utils/translation.collection';
 
-import * as $ from 'cheerio';
+import * as cheerio from 'cheerio';
+
+const $ = cheerio.load('', {xmlMode: true});
 
 export class DirectiveParser extends AbstractTemplateParser implements ParserInterface {
 

tests/parsers/directive.parser.spec.ts

@@ -118,4 +118,10 @@ describe('DirectiveParser', () => {
 		expect(template).to.equal('<p translate="KEY">Hello World</p>');
 	});
 
+	it('should extract contents from within custom tags', () => {
+		const contents = `<custom-table><tbody><tr><td translate>Hello World</td></tr></tbody></custom-table>`;
+		const keys = parser.extract(contents, templateFilename).keys();
+		expect(keys).to.deep.equal(['Hello World']);
+	});
+
 });