Compare commits
10 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
05d1917f9d | ||
|
e50d52003b | ||
|
cb8731ee0f | ||
|
9908681243 | ||
|
a83123fb12 | ||
|
6b740867d6 | ||
|
d0e9a8cd85 | ||
|
f157025f0a | ||
|
ecf629118a | ||
|
ce399ee717 |
@@ -15,7 +15,7 @@ Add a script to your project's `package.json`:
|
||||
```json
|
||||
...
|
||||
"scripts": {
|
||||
"extract-i18n": "ngx-translate-extract --input ./src --output ./src/assets/i18n/ --clean --sort --format namespaced-json"
|
||||
"extract-i18n": "ngx-translate-extract --input ./src --output ./src/assets/i18n/strings.json --key-as-default-value --clean --sort --format namespaced-json"
|
||||
}
|
||||
...
|
||||
```
|
||||
@@ -25,11 +25,11 @@ You can now run `npm run extract-i18n` and it will extract strings from your pro
|
||||
|
||||
**Extract from dir and save to file**
|
||||
|
||||
`ngx-translate-extract --input ./src --output ./src/assets/i18n/template.json`
|
||||
`ngx-translate-extract --input ./src --output ./src/assets/i18n/strings.json`
|
||||
|
||||
**Extract from multiple dirs**
|
||||
|
||||
`ngx-translate-extract --input ./src-a ./src-b --output ./src/assets/i18n/template.json`
|
||||
`ngx-translate-extract --input ./src-a ./src-b --output ./src/assets/i18n/strings.json`
|
||||
|
||||
|
||||
**Extract and save to multiple files using path expansion**
|
||||
|
27
package-lock.json
generated
27
package-lock.json
generated
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@biesbjerg/ngx-translate-extract",
|
||||
"version": "5.0.0",
|
||||
"version": "6.0.0",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
@@ -169,9 +169,9 @@
|
||||
"dev": true
|
||||
},
|
||||
"@types/node": {
|
||||
"version": "12.12.30",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.30.tgz",
|
||||
"integrity": "sha512-sz9MF/zk6qVr3pAnM0BSQvYIBK44tS75QC5N+VbWSE4DjCV/pJ+UzCW/F+vVnl7TkOPcuwQureKNtSSwjBTaMg==",
|
||||
"version": "12.12.31",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.31.tgz",
|
||||
"integrity": "sha512-T+wnJno8uh27G9c+1T+a1/WYCHzLeDqtsGJkoEdSp2X8RTh3oOCZQcUnjAx90CS8cmmADX51O0FI/tu9s0yssg==",
|
||||
"dev": true
|
||||
},
|
||||
"@types/parse-json": {
|
||||
@@ -1133,9 +1133,9 @@
|
||||
"dev": true
|
||||
},
|
||||
"lint-staged": {
|
||||
"version": "10.0.8",
|
||||
"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.0.8.tgz",
|
||||
"integrity": "sha512-Oa9eS4DJqvQMVdywXfEor6F4vP+21fPHF8LUXgBbVWUSWBddjqsvO6Bv1LwMChmgQZZqwUvgJSHlu8HFHAPZmA==",
|
||||
"version": "10.0.9",
|
||||
"resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.0.9.tgz",
|
||||
"integrity": "sha512-NKJHYgRa8oI9c4Ic42ZtF2XA6Ps7lFbXwg3q0ZEP0r55Tw3YWykCW1RzW6vu+QIGqbsy7DxndvKu93Wtr5vPQw==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"chalk": "^3.0.0",
|
||||
@@ -1881,9 +1881,9 @@
|
||||
}
|
||||
},
|
||||
"prettier": {
|
||||
"version": "1.19.1",
|
||||
"resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz",
|
||||
"integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==",
|
||||
"version": "2.0.2",
|
||||
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.2.tgz",
|
||||
"integrity": "sha512-5xJQIPT8BraI7ZnaDwSbu5zLrB6vvi8hVV58yHQ+QK64qrY40dULy0HSRlQ2/2IdzeBpjhDkqdcFBnFeDEMVdg==",
|
||||
"dev": true
|
||||
},
|
||||
"process": {
|
||||
@@ -1982,6 +1982,7 @@
|
||||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
|
||||
"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"glob": "^7.1.3"
|
||||
}
|
||||
@@ -2230,9 +2231,9 @@
|
||||
}
|
||||
},
|
||||
"ts-node": {
|
||||
"version": "8.7.0",
|
||||
"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.7.0.tgz",
|
||||
"integrity": "sha512-s659CsHrsxaRVDEleuOkGvbsA0rWHtszUNEt1r0CgAFN5ZZTQtDzpsluS7W5pOGJIa1xZE8R/zK4dEs+ldFezg==",
|
||||
"version": "8.8.1",
|
||||
"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.8.1.tgz",
|
||||
"integrity": "sha512-10DE9ONho06QORKAaCBpPiFCdW+tZJuY/84tyypGtl6r+/C7Asq0dhqbRZURuUlLQtZxxDvT8eoj8cGW0ha6Bg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"arg": "^4.1.0",
|
||||
|
16
package.json
16
package.json
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@biesbjerg/ngx-translate-extract",
|
||||
"version": "6.0.0",
|
||||
"version": "6.0.3",
|
||||
"description": "Extract strings from projects using ngx-translate",
|
||||
"main": "dist/index.js",
|
||||
"typings": "dist/index.d.ts",
|
||||
@@ -57,7 +57,7 @@
|
||||
},
|
||||
"homepage": "https://github.com/biesbjerg/ngx-translate-extract",
|
||||
"engines": {
|
||||
"node": ">=12"
|
||||
"node": ">=11.15.0"
|
||||
},
|
||||
"config": {},
|
||||
"devDependencies": {
|
||||
@@ -67,20 +67,20 @@
|
||||
"@types/glob": "^7.1.1",
|
||||
"@types/mkdirp": "^1.0.0",
|
||||
"@types/mocha": "^7.0.2",
|
||||
"@types/node": "^12.12.30",
|
||||
"@types/node": "^12.12.31",
|
||||
"@types/yargs": "^15.0.4",
|
||||
"braces": "^3.0.2",
|
||||
"chai": "^4.2.0",
|
||||
"husky": "^4.2.3",
|
||||
"lint-staged": "^10.0.8",
|
||||
"lint-staged": "^10.0.9",
|
||||
"mocha": "^7.1.1",
|
||||
"prettier": "^1.19.1",
|
||||
"ts-node": "^8.7.0",
|
||||
"prettier": "^2.0.2",
|
||||
"rimraf": "^3.0.2",
|
||||
"ts-node": "^8.8.1",
|
||||
"tslint": "^6.1.0",
|
||||
"tslint-config-prettier": "^1.18.0",
|
||||
"tslint-eslint-rules": "^5.4.0",
|
||||
"tslint-etc": "^1.10.1",
|
||||
"rimraf": "^3.0.2"
|
||||
"tslint-etc": "^1.10.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@angular/compiler": "^9.0.7",
|
||||
|
@@ -1,4 +1,5 @@
|
||||
import * as yargs from 'yargs';
|
||||
import { red, green } from 'colorette';
|
||||
|
||||
import { ExtractTask } from './tasks/extract.task';
|
||||
import { ParserInterface } from '../parsers/parser.interface';
|
||||
@@ -18,14 +19,13 @@ import { normalizePaths } from '../utils/fs-helpers';
|
||||
import { donateMessage } from '../utils/donate';
|
||||
|
||||
// First parsing pass to be able to access pattern argument for use input/output arguments
|
||||
const y = yargs
|
||||
.option('patterns', {
|
||||
alias: 'p',
|
||||
describe: 'Default patterns',
|
||||
type: 'array',
|
||||
default: ['/**/*.html', '/**/*.ts'],
|
||||
hidden: true
|
||||
});
|
||||
const y = yargs.option('patterns', {
|
||||
alias: 'p',
|
||||
describe: 'Default patterns',
|
||||
type: 'array',
|
||||
default: ['/**/*.html', '/**/*.ts'],
|
||||
hidden: true
|
||||
});
|
||||
|
||||
const parsed = y.parse();
|
||||
|
||||
@@ -149,6 +149,13 @@ const compiler: CompilerInterface = CompilerFactory.create(cli.format, {
|
||||
});
|
||||
extractTask.setCompiler(compiler);
|
||||
|
||||
extractTask.execute();
|
||||
|
||||
console.log(donateMessage);
|
||||
// Run task
|
||||
try {
|
||||
extractTask.execute();
|
||||
console.log(green('\nDone.\n'));
|
||||
console.log(donateMessage);
|
||||
process.exit(0);
|
||||
} catch (e) {
|
||||
console.log(red(`\nAn error occurred: ${e}\n`));
|
||||
process.exit(1);
|
||||
}
|
||||
|
@@ -4,7 +4,7 @@ import { ParserInterface } from '../../parsers/parser.interface';
|
||||
import { PostProcessorInterface } from '../../post-processors/post-processor.interface';
|
||||
import { CompilerInterface } from '../../compilers/compiler.interface';
|
||||
|
||||
import { cyan, green, bold, dim } from 'colorette';
|
||||
import { cyan, green, bold, dim, red } from 'colorette';
|
||||
import * as glob from 'glob';
|
||||
import * as fs from 'fs';
|
||||
import * as path from 'path';
|
||||
@@ -24,8 +24,8 @@ export class ExtractTask implements TaskInterface {
|
||||
protected compiler: CompilerInterface;
|
||||
|
||||
public constructor(protected inputs: string[], protected outputs: string[], options?: ExtractTaskOptionsInterface) {
|
||||
this.inputs = inputs.map(input => path.resolve(input));
|
||||
this.outputs = outputs.map(output => path.resolve(output));
|
||||
this.inputs = inputs.map((input) => path.resolve(input));
|
||||
this.outputs = outputs.map((output) => path.resolve(output));
|
||||
this.options = { ...this.options, ...options };
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@ export class ExtractTask implements TaskInterface {
|
||||
|
||||
this.out(bold('Saving:'));
|
||||
|
||||
this.outputs.forEach(output => {
|
||||
this.outputs.forEach((output) => {
|
||||
let dir: string = output;
|
||||
let filename: string = `strings.${this.compiler.extension}`;
|
||||
if (!fs.existsSync(output) || !fs.statSync(output).isDirectory()) {
|
||||
@@ -56,26 +56,33 @@ export class ExtractTask implements TaskInterface {
|
||||
|
||||
let existing: TranslationCollection = new TranslationCollection();
|
||||
if (!this.options.replace && fs.existsSync(outputPath)) {
|
||||
existing = this.compiler.parse(fs.readFileSync(outputPath, 'utf-8'));
|
||||
try {
|
||||
existing = this.compiler.parse(fs.readFileSync(outputPath, 'utf-8'));
|
||||
} catch (e) {
|
||||
this.out(`%s %s`, dim(`- ${outputPath}`), red(`[ERROR]`));
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
// merge extracted strings with existing
|
||||
const draft = extracted.union(existing);
|
||||
|
||||
if (existing.isEmpty()) {
|
||||
this.out(dim(`- ${outputPath}`));
|
||||
} else {
|
||||
this.out(dim(`- ${outputPath} (merged)`));
|
||||
}
|
||||
|
||||
// Run collection through post processors
|
||||
const final = this.process(draft, extracted, existing);
|
||||
|
||||
// Save to file
|
||||
this.save(outputPath, final);
|
||||
// Save
|
||||
try {
|
||||
let event = 'CREATED';
|
||||
if (fs.existsSync(outputPath)) {
|
||||
this.options.replace ? event = 'REPLACED' : event = 'MERGED';
|
||||
}
|
||||
this.save(outputPath, final);
|
||||
this.out(`%s %s`, dim(`- ${outputPath}`), green(`[${event}]`));
|
||||
} catch (e) {
|
||||
this.out(`%s %s`, dim(`- ${outputPath}`), red(`[ERROR]`));
|
||||
throw e;
|
||||
}
|
||||
});
|
||||
|
||||
this.out(green('\nDone.\n'));
|
||||
}
|
||||
|
||||
public setParsers(parsers: ParserInterface[]): this {
|
||||
@@ -98,11 +105,11 @@ export class ExtractTask implements TaskInterface {
|
||||
*/
|
||||
protected extract(): TranslationCollection {
|
||||
let collection: TranslationCollection = new TranslationCollection();
|
||||
this.inputs.forEach(pattern => {
|
||||
this.getFiles(pattern).forEach(filePath => {
|
||||
this.inputs.forEach((pattern) => {
|
||||
this.getFiles(pattern).forEach((filePath) => {
|
||||
this.out(dim('- %s'), filePath);
|
||||
const contents: string = fs.readFileSync(filePath, 'utf-8');
|
||||
this.parsers.forEach(parser => {
|
||||
this.parsers.forEach((parser) => {
|
||||
const extracted = parser.extract(contents, filePath);
|
||||
if (extracted instanceof TranslationCollection) {
|
||||
collection = collection.union(extracted);
|
||||
@@ -117,7 +124,7 @@ export class ExtractTask implements TaskInterface {
|
||||
* Run strings through configured post processors
|
||||
*/
|
||||
protected process(draft: TranslationCollection, extracted: TranslationCollection, existing: TranslationCollection): TranslationCollection {
|
||||
this.postProcessors.forEach(postProcessor => {
|
||||
this.postProcessors.forEach((postProcessor) => {
|
||||
draft = postProcessor.process(draft, extracted, existing);
|
||||
});
|
||||
return draft;
|
||||
@@ -139,9 +146,7 @@ export class ExtractTask implements TaskInterface {
|
||||
* Get all files matching pattern
|
||||
*/
|
||||
protected getFiles(pattern: string): string[] {
|
||||
return glob
|
||||
.sync(pattern)
|
||||
.filter(filePath => fs.statSync(filePath).isFile());
|
||||
return glob.sync(pattern).filter((filePath) => fs.statSync(filePath).isFile());
|
||||
}
|
||||
|
||||
protected out(...args: any[]): void {
|
||||
@@ -151,7 +156,7 @@ export class ExtractTask implements TaskInterface {
|
||||
protected printEnabledParsers(): void {
|
||||
this.out(cyan('Enabled parsers:'));
|
||||
if (this.parsers.length) {
|
||||
this.out(cyan(dim(this.parsers.map(parser => `- ${parser.constructor.name}`).join('\n'))));
|
||||
this.out(cyan(dim(this.parsers.map((parser) => `- ${parser.constructor.name}`).join('\n'))));
|
||||
} else {
|
||||
this.out(cyan(dim('(none)')));
|
||||
}
|
||||
@@ -161,7 +166,7 @@ export class ExtractTask implements TaskInterface {
|
||||
protected printEnabledPostProcessors(): void {
|
||||
this.out(cyan('Enabled post processors:'));
|
||||
if (this.postProcessors.length) {
|
||||
this.out(cyan(dim(this.postProcessors.map(postProcessor => `- ${postProcessor.constructor.name}`).join('\n'))));
|
||||
this.out(cyan(dim(this.postProcessors.map((postProcessor) => `- ${postProcessor.constructor.name}`).join('\n'))));
|
||||
} else {
|
||||
this.out(cyan(dim('(none)')));
|
||||
}
|
||||
|
@@ -28,6 +28,6 @@ export class JsonCompiler implements CompilerInterface {
|
||||
}
|
||||
|
||||
protected isNamespacedJsonFormat(values: any): boolean {
|
||||
return Object.keys(values).some(key => typeof values[key] === 'object');
|
||||
return Object.keys(values).some((key) => typeof values[key] === 'object');
|
||||
}
|
||||
}
|
||||
|
@@ -22,18 +22,15 @@ export class PoCompiler implements CompilerInterface {
|
||||
'content-transfer-encoding': '8bit'
|
||||
},
|
||||
translations: {
|
||||
[this.domain]: Object.keys(collection.values).reduce(
|
||||
(translations, key) => {
|
||||
return {
|
||||
...translations,
|
||||
[key]: {
|
||||
msgid: key,
|
||||
msgstr: collection.get(key)
|
||||
}
|
||||
};
|
||||
},
|
||||
{} as any
|
||||
)
|
||||
[this.domain]: Object.keys(collection.values).reduce((translations, key) => {
|
||||
return {
|
||||
...translations,
|
||||
[key]: {
|
||||
msgid: key,
|
||||
msgstr: collection.get(key)
|
||||
}
|
||||
};
|
||||
}, {} as any)
|
||||
}
|
||||
};
|
||||
|
||||
@@ -49,16 +46,13 @@ export class PoCompiler implements CompilerInterface {
|
||||
}
|
||||
|
||||
const values = Object.keys(po.translations[this.domain])
|
||||
.filter(key => key.length > 0)
|
||||
.reduce(
|
||||
(result, key) => {
|
||||
return {
|
||||
...result,
|
||||
[key]: po.translations[this.domain][key].msgstr.pop()
|
||||
};
|
||||
},
|
||||
{} as TranslationType
|
||||
);
|
||||
.filter((key) => key.length > 0)
|
||||
.reduce((result, key) => {
|
||||
return {
|
||||
...result,
|
||||
[key]: po.translations[this.domain][key].msgstr.pop()
|
||||
};
|
||||
}, {} as TranslationType);
|
||||
|
||||
return new TranslationCollection(values);
|
||||
}
|
||||
|
@@ -13,7 +13,7 @@ export class DirectiveParser implements ParserInterface {
|
||||
let collection: TranslationCollection = new TranslationCollection();
|
||||
|
||||
const nodes: TmplAstNode[] = this.parseTemplate(source, filePath);
|
||||
this.getTranslatableElements(nodes).forEach(element => {
|
||||
this.getTranslatableElements(nodes).forEach((element) => {
|
||||
const key = this.getElementTranslateAttrValue(element) || this.getElementContent(element);
|
||||
collection = collection.add(key);
|
||||
});
|
||||
@@ -23,11 +23,11 @@ export class DirectiveParser implements ParserInterface {
|
||||
|
||||
protected getTranslatableElements(nodes: TmplAstNode[]): TmplAstElement[] {
|
||||
return nodes
|
||||
.filter(element => this.isElement(element))
|
||||
.filter((element) => this.isElement(element))
|
||||
.reduce((result: TmplAstElement[], element: TmplAstElement) => {
|
||||
return result.concat(this.findChildrenElements(element));
|
||||
}, [])
|
||||
.filter(element => this.isTranslatable(element));
|
||||
.filter((element) => this.isTranslatable(element));
|
||||
}
|
||||
|
||||
protected findChildrenElements(node: TmplAstNode): TmplAstElement[] {
|
||||
@@ -62,14 +62,14 @@ export class DirectiveParser implements ParserInterface {
|
||||
}
|
||||
|
||||
protected isTranslatable(node: TmplAstNode): boolean {
|
||||
if (this.isElement(node) && node.attributes.some(attribute => attribute.name === 'translate')) {
|
||||
if (this.isElement(node) && node.attributes.some((attribute) => attribute.name === 'translate')) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
protected getElementTranslateAttrValue(element: TmplAstElement): string {
|
||||
const attr: TmplAstTextAttribute = element.attributes.find(attribute => attribute.name === 'translate');
|
||||
const attr: TmplAstTextAttribute = element.attributes.find((attribute) => attribute.name === 'translate');
|
||||
return attr?.value ?? '';
|
||||
}
|
||||
|
||||
|
@@ -19,7 +19,7 @@ export class MarkerParser implements ParserInterface {
|
||||
let collection: TranslationCollection = new TranslationCollection();
|
||||
|
||||
const callExpressions = findFunctionCallExpressions(sourceFile, markerImportName);
|
||||
callExpressions.forEach(callExpression => {
|
||||
callExpressions.forEach((callExpression) => {
|
||||
const [firstArg] = callExpression.arguments;
|
||||
if (!firstArg) {
|
||||
return;
|
||||
|
@@ -14,8 +14,8 @@ export class PipeParser implements ParserInterface {
|
||||
|
||||
let collection: TranslationCollection = new TranslationCollection();
|
||||
const nodes: TmplAstNode[] = this.parseTemplate(source, filePath);
|
||||
const pipes: BindingPipe[] = nodes.map(node => this.findPipesInNode(node)).flat();
|
||||
pipes.forEach(pipe => {
|
||||
const pipes: BindingPipe[] = nodes.map((node) => this.findPipesInNode(node)).flat();
|
||||
pipes.forEach((pipe) => {
|
||||
this.parseTranslationKeysFromPipe(pipe).forEach((key: string) => {
|
||||
collection = collection.add(key);
|
||||
});
|
||||
|
@@ -3,7 +3,15 @@ import { tsquery } from '@phenomnomnominal/tsquery';
|
||||
|
||||
import { ParserInterface } from './parser.interface';
|
||||
import { TranslationCollection } from '../utils/translation.collection';
|
||||
import { findClassDeclarations, findClassPropertyByType, findPropertyCallExpressions, findMethodCallExpressions, getStringsFromExpression, findMethodParameterByType, findConstructorDeclaration } from '../utils/ast-helpers';
|
||||
import {
|
||||
findClassDeclarations,
|
||||
findClassPropertyByType,
|
||||
findPropertyCallExpressions,
|
||||
findMethodCallExpressions,
|
||||
getStringsFromExpression,
|
||||
findMethodParameterByType,
|
||||
findConstructorDeclaration
|
||||
} from '../utils/ast-helpers';
|
||||
|
||||
const TRANSLATE_SERVICE_TYPE_REFERENCE = 'TranslateService';
|
||||
const TRANSLATE_SERVICE_METHOD_NAMES = ['get', 'instant', 'stream'];
|
||||
@@ -19,13 +27,13 @@ export class ServiceParser implements ParserInterface {
|
||||
|
||||
let collection: TranslationCollection = new TranslationCollection();
|
||||
|
||||
classDeclarations.forEach(classDeclaration => {
|
||||
classDeclarations.forEach((classDeclaration) => {
|
||||
const callExpressions = [
|
||||
...this.findConstructorParamCallExpressions(classDeclaration),
|
||||
...this.findPropertyCallExpressions(classDeclaration)
|
||||
];
|
||||
|
||||
callExpressions.forEach(callExpression => {
|
||||
callExpressions.forEach((callExpression) => {
|
||||
const [firstArg] = callExpression.arguments;
|
||||
if (!firstArg) {
|
||||
return;
|
||||
|
@@ -66,7 +66,7 @@ export function findMethodCallExpressions(node: Node, propName: string, fnName:
|
||||
fnName = fnName.join('|');
|
||||
}
|
||||
const query = `CallExpression > PropertyAccessExpression:has(Identifier[name=/^(${fnName})$/]):has(PropertyAccessExpression:has(Identifier[name="${propName}"]):not(:has(ThisKeyword)))`;
|
||||
const nodes = tsquery<PropertyAccessExpression>(node, query).map(n => n.parent as CallExpression);
|
||||
const nodes = tsquery<PropertyAccessExpression>(node, query).map((n) => n.parent as CallExpression);
|
||||
return nodes;
|
||||
}
|
||||
|
||||
@@ -102,7 +102,7 @@ export function findPropertyCallExpressions(node: Node, prop: string, fnName: st
|
||||
fnName = fnName.join('|');
|
||||
}
|
||||
const query = `CallExpression > PropertyAccessExpression:has(Identifier[name=/^(${fnName})$/]):has(PropertyAccessExpression:has(Identifier[name="${prop}"]):has(ThisKeyword))`;
|
||||
const nodes = tsquery<PropertyAccessExpression>(node, query).map(n => n.parent as CallExpression);
|
||||
const nodes = tsquery<PropertyAccessExpression>(node, query).map((n) => n.parent as CallExpression);
|
||||
return nodes;
|
||||
}
|
||||
|
||||
|
@@ -20,13 +20,17 @@ export function expandPattern(pattern: string): string[] {
|
||||
}
|
||||
|
||||
export function normalizePaths(patterns: string[], defaultPatterns: string[] = []): string[] {
|
||||
return patterns.map(pattern =>
|
||||
expandPattern(pattern).map(path => {
|
||||
path = normalizeHomeDir(path);
|
||||
if (fs.existsSync(path) && fs.statSync(path).isDirectory()) {
|
||||
return defaultPatterns.map(defaultPattern => path + defaultPattern);
|
||||
}
|
||||
return path;
|
||||
}).flat()
|
||||
).flat();
|
||||
return patterns
|
||||
.map((pattern) =>
|
||||
expandPattern(pattern)
|
||||
.map((path) => {
|
||||
path = normalizeHomeDir(path);
|
||||
if (fs.existsSync(path) && fs.statSync(path).isDirectory()) {
|
||||
return defaultPatterns.map((defaultPattern) => path + defaultPattern);
|
||||
}
|
||||
return path;
|
||||
})
|
||||
.flat()
|
||||
)
|
||||
.flat();
|
||||
}
|
||||
|
@@ -14,21 +14,18 @@ export class TranslationCollection {
|
||||
}
|
||||
|
||||
public addKeys(keys: string[]): TranslationCollection {
|
||||
const values = keys.reduce(
|
||||
(results, key) => {
|
||||
return { ...results, [key]: '' };
|
||||
},
|
||||
{} as TranslationType
|
||||
);
|
||||
const values = keys.reduce((results, key) => {
|
||||
return { ...results, [key]: '' };
|
||||
}, {} as TranslationType);
|
||||
return new TranslationCollection({ ...this.values, ...values });
|
||||
}
|
||||
|
||||
public remove(key: string): TranslationCollection {
|
||||
return this.filter(k => key !== k);
|
||||
return this.filter((k) => key !== k);
|
||||
}
|
||||
|
||||
public forEach(callback: (key?: string, val?: string) => void): TranslationCollection {
|
||||
Object.keys(this.values).forEach(key => callback.call(this, key, this.values[key]));
|
||||
Object.keys(this.values).forEach((key) => callback.call(this, key, this.values[key]));
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -56,7 +53,7 @@ export class TranslationCollection {
|
||||
|
||||
public intersect(collection: TranslationCollection): TranslationCollection {
|
||||
const values: TranslationType = {};
|
||||
this.filter(key => collection.has(key)).forEach((key, val) => {
|
||||
this.filter((key) => collection.has(key)).forEach((key, val) => {
|
||||
values[key] = val;
|
||||
});
|
||||
|
||||
@@ -87,7 +84,7 @@ export class TranslationCollection {
|
||||
const values: TranslationType = {};
|
||||
this.keys()
|
||||
.sort(compareFn)
|
||||
.forEach(key => {
|
||||
.forEach((key) => {
|
||||
values[key] = this.get(key);
|
||||
});
|
||||
|
||||
|
@@ -1 +0,0 @@
|
||||
{{ 'SOURCES.' + source.name + '.NAME_PLURAL' | translate }}
|
@@ -94,7 +94,9 @@ describe('DirectiveParser', () => {
|
||||
</p>
|
||||
`;
|
||||
const keys = parser.extract(contents, templateFilename).keys();
|
||||
expect(keys).to.deep.equal(['Please leave a message for your client letting them know why you rejected the field and what they need to do to fix it.']);
|
||||
expect(keys).to.deep.equal([
|
||||
'Please leave a message for your client letting them know why you rejected the field and what they need to do to fix it.'
|
||||
]);
|
||||
});
|
||||
|
||||
it('should extract contents without indent spaces', () => {
|
||||
@@ -105,7 +107,9 @@ describe('DirectiveParser', () => {
|
||||
</div>
|
||||
`;
|
||||
const keys = parser.extract(contents, templateFilename).keys();
|
||||
expect(keys).to.deep.equal(['There are currently no students in this class. The good news is, adding students is really easy! Just use the options at the top.']);
|
||||
expect(keys).to.deep.equal([
|
||||
'There are currently no students in this class. The good news is, adding students is really easy! Just use the options at the top.'
|
||||
]);
|
||||
});
|
||||
|
||||
it('should extract contents without indent spaces', () => {
|
||||
|
@@ -50,5 +50,4 @@ describe('MarkerParser', () => {
|
||||
const keys = parser.extract(contents, componentFilename).keys();
|
||||
expect(keys).to.deep.equal(['DYNAMIC_TRAD.val1', 'DYNAMIC_TRAD.val2']);
|
||||
});
|
||||
|
||||
});
|
||||
|
@@ -8,10 +8,9 @@
|
||||
"noImplicitUseStrict": true,
|
||||
"removeComments": true,
|
||||
"declaration": true,
|
||||
"target": "es2015",
|
||||
"target": "es2019",
|
||||
"lib": [
|
||||
"dom",
|
||||
"esnext.array"
|
||||
"es2019"
|
||||
],
|
||||
"module": "commonjs",
|
||||
"outDir": "dist",
|
||||
|
Reference in New Issue
Block a user