- Added typings for packages where typings existed

- 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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@biesbjerg/ngx-translate-extract",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "Extract strings from projects using ngx-translate",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -9,7 +9,7 @@
     "dist/"
   ],
   "bin": {
-    "ngx-translate-extract": "bin/extract.js"
+    "ngx-translate-extract": "bin/cli.js"
   },
   "scripts": {
     "build": "npm run clean && tsc",
@@ -48,23 +48,29 @@
   "config": {},
   "devDependencies": {
     "@types/chai": "3.4.35",
-    "@types/cheerio": "0.17.31",
     "@types/glob": "5.0.30",
-    "@types/mocha": "2.2.39",
+    "@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": "2.1.0",
     "tslint": "4.5.1",
-    "tslint-eslint-rules": "3.4.0",
+    "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.2",
     "glob": "7.1.1",
     "path": "0.12.7",
+    "mkdirp": "0.5.1",
     "flat": "2.0.1"
   }
 }

src/cli/cli-options.interface.ts

@@ -0,0 +1,9 @@
+export interface CliOptionsInterface {
+	dir: string[];
+	output: string[];
+	format: 'json' | 'namespaced-json' | 'pot';
+	replace: boolean;
+	sort: boolean;
+	clean: boolean;
+	help: boolean;
+}

src/cli/cli.ts

@@ -0,0 +1,148 @@
+import { Extractor } from '../utils/extractor';
+import { CliOptionsInterface } from './cli-options.interface';
+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 { 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 mkdirp from 'mkdirp';
+import * as chalk from 'chalk';
+import * as yargs from 'yargs';
+
+const options: CliOptionsInterface = yargs
+	.usage('Extract strings from files for translation.\nUsage: $0 [options]')
+	.help('help')
+	.option('dir', {
+		alias: 'd',
+		describe: 'Paths you would like to extract strings from. Multiple paths can be specified',
+		default: process.env.PWD,
+		type: 'array'
+	})
+	.option('output', {
+		alias: 'o',
+		describe: 'Path you would like to save extracted strings to. Multiple paths can be specified',
+		default: process.env.PWD,
+		type: 'array'
+	})
+	.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 translations in the output file in alphabetical order',
+		default: false,
+		type: 'boolean'
+	})
+	.option('clean', {
+		alias: 'c',
+		describe: 'Remove obsolete strings when merging',
+		default: false,
+		type: 'boolean'
+	})
+	.argv;
+
+const patterns: string[] = [
+	'/**/*.html',
+	'/**/*.ts'
+];
+const parsers: ParserInterface[] = [
+	new ServiceParser(),
+	new PipeParser(),
+	new DirectiveParser()
+];
+
+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 extractor: Extractor = new Extractor(parsers, patterns);
+
+let extractedStrings: TranslationCollection = new TranslationCollection();
+
+// Extract strings from paths
+console.log(chalk.bold('Extracting strings from...'));
+options.dir.forEach(dir => {
+	const normalizedDir: string = path.resolve(dir);
+	if (!fs.existsSync(dir) || !fs.statSync(dir).isDirectory()) {
+		console.log(`The path you supplied was not found: '${dir}'`);
+		process.exit(1);
+	}
+
+	console.log(chalk.gray('- %s'), normalizedDir);
+	extractedStrings = extractedStrings.union(extractor.process(normalizedDir));
+});
+console.log(chalk.green('Extracted %d strings\n'), extractedStrings.count());
+
+// Save extracted strings to output paths
+options.output.forEach(output => {
+	const normalizedOutput: string = path.resolve(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);
+
+	console.log(chalk.bold('Saving to: %s'), outputPath);
+	if (!fs.existsSync(outputDir)) {
+		console.log(chalk.dim('- Created output dir: %s'), outputDir);
+		mkdirp.sync(outputDir);
+	}
+
+	let processedStrings: TranslationCollection = extractedStrings;
+
+	if (fs.existsSync(outputPath) && !options.replace) {
+		const existingStrings: TranslationCollection = compiler.parse(fs.readFileSync(outputPath, 'utf-8'));
+		if (existingStrings.count() > 0) {
+			processedStrings = processedStrings.union(existingStrings);
+			console.log(chalk.dim('- Merged with %d existing strings'), existingStrings.count());
+		}
+
+		if (options.clean) {
+			const collectionCount = processedStrings.count();
+			processedStrings = processedStrings.intersect(processedStrings);
+			const removeCount = collectionCount - processedStrings.count();
+			console.log(chalk.dim('- Removed %d obsolete strings'), removeCount);
+		}
+	}
+
+	if (options.sort) {
+		processedStrings = processedStrings.sort();
+		console.log(chalk.dim('- Sorted strings'));
+	}
+
+	fs.writeFileSync(outputPath, compiler.compile(processedStrings));
+	console.log(chalk.green('OK!\n'));
+});

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/compilers/namespaced-json.compiler.ts

@@ -6,12 +6,12 @@ import * as flat from 'flat';
 export class NamespacedJsonCompiler implements CompilerInterface {
 
 	public compile(collection: TranslationCollection): string {
-		const values = flat.unflatten(collection.values);
+		const values: {} = flat.unflatten(collection.values);
 		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/declarations.d.ts

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

src/parsers/ast-service.parser.ts

@@ -1,163 +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, null, /*setParentNodes */ false);
-	}
-
-	/**
-	 * Detect what the TranslateService instance property
-	 * is called by inspecting constructor params
-	 */
-	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;
-		}
-	}
-
-	/**
-	 * 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);
+		this._sourceFile = this._createSourceFile(path, contents);
-		if (!translateServiceVar) {
+
+		this._instancePropertyName = this._getInstancePropertyName();
+		if (!this._instancePropertyName) {
 			return collection;
 		}
 
-		const methodRegExp: RegExp = /(?:get|instant)\s*\(\s*(\[?\s*(['"`])([^\1\r\n]*)\2\s*\]?)/;
+		const callNodes = this._findCallNodes();
-		const regExp: RegExp = new RegExp(`\\.${translateServiceVar}\\.${methodRegExp.source}`, 'g');
+		callNodes.forEach(callNode => {
-
+			const keys: string[] = this._getCallArgStrings(callNode);
-		let matches: RegExpExecArray;
+			if (keys && keys.length) {
-		while (matches = regExp.exec(contents)) {
+				collection = collection.addKeys(keys);
-			if (this._stringContainsArray(matches[1])) {
-				collection = collection.addKeys(this._stringToArray(matches[1]));
-			} else {
-				collection = collection.add(matches[3]);
 			}
-		}
+		});
 
 		return collection;
 	}
 
-	/**
+	protected _createSourceFile(path: string, contents: string): ts.SourceFile {
-	 * Extracts name of TranslateService variable for use in patterns
+		return ts.createSourceFile(path, contents, null, /*setParentNodes */ false);
-	 */
-	protected _extractTranslateServiceVar(contents: string): string {
-		const matches = contents.match(/([a-z0-9_]+)\s*:\s*TranslateService/i);
-		if (matches === null) {
-			return '';
-		}
-
-		return matches[1];
 	}
 
 	/**
-	 * Checks if string contains an array
+	 * Detect what the TranslateService instance property
+	 * is called by inspecting constructor params
 	 */
-	protected _stringContainsArray(input: string): boolean {
+	protected _getInstancePropertyName(): string {
-		return input.startsWith('[') && input.endsWith(']');
+		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[] {
+	protected _findConstructorNode(): ts.ConstructorDeclaration {
-		if (this._stringContainsArray(input)) {
+		const constructors = this._findNodes(this._sourceFile, ts.SyntaxKind.Constructor, true) as ts.ConstructorDeclaration[];
-			return eval(input);
+		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);
 	}
 
 }

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

@@ -2,11 +2,11 @@ import { expect } from 'chai';
 
 import { ServiceParser } from '../../src/parsers/service.parser';
 
-class TestServiceParser extends ServiceParser {
+class TestAstServiceParser extends ServiceParser {
 
-	public extractTranslateServiceVar(contents: string): string {
+	/*public getInstancePropertyName(): string {
-		return this._extractTranslateServiceVar(contents);
+		return this._getInstancePropertyName();
-	}
+	}*/
 
 }
 
@@ -14,13 +14,13 @@ describe('ServiceParser', () => {
 
 	const componentFilename: string = 'test.component.ts';
 
-	let parser: TestServiceParser;
+	let parser: TestAstServiceParser;
 
 	beforeEach(() => {
-		parser = new TestServiceParser();
+		parser = new TestAstServiceParser();
 	});
 
-	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}}']);
-	});*/
+	});
 
 });