refactor: options

Author: alexander-akait

lib/loader.js

@@ -15,6 +15,9 @@ module.exports = function(content, map, meta) {
 
   const cb = this.async();
   const sourceMap = options.sourceMap || false;
+  const url = typeof options.url === "undefined" ? true : options.url;
+  const importOpt = typeof options.import === "undefined" ? true : options.import;
+  const importLoaders = options.importLoaders || 0;
 
   if (sourceMap && map) {
     if (typeof map === "string") {
@@ -42,9 +45,9 @@ module.exports = function(content, map, meta) {
   const plugins = [
     plugin({
       loaderContext: this,
-      url: options.url !== false,
-      import: options.import !== false,
-      importLoaders: options.importLoaders
+      url,
+      import: importOpt,
+      importLoaders
     })
   ];
 
@@ -114,11 +117,11 @@ module.exports = function(content, map, meta) {
         result.messages
           .filter(
             message =>
-              message.type === "modify-generated-code" ? message : false
+              message.type === "modify-code" ? message : false
           )
           .forEach((message) => {
             try {
-              newContentObj = message.modifyGeneratedCode(this, newContentObj);
+              newContentObj = message.modifyCode(this, newContentObj);
             } catch (err) {
               this.emitError(err);
             }

lib/plugin.js

@@ -5,15 +5,10 @@ const loaderUtils = require("loader-utils");
 const pluginName = "postcss-css-loader";
 
 function getImportPrefix(loaderContext, importLoaders) {
-  if (importLoaders === false) {
-    return "";
-  }
-
-  const importLoadersValue = parseInt(importLoaders, 10) || 0;
   const loadersRequest = loaderContext.loaders
     .slice(
       loaderContext.loaderIndex,
-      loaderContext.loaderIndex + 1 + importLoadersValue
+      loaderContext.loaderIndex + 1 + importLoaders
     )
     .map(x => x.request)
     .join("!");
@@ -81,8 +76,8 @@ module.exports = postcss.plugin(pluginName, function(options) {
         if (!alreadyImported[url]) {
           result.messages.push({
             pluginName,
-            type: "modify-generated-code",
-            modifyGeneratedCode: (loaderContext, contentObj) => {
+            type: "modify-code",
+            modifyCode: (loaderContext, contentObj) => {
               contentObj.runtime = `${contentObj.runtime}${runtimeCode}\n`;
 
               return contentObj;
@@ -148,8 +143,8 @@ module.exports = postcss.plugin(pluginName, function(options) {
 
             result.messages.push({
               pluginName,
-              type: "modify-generated-code",
-              modifyGeneratedCode: (loaderContext, contentObj) => {
+              type: "modify-code",
+              modifyCode: (loaderContext, contentObj) => {
                 if (!hasURLEscapeRuntimeCode) {
                   contentObj.imports = `var runtimeEscape = require(${loaderUtils.stringifyRequest(
                     loaderContext,