babel-plugin-transform-modules-ui5 7.6.0 → 7.6.2

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.6.2](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/compare/v7.6.1...v7.6.2) (2024-09-14)
+
+
+### Bug Fixes
+
+* move qunit config autostart out of require/define ([#134](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/issues/134)) ([9643cd0](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/commit/9643cd08314ce54816886df6c618fbb142c1b3e8))
+
+
+
+
+
+## [7.6.1](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/compare/v7.6.0...v7.6.1) (2024-09-13)
+
+
+### Bug Fixes
+
+* support wrapped controller extension assignments ([dfa51b6](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/commit/dfa51b613259aeedb3f20987f5e5165ca35545d8))
+
+
+
+
+
 # [7.6.0](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/compare/v7.5.0...v7.6.0) (2024-07-22)
 
 

package/dist/classes/helpers/classes.js

@@ -161,24 +161,20 @@ function convertClassToUI5Extend(path, node, classInfo, extraStaticProps, import
       // @transformControllerExtension marker, because it is not a type assignment. In the resulting code, the
       // "ControllerExtension.use(...)" part should be removed and the content of the brackets should be assigned
       // directly to the member property.
-      if (_core.types.isCallExpression(member.value)) {
-        const callee = member.value.callee;
-        if (_core.types.isMemberExpression(callee) && _core.types.isIdentifier(callee.object) && _core.types.isIdentifier(callee.property) && callee.property.name === "use" // we are looking for "ControllerExtension.use(...)"
-        ) {
-          var _memberPath$hub2, _callee$object, _importDeclaration$so;
-          const importDeclaration = (0, _imports.getImportDeclaration)(memberPath === null || memberPath === void 0 || (_memberPath$hub2 = memberPath.hub) === null || _memberPath$hub2 === void 0 || (_memberPath$hub2 = _memberPath$hub2.file) === null || _memberPath$hub2 === void 0 || (_memberPath$hub2 = _memberPath$hub2.opts) === null || _memberPath$hub2 === void 0 ? void 0 : _memberPath$hub2.filename, callee === null || callee === void 0 || (_callee$object = callee.object) === null || _callee$object === void 0 ? void 0 : _callee$object.name // usually, but not necessarily always: "ControllerExtension"...
-          );
-          // ...hence we rather look at the imported module name to be sure
-          if ((importDeclaration === null || importDeclaration === void 0 || (_importDeclaration$so = importDeclaration.source) === null || _importDeclaration$so === void 0 ? void 0 : _importDeclaration$so.value) === "sap/ui/core/mvc/ControllerExtension") {
-            if (!member.value.arguments || member.value.arguments.length !== 1) {
-              // exactly one argument must be there
-              throw memberPath.buildCodeFrameError(`ControllerExtension.use() must be called with exactly one argument but has ${member.value.arguments ? member.value.arguments.length : 0}`);
-            }
-            member.value = member.value.arguments[0];
-            extendProps.unshift(buildObjectProperty(member)); // add it to the properties of the extend() config object
-            continue; // prevent the member from also being added to the constructor
-          }
-        }
+      const rightSide = member.value;
+      if (isCallToControllerExtensionUse(rightSide, memberPath)) {
+        member.value = rightSide.arguments[0];
+        extendProps.unshift(buildObjectProperty(member)); // add it to the properties of the extend() config object
+        continue; // prevent the member from also being added to the constructor
+      }
+
+      // code instrumentation sometimes wraps ControllerExtension.use() calls like:
+      // this.routing = (cov_1uvvg22e7l().s[5]++, ControllerExtension.use(Routing.override({ … })));
+      if (_core.types.isSequenceExpression(rightSide) && isCallToControllerExtensionUse(rightSide.expressions[rightSide.expressions.length - 1], memberPath)) {
+        rightSide.expressions[rightSide.expressions.length - 1] = rightSide.expressions[rightSide.expressions.length - 1].arguments[0];
+        member.value = rightSide;
+        extendProps.unshift(buildObjectProperty(member)); // add it to the properties of the extend() config object
+        continue; // prevent the member from also being added to the constructor
       }
 
       // Special handling for TypeScript limitation where metadata, renderer and overrides must be properties.
@@ -212,6 +208,35 @@ function convertClassToUI5Extend(path, node, classInfo, extraStaticProps, import
     }
   }
 
+  /**
+   * Checks whether the given thing is a CallExpression that calls ControllerExtension.use(...)
+   *
+   * @param {*} expression the thing to check - does not need to be a CallExpression
+   * @param {string} memberPath
+   * @returns true if the given expression is a CallExpression that calls ControllerExtension.use(...)
+   */
+  function isCallToControllerExtensionUse(expression, memberPath) {
+    if (!_core.types.isCallExpression(expression)) {
+      return false;
+    }
+    const callee = expression.callee;
+    if (_core.types.isMemberExpression(callee) && _core.types.isIdentifier(callee.object) && _core.types.isIdentifier(callee.property) && callee.property.name === "use" // we are looking for "ControllerExtension.use(...)"
+    ) {
+      var _memberPath$hub2, _callee$object, _importDeclaration$so;
+      const importDeclaration = (0, _imports.getImportDeclaration)(memberPath === null || memberPath === void 0 || (_memberPath$hub2 = memberPath.hub) === null || _memberPath$hub2 === void 0 || (_memberPath$hub2 = _memberPath$hub2.file) === null || _memberPath$hub2 === void 0 || (_memberPath$hub2 = _memberPath$hub2.opts) === null || _memberPath$hub2 === void 0 ? void 0 : _memberPath$hub2.filename, callee === null || callee === void 0 || (_callee$object = callee.object) === null || _callee$object === void 0 ? void 0 : _callee$object.name // usually, but not necessarily always: "ControllerExtension"...
+      );
+      // ...hence we rather look at the imported module name to be sure
+      if ((importDeclaration === null || importDeclaration === void 0 || (_importDeclaration$so = importDeclaration.source) === null || _importDeclaration$so === void 0 ? void 0 : _importDeclaration$so.value) === "sap/ui/core/mvc/ControllerExtension") {
+        if (!expression.arguments || expression.arguments.length !== 1) {
+          // exactly one argument must be there
+          throw memberPath.buildCodeFrameError(`ControllerExtension.use() must be called with exactly one argument but has ${expression.arguments ? expression.arguments.length : 0}`);
+        }
+        return true;
+      }
+    }
+    return false; // return false if not a match
+  }
+
   // Arrow function properties need to get moved to the constructor so that
   // they're bound properly to the class instance, to align with the spec.
   // For controllers, use onInit rather than constructor, since controller constructors don't work.

package/dist/modules/helpers/wrapper.js

@@ -81,6 +81,7 @@ function wrap(visitor, programNode, opts) {
       defaultExport = newDefaultExportIdentifier;
     }
   }
+  let moveUseStrictIfNeeded = false;
   const preDefine = [...ignoredImports];
   // If the noWrapBeforeImport opt is set, split any code before the first import and afterwards into separate arrays.
   // This should be done before any interops or other vars are injected.
@@ -98,10 +99,25 @@ function wrap(visitor, programNode, opts) {
         reachedFirstImport = true;
       }
     }
+    moveUseStrictIfNeeded = true;
+    body = newBody;
+  }
+
+  // If the QUnit.config.autostart is found it needs to be moved to the top of the program
+  if (opts.noWrapQUnitConfigAutostart === undefined || opts.noWrapQUnitConfigAutostart) {
+    const qunitConfigAutostart = findQUnitConfigAutostart(body, imports);
+    if (qunitConfigAutostart) {
+      preDefine.push(qunitConfigAutostart);
+      body = body.filter(node => node !== qunitConfigAutostart);
+      moveUseStrictIfNeeded = true;
+    }
+  }
+
+  // if code has been moved to preDefine, we need to move the "use strict" directive
+  if (moveUseStrictIfNeeded) {
     if (!opts.neverUseStrict && preDefine.length && !hasUseStrict(programNode)) {
       programNode.directives = [_core.types.directive(_core.types.directiveLiteral("use strict")), ...(programNode.directives || [])];
     }
-    body = newBody;
   }
   if (injectDynamicImportHelper) {
     // import() to sap.ui.require() w/ promise and interop
@@ -187,6 +203,20 @@ function hasUseSapUiRequire(comments, body, remove) {
     return found;
   });
 }
+function findQUnitConfigAutostart(body, imports) {
+  // if one imports QUnit, we don't need to move the QUnit.config.autostart
+  // as the configuration should apply to the local QUnit module
+  if (imports !== null && imports !== void 0 && imports.some(imp => imp.name === "QUnit")) {
+    return undefined;
+  }
+  // find the QUnit.config.autostart
+  return body === null || body === void 0 ? void 0 : body.find(node => {
+    return _core.types.isExpressionStatement(node) && _core.types.isAssignmentExpression(node.expression) && _core.types.isMemberExpression(node.expression.left) && _core.types.isMemberExpression(node.expression.left.object) && _core.types.isIdentifier(node.expression.left.object.object) && node.expression.left.object.object.name === "QUnit" && _core.types.isIdentifier(node.expression.left.object.property) && node.expression.left.object.property.name === "config" && _core.types.isIdentifier(node.expression.left.property) && node.expression.left.property.name === "autostart" && node.expression.operator === "=" /* &&
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         t.isBooleanLiteral(node.expression.right) &&
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         node.expression.right.value === false */;
+  });
+}
+
 function generateDefineOrRequire(body, imports, exportGlobal, useRequire) {
   const defineOpts = {
     SOURCES: _core.types.arrayExpression(imports.map(i => _core.types.stringLiteral(i.src))),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-modules-ui5",
-  "version": "7.6.0",
+  "version": "7.6.2",
   "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": "8db5f32610df08996a49b97529c8a8f3fabcc59c"
+  "gitHead": "cb7d99003c5eb351bf59327e81842aaa6d101133"
 }