chore: Move core's postcss plugin to test helpers.

amiller-gh · amiller-gh · commit 521797147dc2 · 2018-04-19T11:08:32.000-07:00
diff --git a/packages/@css-blocks/core/src/cssBlocks.ts b/packages/@css-blocks/core/src/cssBlocks.ts
diff --git a/packages/@css-blocks/core/src/index.ts b/packages/@css-blocks/core/src/index.ts
@@ -2,15 +2,10 @@ export * from "./BlockTree";
 export * from "./errors";
 export * from "./SourceLocation";
 export * from "./configuration";
-export * from "./BlockParser";
 export * from "./BlockCompiler";
 export * from "./BlockParser";
 export * from "./errors";
 export * from "./importing";
 export * from "./Analyzer";
 export * from "./TemplateRewriter";
 export * from "./configuration";
-
-import cssBlocks = require("./cssBlocks");
-// tslint:disable-next-line:no-default-export
-export default cssBlocks;
diff --git a/packages/@css-blocks/core/test/attribute-container-test.ts b/packages/@css-blocks/core/test/attribute-container-test.ts
@@ -3,10 +3,10 @@ import { assert } from "chai";
 import { suite, test } from "mocha-typescript";
 import { postcss } from "opticss";
 
-import cssBlocks = require("../src/cssBlocks");
 import { AttrValue } from "../src/index";
 
 import { BEMProcessor } from "./util/BEMProcessor";
+import cssBlocks = require("./util/postcss-helper");
 import { setupImporting } from "./util/setupImporting";
 
 @suite("Attribute container")
diff --git a/packages/@css-blocks/core/test/block-factory-test.ts b/packages/@css-blocks/core/test/block-factory-test.ts
@@ -2,7 +2,7 @@ import { assert } from "chai";
 import { suite, test } from "mocha-typescript";
 import { postcss } from "opticss";
 
-import cssBlocks from "../src";
+import * as cssBlocks from "../src";
 
 import { BEMProcessor } from "./util/BEMProcessor";
 import { setupImporting } from "./util/setupImporting";
diff --git a/packages/@css-blocks/core/test/block-interface-test.ts b/packages/@css-blocks/core/test/block-interface-test.ts
@@ -2,7 +2,7 @@ import { assert } from "chai";
 import { suite, test } from "mocha-typescript";
 import { postcss } from "opticss";
 
-import cssBlocks = require("../src/cssBlocks");
+import cssBlocks = require("./util/postcss-helper");
 
 import { BEMProcessor } from "./util/BEMProcessor";
 import { setupImporting } from "./util/setupImporting";
diff --git a/packages/@css-blocks/core/test/global-states-test.ts b/packages/@css-blocks/core/test/global-states-test.ts
@@ -1,7 +1,7 @@
 import { assert } from "chai";
 import { suite, test } from "mocha-typescript";
 
-import cssBlocks = require("../src/cssBlocks");
+import cssBlocks = require("./util/postcss-helper");
 
 import { assertError } from "./util/assertError";
 import { BEMProcessor } from "./util/BEMProcessor";
diff --git a/packages/@css-blocks/core/test/local-scope-test.ts b/packages/@css-blocks/core/test/local-scope-test.ts
@@ -2,7 +2,7 @@ import { assert } from "chai";
 import { suite, test } from "mocha-typescript";
 import { postcss } from "opticss";
 
-import cssBlocks = require("../src/cssBlocks");
+import cssBlocks = require("./util/postcss-helper");
 
 import { BEMProcessor } from "./util/BEMProcessor";
 import { setupImporting } from "./util/setupImporting";
diff --git a/packages/@css-blocks/core/test/plugin-api-test.ts b/packages/@css-blocks/core/test/plugin-api-test.ts
@@ -3,7 +3,8 @@ import { suite, test } from "mocha-typescript";
 import { postcss } from "opticss";
 
 import { resolveConfiguration } from "../src/configuration";
-import cssBlocks = require("../src/cssBlocks");
+
+import cssBlocks = require("./util/postcss-helper");
 
 @suite("Setting up")
 export class SetupTests {
diff --git a/packages/@css-blocks/core/test/resolution-test.ts b/packages/@css-blocks/core/test/resolution-test.ts
@@ -1,7 +1,7 @@
 import { assert } from "chai";
 import { skip, suite, test } from "mocha-typescript";
 
-import cssBlocks = require("../src/cssBlocks");
+import cssBlocks = require("./util/postcss-helper");
 
 import { assertError } from "./util/assertError";
 import { BEMProcessor } from "./util/BEMProcessor";
diff --git a/packages/@css-blocks/core/test/syntax-test.ts b/packages/@css-blocks/core/test/syntax-test.ts
@@ -1,7 +1,7 @@
 import { assert } from "chai";
 import { skip, suite, test } from "mocha-typescript";
 
-import cssBlocks = require("../src/cssBlocks");
+import cssBlocks = require("./util/postcss-helper");
 
 import { assertError } from "./util/assertError";
 import { BEMProcessor } from "./util/BEMProcessor";
diff --git a/packages/@css-blocks/core/test/util/BEMProcessor.ts b/packages/@css-blocks/core/test/util/BEMProcessor.ts
@@ -2,7 +2,7 @@ import { postcss } from "opticss";
 import * as perfectionist from "perfectionist";
 
 import { Options } from "../../src/configuration";
-import cssBlocks = require("../../src/cssBlocks");
+import cssBlocks = require(".././util/postcss-helper");
 
 export class BEMProcessor {
   process(filename: string, contents: string, cssBlocksOpts?: Options) {
diff --git a/packages/@css-blocks/core/test/util/assertError.ts b/packages/@css-blocks/core/test/util/assertError.ts
@@ -2,7 +2,7 @@ import { whatever } from "@opticss/util";
 import { assert } from "chai";
 import { postcss } from "opticss";
 
-import cssBlocks from "../../src/cssBlocks";
+import cssBlocks from ".././util/postcss-helper";
 
 export function assertError(errorType: typeof cssBlocks.CssBlockError, message: string, promise: postcss.LazyResult) {
   return promise.then(
diff --git a/packages/@css-blocks/core/test/util/postcss-helper.ts b/packages/@css-blocks/core/test/util/postcss-helper.ts
@@ -1,14 +1,15 @@
 import { postcss } from "opticss";
 
-import { BlockCompiler } from "./BlockCompiler";
-import { BlockFactory } from "./BlockParser";
-import { Options, ResolvedConfiguration, resolveConfiguration } from "./configuration";
-import * as errors from "./errors";
+import { BlockCompiler } from "../../src/BlockCompiler";
+import { BlockFactory } from "../../src/BlockParser";
+import { Configuration, OutputMode } from "../../src/configuration";
+import { Options, ResolvedConfiguration, resolveConfiguration } from "../../src/configuration";
+import * as errors from "../../src/errors";
 
 /**
  * CSS Blocks PostCSS plugin.
  */
-export class Plugin {
+class Plugin {
   private config: ResolvedConfiguration;
   private postcss: typeof postcss;
 
@@ -22,7 +23,7 @@ export class Plugin {
   }
 
   /**
-   * Main processing entrypoint for PostCSS Plugin
+   * Main processing entry point for PostCSS Plugin
    * @param  root  PostCSS AST
    * @param  result  Provides the result of the PostCSS transformations
    */
@@ -48,3 +49,31 @@ export class 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.
+
+type temp = {
+  (postcssImpl: typeof postcss): (config?: Partial<Readonly<Configuration>>) => postcss.Plugin<Partial<Readonly<Configuration>>>;
+  OutputMode: typeof OutputMode;
+  CssBlockError: typeof errors.CssBlockError;
+  InvalidBlockSyntax: typeof errors.InvalidBlockSyntax;
+  MissingSourcePath: typeof errors.MissingSourcePath;
+};
+
+function makeApi(): temp {
+  let cssBlocks: temp;
+  cssBlocks = <temp>function(postcssImpl: typeof postcss) {
+    return (config?: Partial<Readonly<Configuration>>) => {
+      let plugin = new Plugin(postcssImpl, config);
+      return plugin.process.bind(plugin);
+    };
+  };
+  cssBlocks.OutputMode = OutputMode;
+  cssBlocks.CssBlockError = errors.CssBlockError;
+  cssBlocks.InvalidBlockSyntax = errors.InvalidBlockSyntax;
+  cssBlocks.MissingSourcePath = errors.MissingSourcePath;
+  return cssBlocks;
+}
+
+export = makeApi();
