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

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.2.2](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/compare/v7.2.1...v7.2.2) (2023-07-18)
+
+
+### Bug Fixes
+
+* ensure copyright to be kept after typescript processing ([#107](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/issues/107)) ([da9aa69](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/commit/da9aa69c94017e085d7f5a22abde04b123d9307d))
+
+
+
+
+
+## [7.2.1](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/compare/v7.2.0...v7.2.1) (2023-06-13)
+
+
+### Bug Fixes
+
+* add support for import.meta.url|resolve ([#106](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/issues/106)) ([afb1e6d](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/commit/afb1e6daa0fcc9896fd184ac9d66990d0a29214a)), closes [#103](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/issues/103)
+* support for anonymous classes ([#105](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/issues/105)) ([64773d1](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/commit/64773d180bf65e544806b9f04b7334cd76831b3d)), closes [#104](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/issues/104)
+
+
+
+
+
 # [7.2.0](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/compare/v7.1.5...v7.2.0) (2023-05-30)
 
 

package/dist/classes/visitor.js

@@ -26,14 +26,12 @@ const ClassTransformVisitor = {
       file,
       opts = {}
     }) {
-      var _node$decorators;
+      var _node$id, _node$decorators;
       const {
         node
       } = path;
-      const {
-        name: className
-      } = node.id;
-      if (opts.neverConvertClass) {
+      const className = node === null || node === void 0 ? void 0 : (_node$id = node.id) === null || _node$id === void 0 ? void 0 : _node$id.name;
+      if (!className || opts.neverConvertClass) {
         return;
       }
       if (!doesClassExtendFromImport(node, [...this.importNames])) {
@@ -56,22 +54,22 @@ const ClassTransformVisitor = {
         // Save super class name for converting super calls
         this.superClassName = classInfo.superClassName;
         // store the classinfo
-        this.classInfo = this.classInfo || {};
-        this.classInfo[className] = classInfo;
+        if (className) {
+          this.classInfo = this.classInfo || {};
+          this.classInfo[className] = classInfo;
+        }
       }
     },
     exit(path, {
       opts = {}
     }) {
-      var _this$classInfo;
+      var _node$id2, _this$classInfo;
       const {
         node,
         parent,
         parentPath
       } = path;
-      const {
-        name: className
-      } = node.id;
+      const className = node === null || node === void 0 ? void 0 : (_node$id2 = node.id) === null || _node$id2 === void 0 ? void 0 : _node$id2.name;
 
       // 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];

package/dist/index.js

@@ -39,6 +39,7 @@ module.exports = () => {
 
         // Properties for Module Transform
         this.programNode = path.node;
+        this.comments = path.parent.comments;
         this.defaultExport = null;
         this.defaultExportNode = null;
         this.exportGlobal = false;

package/dist/modules/helpers/wrapper.js

@@ -27,13 +27,27 @@ function wrap(visitor, programNode, opts) {
     body
   } = programNode;
 
-  // find the copyright comment from the original program body
-  const copyright = (_body = body) === null || _body === void 0 ? void 0 : (_body$ = _body[0]) === null || _body$ === void 0 ? void 0 : (_body$$leadingComment = _body$.leadingComments) === null || _body$$leadingComment === void 0 ? void 0 : _body$$leadingComment.find((comment, idx, arr) => {
+  // find the copyright comment from the original program body and remove it there
+  // since it need to be put around the new program body (which is sap.ui.define)
+  let copyright = (_body = body) === null || _body === void 0 ? void 0 : (_body$ = _body[0]) === null || _body$ === void 0 ? void 0 : (_body$$leadingComment = _body$.leadingComments) === null || _body$$leadingComment === void 0 ? void 0 : _body$$leadingComment.find((comment, idx, arr) => {
     if (comment.value.startsWith("!")) {
       arr.splice(idx, 1);
       return true;
     }
   });
+
+  // in case of TypeScript transpiling taking place upfront, the copyright comment
+  // is associcated with the program and not the program body, so we need to find it
+  // and move it to the new program body (which is sap.ui.define)
+  if (!copyright) {
+    var _visitor$comments;
+    copyright = (_visitor$comments = visitor.comments) === null || _visitor$comments === void 0 ? void 0 : _visitor$comments.find((comment, idx, arr) => {
+      if (comment.value.startsWith("!")) {
+        arr.splice(idx, 1);
+        return true;
+      }
+    });
+  }
   let allExportHelperAdded = false;
   let extendAdded = false;
   opts.collapse = !opts.noExportCollapse;

package/dist/modules/visitor.js

@@ -21,6 +21,16 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 const tempModuleName = name => `__${name}`;
 const cleanImportSource = src => src.replace(/(\/)|(-)|(@)/g, "_").replace(/\./g, "");
 const hasGlobalExportFlag = node => (0, _jsdoc.hasJsdocGlobalExportFlag)(node);
+const addModuleImport = (imports, name) => {
+  const existingImport = imports.find(imp => imp.src === name);
+  if (!existingImport) {
+    imports.unshift({
+      src: name,
+      name: name,
+      tmpName: name
+    });
+  }
+};
 const ModuleTransformVisitor = {
   /*!
    * Removes the ES6 import and adds the details to the import array in our state.
@@ -289,6 +299,25 @@ const ModuleTransformVisitor = {
         callee: _core.types.identifier("__ui5_require_async")
       }));
     }
+  },
+  MemberExpression(path) {
+    var _node$object;
+    const {
+      node
+    } = path;
+    if ((node === null || node === void 0 ? void 0 : (_node$object = node.object) === null || _node$object === void 0 ? void 0 : _node$object.type) === "MetaProperty") {
+      var _node$property, _node$property2;
+      // replace all "import.meta.url" with "module.url"
+      if ((node === null || node === void 0 ? 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");
+      }
+      // replace all "import.meta.resolve(...)" with "require.toUrl(...)"
+      else if ((node === null || node === void 0 ? 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");
+      }
+    }
   }
 };
 exports.ModuleTransformVisitor = ModuleTransformVisitor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-modules-ui5",
-  "version": "7.2.0",
+  "version": "7.2.2",
   "description": "An unofficial babel plugin for SAP UI5.",
   "main": "dist/index.js",
   "repository": {
@@ -94,5 +94,5 @@
     "prettier": "^2.8.8",
     "rimraf": "^5.0.1"
   },
-  "gitHead": "90e2d8ca12938f510237f02153d1e7ce03683779"
+  "gitHead": "744a18300e56c98edbf88c7528c17c2e6134bd63"
 }