fix: Correct the SourceAttributes returned by new State model.

The source attributes for the state attribute required handling for
universal states and also it was no longer including the class's source
attributes.

Author: chriseppstein

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

@@ -1,4 +1,4 @@
-import { Attribute } from "@opticss/element-analysis";
+import { Attribute, AttributeValue, attrValues } from "@opticss/element-analysis";
 
 import { UNIVERSAL_STATE } from "../BlockSyntax";
 import { OptionsReader } from "../OptionsReader";
@@ -94,9 +94,13 @@ export class BlockClass extends Style<BlockClass, Block, Block, StateGroup> {
    */
   public asSource(): string { return `.${this.name}`; }
 
-  public asSourceAttributes(): Attribute[] {
+  public asSourceAttributes(optionalRoot = false): Attribute[] {
     if (!this._sourceAttribute) {
-      this._sourceAttribute = new Attribute("class", { constant: this.name });
+      let value: AttributeValue = { constant: this.name };
+      if (optionalRoot && this.isRoot) {
+        value = attrValues.oneOf([value, attrValues.absent()]);
+      }
+      this._sourceAttribute = new Attribute("class", value);
     }
     return [this._sourceAttribute];
   }

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

@@ -1,6 +1,7 @@
 import {
   Attr,
   AttributeNS,
+  attrValues,
 } from "@opticss/element-analysis";
 import { assertNever, assertNeverCalled } from "@opticss/util";
 
@@ -59,8 +60,11 @@ export class State extends Style<State, Block, StateGroup, never> {
 
   asSourceAttributes(): Attr[] {
     if (!this._sourceAttributes) {
-      this._sourceAttributes = [];
-      this._sourceAttributes.push(new AttributeNS("state", this.parent.name, { constant: this.name }));
+      let blockClass = this.blockClass;
+      let rootIsOptional = true;
+      this._sourceAttributes = blockClass.asSourceAttributes(rootIsOptional);
+      let value = this.isUniversal ? attrValues.absent() : attrValues.constant(this.name);
+      this._sourceAttributes.push(new AttributeNS("state", this.parent.name, value));
     }
     return this._sourceAttributes.slice();
   }