unistack-org/ngx-translate-extract
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kim Biesbjerg
2016-12-13 15:17:03 +01:00
parent ca8b122295
commit 8093370e94
9 changed files with 64 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/parsers/abstract-template.parser.ts
View File

@@ -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];
}

2
src/parsers/pipe.parser.ts
View File

@@ -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)) {

4
src/parsers/service.parser.ts
View File

@@ -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]));