damnnnn, curly. back at it again with indented blocks

import-js · May 11, 2016 · 464cb47 · 464cb47
1 parent c862b68
commit 464cb47
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 26 deletions.
diff --git a/src/core/getExports.js b/src/core/getExports.js
@@ -229,13 +229,15 @@ export default class ExportMap {
     if (this.reexports.has(name)) return true
 
     // default exports must be explicitly re-exported (#328)
-    if (name !== 'default') for (let dep of this.dependencies.values()) {
-      let innerMap = dep()
+    if (name !== 'default') {
+      for (let dep of this.dependencies.values()) {
+        let innerMap = dep()
 
-      // todo: report as unresolved?
-      if (!innerMap) continue
+        // todo: report as unresolved?
+        if (!innerMap) continue
 
-      if (innerMap.has(name)) return true
+        if (innerMap.has(name)) return true
+      }
     }
 
     return false
@@ -267,18 +269,20 @@ export default class ExportMap {
 
 
     // default exports must be explicitly re-exported (#328)
-    if (name !== 'default') for (let dep of this.dependencies.values()) {
-      let innerMap = dep()
-      // todo: report as unresolved?
-      if (!innerMap) continue
-
-      // safeguard against cycles
-      if (innerMap.path === this.path) continue
-
-      let innerValue = innerMap.hasDeep(name)
-      if (innerValue.found) {
-        innerValue.path.unshift(this)
-        return innerValue
+    if (name !== 'default') {
+      for (let dep of this.dependencies.values()) {
+        let innerMap = dep()
+        // todo: report as unresolved?
+        if (!innerMap) continue
+
+        // safeguard against cycles
+        if (innerMap.path === this.path) continue
+
+        let innerValue = innerMap.hasDeep(name)
+        if (innerValue.found) {
+          innerValue.path.unshift(this)
+          return innerValue
+        }
       }
     }
 
@@ -302,16 +306,18 @@ export default class ExportMap {
     }
 
     // default exports must be explicitly re-exported (#328)
-    if (name !== 'default') for (let dep of this.dependencies.values()) {
-      let innerMap = dep()
-      // todo: report as unresolved?
-      if (!innerMap) continue
+    if (name !== 'default') {
+      for (let dep of this.dependencies.values()) {
+        let innerMap = dep()
+        // todo: report as unresolved?
+        if (!innerMap) continue
 
-      // safeguard against cycles
-      if (innerMap.path === this.path) continue
+        // safeguard against cycles
+        if (innerMap.path === this.path) continue
 
-      let innerValue = innerMap.get(name)
-      if (innerValue !== undefined) return innerValue
+        let innerValue = innerMap.get(name)
+        if (innerValue !== undefined) return innerValue
+      }
     }
 
     return undefined

diff --git a/src/rules/export.js b/src/rules/export.js
@@ -50,7 +50,10 @@ module.exports = function (context) {
         return
       }
       let any = false
-      remoteExports.forEach((v, name) => name !== 'default' && (any = true) && addNamed(name, node))
+      remoteExports.forEach((v, name) =>
+        name !== 'default' &&
+        (any = true) && // poor man's filter
+        addNamed(name, node))
 
       if (!any) {
         context.report(node.source,