fix: handle inheritance in runtime class expressions.

Author: chriseppstein

packages/glimmer-templates/src/ClassnamesHelperGenerator.ts

@@ -20,7 +20,9 @@ import {
   BooleanExpression,
   OrExpression,
   NotExpression,
-  AndExpression
+  AndExpression,
+  BlockClass,
+  Block
 } from "css-blocks";
 import {
   TemplateElement,
@@ -36,6 +38,7 @@ import {
 import {
   assertNever,
   unwrap,
+  isSome,
 } from "@opticss/util";
 
 const enum SourceExpression {
@@ -130,23 +133,31 @@ function constructTernary(classes: DynamicClasses<TernaryAST>, rewrite: IndexedC
   expr.push(classes.condition);
   // The true styles
   if (isTrueCondition(classes)) {
-    expr.push(builders.number(classes.whenTrue.length));
-    // TODO: inheritance
-    expr.push(...classes.whenTrue.map(style => builders.number(unwrap(rewrite.indexOf(style)))));
+    let trueClasses = resolveInheritance(classes.whenTrue, rewrite);
+    expr.push(builders.number(trueClasses.length));
+    expr.push(...trueClasses.map(style => builders.number(unwrap(rewrite.indexOf(style)))));
   } else {
     expr.push(builders.number(0));
   }
   // The false styles
   if (isFalseCondition(classes)) {
-    expr.push(builders.number(classes.whenFalse.length));
-    // TODO: inheritance
-    expr.push(...classes.whenFalse.map(style => builders.number(unwrap(rewrite.indexOf(style)))));
+    let falseClasses = resolveInheritance(classes.whenFalse, rewrite);
+    expr.push(builders.number(falseClasses.length));
+    expr.push(...falseClasses.map(style => builders.number(unwrap(rewrite.indexOf(style)))));
   } else {
     expr.push(builders.number(0));
   }
   return expr;
 }
 
+function resolveInheritance(classes: Array<BlockClass|Block>, rewrite: IndexedClassRewrite<BlockObject>) {
+  let allClasses = [...classes];
+  for (let c of classes) {
+    allClasses.push(...c.resolveInheritance() as Set<Block> | Set<BlockClass>);
+  }
+  return allClasses.filter(c => isSome(rewrite.indexOf(c)));
+}
+
 /*
  * if conditional type has a dependency:
  *   3/4: number (d) of style indexes this is dependent on.