chore: Prefer to import from the configuration module.

Author: chriseppstein

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

@@ -7,8 +7,8 @@ import {
 import { assertNever, assertNeverCalled } from "@opticss/util";
 
 import { ATTR_PRESENT } from "../BlockSyntax";
-import { OutputMode } from "../OutputMode";
-import { ResolvedConfiguration } from "../options";
+import { OutputMode,
+ ResolvedConfiguration } from "../configuration";
 
 import { Attribute } from "./Attribute";
 import { Block } from "./Block";

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

@@ -9,8 +9,8 @@ import {
 import { assertNever, ObjectDictionary } from "@opticss/util";
 
 import { ATTR_PRESENT, IAttrToken as AttrToken } from "../BlockSyntax";
-import { OutputMode } from "../OutputMode";
-import { ResolvedConfiguration } from "../options";
+import { OutputMode } from "../configuration/OutputMode";
+import { ResolvedConfiguration } from "../configuration/types";
 
 import { AttrValue } from "./AttrValue";
 import { Block } from "./Block";

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

@@ -17,9 +17,9 @@ import {
 import { isRootNode, toAttrToken } from "../BlockParser";
 import { BlockPath, CLASS_NAME_IDENT, ROOT_CLASS } from "../BlockSyntax";
 import { SourceLocation } from "../SourceLocation";
+import { ResolvedConfiguration } from "../configuration/types";
 import { CssBlockError, InvalidBlockSyntax } from "../errors";
 import { FileIdentifier } from "../importing";
-import { ResolvedConfiguration } from "../options";
 
 import { BlockClass } from "./BlockClass";
 import { Inheritable } from "./Inheritable";

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

@@ -4,8 +4,7 @@ import { isString } from "util";
 
 import { ATTR_PRESENT, IAttrToken as AttrToken, ROOT_CLASS } from "../BlockSyntax";
 import { BlockPath } from "../BlockSyntax";
-import { OutputMode } from "../OutputMode";
-import { ResolvedConfiguration } from "../options";
+import { OutputMode, ResolvedConfiguration } from "../configuration";
 
 import { AttrValue } from "./AttrValue";
 import { Attribute } from "./Attribute";

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

@@ -1,6 +1,6 @@
 import { Attr } from "@opticss/element-analysis";
 
-import { ResolvedConfiguration } from "../options";
+import { ResolvedConfiguration } from "../configuration";
 import { unionInto } from "../util/unionInto";
 
 import { AnyNode, Inheritable } from "./Inheritable";

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

@@ -7,8 +7,8 @@ import { Block, Style } from "../Block";
 import { getBlockNode } from "../BlockParser";
 import { RESOLVE_RE } from "../BlockSyntax";
 import { SourceLocation, sourceLocation } from "../SourceLocation";
+import { ResolvedConfiguration } from "../configuration/types";
 import * as errors from "../errors";
-import { ResolvedConfiguration } from "../options";
 import { QueryKeySelector } from "../query";
 
 import { Conflicts, detectConflicts } from "./conflictDetection";

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

@@ -9,8 +9,11 @@ import {
   ROOT_CLASS,
 } from "../BlockSyntax";
 import { StyleAnalysis } from "../TemplateAnalysis/StyleAnalysis";
-import { normalizeOptions } from "../normalizeOptions";
-import { Options, ResolvedConfiguration } from "../options";
+import {
+  normalizeOptions,
+  Options,
+  ResolvedConfiguration,
+} from "../configuration";
 
 import { ConflictResolver } from "./ConflictResolver";
 /**

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

@@ -5,9 +5,9 @@ import * as postcss from "postcss";
 import { RawSourceMap } from "source-map";
 
 import { Block } from "../Block";
+import { normalizeOptions } from "../configuration/normalizeOptions";
+import { Options, ResolvedConfiguration } from "../configuration/types";
 import { FileIdentifier, ImportedFile, Importer } from "../importing";
-import { normalizeOptions } from "../normalizeOptions";
-import { Options, ResolvedConfiguration } from "../options";
 import { PromiseQueue } from "../util/PromiseQueue";
 
 import { BlockParser, ParsedSource } from "./BlockParser";

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

@@ -1,10 +1,10 @@
 import * as postcss from "postcss";
 
 import { Block } from "../Block";
+import { normalizeOptions } from "../configuration/normalizeOptions";
+import { Options, ResolvedConfiguration } from "../configuration/types";
 import * as errors from "../errors";
 import { FileIdentifier } from "../importing";
-import { normalizeOptions } from "../normalizeOptions";
-import { Options, ResolvedConfiguration } from "../options";
 
 import { assertForeignGlobalAttribute } from "./features/assert-foreign-global-attribute";
 import { constructBlock } from "./features/construct-block";

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

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

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

@@ -6,7 +6,7 @@ import {
 
 import {
   ResolvedConfiguration,
-} from "../options";
+} from "../configuration/types";
 
 export enum Syntax {
   sass = "sass",

packages/css-blocks/src/Plugin.ts

@@ -2,10 +2,9 @@ import * as postcss from "postcss";
 
 import { BlockCompiler } from "./BlockCompiler";
 import { BlockFactory } from "./BlockParser";
+import { Options, ResolvedConfiguration } from "./configuration";
+import { normalizeOptions } from "./configuration/normalizeOptions";
 import * as errors from "./errors";
-import { normalizeOptions } from "./normalizeOptions";
-import { Options, ResolvedConfiguration } from "./options";
-export { Options } from "./options";
 
 /**
  * CSS Blocks PostCSS plugin.

packages/css-blocks/src/TemplateAnalysis/ElementAnalysis.ts

@@ -31,7 +31,7 @@ import {
 } from "../Block";
 import {
   ResolvedConfiguration,
-} from "../options";
+} from "../configuration/types";
 import {
   unionInto,
 } from "../util/unionInto";

packages/css-blocks/src/TemplateAnalysis/MetaAnalysis.ts

@@ -7,7 +7,7 @@ import { whatever } from "@opticss/util";
 import * as debugGenerator from "debug";
 
 import { Block, Style } from "../Block";
-import { ResolvedConfiguration } from "../options";
+import { ResolvedConfiguration } from "../configuration";
 
 import { StyleAnalysis } from "./StyleAnalysis";
 import { SerializedTemplateAnalysis, TemplateAnalysis } from "./index";

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

@@ -21,7 +21,7 @@ import { IdentGenerator } from "opticss";
 
 import { Block, Style } from "../Block";
 import { BlockFactory } from "../BlockParser";
-import { ResolvedConfiguration } from "../options";
+import { ResolvedConfiguration } from "../configuration";
 
 import { ElementAnalysis, SerializedElementAnalysis } from "./ElementAnalysis";
 import { StyleAnalysis } from "./StyleAnalysis";

packages/css-blocks/src/TemplateRewriter/StyleMapping.ts

@@ -3,7 +3,7 @@ import { StyleMapping as OptimizedMapping, TemplateTypes } from "@opticss/templa
 import { Block, Style } from "../Block";
 import { TemplateAnalysis } from "../TemplateAnalysis";
 import { ElementAnalysis } from "../TemplateAnalysis/ElementAnalysis";
-import { ResolvedConfiguration } from "../options";
+import { ResolvedConfiguration } from "../configuration";
 
 import { IndexedClassRewrite } from "./ClassRewrite";
 import { IndexedClassMapping, RewriteMapping } from "./RewriteMapping";

packages/css-blocks/src/OutputMode.ts renamed to packages/css-blocks/src/configuration/OutputMode.ts

@@ -0,0 +1,3 @@
+export * from "./types";
+export * from "./OutputMode";
+export * from "./normalizeOptions";

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

@@ -1,19 +1,20 @@
-import { Preprocessors } from "./BlockParser";
-import {
-  OutputMode,
-} from "./OutputMode";
+import { Preprocessors } from "../BlockParser";
 import {
   filesystemImporter,
   Importer,
   ImporterData,
-} from "./importing";
+} from "../importing";
+
+import {
+  OutputMode,
+} from "./OutputMode";
 import {
   Configuration,
   ConfigurationObjectKeys,
   ConfigurationSimpleKeys,
   Options,
   ResolvedConfiguration,
-} from "./options";
+} from "./types";
 
 const CONFIG_OBJECT_KEYS: Array<ConfigurationObjectKeys> = [
   "importerData",

packages/css-blocks/src/normalizeOptions.ts renamed to packages/css-blocks/src/configuration/normalizeOptions.ts

@@ -1,4 +1,6 @@
-import { Preprocessors } from "./BlockParser";
+import { Preprocessors } from "../BlockParser";
+import { Importer, ImporterData } from "../importing/types";
+
 import { OutputMode } from "./OutputMode";
 
 /**
@@ -13,10 +15,17 @@ export interface Configuration {
    */
   maxConcurrentCompiles: number;
   /**
-    * A preprocessor function can be declared by syntax.
-    */
+   * A preprocessor function can be declared by syntax.
+   */
   preprocessors: Preprocessors;
 
+  /**
+   * An importer is an object that is in charge of findi
+   *
+   */
+  importer: Importer;
+
+  importerData: ImporterData;
   /**
    * If a preprocessor function is declared for `css`, all blocks will be ran through it, even those that were preprocessed for another syntax.
    * this can be disabled by setting `disablePreprocessChaining` to true.

packages/css-blocks/src/options.ts renamed to packages/css-blocks/src/configuration/types.ts

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