babel-plugin-transform-modules-ui5 7.3.0 → 7.4.0

package/CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [7.4.0](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/compare/v7.3.1...v7.4.0) (2024-05-31)
+
+
+### Bug Fixes
+
+* remove empty export declaration added by TypeScript ([3cb14cf](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/commit/3cb14cf7aefd400d0191d364f457c66452edc32a)), closes [/github.com/babel/babel/blob/main/packages/babel-plugin-transform-typescript/src/index.ts#L399](https://github.com//github.com/babel/babel/blob/main/packages/babel-plugin-transform-typescript/src/index.ts/issues/L399)
+
+
+### Features
+
+* imports added by other plugins are also included in the sap.ui.define calls ([#126](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/issues/126)) ([895fe62](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/commit/895fe624df66a6db1b9daa5cadce8a984ced5af4))
+
+
+
+
+
+## [7.3.1](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/compare/v7.3.0...v7.3.1) (2024-05-12)
+
+
+### Bug Fixes
+
+* remove file extensions from imports to avoid redundant extensions ([#125](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/issues/125)) ([e86d6f6](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/commit/e86d6f675451b6eaaaf63f9433200cd7406d0245))
+* support index modules for dependencies ([#123](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/issues/123)) ([f510380](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/commit/f510380f7c201d9aba3e735badea21546f81f03d))
+
+
+
+
+
 # [7.3.0](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/compare/v7.2.6...v7.3.0) (2024-01-18)
 
 

package/dist/index.js

@@ -59,6 +59,9 @@ module.exports = () => {
       exit(path, {
         opts
       }) {
+        path.traverse({
+          ImportDeclaration: _visitor2.ModuleTransformVisitor.ImportDeclaration
+        }, this);
         (0, _wrapper.wrap)(this, path.node, opts);
       }
     }

package/dist/modules/helpers/wrapper.js

@@ -22,7 +22,16 @@ function wrap(visitor, programNode, opts) {
     injectDynamicImportHelper
   } = visitor;
   const needsWrap = !!(defaultExport || imports.length || namedExports.length || injectDynamicImportHelper);
-  if (!needsWrap) return;
+  if (!needsWrap) {
+    // cleanup the program node if it's empty (just having empty imports)
+    programNode.body = programNode.body.filter(node => {
+      if (_core.types.isExportNamedDeclaration(node)) {
+        return node.declaration != null;
+      }
+      return true;
+    });
+    return;
+  }
   let {
     body
   } = programNode;

package/dist/modules/visitor.js

@@ -4,11 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ModuleTransformVisitor = void 0;
+var _path = require("path");
+var _fs = require("fs");
 var _core = require("@babel/core");
 var th = _interopRequireWildcard(require("../utils/templates"));
 var ast = _interopRequireWildcard(require("../utils/ast"));
 var _jsdoc = require("../classes/helpers/jsdoc");
-const _excluded = ["opts"];
+const _excluded = ["filename", "opts"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -18,25 +20,58 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typ
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+const resolveSource = (src, filename) => {
+  src = src.replace(/\\/g, "/");
+  const dir = (0, _path.dirname)(filename);
+  const absoluteSrc = (0, _path.join)(dir, src);
+  if ((0, _fs.existsSync)(absoluteSrc) && (0, _fs.statSync)(absoluteSrc).isDirectory) {
+    if ((0, _fs.existsSync)((0, _path.join)(absoluteSrc, "index.js")) || (0, _fs.existsSync)((0, _path.join)(absoluteSrc, "index.jsx")) || (0, _fs.existsSync)((0, _path.join)(absoluteSrc, "index.ts")) || (0, _fs.existsSync)((0, _path.join)(absoluteSrc, "index.tsx")) || (0, _fs.existsSync)((0, _path.join)(absoluteSrc, "index.mjs")) || (0, _fs.existsSync)((0, _path.join)(absoluteSrc, "index.cjs"))) {
+      src = `${src}/index`;
+    }
+  }
+  return src;
+};
 const cleanImportSource = src => src.replace(/(\/)|(-)|(@)/g, "_").replace(/\./g, "");
 const tempModuleName = name => `__${name}`;
 const hasGlobalExportFlag = node => (0, _jsdoc.hasJsdocGlobalExportFlag)(node);
-const addModuleImport = (imports, name) => {
-  const existingImport = imports.find(imp => imp.src === name);
+const addImport = (imports, imp, filename, first) => {
+  const existingImport = imports.find(i => i.src === imp.src);
   if (!existingImport) {
-    imports.unshift({
-      src: name,
-      name: name,
-      tmpName: name
-    });
+    // if a module ends with the file extension ".js" and it can be resolved to
+    // a local file having also the file extension ".js" and not ".js.js" then
+    // we need to slice the file extension to avoid redundant file extension
+    // (the require/define of UI5 always adds the file extension ".js" to the module name)
+    if (imp.src.indexOf(".js") != -1) {
+      try {
+        const modulePath = require.resolve(imp.src);
+        if (modulePath.endsWith(imp.src.split("/").pop())) {
+          console.log(`\x1b[33mHint:\x1b[0m Removed file extension for dependency "\x1b[34m${imp.src}\x1b[0m" found in \x1b[90m${filename}\x1b[0m`);
+          imp.src = imp.src.slice(0, -3);
+        }
+      } catch (ex) {
+        // ignore the error, do not slice file extension as the module
+        // can't be resolved with the given file extension, e.g.
+        // myns/module.js must be provided as myns/module
+        // myns/module.js.js must be provided as myns/module.js
+      }
+    }
+    imports[first ? "unshift" : "push"](imp);
   }
 };
+const addModuleImport = (imports, name, filename) => {
+  addImport(imports, {
+    src: name,
+    name: name,
+    tmpName: name
+  }, filename, true);
+};
 const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
   /*!
    * Removes the ES6 import and adds the details to the import array in our state.
    */
   ImportDeclaration(path, _ref) {
     let {
+        filename,
         opts = {}
       } = _ref,
       state = _objectWithoutProperties(_ref, _excluded);
@@ -49,7 +84,7 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
       specifiers,
       source
     } = node;
-    const src = source.value.replace(/\\/g, "/");
+    const src = resolveSource(source.value, filename);
 
     // When 'libs' are used, only 'libs' will be converted to UI5 imports.
     const {
@@ -159,7 +194,7 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
     }
     imp.deconstructors = imp.deconstructors.concat(deconstructors);
     if (!existingImport) {
-      this.imports.push(imp);
+      addImport(this.imports, imp, filename);
     }
   },
   /**
@@ -167,7 +202,9 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
    * The reason we don't export in place is to handle the situation
    * where a let or var can be defined, and the latest one should be exported.
    */
-  ExportNamedDeclaration(path) {
+  ExportNamedDeclaration(path, {
+    filename
+  }) {
     const {
       node
     } = path;
@@ -179,14 +216,14 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
     let fromSource = "";
     if (source) {
       // e.g. export { one, two } from 'x'
-      const src = source.value;
+      const src = resolveSource(source.value, filename);
       const name = cleanImportSource(src);
       const tmpName = tempModuleName(name);
-      this.imports.push({
+      addImport(this.imports, {
         src,
         name,
         tmpName
-      });
+      }, filename);
       fromSource = tmpName + ".";
     }
     if (specifiers && specifiers.length) {
@@ -229,7 +266,9 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
       return;
     }
   },
-  ExportDefaultDeclaration(path) {
+  ExportDefaultDeclaration(path, {
+    filename
+  }) {
     const {
       node
     } = path;
@@ -267,15 +306,17 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
       this.defaultExport = th.exportsIdentifier;
     }
   },
-  ExportAllDeclaration(path) {
-    const src = path.node.source.value;
+  ExportAllDeclaration(path, {
+    filename
+  }) {
+    const src = resolveSource(path.node.source.value, filename);
     const name = cleanImportSource(src);
     const tmpName = tempModuleName(name);
-    this.imports.push({
+    addImport(this.imports, {
       src,
       name,
       tmpName
-    });
+    }, filename);
     this.exportAllHelper = true;
     this.namedExports.push({
       all: true,
@@ -300,7 +341,9 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
       }));
     }
   },
-  MemberExpression(path) {
+  MemberExpression(path, {
+    filename
+  }) {
     var _node$object;
     const {
       node
@@ -310,12 +353,12 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
       // replace all "import.meta.url" with "module.url"
       if ((node === null || node === void 0 || (_node$property = node.property) === null || _node$property === void 0 ? void 0 : _node$property.name) === "url") {
         path.replaceWith(_objectSpread(_objectSpread({}, node), (0, _core.template)`module.url`()));
-        addModuleImport(this.imports, "module");
+        addModuleImport(this.imports, "module", filename);
       }
       // replace all "import.meta.resolve(...)" with "require.toUrl(...)"
       else if ((node === null || node === void 0 || (_node$property2 = node.property) === null || _node$property2 === void 0 ? void 0 : _node$property2.name) === "resolve") {
         path.replaceWith(_objectSpread(_objectSpread({}, node), (0, _core.template)`require.toUrl`()));
-        addModuleImport(this.imports, "require");
+        addModuleImport(this.imports, "require", filename);
       }
     }
   }

package/dist/utils/templates.js

@@ -49,7 +49,7 @@ function buildNamedExport(obj) {
 }
 const buildAllExportHelper = exports.buildAllExportHelper = (0, _core.template)(`
   function extendExports(exports, obj) {
-    Object.keys(obj).forEach(function (key) {
+    obj && Object.keys(obj).forEach(function (key) {
       if (key === "default" || key === "__esModule") return;
       Object.defineProperty(exports, key, {
         enumerable: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-modules-ui5",
-  "version": "7.3.0",
+  "version": "7.4.0",
   "description": "An unofficial babel plugin for SAP UI5.",
   "main": "dist/index.js",
   "repository": {
@@ -94,5 +94,5 @@
     "prettier": "^3.1.0",
     "rimraf": "^5.0.5"
   },
-  "gitHead": "cf41a67c81c9321ba93ce4299cbb33a908da4e1a"
+  "gitHead": "76dacf36cedd90d054dba13d8a92168e66b1730b"
 }