babel-plugin-transform-modules-ui5 7.1.5 → 7.2.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [7.2.0](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/compare/v7.1.5...v7.2.0) (2023-05-30)
+
+
+### Features
+
+* split class conversion to enable other Babel plugin conversion ([#100](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/issues/100)) ([4ba096b](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/commit/4ba096b1a24d807cda2fd2f57425f3ab4b91a31b)), closes [#23](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/issues/23) [#25](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/issues/25)
+
+
+
+
+
 ## [7.1.5](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/compare/v7.1.4...v7.1.5) (2023-05-30)
 
 

package/dist/classes/helpers/classes.js

@@ -68,7 +68,7 @@ function convertClassToUI5Extend(path, node, classInfo, extraStaticProps, opts)
         return param;
       }) : member.params;
       const func = _core.types.functionExpression(member.key, params, member.body, member.generator, member.async);
-      if (isConstructor) {
+      if (isConstructor && membersToAssign.length > 0) {
         // handling of parameter properties for constructors (TypeScript):
         //   -> assigning parameter properties as members to the instance
         const newMembers = membersToAssign.map(member => buildMemberAssignmentStatement(_core.types.thisExpression(), {
@@ -76,9 +76,8 @@ function convertClassToUI5Extend(path, node, classInfo, extraStaticProps, opts)
           computed: false,
           value: member
         }));
-        _core.types.isSuperCallExpression;
-        const idx = member.body.body.findIndex(m => _core.types.isExpressionStatement(m) && _core.types.isCallExpression(m.expression) && _core.types.isSuper(m.expression.callee));
-        member.body.body.splice(idx === -1 ? member.body.body.length : idx + 1, 0, ...newMembers);
+        const superIndex = member.body.body.findIndex(node => ast.isSuperCallExpression(node.expression) || ast.isSuperPrototypeCallOf(node.expression, superClassName, "constructor"));
+        member.body.body.splice(superIndex === -1 ? member.body.body.length : superIndex + 1, 0, ...newMembers);
       }
       if (member.static) {
         staticMembers.push(buildMemberAssignmentStatement(classNameIdentifier, _objectSpread(_objectSpread({}, member), {}, {
@@ -171,7 +170,7 @@ function convertClassToUI5Extend(path, node, classInfo, extraStaticProps, opts)
       extendProps.unshift(_core.types.objectProperty(_core.types.identifier(CONSTRUCTOR), constructor));
     } else {
       // Copy all except the super call from the constructor to the bindMethod (i.e. onInit)
-      bindMethod.body.body.unshift(...constructor.body.body.filter(node => !ast.isSuperCallExpression(node.expression)));
+      bindMethod.body.body.unshift(...constructor.body.body.filter(node => !(ast.isSuperCallExpression(node.expression) || ast.isSuperPrototypeCallOf(node.expression, superClassName, "constructor"))));
     }
   }
   if (boundProps.length) {

package/dist/classes/visitor.js

@@ -26,11 +26,13 @@ const ClassTransformVisitor = {
       file,
       opts = {}
     }) {
+      var _node$decorators;
       const {
-        node,
-        parent,
-        parentPath
+        node
       } = path;
+      const {
+        name: className
+      } = node.id;
       if (opts.neverConvertClass) {
         return;
       }
@@ -42,19 +44,45 @@ const ClassTransformVisitor = {
       // If the super class is one of the imports, we'll assume it's a UI5 managed class,
       // and therefore may need to be transformed to .extend() syntax.
       const classInfo = classes.getClassInfo(path, node, path.parent, opts);
-      if (!shouldConvertClass(file, node, opts, classInfo)) {
-        return;
-      }
-
-      // Save super class name for converting super calls
-      this.superClassName = classInfo.superClassName;
 
-      // Find the Block scoped parent (Program or Function body) and search for assigned properties within that (eg. MyClass.X = "X").
+      // filter found decorators (to be not handled by other plugins)
+      node.decorators = (_node$decorators = node.decorators) === null || _node$decorators === void 0 ? void 0 : _node$decorators.filter(d => {
+        var _exp$callee;
+        const exp = d.expression;
+        const name = exp.name || ((_exp$callee = exp.callee) === null || _exp$callee === void 0 ? void 0 : _exp$callee.name);
+        return classInfo[name] === undefined;
+      });
+      if (shouldConvertClass(file, node, opts, classInfo)) {
+        // Save super class name for converting super calls
+        this.superClassName = classInfo.superClassName;
+        // store the classinfo
+        this.classInfo = this.classInfo || {};
+        this.classInfo[className] = classInfo;
+      }
+    },
+    exit(path, {
+      opts = {}
+    }) {
+      var _this$classInfo;
+      const {
+        node,
+        parent,
+        parentPath
+      } = path;
       const {
         name: className
       } = node.id;
+
+      // Only if classinfo has been found we process this file
+      const classInfo = (_this$classInfo = this.classInfo) === null || _this$classInfo === void 0 ? void 0 : _this$classInfo[className];
+      if (!classInfo || !node.superClass) {
+        return;
+      }
+
+      // Find the Block scoped parent (Program or Function body) and search for assigned properties within that (eg. MyClass.X = "X").
       const blockParent = path.findParent(path => path.isBlock()).node;
       const staticProps = ast.groupPropertiesByName(ast.getOtherPropertiesOfIdentifier(blockParent, className));
+
       // TODO: flag metadata and renderer for removal if applicable
       const ui5ExtendClass = classes.convertClassToUI5Extend(path, node, classInfo, staticProps, opts);
       if (path.isClassDeclaration()) {
@@ -76,8 +104,6 @@ const ClassTransformVisitor = {
         }
         parentPath.replaceWithMultiple(ui5ExtendClass);
       }
-    },
-    exit() {
       this.superClassName = null;
     }
   },

package/dist/utils/ast.js

@@ -153,7 +153,7 @@ function convertDeclarationToExpression(declaration) {
   }
 }
 function isSuperPrototypeCallOf(expression, superClassName, superMethodName) {
-  return _core.types.isCallExpression(expression) && isCallExpressionCalling(expression, `${superClassName}.prototype.${superMethodName}.apply`);
+  return _core.types.isCallExpression(expression) && (isCallExpressionCalling(expression, `${superClassName}.prototype.${superMethodName}.apply`) || isCallExpressionCalling(expression, `${superClassName}.prototype.${superMethodName}.call`));
 }
 
 /**
@@ -166,16 +166,20 @@ function isSuperPrototypeCallOf(expression, superClassName, superMethodName) {
 function isCallExpressionCalling(expression, dotNotationString) {
   if (!_core.types.isCallExpression(expression)) return false;
   const callee = expression.callee;
-  const parts = dotNotationString.split(".");
-  let node = callee;
-  for (const nextNamePart of parts.reverse()) {
-    if (!node) return false;
-    // property won't be there for an anonymous function
-    const nodeName = node.name || node.property && node.property.name;
-    if (nodeName !== nextNamePart) return false;
-    node = node.object;
+  if (callee.type === "Identifier") {
+    return callee.name === dotNotationString;
+  } else {
+    const parts = dotNotationString.split(".");
+    let node = callee;
+    for (const nextNamePart of parts.reverse()) {
+      if (!node) return false;
+      // property won't be there for an anonymous function
+      const nodeName = node.name || node.property && node.property.name;
+      if (nodeName !== nextNamePart) return false;
+      node = node.object;
+    }
+    return true;
   }
-  return true;
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-modules-ui5",
-  "version": "7.1.5",
+  "version": "7.2.0",
   "description": "An unofficial babel plugin for SAP UI5.",
   "main": "dist/index.js",
   "repository": {
@@ -63,34 +63,36 @@
     "object-assign-defined": "^1.0.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.21.0",
-    "@babel/core": "^7.21.0",
-    "@babel/eslint-parser": "^7.19.1",
+    "@babel/cli": "^7.21.5",
+    "@babel/core": "^7.22.1",
+    "@babel/eslint-parser": "^7.21.8",
+    "@babel/plugin-proposal-decorators": "^7.22.3",
     "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
     "@babel/plugin-syntax-class-properties": "^7.12.13",
-    "@babel/plugin-syntax-decorators": "^7.21.0",
+    "@babel/plugin-syntax-decorators": "^7.22.3",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-    "@babel/plugin-transform-typescript": "^7.21.0",
-    "@babel/preset-env": "^7.20.2",
-    "@babel/preset-flow": "^7.18.6",
-    "@babel/preset-typescript": "^7.21.0",
+    "@babel/plugin-transform-property-mutators": "^7.20.7",
+    "@babel/plugin-transform-typescript": "^7.22.3",
+    "@babel/preset-env": "^7.22.2",
+    "@babel/preset-flow": "^7.21.4",
+    "@babel/preset-typescript": "^7.21.5",
     "babel-eslint": "^10.0.3",
-    "babel-jest": "^29.4.3",
-    "core-js": "^3.28.0",
-    "eslint": "^8.34.0",
+    "babel-jest": "^29.5.0",
+    "core-js": "^3.30.2",
+    "eslint": "^8.41.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-standard": "^4.1.0",
-    "fs-extra": "^11.1.0",
+    "fs-extra": "^11.1.1",
     "husky": "^8.0.3",
-    "jest": "^29.4.3",
-    "lint-staged": "^13.1.2",
-    "prettier": "^2.8.4",
-    "rimraf": "^4.1.2"
+    "jest": "^29.5.0",
+    "lint-staged": "^13.2.2",
+    "prettier": "^2.8.8",
+    "rimraf": "^5.0.1"
   },
-  "gitHead": "a34cbc1fe2fc53fe5ace60ac710d9579e93034bd"
+  "gitHead": "90e2d8ca12938f510237f02153d1e7ce03683779"
 }