fix(css-blocks): Rename BlockTree node types, clea up exports.

Author: amiller-gh

packages/css-blocks/src/Block/Block.ts

@@ -24,7 +24,7 @@ import { FileIdentifier } from "../importing";
 import { LocalScopedContext } from "../util/LocalScope";
 
 import { BlockClass } from "./BlockClass";
-import { Source } from "./BlockTree";
+import { SourceNode } from "./BlockTree";
 import { State } from "./State";
 
 export type Style = BlockClass | State;
@@ -39,7 +39,7 @@ export const OBJ_REF_SPLITTER = (s: string): [string, string] | undefined => {
 };
 
 export class Block
-  extends Source<Block, BlockClass>
+  extends SourceNode<Block, BlockClass>
   implements SelectorFactory {
   private _rootClass: BlockClass;
   private _blockReferences: ObjectDictionary<Block> = {};

packages/css-blocks/src/Block/BlockClass.ts

@@ -5,7 +5,7 @@ import { OptionsReader } from "../OptionsReader";
 import { OutputMode } from "../OutputMode";
 
 import { Block } from "./Block";
-import { NodeStyle } from "./BlockTree";
+import { StyleNode } from "./BlockTree";
 import { State } from "./State";
 import { StateGroup } from "./StateGroup";
 
@@ -20,7 +20,7 @@ export interface StateInfo {
 /**
  * Represents a Class present in the Block.
  */
-export class BlockClass extends NodeStyle<BlockClass, Block, Block, StateGroup> {
+export class BlockClass extends StyleNode<BlockClass, Block, Block, StateGroup> {
   private _sourceAttribute: Attribute | undefined;
 
   protected newChild(name: string): StateGroup { return new StateGroup(name, this, this.block); }

packages/css-blocks/src/Block/BlockTree/Style.ts

@@ -111,23 +111,6 @@ export abstract class Style<
     return undefined;
   }
 
-  /**
-   * Compute all block objects that are implied by this block object through
-   * inheritance. Does not include this object or the styles it implies through
-   * other relationships to this object.
-   *
-   * If nothing is inherited, this returns an empty set.
-   */
-  resolveInheritance(): Self[] {
-    let inherited: Self[] = [];
-    let base: Self | undefined = this.base;
-    while (base) {
-      inherited.unshift(base);
-      base = base.base;
-    }
-    return inherited;
-  }
-
   /**
    * Debug utility to help log Styles
    * @param opts  Options for rendering cssClass.

packages/css-blocks/src/Block/BlockTree/index.ts

@@ -1,48 +1,50 @@
 import { AnyNode, Inheritable } from "./Inheritable";
-export { Ruleset } from "./RulesetContainer";
 import { Style } from "./Style";
 
-export { Style, isStyle } from "./Style";
-
 // Its days like these that I wish JavaScript had multiple inheritance.
-export abstract class Source<
-  Self extends Source<Self, Child>,
+export abstract class SourceNode<
+  Self extends SourceNode<Self, Child>,
   Child extends Inheritable<Child, Self, Self, AnyNode>
 > extends Inheritable<Self, Self, null, Child> {
-  constructor(name: string) {
-    super(name, null);
-  }
+  constructor(name: string) { super(name, null); }
 }
 
 export abstract class Node<
   Self extends Node<Self, Root, Parent, Child>,
-  Root extends Source<Root, AnyNode>,
+  Root extends SourceNode<Root, AnyNode>,
   Parent extends Inheritable<Parent, Root, AnyNode, Self>,
   Child extends Inheritable<Child, Root, Self, AnyNode | null>
 > extends Inheritable<Self, Root, Parent, Child> {
   constructor(name: string, parent: Parent, root: Root) { super(name, parent, root); }
 }
 
-export abstract class Sink<
+export abstract class SinkNode<
   Self extends Inheritable<Self, Root, Parent, null>,
-  Root extends Source<Root, AnyNode>,
+  Root extends SourceNode<Root, AnyNode>,
   Parent extends Inheritable<Parent, Root, AnyNode, Self>
 > extends Inheritable<Self, Root, Parent, null> {
   constructor(name: string, parent: Parent, root: Root) { super(name, parent, root); }
 }
 
-export abstract class NodeStyle<
+export abstract class StyleSource<
+  Self extends StyleSource<Self, Child>,
+  Child extends Inheritable<Child, Self, Self, AnyNode>
+> extends Inheritable<Self, Self, null, Child> {
+  constructor(name: string) { super(name, null); }
+}
+
+export abstract class StyleNode<
   Self extends Style<Self, Root, Parent, Child>,
-  Root extends Source<Root, AnyNode>,
+  Root extends SourceNode<Root, AnyNode>,
   Parent extends Inheritable<Parent, Root, AnyNode | null, Self>,
   Child extends Inheritable<Child, Root, Self, AnyNode | null>
 > extends Style<Self, Root, Parent, Child> {
   constructor(name: string, parent: Parent, root: Root) { super(name, parent, root); }
 }
 
-export abstract class SinkStyle<
+export abstract class StyleSink<
   Self extends Style<Self, Root, Parent, null>,
-  Root extends Source<Root, AnyNode>,
+  Root extends SourceNode<Root, AnyNode>,
   Parent extends Inheritable<Parent, Root, AnyNode, Self>
 > extends Style<Self, Root, Parent, null> {
   constructor(name: string, parent: Parent, root: Root) { super(name, parent, root); }

packages/css-blocks/src/Block/State.ts

@@ -10,15 +10,15 @@ import { OutputMode } from "../OutputMode";
 
 import { Block } from "./Block";
 import { BlockClass } from "./BlockClass";
-import { SinkStyle } from "./BlockTree";
+import { StyleSink } from "./BlockTree";
 import { StateGroup } from "./StateGroup";
 
 /**
  * States represent a state attribute selector in a particular Block.
  * A State can have sub-states that are considered to be mutually exclusive.
  * States can be designated as "global";
  */
-export class State extends SinkStyle<State, Block, StateGroup> {
+export class State extends StyleSink<State, Block, StateGroup> {
   isGlobal = false;
 
   private _sourceAttributes: AttributeNS[] | undefined;

packages/css-blocks/src/Block/index.ts

@@ -2,4 +2,3 @@ export { Style, Block, isBlock, OBJ_REF_SPLITTER } from "./Block";
 export { BlockClass, isBlockClass } from "./BlockClass";
 export { StateGroup } from "./StateGroup";
 export { State, isState } from "./State";
-export { RulesetContainer } from "./BlockTree/RulesetContainer";

packages/css-blocks/src/TemplateAnalysis/validations/property-conflict-validator.ts

@@ -3,7 +3,7 @@ import * as propParser from "css-property-parser";
 import * as postcss from "postcss";
 
 import { Style } from "../../Block";
-import { Ruleset } from "../../Block/BlockTree";
+import { Ruleset } from "../../Block/BlockTree/RulesetContainer";
 import {
   isBooleanState,
   isFalseCondition,