babel-plugin-transform-modules-ui5 7.7.0 → 7.8.0

package/CHANGELOG.md

@@ -3,6 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [7.8.0](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/compare/v7.7.1...v7.8.0) (2025-09-11)
+
+
+### Features
+
+* support optional super call ([#143](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/issues/143)) ([e09f561](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/commit/e09f5617eb98b082e1630caa2d23801d3fc91650))
+
+
+
+
+
+## [7.7.1](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/compare/v7.7.0...v7.7.1) (2025-05-13)
+
+
+### Bug Fixes
+
+* autoConvertControllerClass to consider controller.ts file as well (not just .js) ([#140](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/issues/140)) ([788705d](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/commit/788705dde44091cfecb47e9f51a5bd294b39af4b)), closes [#139](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/issues/139)
+* noWrapBeforeImport must wrap first import if no code is before ([#141](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/issues/141)) ([d80c070](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/commit/d80c070e181b03546d381d8ee2fb0ddfc09d4e5a))
+
+
+
+
+
 # [7.7.0](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/compare/v7.6.2...v7.7.0) (2024-09-16)
 
 

package/dist/classes/helpers/classes.js

@@ -14,8 +14,7 @@ var ast = _interopRequireWildcard(require("../../utils/ast"));
 var _jsdoc = require("./jsdoc");
 var _decorators = require("./decorators");
 var _imports = require("./imports");
-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 && {}.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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }

package/dist/classes/visitor.js

@@ -8,8 +8,7 @@ var _core = require("@babel/core");
 var th = _interopRequireWildcard(require("../utils/templates"));
 var ast = _interopRequireWildcard(require("../utils/ast"));
 var classes = _interopRequireWildcard(require("./helpers/classes"));
-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 && {}.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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 const CONSTRUCTOR = "constructor";
 const ClassTransformVisitor = exports.ClassTransformVisitor = {
   ImportDeclaration(path) {
@@ -111,7 +110,7 @@ const ClassTransformVisitor = exports.ClassTransformVisitor = {
   /*!
    * Visits function calls.
    */
-  CallExpression(path) {
+  "OptionalCallExpression|CallExpression"(path) {
     const {
       node
     } = path;
@@ -126,9 +125,9 @@ const ClassTransformVisitor = exports.ClassTransformVisitor = {
       if (_core.types.isSuper(callee)) {
         replaceConstructorSuperCall(path, node, this.superClassName);
       } else if (_core.types.isSuper(callee.object)) {
-        replaceObjectSuperCall(path, node, this.superClassName);
+        replaceObjectSuperCall(path, node, this.superClassName, path.isOptionalCallExpression());
       } else if (isSuperApply(callee)) {
-        replaceSuperApplyCall(path, node, this.superClassName);
+        replaceSuperApplyCall(path, node, this.superClassName, path.isOptionalCallExpression());
       }
     }
   },
@@ -169,25 +168,27 @@ function replaceConstructorSuperCall(path, node, superClassName) {
 /**
  * Replace super.method() call
  */
-function replaceObjectSuperCall(path, node, superClassName) {
-  replaceSuperNamedCall(path, node, superClassName, node.callee.property.name);
+function replaceObjectSuperCall(path, node, superClassName, optional = false) {
+  replaceSuperNamedCall(path, node, superClassName, node.callee.property.name, optional);
 }
 
 /**
  * Replace super.method.apply() call
  */
-function replaceSuperApplyCall(path, node, superClassName) {
+function replaceSuperApplyCall(path, node, superClassName, optional = false) {
   const methodName = node.callee.object.property.name;
-  path.replaceWith(_core.types.callExpression(_core.types.identifier(`${superClassName}.prototype.${methodName}.apply`), node.arguments));
+  const op = optional ? "?." : ".";
+  path.replaceWith(_core.types.callExpression(_core.types.identifier(`${superClassName}.prototype.${methodName}${op}apply`), node.arguments));
 }
-function replaceSuperNamedCall(path, node, superClassName, methodName) {
+function replaceSuperNamedCall(path, node, superClassName, methodName, optional = false) {
   // .call() is better for simple args (or not args) but doesn't work right for spread args
   // if it gets further transpiled by babel spread args transform (will be .call.apply(...).
   const thisEx = _core.types.thisExpression();
   const hasSpread = node.arguments.some(_core.types.isSpreadElement);
   const caller = hasSpread ? "apply" : "call";
   const callArgs = hasSpread ? [thisEx, _core.types.arrayExpression(node.arguments)] : [thisEx, ...node.arguments];
-  path.replaceWith(_core.types.callExpression(_core.types.identifier(`${superClassName}.prototype.${methodName}.${caller}`), callArgs));
+  const op = optional ? "?." : ".";
+  path.replaceWith(_core.types.callExpression(_core.types.identifier(`${superClassName}.prototype.${methodName}${op}${caller}`), callArgs));
 }
 function doesClassExtendFromImport(node, imports) {
   const superClass = node.superClass;
@@ -203,7 +204,8 @@ function shouldConvertClass(file, node, opts, classInfo) {
   if (classInfo.name || classInfo.alias || classInfo.controller || classInfo.namespace) {
     return true;
   }
-  if (/.*[.]controller[.]js$/.test(file.opts.filename) && opts.autoConvertControllerClass !== false) {
+  // Convert controller classes
+  if (/.*[.]controller[.](js|ts)$/.test(file.opts.filename) && opts.autoConvertControllerClass !== false) {
     return true;
   }
   return false;

package/dist/modules/helpers/exports.js

@@ -8,8 +8,7 @@ exports.getDefaultExportName = getDefaultExportName;
 var _core = require("@babel/core");
 var th = _interopRequireWildcard(require("../../utils/templates"));
 var ast = _interopRequireWildcard(require("../../utils/ast"));
-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 && {}.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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 /**
  * Collapse named exports onto the default export so that the default export can be returned directly,
  * so that exports can be easily used by code that does not include an import interop.

package/dist/modules/helpers/wrapper.js

@@ -8,8 +8,7 @@ var _core = require("@babel/core");
 var eh = _interopRequireWildcard(require("./exports"));
 var th = _interopRequireWildcard(require("../../utils/templates"));
 var ast = _interopRequireWildcard(require("../../utils/ast"));
-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 && {}.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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function wrap(visitor, programNode, opts) {
   var _body;
   let {
@@ -89,6 +88,11 @@ function wrap(visitor, programNode, opts) {
     let reachedFirstImport = false;
     const fullBody = body;
     const newBody = [];
+
+    // If there is no lastBeforeWrapping, the first import is not marked
+    if (!fullBody.find(item => item.lastBeforeWrapping)) {
+      reachedFirstImport = true;
+    }
     for (const item of fullBody) {
       if (reachedFirstImport) {
         newBody.push(item);

package/dist/modules/visitor.js

@@ -11,15 +11,14 @@ var th = _interopRequireWildcard(require("../utils/templates"));
 var ast = _interopRequireWildcard(require("../utils/ast"));
 var _jsdoc = require("../classes/helpers/jsdoc");
 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 && {}.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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 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; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 const resolveSource = (src, filename) => {
   src = src.replace(/\\/g, "/");
   const dir = (0, _path.dirname)(filename);
@@ -198,9 +197,13 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
     }
 
     // this is the very first import in noWrapBeforeImport mode and there are sibling nodes before this import
-    if (opts.noWrapBeforeImport && !this.firstImportMarked && path.inList && path.key > 0) {
-      // mark the direct predecessor as the last one to exclude from wrapping
-      path.getSibling(path.key - 1).node.lastBeforeWrapping = true;
+    if (opts.noWrapBeforeImport && !this.firstImportMarked && path.inList) {
+      // for the first element there is a special case as we can't mark the previous one
+      // therefore we do not mark anything to make clear that there's nothing to exclude
+      if (path.key > 0) {
+        // mark the direct predecessor as the last one to exclude from wrapping
+        path.getSibling(path.key - 1).node.lastBeforeWrapping = true;
+      }
       this.firstImportMarked = true;
     }
     path.replaceWithMultiple(deconstructors);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-modules-ui5",
-  "version": "7.7.0",
+  "version": "7.8.0",
   "description": "An unofficial babel plugin for SAP UI5.",
   "main": "dist/index.js",
   "repository": {
@@ -96,5 +96,5 @@
     "prettier": "^3.3.3",
     "rimraf": "^6.0.1"
   },
-  "gitHead": "0685a329208b50e1a5ff8f4cb5a6974d85364012"
+  "gitHead": "d0c106c3b4a88bf2f44eaa09622311bbf4471bc8"
 }