chore: Update lockfile. Organize imports.

Author: chriseppstein

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

@@ -1,9 +1,9 @@
 // tslint:disable-next-line:no-unused-variable Imported for Documentation link
 import {
-  isSourcePosition,
   POSITION_UNKNOWN,
   SourceLocation,
   SourcePosition,
+  isSourcePosition,
 } from "@opticss/element-analysis";
 import {
   SerializedTemplateInfo,

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

@@ -10,8 +10,8 @@ import { BlockFactory } from "../BlockParser";
 import { Block, Style } from "../BlockTree";
 import {
   Options,
-  resolveConfiguration,
   ResolvedConfiguration,
+  resolveConfiguration,
 } from "../configuration";
 
 import { Analysis, SerializedAnalysis } from "./Analysis";

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

@@ -4,14 +4,14 @@ import {
   AttributeValueChoiceOption,
   AttributeValueSet,
   AttributeValueSetItem,
-  attrValues,
   Element,
-  isConstant,
   POSITION_UNKNOWN,
   SourceLocation,
   Tagname,
   ValueAbsent,
   ValueConstant,
+  attrValues,
+  isConstant,
 } from "@opticss/element-analysis";
 import {
   MultiMap,
@@ -21,13 +21,13 @@ import {
 } from "@opticss/util";
 
 import {
-  Attribute,
   AttrValue,
+  Attribute,
   Block,
   BlockClass,
+  Style,
   isAttrValue,
   isBlockClass,
-  Style,
 } from "../BlockTree";
 import {
   ResolvedConfiguration,

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

@@ -5,12 +5,12 @@ import * as errors from "../../errors";
 import { Analysis } from "../Analysis";
 import { ElementAnalysis } from "../ElementAnalysis";
 
-import { Validator } from "./Validator";
 import { attributeGroupValidator } from "./attribute-group-validator";
 import { attributeParentValidator } from "./attribute-parent-validator";
 import { classPairsValidator } from "./class-pairs-validator";
 import { propertyConflictValidator } from "./property-conflict-validator";
 import { rootClassValidator } from "./root-class-validator";
+import { Validator } from "./Validator";
 
 export * from "./class-pairs-validator";
 export * from "./root-class-validator";

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

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

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

@@ -4,10 +4,10 @@ import { CompoundSelector, ParsedSelector, parseSelector, postcss, postcssSelect
 import { getBlockNode } from "../BlockParser";
 import { RESOLVE_RE } from "../BlockSyntax";
 import { Block, Style } from "../BlockTree";
-import { SourceLocation, sourceLocation } from "../SourceLocation";
 import { ResolvedConfiguration } from "../configuration";
 import * as errors from "../errors";
 import { QueryKeySelector } from "../query";
+import { SourceLocation, sourceLocation } from "../SourceLocation";
 
 import { Conflicts, detectConflicts } from "./conflictDetection";
 

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

@@ -6,14 +6,14 @@ import {
   BLOCK_DEBUG,
   BLOCK_PROP_NAMES_RE,
   BLOCK_REFERENCE,
-  parseBlockDebug,
   ROOT_CLASS,
+  parseBlockDebug,
 } from "../BlockSyntax";
 import { Block } from "../BlockTree";
 import {
   Options,
-  resolveConfiguration,
   ResolvedConfiguration,
+  resolveConfiguration,
 } from "../configuration";
 
 import { ConflictResolver } from "./ConflictResolver";

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

@@ -5,12 +5,12 @@ import * as path from "path";
 import { RawSourceMap } from "source-map";
 
 import { Block } from "../BlockTree";
-import { Options, resolveConfiguration, ResolvedConfiguration } from "../configuration";
+import { Options, ResolvedConfiguration, resolveConfiguration } from "../configuration";
 import { FileIdentifier, ImportedFile, Importer } from "../importing";
 import { PromiseQueue } from "../util/PromiseQueue";
 
 import { BlockParser, ParsedSource } from "./BlockParser";
-import { annotateCssContentWithSourceMap, Preprocessor, Preprocessors, ProcessedFile, Syntax, syntaxName } from "./preprocessing";
+import { Preprocessor, Preprocessors, ProcessedFile, Syntax, annotateCssContentWithSourceMap, syntaxName } from "./preprocessing";
 
 const debug = debugGenerator("css-blocks:BlockFactory");
 

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

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

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

@@ -1,8 +1,8 @@
 import { postcss } from "opticss";
 
 import { Block } from "../../BlockTree";
-import { selectorSourceLocation as loc } from "../../SourceLocation";
 import * as errors from "../../errors";
+import { selectorSourceLocation as loc } from "../../SourceLocation";
 import {
   BlockType,
   getBlockNode,

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

@@ -2,19 +2,19 @@ import { assertNever } from "@opticss/util";
 import { CompoundSelector, ParsedSelector, postcss, postcssSelectorParser as selectorParser } from "opticss";
 
 import { Block, Style } from "../../BlockTree";
-import { selectorSourceLocation as loc, sourceLocation } from "../../SourceLocation";
 import * as errors from "../../errors";
+import { selectorSourceLocation as loc, sourceLocation } from "../../SourceLocation";
 import {
   BlockNodeAndType,
   BlockType,
+  NodeAndType,
   blockTypeName,
   getBlockNode,
   isAttributeNode,
   isClassLevelObject,
   isClassNode,
   isRootLevelObject,
   isRootNode,
-  NodeAndType,
   toAttrToken,
 } from "../block-intermediates";
 

packages/@css-blocks/core/src/BlockParser/features/disallow-important.ts

@@ -1,7 +1,7 @@
 import { postcss } from "opticss";
 
-import { sourceLocation as loc } from "../../SourceLocation";
 import * as errors from "../../errors";
+import { sourceLocation as loc } from "../../SourceLocation";
 
 export async function disallowImportant(root: postcss.Root, file: string): Promise<postcss.Root> {
   root.walkDecls((decl) => {

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

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

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

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

packages/@css-blocks/core/src/BlockParser/features/global-attributes.ts

@@ -2,8 +2,8 @@ import { parseSelector, postcss, postcssSelectorParser as selectorParser } from
 
 import { BLOCK_GLOBAL } from "../../BlockSyntax";
 import { Block } from "../../BlockTree";
-import { sourceLocation as loc } from "../../SourceLocation";
 import * as errors from "../../errors";
+import { sourceLocation as loc } from "../../SourceLocation";
 import { toAttrToken } from "../block-intermediates";
 
 export async function globalAttributes(root: postcss.Root, block: Block, file: string): Promise<Block> {

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

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

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

@@ -3,8 +3,8 @@ import { postcss } from "opticss";
 
 import { BLOCK_REFERENCE, CLASS_NAME_IDENT } from "../../BlockSyntax";
 import { Block } from "../../BlockTree";
-import { sourceLocation } from "../../SourceLocation";
 import * as errors from "../../errors";
+import { sourceLocation } from "../../SourceLocation";
 import { BlockFactory } from "../index";
 
 /**

packages/@css-blocks/core/src/BlockSyntax/parseBlockDebug.ts

@@ -1,8 +1,8 @@
 import { postcss } from "opticss";
 
 import { Block } from "../BlockTree";
-import { sourceLocation } from "../SourceLocation";
 import * as errors from "../errors";
+import { sourceLocation } from "../SourceLocation";
 
 export type DebugChannel = "comment" | "stderr" | "stdout";
 

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

@@ -6,7 +6,7 @@ import {
   ValueAbsent,
   ValueConstant,
 } from "@opticss/element-analysis";
-import { assertNever, ObjectDictionary } from "@opticss/util";
+import { ObjectDictionary, assertNever } from "@opticss/util";
 
 import { ATTR_PRESENT, IAttrToken as AttrToken } from "../BlockSyntax";
 import { OutputMode, ResolvedConfiguration } from "../configuration";

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

@@ -1,4 +1,4 @@
-import { assertNever, MultiMap, ObjectDictionary } from "@opticss/util";
+import { MultiMap, ObjectDictionary, assertNever } from "@opticss/util";
 import { whatever } from "@opticss/util";
 import {
   CompoundSelector,
@@ -10,16 +10,16 @@ import {
 
 import {
   BlockType,
+  NodeAndType,
   isAttributeNode,
   isClassNode,
-  NodeAndType,
 } from "../BlockParser";
 import { isRootNode, toAttrToken } from "../BlockParser";
 import { BlockPath, CLASS_NAME_IDENT, ROOT_CLASS } from "../BlockSyntax";
-import { SourceLocation } from "../SourceLocation";
 import { ResolvedConfiguration } from "../configuration";
 import { CssBlockError, InvalidBlockSyntax } from "../errors";
 import { FileIdentifier } from "../importing";
+import { SourceLocation } from "../SourceLocation";
 
 import { BlockClass } from "./BlockClass";
 import { Inheritable } from "./Inheritable";

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

@@ -6,8 +6,8 @@ import { ATTR_PRESENT, IAttrToken as AttrToken, ROOT_CLASS } from "../BlockSynta
 import { BlockPath } from "../BlockSyntax";
 import { OutputMode, ResolvedConfiguration } from "../configuration";
 
-import { AttrValue } from "./AttrValue";
 import { Attribute } from "./Attribute";
+import { AttrValue } from "./AttrValue";
 import { Block } from "./Block";
 import { RulesetContainer } from "./RulesetContainer";
 import { Style } from "./Style";

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

@@ -11,10 +11,10 @@ import * as propParser from "css-property-parser";
 import { ParsedSelector, postcss } from "opticss";
 
 import { BLOCK_PROP_NAMES, RESOLVE_RE, SELF_SELECTOR } from "../BlockSyntax";
-import { sourceLocation } from "../SourceLocation";
 import { InvalidBlockSyntax } from "../errors";
+import { sourceLocation } from "../SourceLocation";
 
-import { isStyle, Styles } from "./Styles";
+import { Styles, isStyle } from "./Styles";
 export { Styles, BlockClass, AttrValue } from "./Styles";
 
 // Convenience types to help our code read better.

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

@@ -2,7 +2,7 @@ import { postcss } from "opticss";
 
 import { BlockCompiler } from "./BlockCompiler";
 import { BlockFactory } from "./BlockParser";
-import { Options, resolveConfiguration, ResolvedConfiguration } from "./configuration";
+import { Options, ResolvedConfiguration, resolveConfiguration } from "./configuration";
 import * as errors from "./errors";
 
 /**

packages/@css-blocks/core/src/TemplateRewriter/RewriteMapping.ts

@@ -1,15 +1,15 @@
 import {
   BooleanExpression,
+  RewriteMapping as OptimizedMapping,
+  SimpleAttribute,
+  SimpleTagname,
   isAndExpression,
   isBooleanExpression,
   isNotExpression,
   isOrExpression,
   isSimpleTagname,
-  RewriteMapping as OptimizedMapping,
-  SimpleAttribute,
-  SimpleTagname,
 } from "@opticss/template-api";
-import { assertNever, Maybe, maybe, ObjectDictionary, objectValues } from "@opticss/util";
+import { Maybe, ObjectDictionary, assertNever, maybe, objectValues } from "@opticss/util";
 import { inspect } from "util";
 
 import { Style } from "../BlockTree";

packages/@css-blocks/core/src/configuration/resolver.ts

@@ -1,8 +1,8 @@
 import { Preprocessors } from "../BlockParser";
 import {
-  filesystemImporter,
   Importer,
   ImporterData,
+  filesystemImporter,
 } from "../importing";
 
 import { OutputMode } from "./OutputMode";

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

@@ -1,8 +1,8 @@
 import { postcss } from "opticss";
 
-import { Plugin } from "./Plugin";
 import { Configuration, OutputMode } from "./configuration";
 import { CssBlockError, InvalidBlockSyntax, MissingSourcePath } from "./errors";
+import { Plugin } from "./Plugin";
 
 // This is ugly but it's the only thing I have been able to make work.
 // I welcome a patch that cleans this up.

packages/@css-blocks/core/test/global-states-test.ts

@@ -3,8 +3,8 @@ import { suite, test } from "mocha-typescript";
 
 import cssBlocks = require("./util/postcss-helper");
 
-import { BEMProcessor } from "./util/BEMProcessor";
 import { assertError } from "./util/assertError";
+import { BEMProcessor } from "./util/BEMProcessor";
 import { setupImporting } from "./util/setupImporting";
 
 @suite("Resolves conflicts")

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

@@ -6,13 +6,13 @@ import * as path from "path";
 import { Syntax } from "../src/BlockParser";
 import {
   Options,
-  resolveConfiguration,
   ResolvedConfiguration,
+  resolveConfiguration,
 } from "../src/configuration";
 import {
-  filesystemImporter,
   Importer,
   PathAliasImporter,
+  filesystemImporter,
 } from "../src/importing";
 
 const FIXTURES = path.resolve(__dirname, "..", "..", "test", "fixtures");

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

@@ -2,8 +2,8 @@ import {
   POSITION_UNKNOWN,
 } from "@opticss/element-analysis";
 import {
-  isAndExpression,
   Template,
+  isAndExpression,
 } from "@opticss/template-api";
 import {
   clean,
@@ -18,8 +18,8 @@ import { Analysis, Analyzer } from "../src/Analyzer";
 import { ElementAnalysis } from "../src/Analyzer";
 import { BlockCompiler } from "../src/BlockCompiler";
 import { AttrValue, Block, BlockClass } from "../src/BlockTree";
-import { StyleMapping } from "../src/TemplateRewriter/StyleMapping";
 import { resolveConfiguration } from "../src/configuration";
+import { StyleMapping } from "../src/TemplateRewriter/StyleMapping";
 
 @suite("Optimization")
 export class TemplateAnalysisTests {

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

@@ -3,8 +3,8 @@ import { skip, suite, test } from "mocha-typescript";
 
 import cssBlocks = require("./util/postcss-helper");
 
-import { BEMProcessor } from "./util/BEMProcessor";
 import { assertError } from "./util/assertError";
+import { BEMProcessor } from "./util/BEMProcessor";
 import { setupImporting } from "./util/setupImporting";
 
 @suite("Resolves conflicts")