Import guarding now short circuits import searching after the first v…

…alid tcomb import instance is resolved. This provides higher efficiency whilst also preventing strange bug cases that could occur
christophehurpeau · May 15, 2016 · 41a102d · 41a102d
1 parent 1cb8e91
commit 41a102d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -291,7 +291,7 @@ exports['default'] = function (_ref) {
 
       ImportDeclaration: {
         exit: function exit(node) {
-          if (tcombLibraries.hasOwnProperty(node.source.value)) {
+          if (!tcombLocalName && tcombLibraries.hasOwnProperty(node.source.value)) {
             tcombLocalName = getTcombLocalNameFromImports(node);
           }
         }

diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
     "babel-eslint": "4.1.8",
     "eslint": "1.10.3",
     "mocha": "^2.2.5",
-    "tcomb": "^2.5.0"
+    "tcomb": "^3.0.0"
   },
   "tags": [
     "babel-plugin",

diff --git a/src/index.js b/src/index.js
@@ -312,7 +312,7 @@ export default function ({ Plugin, types: t }) {
 
       ImportDeclaration: {
         exit(node) {
-          if (tcombLibraries.hasOwnProperty(node.source.value)) {
+          if (!tcombLocalName && tcombLibraries.hasOwnProperty(node.source.value)) {
             tcombLocalName = getTcombLocalNameFromImports(node);
           }
         }

diff --git a/test/fixtures/import/actual.js b/test/fixtures/import/actual.js
@@ -1,4 +1,5 @@
 import tc from 'tcomb';
+import { propTypes } from 'tcomb-react';
 
 function foo(x: ?tc.String) {
   return x || 'Empty';

diff --git a/test/fixtures/import/expected.js b/test/fixtures/import/expected.js
@@ -1,4 +1,5 @@
 import tc from 'tcomb';
+import { propTypes } from 'tcomb-react';
 
 function foo(x: ?tc.String) {
   tc.assert(tc.maybe(tc.String).is(x), 'Invalid argument x (expected a ' + tc.getTypeName(tc.maybe(tc.String)) + ')');