babel-plugin-transform-modules-ui5 7.11.0 → 7.11.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 7.11.1
+
+### Patch Changes
+
+- [#172](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/pull/172) [`99f2963`](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/commit/99f2963f1cbb4bef4e23f60e83620a8ce7610884) Thanks [@petermuessig](https://github.com/petermuessig)! - Fix default re-exports (`export { default as X } from "./Mod"` and `export { default } from "./Mod"`) to use the same import interop as default imports, including modules that return their default value directly. Preserve dependency aliases when imports and re-exports share a source, regardless of declaration order. Producer export shapes and interop opt-out behavior remain unchanged.
+
 ## 7.11.0
 
 ### Minor Changes

package/dist/modules/visitor.js

@@ -78,6 +78,7 @@ const addImport = (imports, imp, filename, first, opts = {}) => {
     }
     imports[first ? "unshift" : "push"](imp);
   }
+  return existingImport || imp;
 };
 const addModuleImport = (imports, name, filename) => {
   addImport(imports, {
@@ -175,6 +176,13 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
             MODULE: _core.types.identifier(imp.tmpName),
             LOCAL: specifier.local
           }));
+        } else if (specifier.local.name !== imp.tmpName) {
+          // A previous import or re-export may already have locked the factory
+          // parameter name. Preserve this default import's local alias too.
+          deconstructors.push(th.buildConstDeclaration({
+            NAME: specifier.local,
+            VALUE: _core.types.identifier(imp.tmpName)
+          }));
         }
       } else if (_core.types.isImportNamespaceSpecifier(specifier)) {
         if (specifiers.length === 1 && !imp.locked) {
@@ -241,25 +249,47 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
       source
     } = node;
     if (this.noWrap) return;
-    let fromSource = "";
+    if (node.exportKind === "type") return; // TS or Flow-types
+
+    let fromImport;
+    let shouldInterop = false;
     if (source) {
-      // e.g. export { one, two } from 'x'
+      // Reuse the actual factory parameter if this dependency was imported
+      // earlier. Lock new records because the export expressions reference it.
       const src = resolveSource(source.value, filename);
       const name = cleanImportSource(src);
       const tmpName = tempModuleName(name);
-      addImport(this.imports, {
+      fromImport = addImport(this.imports, {
         src,
         name,
-        tmpName
+        tmpName,
+        deconstructors: [],
+        locked: true
       }, filename, false, opts);
-      fromSource = tmpName + ".";
+      fromImport.locked = true;
+      shouldInterop = !this.noImportInteropPrefixesRegexp.test(src);
     }
     if (specifiers && specifiers.length) {
       // e.g. export { one, two }
-      for (const specifier of path.node.specifiers) {
+      for (const specifier of specifiers) {
+        if (specifier.exportKind === "type") continue; // TS type-only specifier
+        let value = _core.types.cloneNode(specifier.local);
+        if (fromImport) {
+          const importedName = _core.types.isStringLiteral(specifier.local) ? specifier.local.value : specifier.local.name;
+          const module = _core.types.identifier(fromImport.tmpName);
+          if (importedName === "default") {
+            // Transformed UI5 modules can return the default value directly.
+            // Use exactly the same interop as a normal default import, without
+            // changing the producer's export shape or named export semantics.
+            value = shouldInterop ? _core.types.callExpression(_core.types.identifier("_interopRequireDefault"), [module]) : module;
+            if (shouldInterop) fromImport.interop = true;
+          } else {
+            value = _core.types.memberExpression(module, _core.types.cloneNode(specifier.local), _core.types.isStringLiteral(specifier.local));
+          }
+        }
         this.namedExports.push({
           key: specifier.exported,
-          value: _core.types.identifier(`${fromSource}${specifier.local.name}`)
+          value
         });
       }
       path.remove();
@@ -341,15 +371,18 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
     const src = resolveSource(path.node.source.value, filename);
     const name = cleanImportSource(src);
     const tmpName = tempModuleName(name);
-    addImport(this.imports, {
+    const imp = addImport(this.imports, {
       src,
       name,
-      tmpName
+      tmpName,
+      deconstructors: [],
+      locked: true
     }, filename, false, opts);
+    imp.locked = true;
     this.exportAllHelper = true;
     this.namedExports.push({
       all: true,
-      value: _core.types.identifier(tmpName)
+      value: _core.types.identifier(imp.tmpName)
     });
     path.remove();
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-modules-ui5",
-  "version": "7.11.0",
+  "version": "7.11.1",
   "description": "An unofficial babel plugin for SAP UI5.",
   "main": "dist/index.js",
   "repository": {