chore: Upgrade to TypeScript 3.4, OptiCSS 0.6.

Author: chriseppstein

package.json

@@ -48,7 +48,7 @@
     "tslint": "^5.9.1",
     "typedoc": "^0.11.0",
     "typedoc-plugin-monorepo": "^0.1.0",
-    "typescript": "~3.1.6",
+    "typescript": "~3.4.4",
     "watch": "^1.0.2"
   },
   "workspaces": [

packages/@css-blocks/broccoli/package.json

@@ -40,7 +40,7 @@
     "@css-blocks/core": "^0.21.0",
     "@glimmer/compiler": "^0.33.0",
     "@glimmer/syntax": "^0.33.0",
-    "@opticss/template-api": "^0.4.0",
+    "@opticss/template-api": "^0.6.0",
     "broccoli-funnel": "^2.0.1",
     "broccoli-merge-trees": "^3.0.0",
     "broccoli-plugin": "^1.3.0",
@@ -49,8 +49,8 @@
     "fs-extra": "^5.0.0",
     "fs-tree-diff": "^0.5.9",
     "glob": "^7.1.2",
-    "opticss": "^0.4.0",
+    "opticss": "^0.6.0",
     "symlink-or-copy": "^1.2.0",
     "walk-sync": "^0.3.3"
   }
-}
+}

packages/@css-blocks/broccoli/src/Aggregate.ts

@@ -30,7 +30,7 @@ export class CSSBlocksAggregate extends BroccoliPlugin {
    * @param transport Magical shared-memory Transport object shared with the aggregator and Template transformer.
    * @param out Output file name.
    */
-  // tslint:disable-next-line:prefer-whatever-to-any
+  // tslint:disable-next-line:prefer-unknown-to-any
   constructor(inputNodes: any[], transport: Transport, out: string) {
     super(inputNodes, {
       name: "broccoli-css-blocks-aggregate",

packages/@css-blocks/broccoli/src/Analyze.ts

@@ -46,7 +46,7 @@ export class CSSBlocksAnalyze extends BroccoliPlugin {
    * @param transport Magical shared-memory Transport object shared with the aggregator and Template transformer.
    * @param options Analysis options.
    */
-  // tslint:disable-next-line:prefer-whatever-to-any
+  // tslint:disable-next-line:prefer-unknown-to-any
   constructor(inputNode: any, transport: Transport, options: BroccoliOptions) {
     super([inputNode], {
       name: "broccoli-css-blocks-analyze",

packages/@css-blocks/code-style/package.json

@@ -29,7 +29,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@opticss/code-style": "^0.4.0"
+    "@opticss/code-style": "^0.6.0"
   },
   "engines": {
     "node": "6.* || 8.* || >= 10.*"
@@ -38,4 +38,4 @@
     "configs",
     "*.md"
   ]
-}
+}

packages/@css-blocks/core/package.json

@@ -41,9 +41,9 @@
     "@css-blocks/code-style": "^0.21.0"
   },
   "dependencies": {
-    "@opticss/element-analysis": "^0.4.0",
-    "@opticss/template-api": "^0.4.0",
-    "@opticss/util": "^0.4.0",
+    "@opticss/element-analysis": "^0.6.0",
+    "@opticss/template-api": "^0.6.0",
+    "@opticss/util": "^0.6.0",
     "@types/async": "^2.0.40",
     "@types/debug": "0.0.29",
     "async": "^2.5.0",
@@ -52,7 +52,7 @@
     "inline-source-map-comment": "^1.0.5",
     "json-parse-better-errors": "^1.0.1",
     "object.values": "^1.0.4",
-    "opticss": "^0.4.0",
+    "opticss": "^0.6.0",
     "regexpu-core": "^4.0.11",
     "source-map": "^0.6.1",
     "watch": "^1.0.2"
@@ -61,4 +61,4 @@
     "node": "6.* || 8.* || >= 10.*"
   },
   "engineStrict": true
-}
+}

packages/@css-blocks/core/src/Analyzer/Analysis.ts

@@ -53,7 +53,7 @@ export class Analysis<K extends keyof TemplateTypes> {
    * A per-element correlation of styles used. The current correlation is added
    * to this list when [[endElement]] is called.
    */
-  // tslint:disable-next-line:prefer-whatever-to-any
+  // tslint:disable-next-line:prefer-unknown-to-any
   elements: Map<string, ElementAnalysis<any, any, any>>;
 
   /**
@@ -67,7 +67,7 @@ export class Analysis<K extends keyof TemplateTypes> {
    * The current element, created when calling [[startElement]].
    * The current element is unset after calling [[endElement]].
    */
-  // tslint:disable-next-line:prefer-whatever-to-any
+  // tslint:disable-next-line:prefer-unknown-to-any
   private currentElement: ElementAnalysis<any, any, any> | undefined;
 
   /**
@@ -367,7 +367,7 @@ export class Analysis<K extends keyof TemplateTypes> {
       analysis.elements.set(elID, element);
     });
 
-    // tslint:disable-next-line:prefer-whatever-to-any
+    // tslint:disable-next-line:prefer-unknown-to-any
     return analysis;
   }
 

packages/@css-blocks/core/src/Analyzer/Analyzer.ts

@@ -3,7 +3,7 @@ import {
   TemplateIntegrationOptions,
   TemplateTypes,
  } from "@opticss/template-api";
-import { MultiMap, whatever } from "@opticss/util";
+import { MultiMap } from "@opticss/util";
 import * as debugGenerator from "debug";
 
 import { BlockFactory } from "../BlockParser";
@@ -87,7 +87,7 @@ export abstract class Analyzer<K extends keyof TemplateTypes> {
 
   analysisCount(): number { return this.analysisMap.size; }
 
-  eachAnalysis(cb: (v: Analysis<K>) => whatever) { this.analysisMap.forEach(cb); }
+  eachAnalysis(cb: (v: Analysis<K>) => unknown) { this.analysisMap.forEach(cb); }
 
   analyses(): Analysis<K>[] {
     let analyses: Analysis<K>[] = [];

packages/@css-blocks/core/src/Analyzer/ElementAnalysis.ts

@@ -17,7 +17,6 @@ import {
   MultiMap,
   ObjectDictionary,
   objectValues,
-  whatever,
 } from "@opticss/util";
 
 import {
@@ -74,7 +73,7 @@ export interface Switch<StringExpression> {
   disallowFalsy?: boolean;
 }
 
-export function isSwitch(o: object): o is Switch<whatever> {
+export function isSwitch(o: object): o is Switch<unknown> {
   return o.hasOwnProperty("stringExpression");
 }
 

packages/@css-blocks/core/src/Analyzer/validations/Validator.ts

@@ -1,8 +1,7 @@
 import { TemplateTypes } from "@opticss/template-api";
-import { whatever } from "@opticss/util";
 
 import { Analysis } from "../Analysis";
 import { ElementAnalysis } from "../ElementAnalysis";
 
 export type ErrorCallback = (str: string, loc?: null, details?: string) => void;
-export type Validator = (analysis: ElementAnalysis<whatever, whatever, whatever>, templateAnalysis: Analysis<keyof TemplateTypes>, err: ErrorCallback) => void;
+export type Validator = (analysis: ElementAnalysis<unknown, unknown, unknown>, templateAnalysis: Analysis<keyof TemplateTypes>, err: ErrorCallback) => void;

packages/@css-blocks/core/src/Analyzer/validations/index.ts

@@ -95,7 +95,7 @@ export class TemplateValidator {
    * @param correlations The correlations object for a given element.
    * @param locInfo Location info for the elements being validated.
    */
-  // tslint:disable-next-line:prefer-whatever-to-any
+  // tslint:disable-next-line:prefer-unknown-to-any
   validate(templateAnalysis: Analysis<keyof TemplateTypes>, element: ElementAnalysis<any, any, any>) {
 
     function err (message: string, locInfo?: errors.ErrorLocation | undefined | null, details?: string) {

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

@@ -1,4 +1,4 @@
-import { MultiMap, TwoKeyMultiMap, objectValues, whatever } from "@opticss/util";
+import { MultiMap, TwoKeyMultiMap, objectValues } from "@opticss/util";
 import * as propParser from "css-property-parser";
 import { postcss } from "opticss";
 
@@ -125,7 +125,7 @@ function printRulesetConflict(prop: string, rule: Ruleset) {
 
 function inStylesheetComposition(
   blockClass: BlockClass,
-  analysis: ElementAnalysis<whatever, whatever, whatever>,
+  analysis: ElementAnalysis<unknown, unknown, unknown>,
   conflicts: ConflictMap,
   allConditions: PropMap,
 ) {

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

@@ -1,4 +1,4 @@
-import { assertNever, whatever } from "@opticss/util";
+import { assertNever } from "@opticss/util";
 import { CompoundSelector, postcssSelectorParser as selectorParser } from "opticss";
 
 import { ATTR_PRESENT, AttrToken, ROOT_CLASS, STATE_NAMESPACE } from "../BlockSyntax";
@@ -114,7 +114,7 @@ export function isClassLevelObject(object: NodeAndType): object is ClassAttribut
 /**
  * Check if given selector node is targeting the root block node
  */
-export function isRootNode(node: whatever): node is selectorParser.Pseudo {
+export function isRootNode(node: unknown): node is selectorParser.Pseudo {
   return selectorParser.isPseudoClass(node) && node.value === ROOT_CLASS;
 }
 

packages/@css-blocks/core/src/BlockTree/Block.ts

@@ -1,7 +1,6 @@
 import * as crypto from "crypto";
 
 import { MultiMap, ObjectDictionary } from "@opticss/util";
-import { whatever } from "@opticss/util";
 import {
   CompoundSelector,
   ParsedSelector,
@@ -227,7 +226,7 @@ export class Block
     return this.all().find(e => e.asSource() === sourceName);
   }
 
-  eachBlockReference(callback: (name: string, block: Block) => whatever) {
+  eachBlockReference(callback: (name: string, block: Block) => unknown) {
     for (let name of Object.keys(this._blockReferences)) {
       callback(name, this._blockReferences[name]);
     }

packages/@css-blocks/core/src/BlockTree/Inheritable.ts

@@ -12,7 +12,7 @@
 import { ObjectDictionary } from "@opticss/util";
 import { ParsedSelector, SelectorFactory, parseSelector, postcss } from "opticss";
 
-/* tslint:disable:prefer-whatever-to-any */
+/* tslint:disable:prefer-unknown-to-any */
 export type AnyNode = Inheritable<any, any, any, any, any>;
 
 export abstract class Inheritable<
@@ -25,7 +25,7 @@ export abstract class Inheritable<
 
   protected abstract get ChildConstructor(): { new(token: any, parent: Self): Child } | never;
 
-/* tslint:enable:prefer-whatever-to-any */
+/* tslint:enable:prefer-unknown-to-any */
 
   private readonly parsedRuleSelectors: WeakMap<postcss.Rule, ParsedSelector[]> | null;
 

packages/@css-blocks/core/src/BlockTree/Style.ts

@@ -10,7 +10,7 @@ export { RulesetContainer, Resolution, Ruleset } from "./RulesetContainer";
  * Abstract class that serves as the base for all Styles. Contains basic
  * properties and abstract methods that extenders must implement.
  */
-/* tslint:disable:prefer-whatever-to-any */
+/* tslint:disable:prefer-unknown-to-any */
 
 export abstract class Style<
   Self extends Style<Self, Root, Parent, Child, Token>,
@@ -19,12 +19,12 @@ export abstract class Style<
   Child extends Inheritable<any, Root, Self, AnyNode | never, any> | never,
   Token extends any = string,
 > extends Inheritable<Self, Root, Parent, Child> {
-/* tslint:enable:prefer-whatever-to-any */
+/* tslint:enable:prefer-unknown-to-any */
 
   /** cache of resolveStyles() */
   private _resolvedStyles: Set<Self> | undefined;
 
-  // tslint:disable-next-line:prefer-whatever-to-any
+  // tslint:disable-next-line:prefer-unknown-to-any
   public abstract readonly rulesets: RulesetContainer<any>;
 
   /**

packages/@css-blocks/core/src/BlockTree/Styles.ts

@@ -1,4 +1,4 @@
-import { isObject, whatever } from "@opticss/util";
+import { isObject } from "@opticss/util";
 
 import { AttrValue, isAttrValue } from "./AttrValue";
 import { BlockClass, isBlockClass } from "./BlockClass";
@@ -7,6 +7,6 @@ export { BlockClass } from "./BlockClass";
 export { AttrValue } from "./AttrValue";
 export type Styles = AttrValue | BlockClass;
 
-export function isStyle(o: whatever): o is Styles {
+export function isStyle(o: unknown): o is Styles {
   return isObject(o) && (isBlockClass(o) || isAttrValue(o));
 }

packages/@css-blocks/core/src/errors.ts

@@ -28,7 +28,7 @@ export class CssBlockError extends Error {
     let line = loc.line ? `:${loc.line}` : "";
     let column = loc.column ? `:${loc.column}` : "";
     let locMessage = ` (${filename}${line}${column})`;
-    // tslint:disable-next-line:prefer-whatever-to-any
+    // tslint:disable-next-line:prefer-unknown-to-any
     return `[css-blocks] ${(this.constructor as any).prefix}: ${this.origMessage}${locMessage}`;
   }
 

packages/@css-blocks/core/src/importing/Importer.ts

@@ -1,4 +1,4 @@
-import { ObjectDictionary, whatever } from "@opticss/util";
+import { ObjectDictionary } from "@opticss/util";
 
 import { Syntax } from "../BlockParser";
 import { ResolvedConfiguration } from "../configuration";
@@ -8,10 +8,10 @@ import { ResolvedConfiguration } from "../configuration";
  * options hash where custom importers can request for additional importer configuration
  * to be passed. All `Importer` methods are passed the configuration hash.
  */
-export type ImporterData = ObjectDictionary<whatever>;
+export type ImporterData = ObjectDictionary<unknown>;
 
 /**
- * A FileIdentifier is a string with a whatever internal encoding is needed to uniquely resolve
+ * A FileIdentifier is a string with a unknown internal encoding is needed to uniquely resolve
  * a file or relative importPath against the identifier by an importer. FileIdentifiers may be
  * serialized across processes and should not encode any transient state. If an importer
  * wraps another importer, it is responsible for mangling and de-mangling the import identifier to

packages/@css-blocks/core/src/util/PromiseQueue.ts

@@ -1,5 +1,4 @@
 // tslint:disable:no-floating-promises
-import { whatever } from "@opticss/util";
 import * as async from "async";
 import * as debugGenerator from "debug";
 
@@ -29,15 +28,15 @@ export class PromiseQueue<WorkItem, Result> {
     this.jobId = 0;
   }
 
-  private processWork(work: PendingWork<WorkItem, Result>, callback: (err?: whatever) => void) {
+  private processWork(work: PendingWork<WorkItem, Result>, callback: (err?: unknown) => void) {
     this.debug(`[Job:${work.id}] Starting job.`);
     this.promiseProcessor(work.item).then(
       (result: Result) => {
         this.debug(`[Job:${work.id}] Finished. Recording result.`);
         work.result = result;
         callback();
       },
-      (error: whatever) => {
+      (error: unknown) => {
         this.debug(`[Job:${work.id}] Errored.`);
         callback(error);
       });

packages/@css-blocks/core/test/Block/inheritable-test.ts

@@ -90,7 +90,7 @@ class TestSink extends Inheritable<
   get ChildConstructor(): never { return assertNeverCalled(); }
   get parent(): SinkNode["parent"] { return this._parent!; }
   get root(): SinkNode["root"] { return this.parent.root; }
-  // tslint:disable-next-line:prefer-whatever-to-any
+  // tslint:disable-next-line:prefer-unknown-to-any
   public lookup(_path: string, _errLoc?: SourceLocation | undefined): Inheritable<any, any, any, any> | undefined {
     throw new Error("Method not implemented.");
   }

packages/@css-blocks/core/test/opticss-test.ts

@@ -7,7 +7,6 @@ import {
 } from "@opticss/template-api";
 import {
   clean,
-  whatever,
 } from "@opticss/util";
 import { assert } from "chai";
 import { suite, test } from "mocha-typescript";
@@ -24,7 +23,7 @@ import { StyleMapping } from "../src/TemplateRewriter/StyleMapping";
 @suite("Optimization")
 export class TemplateAnalysisTests {
 
-  private useAttrs(element: ElementAnalysis<whatever, whatever, whatever>, klass: BlockClass) {
+  private useAttrs(element: ElementAnalysis<unknown, unknown, unknown>, klass: BlockClass) {
     for (let attribute of klass.getAttributes()) {
       if (attribute.hasResolvedValues()) {
         element.addDynamicGroup(klass, attribute, null);
@@ -36,7 +35,7 @@ export class TemplateAnalysisTests {
   }
   private useBlockStyles(
     analysis: Analysis<"Opticss.Template">, block: Block, blockName: string,
-    useAttrsCallback?: (container: BlockClass, element: ElementAnalysis<whatever, whatever, whatever>) => void,
+    useAttrsCallback?: (container: BlockClass, element: ElementAnalysis<unknown, unknown, unknown>) => void,
   ) {
     analysis.addBlock(blockName, block);
 

packages/@css-blocks/core/test/util/assertError.ts

@@ -1,4 +1,3 @@
-import { whatever } from "@opticss/util";
 import { assert } from "chai";
 import { postcss } from "opticss";
 
@@ -15,7 +14,7 @@ export function assertError(errorType: typeof cssBlocks.CssBlockError, message:
     });
 }
 
-export function assertParseError(errorType: typeof cssBlocks.CssBlockError, message: string, promise: Promise<whatever>) {
+export function assertParseError(errorType: typeof cssBlocks.CssBlockError, message: string, promise: Promise<unknown>) {
   return promise.then(
     () => {
       assert(false, `Error ${errorType.name} was not raised.`);

packages/@css-blocks/core/test/util/indented.ts

@@ -1,4 +1,4 @@
-// import { whatever } from "@opticss/util";
+// import { unknown } from "@opticss/util";
 import { outdent } from "outdent";
 // function getFirstIndentedString(strings: string[][]): string | undefined {
 //   for (let group of strings) {

packages/@css-blocks/ember-cli/package.json

@@ -78,4 +78,4 @@
       "tests/dummy/lib/in-repo-lazy-engine"
     ]
   }
-}
+}