feat(css-blocks): Added BlockPath parser

Author: amiller-gh

packages/css-blocks/.vscode/cSpell.json

@@ -15,7 +15,8 @@
         "longhands",
         "truthy",
         "ruleset",
-        "combinator"
+        "combinator",
+        "regexpu"
     ],
     // flagWords - list of words to be always considered incorrect
     // This is useful for offensive words and common spelling errors.

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

@@ -8,6 +8,7 @@ import { LocalScopedContext, HasLocalScope, HasScopeLookup } from "../util/Local
 import { unionInto } from '../util/unionInto';
 import { ObjectDictionary, MultiMap, assertNever, objectValues } from "@opticss/util";
 import { RulesetContainer } from './RulesetContainer';
+import { CLASS_NAME_IDENT } from "../BlockSyntax";
 import {
   SelectorFactory,
   parseSelector,
@@ -27,8 +28,7 @@ import {
   isClassNode,
   isStateNode,
   NodeAndType,
-  BlockType,
-  CLASS_NAME_IDENT
+  BlockType
 } from "../BlockParser";
 
 export const OBJ_REF_SPLITTER = (s: string): [string, string] | undefined => {
@@ -485,6 +485,7 @@ export class Block
   }
 
   getReferencedBlock(localName: string): Block | null {
+    if (localName === "") { return this; }
     return this._blockReferences[localName] || null;
   }
 

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

@@ -2,7 +2,7 @@ import * as postcss from 'postcss';
 import * as propParser from 'css-property-parser';
 import { MultiMap, TwoKeyMultiMap } from "@opticss/util";
 import { Style } from './Block';
-import { BLOCK_PROP_NAMES, RESOLVE_RE, SELF_SELECTOR } from "../blockSyntax";
+import { BLOCK_PROP_NAMES, RESOLVE_RE, SELF_SELECTOR, BlockPath } from "../BlockSyntax";
 import * as errors from '../errors';
 import { sourceLocation } from "../SourceLocation";
 
@@ -110,11 +110,20 @@ export class RulesetContainer {
         // If this is a resolution, track that this property has been resolved
         if (referenceStr) {
 
+          let blockPath = new BlockPath(referenceStr);
           let other = style.block.lookup(referenceStr);
+          let otherBlock = style.block.getReferencedBlock(blockPath.block);
+
+          if (!otherBlock) {
+            throw new errors.InvalidBlockSyntax(
+              `No Block named "${blockPath.block}" found in scope.`,
+              sourceLocation(file, decl)
+            );
+          }
 
           if (!other) {
             throw new errors.InvalidBlockSyntax(
-              `Cannot resolve Style at Block path "${referenceStr}".`,
+              `No Style "${blockPath.path}" found on Block "${otherBlock.name}".`,
               sourceLocation(file, decl)
             );
           }

packages/css-blocks/src/BlockCompiler/ConflictResolver.ts

@@ -8,7 +8,7 @@ import { parseSelector, ParsedSelector, CompoundSelector } from "opticss";
 import { QueryKeySelector } from "../query";
 import { SourceLocation, sourceLocation } from "../SourceLocation";
 import * as conflictDetection from "./conflictDetection";
-import { RESOLVE_RE } from "../blockSyntax";
+import { RESOLVE_RE } from "../BlockSyntax";
 
 enum ConflictType {
   conflict,

packages/css-blocks/src/BlockCompiler/conflictDetection.ts

@@ -1,6 +1,6 @@
 import { Style } from "../Block";
 import { MultiMap } from "@opticss/util";
-import { SELF_SELECTOR } from "../blockSyntax";
+import { SELF_SELECTOR } from "../BlockSyntax";
 import { shorthandsFor, longhandsFor } from "../shortHandProps";
 
 export type Conflict = [string, string];

packages/css-blocks/src/BlockParser/block-intermediates.ts

@@ -1,13 +1,6 @@
-import regexpu = require('regexpu-core');
 import selectorParser = require('postcss-selector-parser');
 import { CompoundSelector } from "opticss";
 
-/**
- * CSS <ident-token> RegExp.
- * Defined: https://www.w3.org/TR/css-syntax-3/#typedef-ident-token
- */
-export const CLASS_NAME_IDENT = new RegExp(regexpu("^(-?(?:\\\\.|[A-Za-z_\\u{0080}-\\u{10ffff}])(?:\\\\.|[A-Za-z0-9_\\-\\u{0080}-\\u{10ffff}])*)$", "u"));
-
 /**
  * Holds state values to be passed to the StateContainer.
  */

packages/css-blocks/src/BlockParser/features/discover-name.ts

@@ -1,8 +1,7 @@
 import * as postcss from 'postcss';
 import * as errors from '../../errors';
-import { CLASS_NAME_IDENT } from "../block-intermediates";
 import { sourceLocation } from "../../SourceLocation";
-import { BLOCK_NAME } from "../../blockSyntax";
+import { BLOCK_NAME, CLASS_NAME_IDENT } from "../../BlockSyntax";
 
 export default async function discoverName(root: postcss.Root, defaultName: string, file: string): Promise<string> {
 

packages/css-blocks/src/BlockParser/features/extend-block.ts

@@ -2,7 +2,7 @@ import * as postcss from 'postcss';
 import * as errors from '../../errors';
 import { sourceLocation } from "../../SourceLocation";
 import { Block } from "../../Block";
-import { EXTENDS } from "../../blockSyntax";
+import { EXTENDS } from "../../BlockSyntax";
 
 /**
  * For each `extends` property found in the passed ruleset, set the block's base

packages/css-blocks/src/BlockParser/features/global-states.ts

@@ -5,7 +5,7 @@ import { parseSelector } from "opticss";
 import { stateParser } from "../block-intermediates";
 import { sourceLocation as loc } from "../../SourceLocation";
 import { Block } from "../../Block";
-import { BLOCK_GLOBAL } from "../../blockSyntax";
+import { BLOCK_GLOBAL } from "../../BlockSyntax";
 
 export default async function globalStates(root: postcss.Root, block: Block, file: string): Promise<Block> {
   root.walkAtRules(BLOCK_GLOBAL, (atRule) => {

packages/css-blocks/src/BlockParser/features/implement-block.ts

@@ -2,7 +2,7 @@ import * as postcss from 'postcss';
 import * as errors from '../../errors';
 import { sourceLocation } from "../../SourceLocation";
 import { Block } from "../../Block";
-import { IMPLEMENTS } from "../../blockSyntax";
+import { IMPLEMENTS } from "../../BlockSyntax";
 
 /**
  * For each `implements` property found in the passed ruleset, track the foreign

packages/css-blocks/src/BlockParser/features/process-debug-statements.ts

@@ -2,7 +2,7 @@ import parseBlockDebug from "../../parseBlockDebug";
 import * as postcss from 'postcss';
 import { Block } from "../../Block";
 import { OptionsReader } from "../../OptionsReader";
-import { BLOCK_DEBUG } from "../../blockSyntax";
+import { BLOCK_DEBUG } from "../../BlockSyntax";
 
 /**
  * Process all `@block-debug` statements, output debug statement to console or in comment as requested.

packages/css-blocks/src/BlockParser/features/resolve-references.ts

@@ -3,8 +3,7 @@ import * as errors from '../../errors';
 import { IBlockFactory } from "../../BlockFactory/IBlockFactory";
 import { sourceLocation } from "../../SourceLocation";
 import { Block } from "../../Block";
-import { CLASS_NAME_IDENT } from "../block-intermediates";
-import { BLOCK_REFERENCE } from "../../blockSyntax";
+import { BLOCK_REFERENCE, CLASS_NAME_IDENT } from "../../BlockSyntax";
 
 /**
  * Resolve all block references for a given block.

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

@@ -19,7 +19,6 @@ import extendBlock from "./features/extend-block";
 import implementBlock from "./features/implement-block";
 
 export {
-  CLASS_NAME_IDENT,
   stateParser,
   BlockType,
   NodeAndType,