babel-plugin-transform-modules-ui5 7.1.1 → 7.1.3

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [7.1.3](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/compare/v7.1.2...v7.1.3) (2023-04-11)
+
+
+### Bug Fixes
+
+* dynamic import must not handle __esModule flagged modules ([#93](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/issues/93)) ([b269985](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/commit/b26998540cac0c2c2868bd59198d6f9abfaab8f7))
+
+
+
+
+
+## [7.1.2](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/compare/v7.1.1...v7.1.2) (2023-04-11)
+
+
+### Bug Fixes
+
+* dynamic imports of empty modules must not fail ([#92](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/issues/92)) ([a1de75d](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/commit/a1de75dcfcb577bf6fea3669cf448e9183b7d636))
+
+
+
+
+
 ## [7.1.1](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/compare/v7.1.0...v7.1.1) (2023-03-27)
 
 

package/dist/utils/templates.js

@@ -85,23 +85,83 @@ const buildDefaultImportDeconstructor = (0, _core.template)(`
   const LOCAL = _interopRequireDefault(MODULE);
 `);
 
+/*
+ * Scenarios for dynamic exports:
+ *
+ * 1.) ES module with no exports
+ *
+ * (await import("./moduleWithNoExports.js")) ==> Module
+ * (await import("./moduleWithNoExports.js")).default ==> undefined
+ *
+ * 2.) ES module with default export
+ *
+ * (await import("./moduleWithDefaultExport.js")) ==> Module
+ * (await import("./moduleWithDefaultExport.js")).default ==> DefaultExport
+ *
+ * 3.) ES module with named exports
+ *
+ * (await import("./moduleWithNamedExport.js")) ==> Module
+ * (await import("./moduleWithNamedExport.js")).default ==> undefined
+ * (await import("./moduleWithNamedExport.js")).NamedExport ==> NamedExport
+ *
+ * A Module object is always returned by the dynamic import.
+ *
+ * ---
+ *
+ * The dynamic import script template simulates the default and named exports
+ * for non-ES modules so that the TypeScript code completion can be properly
+ * used. The template below is used to translate dynamic imports to sap.ui.require
+ * calls which are typically be used for the following scenarios:
+ *
+ * 1.) UI5 Libraries
+ *
+ * A UI5 library exports its complete namespace and all available
+ * types/enums/... are accessible as named properties on that
+ * namespace, e.g.:
+ *
+ * (await import("sap/m/library")) => { __esModule: true, ... }
+ * (await import("sap/m/library")).default => undefined
+ * (await import("sap/m/library")).ButtonType => sap/m/ButtonType
+ *
+ * 2.) UI5 Classes
+ *
+ * A UI5 class exports itself as default. When importing a UI5 class
+ * it is expected to be accessible via the default property.
+ *
+ * (await import("sap/m/Button")) => { __esModule: true, ... }
+ * (await import("sap/m/Button")).default => sap/m/Button
+ *
+ * 3.) Static Helpers (sap/m/MessageBox)
+ *
+ * (await import("sap/m/MessageBox")) => { __esModule: true, ... }
+ * (await import("sap/m/MessageBox")).default => sap/m/MessageBox
+ * (await import("sap/m/MessageBox")).Action => undefined
+ * (await import("sap/m/MessageBox")).default.Action => sap/m/MessageBox.Action
+ *
+ * 4.) undefined or null (no exports)
+ *
+ * (await import("./non/exporting/module")) => { __esModule: true, ... }
+ * (await import("./non/exporting/module")) => undefined
+ *
+ * 5.) Other dependencies (jsPDF)
+ *
+ * (await import("jsPDF")) => { __esModule: true, jsPDF: ?, ... }
+ * (await import("sap/m/MessageBox")).jsPDF => jsPDF
+ *
+ * When requiring other dependencies they are already flagged as __esModule
+ * and must not be processed in our dynamic import to require handler.
+ */
 // TODO: inject __extends instead of Object.assign unless useBuiltIns in set
 exports.buildDefaultImportDeconstructor = buildDefaultImportDeconstructor;
 const buildDynamicImportHelper = (0, _core.template)(`
   function __ui5_require_async(path) {
     return new Promise((resolve, reject) => {
       sap.ui.require([path], (module) => {
-        if (!module) { 
-          return reject("No module returned from " + path); 
-        } else if (module.__esModule) { 
-          return resolve(module); 
-        } else if (module.default) {
-          return reject(new Error(path + " module includes a 'default' property but not __esModule. Cannot use as dynamic import"));
-        } else {
-          module.default = typeof module === "object" ? Object.assign({}, module) : module;
-          module.__esModule = true;
-          resolve(module);
+        if (!module.__esModule) {
+          module = module === null || !(typeof module === "object" && path.endsWith("/library")) ? { default: module } : module;
+          Object.defineProperty(module, "__esModule", { value: true });
         }
+        resolve(module);
       }, (err) => {
         reject(err);
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-modules-ui5",
-  "version": "7.1.1",
+  "version": "7.1.3",
   "description": "An unofficial babel plugin for SAP UI5.",
   "main": "dist/index.js",
   "repository": {
@@ -92,5 +92,5 @@
     "prettier": "^2.8.4",
     "rimraf": "^4.1.2"
   },
-  "gitHead": "e7dd55f8a73fa37f31267372da5ac3d441e26e3e"
+  "gitHead": "54a5521dea19fedd9cd53f7aeabc5e383e926303"
 }