chore: Update selector-parser. Use public libs from opticss.

We sometimes hits typescript compilation issues due to opticss and
css-blocks both holding their own dependency on postcss and
postcss-selector-parser. So opticss now exports those libraries from its
dependency and css-blocks dropped our dep on them and typescript doesn't
get mad anymore.

Author: chriseppstein

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

@@ -10,7 +10,7 @@
       "request": "launch",
       "name": "Launch Program",
       "preLaunchTask": "compile",
-      "program": "${workspaceRoot}/node_modules/.bin/_mocha",
+      "program": "${workspaceRoot}/../../node_modules/.bin/_mocha",
       "args": [
         "dist/test",
         "--opts",

packages/css-blocks/package.json

@@ -4,17 +4,17 @@
   "description": "Fast, maintainable, optimal, component-oriented CSS.",
   "main": "dist/src/index.js",
   "scripts": {
-    "compile": "rm -rf dist && tsc",
+    "compile": "../../node_modules/.bin/tsc --version && rm -rf dist && ../../node_modules/.bin/tsc",
     "pretest": "yarn run compile",
-    "test": "mocha dist/test --opts test/mocha.opts",
+    "test": "../../node_modules/.bin/mocha dist/test --opts test/mocha.opts",
     "posttest": "yarn run lint",
     "prepublish": "yarn run compile && yarn run lintall",
-    "lint": "tslint -t msbuild --project . -c tslint.cli.json",
-    "lintall": "tslint -t msbuild --project . -c tslint.release.json",
-    "lintfix": "tslint -t msbuild --project . -c tslint.cli.json --fix",
-    "coverage": "istanbul cover -i \"dist/src/**/*.js\" --dir ./build/coverage node_modules/.bin/_mocha -- dist/test --opts test/mocha.opts",
-    "remap": "remap-istanbul -i build/coverage/coverage.json -o coverage -t html",
-    "docs": "typedoc --out ./docs .",
+    "lint": "../../node_modules/.bin/tslint -t msbuild --project . -c tslint.cli.json",
+    "lintall": "../../node_modules/.bin/tslint -t msbuild --project . -c tslint.release.json",
+    "lintfix": "../../node_modules/.bin/tslint -t msbuild --project . -c tslint.cli.json --fix",
+    "coverage": "../../node_modules/.bin/istanbul cover -i \"dist/src/**/*.js\" --dir ./build/coverage node_modules/.bin/_mocha -- dist/test --opts test/mocha.opts",
+    "remap": "../../node_modules/.bin/remap-istanbul -i build/coverage/coverage.json -o coverage -t html",
+    "docs": "../../node_modules/.bin/typedoc --out ./docs .",
     "watch": "watch 'yarn run test' './src' './test' --wait=3"
   },
   "repository": {
@@ -53,7 +53,6 @@
     "inline-source-map-comment": "^1.0.5",
     "json-parse-better-errors": "^1.0.1",
     "object.values": "^1.0.4",
-    "postcss-selector-parser": "3.1.1",
     "regexpu-core": "^4.0.11",
     "source-map": "^0.6.1",
     "watch": "^1.0.2"

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

@@ -1,6 +1,6 @@
 import { MultiMap, TwoKeyMultiMap, objectValues } from "@opticss/util";
 import * as propParser from "css-property-parser";
-import * as postcss from "postcss";
+import { postcss } from "opticss";
 
 import { Ruleset, Style } from "../../BlockTree";
 import {

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

@@ -1,7 +1,5 @@
 import { assertNever } from "@opticss/util";
-import { CompoundSelector, ParsedSelector, parseSelector } from "opticss";
-import * as postcss from "postcss";
-import selectorParser = require("postcss-selector-parser");
+import { CompoundSelector, ParsedSelector, parseSelector, postcss, postcssSelectorParser as selectorParser } from "opticss";
 
 import { getBlockNode } from "../BlockParser";
 import { RESOLVE_RE } from "../BlockSyntax";
@@ -309,7 +307,7 @@ export class ConflictResolver {
    * @param s The compound selector to split.
    * @returns [ CompoundSelector, Combinator, CompoundSelector ]
    */
-  private splitSelector(s: CompoundSelector): [CompoundSelector | undefined, selectorParser.Combinator | undefined, CompoundSelector] {
+  private splitSelector(s: CompoundSelector): [CompoundSelector, selectorParser.Combinator, CompoundSelector] | [undefined, undefined, CompoundSelector] {
     s = s.clone();
     let last = s.removeLast();
     if (last) {

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

@@ -1,5 +1,5 @@
 import { TemplateTypes } from "@opticss/template-api";
-import * as postcss from "postcss";
+import { postcss } from "opticss";
 
 import { Analyzer } from "../Analyzer";
 import {

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

@@ -1,7 +1,7 @@
 import { ObjectDictionary } from "@opticss/util";
 import * as debugGenerator from "debug";
+import { postcss } from "opticss";
 import * as path from "path";
-import * as postcss from "postcss";
 import { RawSourceMap } from "source-map";
 
 import { Block } from "../BlockTree";

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

@@ -1,4 +1,4 @@
-import * as postcss from "postcss";
+import { postcss } from "opticss";
 
 import { Block } from "../BlockTree";
 import { Options, ResolvedConfiguration, resolveConfiguration } from "../configuration";

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

@@ -1,6 +1,5 @@
-import { assertNever, firstOfType } from "@opticss/util";
-import { CompoundSelector } from "opticss";
-import selectorParser = require("postcss-selector-parser");
+import { assertNever, firstOfType, whatever } from "@opticss/util";
+import { CompoundSelector, postcssSelectorParser as selectorParser } from "opticss";
 
 import { ATTR_PRESENT, AttrToken, ROOT_CLASS, STATE_NAMESPACE } from "../BlockSyntax";
 
@@ -81,26 +80,19 @@ export function isClassLevelObject(object: NodeAndType): boolean {
 /**
  * Check if given selector node is targeting the root block node
  */
-export function isRootNode(node: selectorParser.Node): node is selectorParser.Pseudo {
-  return node.type === selectorParser.PSEUDO && node.value === ROOT_CLASS;
+export function isRootNode(node: whatever): node is selectorParser.Pseudo {
+  return selectorParser.isPseudoClass(node) && node.value === ROOT_CLASS;
 }
 
-/**
- * Check if given selector node is a class selector
- * @param  node The selector to test.
- * @return True if class selector, false if not.
- */
-export function isClassNode(node: selectorParser.Node): node is selectorParser.ClassName {
-  return node.type === selectorParser.CLASS;
-}
+export const isClassNode = selectorParser.isClassName;
 
 /**
  * Check if given selector node is an attribute selector
  * @param  node The selector to test.
  * @return True if attribute selector, false if not.
  */
 export function isAttributeNode(node: selectorParser.Node): node is selectorParser.Attribute {
-  return node.type === selectorParser.ATTRIBUTE && node.namespace === STATE_NAMESPACE;
+  return selectorParser.isAttribute(node) && node.namespace === STATE_NAMESPACE;
 }
 
 /**

packages/css-blocks/src/BlockParser/features/assert-foreign-global-attribute.ts

@@ -1,4 +1,4 @@
-import * as postcss from "postcss";
+import { postcss } from "opticss";
 
 import { Block } from "../../BlockTree";
 import * as errors from "../../errors";

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

@@ -1,7 +1,5 @@
 import { assertNever } from "@opticss/util";
-import { CompoundSelector, ParsedSelector } from "opticss";
-import * as postcss from "postcss";
-import selectorParser = require("postcss-selector-parser");
+import { CompoundSelector, ParsedSelector, postcss, postcssSelectorParser as selectorParser } from "opticss";
 
 import { Block, Style } from "../../BlockTree";
 import * as errors from "../../errors";
@@ -257,9 +255,9 @@ function assertBlockObject(block: Block, sel: CompoundSelector, rule: postcss.Ru
 
   // If selecting a block or tag, check that the referenced block has been imported.
   // Otherwise, referencing a tag name is not allowed in blocks, throw an error.
-  let blockName = sel.nodes.find(n => n.type === selectorParser.TAG);
+  let blockName = sel.nodes.find(selectorParser.isTag);
   if (blockName) {
-    let refBlock = block.getReferencedBlock(blockName.value!);
+    let refBlock = block.getReferencedBlock(blockName.value);
     if (!refBlock) {
       throw new errors.InvalidBlockSyntax(
         `Tag name selectors are not allowed: ${rule.selector}`,
@@ -269,7 +267,7 @@ function assertBlockObject(block: Block, sel: CompoundSelector, rule: postcss.Ru
   }
 
   // Targeting attributes that are not state selectors is not allowed in blocks, throw.
-  let nonStateAttribute = sel.nodes.find(n => n.type === selectorParser.ATTRIBUTE && !isAttributeNode(n));
+  let nonStateAttribute = sel.nodes.find(n => selectorParser.isAttribute(n) && !isAttributeNode(n));
   if (nonStateAttribute) {
     throw new errors.InvalidBlockSyntax(
       `Cannot select attributes other than states: ${rule.selector}`,
@@ -279,7 +277,7 @@ function assertBlockObject(block: Block, sel: CompoundSelector, rule: postcss.Ru
 
   // Disallow pseudoclasses that take selectors as arguments.
   sel.nodes.forEach(n => {
-    if (n.type === selectorParser.PSEUDO) {
+    if (selectorParser.isPseudoClass(n)) {
       let pseudo = n;
       if (pseudo.value === ":not" || pseudo.value === ":matches") {
         throw new errors.InvalidBlockSyntax(