iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: pass `stripExportPattern` as an array of `RegExp` (#26012) 

This is a workaround for https://github.com/bazelbuild/rules_nodejs/issues/317

PR Close #26012
This commit is contained in:
Alan Agius 2018-09-19 13:40:21 +02:00 committed by Alex Rickabaugh
parent 63b795ae4a
commit aac08e0438
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/ts-api-guardian/index.bzl
View File

@ -19,7 +19,7 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary", "nodejs_test")
COMMON_MODULE_IDENTIFIERS = ["angular", "jasmine", "protractor"] COMMON_MODULE_IDENTIFIERS = ["angular", "jasmine", "protractor"]
def ts_api_guardian_test(name, golden, actual, data = [], strip_export_pattern = "^\(__\|ɵ\)", allow_module_identifiers = COMMON_MODULE_IDENTIFIERS, **kwargs): def ts_api_guardian_test(name, golden, actual, data = [], strip_export_pattern = ["^__", "^ɵ"], allow_module_identifiers = COMMON_MODULE_IDENTIFIERS, **kwargs):
"""Runs ts_api_guardian """Runs ts_api_guardian
""" """
data += [ data += [
@ -31,9 +31,11 @@ def ts_api_guardian_test(name, golden, actual, data = [], strip_export_pattern =
# Needed so that node doesn't walk back to the source directory. # Needed so that node doesn't walk back to the source directory.
# From there, the relative imports would point to .ts files. # From there, the relative imports would point to .ts files.
"--node_options=--preserve-symlinks", "--node_options=--preserve-symlinks",
"--stripExportPattern",
strip_export_pattern,
] ]
for i in strip_export_pattern:
args += ["--stripExportPattern", i]
for i in allow_module_identifiers: for i in allow_module_identifiers:
args += ["--allowModuleIdentifiers", i] args += ["--allowModuleIdentifiers", i]

2
tools/ts-api-guardian/lib/cli.ts
View File

@ -22,7 +22,7 @@ export function startCli() {
const {argv, mode, errors} = parseArguments(process.argv.slice(2)); const {argv, mode, errors} = parseArguments(process.argv.slice(2));
const options: SerializationOptions = { const options: SerializationOptions = {
stripExportPattern: argv['stripExportPattern'], stripExportPattern: [].concat(argv['stripExportPattern']),
allowModuleIdentifiers: [].concat(argv['allowModuleIdentifiers']), allowModuleIdentifiers: [].concat(argv['allowModuleIdentifiers']),
}; };

10
tools/ts-api-guardian/lib/serializer.ts
View File

@ -19,7 +19,7 @@ export interface SerializationOptions {
/** /**
* Removes all exports matching the regular expression. * Removes all exports matching the regular expression.
*/ */
stripExportPattern?: RegExp; stripExportPattern?: RegExp|RegExp[];
/** /**
* Whitelists these identifiers as modules in the output. For example, * Whitelists these identifiers as modules in the output. For example,
* ``` * ```
@ -88,7 +88,7 @@ class ResolvedDeclarationEmitter {
resolvedSymbols.sort(symbolCompareFunction); resolvedSymbols.sort(symbolCompareFunction);
for (const symbol of resolvedSymbols) { for (const symbol of resolvedSymbols) {
if (this.options.stripExportPattern && symbol.name.match(this.options.stripExportPattern)) { if (this.isExportPatternStripped(symbol.name)) {
continue; continue;
} }
@ -145,6 +145,10 @@ class ResolvedDeclarationEmitter {
return output; return output;
} }
private isExportPatternStripped(symbolName: string): boolean {
return [].concat(this.options.stripExportPattern).some(p => !!(p && symbolName.match(p)));
}
private getResolvedSymbols(sourceFile: ts.SourceFile): ts.Symbol[] { private getResolvedSymbols(sourceFile: ts.SourceFile): ts.Symbol[] {
const ms = (<any>sourceFile).symbol; const ms = (<any>sourceFile).symbol;
const rawSymbols = ms ? (this.typeChecker.getExportsOfModule(ms) || []) : []; const rawSymbols = ms ? (this.typeChecker.getExportsOfModule(ms) || []) : [];
@ -157,7 +161,7 @@ class ResolvedDeclarationEmitter {
return s; return s;
} }
if (resolvedSymbol.name !== s.name) { if (resolvedSymbol.name !== s.name) {
if (this.options.stripExportPattern && s.name.match(this.options.stripExportPattern)) { if (this.isExportPatternStripped(s.name)) {
return s; return s;
} }
throw new Error( throw new Error(