@micro-zoe/micro-app 1.0.0-rc.23 → 1.0.0-rc.24

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-const version = '1.0.0-rc.23';
+const version = '1.0.0-rc.24';
 // do not use isUndefined
 const isBrowser = typeof window !== 'undefined';
 // do not use isUndefined
@@ -6510,18 +6510,14 @@ function patchIframeAttribute(url, microAppWindow, appName) {
     const microRootElement = microAppWindow.Element;
     const rawMicroSetAttribute = microRootElement.prototype.setAttribute;
     microRootElement.prototype.setAttribute = function setAttribute(key, value) {
-        var _a, _b, _c, _d;
+        var _a;
         if (/^micro-app(-\S+)?/i.test(this.tagName) &&
             key === 'data' &&
             this.setAttribute !== microRootElement.prototype.setAttribute) {
             this.setAttribute(key, value);
         }
         else {
-            let appPlugins = (_c = (_b = (_a = microApp === null || microApp === void 0 ? void 0 : microApp.options) === null || _a === void 0 ? void 0 : _a.plugins) === null || _b === void 0 ? void 0 : _b.modules) === null || _c === void 0 ? void 0 : _c[appName];
-            if (!isArray(appPlugins)) {
-                appPlugins = [];
-            }
-            const aHrefResolver = (_d = appPlugins[0]) === null || _d === void 0 ? void 0 : _d.aHrefResolver;
+            const aHrefResolver = (_a = microApp === null || microApp === void 0 ? void 0 : microApp.options) === null || _a === void 0 ? void 0 : _a.aHrefResolver;
             if (key === 'href' && /^a$/i.test(this.tagName) && typeof aHrefResolver === 'function') {
                 // 试验性质：a 标签开放自定义补齐功能
                 value = aHrefResolver(value, appName, url);
@@ -7783,6 +7779,7 @@ function isPendMethod(method) {
  * @param newChild target node
  */
 function completePathDynamic(app, newChild) {
+    var _a;
     if (isElement(newChild)) {
         if (/^(img|script)$/i.test(newChild.tagName)) {
             if (newChild.hasAttribute('src')) {
@@ -7795,7 +7792,16 @@ function completePathDynamic(app, newChild) {
         else if ((/^(link|image)$/i.test(newChild.tagName) && newChild.hasAttribute('href')) ||
             // If it is the anchor tag,eg. <a href="#xxx"/>, the path will not be completed
             (/^(a)$/i.test(newChild.tagName) && newChild.hasAttribute('href') && !/^#/.test(newChild.getAttribute('href') || ''))) {
-            globalEnv.rawSetAttribute.call(newChild, 'href', CompletionPath(newChild.getAttribute('href'), app.url));
+            const aHrefResolver = (_a = microApp === null || microApp === void 0 ? void 0 : microApp.options) === null || _a === void 0 ? void 0 : _a.aHrefResolver;
+            const hrefValue = newChild.getAttribute('href');
+            let nextHrefValue;
+            if ((/^(a)$/i.test(newChild.tagName) && typeof aHrefResolver === 'function')) {
+                nextHrefValue = aHrefResolver(hrefValue, app.name, app.url);
+            }
+            else {
+                nextHrefValue = CompletionPath(hrefValue, app.url);
+            }
+            globalEnv.rawSetAttribute.call(newChild, 'href', nextHrefValue);
         }
     }
 }
@@ -7958,7 +7964,7 @@ function patchElementAndDocument() {
     };
     // rewrite setAttribute, complete resource address
     rawRootElement.prototype.setAttribute = function setAttribute(key, value) {
-        var _a;
+        var _a, _b;
         if (/^micro-app(-\S+)?/i.test(this.tagName) &&
             key === 'data' &&
             this.setAttribute !== rawRootElement.prototype.setAttribute) {
@@ -7973,12 +7979,18 @@ function patchElementAndDocument() {
                     // If it is the anchor tag,eg. <a href="#xxx"/>, the path will not be completed
                     (key === 'href' && /^(a)$/i.test(this.tagName) && !/^#/.test(value)))) {
                 const app = appInstanceMap.get(appName);
-                value = CompletionPath(value, app.url);
+                const aHrefResolver = (_a = microApp === null || microApp === void 0 ? void 0 : microApp.options) === null || _a === void 0 ? void 0 : _a.aHrefResolver;
+                if (key === 'href' && /^a$/i.test(this.tagName) && typeof aHrefResolver === 'function') {
+                    value = aHrefResolver(value, appName, app.url);
+                }
+                else {
+                    value = CompletionPath(value, app.url);
+                }
             }
             globalEnv.rawSetAttribute.call(this, key, value);
             if (isImageElement(this) || isVideoElement(this) || isAudioElement(this)) {
                 let includeCrossOrigin = false;
-                if (((_a = microApp === null || microApp === void 0 ? void 0 : microApp.options) === null || _a === void 0 ? void 0 : _a.includeCrossOrigin) && isFunction(microApp.options.includeCrossOrigin)) {
+                if (((_b = microApp === null || microApp === void 0 ? void 0 : microApp.options) === null || _b === void 0 ? void 0 : _b.includeCrossOrigin) && isFunction(microApp.options.includeCrossOrigin)) {
                     includeCrossOrigin = microApp.options.includeCrossOrigin(value);
                 }
                 // @ts-ignore