Bump version

- fix template parser regexp (Closes #15)

.gitignore

@@ -10,8 +10,8 @@ npm-debug.log*
 dist
 
 # Extracted strings
-template.json
+strings.json
-template.pot
+strings.pot
 
 # Dependency directory
 node_modules

README.md

@@ -50,6 +50,18 @@ If you want to use spaces instead, you can do the following:
 
 `ngx-translate-extract -i ./src -o ./src/i18n/en.json --format-indentation '  '`
 
+## Mark strings for extraction using a marker function
+If, for some reason, you want to extract strings not passed directly to TranslateService, you can wrap them in a custom marker function.
+
+```ts
+import { _ } from '@biesbjerg/ngx-translate-extract';
+
+_('Extract me');
+```
+
+Add the `marker` argument when running the extract script:
+
+`ngx-translate-extract ... -m _`
 
 Modify the scripts arguments as required.
 
@@ -70,6 +82,8 @@ Options:
   --output, -o                Paths where you would like to save extracted
                               strings. You can use path expansion, glob patterns
                               and multiple paths              [array] [required]
+  --marker, -m                Extract strings passed to a marker function
+                                                       [string] [default: false]
   --format, -f                Output format
           [string] [choices: "json", "namespaced-json", "pot"] [default: "json"]
   --format-indentation, --fi  Output format indentation [string] [default: "\t"]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@biesbjerg/ngx-translate-extract",
-  "version": "2.1.0",
+  "version": "2.2.5",
   "description": "Extract strings from projects using ngx-translate",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -58,8 +58,8 @@
     "chai": "3.5.0",
     "mocha": "3.2.0",
     "ts-node": "3.0.2",
-    "tslint": "4.5.1",
+    "tslint": "5.0.0",
-    "tslint-eslint-rules": "3.5.1",
+    "tslint-eslint-rules": "4.0.0",
     "typescript": "2.2.2"
   },
   "dependencies": {

src/cli/cli.ts

@@ -3,6 +3,7 @@ import { ParserInterface } from '../parsers/parser.interface';
 import { PipeParser } from '../parsers/pipe.parser';
 import { DirectiveParser } from '../parsers/directive.parser';
 import { ServiceParser } from '../parsers/service.parser';
+import { FunctionParser } from '../parsers/function.parser';
 import { CompilerInterface } from '../compilers/compiler.interface';
 import { CompilerFactory } from '../compilers/compiler.factory';
 
@@ -44,6 +45,12 @@ export const cli = yargs
 		normalize: true,
 		required: true
 	})
+	.option('marker', {
+		alias: 'm',
+		describe: 'Extract strings passed to a marker function',
+		default: false,
+		type: 'string'
+	})
 	.option('format', {
 		alias: 'f',
 		describe: 'Output format',
@@ -78,22 +85,28 @@ export const cli = yargs
 	.exitProcess(true)
 	.parse(process.argv);
 
-const parsers: ParserInterface[] = [
+const extract = new ExtractTask(cli.input, cli.output, {
-	new ServiceParser(),
-	new PipeParser(),
-	new DirectiveParser()
-];
-
-const compiler: CompilerInterface = CompilerFactory.create(cli.format, {
-	indentation: cli.formatIndentation
-});
-
-new ExtractTask(cli.input, cli.output, {
 	replace: cli.replace,
 	sort: cli.sort,
 	clean: cli.clean,
 	patterns: cli.patterns
-})
+});
-.setParsers(parsers)
+
-.setCompiler(compiler)
+const compiler: CompilerInterface = CompilerFactory.create(cli.format, {
-.execute();
+	indentation: cli.formatIndentation
+});
+extract.setCompiler(compiler);
+
+const parsers: ParserInterface[] = [
+	new PipeParser(),
+	new DirectiveParser(),
+	new ServiceParser()
+];
+if (cli.marker) {
+	parsers.push(new FunctionParser({
+		identifier: cli.marker
+	}));
+}
+extract.setParsers(parsers);
+
+extract.execute();

src/cli/tasks/extract.task.ts

@@ -41,11 +41,6 @@ export class ExtractTask implements TaskInterface {
 		}
 
 		const collection = this._extract();
-		if (collection.isEmpty()) {
-			this._out(chalk.yellow('Did not find any extractable strings\n'));
-			return;
-		}
-
 		this._out(chalk.green('Extracted %d strings\n'), collection.count());
 		this._save(collection);
 	}
@@ -109,7 +104,7 @@ export class ExtractTask implements TaskInterface {
 
 				if (this._options.clean) {
 					const collectionCount = processedCollection.count();
-					processedCollection = processedCollection.intersect(processedCollection);
+					processedCollection = processedCollection.intersect(collection);
 					const removeCount = collectionCount - processedCollection.count();
 					if (removeCount > 0) {
 						this._out(chalk.dim('- removed %d obsolete strings'), removeCount);

src/compilers/json.compiler.ts

@@ -1,6 +1,8 @@
 import { CompilerInterface } from './compiler.interface';
 import { TranslationCollection } from '../utils/translation.collection';
 
+import * as flat from 'flat';
+
 export class JsonCompiler implements CompilerInterface {
 
 	public indentation: string = '\t';
@@ -18,7 +20,15 @@ export class JsonCompiler implements CompilerInterface {
 	}
 
 	public parse(contents: string): TranslationCollection {
-		return new TranslationCollection(JSON.parse(contents));
+		let values: any = JSON.parse(contents);
+		if (this._isNamespacedJsonFormat(values)) {
+			values = flat.flatten(values);
+		}
+		return new TranslationCollection(values);
+	}
+
+	protected _isNamespacedJsonFormat(values: any): boolean {
+		return Object.keys(values).some(key => typeof values[key] === 'object');
 	}
 
 }

src/index.ts

@@ -1,5 +1,5 @@
 export * from './utils/translation.collection';
-export * from './utils/ast-utils';
+export * from './utils/utils';
 
 export * from './cli/cli';
 export * from './cli/tasks/task.interface';
@@ -7,9 +7,11 @@ export * from './cli/tasks/extract.task';
 
 export * from './parsers/parser.interface';
 export * from './parsers/abstract-template.parser';
+export * from './parsers/abstract-ast.parser';
 export * from './parsers/directive.parser';
 export * from './parsers/pipe.parser';
 export * from './parsers/service.parser';
+export * from './parsers/function.parser';
 
 export * from './compilers/compiler.interface';
 export * from './compilers/compiler.factory';

src/parsers/abstract-ast.parser.ts

@@ -0,0 +1,69 @@
+import * as ts from 'typescript';
+
+export abstract class AbstractAstParser {
+
+	protected _sourceFile: ts.SourceFile;
+
+	protected _createSourceFile(path: string, contents: string): ts.SourceFile {
+		return ts.createSourceFile(path, contents, null, /*setParentNodes */ false);
+	}
+
+	/**
+	 * Get strings from function call's first argument
+	 */
+	protected _getCallArgStrings(callNode: ts.CallExpression): string[] {
+		if (!callNode.arguments.length) {
+			return;
+		}
+
+		const firstArg = callNode.arguments[0];
+		switch (firstArg.kind) {
+			case ts.SyntaxKind.StringLiteral:
+			case ts.SyntaxKind.FirstTemplateToken:
+				return [(firstArg as ts.StringLiteral).text];
+			case ts.SyntaxKind.ArrayLiteralExpression:
+				return (firstArg as ts.ArrayLiteralExpression).elements
+					.map((element: ts.StringLiteral) => element.text);
+			case ts.SyntaxKind.Identifier:
+				console.log('WARNING: We cannot extract variable values passed to TranslateService (yet)');
+				break;
+			default:
+				console.log(`SKIP: Unknown argument type: '${this._syntaxKindToName(firstArg.kind)}'`, firstArg);
+		}
+	}
+
+	/**
+	 * Find all child nodes of a kind
+	 */
+	protected _findNodes(node: ts.Node, kind: ts.SyntaxKind, onlyOne: boolean = false): ts.Node[] {
+		if (node.kind === kind && onlyOne) {
+			return [node];
+		}
+
+		const childrenNodes: ts.Node[] = node.getChildren(this._sourceFile);
+		const initialValue: ts.Node[] = node.kind === kind ? [node] : [];
+
+		return childrenNodes.reduce((result: ts.Node[], childNode: ts.Node) => {
+			return result.concat(this._findNodes(childNode, kind));
+		}, initialValue);
+	}
+
+	protected _syntaxKindToName(kind: ts.SyntaxKind): string {
+		return ts.SyntaxKind[kind];
+	}
+
+	protected _printAllChildren(sourceFile: ts.SourceFile, node: ts.Node, depth = 0): void {
+		console.log(
+			new Array(depth + 1).join('----'),
+			`[${node.kind}]`,
+			this._syntaxKindToName(node.kind),
+			`[pos: ${node.pos}-${node.end}]`,
+			':\t\t\t',
+			node.getFullText(sourceFile).trim()
+		);
+
+		depth++;
+		node.getChildren(sourceFile).forEach(childNode => this._printAllChildren(sourceFile, childNode, depth));
+	}
+
+}

src/parsers/function.parser.ts

@@ -0,0 +1,61 @@
+import { ParserInterface } from './parser.interface';
+import { AbstractAstParser } from './abstract-ast.parser';
+import { TranslationCollection } from '../utils/translation.collection';
+
+import * as ts from 'typescript';
+
+export class FunctionParser extends AbstractAstParser implements ParserInterface {
+
+	protected _functionIdentifier: string = '_';
+
+	public constructor(options?: any) {
+		super();
+		if (options && typeof options.identifier !== 'undefined') {
+			this._functionIdentifier = options.identifier;
+		}
+	}
+
+	public extract(contents: string, path?: string): TranslationCollection {
+		let collection: TranslationCollection = new TranslationCollection();
+
+		this._sourceFile = this._createSourceFile(path, contents);
+
+		const callNodes = this._findCallNodes();
+		callNodes.forEach(callNode => {
+			const keys: string[] = this._getCallArgStrings(callNode);
+			if (keys && keys.length) {
+				collection = collection.addKeys(keys);
+			}
+		});
+
+		return collection;
+	}
+
+	/**
+	 * Find all calls to marker function
+	 */
+	protected _findCallNodes(node?: ts.Node): ts.CallExpression[] {
+		if (!node) {
+			node = this._sourceFile;
+		}
+
+		let callNodes = this._findNodes(node, ts.SyntaxKind.CallExpression) as ts.CallExpression[];
+		callNodes = callNodes
+			.filter(callNode => {
+				// Only call expressions with arguments
+				if (callNode.arguments.length < 1) {
+					return false;
+				}
+
+				const identifier = (callNode.getChildAt(0) as ts.Identifier).text;
+				if (identifier !== this._functionIdentifier) {
+					return false;
+				}
+
+				return true;
+			});
+
+		return callNodes;
+	}
+
+}

src/parsers/pipe.parser.ts

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

src/parsers/service.parser.ts

@@ -1,10 +1,10 @@
 import { ParserInterface } from './parser.interface';
+import { AbstractAstParser } from './abstract-ast.parser';
 import { TranslationCollection } from '../utils/translation.collection';
-import { syntaxKindToName } from '../utils/ast-utils';
 
 import * as ts from 'typescript';
 
-export class ServiceParser implements ParserInterface {
+export class ServiceParser extends AbstractAstParser implements ParserInterface {
 
 	protected _sourceFile: ts.SourceFile;
 
@@ -33,10 +33,6 @@ export class ServiceParser implements ParserInterface {
 		return collection;
 	}
 
-	protected _createSourceFile(path: string, contents: string): ts.SourceFile {
-		return ts.createSourceFile(path, contents, null, /*setParentNodes */ false);
-	}
-
 	/**
 	 * Detect what the TranslateService instance property
 	 * is called by inspecting constructor params
@@ -53,6 +49,11 @@ export class ServiceParser implements ParserInterface {
 				return false;
 			}
 
+			// Parameter has no type
+			if (!parameter.type) {
+				return false;
+			}
+
 			// Make sure className is of the correct type
 			const parameterType: ts.Identifier = (parameter.type as ts.TypeReferenceNode).typeName as ts.Identifier;
 			if (!parameterType) {
@@ -91,10 +92,12 @@ export class ServiceParser implements ParserInterface {
 
 		let callNodes = this._findNodes(node, ts.SyntaxKind.CallExpression) as ts.CallExpression[];
 		callNodes = callNodes
-			// Only call expressions with arguments
-			.filter(callNode => callNode.arguments.length > 0)
-			// More filters
 			.filter(callNode => {
+				// Only call expressions with arguments
+				if (callNode.arguments.length < 1) {
+					return false;
+				}
+
 				const propAccess = callNode.getChildAt(0).getChildAt(0) as ts.PropertyAccessExpression;
 				if (!propAccess || propAccess.kind !== ts.SyntaxKind.PropertyAccessExpression) {
 					return false;
@@ -120,44 +123,4 @@ export class ServiceParser implements ParserInterface {
 		return callNodes;
 	}
 
-	/**
-	 * Get strings from function call's first argument
-	 */
-	protected _getCallArgStrings(callNode: ts.CallExpression): string[] {
-		if (!callNode.arguments.length) {
-			return;
-		}
-
-		const firstArg = callNode.arguments[0];
-		switch (firstArg.kind) {
-			case ts.SyntaxKind.StringLiteral:
-			case ts.SyntaxKind.FirstTemplateToken:
-				return [(firstArg as ts.StringLiteral).text];
-			case ts.SyntaxKind.ArrayLiteralExpression:
-				return (firstArg as ts.ArrayLiteralExpression).elements
-					.map((element: ts.StringLiteral) => element.text);
-			case ts.SyntaxKind.Identifier:
-				console.log('WARNING: We cannot extract variable values passed to TranslateService (yet)');
-				break;
-			default:
-				console.log(`SKIP: Unknown argument type: '${syntaxKindToName(firstArg.kind)}'`, firstArg);
-		}
-	}
-
-	/**
-	 * Find all child nodes of a kind
-	 */
-	protected _findNodes(node: ts.Node, kind: ts.SyntaxKind, onlyOne: boolean = false): ts.Node[] {
-		if (node.kind === kind && onlyOne) {
-			return [node];
-		}
-
-		const childrenNodes: ts.Node[] = node.getChildren(this._sourceFile);
-		const initialValue: ts.Node[] = node.kind === kind ? [node] : [];
-
-		return childrenNodes.reduce((result: ts.Node[], childNode: ts.Node) => {
-			return result.concat(this._findNodes(childNode, kind));
-		}, initialValue);
-	}
-
 }

src/utils/ast-utils.ts

@@ -1,19 +0,0 @@
-import * as ts from 'typescript';
-
-export function printAllChildren(sourceFile: ts.SourceFile, node: ts.Node, depth = 0) {
-	console.log(
-		new Array(depth + 1).join('----'),
-		`[${node.kind}]`,
-		syntaxKindToName(node.kind),
-		`[pos: ${node.pos}-${node.end}]`,
-		':\t\t\t',
-		node.getFullText(sourceFile).trim()
-	);
-
-	depth++;
-	node.getChildren(sourceFile).forEach(childNode => printAllChildren(sourceFile, childNode, depth));
-}
-
-export function syntaxKindToName(kind: ts.SyntaxKind) {
-	return ts.SyntaxKind[kind];
-}

src/utils/translation.collection.ts

@@ -1,6 +1,6 @@
 export interface TranslationType {
 	[key: string]: string
-};
+}
 
 export class TranslationCollection {
 

src/utils/utils.ts

@@ -0,0 +1,3 @@
+export function _(key: string | string[]): string | string[] {
+	return key;
+}

tests/parsers/function.parser.spec.ts

@@ -0,0 +1,27 @@
+import { expect } from 'chai';
+
+import { FunctionParser } from '../../src/parsers/function.parser';
+
+describe('FunctionParser', () => {
+
+	const componentFilename: string = 'test.component.ts';
+
+	let parser: FunctionParser;
+
+	beforeEach(() => {
+		parser = new FunctionParser();
+	});
+
+
+	it('should extract strings using marker function', () => {
+		const contents = `
+			import { _ } from '@biesbjerg/ngx-translate-extract';
+			_('Hello world');
+			_(['I', 'am', 'extracted']);
+			otherFunction('But I am not');
+		`;
+		const keys = parser.extract(contents, componentFilename).keys();
+		expect(keys).to.deep.equal(['Hello world', 'I', 'am', 'extracted']);
+	});
+
+});

tests/parsers/pipe.parser.spec.ts

@@ -18,6 +18,12 @@ describe('PipeParser', () => {
 		expect(keys).to.deep.equal(['SomeKey_NotWorking']);
 	});
 
+	it('should extract string using pipe, but between quotes only', () => {
+		const contents = `<input class="form-control" type="text" placeholder="{{'user.settings.form.phone.placeholder' | translate}}" [formControl]="settingsForm.controls['phone']">`;
+		const keys = parser.extract(contents, templateFilename).keys();
+		expect(keys).to.deep.equal(['user.settings.form.phone.placeholder']);
+	});
+
 	it('should extract interpolated strings using translate pipe', () => {
 		const contents = `Hello {{ 'World' | translate }}`;
 		const keys = parser.extract(contents, templateFilename).keys();
@@ -25,7 +31,7 @@ describe('PipeParser', () => {
 	});
 
 	it('should extract strings with escaped quotes', () => {
-		const contents = `Hello {{ 'World\'s largest potato' | translate }}`;
+		const contents = `Hello {{ 'World\\'s largest potato' | translate }}`;
 		const keys = parser.extract(contents, templateFilename).keys();
 		expect(keys).to.deep.equal([`World's largest potato`]);
 	});

tests/parsers/service.parser.spec.ts

@@ -151,4 +151,17 @@ describe('ServiceParser', () => {
 		expect(keys).to.deep.equal(['You are expected at {{time}}']);
 	});
 
+	it('should not crash when constructor parameter has no type', () => {
+		const contents = `
+			@Component({ })
+			export class AppComponent {
+				public constructor(protected _translateService) { }
+				public test() {
+					this._translateService.instant('Hello World');
+				}
+		`;
+		const keys = parser.extract(contents, componentFilename).keys();
+		expect(keys).to.deep.equal([]);
+	});
+
 });