build restrict tree of abstract component comma separated

Author: Brian Lonsdorf

lib/__tests__/index.js

@@ -48,6 +48,9 @@ describe('parser', () => {
         const restrictee = table.get('restrictees').first()
         expect(restrictee.getIn(['annotations', 'selector'])).toEqual('.slds-table')
       })
+      it('does not add itself as a restrictee', () => {
+        expect(table.get('restrictees').first().get('id')).toEqual('basic')
+      })
       it('does not place overly verbose restricts on outter mentioned elements', () => {
       // slds-is-sortable__icon restrict looks like
      // @restrict .slds-table--fixed-layout th.slds-is-sortable .slds-icon

lib/comment.js

@@ -30,10 +30,10 @@ module.exports = repo => {
 
   // decorateWithRestrictees :: Component -> Component
   const decorateWithRestrictees = comp =>
-    repo.findFirstVariant(getSelector(comp))
-    .map(setId)
+    repo.findFirstVariants(getSelector(comp))
+    .map(vs => vs.map(setId))
     .fold(l => comp.set('restrictees', List()),
-          v => comp.set('restrictees', List.of(recurse(Map(), v))))
+          vs => comp.set('restrictees', vs.map(v => recurse(Map(), v))))
 
   // setId :: Comment -> Comment
   const setId = comment =>

lib/repository.js

@@ -1,8 +1,9 @@
 // Copyright (c) 2015-present, salesforce.com, inc. All rights reserved
 // Licensed under BSD 3-Clause - see LICENSE.txt or git.io/sfdc-license
 
-const { Right, Left, fromNullable } = require('data.either')
-const { List, Map, OrderedSet } = require('immutable-ext')
+const Either = require('data.either')
+const { Right, Left, fromNullable } = Either
+const { List, Map, OrderedSet, Set } = require('immutable-ext')
 
 const { toTree } = require('./tree')
 const { find } = require('./utils')
@@ -83,9 +84,16 @@ module.exports = comments => {
   const findAllBySelector = selector =>
     utils.filter(comment => selectorMatches('selector', selector, comment))
 
-  // findFirstVariant :: String -> Either Null Variant
-  const findFirstVariant = selector =>
-    find(variants(comments), v => getSelector(v) === selector)
+  // findFirstVariants :: String -> Either Null Variant
+  const findFirstVariants = selector =>
+    Either.of(selector.split(','))
+    .map(xs => xs.map(x => x.trim()))
+    .map(xs => Set(xs))
+    .map(selectors =>
+      variants(comments)
+      .filter(v =>
+        selectors.has(getSelector(v))))
+    .map(xs => xs.toList())
 
   // findVariants :: Component -> List Variant
   const findVariants = comp =>
@@ -128,7 +136,7 @@ module.exports = comments => {
     findModifier,
     findComponent,
     findUtility,
-    findFirstVariant,
+    findFirstVariants,
     findAllByRestrict,
     findAllBySelector,
     findVariants