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

build(aio): better parsing of selectors as aliases for directives/components (#20512) 

PR Close #20512
This commit is contained in:
Peter Bacon Darwin 2017-11-17 13:37:15 +00:00 committed by Miško Hevery
parent c2cb475a2c
commit ecce90718b
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
aio/package.json
View File

@ -98,6 +98,7 @@
"codelyzer": "~2.0.0", "codelyzer": "~2.0.0",
"concurrently": "^3.4.0", "concurrently": "^3.4.0",
"cross-spawn": "^5.1.0", "cross-spawn": "^5.1.0",
"css-selector-parser": "^1.3.0",
"dgeni": "^0.4.7", "dgeni": "^0.4.7",
"dgeni-packages": "0.22.0", "dgeni-packages": "0.22.0",
"entities": "^1.1.1", "entities": "^1.1.1",

14
aio/tools/transforms/angular-api-package/processors/addMetadataAliases.js vendored
View File

@ -1,3 +1,5 @@
const CssSelectorParser = require('css-selector-parser').CssSelectorParser;
const cssParser = new CssSelectorParser();
/** /**
* @dgProcessor addMetadataAliases * @dgProcessor addMetadataAliases
* *
@ -28,11 +30,13 @@ module.exports = function addMetadataAliasesProcessor() {
}; };
function extractSelectors(selectors) { function extractSelectors(selectors) {
if (selectors) { const selectorAST = cssParser.parse(stripQuotes(selectors));
return stripQuotes(selectors).split(',').map(selector => selector.replace(/^\W*([\w-]+)\W*$/, '$1')); const rules = selectorAST.selectors ? selectorAST.selectors.map(ruleSet => ruleSet.rule) : [selectorAST.rule];
} else { return rules.reduce((aliases, rule) => {
return []; const tagAliases = rule.tagName? [rule.tagName] : [];
} const attrRulesAliases = (rule.attrs || []).map(attr => attr.name);
return aliases.concat(tagAliases, attrRulesAliases);
}, []);
} }
function stripQuotes(value) { function stripQuotes(value) {

2
aio/tools/transforms/angular-api-package/processors/addMetadataAliases.spec.js
View File

@ -46,7 +46,7 @@ describe('addSelectorsAsAliases processor', () => {
expect(docs[3].aliases).toEqual([docs[3].name]); expect(docs[3].aliases).toEqual([docs[3].name]);
expect(docs[4].aliases).toEqual([docs[4].name, 'myPipe']); expect(docs[4].aliases).toEqual([docs[4].name, 'myPipe']);
expect(docs[5].aliases).toEqual([docs[5].name, 'my-directive', 'myDirective', 'my-directive']); expect(docs[5].aliases).toEqual([docs[5].name, 'my-directive', 'myDirective', 'my-directive']);
expect(docs[6].aliases).toEqual([docs[6].name, '[ngModel]:not([formControlName]):not([formControl])']); expect(docs[6].aliases).toEqual([docs[6].name, 'ngModel']);
expect(docs[7].aliases).toEqual([docs[7].name, 'my-component']); expect(docs[7].aliases).toEqual([docs[7].name, 'my-component']);
expect(docs[8].aliases).toEqual([docs[8].name]); expect(docs[8].aliases).toEqual([docs[8].name]);
expect(docs[9].aliases).toEqual([docs[9].name]); expect(docs[9].aliases).toEqual([docs[9].name]);

4
aio/yarn.lock
View File

@ -2007,6 +2007,10 @@ css-select@^1.1.0:
domutils "1.5.1" domutils "1.5.1"
nth-check "~1.0.1" nth-check "~1.0.1"
css-selector-parser@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/css-selector-parser/-/css-selector-parser-1.3.0.tgz#5f1ad43e2d8eefbfdc304fcd39a521664943e3eb"
css-selector-tokenizer@^0.7.0: css-selector-tokenizer@^0.7.0:
version "0.7.0" version "0.7.0"
resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86" resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"