refactor: process plugins

Author: cap-Bernardito

src/index.js

@@ -7,21 +7,8 @@ import postcss from 'postcss';
 
 import Warning from './Warning';
 import SyntaxError from './Error';
-import parseOptions from './options';
 import schema from './options.json';
-import { exec, loadConfig, createPostCssPlugins } from './utils';
-
-function pluginsToArray(plugins) {
-  if (typeof plugins === 'undefined') {
-    return [];
-  }
-
-  if (Array.isArray(plugins)) {
-    return plugins;
-  }
-
-  return [plugins];
-}
+import { exec, loadConfig, getArrayPlugins } from './utils';
 
 /**
  * **PostCSS Loader**
@@ -92,52 +79,26 @@ export default async function loader(content, sourceMap, meta = {}) {
     ...loadedConfig,
     ...options,
     plugins: [
-      ...pluginsToArray(loadedConfig.plugins),
-      ...pluginsToArray(options.plugins),
+      ...getArrayPlugins(loadedConfig.plugins, file),
+      ...getArrayPlugins(options.plugins, file),
     ],
   };
 
-  let config;
-
-  const { length } = Object.keys(mergedOptions).filter((option) => {
-    switch (option) {
-      // case 'exec':
-      // case 'ident':
-      case 'config':
-      case 'sourceMap':
-        return false;
-      default:
-        return option;
-    }
-  });
+  const resultPlugins = mergedOptions.plugins;
 
-  if (length) {
-    config = parseOptions.call(this, mergedOptions);
-  }
+  const { parser, syntax, stringifier } = mergedOptions;
 
-  if (typeof config.options !== 'undefined') {
-    if (typeof config.options.to !== 'undefined') {
-      delete config.options.to;
-    }
-
-    if (typeof config.options.from !== 'undefined') {
-      delete config.options.from;
-    }
-  }
-
-  const plugins = config.plugins || [];
-
-  const postcssOptions = Object.assign(
-    {
-      from: file,
-      map: options.sourceMap
-        ? options.sourceMap === 'inline'
-          ? { inline: true, annotation: false }
-          : { inline: false, annotation: false }
-        : false,
-    },
-    config.options
-  );
+  const postcssOptions = {
+    from: file,
+    map: options.sourceMap
+      ? options.sourceMap === 'inline'
+        ? { inline: true, annotation: false }
+        : { inline: false, annotation: false }
+      : false,
+    parser,
+    syntax,
+    stringifier,
+  };
 
   // Loader Exec (Deprecated)
   // https://webpack.js.org/api/loaders/#deprecated-context-properties
@@ -181,7 +142,7 @@ export default async function loader(content, sourceMap, meta = {}) {
 
   // Loader API Exec (Deprecated)
   // https://webpack.js.org/api/loaders/#deprecated-context-properties
-  if (config.exec) {
+  if (mergedOptions.exec) {
     // eslint-disable-next-line no-param-reassign
     content = exec(content, this);
   }
@@ -195,8 +156,6 @@ export default async function loader(content, sourceMap, meta = {}) {
     postcssOptions.map.prev = sourceMap;
   }
 
-  const resultPlugins = createPostCssPlugins(plugins, file);
-
   let result;
 
   try {
@@ -268,9 +227,7 @@ export default async function loader(content, sourceMap, meta = {}) {
  * @requires schema-utils
  *
  * @requires postcss
- * @requires postcss-load-config
  *
- * @requires ./options.js
  * @requires ./Warning.js
  * @requires ./SyntaxError.js
  */

src/options.js

@@ -151,11 +151,7 @@ async function loadConfig(config, context, configPath, loaderContext) {
   if (typeof resultConfig === 'function') {
     resultConfig = resultConfig(patchedContext);
   } else {
-    resultConfig = Object.assign({}, resultConfig, patchedContext);
-  }
-
-  if (!resultConfig.plugins) {
-    resultConfig.plugins = [];
+    resultConfig = { ...resultConfig, ...patchedContext };
   }
 
   if (result.filepath) {
@@ -166,45 +162,39 @@ async function loadConfig(config, context, configPath, loaderContext) {
   return resultConfig;
 }
 
-function createPostCssPlugins(items, file) {
-  function iterator(plugins, plugin, acc) {
-    if (typeof plugin === 'undefined') {
-      return acc;
-    }
+function getPlugin(pluginEntry) {
+  if (!pluginEntry) {
+    return [];
+  }
 
-    if (plugin === false) {
-      return iterator(plugins, plugins.pop(), acc);
-    }
+  if (pluginEntry.postcssVersion === postcssPkg.version) {
+    return [pluginEntry];
+  }
 
-    if (plugin.postcssVersion === postcssPkg.version) {
-      acc.push(plugin);
-      return iterator(plugins, plugins.pop(), acc);
-    }
+  const result = pluginEntry.call(this, this);
 
-    if (typeof plugin === 'function') {
-      const postcssPlugin = plugin.call(this, this);
+  return Array.isArray(result) ? result : [result];
+}
 
-      if (Array.isArray(postcssPlugin)) {
-        acc.concat(postcssPlugin);
-      } else {
-        acc.push(postcssPlugin);
-      }
+function getArrayPlugins(plugins, file) {
+  if (Array.isArray(plugins)) {
+    return plugins.reduce((accumulator, plugin) => {
+      // eslint-disable-next-line no-param-reassign
+      accumulator = accumulator.concat(getArrayPlugins(plugin));
 
-      return iterator(plugins, plugins.pop(), acc);
-    }
+      return accumulator;
+    }, []);
+  }
 
-    if (Object.keys(plugin).length === 0) {
-      return iterator(plugins, plugins.pop(), acc);
+  if (typeof plugins === 'object' && typeof plugins !== 'function') {
+    if (Object.keys(plugins).length === 0) {
+      return [];
     }
 
-    const concatPlugins = [...plugins, ...loadPlugins(plugin, file)];
-
-    return iterator(concatPlugins, concatPlugins.pop(), acc);
+    return getArrayPlugins(loadPlugins(plugins, file), file);
   }
 
-  const pl = [...items];
-
-  return iterator(pl, pl.pop(), []);
+  return getPlugin(plugins);
 }
 
-export { exec, loadConfig, createPostCssPlugins };
+export { exec, loadConfig, getArrayPlugins };

src/utils.js

@@ -3,8 +3,7 @@
 exports[`Config Options should emit error when invalid config : errors 1`] = `
 Array [
   "ModuleBuildError: Module build failed (from \`replaced original path\`):
-Error: No PostCSS Config found in: /test/fixtures/css/invalid.config.js
-    at loadConfig (/src/utils.js:144:11)",
+Error: No PostCSS Config found in: /test/fixtures/css/invalid.config.js",
 ]
 `;
 
@@ -13,9 +12,7 @@ exports[`Config Options should emit error when invalid config : warnings 1`] = `
 exports[`Config Options should emit error when unresolved config : errors 1`] = `
 Array [
   "ModuleBuildError: Module build failed (from \`replaced original path\`):
-Error: No PostCSS Config found in: /test/fixtures/css/unresolve.js
-    at loadConfig (/src/utils.js:130:11)
-    at processTicksAndRejections (internal/process/task_queues.js:97:5)",
+Error: No PostCSS Config found in: /test/fixtures/css/unresolve.js",
 ]
 `;
 

test/options/__snapshots__/config.test.js.snap

@@ -220,7 +220,7 @@ describe('Config Options', () => {
     const stats = await compile(compiler);
 
     expect(getWarnings(stats)).toMatchSnapshot('warnings');
-    expect(getErrors(stats)).toMatchSnapshot('errors');
+    expect(getErrors(stats, true)).toMatchSnapshot('errors');
   });
 
   it('should emit error when invalid config ', async () => {
@@ -230,6 +230,6 @@ describe('Config Options', () => {
     const stats = await compile(compiler);
 
     expect(getWarnings(stats)).toMatchSnapshot('warnings');
-    expect(getErrors(stats)).toMatchSnapshot('errors');
+    expect(getErrors(stats, true)).toMatchSnapshot('errors');
   });
 });