babel-plugin-transform-modules-ui5 7.0.4 → 7.0.6

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))),

package/dist/modules/visitor.js

@@ -4,45 +4,32 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ModuleTransformVisitor = void 0;
-
 var _core = require("@babel/core");
-
 var th = _interopRequireWildcard(require("../utils/templates"));
-
 var ast = _interopRequireWildcard(require("../utils/ast"));
-
 var _jsdoc = require("../classes/helpers/jsdoc");
-
-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 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; }
-
+const _excluded = ["opts"];
+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 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); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 const tempModuleName = name => `__${name}`;
-
 const cleanImportSource = src => src.replace(/(\/)|(-)|(@)/g, "_").replace(/\./g, "");
-
 const hasGlobalExportFlag = node => (0, _jsdoc.hasJsdocGlobalExportFlag)(node);
-
 const ModuleTransformVisitor = {
   /*!
    * Removes the ES6 import and adds the details to the import array in our state.
    */
   ImportDeclaration(path, _ref) {
     let {
-      opts = {}
-    } = _ref,
-        state = _objectWithoutProperties(_ref, ["opts"]);
-
+        opts = {}
+      } = _ref,
+      state = _objectWithoutProperties(_ref, _excluded);
     const {
       node
     } = path;
@@ -52,23 +39,24 @@ const ModuleTransformVisitor = {
       specifiers,
       source
     } = node;
-    const src = source.value.replace(/\\/g, "/"); // When 'libs' are used, only 'libs' will be converted to UI5 imports.
+    const src = source.value.replace(/\\/g, "/");
 
+    // When 'libs' are used, only 'libs' will be converted to UI5 imports.
     const {
       libs = [".*"]
     } = opts;
     const isLibToConvert = new RegExp(`(${libs.join("|")})`).test(src);
-
     if (!isLibToConvert) {
       this.ignoredImports.push(node);
       path.remove();
       return;
-    } //const testSrc = (opts.libs || ["^sap/"]).concat(opts.files || []);
+    }
+
+    //const testSrc = (opts.libs || ["^sap/"]).concat(opts.files || []);
     // const isUi5SrcRE = testSrc.length && new RegExp(`(${testSrc.join("|")})`);
     // const isUi5Src = isUi5SrcRE.test(src);
-    // Importing using an interop is the default behaviour but can be opt-out using regex.
-
 
+    // Importing using an interop is the default behaviour but can be opt-out using regex.
     const shouldInterop = !this.noImportInteropPrefixesRegexp.test(src);
     const name = cleanImportSource(src); // default to the src for import without named var
 
@@ -83,8 +71,9 @@ const ModuleTransformVisitor = {
       file: {
         opts: state.file.opts
       }
-    }) : modulesMap[src]) || src; // Note that existingImport may get mutated if there are multiple import lines from the same module.
+    }) : modulesMap[src]) || src;
 
+    // Note that existingImport may get mutated if there are multiple import lines from the same module.
     const existingImport = this.imports.find(imp => imp.src === mappedSrc);
     const imp = existingImport || {
       src: mappedSrc,
@@ -100,21 +89,20 @@ const ModuleTransformVisitor = {
       locked: false
     };
     const deconstructors = [];
-
     for (const specifier of specifiers) {
       if (_core.types.isImportDefaultSpecifier(specifier)) {
         // e.g. import X from 'X'
         imp.default = true;
-        imp.interop = shouldInterop; // Shorten the imported-as name since it should be unique for default imports.
+        imp.interop = shouldInterop;
+
+        // Shorten the imported-as name since it should be unique for default imports.
         // The default import should always come first,
         // so this new name will be used for destructuring the other too.
-
         if (!imp.locked) {
           imp.name = specifier.local.name;
           imp.tmpName = shouldInterop ? tempModuleName(imp.name) : imp.name;
           imp.locked = true;
         }
-
         if (shouldInterop) {
           deconstructors.push(th.buildDefaultImportDeconstructor({
             MODULE: _core.types.identifier(imp.tmpName),
@@ -148,24 +136,22 @@ const ModuleTransformVisitor = {
       }
     }
 
+    // this is the very first import in noWrapBeforeImport mode and there are sibling nodes before this import
+    if (opts.noWrapBeforeImport && !this.firstImportMarked && path.inList && path.key > 0) {
+      // mark the direct predecessor as the last one to exclude from wrapping
+      path.getSibling(path.key - 1).node.lastBeforeWrapping = true;
+      this.firstImportMarked = true;
+    }
     path.replaceWithMultiple(deconstructors);
-
     if (deconstructors.length) {
       // Keep the same variable name if the same module is imported on another line.
       imp.locked = true;
     }
-
-    imp.deconstructors = imp.deconstructors.concat(deconstructors); // TODO: now that we're saving deconstructors on the import, dynamically determine firstImport if needed.
-
-    if (!this.firstImport && imp.deconstructors[0]) {
-      this.firstImport = imp.deconstructors[0];
-    }
-
+    imp.deconstructors = imp.deconstructors.concat(deconstructors);
     if (!existingImport) {
       this.imports.push(imp);
     }
   },
-
   /**
    * Push all exports to an array.
    * The reason we don't export in place is to handle the situation
@@ -181,7 +167,6 @@ const ModuleTransformVisitor = {
       source
     } = node;
     let fromSource = "";
-
     if (source) {
       // e.g. export { one, two } from 'x'
       const src = source.value;
@@ -194,7 +179,6 @@ const ModuleTransformVisitor = {
       });
       fromSource = tmpName + ".";
     }
-
     if (specifiers && specifiers.length) {
       // e.g. export { one, two }
       for (const specifier of path.node.specifiers) {
@@ -203,18 +187,14 @@ const ModuleTransformVisitor = {
           value: _core.types.identifier(`${fromSource}${specifier.local.name}`)
         });
       }
-
       path.remove();
     } else if (declaration) {
       // e.g. export const c = 1 | export function f() {}
       if (["TypeAlias", "InterfaceDeclaration", "TSInterfaceDeclaration", "TSTypeAliasDeclaration"].includes(declaration.type)) return; // TS or Flow-types
-
       const name = ast.getIdName(declaration);
-
       if (name) {
         // e.g. export function f() {}
         const id = _core.types.identifier(declaration.id.name);
-
         this.namedExports.push({
           key: id,
           value: id,
@@ -224,7 +204,6 @@ const ModuleTransformVisitor = {
         // e.g. export const c = 1
         for (const subDeclaration of declaration.declarations) {
           const id = _core.types.identifier(subDeclaration.id.name);
-
           this.namedExports.push({
             value: id,
             key: id,
@@ -234,14 +213,12 @@ const ModuleTransformVisitor = {
       } else {
         throw path.buildCodeFrameError("Unknown ExportNamedDeclaration shape.");
       }
-
       path.replaceWith(declaration);
     } else {
       path.remove();
       return;
     }
   },
-
   ExportDefaultDeclaration(path) {
     const {
       node
@@ -250,12 +227,10 @@ const ModuleTransformVisitor = {
       declaration
     } = node;
     const declarationName = ast.getIdName(declaration);
-
     if (hasGlobalExportFlag(node)) {
       // check for jsdoc @export
       this.exportGlobal = true;
     }
-
     if (declarationName) {
       // ClassDeclaration or FunctionDeclaration with name.
       // Leave the declaration in-line and preserve the identifier for the return statement.
@@ -275,7 +250,6 @@ const ModuleTransformVisitor = {
         } = declaration;
         declaration = _core.types.functionExpression(null, params, body, generator, isAsync);
       }
-
       const exportDeclaration = th.buildTempExport({
         VALUE: declaration
       });
@@ -283,7 +257,6 @@ const ModuleTransformVisitor = {
       this.defaultExport = th.exportsIdentifier;
     }
   },
-
   ExportAllDeclaration(path) {
     const src = path.node.source.value;
     const name = src.replace(/\//g, "_").replace(/\./g, "");
@@ -300,7 +273,6 @@ const ModuleTransformVisitor = {
     });
     path.remove();
   },
-
   /*!
    * Visits function calls to handle for dynamic imports.
    */
@@ -311,14 +283,12 @@ const ModuleTransformVisitor = {
     const {
       callee
     } = node;
-
     if (ast.isImport(callee)) {
       this.injectDynamicImportHelper = true;
-      path.replaceWith(_objectSpread({}, node, {
+      path.replaceWith(_objectSpread(_objectSpread({}, node), {}, {
         callee: _core.types.identifier("__ui5_require_async")
       }));
     }
   }
-
 };
 exports.ModuleTransformVisitor = ModuleTransformVisitor;