babel-plugin-transform-modules-ui5 7.2.1 → 7.2.3

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.2.3](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/compare/v7.2.2...v7.2.3) (2023-07-18)
+
+
+### Bug Fixes
+
+* copyright comment must be appended as leading comment to file ([#108](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/issues/108)) ([8194671](https://github.com/ui5-community/babel-plugin-transform-modules-ui5/commit/81946714f1d48c82a6609ec3fc1c820e5fff9e51))
+
+
+
+
+
+## [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)
 
 

package/dist/index.js

@@ -39,6 +39,7 @@ module.exports = () => {
 
         // Properties for Module Transform
         this.programNode = path.node;
+        this.parent = path.parent;
         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$parent, _visitor$parent$comme;
+    copyright = (_visitor$parent = visitor.parent) === null || _visitor$parent === void 0 ? void 0 : (_visitor$parent$comme = _visitor$parent.comments) === null || _visitor$parent$comme === void 0 ? void 0 : _visitor$parent$comme.find((comment, idx, arr) => {
+      if (comment.value.startsWith("!")) {
+        arr.splice(idx, 1);
+        return true;
+      }
+    });
+  }
   let allExportHelperAdded = false;
   let extendAdded = false;
   opts.collapse = !opts.noExportCollapse;
@@ -119,8 +133,9 @@ function wrap(visitor, programNode, opts) {
   programNode.body = [...preDefine, generateDefine(body, imports, exportGlobal || opts.exportAllGlobal)];
 
   // if a copyright comment is present we append it to the new program node
-  if (copyright) {
-    programNode.body[0].leadingComments = [copyright];
+  if (copyright && visitor.parent) {
+    visitor.parent.leadingComments = visitor.parent.leadingComments || [];
+    visitor.parent.leadingComments.unshift(copyright);
   }
 }
 function hasUseStrict(node) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babel-plugin-transform-modules-ui5",
-  "version": "7.2.1",
+  "version": "7.2.3",
   "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": "c2412968863ebeddb8c7c8cc26794759dc83c37b"
+  "gitHead": "bfdb0979de1cbaeff7c4d373761f261de469d376"
 }