fix: import order

.gitignore

@@ -5,3 +5,4 @@ coverage
 lib
 *.log
 *.log.*
+.vscode

src/Plugin.js

@@ -52,11 +52,33 @@ export default class Plugin {
     this.pluginStateKey = `importPluginState${index}`;
   }
 
-  getPluginState(state) {
-    if (!state[this.pluginStateKey]) {
-      state[this.pluginStateKey] = {}; // eslint-disable-line
+  transformFilename(methodName) {
+    // eslint-disable-next-line no-nested-ternary
+    return this.camel2UnderlineComponentName
+      ? transCamel(methodName, '_')
+      : this.camel2DashComponentName
+      ? transCamel(methodName, '-')
+      : methodName;
+  }
+
+  getInjectStylePath(path, file, transformedMethodName) {
+    let stylePath;
+    const { style } = this;
+
+    if (this.customStyleName) {
+      stylePath = winPath(this.customStyleName(transformedMethodName));
+    } else if (this.styleLibraryDirectory) {
+      stylePath = winPath(
+        join(this.libraryName, this.styleLibraryDirectory, transformedMethodName, this.fileName),
+      );
+    } else if (style === true) {
+      stylePath = `${path}/style`;
+    } else if (style === 'css') {
+      stylePath = `${path}/style/css`;
+    } else if (typeof style === 'function') {
+      stylePath = style(path, file);
     }
-    return state[this.pluginStateKey];
+    return stylePath;
   }
 
   importMethod(methodName, file, pluginState) {
@@ -97,6 +119,13 @@ export default class Plugin {
     return { ...pluginState.selectedMethods[methodName] };
   }
 
+  getPluginState(state) {
+    if (!state[this.pluginStateKey]) {
+      state[this.pluginStateKey] = {}; // eslint-disable-line
+    }
+    return state[this.pluginStateKey];
+  }
+
   buildExpressionHandler(node, props, path, state) {
     const file = (path && path.hub && path.hub.file) || (state && state.file);
     const { types } = this;
@@ -145,45 +174,55 @@ export default class Plugin {
     if (!node) return;
 
     const { value } = node.source;
-    const { libraryName } = this;
-    const { types } = this;
+    const { libraryName, libraryDirectory, types } = this;
     const pluginState = this.getPluginState(state);
     if (value === libraryName) {
-      node.specifiers.forEach(spec => {
-        if (types.isImportSpecifier(spec)) {
-          pluginState.specified[spec.local.name] = spec.imported.name;
-        } else {
-          pluginState.libraryObjs[spec.local.name] = true;
-        }
-      });
-      pluginState.pathsToRemove.push(path);
-    }
-  }
-
-  CallExpression(path, state) {
-    const { node } = path;
-    const file = (path && path.hub && path.hub.file) || (state && state.file);
-    const { name } = node.callee;
-    const { types } = this;
-    const pluginState = this.getPluginState(state);
-
-    if (types.isIdentifier(node.callee)) {
-      if (pluginState.specified[name]) {
-        node.callee = this.importMethod(pluginState.specified[name], file, pluginState);
-      }
+      const newImports = node.specifiers
+        .map(item => {
+          /**
+           * LibraryObjs for @MemberExpression shaking, like
+           * import antd from 'antd'
+           * <antd.Button />
+           *
+           * to
+           *
+           * var Button =  require("antd/lib/button")
+           * <Button />
+           */
+          if (!types.isImportSpecifier(item)) {
+            pluginState.libraryObjs[item.local.name] = true;
+            return false;
+          }
+
+          const transformedMethodName = this.transformFilename(
+            types.isImportSpecifier(item) ? item.imported.name : item.local.name,
+          );
+
+          const file = (path && path.hub && path.hub.file) || (state && state.file);
+          const importPath = winPath(
+            this.customName
+              ? this.customName(transformedMethodName, file)
+              : join(this.libraryName, libraryDirectory, transformedMethodName, this.fileName), // eslint-disable-line
+          );
+          const stylePath = this.getInjectStylePath(importPath, file, transformedMethodName);
+          // eslint-disable-next-line new-cap
+          return [
+            stylePath ? types.ImportDeclaration([], types.StringLiteral(stylePath)) : false,
+            types.ImportDeclaration(
+              [
+                this.transformToDefaultImport
+                  ? types.importDefaultSpecifier(item.local)
+                  : types.ImportNamespaceSpecifier(item.local),
+              ],
+              // eslint-disable-next-line new-cap
+              types.StringLiteral(importPath),
+            ),
+          ];
+        })
+        .reduce((acc, val) => acc.concat(val), [])
+        .filter(Boolean);
+      path.replaceWithMultiple(newImports);
     }
-
-    node.arguments = node.arguments.map(arg => {
-      const { name: argName } = arg;
-      if (
-        pluginState.specified[argName] &&
-        path.scope.hasBinding(argName) &&
-        path.scope.getBinding(argName).path.type === 'ImportSpecifier'
-      ) {
-        return this.importMethod(pluginState.specified[argName], file, pluginState);
-      }
-      return arg;
-    });
   }
 
   MemberExpression(path, state) {
@@ -197,77 +236,6 @@ export default class Plugin {
     if (pluginState.libraryObjs[node.object.name]) {
       // antd.Button -> _Button
       path.replaceWith(this.importMethod(node.property.name, file, pluginState));
-    } else if (pluginState.specified[node.object.name] && path.scope.hasBinding(node.object.name)) {
-      const { scope } = path.scope.getBinding(node.object.name);
-      // global variable in file scope
-      if (scope.path.parent.type === 'File') {
-        node.object = this.importMethod(pluginState.specified[node.object.name], file, pluginState);
-      }
     }
   }
-
-  Property(path, state) {
-    const { node } = path;
-    this.buildDeclaratorHandler(node, 'value', path, state);
-  }
-
-  VariableDeclarator(path, state) {
-    const { node } = path;
-    this.buildDeclaratorHandler(node, 'init', path, state);
-  }
-
-  ArrayExpression(path, state) {
-    const { node } = path;
-    const props = node.elements.map((_, index) => index);
-    this.buildExpressionHandler(node.elements, props, path, state);
-  }
-
-  LogicalExpression(path, state) {
-    const { node } = path;
-    this.buildExpressionHandler(node, ['left', 'right'], path, state);
-  }
-
-  ConditionalExpression(path, state) {
-    const { node } = path;
-    this.buildExpressionHandler(node, ['test', 'consequent', 'alternate'], path, state);
-  }
-
-  IfStatement(path, state) {
-    const { node } = path;
-    this.buildExpressionHandler(node, ['test'], path, state);
-    this.buildExpressionHandler(node.test, ['left', 'right'], path, state);
-  }
-
-  ExpressionStatement(path, state) {
-    const { node } = path;
-    const { types } = this;
-    if (types.isAssignmentExpression(node.expression)) {
-      this.buildExpressionHandler(node.expression, ['right'], path, state);
-    }
-  }
-
-  ReturnStatement(path, state) {
-    const { node } = path;
-    this.buildExpressionHandler(node, ['argument'], path, state);
-  }
-
-  ExportDefaultDeclaration(path, state) {
-    const { node } = path;
-    this.buildExpressionHandler(node, ['declaration'], path, state);
-  }
-
-  BinaryExpression(path, state) {
-    const { node } = path;
-    this.buildExpressionHandler(node, ['left', 'right'], path, state);
-  }
-
-  NewExpression(path, state) {
-    const { node } = path;
-    this.buildExpressionHandler(node, ['callee', 'arguments'], path, state);
-  }
-
-  ClassDeclaration(path, state) {
-    const { node } = path;
-    this.buildExpressionHandler(node, ['superClass'], path, state);
-  }
 }

test/fixtures/custom-style-path-ignore/expected.js

@@ -1,15 +1,15 @@
 "use strict";
 
+var _react = _interopRequireDefault(require("react"));
+
+var _reactDom = _interopRequireDefault(require("react-dom"));
+
 var _animation = _interopRequireDefault(require("antd/lib/animation"));
 
 require("antd/lib/button/style/2x");
 
 var _button = _interopRequireDefault(require("antd/lib/button"));
 
-var _react = _interopRequireDefault(require("react"));
-
-var _reactDom = _interopRequireDefault(require("react-dom"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 ReactDOM.render(_react.default.createElement(_animation.default, null, _react.default.createElement(_button.default, null, "xxxx")), document.getElementById("react-container"));

test/fixtures/custom-style-path/expected.js

@@ -1,13 +1,13 @@
 "use strict";
 
-require("antd/lib/button/style/2x");
-
-var _button = _interopRequireDefault(require("antd/lib/button"));
-
 var _react = _interopRequireDefault(require("react"));
 
 var _reactDom = _interopRequireDefault(require("react-dom"));
 
+require("antd/lib/button/style/2x");
+
+var _button = _interopRequireDefault(require("antd/lib/button"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-ReactDOM.render(_react.default.createElement("div", null, _react.default.createElement(_button.default, null, "xxxx")), document.getElementById('react-container'));
+ReactDOM.render(_react.default.createElement("div", null, _react.default.createElement(_button.default, null, "xxxx")), document.getElementById('react-container'));

test/fixtures/execute-direct/expected.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var _message2 = _interopRequireDefault(require("antd/lib/message"));
+var _message = _interopRequireDefault(require("antd/lib/message"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-(0, _message2.default)('xxx');
+(0, _message.default)('xxx');

test/fixtures/execute-member/expected.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var _message2 = _interopRequireDefault(require("antd/lib/message"));
+var _message = _interopRequireDefault(require("antd/lib/message"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-_message2.default.success('xxx');
+_message.default.success('xxx');

test/fixtures/import-css/expected.js

@@ -2,15 +2,15 @@
 
 var _react = _interopRequireDefault(require("react"));
 
-require("antd/lib/button/style");
+require("antd/lib/message/style");
 
-var _button = _interopRequireDefault(require("antd/lib/button"));
+var _message = _interopRequireDefault(require("antd/lib/message"));
 
-require("antd/lib/message/style");
+require("antd/lib/button/style");
 
-var _message2 = _interopRequireDefault(require("antd/lib/message"));
+var _button = _interopRequireDefault(require("antd/lib/button"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-(0, _message2.default)('xxx');
-ReactDOM.render(_react.default.createElement("div", null, _react.default.createElement(_button.default, null, "xxxx")));
+(0, _message.default)('xxx');
+ReactDOM.render(_react.default.createElement("div", null, _react.default.createElement(_button.default, null, "xxxx")));

test/fixtures/import-order/actual.js

@@ -0,0 +1,4 @@
+import 'polyfill';
+import { Button } from 'antd';
+
+console.log(Button);

test/fixtures/import-order/expected.js

@@ -0,0 +1,9 @@
+"use strict";
+
+require("polyfill");
+
+var _button = _interopRequireDefault(require("antd/lib/button"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+console.log(_button.default);

test/fixtures/keep-named-import/expected.js

@@ -1,8 +1,12 @@
 "use strict";
 
-var _end2 = require("stream/lib/end");
+var start = _interopRequireWildcard(require("stream/lib/start"));
 
-var _start2 = require("stream/lib/start");
+var end = _interopRequireWildcard(require("stream/lib/end"));
 
-(0, _start2.start)();
-(0, _end2.end)();
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+start();
+end();

test/fixtures/material-ui/expected.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var _Toolbar2 = _interopRequireDefault(require("material-ui/Toolbar"));
+var _Toolbar = _interopRequireDefault(require("material-ui/Toolbar"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-(0, _Toolbar2.default)('xxx');
+(0, _Toolbar.default)('xxx');

test/fixtures/modules-false/expected.js

@@ -1,13 +1,13 @@
 "use strict";
 
-require("antd/lib/button/style");
-
-var _button = _interopRequireDefault(require("antd/lib/button"));
-
 var _react = _interopRequireDefault(require("react"));
 
 var _reactDom = _interopRequireDefault(require("react-dom"));
 
+require("antd/lib/button/style");
+
+var _button = _interopRequireDefault(require("antd/lib/button"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 ReactDOM.render(_react.default.createElement("div", null, _react.default.createElement(_button.default, null, "xxxx")), document.getElementById('react-container'));

test/fixtures/multiple-libraries-hilojs/expected.js

@@ -1,13 +1,13 @@
 "use strict";
 
+var _select = _interopRequireDefault(require("antd/lib/select"));
+
 var _abc = _interopRequireDefault(require("hilojs/abc"));
 
 var _class = _interopRequireDefault(require("hilojs/core/class"));
 
-var _select = _interopRequireDefault(require("antd/lib/select"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 if (_select.default) {}
 
-if (_class.default && _abc.default) {}
+if (_class.default && _abc.default) {}