fix: Don't permute analyses -- exponents and factorials are bad.

linkedin · Nov 22, 2017 · ee93a6c · ee93a6c
1 parent bf9fd78
commit ee93a6c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 33 deletions.
diff --git a/packages/opticss/src/Actions/actions/MergeDeclarations.ts b/packages/opticss/src/Actions/actions/MergeDeclarations.ts
@@ -27,6 +27,7 @@ import {
 import {
   DeclarationInfo
 } from '../../optimizations/MergeDeclarations/StyleInfo';
+import { isRoot } from 'postcss-selector-parser';
 
 const {
   isAttribute,
@@ -135,6 +136,8 @@ export class MergeDeclarations extends MultiAction {
             if (isAtRule(ruleParent)) {
               this.removedAtRules.push(ruleParent);
               ruleParent.remove();
+            } else if (isRoot(ruleParent)) {
+              // Empty stylesheet
             } else {
               console.warn("this is a weird parent for a rule: ", ruleParent);
             }

diff --git a/packages/opticss/src/Match/AttributeMatcher.ts b/packages/opticss/src/Match/AttributeMatcher.ts
@@ -10,7 +10,6 @@ import {
   isStartsAndEndsWith,
   isSet,
   isChoice,
-  isFlattenedSet,
 } from '@opticss/template-api';
 import { Memoize } from 'typescript-memoize';
 import * as SelectorParser from 'postcss-selector-parser';
@@ -110,7 +109,7 @@ export class AttributeMatcher extends Matcher<Attr> {
    * @param [value=this.value] the attribute value to match against.
    * @returns boolean if it matches or not
    */
-  matchIdent(attr: Attr, identifier: string, value: AttributeValue = attr.value): Match {
+  matchIdent(attr: Attr, identifier: string, value: AttributeValue = attr.value, whitespaceDelimited = false): Match {
     if (isAbsent(value)) {
       return Match.no;
     } else if (isUnknown(value)) {
@@ -131,13 +130,18 @@ export class AttributeMatcher extends Matcher<Attr> {
       return boolToMatch(identifier.startsWith(value.startsWith) &&
         identifier.endsWith(value.endsWith));
     } else if (isSet(value)) {
-      // This is a tricky case. There really shouldn't be an `allOf` used
-      // for an identifier match. In theory a regex could be constructed?
-      // I'm hesitant to throw an error here but maybe I should?
-      return Match.no;
+      if (whitespaceDelimited) {
+        return boolToMatch(value.allOf.some(v =>
+          matches(this.matchIdent(attr, identifier, v, whitespaceDelimited))));
+      } else {
+        // This is a tricky case. There really shouldn't be an `allOf` used
+        // for an identifier match. In theory a regex could be constructed?
+        // I'm hesitant to throw an error here but maybe I should?
+        return Match.no;
+      }
     } else if (isChoice(value)) {
       return boolToMatch(value.oneOf.some(v =>
-        matches(this.matchIdent(attr, identifier, v))));
+        matches(this.matchIdent(attr, identifier, v, whitespaceDelimited))));
     } else {
       return assertNever(value);
     }
@@ -153,10 +157,8 @@ export class AttributeMatcher extends Matcher<Attr> {
    * @returns boolean if it matches
    */
   matchWhitespaceDelimited(attr: Attr, identifier: string, value?: AttributeValue): boolean {
-    let isTopLevel = false;
     if (!value) {
       value = attr.value;
-      isTopLevel = true;
     }
     if (isAbsent(value)) {
       return false;
@@ -179,28 +181,10 @@ export class AttributeMatcher extends Matcher<Attr> {
         return false;
       }
       return true;
-    } else if (isTopLevel && (isChoice(value) || isSet(value))) {
-      let flattenedValues = attr.flattenedValue(value);
-      for (let flattenedValue of flattenedValues) {
-        if (isFlattenedSet(flattenedValue)) {
-          for (let v of flattenedValue.allOf) {
-            let m = this.matchIdent(attr, identifier, v);
-            if (m === Match.yes) {
-              return true;
-            }
-          }
-        } else {
-          let m = this.matchIdent(attr, identifier, flattenedValue);
-          if (m === Match.yes) {
-            return true;
-          }
-        }
-      }
-      return false;
     } else if (isSet(value)) {
-      return value.allOf.some(v => matches(this.matchIdent(attr, identifier, v)));
+      return value.allOf.some(v => matches(this.matchIdent(attr, identifier, v, true)));
     } else if (isChoice(value)) {
-      return value.oneOf.some(v => matches(this.matchIdent(attr, identifier, v)));
+      return value.oneOf.some(v => matches(this.matchIdent(attr, identifier, v, true)));
     } else {
       return assertNever(value);
     }

diff --git a/packages/template-api/src/StyleMapping.ts b/packages/template-api/src/StyleMapping.ts
@@ -269,10 +269,8 @@ export class StyleMapping {
     // match the value descriptors -- not to be derived from the analysis for
     // our immediate needs this works tho and it's much faster than
     // deriving it from the styles.
-    let names = new Set<string>();
-    attr.flattenedValue().forEach(v => {
-      stringsForValue(v).forEach(sv => names.add(sv));
-    });
+    // let names = new Set<string>();
+    let names = attr.constants();
     let nameArray = new Array(...names);
     nameArray.sort();
     return nameArray.map(value => {