Fix namespaced-json compiler not preserving numeric values. Fixes #28

- Remove regexp ServiceParser and make AstServiceParser the default. #23
- Replaced CLI parser to add support for multiple input/output paths (supports file expansion, glob patterns and multiple values/parameters) #7

README.md

@@ -1,37 +1,67 @@
-# ng2-translate-extract
-Extract translatable (ng2-translate) strings and save as a JSON or Gettext pot file.
+If you like this project please show your support with a GitHub star. Much appreciated!
+
+# ngx-translate-extract
+Extract translatable (ngx-translate) strings and save as a JSON or Gettext pot file.
 Merges with existing strings if the output file already exists.
 
 ## Usage
 Install the package in your project:
 
-`npm install @biesbjerg/ng2-translate-extract --save-dev`
+`npm install @biesbjerg/ngx-translate-extract --save-dev`
 
 Add an `extract` script to your project's `package.json`:
 ```
 "scripts": {
-  "extract": "ng2-translate-extract --dir ./src --output ./ --format=json --clean"
+  "extract": "ngx-translate-extract --input ./src --output ./src/assets/i18n/*.json --clean --sort --format namespaced-json"
 }
 ```
-You can now run `npm run extract` to extract strings from your project's `src` dir. The extracted strings are saved in `JSON`-format in your project's root.
+You can now run `npm run extract` to extract strings.
+
+## Commandline examples
+
+**Extract from dir and save to file**
+
+`ngx-translate-extract -i ./src -o ./src/i18n/strings.json`
+
+**Extract from multiple dirs**
+
+`ngx-translate-extract -i ./src/folder-a ./src/folder-b -o ./src/i18n/strings.json`
+
+**Extract and save to multiple files**
+
+`ngx-translate-extract -i ./src -o ./src/i18n/{da,en,fr}.json`
+
+**or**
+
+`ngx-translate-extract -i ./src -o ./src/i18n/da.json ./src/i18n/en.json ./src/i18n/fr.json`
+
+**or (update only)**
+
+`ngx-translate-extract -i ./src -o ./src/i18n/*.json`
+
 
 Modify the scripts arguments as required.
 
 ## Commandline arguments
 ```
 Usage:
-  ng2-translate-extract [OPTIONS] [ARGS]
+ngx-translate-extract [options]
 
 Options:
-  -d, --dir [DIR]        Directory path you would like to extract strings from  (Default is current directory)
-  -o, --output [DIR]     Directory path you would like to save extracted
-                         strings  (Default is current directory/template.json)
-  -f, --format [VALUE]   Output format. VALUE must be either
-                         [json|namespaced-json|pot]  (Default is json)
-  -r, --replace BOOLEAN  Replace the contents of output file if it exists
-                         (Merges by default)
-  -s, --sort BOOLEAN     Sort translations in the output file in alphabetical
-                         order
-  -c, --clean BOOLEAN    Remove obsolete strings when merging
-  -h, --help             Display help and usage details
-```
+  --version, -v   Show version number                                  [boolean]
+  --help, -h      Show help                                            [boolean]
+  --input, -i     Paths you would like to extract strings from. You can use path
+                  expansion, glob patterns and multiple paths
+                     [array] [default: "/Users/kim/ionic/ngx-translate-extract"]
+  --patterns, -p  Extract strings from the following file patterns
+                                    [array] [default: ["/**/*.html","/**/*.ts"]]
+  --output, -o    Paths where you would like to save extracted strings. You can
+                  use path expansion, glob patterns and multiple paths
+                                                              [array] [required]
+  --format, -f    Output format
+          [string] [choices: "json", "namespaced-json", "pot"] [default: "json"]
+  --replace, -r   Replace the contents of output file if it exists (Merges by
+                  default)                            [boolean] [default: false]
+  --sort, -s      Sort strings in alphabetical order when saving
+                                                      [boolean] [default: false]
+  --clean, -c     Remove obsolete strings when merging[boolean] [default: false]

bin/cli.js

@@ -0,0 +1,3 @@
+#! /usr/bin/env node
+
+require('../dist/cli/cli');

bin/extract.js

@@ -1,3 +0,0 @@
-#! /usr/bin/env node
-
-require('../dist/cli/extract');

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "@biesbjerg/ng2-translate-extract",
-  "version": "0.6.0",
-  "description": "Extract strings from projects using ng2-translate",
+  "name": "@biesbjerg/ngx-translate-extract",
+  "version": "2.0.1",
+  "description": "Extract strings from projects using ngx-translate",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -9,7 +9,7 @@
     "dist/"
   ],
   "bin": {
-    "ng2-translate-extract": "bin/extract.js"
+    "ngx-translate-extract": "bin/cli.js"
   },
   "scripts": {
     "build": "npm run clean && tsc",
@@ -20,47 +20,57 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/biesbjerg/ng2-translate-extract.git"
+    "url": "https://github.com/biesbjerg/ngx-translate-extract.git"
   },
   "keywords": [
+    "angular",
     "angular2",
     "ionic",
     "ionic2",
     "ng2-translate",
+    "ngx-translate",
     "extract",
+    "extractor",
     "translate",
+    "translation",
     "i18n",
     "gettext"
   ],
   "author": "Kim Biesbjerg <kim@biesbjerg.com>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/biesbjerg/ng2-translate-extract/issues"
+    "url": "https://github.com/biesbjerg/ngx-translate-extract/issues"
   },
-  "homepage": "https://github.com/biesbjerg/ng2-translate-extract",
+  "homepage": "https://github.com/biesbjerg/ngx-translate-extract",
   "engines": {
     "node": ">=4.3.2"
   },
   "config": {},
   "devDependencies": {
-    "@types/chai": "3.4.34",
-    "@types/cheerio": "0.17.31",
+    "@types/chai": "3.4.35",
     "@types/glob": "5.0.30",
-    "@types/mocha": "2.2.34",
+    "@types/mocha": "2.2.40",
+    "@types/cheerio": "0.22.0",
+    "@types/chalk": "0.4.31",
+    "@types/flat": "0.0.28",
+    "@types/yargs": "6.6.0",
+    "@types/mkdirp": "0.3.29",
     "chai": "3.5.0",
     "mocha": "3.2.0",
-    "ts-node": "1.7.2",
-    "tslint": "4.1.1",
-    "tslint-eslint-rules": "3.2.0",
-    "typescript": "2.0.10"
+    "ts-node": "2.1.0",
+    "tslint": "4.5.1",
+    "tslint-eslint-rules": "3.5.1",
+    "typescript": "2.2.1"
   },
   "dependencies": {
+    "chalk": "1.1.3",
+    "yargs": "7.0.2",
     "cheerio": "0.22.0",
-    "cli": "1.0.1",
     "fs": "0.0.1-security",
-    "gettext-parser": "1.2.1",
+    "gettext-parser": "1.2.2",
     "glob": "7.1.1",
     "path": "0.12.7",
+    "mkdirp": "0.5.1",
     "flat": "2.0.1"
   }
 }

src/cli/cli.ts

@@ -0,0 +1,87 @@
+import { ExtractTask } from './tasks/extract.task';
+import { PipeParser } from '../parsers/pipe.parser';
+import { DirectiveParser } from '../parsers/directive.parser';
+import { ServiceParser } from '../parsers/service.parser';
+
+import * as fs from 'fs';
+import * as yargs from 'yargs';
+
+export const cli = yargs
+	.usage('Extract strings from files for translation.\nUsage: $0 [options]')
+	.version(require(__dirname + '/../../package.json').version)
+	.alias('version', 'v')
+	.help('help')
+	.alias('help', 'h')
+	.option('input', {
+		alias: 'i',
+		describe: 'Paths you would like to extract strings from. You can use path expansion, glob patterns and multiple paths',
+		default: process.env.PWD,
+		type: 'array',
+		normalize: true
+	})
+	.check(options => {
+		options.input.forEach((dir: string) => {
+			if (!fs.existsSync(dir) || !fs.statSync(dir).isDirectory()) {
+				throw new Error(`The path you supplied was not found: '${dir}'`)
+			}
+
+		});
+		return true;
+	})
+	.option('patterns', {
+		alias: 'p',
+		describe: 'Extract strings from the following file patterns',
+		type: 'array',
+		default: ['/**/*.html', '/**/*.ts']
+	})
+	.option('output', {
+		alias: 'o',
+		describe: 'Paths where you would like to save extracted strings. You can use path expansion, glob patterns and multiple paths',
+		type: 'array',
+		normalize: true,
+		required: true
+	})
+	.option('format', {
+		alias: 'f',
+		describe: 'Output format',
+		default: 'json',
+		type: 'string',
+		choices: ['json', 'namespaced-json', 'pot']
+	})
+	.option('replace', {
+		alias: 'r',
+		describe: 'Replace the contents of output file if it exists (Merges by default)',
+		default: false,
+		type: 'boolean'
+	})
+	.option('sort', {
+		alias: 's',
+		describe: 'Sort strings in alphabetical order when saving',
+		default: false,
+		type: 'boolean'
+	})
+	.option('clean', {
+		alias: 'c',
+		describe: 'Remove obsolete strings when merging',
+		default: false,
+		type: 'boolean'
+	})
+	.exitProcess(true)
+	.parse(process.argv);
+
+const extractTask = new ExtractTask(cli.input, cli.output, {
+	replace: cli.replace,
+	sort: cli.sort,
+	clean: cli.clean,
+	patterns: cli.patterns
+});
+
+extractTask
+	.setParsers([
+		new ServiceParser(),
+		new PipeParser(),
+		new DirectiveParser()
+	])
+	.setCompiler(cli.format)
+	.execute();
+

src/cli/extract.ts

@@ -1,105 +0,0 @@
-import { Extractor } from '../utils/extractor';
-import { TranslationCollection } from '../utils/translation.collection';
-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 { AstServiceParser } from '../parsers/ast-service.parser';
-import { CompilerInterface } from '../compilers/compiler.interface';
-import { JsonCompiler } from '../compilers/json.compiler';
-import { NamespacedJsonCompiler } from '../compilers/namespaced-json.compiler';
-import { PoCompiler } from '../compilers/po.compiler';
-
-import * as fs from 'fs';
-import * as path from 'path';
-import * as cli from 'cli';
-
-const options = cli.parse({
-	dir: ['d', 'Path you would like to extract strings from', 'dir', process.env.PWD],
-	output: ['o', 'Path you would like to save extracted strings to', 'dir', process.env.PWD],
-	format: ['f', 'Output format', ['json', 'namespaced-json', 'pot'], 'json'],
-	replace: ['r', 'Replace the contents of output file if it exists (Merges by default)', 'boolean', false],
-	sort: ['s', 'Sort translations in the output file in alphabetical order', 'boolean', false],
-	clean: ['c', 'Remove obsolete strings when merging', 'boolean', false],
-	experimental: ['e', 'Use experimental AST Service Parser', 'boolean', false]
-});
-
-const patterns: string[] = [
-	'/**/*.html',
-	'/**/*.ts'
-];
-const parsers: ParserInterface[] = [
-	new PipeParser(),
-	new DirectiveParser(),
-	options.experimental ? new AstServiceParser() : new ServiceParser()
-];
-
-let compiler: CompilerInterface;
-let ext: string;
-switch (options.format) {
-	case 'pot':
-		compiler = new PoCompiler();
-		ext = 'pot';
-		break;
-	case 'json':
-		compiler = new JsonCompiler();
-		ext = 'json';
-		break;
-	case 'namespaced-json':
-		compiler = new NamespacedJsonCompiler();
-		ext = 'json';
-		break;
-}
-
-const normalizedDir: string = path.resolve(options.dir);
-const normalizedOutput: string = path.resolve(options.output);
-
-let outputDir: string = normalizedOutput;
-let outputFilename: string = `template.${ext}`;
-if (!fs.existsSync(normalizedOutput) || !fs.statSync(normalizedOutput).isDirectory()) {
-	outputDir = path.dirname(normalizedOutput);
-	outputFilename = path.basename(normalizedOutput);
-}
-const outputPath: string = path.join(outputDir, outputFilename);
-
-[normalizedDir, outputDir].forEach(dir => {
-	if (!fs.existsSync(dir) || !fs.statSync(dir).isDirectory()) {
-		cli.fatal(`The path you supplied was not found: '${dir}'`);
-	}
-});
-
-try {
-	const extractor: Extractor = new Extractor(parsers, patterns);
-	cli.info(`Extracting strings from '${normalizedDir}'`);
-
-	const extracted: TranslationCollection = extractor.process(normalizedDir);
-	cli.ok(`* Extracted ${extracted.count()} strings`);
-
-	let collection: TranslationCollection = extracted;
-
-	if (!options.replace && fs.existsSync(outputPath)) {
-		const existing: TranslationCollection = compiler.parse(fs.readFileSync(outputPath, 'utf-8'));
-		if (existing.count() > 0) {
-			collection = extracted.union(existing);
-			cli.ok(`* Merged with ${existing.count()} existing strings`);
-		}
-
-		if (options.clean) {
-			const collectionCount = collection.count();
-			collection = collection.intersect(extracted);
-			const removeCount = collectionCount - collection.count();
-			if (removeCount > 0) {
-				cli.ok(`* Removed ${removeCount} obsolete strings`);
-			}
-		}
-	}
-
-	if (options.sort) {
-		collection = collection.sort();
-	}
-
-	fs.writeFileSync(outputPath, compiler.compile(collection));
-	cli.ok(`* Saved to '${outputPath}'`);
-} catch (e) {
-	cli.fatal(e.toString());
-}

src/cli/tasks/extract.task.ts

@@ -0,0 +1,156 @@
+import { TranslationCollection } from '../../utils/translation.collection';
+import { TaskInterface } from './task.interface';
+import { ParserInterface } from '../../parsers/parser.interface';
+import { CompilerInterface } from '../../compilers/compiler.interface';
+import { CompilerFactory } from '../../compilers/compiler.factory';
+
+import * as chalk from 'chalk';
+import * as glob from 'glob';
+import * as fs from 'fs';
+import * as path from 'path';
+import * as mkdirp from 'mkdirp';
+
+export interface ExtractTaskOptionsInterface {
+	replace?: boolean;
+	sort?: boolean;
+	clean?: boolean;
+	patterns?: string[];
+}
+
+export class ExtractTask implements TaskInterface {
+
+	protected _options: ExtractTaskOptionsInterface = {
+		replace: false,
+		sort: false,
+		clean: false,
+		patterns: []
+	};
+
+	protected _parsers: ParserInterface[] = [];
+	protected _compiler: CompilerInterface;
+
+	public constructor(protected _input: string[], protected _output: string[], options?: ExtractTaskOptionsInterface) {
+		this._options = Object.assign({}, this._options, options);
+	}
+
+	public execute(): void {
+		if (!this._parsers) {
+			throw new Error('No parsers configured');
+		}
+		if (!this._compiler) {
+			throw new Error('No compiler configured');
+		}
+
+		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);
+	}
+
+	public setParsers(parsers: ParserInterface[]): this {
+		this._parsers = parsers;
+		return this;
+	}
+
+	public setCompiler(compiler: CompilerInterface | string): this {
+		if (typeof compiler === 'string') {
+			this._compiler = CompilerFactory.create(compiler)
+		} else {
+			this._compiler = compiler;
+		}
+
+		return this;
+	}
+
+	/**
+	 * Extract strings from input dirs using configured parsers
+	 */
+	protected _extract(): TranslationCollection {
+		let collection: TranslationCollection = new TranslationCollection();
+
+		this._out(chalk.bold('Extracting strings...'));
+
+		this._input.forEach(dir => {
+			this._readDir(dir, this._options.patterns).forEach(path => {
+				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));
+				});
+			});
+		});
+		return collection;
+	}
+
+	/**
+	 * Process collection according to options (merge, clean, sort), compile and save
+	 * @param collection
+	 */
+	protected _save(collection: TranslationCollection): void {
+		this._output.forEach(output => {
+			const normalizedOutput: string = path.resolve(output);
+
+			let dir: string = normalizedOutput;
+			let filename: string = `strings.${this._compiler.extension}`;
+			if (!fs.existsSync(normalizedOutput) || !fs.statSync(normalizedOutput).isDirectory()) {
+				dir = path.dirname(normalizedOutput);
+				filename = path.basename(normalizedOutput);
+			}
+
+			const outputPath: string = path.join(dir, filename);
+			let processedCollection: TranslationCollection = collection;
+
+			this._out(chalk.bold('\nSaving: %s'), outputPath);
+
+			if (fs.existsSync(outputPath) && !this._options.replace) {
+				const existingCollection: TranslationCollection = this._compiler.parse(fs.readFileSync(outputPath, 'utf-8'));
+				if (!existingCollection.isEmpty()) {
+					processedCollection = processedCollection.union(existingCollection);
+					this._out(chalk.dim('- merged with %d existing strings'), existingCollection.count());
+				}
+
+				if (this._options.clean) {
+					const collectionCount = processedCollection.count();
+					processedCollection = processedCollection.intersect(processedCollection);
+					const removeCount = collectionCount - processedCollection.count();
+					if (removeCount > 0) {
+						this._out(chalk.dim('- removed %d obsolete strings'), removeCount);
+					}
+				}
+			}
+
+			if (this._options.sort) {
+				processedCollection = processedCollection.sort();
+				this._out(chalk.dim('- sorted strings'));
+			}
+
+			if (!fs.existsSync(dir)) {
+				mkdirp.sync(dir);
+				this._out(chalk.dim('- created dir: %s'), dir);
+			}
+			fs.writeFileSync(outputPath, this._compiler.compile(processedCollection));
+
+			this._out(chalk.green('Done!'));
+		});
+	}
+
+	/**
+	 * Get all files in dir matching patterns
+	 */
+	protected _readDir(dir: string, patterns: string[]): string[] {
+		return patterns.reduce((results, pattern) => {
+			return glob.sync(dir + pattern)
+				.filter(path => fs.statSync(path).isFile())
+				.concat(results);
+		}, []);
+	}
+
+	protected _out(...args: any[]): void {
+		console.log.apply(this, arguments);
+	}
+
+}

src/cli/tasks/task.interface.ts

@@ -0,0 +1,3 @@
+export interface TaskInterface {
+	execute(): void;
+}

src/compilers/compiler.factory.ts

@@ -0,0 +1,17 @@
+import { CompilerInterface } from '../compilers/compiler.interface';
+import { JsonCompiler } from '../compilers/json.compiler';
+import { NamespacedJsonCompiler } from '../compilers/namespaced-json.compiler';
+import { PoCompiler } from '../compilers/po.compiler';
+
+export class CompilerFactory {
+
+	public static create(format: string): CompilerInterface {
+		switch (format) {
+			case 'pot': return new PoCompiler();
+			case 'json': return new JsonCompiler();
+			case 'namespaced-json': return new NamespacedJsonCompiler();
+			default: throw new Error(`Unknown format: ${format}`);
+		}
+	}
+
+}

src/compilers/compiler.interface.ts

@@ -2,6 +2,8 @@ import { TranslationCollection } from '../utils/translation.collection';
 
 export interface CompilerInterface {
 
+	extension: string;
+
 	compile(collection: TranslationCollection): string;
 
 	parse(contents: string): TranslationCollection;

src/compilers/json.compiler.ts

@@ -3,6 +3,8 @@ import { TranslationCollection } from '../utils/translation.collection';
 
 export class JsonCompiler implements CompilerInterface {
 
+	public extension = 'json';
+
 	public compile(collection: TranslationCollection): string {
 		return JSON.stringify(collection.values, null, '\t');
 	}

src/compilers/namespaced-json.compiler.ts

@@ -5,13 +5,17 @@ import * as flat from 'flat';
 
 export class NamespacedJsonCompiler implements CompilerInterface {
 
+	public extension = 'json';
+
 	public compile(collection: TranslationCollection): string {
-		const values = flat.unflatten(collection.values);
+		const values: {} = flat.unflatten(collection.values, {
+			object: true
+		});
 		return JSON.stringify(values, null, '\t');
 	}
 
 	public parse(contents: string): TranslationCollection {
-		const values = flat.flatten(JSON.parse(contents));
+		const values: {} = flat.flatten(JSON.parse(contents));
 		return new TranslationCollection(values);
 	}
 

src/compilers/po.compiler.ts

@@ -5,6 +5,8 @@ import * as gettext from 'gettext-parser';
 
 export class PoCompiler implements CompilerInterface {
 
+	public extension = 'po';
+
 	/**
 	 * Translation domain
 	 */

src/declarations.d.ts

@@ -1,3 +1 @@
-declare module 'cli';
-declare module 'flat';
 declare module 'gettext-parser';

src/index.ts

@@ -1,5 +1,9 @@
-export * from './utils/extractor';
 export * from './utils/translation.collection';
+export * from './utils/ast-utils';
+
+export * from './cli/cli';
+export * from './cli/tasks/task.interface';
+export * from './cli/tasks/extract.task';
 
 export * from './parsers/parser.interface';
 export * from './parsers/abstract-template.parser';
@@ -8,5 +12,7 @@ export * from './parsers/pipe.parser';
 export * from './parsers/service.parser';
 
 export * from './compilers/compiler.interface';
+export * from './compilers/compiler.factory';
 export * from './compilers/json.compiler';
+export * from './compilers/namespaced-json.compiler';
 export * from './compilers/po.compiler';

src/parsers/ast-service.parser.ts

@@ -1,155 +0,0 @@
-import { ParserInterface } from './parser.interface';
-import { TranslationCollection } from '../utils/translation.collection';
-import { syntaxKindToName } from '../utils/ast-utils';
-
-import * as ts from 'typescript';
-
-export class AstServiceParser implements ParserInterface {
-
-	protected _sourceFile: ts.SourceFile;
-
-	protected _instancePropertyName: any;
-	protected _serviceClassName: string = 'TranslateService';
-	protected _serviceMethodNames: string[] = ['get', 'instant'];
-
-	public extract(contents: string, path?: string): TranslationCollection {
-		let collection: TranslationCollection = new TranslationCollection();
-
-		this._sourceFile = this._createSourceFile(path, contents);
-
-		this._instancePropertyName = this._getInstancePropertyName();
-		if (!this._instancePropertyName) {
-			return collection;
-		}
-
-		const callNodes = this._findCallNodes();
-		callNodes.forEach(callNode => {
-			const keys: string[] = this._getCallArgStrings(callNode);
-			if (keys && keys.length) {
-				collection = collection.addKeys(keys);
-			}
-		});
-
-		return collection;
-	}
-
-	protected _createSourceFile(path: string, contents: string): ts.SourceFile {
-		return ts.createSourceFile(path, contents, ts.ScriptTarget.ES6, /*setParentNodes */ false);
-	}
-
-	/**
-	 * Detect what the TranslateService instance property
-	 * is called by inspecting constructor params
-	 */
-	protected _getInstancePropertyName(): string {
-		const constructorNode = this._findConstructorNode();
-		const result = constructorNode.parameters.find(parameter => {
-			// Skip if visibility modifier is not present (we want it set as an instance property)
-			if (!parameter.modifiers) {
-				return false;
-			}
-
-			// Make sure className is of the correct type
-			const className: string = ( (parameter.type as ts.TypeReferenceNode).typeName as ts.Identifier).text;
-			if (className !== this._serviceClassName) {
-				return false;
-			}
-
-			return true;
-		});
-
-		if (result) {
-			return (result.name as ts.Identifier).text;
-		}
-	}
-
-	/**
-	 * Find first constructor
-	 */
-	protected _findConstructorNode(): ts.ConstructorDeclaration {
-		const constructors = this._findNodes(this._sourceFile, ts.SyntaxKind.Constructor, true) as ts.ConstructorDeclaration[];
-		if (constructors.length) {
-			return constructors[0];
-		}
-	}
-
-	/**
-	 * Find all calls to TranslateService methods
-	 */
-	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
-			// Only call expressions with arguments
-			.filter(callNode => callNode.arguments.length > 0)
-			// More filters
-			.filter(callNode => {
-				const propAccess = callNode.getChildAt(0).getChildAt(0) as ts.PropertyAccessExpression;
-				if (!propAccess || propAccess.kind !== ts.SyntaxKind.PropertyAccessExpression) {
-					return false;
-				}
-				if (!propAccess.getFirstToken() || propAccess.getFirstToken().kind !== ts.SyntaxKind.ThisKeyword) {
-					return false;
-				}
-				if (propAccess.name.text !== this._instancePropertyName) {
-					return false;
-				}
-
-				const methodAccess = callNode.getChildAt(0) as ts.PropertyAccessExpression;
-				if (!methodAccess || methodAccess.kind !== ts.SyntaxKind.PropertyAccessExpression) {
-					return false;
-				}
-				if (!methodAccess.name || this._serviceMethodNames.indexOf(methodAccess.name.text) === -1) {
-					return false;
-				}
-
-				return true;
-			});
-
-		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/parsers/service.parser.ts

@@ -1,59 +1,163 @@
 import { ParserInterface } from './parser.interface';
 import { TranslationCollection } from '../utils/translation.collection';
+import { syntaxKindToName } from '../utils/ast-utils';
+
+import * as ts from 'typescript';
 
 export class ServiceParser implements ParserInterface {
 
+	protected _sourceFile: ts.SourceFile;
+
+	protected _instancePropertyName: any;
+	protected _serviceClassName: string = 'TranslateService';
+	protected _serviceMethodNames: string[] = ['get', 'instant'];
+
 	public extract(contents: string, path?: string): TranslationCollection {
 		let collection: TranslationCollection = new TranslationCollection();
 
-		const translateServiceVar = this._extractTranslateServiceVar(contents);
-		if (!translateServiceVar) {
+		this._sourceFile = this._createSourceFile(path, contents);
+
+		this._instancePropertyName = this._getInstancePropertyName();
+		if (!this._instancePropertyName) {
 			return collection;
 		}
 
-		const methodRegExp: RegExp = /(?:get|instant)\s*\(\s*(\[?\s*(['"`])([^\1\r\n]*)\2\s*\]?)/;
-		const regExp: RegExp = new RegExp(`\\.${translateServiceVar}\\.${methodRegExp.source}`, 'g');
-
-		let matches: RegExpExecArray;
-		while (matches = regExp.exec(contents)) {
-			if (this._stringContainsArray(matches[1])) {
-				collection = collection.addKeys(this._stringToArray(matches[1]));
-			} else {
-				collection = collection.add(matches[3]);
+		const callNodes = this._findCallNodes();
+		callNodes.forEach(callNode => {
+			const keys: string[] = this._getCallArgStrings(callNode);
+			if (keys && keys.length) {
+				collection = collection.addKeys(keys);
 			}
-		}
+		});
 
 		return collection;
 	}
 
-	/**
-	 * Extracts name of TranslateService variable for use in patterns
-	 */
-	protected _extractTranslateServiceVar(contents: string): string {
-		const matches = contents.match(/([a-z0-9_]+)\s*:\s*TranslateService/i);
-		if (matches === null) {
-			return '';
-		}
-
-		return matches[1];
+	protected _createSourceFile(path: string, contents: string): ts.SourceFile {
+		return ts.createSourceFile(path, contents, null, /*setParentNodes */ false);
 	}
 
 	/**
-	 * Checks if string contains an array
+	 * Detect what the TranslateService instance property
+	 * is called by inspecting constructor params
 	 */
-	protected _stringContainsArray(input: string): boolean {
-		return input.startsWith('[') && input.endsWith(']');
+	protected _getInstancePropertyName(): string {
+		const constructorNode = this._findConstructorNode();
+		if (!constructorNode) {
+			return null;
+		}
+
+		const result = constructorNode.parameters.find(parameter => {
+			// Skip if visibility modifier is not present (we want it set as an instance property)
+			if (!parameter.modifiers) {
+				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) {
+				return false;
+			}
+			const className: string = parameterType.text;
+			if (className !== this._serviceClassName) {
+				return false;
+			}
+
+			return true;
+		});
+
+		if (result) {
+			return (result.name as ts.Identifier).text;
+		}
 	}
 
 	/**
-	 * Converts string to array
+	 * Find first constructor
 	 */
-	protected _stringToArray(input: string): string[] {
-		if (this._stringContainsArray(input)) {
-			return eval(input);
+	protected _findConstructorNode(): ts.ConstructorDeclaration {
+		const constructors = this._findNodes(this._sourceFile, ts.SyntaxKind.Constructor, true) as ts.ConstructorDeclaration[];
+		if (constructors.length) {
+			return constructors[0];
+		}
+	}
+
+	/**
+	 * Find all calls to TranslateService methods
+	 */
+	protected _findCallNodes(node?: ts.Node): ts.CallExpression[] {
+		if (!node) {
+			node = this._sourceFile;
 		}
 
-		return [];
+		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 => {
+				const propAccess = callNode.getChildAt(0).getChildAt(0) as ts.PropertyAccessExpression;
+				if (!propAccess || propAccess.kind !== ts.SyntaxKind.PropertyAccessExpression) {
+					return false;
+				}
+				if (!propAccess.getFirstToken() || propAccess.getFirstToken().kind !== ts.SyntaxKind.ThisKeyword) {
+					return false;
+				}
+				if (propAccess.name.text !== this._instancePropertyName) {
+					return false;
+				}
+
+				const methodAccess = callNode.getChildAt(0) as ts.PropertyAccessExpression;
+				if (!methodAccess || methodAccess.kind !== ts.SyntaxKind.PropertyAccessExpression) {
+					return false;
+				}
+				if (!methodAccess.name || this._serviceMethodNames.indexOf(methodAccess.name.text) === -1) {
+					return false;
+				}
+
+				return true;
+			});
+
+		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/extractor.ts

@@ -1,38 +0,0 @@
-import { ParserInterface } from '../parsers/parser.interface';
-import { TranslationCollection } from './translation.collection';
-
-import * as glob from 'glob';
-import * as fs from 'fs';
-
-export class Extractor {
-
-	public constructor(public parsers: ParserInterface[], public patterns: string[]) { }
-
-	/**
-	 * Extract strings from dir
-	 */
-	public process(dir: string): TranslationCollection {
-		let collection: TranslationCollection = new TranslationCollection();
-
-		this._readDir(dir, this.patterns).forEach(path => {
-			const contents: string = fs.readFileSync(path, 'utf-8');
-			this.parsers.forEach((parser: ParserInterface) => {
-				collection = collection.union(parser.extract(contents, path));
-			});
-		});
-
-		return collection;
-	}
-
-	/**
-	 * Get all files in dir matching patterns
-	 */
-	protected _readDir(dir: string, patterns: string[]): string[] {
-		return patterns.reduce((results, pattern) => {
-			return glob.sync(dir + pattern)
-				.filter(path => fs.statSync(path).isFile())
-				.concat(results);
-		}, []);
-	}
-
-}

src/utils/translation.collection.ts

@@ -76,16 +76,11 @@ export class TranslationCollection {
 	}
 
 	public sort(compareFn?: (a: string, b: string) => number): TranslationCollection {
-		if (!compareFn) {
-			// if no compare functions is provided use a case insensitive sorting function
-			compareFn = (a, b) => a.toLowerCase().localeCompare(b.toLowerCase());
-		}
-
-		let collection = new TranslationCollection();
-		let sortedKeys = this.keys().sort(compareFn);
-		sortedKeys.forEach((key) => {
-			collection = collection.add(key, this.get(key));
+		let values: TranslationType = {};
+		this.keys().sort(compareFn).forEach((key) => {
+			values[key] = this.get(key);
 		});
-		return collection;
+
+		return new TranslationCollection(values);
 	}
 }

tests/compilers/namespaced-compiler.spec.ts

@@ -35,4 +35,14 @@ describe('NamespacedJsonCompiler', () => {
 		expect(result).to.equal('{\n\t"NAMESPACE": {\n\t\t"KEY": {\n\t\t\t"FIRST_KEY": "",\n\t\t\t"SECOND_KEY": "VALUE"\n\t\t}\n\t}\n}');
 	});
 
+	it('should preserve numeric values on compile', () => {
+		const collection = new TranslationCollection({
+			"option.0": '',
+			"option.1": '',
+			"option.2": ''
+		});
+		const result: string = compiler.compile(collection);
+		expect(result).to.equal('{\n\t"option": {\n\t\t"0": "",\n\t\t"1": "",\n\t\t"2": ""\n\t}\n}');
+	});
+
 });

tests/parsers/ast-service.parser.spec.ts

@@ -1,154 +0,0 @@
-import { expect } from 'chai';
-
-import { AstServiceParser } from '../../src/parsers/ast-service.parser';
-
-class TestAstServiceParser extends AstServiceParser {
-
-	/*public getInstancePropertyName(): string {
-		return this._getInstancePropertyName();
-	}*/
-
-}
-
-describe('AstServiceParser', () => {
-
-	const componentFilename: string = 'test.component.ts';
-
-	let parser: TestAstServiceParser;
-
-	beforeEach(() => {
-		parser = new TestAstServiceParser();
-	});
-
-	/*it('should extract variable used for TranslateService', () => {
-		const contents = `
-			@Component({ })
-			export class AppComponent {
-				public constructor(
-					_serviceA: ServiceA,
-					public _serviceB: ServiceB,
-					protected _translateService: TranslateService
-			) { }
-		`;
-		const name = parser.getInstancePropertyName();
-		expect(name).to.equal('_translateService');
-	});*/
-
-	it('should extract strings in TranslateService\'s get() method', () => {
-		const contents = `
-			@Component({ })
-			export class AppComponent {
-				public constructor(protected _translateService: TranslateService) { }
-				public test() {
-					this._translateService.get('Hello World');
-				}
-		`;
-		const keys = parser.extract(contents, componentFilename).keys();
-		expect(keys).to.deep.equal(['Hello World']);
-	});
-
-	it('should extract strings in TranslateService\'s instant() method', () => {
-		const contents = `
-			@Component({ })
-			export class AppComponent {
-				public constructor(protected _translateService: TranslateService) { }
-				public test() {
-					this._translateService.instant('Hello World');
-				}
-		`;
-		const keys = parser.extract(contents, componentFilename).keys();
-		expect(keys).to.deep.equal(['Hello World']);
-	});
-
-	it('should extract array of strings in TranslateService\'s get() method', () => {
-		const contents = `
-			@Component({ })
-			export class AppComponent {
-				public constructor(protected _translateService: TranslateService) { }
-				public test() {
-					this._translateService.get(['Hello', 'World']);
-				}
-		`;
-		const keys = parser.extract(contents, componentFilename).keys();
-		expect(keys).to.deep.equal(['Hello', 'World']);
-	});
-
-	it('should extract array of strings in TranslateService\'s instant() method', () => {
-		const contents = `
-			@Component({ })
-			export class AppComponent {
-				public constructor(protected _translateService: TranslateService) { }
-				public test() {
-					this._translateService.instant(['Hello', 'World']);
-				}
-		`;
-		const key = parser.extract(contents, componentFilename).keys();
-		expect(key).to.deep.equal(['Hello', 'World']);
-	});
-
-	it('should not extract strings in get()/instant() methods of other services', () => {
-		const contents = `
-			@Component({ })
-			export class AppComponent {
-				public constructor(
-					protected _translateService: TranslateService,
-					protected _otherService: OtherService
-				) { }
-				public test() {
-					this._otherService.get('Hello World');
-					this._otherService.instant('Hi there');
-				}
-		`;
-		const keys = parser.extract(contents, componentFilename).keys();
-		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']);
-	});
-
-	it('should not extract string when not accessing property', () => {
-		const contents = `
-			@Component({ })
-			export class AppComponent {
-				public constructor(protected trans: TranslateService) { }
-				public test() {
-					trans.get("You are expected at {{time}}", {time: moment.format('H:mm')}).subscribe();
-				}
-			}
-		`;
-		const keys = parser.extract(contents, componentFilename).keys();
-		expect(keys).to.deep.equal([]);
-	});
-
-	it('should extract string with params on same line', () => {
-		const contents = `
-			@Component({ })
-			export class AppComponent {
-				public constructor(protected _translateService: TranslateService) { }
-				public test() {
-					this._translateService.get('You are expected at {{time}}', {time: moment.format('H:mm')});
-				}
-			}
-		`;
-		const keys = parser.extract(contents, componentFilename).keys();
-		expect(keys).to.deep.equal(['You are expected at {{time}}']);
-	});
-
-});

tests/parsers/service.parser.spec.ts

@@ -4,9 +4,9 @@ import { ServiceParser } from '../../src/parsers/service.parser';
 
 class TestServiceParser extends ServiceParser {
 
-	public extractTranslateServiceVar(contents: string): string {
-		return this._extractTranslateServiceVar(contents);
-	}
+	/*public getInstancePropertyName(): string {
+		return this._getInstancePropertyName();
+	}*/
 
 }
 
@@ -20,7 +20,7 @@ describe('ServiceParser', () => {
 		parser = new TestServiceParser();
 	});
 
-	it('should extract variable used for TranslateService', () => {
+	/*it('should extract variable used for TranslateService', () => {
 		const contents = `
 			@Component({ })
 			export class AppComponent {
@@ -30,9 +30,9 @@ describe('ServiceParser', () => {
 					protected _translateService: TranslateService
 			) { }
 		`;
-		const name = parser.extractTranslateServiceVar(contents);
+		const name = parser.getInstancePropertyName();
 		expect(name).to.equal('_translateService');
-	});
+	});*/
 
 	it('should extract strings in TranslateService\'s get() method', () => {
 		const contents = `
@@ -129,7 +129,7 @@ describe('ServiceParser', () => {
 			export class AppComponent {
 				public constructor(protected trans: TranslateService) { }
 				public test() {
-					trans.get('Hello World');
+					trans.get("You are expected at {{time}}", {time: moment.format('H:mm')}).subscribe();
 				}
 			}
 		`;
@@ -137,8 +137,7 @@ describe('ServiceParser', () => {
 		expect(keys).to.deep.equal([]);
 	});
 
-	// FAILS (Use AstServiceParser)
-	/*it('should extract string with params on same line', () => {
+	it('should extract string with params on same line', () => {
 		const contents = `
 			@Component({ })
 			export class AppComponent {
@@ -150,6 +149,6 @@ describe('ServiceParser', () => {
 		`;
 		const keys = parser.extract(contents, componentFilename).keys();
 		expect(keys).to.deep.equal(['You are expected at {{time}}']);
-	});*/
+	});
 
 });