@babel/helper-module-imports - npm Package Compare versions

Comparing version 7.0.0-beta.32 to 7.0.0-beta.33

lib/import-builder.js

@@ -47,2 +47,6 @@ "use strict";
   _proto.namespace = function namespace(name) {
+    if (name === void 0) {
+      name = "namespace";
+    }
+
     name = this._scope.generateUidIdentifier(name);
@@ -49,0 +53,0 @@ var statement = this._statements[this._statements.length - 1];

lib/import-injector.js

@@ -111,5 +111,5 @@ "use strict";
         ensureNoContext = opts.ensureNoContext,
-        _opts$nameHint = opts.nameHint,
-        nameHint = _opts$nameHint === void 0 ? importName : _opts$nameHint,
+        nameHint = opts.nameHint,
         blockHoist = opts.blockHoist;
+    var name = nameHint || importName;
     var isMod = (0, _isModule.default)(this._programPath, true);
@@ -128,5 +128,5 @@ var isModuleForNode = isMod && importingInterop === "node";
       if (isNamespace) {
-        builder.namespace("namespace");
+        builder.namespace(nameHint || importedSource);
       } else if (isDefault || isNamed) {
-        builder.named(nameHint, importName);
+        builder.named(name, importName);
       }
@@ -137,14 +137,16 @@ } else if (importedType !== "commonjs") {
       if (isModuleForNode) {
+        name = name !== "default" ? name : importedSource;
+        var es6Default = importedSource + "$es6Default";
         builder.import();
 
         if (isNamespace) {
-          builder.default("es6Default").var(nameHint || "namespace").wildcardInterop();
+          builder.default(es6Default).var(name || importedSource).wildcardInterop();
         } else if (isDefault) {
           if (ensureLiveReference) {
-            builder.default("es6Default").var("namespace").defaultInterop().read("default");
+            builder.default(es6Default).var(name || importedSource).defaultInterop().read("default");
           } else {
-            builder.default("es6Default").var(nameHint).defaultInterop().prop(importName);
+            builder.default(es6Default).var(name).defaultInterop().prop(importName);
           }
         } else if (isNamed) {
-          builder.default("es6Default").read(importName);
+          builder.default(es6Default).read(importName);
         }
@@ -155,5 +157,5 @@ } else if (isModuleForBabel) {
         if (isNamespace) {
-          builder.namespace("namespace");
+          builder.namespace(name || importedSource);
         } else if (isDefault || isNamed) {
-          builder.named(nameHint, importName);
+          builder.named(name, importName);
         }
@@ -164,10 +166,15 @@ } else {
         if (isNamespace) {
-          builder.var("namespace").wildcardInterop();
+          builder.var(name || importedSource).wildcardInterop();
         } else if ((isDefault || isNamed) && ensureLiveReference) {
-          builder.var("namespace").read(importName);
-          if (isDefault) builder.defaultInterop();
+          if (isDefault) {
+            name = name !== "default" ? name : importedSource;
+            builder.var(name).read(importName);
+            builder.defaultInterop();
+          } else {
+            builder.var(importedSource).read(importName);
+          }
         } else if (isDefault) {
-          builder.var(nameHint).defaultInterop().prop(importName);
+          builder.var(name).defaultInterop().prop(importName);
         } else if (isNamed) {
-          builder.var(nameHint).prop(importName);
+          builder.var(name).prop(importName);
         }
@@ -180,5 +187,5 @@ }
         if (isNamespace) {
-          builder.default("namespace");
+          builder.default(name || importedSource);
         } else if (isDefault || isNamed) {
-          builder.default("namespace").read(importName);
+          builder.default(importedSource).read(name);
         }
@@ -189,5 +196,5 @@ } else if (isModuleForBabel) {
         if (isNamespace) {
-          builder.namespace("namespace");
+          builder.namespace(name || importedSource);
         } else if (isDefault || isNamed) {
-          builder.named(nameHint, importName);
+          builder.named(name, importName);
         }
@@ -198,8 +205,8 @@ } else {
         if (isNamespace) {
-          builder.var("namespace");
+          builder.var(name || importedSource);
         } else if (isDefault || isNamed) {
           if (ensureLiveReference) {
-            builder.var("namespace").read(importName);
+            builder.var(importedSource).read(name);
           } else {
-            builder.prop(importName).var(nameHint);
+            builder.prop(importName).var(name);
           }
@@ -217,7 +224,7 @@ }
         if (isNamespace) {
-          builder.default("namespace");
+          builder.default(name || importedSource);
         } else if (isDefault) {
-          builder.default(nameHint);
+          builder.default(name);
         } else if (isNamed) {
-          builder.default("namespace").read(importName);
+          builder.default(importedSource).read(name);
         }
@@ -228,7 +235,7 @@ } else if (isModuleForBabel) {
         if (isNamespace) {
-          builder.default("namespace");
+          builder.default(name || importedSource);
         } else if (isDefault) {
-          builder.default(nameHint);
+          builder.default(name);
         } else if (isNamed) {
-          builder.named(nameHint, importName);
+          builder.named(name, importName);
         }
@@ -239,10 +246,10 @@ } else {
         if (isNamespace) {
-          builder.var("namespace");
+          builder.var(name || importedSource);
         } else if (isDefault) {
-          builder.var(nameHint);
+          builder.var(name);
         } else if (isNamed) {
           if (ensureLiveReference) {
-            builder.var("namespace").read(importName);
+            builder.var(importedSource).read(name);
           } else {
-            builder.var(nameHint).prop(importName);
+            builder.var(name).prop(importName);
           }
@@ -249,0 +256,0 @@ }

package.json

 {
   "name": "@babel/helper-module-imports",
-  "version": "7.0.0-beta.32",
+  "version": "7.0.0-beta.33",
   "description": "Babel helper functions for inserting module loads",
@@ -11,8 +11,8 @@ "author": "Logan Smyth <[e-mail]>",
   "dependencies": {
-    "@babel/types": "7.0.0-beta.32",
+    "@babel/types": "7.0.0-beta.33",
     "lodash": "^4.2.0"
   },
   "devDependencies": {
-    "@babel/core": "7.0.0-beta.32"
+    "@babel/core": "7.0.0-beta.33"
   }
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

18273

increased by1.89%

Lines of code

403

increased by2.54%

Dependency changes

• + Added@babel/types@7.0.0-beta.33(transitive)

• - Removed@babel/types@7.0.0-beta.32(transitive)

• Updated@babel/types@7.0.0-beta.33