Add tests and allow more liberal spacing with get/instant calls

src/cli/extract.ts

@@ -21,7 +21,7 @@ const options = cli.parse({
 
 [options.dir, options.output].forEach(dir => {
 	if (!fs.existsSync(dir)) {
-		cli.fatal('The directory path you supplied was not found: ' + dir);
+		cli.fatal(`The directory path you supplied was not found: '${dir}'`);
 	}
 });
 
@@ -39,17 +39,12 @@ const patterns: string[] = [
 	'/**/*.js'
 ];
 
-const extractor: Extractor = new Extractor(parsers, patterns);
-
 try {
+	const extractor: Extractor = new Extractor(parsers, patterns);
 	cli.info(`Extracting strings from '${options.dir}'`);
 	const extracted: TranslationCollection = extractor.process(options.dir);
 	cli.ok(`* Extracted ${extracted.count()} strings`);
 
-	if (extracted.isEmpty()) {
-		process.exit();
-	}
-
 	let collection: TranslationCollection = extracted;
 
 	let compiler = new JsonCompiler();
@@ -60,8 +55,10 @@ try {
 	if (!options.replace && fs.existsSync(dest)) {
 		const existing: TranslationCollection = compiler.parse(fs.readFileSync(dest, 'utf-8'));
 
+		if (existing.count() > 0) {
 			collection = extracted.union(existing);
 			cli.ok(`* Merged ${existing.count()} existing strings`);
+		}
 
 		if (options.clean) {
 			const collectionCount = collection.count();

src/parsers/abstract-template.parser.ts

@@ -12,7 +12,7 @@ export abstract class AbstractTemplateParser {
 	 * Extracts inline template from components
 	 */
 	protected _extractInlineTemplate(contents: string): string {
-		const match = new RegExp(/template\s*:\s*(["'`])((.|[\r\n])+?[^\\])\1/).exec(contents);
+		const match = new RegExp(/template\s*:\s*(["'`])([^\1]*?)\1/).exec(contents);
 		if (match !== null) {
 			return match[2];
 		}

src/parsers/pipe.parser.ts

@@ -15,7 +15,7 @@ export class PipeParser extends AbstractTemplateParser implements ParserInterfac
 	protected _parseTemplate(template: string): TranslationCollection {
 		let collection: TranslationCollection = new TranslationCollection();
 
-		const regExp = new RegExp(/(['"`])([^\1\r\n]*)\1\s*\|\s*translate(:.*?)?/, 'g');
+		const regExp = new RegExp(/(['"`])([^\1]*)\1\s*\|\s*translate/, 'g');
 
 		let matches: RegExpExecArray;
 		while (matches = regExp.exec(template)) {

src/parsers/service.parser.ts

@@ -11,10 +11,10 @@ export class ServiceParser implements ParserInterface {
 			return collection;
 		}
 
-		const methodRegExp: RegExp = new RegExp(/(?:get|instant)\s*\(\s*(\[?(['"`])([^\1\r\n]+)\2\]?)/);
+		const methodRegExp: RegExp = new RegExp(/(?:get|instant)\s*\(\s*(\[?\s*(['"`])([^\1\r\n]*)\2\s*\]?)/);
 		const regExp: RegExp = new RegExp(`${translateServiceVar}\.${methodRegExp.source}`, 'g');
 
-		let matches;
+		let matches: RegExpExecArray;
 		while (matches = regExp.exec(contents)) {
 			if (this._stringContainsArray(matches[1])) {
 				collection = collection.addKeys(this._stringToArray(matches[1]));

tests/parsers/abstract-template.parser.spec.ts

@@ -41,6 +41,12 @@ describe('AbstractTemplateParser', () => {
 		expect(result).to.equal(false);
 	});
 
+	it('should normalize bound attributes', () => {
+		const contents = `<p [translate]="'KEY'">Hello World</p>`;
+		const template = parser.normalizeTemplateAttributes(contents);
+		expect(template).to.equal('<p translate="KEY">Hello World</p>');
+	});
+
 	it('should extract inline template', () => {
 		const contents = `
 			@Component({
@@ -53,10 +59,25 @@ describe('AbstractTemplateParser', () => {
 		expect(template).to.equal('<p translate>Hello World</p>');
 	});
 
-	it('should normalize bound attributes', () => {
+	it('should extract inline template spanning multiple lines', () => {
-		const contents = `<p [translate]="'KEY'">Hello World</p>`;
+		const contents = `
-		const template = parser.normalizeTemplateAttributes(contents);
+			@Component({
-		expect(template).to.equal('<p translate="KEY">Hello World</p>');
+				selector: 'test',
+				template: '
+					<p>
+						Hello World
+					</p>
+				',
+				styles: ['
+					p {
+						color: red;
+					}
+				']
+			})
+			export class TestComponent { }
+		`;
+		const template = parser.extractInlineTemplate(contents);
+		expect(template).to.equal('\n\t\t\t\t\t<p>\n\t\t\t\t\t\tHello World\n\t\t\t\t\t</p>\n\t\t\t\t');
 	});
 
 });

tests/parsers/pipe.parser.spec.ts

@@ -18,6 +18,12 @@ describe('PipeParser', () => {
 		expect(keys).to.deep.equal(['World']);
 	});
 
+	it('should extract strings with escaped quotes', () => {
+		const contents = `Hello {{ 'World\'s largest potato' | translate }}`;
+		const keys = parser.extract(contents, templateFilename).keys();
+		expect(keys).to.deep.equal([`World's largest potato`]);
+	});
+
 	it('should extract interpolated strings using translate pipe in attributes', () => {
 		const contents = `<span attr="{{ 'Hello World' | translate }}"></span>`;
 		const keys = parser.extract(contents, templateFilename).keys();

tests/parsers/service.parser.spec.ts

@@ -103,4 +103,24 @@ describe('ServiceParser', () => {
 		expect(keys).to.deep.equal([]);
 	});
 
+	it('should extract strings with liberal spacing', () => {
+		const contents = `
+			@Component({ })
+			export class AppComponent {
+				public constructor(
+					protected _translateService: TranslateService,
+					protected _otherService: OtherService
+				) { }
+				public test() {
+					this._translateService.instant('Hello');
+					this._translateService.get ( 'World' );
+					this._translateService.instant ( ['How'] );
+					this._translateService.get([ 'Are' ]);
+					this._translateService.get([ 'You' , 'Today' ]);
+				}
+		`;
+		const keys = parser.extract(contents, componentFilename).keys();
+		expect(keys).to.deep.equal(['Hello', 'World', 'How', 'Are', 'You', 'Today']);
+	});
+
 });