babel-plugin-transform-modules-ui5 7.0.5 → 7.1.0

package/dist/classes/visitor.js

@@ -4,25 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ClassTransformVisitor = void 0;
-
 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() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 const CONSTRUCTOR = "constructor";
 const ClassTransformVisitor = {
   ImportDefaultSpecifier(path) {
     this.importNames.push(path.node.local.name);
   },
-
   /**
    * ClassDeclaration visitor.
    * Use both enter() and exit() to track when the visitor is inside a UI5 class,
@@ -39,35 +31,32 @@ const ClassTransformVisitor = {
         parent,
         parentPath
       } = path;
-
       if (opts.neverConvertClass) {
         return;
       }
-
       if (!doesClassExtendFromImport(node, [...this.importNames])) {
         // If it doesn't extend from an import, treat it as plain ES2015 class.
         return;
-      } // 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.
-
+      }
 
+      // 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").
+      // 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").
       const {
         name: className
       } = node.id;
       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 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()) {
         if (_core.types.isExportDefaultDeclaration(parent)) {
           path.parentPath.replaceWithMultiple([...ui5ExtendClass, th.buildExportDefault({
@@ -85,17 +74,13 @@ const ClassTransformVisitor = {
             ID: _core.types.identifier(classInfo.localName)
           }));
         }
-
         parentPath.replaceWithMultiple(ui5ExtendClass);
       }
     },
-
     exit() {
       this.superClassName = null;
     }
-
   },
-
   /*!
    * Visits function calls.
    */
@@ -105,8 +90,8 @@ const ClassTransformVisitor = {
     } = path;
     const {
       callee
-    } = node; // If the file already has sap.ui.define, get the names of variables it creates to use for the class logic.
-
+    } = node;
+    // If the file already has sap.ui.define, get the names of variables it creates to use for the class logic.
     if (ast.isCallExpressionCalling(node, "sap.ui.define")) {
       this.importNames.push(...getRequiredParamsOfSAPUIDefine(path, node).map(req => req.name));
       return;
@@ -120,7 +105,6 @@ const ClassTransformVisitor = {
       }
     }
   },
-
   /**
    * Convert object method constructor() to constructor: function constructor(),
    * since a UI5 class is not a real class.
@@ -129,7 +113,6 @@ const ClassTransformVisitor = {
     const {
       node
     } = path;
-
     if (node.key.name === CONSTRUCTOR) {
       // The keyword 'constructor' should not be used as a shorthand
       // method name in an object. It might(?) work on some objects,
@@ -137,79 +120,65 @@ const ClassTransformVisitor = {
       path.replaceWith(_core.types.objectProperty(_core.types.identifier(CONSTRUCTOR), _core.types.functionExpression(_core.types.identifier(CONSTRUCTOR), node.params, node.body)));
     }
   }
-
 };
 exports.ClassTransformVisitor = ClassTransformVisitor;
-
 function isSuperApply(callee) {
   return _core.types.isIdentifier(callee.property, {
-    "name": "apply"
+    name: "apply"
   }) && _core.types.isSuper(callee.object.object);
 }
-
 function getRequiredParamsOfSAPUIDefine(path, node) {
   const defineArgs = node.arguments;
   const callbackNode = defineArgs.find(argNode => _core.types.isFunction(argNode));
   return callbackNode.params; // Identifier
 }
+
 /**
  * Replace super() call
  */
-
-
 function replaceConstructorSuperCall(path, node, superClassName) {
   replaceSuperNamedCall(path, node, superClassName, CONSTRUCTOR);
 }
+
 /**
  * Replace super.method() call
  */
-
-
 function replaceObjectSuperCall(path, node, superClassName) {
   replaceSuperNamedCall(path, node, superClassName, node.callee.property.name);
 }
+
 /**
  * Replace super.method.apply() call
  */
-
-
 function replaceSuperApplyCall(path, node, superClassName) {
   const methodName = node.callee.object.property.name;
   path.replaceWith(_core.types.callExpression(_core.types.identifier(`${superClassName}.prototype.${methodName}.apply`), node.arguments));
 }
-
 function replaceSuperNamedCall(path, node, superClassName, methodName) {
   // .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));
 }
-
 function doesClassExtendFromImport(node, imports) {
   const superClass = node.superClass;
   return superClass && imports.some(imported => imported === superClass.name);
 }
-
 function shouldConvertClass(file, node, opts, classInfo) {
   if (classInfo.nonUI5) {
     return false;
   }
-
   if (opts.autoConvertAllExtendClasses == true) {
     return true;
   }
-
   if (classInfo.name || classInfo.alias || classInfo.controller || classInfo.namespace) {
     return true;
   }
-
   if (/.*[.]controller[.]js$/.test(file.opts.filename) && opts.autoConvertControllerClass !== false) {
     return true;
   }
-
   return false;
 }

package/dist/index.js

@@ -1,17 +1,13 @@
 "use strict";
 
 var _visitor = require("./classes/visitor");
-
 var _visitor2 = require("./modules/visitor");
-
 var _wrapper = require("./modules/helpers/wrapper");
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 /*
 References:
 Babel Plugin Handbook: https://github.com/thejameskyle/babel-handbook/blob/master/translations/en/plugin-handbook.md
@@ -19,6 +15,7 @@ AST Spec: https://github.com/babel/babel/blob/master/packages/babel-parser/ast/s
 Babel Types (t.*) https://github.com/babel/babel/tree/master/packages/babel-types
 AST Explorer: https://astexplorer.net/
 */
+
 module.exports = () => {
   const UI5Visitor = _objectSpread({
     Program: {
@@ -27,20 +24,20 @@ module.exports = () => {
       }) {
         if (this.ran) return;
         this.ran = true;
-
         if (opts.onlyConvertNamedClass == false) {
           throw new Error("ERROR: onlyConvertNamedClass=false is no longer supported. Use autoConvertAllExtendClassesByDefault=true");
-        } // TODO: enable this in a later version
+        }
+        // TODO: enable this in a later version
         // else if (opts.onlyConvertNamedClass == true) {
         //   console.warn('WARN: onlyConvertNamedClass=true is now the default behaviour') // eslint-disable-line no-console
         // }
-        // Opts
-
 
+        // Opts
         this.namespacePrefix = opts.namespacePrefix;
         this.noImportInteropPrefixes = opts.noImportInteropPrefixes || ["sap/"];
-        this.noImportInteropPrefixesRegexp = new RegExp(this.noImportInteropPrefixes.map(p => `(^${p}.*)`).join("|")); // Properties for Module Transform
+        this.noImportInteropPrefixesRegexp = new RegExp(this.noImportInteropPrefixes.map(p => `(^${p}.*)`).join("|"));
 
+        // Properties for Module Transform
         this.programNode = path.node;
         this.defaultExport = null;
         this.defaultExportNode = null;
@@ -48,22 +45,21 @@ module.exports = () => {
         this.ignoredImports = [];
         this.imports = [];
         this.namedExports = [];
-        this.injectDynamicImportHelper = false; // Properties for Class Transform
+        this.injectDynamicImportHelper = false;
 
-        this.importNames = []; // The classes must be converted right away before any other class transforms get a chance to run.
+        // Properties for Class Transform
+        this.importNames = [];
 
+        // The classes must be converted right away before any other class transforms get a chance to run.
         path.traverse(_visitor.ClassTransformVisitor, this);
       },
-
       exit(path, {
         opts
       }) {
         (0, _wrapper.wrap)(this, path.node, opts);
       }
-
     }
   }, _visitor2.ModuleTransformVisitor);
-
   return {
     visitor: UI5Visitor
   };

package/dist/modules/helpers/exports.js

@@ -5,17 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.collapseNamedExports = collapseNamedExports;
 exports.getDefaultExportName = getDefaultExportName;
-
 var _core = require("@babel/core");
-
 var th = _interopRequireWildcard(require("../../utils/templates"));
-
 var ast = _interopRequireWildcard(require("../../utils/ast"));
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 /**
  * 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.
@@ -33,14 +27,12 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
  */
 function collapseNamedExports(programNode, defaultExport, namedExports, opts) {
   namedExports = filterOutExportsWhichAlreadyMatchPropsOnDefault(programNode, defaultExport, namedExports);
-
   if (!namedExports.length || opts.noExportExtend) {
     return {
       filteredExports: namedExports,
       newDefaultExportIdentifier: null
     };
   }
-
   if (namedExports.some(exp => exp.conflict)) {
     return {
       filteredExports: namedExports,
@@ -48,10 +40,8 @@ function collapseNamedExports(programNode, defaultExport, namedExports, opts) {
       newDefaultExportIdentifier: null
     };
   }
-
   let exportVariableName = getDefaultExportName(defaultExport);
   let newDefaultExportIdentifier = null;
-
   if (!exportVariableName) {
     // Something anonymous (literal, anon function, etc...)
     programNode.body.push(th.buildTempExport({
@@ -60,9 +50,7 @@ function collapseNamedExports(programNode, defaultExport, namedExports, opts) {
     newDefaultExportIdentifier = th.exportsIdentifier;
     exportVariableName = newDefaultExportIdentifier.name;
   }
-
   const id = _core.types.identifier(exportVariableName);
-
   for (const namedExport of namedExports) {
     programNode.body.push(th.buildAssign({
       OBJECT: id,
@@ -70,35 +58,29 @@ function collapseNamedExports(programNode, defaultExport, namedExports, opts) {
       VALUE: namedExport.value
     }));
   }
-
   return {
     filteredExports: [],
     conflictingExports: [],
     newDefaultExportIdentifier: newDefaultExportIdentifier
   };
 }
-
 function getDefaultExportName(defaultExport) {
   return defaultExport.name || ast.getIdName(defaultExport);
 }
-
 function filterOutExportsWhichAlreadyMatchPropsOnDefault(programNode, defaultExport, namedExports) {
   namedExports = [...namedExports]; // Shallow clone for safe splicing
+  const defaultObjectProperties = ast.findPropertiesOfNode(programNode, defaultExport);
 
-  const defaultObjectProperties = ast.findPropertiesOfNode(programNode, defaultExport); // Loop through the default object's props and see if it already has a matching definition of the named exports.
+  // Loop through the default object's props and see if it already has a matching definition of the named exports.
   // If the definition matches, we can ignore the named export. If the definition does not match, mark it as a conflict.
-
   if (defaultObjectProperties) {
     for (const defaultExportProperty of defaultObjectProperties) {
       if (!defaultExportProperty.key) {
         // i.e. SpreadProperty
         continue;
       }
-
       const matchingNamedExportIndex = namedExports.findIndex(namedExport => namedExport.key.name === defaultExportProperty.key.name); // get the index for splicing
-
       const matchingNamedExport = namedExports[matchingNamedExportIndex];
-
       if (matchingNamedExport && !matchingNamedExport.conflict) {
         if (areSame(defaultExportProperty, matchingNamedExport)) {
           namedExports.splice(matchingNamedExportIndex, 1);
@@ -108,20 +90,16 @@ function filterOutExportsWhichAlreadyMatchPropsOnDefault(programNode, defaultExp
       }
     }
   }
-
   return namedExports;
 }
-
 function areSame(defaultExportProperty, matchingNamedExport) {
   const defaultExportValue = defaultExportProperty.value;
   const declaration = matchingNamedExport.declaration; // i.e. 'export const a = 1' or 'export let a = b'
-
   if (!defaultExportValue) {
     // i.e. object method
     return false; // always a conflict
   } else if (_core.types.isIdentifier(defaultExportValue)) {
     const valueName = defaultExportValue.name;
-
     if (valueName === matchingNamedExport.value.name) {
       // Same identifier reference. Safe to ignore
       return true;
@@ -137,8 +115,7 @@ function areSame(defaultExportProperty, matchingNamedExport) {
       // Same literal. Safe to ignore
       return true;
     }
-  } // Either a conflicting value or no value at all (i.e. method)
-
-
+  }
+  // Either a conflicting value or no value at all (i.e. method)
   return false;
 }

package/dist/modules/helpers/wrapper.js

@@ -4,24 +4,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.wrap = wrap;
-
 var _core = require("@babel/core");
-
 var eh = _interopRequireWildcard(require("./exports"));
-
 var th = _interopRequireWildcard(require("../../utils/templates"));
-
 var ast = _interopRequireWildcard(require("../../utils/ast"));
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function wrap(visitor, programNode, opts) {
   let {
     defaultExport,
     exportGlobal,
-    firstImport,
+    firstImportMarked,
     imports,
     namedExports,
     ignoredImports,
@@ -34,62 +27,54 @@ function wrap(visitor, programNode, opts) {
   } = programNode;
   let allExportHelperAdded = false;
   let extendAdded = false;
-  opts.collapse = !opts.noExportCollapse; // opts.extend = !opts.noExportExtend
-  // Before adding anything, see if the named exports can be collapsed into the default export.
+  opts.collapse = !opts.noExportCollapse;
+  // opts.extend = !opts.noExportExtend
 
+  // Before adding anything, see if the named exports can be collapsed into the default export.
   if (defaultExport && namedExports.length && opts.collapse) {
     let {
       filteredExports,
       conflictingExports,
       newDefaultExportIdentifier
     } = eh.collapseNamedExports(programNode, defaultExport, namedExports, opts);
-
     if (filteredExports.length && !opts.allowUnsafeMixedExports) {
       throw new Error(`Unsafe mixing of conflicting default and named exports. The following named exports are conflicting: (${ast.getPropNames(conflictingExports).join(", ")}).`);
     } else {
       namedExports = filteredExports;
-    } // The default export may have changed if the collapse logic needed to assign a prop when the default export was previously anonymous.
-
+    }
 
+    // The default export may have changed if the collapse logic needed to assign a prop when the default export was previously anonymous.
     if (newDefaultExportIdentifier) {
       extendAdded = true; // If an anonymous default export needed to be assigned to a a variable, it uses the exports name for convenience.
-
       defaultExport = newDefaultExportIdentifier;
     }
   }
-
-  const preDefine = [...ignoredImports]; // If the noWrapBeforeImport opt is set, split any code before the first import and afterwards into separate arrays.
+  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.
-
-  if (opts.noWrapBeforeImport && firstImport) {
+  if (opts.noWrapBeforeImport && firstImportMarked) {
     let reachedFirstImport = false;
     const fullBody = body;
     const newBody = [];
-
     for (const item of fullBody) {
-      if (item === firstImport) {
-        reachedFirstImport = true;
-      }
-
       if (reachedFirstImport) {
         newBody.push(item);
       } else {
         preDefine.push(item);
       }
+      if (item.lastBeforeWrapping) {
+        reachedFirstImport = true;
+      }
     }
-
     if (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
     body.unshift(th.buildDynamicImportHelper());
   }
-
   if (!namedExports.length && defaultExport) {
     // If there's no named exports, return the default export
     body.push(_core.types.returnStatement(defaultExport));
@@ -104,7 +89,6 @@ function wrap(visitor, programNode, opts) {
           body.push(th.buildAllExportHelper());
           allExportHelperAdded = true;
         }
-
         body.push(th.buildAllExport({
           LOCAL: namedExport.value
         }));
@@ -112,28 +96,22 @@ function wrap(visitor, programNode, opts) {
         body.push(th.buildNamedExport(namedExport));
       }
     }
-
     if (defaultExport) {
       body.push(th.buildNamedExport({
         key: _core.types.identifier("default"),
         value: defaultExport
       }));
     }
-
     body.push(th.buildReturnExports());
   }
-
   if (imports.some(imp => imp.interop)) {
     body.unshift(th.buildDefaultImportInterop());
   }
-
   programNode.body = [...preDefine, generateDefine(body, imports, exportGlobal || opts.exportAllGlobal)];
 }
-
 function hasUseStrict(node) {
   return (node.directives || []).some(directive => directive.value.value === "use strict");
 }
-
 function generateDefine(body, imports, exportGlobal) {
   const defineOpts = {
     SOURCES: _core.types.arrayExpression(imports.map(i => _core.types.stringLiteral(i.src))),