Compare commits

..

2 Commits

Author SHA1 Message Date
Kim Biesbjerg
567a0586dc Update deps 2021-04-14 10:08:21 +02:00
Jabi
17dfbbed84 enable piped argument on function calls (#233) 2021-04-14 10:00:44 +02:00
4 changed files with 449 additions and 839 deletions

1243
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -61,29 +61,29 @@
}, },
"config": {}, "config": {},
"devDependencies": { "devDependencies": {
"@angular/compiler": "^10.1.3", "@angular/compiler": "^11.2.9",
"@types/braces": "^3.0.0", "@types/braces": "^3.0.0",
"@types/chai": "^4.2.12", "@types/chai": "^4.2.16",
"@types/flat": "^5.0.1", "@types/flat": "^5.0.1",
"@types/gettext-parser": "4.0.0", "@types/gettext-parser": "4.0.0",
"@types/glob": "^7.1.3", "@types/glob": "^7.1.3",
"@types/mkdirp": "^1.0.1", "@types/mkdirp": "^1.0.1",
"@types/mocha": "^8.0.3", "@types/mocha": "^8.2.2",
"@types/node": "^14.11.2", "@types/node": "^14.14.37",
"@types/yargs": "^15.0.7", "@types/yargs": "^16.0.1",
"braces": "^3.0.2", "braces": "^3.0.2",
"chai": "^4.2.0", "chai": "^4.3.4",
"husky": "^4.3.0", "husky": "^6.0.0",
"lint-staged": "^10.4.0", "lint-staged": "^10.5.4",
"mocha": "^8.1.3", "mocha": "^8.3.2",
"prettier": "^2.1.2", "prettier": "^2.2.1",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"ts-node": "^9.0.0", "ts-node": "^9.1.1",
"tslint": "^6.1.3", "tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0", "tslint-config-prettier": "^1.18.0",
"tslint-eslint-rules": "^5.4.0", "tslint-eslint-rules": "^5.4.0",
"tslint-etc": "^1.13.7", "tslint-etc": "^1.13.9",
"typescript": "^4.0.3" "typescript": "^4.2.4"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/compiler": ">=8.0.0", "@angular/compiler": ">=8.0.0",
@@ -91,14 +91,14 @@
}, },
"dependencies": { "dependencies": {
"@phenomnomnominal/tsquery": "^4.1.1", "@phenomnomnominal/tsquery": "^4.1.1",
"boxen": "^4.2.0", "boxen": "^5.0.1",
"colorette": "^1.2.1", "colorette": "^1.2.2",
"flat": "^5.0.2", "flat": "^5.0.2",
"gettext-parser": "^4.0.4", "gettext-parser": "^4.0.4",
"glob": "^7.1.6", "glob": "^7.1.6",
"mkdirp": "^1.0.4", "mkdirp": "^1.0.4",
"path": "^0.12.7", "path": "^0.12.7",
"terminal-link": "^2.1.1", "terminal-link": "^2.1.1",
"yargs": "^16.0.3" "yargs": "^16.2.0"
} }
} }

View File

@@ -9,7 +9,8 @@ import {
Binary, Binary,
LiteralMap, LiteralMap,
LiteralArray, LiteralArray,
Interpolation Interpolation,
MethodCall
} from '@angular/compiler'; } from '@angular/compiler';
import { ParserInterface } from './parser.interface'; import { ParserInterface } from './parser.interface';
@@ -131,6 +132,10 @@ export class PipeParser implements ParserInterface {
return this.getTranslatablesFromAsts(ast.expressions); return this.getTranslatablesFromAsts(ast.expressions);
} }
if (ast instanceof MethodCall) {
return this.getTranslatablesFromAsts(ast.args);
}
return []; return [];
} }

View File

@@ -195,4 +195,10 @@ describe('PipeParser', () => {
const keys = parser.extract(contents, templateFilename).keys(); const keys = parser.extract(contents, templateFilename).keys();
expect(keys).to.deep.equal([]); expect(keys).to.deep.equal([]);
}); });
it('should extract strings from piped arguments inside a function calls on templates', () => {
const contents = `{{ callMe('Hello' | translate, 'World' | translate ) }}`;
const keys = parser.extract(contents, templateFilename).keys();
expect(keys).to.deep.equal([`Hello`, `World`]);
});
}); });