babel-plugin-transform-modules-ui5 7.9.0 → 7.11.0

package/dist/classes/helpers/jsdoc.js

@@ -8,6 +8,16 @@ exports.getTags = getTags;
 exports.hasJsdocGlobalExportFlag = hasJsdocGlobalExportFlag;
 var _core = require("@babel/core");
 var _commentParser = require("comment-parser");
+// Tags that provide a value for the class info:
+//   @alias  — recommended for named UI5 extend-classes (Component, View, Controller,
+//             Control, …); sets the fully-qualified class name passed to .extend().
+//             This is the JSDoc property used by UI5 source code and is the officially
+//             recommended way to declare the module name.
+//   @name   — use when the class has no local name (anonymous class expression, e.g.
+//             `return class extends SAPController {}`). @alias requires a local name
+//             to alias; @name does not.
+//   @namespace — sets the namespace prefix; the ES class name is appended automatically
+//             to form the full FQN passed to .extend().
 const classInfoValueTags = ["alias", "name", "namespace"];
 const classInfoBoolTags = ["nonUI5", "controller", "keepConstructor"];
 

package/dist/classes/pre.js

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ClassPre = void 0;
+exports.ClassPre = ClassPre;
 var _imports = require("./helpers/imports");
-const ClassPre = file => {
-  // save all import declarations before "unneeded" ones are removed by the TypeScript plugin
-  (0, _imports.saveImports)(file);
-};
-exports.ClassPre = ClassPre;
+// Must be a regular function (not arrow) so Babel's plugin lifecycle sets `this` to the
+// plugin state object, giving access to this.opts (the plugin options).
+function ClassPre(file) {
+  var _this$opts;
+  (0, _imports.saveImports)(file, (_this$opts = this.opts) === null || _this$opts === void 0 ? void 0 : _this$opts.additionalUI5Classes);
+}

package/dist/classes/visitor.js

@@ -5,10 +5,26 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ClassTransformVisitor = void 0;
 var _core = require("@babel/core");
+var Path = _interopRequireWildcard(require("path"));
 var th = _interopRequireWildcard(require("../utils/templates"));
 var ast = _interopRequireWildcard(require("../utils/ast"));
 var classes = _interopRequireWildcard(require("./helpers/classes"));
+var _imports = require("./helpers/imports");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
+/**
+ * Built-in list of UI5 base-class module paths used by autoConvertKnownUI5Classes.
+ * A class whose superclass is imported from one of these paths will be auto-converted
+ * to .extend() syntax without requiring an explicit @alias/@namespace annotation.
+ */
+const KNOWN_UI5_BASE_CLASSES = ["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/View", "sap/ui/core/mvc/XMLView", "sap/ui/core/mvc/JSView", "sap/ui/core/mvc/HTMLView", "sap/ui/core/mvc/JSONView", "sap/ui/core/UIComponent", "sap/ui/core/Component", "sap/ui/core/Control", "sap/ui/core/Element", "sap/ui/base/ManagedObject", "sap/ui/base/Object", "sap/ui/core/mvc/ControllerExtension"];
+
+/**
+ * Subset of KNOWN_UI5_BASE_CLASSES that are UI5 controller types.
+ * Used to auto-set classInfo.controller when no explicit @controller tag is present,
+ * so that controller-specific options (moveControllerPropsToOnInit, etc.) activate
+ * for classes that extend a controller base class directly.
+ */
+const KNOWN_UI5_CONTROLLER_CLASSES = ["sap/ui/core/mvc/Controller", "sap/ui/core/mvc/ControllerExtension"];
 const CONSTRUCTOR = "constructor";
 const ClassTransformVisitor = exports.ClassTransformVisitor = {
   ImportDeclaration(path) {
@@ -17,6 +33,9 @@ const ClassTransformVisitor = exports.ClassTransformVisitor = {
   ImportDefaultSpecifier(path) {
     this.importNames.push(path.node.local.name);
   },
+  ImportSpecifier(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,
@@ -52,7 +71,31 @@ const ClassTransformVisitor = exports.ClassTransformVisitor = {
         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)) {
+      const convertInfo = shouldConvertClass(file, node, opts, classInfo);
+      if (convertInfo) {
+        var _node$superClass2;
+        // Auto-set the controller flag when the filename suffix or superclass
+        // import identifies this as a UI5 controller, so that controller-specific
+        // options (moveControllerPropsToOnInit, etc.) activate even when the class
+        // name does not contain "Controller" and no explicit @controller tag is set.
+        if (!classInfo.controller) {
+          const filename = file.opts.filename || "";
+          if (opts.autoConvertUI5FileTypes !== false && opts.autoConvertControllerClass !== false && /[.]controller[.](js|ts)$/.test(filename)) {
+            classInfo.controller = true;
+          } else if (convertInfo.isController) {
+            // shouldConvertClass already walked the chain and found a controller ancestor.
+            classInfo.controller = true;
+          } else {
+            var _node$superClass;
+            // Direct superclass imported from a known controller base-class path.
+            const directSuperClassName = (_node$superClass = node.superClass) === null || _node$superClass === void 0 ? void 0 : _node$superClass.name;
+            const importDecl = directSuperClassName ? (0, _imports.getImportDeclaration)(filename, directSuperClassName) : null;
+            if (importDecl && KNOWN_UI5_CONTROLLER_CLASSES.includes(importDecl.source.value)) {
+              classInfo.controller = true;
+            }
+          }
+        }
+
         // Save super class name for converting super calls
         this.superClassName = classInfo.superClassName;
         // store the classinfo
@@ -60,6 +103,18 @@ const ClassTransformVisitor = exports.ClassTransformVisitor = {
           this.classInfo = this.classInfo || {};
           this.classInfo[className] = classInfo;
         }
+        // Record this file's superclass import source unconditionally so that
+        // descendants in other files can use transitive detection even when this
+        // class was converted via an explicit annotation (not autoConvertKnownUI5Classes).
+        // Keyed by the class's own name so descendants can look up by the binding name
+        // they used for the import (which equals the class name in the ancestor file).
+        const superClassName = (_node$superClass2 = node.superClass) === null || _node$superClass2 === void 0 ? void 0 : _node$superClass2.name;
+        if (superClassName) {
+          const importDecl = (0, _imports.getImportDeclaration)(file.opts.filename, superClassName);
+          if (importDecl) {
+            (0, _imports.saveSuperclassImportSource)(file.opts.filename, className, superClassName, importDecl.source.value);
+          }
+        }
       }
     },
     exit(path, {
@@ -194,19 +249,153 @@ function doesClassExtendFromImport(node, imports) {
   const superClass = node.superClass;
   return superClass && imports.some(imported => imported === superClass.name);
 }
+function decoratorName(expr) {
+  if (!expr) return "?";
+  if (_core.types.isIdentifier(expr)) return expr.name;
+  if (_core.types.isCallExpression(expr) || _core.types.isOptionalCallExpression(expr)) return decoratorName(expr.callee);
+  if (_core.types.isMemberExpression(expr) || _core.types.isOptionalMemberExpression(expr)) {
+    const obj = decoratorName(expr.object);
+    const prop = _core.types.isIdentifier(expr.property) ? expr.property.name : "?";
+    return `${obj}.${prop}`;
+  }
+  return "?";
+}
+
+// Sentinel objects returned by shouldConvertClass.
+// Using distinct objects (not `true`) lets callers read `isController` without a second walk.
+const CONVERT = {
+  isController: false
+};
+const CONVERT_CONTROLLER = {
+  isController: true
+};
 function shouldConvertClass(file, node, opts, classInfo) {
+  var _node$decorators2, _opts$additionalUI5Cl;
   if (classInfo.nonUI5) {
-    return false;
+    return null;
   }
   if (opts.autoConvertAllExtendClasses == true) {
-    return true;
+    return CONVERT;
   }
   if (classInfo.name || classInfo.alias || classInfo.controller || classInfo.namespace) {
-    return true;
+    return CONVERT;
+  }
+
+  // Filename-suffix opt-outs are authoritative overrides — honor them regardless of
+  // whether autoConvertUI5FileTypes is on or off. A user who explicitly disables
+  // controller or view conversion must not have it silently re-enabled by the
+  // known-class branch or any other detection path.
+  {
+    const filename = file.opts.filename || "";
+    if (/[.]controller[.](js|ts)$/.test(filename)) {
+      if (opts.autoConvertUI5FileTypes === false || opts.autoConvertControllerClass === false) {
+        return null;
+      }
+    }
+    if (/[.]view[.](js|ts|jsx|tsx)$/.test(filename)) {
+      if (opts.autoConvertUI5FileTypes === false || opts.autoConvertViewClass === false) {
+        return null;
+      }
+    }
+  }
+
+  // Preserve legacy .controller.(js|ts) behaviour exactly: controllers have always
+  // been auto-converted without requiring a resolvable namespace, so this runs before
+  // the namespace guard below. Views are a new feature and remain subject to the guard.
+  if (opts.autoConvertUI5FileTypes !== false && opts.autoConvertControllerClass !== false && /[.]controller[.](js|ts)$/.test(file.opts.filename || "")) {
+    return CONVERT_CONTROLLER;
+  }
+
+  // For all auto-conversion paths below, require a non-empty namespace so the
+  // generated FQN is not a bare class name. fileNamespace is derived from the
+  // file path relative to sourceRoot (+ namespacePrefix if set).
+  if (!classInfo.fileNamespace) {
+    return null;
+  }
+
+  // Don't auto-convert when unknown (non-UI5) decorators remain on the class —
+  // those decorators may transform the class in ways incompatible with .extend().
+  // Explicit @alias/@namespace annotations (handled above) still take precedence.
+  if ((_node$decorators2 = node.decorators) !== null && _node$decorators2 !== void 0 && _node$decorators2.length) {
+    var _node$id3;
+    const names = node.decorators.map(d => "@" + decoratorName(d.expression)).join(", ");
+    console.warn(`[babel-plugin-ui5] Skipping auto-conversion of class "${(_node$id3 = node.id) === null || _node$id3 === void 0 ? void 0 : _node$id3.name}" in "${file.opts.filename}" — ` + `non-UI5 decorator(s) present: ${names}. Add @alias or @namespace to convert it, or @nonUI5 to silence this warning.`);
+    return null;
+  }
+
+  // Convert classes whose superclass is imported from a known UI5 base-class module.
+  // autoConvertKnownUI5Classes defaults to true; opt out by setting it to false.
+  // additionalUI5Classes entries are always checked regardless of autoConvertKnownUI5Classes —
+  // the two are independent: one controls the built-in list, the other adds custom paths.
+  const useBuiltInList = opts.autoConvertKnownUI5Classes !== false;
+  const hasAdditionalClasses = !!((_opts$additionalUI5Cl = opts.additionalUI5Classes) !== null && _opts$additionalUI5Cl !== void 0 && _opts$additionalUI5Cl.length);
+  if (useBuiltInList || hasAdditionalClasses) {
+    const knownPaths = new Set([...(useBuiltInList ? KNOWN_UI5_BASE_CLASSES : []), ...(opts.additionalUI5Classes || [])]);
+    if (knownPaths.size) {
+      var _node$superClass3, _node$id4;
+      const superClassName = (_node$superClass3 = node.superClass) === null || _node$superClass3 === void 0 ? void 0 : _node$superClass3.name;
+      const className = (_node$id4 = node.id) === null || _node$id4 === void 0 ? void 0 : _node$id4.name;
+      const filename = file.opts.filename;
+      const importDecl = (0, _imports.getImportDeclaration)(filename, superClassName);
+      if (importDecl) {
+        var _opts$sourceFolders, _opts$dependencies;
+        const importSource = importDecl.source.value;
+        // Record keyed by the class's own name so descendants can look up by the binding
+        // name they used in their import (which equals the class name in the ancestor file).
+        // Also records the superclass binding name so the transitive chain can be followed.
+        (0, _imports.saveSuperclassImportSource)(filename, className, superClassName, importSource);
+        // Direct hit — immediate superclass is a known UI5 base class
+        if (knownPaths.has(importSource)) {
+          var _opts$additionalUI5Cl2;
+          if ((_opts$additionalUI5Cl2 = opts.additionalUI5Classes) !== null && _opts$additionalUI5Cl2 !== void 0 && _opts$additionalUI5Cl2.includes(importSource)) {
+            (0, _imports.recordAdditionalUI5ClassMatch)(importSource);
+          }
+          return KNOWN_UI5_CONTROLLER_CLASSES.includes(importSource) ? CONVERT_CONTROLLER : CONVERT;
+        }
+        // Transitive hit — walk the superclass chain through already-processed local files.
+        // isSuperclassTransitivelyKnown returns the matched importSource string (or null).
+        const sourceRoot = file.opts.sourceRoot ? Path.resolve(process.cwd(), file.opts.sourceRoot) : process.cwd();
+        // Use the effective namespace prefix for the current file (respects sourceFolders).
+        // ?? (not ||) so that an explicit "" mapping in sourceFolders is respected —
+        // || would treat "" as falsy and fall through to namespacePrefix.
+        // ?? (not ||) so that an explicit "" mapping in sourceFolders is respected —
+        // || would treat "" as falsy and fall through to namespacePrefix.
+        // getEffectiveNamespacePrefix already returns namespacePrefix as a fallback when
+        // sourceFolders is absent, so no extra ?? namespacePrefix chaining is needed here.
+        const effectivePrefix = (0, _imports.getEffectiveNamespacePrefix)(filename, sourceRoot, opts);
+        const transitiveMatch = (0, _imports.isSuperclassTransitivelyKnown)(filename, superClassName, knownPaths, sourceRoot, {
+          namespacePrefix: effectivePrefix,
+          sourceFolders: (_opts$sourceFolders = opts.sourceFolders) !== null && _opts$sourceFolders !== void 0 ? _opts$sourceFolders : null,
+          dependencies: (_opts$dependencies = opts.dependencies) !== null && _opts$dependencies !== void 0 ? _opts$dependencies : null
+        });
+        if (transitiveMatch) {
+          var _opts$additionalUI5Cl3;
+          // N2: walk every intermediate local ancestor in the chain and verify that each
+          // one has a resolvable namespace (or is a legacy .controller.(js|ts) file that
+          // converts without a namespace). An ancestor with an empty namespace that is NOT
+          // a controller file remains a native ES class at runtime, so calling .extend()
+          // on it would throw.
+          //
+          // isLocalChainConvertible checks the *full* chain, not only the direct ancestor:
+          // a chain MyCtrl→LocalA(has NS)→LocalMid(empty NS)→SAP Controller is rejected
+          // because LocalMid would not be converted to .extend().
+          if (!(0, _imports.isLocalChainConvertible)(importSource, filename, sourceRoot, effectivePrefix, knownPaths, opts)) {
+            return null;
+          }
+          // F4: mark only the path that was actually matched, not every additionalUI5Classes
+          // entry — to avoid suppressing valid "never matched" warnings for typo paths.
+          if ((_opts$additionalUI5Cl3 = opts.additionalUI5Classes) !== null && _opts$additionalUI5Cl3 !== void 0 && _opts$additionalUI5Cl3.includes(transitiveMatch)) {
+            (0, _imports.recordAdditionalUI5ClassMatch)(transitiveMatch);
+          }
+          return KNOWN_UI5_CONTROLLER_CLASSES.includes(transitiveMatch) ? CONVERT_CONTROLLER : CONVERT;
+        }
+      }
+    }
   }
-  // Convert controller classes
-  if (/.*[.]controller[.](js|ts)$/.test(file.opts.filename) && opts.autoConvertControllerClass !== false) {
-    return true;
+  // Convert classes in .view.* files based on filename suffix (requires namespace above).
+  // .controller.* is already handled before the namespace guard to preserve legacy behaviour.
+  if (opts.autoConvertUI5FileTypes !== false && opts.autoConvertViewClass !== false && /[.]view[.](js|ts|jsx|tsx)$/.test(file.opts.filename || "")) {
+    return CONVERT;
   }
-  return false;
+  return null;
 }

package/dist/index.js

@@ -2,7 +2,9 @@
 
 var _visitor = require("./classes/visitor");
 var _pre = require("./classes/pre");
+var _imports = require("./classes/helpers/imports");
 var _visitor2 = require("./modules/visitor");
+var _ast = require("./utils/ast");
 var _wrapper = require("./modules/helpers/wrapper");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -17,16 +19,30 @@ Babel Types (t.*) https://github.com/babel/babel/tree/master/packages/babel-type
 AST Explorer: https://astexplorer.net/
 */
 
+// Accumulates every additionalUI5Classes path seen across all post() invocations.
+// A single process.on('exit') handler (registered once) checks this set so that all
+// configured paths — even those from different plugin instances in the same build — are
+// covered. Without this, the closure in the first post() call would only see the first
+// invocation's options array.
+//
+// NOTE: The warning fires once per Node process (at exit), not once per build. In a
+// long-lived process that runs many builds (watch mode, programmatic transform loops) the
+// paths accumulate across all of them and the warning reports the union at process exit.
+// There is no reliable per-build boundary at the Babel plugin level to scope this to a
+// single build, so the per-process behaviour is intentional for the common one-shot CLI case.
+let allConfiguredUI5ClassPaths = null;
+let exitHandlerRegistered = false;
 module.exports = () => {
   const UI5Visitor = _objectSpread({
     Program: {
       enter(path, {
         opts
       }) {
+        var _path$parent$comments, _path$parent;
         if (this.ran) return;
         this.ran = true;
         if (opts.onlyConvertNamedClass == false) {
-          throw new Error("ERROR: onlyConvertNamedClass=false is no longer supported. Use autoConvertAllExtendClassesByDefault=true");
+          throw new Error("ERROR: onlyConvertNamedClass=false is no longer supported. Use autoConvertAllExtendClasses=true");
         }
         // TODO: enable this in a later version
         // else if (opts.onlyConvertNamedClass == true) {
@@ -35,8 +51,9 @@ module.exports = () => {
 
         // Opts
         this.namespacePrefix = opts.namespacePrefix;
+        this.dependencies = Array.isArray(opts.dependencies) ? opts.dependencies : [];
         this.noImportInteropPrefixes = opts.noImportInteropPrefixes || ["sap/"];
-        this.noImportInteropPrefixesRegexp = new RegExp(this.noImportInteropPrefixes.map(p => `(^${p}.*)`).join("|"));
+        this.noImportInteropPrefixesRegexp = new RegExp(this.noImportInteropPrefixes.map(p => `(^${(0, _ast.escapeRegExp)(p)}.*)`).join("|"));
 
         // Properties for Module Transform
         this.programNode = path.node;
@@ -48,6 +65,7 @@ module.exports = () => {
         this.imports = [];
         this.namedExports = [];
         this.injectDynamicImportHelper = false;
+        this.noWrap = ((_path$parent$comments = (_path$parent = path.parent) === null || _path$parent === void 0 ? void 0 : _path$parent.comments) !== null && _path$parent$comments !== void 0 ? _path$parent$comments : []).some(c => c.type === "CommentBlock" && c.value.trim() === "@ui5-no-wrap");
 
         // Properties for Class Transform
         this.importNames = [];
@@ -68,6 +86,38 @@ module.exports = () => {
   }, _visitor2.ModuleTransformVisitor);
   return {
     pre: _pre.ClassPre,
+    post() {
+      var _this$opts;
+      // PM2: reset the per-cycle eviction flag so that the next watch cycle's first
+      // saveImports call re-evicts on-demand ancestor files that may have changed.
+      (0, _imports.resetOnDemandEvictionCycle)();
+      // F5: use this.opts (plugin options), not the Babel file opts passed as argument.
+      // F6: defer the warning to process exit so it fires once after all files are done,
+      //     avoiding false positives when a valid path is only imported in a later file.
+      const additionalUI5Classes = (_this$opts = this.opts) === null || _this$opts === void 0 ? void 0 : _this$opts.additionalUI5Classes;
+      if (!(additionalUI5Classes !== null && additionalUI5Classes !== void 0 && additionalUI5Classes.length)) return;
+      // Accumulate all configured paths across every post() invocation so that builds
+      // using multiple Babel configs or programmatic transforms don't miss any list.
+      if (!allConfiguredUI5ClassPaths) allConfiguredUI5ClassPaths = new Set();
+      for (const p of additionalUI5Classes) allConfiguredUI5ClassPaths.add(p);
+      if (!exitHandlerRegistered) {
+        exitHandlerRegistered = true;
+        process.on("exit", () => {
+          if (!allConfiguredUI5ClassPaths) return;
+          const unmatched = (0, _imports.getUnmatchedAdditionalUI5Classes)([...allConfiguredUI5ClassPaths]);
+          for (const p of unmatched) {
+            console.warn(`\x1b[33mWarn:\x1b[0m additionalUI5Classes: path "\x1b[34m${p}\x1b[0m" was never matched by any import in this build. Check for typos.`);
+          }
+        });
+      }
+    },
     visitor: UI5Visitor
   };
+};
+module.exports.resetPluginState = function resetPluginState() {
+  allConfiguredUI5ClassPaths = null;
+  // Do NOT reset exitHandlerRegistered: the process.on('exit') handler is registered
+  // once for the lifetime of the process. Re-registering it after resetPluginState()
+  // would cause duplicate warnings (both handlers fire at exit).
+  (0, _imports.resetAllCaches)();
 };

package/dist/modules/helpers/exports.js

@@ -29,6 +29,12 @@ function collapseNamedExports(programNode, defaultExport, namedExports, opts) {
   if (!namedExports.length || opts.noExportExtend) {
     return {
       filteredExports: namedExports,
+      // Always include conflictingExports so the consumer (wrapper.js) can call
+      // getPropNames() on it. When noExportExtend leaves non-collapsible named
+      // exports in filteredExports, the consumer throws the "Unsafe mixing" error
+      // and reads conflictingExports — a missing key here produced a garbled
+      // "Cannot read properties of undefined (reading 'map')" instead.
+      conflictingExports: namedExports,
       newDefaultExportIdentifier: null
     };
   }
@@ -108,8 +114,11 @@ function areSame(defaultExportProperty, matchingNamedExport) {
     }
   } else if (_core.types.isLiteral(defaultExportValue)) {
     // i.e. { a: 1 } or { a: '1' }
-    // See if the original declaration for the matching export was for the same literal
-    if (_core.types.isLiteral(declaration.init) && declaration.init.value === defaultExportValue.value) {
+    // See if the original declaration for the matching export was for the same literal.
+    // Guard `declaration` the same way the identifier branch above does: specifier
+    // exports (`export { a }`) carry no `declaration`, so reading declaration.init
+    // would throw.
+    if (declaration && _core.types.isLiteral(declaration.init) && declaration.init.value === defaultExportValue.value) {
       // i.e. 'export const a = 1'
       // Same literal. Safe to ignore
       return true;

package/dist/modules/helpers/wrapper.js

@@ -10,7 +10,10 @@ var th = _interopRequireWildcard(require("../../utils/templates"));
 var ast = _interopRequireWildcard(require("../../utils/ast"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function wrap(visitor, programNode, opts) {
-  var _body;
+  var _visitor$parent$comme, _visitor$parent, _body;
+  if (hasNoWrapPragma((_visitor$parent$comme = (_visitor$parent = visitor.parent) === null || _visitor$parent === void 0 ? void 0 : _visitor$parent.comments) !== null && _visitor$parent$comme !== void 0 ? _visitor$parent$comme : [])) {
+    return;
+  }
   let {
     defaultExport,
     exportGlobal,
@@ -48,8 +51,8 @@ function wrap(visitor, programNode, opts) {
   // 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;
-    copyright = (_visitor$parent = visitor.parent) === null || _visitor$parent === void 0 || (_visitor$parent = _visitor$parent.comments) === null || _visitor$parent === void 0 ? void 0 : _visitor$parent.find((comment, idx, arr) => {
+    var _visitor$parent2;
+    copyright = (_visitor$parent2 = visitor.parent) === null || _visitor$parent2 === void 0 || (_visitor$parent2 = _visitor$parent2.comments) === null || _visitor$parent2 === void 0 ? void 0 : _visitor$parent2.find((comment, idx, arr) => {
       if (comment.value.startsWith("!")) {
         arr.splice(idx, 1);
         return true;
@@ -181,6 +184,9 @@ function wrap(visitor, programNode, opts) {
 function hasUseStrict(node) {
   return (node.directives || []).some(directive => directive.value.value === "use strict");
 }
+function hasNoWrapPragma(comments) {
+  return comments.some(comment => comment.type === "CommentBlock" && comment.value.trim() === "@ui5-no-wrap");
+}
 function hasUseSapUiRequire(comments, body, remove) {
   // detect the @sapUiRequire comment
   return comments.some(comment => {

package/dist/modules/visitor.js

@@ -23,7 +23,7 @@ const resolveSource = (src, filename) => {
   src = src.replace(/\\/g, "/");
   const dir = (0, _path.dirname)(filename);
   const absoluteSrc = (0, _path.join)(dir, src);
-  if ((0, _fs.existsSync)(absoluteSrc) && (0, _fs.statSync)(absoluteSrc).isDirectory) {
+  if ((0, _fs.existsSync)(absoluteSrc) && (0, _fs.statSync)(absoluteSrc).isDirectory()) {
     if ((0, _fs.existsSync)((0, _path.join)(absoluteSrc, "index.js")) || (0, _fs.existsSync)((0, _path.join)(absoluteSrc, "index.jsx")) || (0, _fs.existsSync)((0, _path.join)(absoluteSrc, "index.ts")) || (0, _fs.existsSync)((0, _path.join)(absoluteSrc, "index.tsx")) || (0, _fs.existsSync)((0, _path.join)(absoluteSrc, "index.mjs")) || (0, _fs.existsSync)((0, _path.join)(absoluteSrc, "index.cjs"))) {
       src = `${src}/index`;
     }
@@ -33,7 +33,7 @@ const resolveSource = (src, filename) => {
 const cleanImportSource = src => src.replace(/(\/)|(-)|(@)/g, "_").replace(/\./g, "");
 const tempModuleName = name => `__${name}`;
 const hasGlobalExportFlag = node => (0, _jsdoc.hasJsdocGlobalExportFlag)(node);
-const addImport = (imports, imp, filename, first) => {
+const addImport = (imports, imp, filename, first, opts = {}) => {
   const existingImport = imports.find(i => i.src === imp.src);
   if (!existingImport) {
     // if a module path ends with the file extension ".js" and it can be resolved to
@@ -58,9 +58,14 @@ const addImport = (imports, imp, filename, first) => {
         } else {
           modulePath = require.resolve(absModuleSrc);
         }
-        // detect removal of file extension and log a hint
-        if (modulePath.endsWith(imp.src.split("/").pop())) {
-          console.log(`\x1b[33mHint:\x1b[0m Removed file extension for dependency "\x1b[34m${imp.src}\x1b[0m" found in \x1b[90m${filename}\x1b[0m`);
+        // detect removal of file extension and log a hint.
+        // Guard on modulePath: for a relative import whose file doesn't exist it
+        // stays undefined (no extension matched) — don't slice, and don't rely on a
+        // thrown TypeError for that control flow.
+        if (modulePath && modulePath.endsWith(imp.src.split("/").pop())) {
+          if (!opts.suppressImportResolutionHints) {
+            console.log(`\x1b[33mHint:\x1b[0m Removed file extension for dependency "\x1b[34m${imp.src}\x1b[0m" found in \x1b[90m${filename}\x1b[0m`);
+          }
           imp.src = imp.src.slice(0, -3);
         }
       } catch (ex) {
@@ -68,6 +73,7 @@ const addImport = (imports, imp, filename, first) => {
         // can't be resolved with the given file extension, e.g.
         // myns/module.js must be provided as myns/module
         // myns/module.js.js must be provided as myns/module.js
+        void ex;
       }
     }
     imports[first ? "unshift" : "push"](imp);
@@ -94,7 +100,8 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
       node
     } = path;
     if (node.importKind === "type") return; // flow-type
-
+    if (this.noWrap) return;
+    if (hasIgnoreImportPragma(node)) return;
     const {
       specifiers,
       source
@@ -189,7 +196,7 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
         deconstructors.push(th.buildNamedImportDestructor({
           MODULE: _core.types.identifier(imp.tmpName),
           LOCAL: specifier.local,
-          IMPORTED: _core.types.stringLiteral(specifier.imported.name)
+          IMPORTED: _core.types.stringLiteral(_core.types.isStringLiteral(specifier.imported) ? specifier.imported.value : specifier.imported.name)
         }));
       } else {
         throw path.buildCodeFrameError(`Unknown ImportDeclaration specifier type ${specifier.type}`);
@@ -213,7 +220,7 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
     }
     imp.deconstructors = imp.deconstructors.concat(deconstructors);
     if (!existingImport) {
-      addImport(this.imports, imp, filename);
+      addImport(this.imports, imp, filename, false, opts);
     }
   },
   /**
@@ -222,7 +229,8 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
    * where a let or var can be defined, and the latest one should be exported.
    */
   ExportNamedDeclaration(path, {
-    filename
+    filename,
+    opts
   }) {
     const {
       node
@@ -232,6 +240,7 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
       declaration,
       source
     } = node;
+    if (this.noWrap) return;
     let fromSource = "";
     if (source) {
       // e.g. export { one, two } from 'x'
@@ -242,7 +251,7 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
         src,
         name,
         tmpName
-      }, filename);
+      }, filename, false, opts);
       fromSource = tmpName + ".";
     }
     if (specifiers && specifiers.length) {
@@ -289,6 +298,7 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
     const {
       node
     } = path;
+    if (this.noWrap) return;
     let {
       declaration
     } = node;
@@ -324,8 +334,10 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
     }
   },
   ExportAllDeclaration(path, {
-    filename
+    filename,
+    opts
   }) {
+    if (this.noWrap) return;
     const src = resolveSource(path.node.source.value, filename);
     const name = cleanImportSource(src);
     const tmpName = tempModuleName(name);
@@ -333,7 +345,7 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
       src,
       name,
       tmpName
-    }, filename);
+    }, filename, false, opts);
     this.exportAllHelper = true;
     this.namedExports.push({
       all: true,
@@ -351,7 +363,9 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
     const {
       callee
     } = node;
+    if (this.noWrap) return;
     if (ast.isImport(callee)) {
+      if (hasIgnoreImportPragma(path.getStatementParent().node)) return;
       this.injectDynamicImportHelper = true;
       path.replaceWith(_objectSpread(_objectSpread({}, node), {}, {
         callee: _core.types.identifier("__ui5_require_async")
@@ -365,6 +379,7 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
     const {
       node
     } = path;
+    if (this.noWrap) return;
     if ((node === null || node === 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"
@@ -379,4 +394,8 @@ const ModuleTransformVisitor = exports.ModuleTransformVisitor = {
       }
     }
   }
-};
+};
+function hasIgnoreImportPragma(node) {
+  var _node$leadingComments;
+  return ((_node$leadingComments = node.leadingComments) !== null && _node$leadingComments !== void 0 ? _node$leadingComments : []).some(comment => comment.type === "CommentBlock" && comment.value.trim() === "@ui5-ignore-import");
+}

package/dist/utils/ast.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.convertDeclarationToExpression = convertDeclarationToExpression;
 exports.convertFunctionDeclarationToExpression = convertFunctionDeclarationToExpression;
+exports.escapeRegExp = void 0;
 exports.findPropertiesOfNode = findPropertiesOfNode;
 exports.getIdName = getIdName;
 exports.getInternalStaticThingsOfClass = getInternalStaticThingsOfClass;
@@ -23,6 +24,8 @@ exports.isSuperCallExpression = isSuperCallExpression;
 exports.isSuperPrototypeCallOf = isSuperPrototypeCallOf;
 exports.isThisExpressionUsed = isThisExpressionUsed;
 var _core = require("@babel/core");
+const escapeRegExp = s => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+exports.escapeRegExp = escapeRegExp;
 function isObjectAssignOrExtendsExpression(node) {
   return isObjectAssignExpression(node) || isExtendsHelperExpression(node);
 }
@@ -130,14 +133,24 @@ function getPropertiesOfObjectAssignOrExtendHelper(node, blockScopeNode) {
       // Recursive, although props will be empty if arg is an imported object
       return getOtherPropertiesOfIdentifier(blockScopeNode, arg.name);
     }
-  }).flat(Infinity);
+    return []; // e.g. Object.create(null) or other CallExpression args contribute no properties
+  }).flat(Infinity).filter(Boolean);
+}
+function getPropKeyName(key) {
+  if (!key) return undefined;
+  if (key.type === "StringLiteral") return key.value;
+  if (key.type === "Identifier") return key.name;
+  return undefined;
 }
 function getPropNames(props) {
-  return props.map(prop => prop.key.name);
+  return props.map(prop => getPropKeyName(prop.key)).filter(Boolean);
 }
 function groupPropertiesByName(properties) {
   return properties && properties.reduce((accumulator, property) => {
-    accumulator[property.key.name] = property.value;
+    const name = getPropKeyName(property.key);
+    if (name !== undefined) {
+      accumulator[name] = property.value;
+    }
     return accumulator;
   }, {});
 }