wujie-event-scope 1.0.3 → 1.0.5

package/dist/index.cjs.js

@@ -6577,6 +6577,29 @@ function getMemberExpressionPath(node) {
         : property?.name ?? property?.value ?? "";
     return `${objectName}.${propertyName}`;
 }
+function getCallExpression(node, args, results) {
+    if (node.type === "Identifier") {
+        results.add({
+            ast: node.name,
+            start: node.start,
+            end: node.end,
+        });
+        if (Array.isArray(args) && args.length > 0) {
+            args.forEach((node) => {
+                getCallExpression(node, node.arguments, results);
+            });
+        }
+    }
+    else if (node.type === 'MemberExpression') {
+        const memberName = getMemberExpressionPath(node);
+        results.add({
+            ast: memberName,
+            start: node.start,
+            end: node.end,
+        });
+    }
+    return results;
+}
 function findIdentifiers(code) {
     const results = new Set();
     const ast = parse(code, {
@@ -6590,21 +6613,40 @@ function findIdentifiers(code) {
             const callee = node.callee;
             if (!callee)
                 return;
-            if (callee.type === "Identifier") {
-                results.add({
-                    ast: callee.name,
-                    start: callee.start,
-                    end: callee.end,
-                });
-            }
-            if (callee.type === "MemberExpression") {
-                const memberName = getMemberExpressionPath(callee);
-                results.add({
-                    ast: memberName,
-                    start: callee.start,
-                    end: callee.end,
-                });
-            }
+            getCallExpression(callee, node.arguments, results);
+            // if (callee.type === "Identifier") {
+            //   results.add({
+            //     ast: callee.name,
+            //     start: callee.start,
+            //     end: callee.end,
+            //   });
+            //   if (Array.isArray(node.arguments) && node.arguments.length > 0) {
+            //     node.arguments.forEach((node: any) => {
+            //       if (node.type === 'Identifier') {
+            //         results.add({
+            //           ast: node.name,
+            //           start: node.start,
+            //           end: node.end,
+            //         });
+            //       } else if (node.type === 'MemberExpression') {
+            //         const memberName = getMemberExpressionPath(callee);
+            //         results.add({
+            //           ast: memberName,
+            //           start: node.start,
+            //           end: node.end,
+            //         });
+            //       }
+            //     })
+            //   }
+            // }
+            // if (callee.type === "MemberExpression") {
+            //   const memberName = getMemberExpressionPath(callee);
+            //   results.add({
+            //     ast: memberName,
+            //     start: callee.start,
+            //     end: callee.end,
+            //   });
+            // }
         },
         AssignmentExpression(node) {
             const left = node.left;
@@ -6627,36 +6669,64 @@ function findIdentifiers(code) {
             }
         },
     });
-    return Array.from(results);
+    return Array.from(results).sort((a, b) => a.start - b.start);
 }
 
-function patchElementHook(element, window) {
-    const originHTMLClickEvent = element.onclick;
-    if (typeof originHTMLClickEvent === 'function') {
-        const originHTMLClickEventStr = originHTMLClickEvent.toString();
-        console.log("====事件函数原字符", originHTMLClickEventStr);
-        const targetAttrLists = findIdentifiers(originHTMLClickEventStr);
-        let lastSliceEnd = 0;
-        let replaceHTMLClickEventStr = '';
-        targetAttrLists.forEach(astInfo => {
-            const { ast, start, end } = astInfo;
-            if (!ast.includes('window')) {
-                replaceHTMLClickEventStr += `${originHTMLClickEventStr.slice(lastSliceEnd, start)}window.${ast}`;
-                lastSliceEnd = end;
-            }
-        });
-        replaceHTMLClickEventStr += `${originHTMLClickEventStr.slice(lastSliceEnd)}`;
-        console.log("====事件函数处理后字符", replaceHTMLClickEventStr);
-        const fnBodyStr = replaceHTMLClickEventStr.match(fnBody)?.[1];
-        console.log("====匹配后字符", fnBodyStr);
-        if (fnBodyStr) {
-            element.onclick = (function (window) {
-                return function (event) {
-                    const fn = new Function(fnBodyStr);
-                    fn.call(this);
-                };
-            })();
+function dealAttributesOCPatch(targetString) {
+    const targetAttrLists = findIdentifiers(targetString);
+    let lastSliceEnd = 0;
+    let replaceAttributeEventStr = '';
+    targetAttrLists.forEach(astInfo => {
+        const { ast, start, end } = astInfo;
+        if (!ast.includes('window')) {
+            replaceAttributeEventStr += `${targetString.slice(lastSliceEnd, start)}window.${ast}`;
+            lastSliceEnd = end;
         }
+    });
+    replaceAttributeEventStr += `${targetString.slice(lastSliceEnd)}`;
+    console.log("====事件函数处理后字符", replaceAttributeEventStr);
+    return replaceAttributeEventStr;
+}
+function dealHTMLOCPatch(targetString) {
+    console.log("====事件函数原字符", targetString);
+    const targetAttrLists = findIdentifiers(targetString);
+    let lastSliceEnd = 0;
+    let replaceHTMLClickEventStr = '';
+    targetAttrLists.forEach(astInfo => {
+        const { ast, start, end } = astInfo;
+        if (!ast.includes('window')) {
+            replaceHTMLClickEventStr += `${targetString.slice(lastSliceEnd, start)}window.${ast}`;
+            lastSliceEnd = end;
+        }
+    });
+    replaceHTMLClickEventStr += `${targetString.slice(lastSliceEnd)}`;
+    console.log("====事件函数处理后字符", replaceHTMLClickEventStr);
+    const fnBodyStr = replaceHTMLClickEventStr.match(fnBody)?.[1];
+    return fnBodyStr || '';
+}
+function patchElementHook(element) {
+    const targetHaveGetAttribute = typeof element.getAttribute === 'function';
+    const originHTMLClickEvent = element.onclick;
+    const originAttributeEventStr = targetHaveGetAttribute ? element.getAttribute('onclick') : '';
+    if (targetHaveGetAttribute && element.getAttribute('data-test-scope')) {
+        // @ts-ignore
+        console.log('===子应用window', window.__WUJIE.proxy);
+        console.log('===HTML事件绑定', originHTMLClickEvent);
+        console.log('===attribute获取事件', originAttributeEventStr);
+    }
+    let result = '';
+    if (originAttributeEventStr) {
+        result = dealAttributesOCPatch(originAttributeEventStr);
+    }
+    else if (typeof originHTMLClickEvent === 'function') {
+        result = dealHTMLOCPatch(originHTMLClickEvent.toString());
+    }
+    if (result) {
+        console.log("====执行字符串", result);
+        element.setAttribute('onclick', `(function(window) {
+            ${result}
+        })(window.__WUJIE.proxy)`);
+        console.log("===替换之后的结果", element.getAttribute('onclick'));
     }
 }
 var index = {

package/dist/index.es.js

@@ -6575,6 +6575,29 @@ function getMemberExpressionPath(node) {
         : property?.name ?? property?.value ?? "";
     return `${objectName}.${propertyName}`;
 }
+function getCallExpression(node, args, results) {
+    if (node.type === "Identifier") {
+        results.add({
+            ast: node.name,
+            start: node.start,
+            end: node.end,
+        });
+        if (Array.isArray(args) && args.length > 0) {
+            args.forEach((node) => {
+                getCallExpression(node, node.arguments, results);
+            });
+        }
+    }
+    else if (node.type === 'MemberExpression') {
+        const memberName = getMemberExpressionPath(node);
+        results.add({
+            ast: memberName,
+            start: node.start,
+            end: node.end,
+        });
+    }
+    return results;
+}
 function findIdentifiers(code) {
     const results = new Set();
     const ast = parse(code, {
@@ -6588,21 +6611,40 @@ function findIdentifiers(code) {
             const callee = node.callee;
             if (!callee)
                 return;
-            if (callee.type === "Identifier") {
-                results.add({
-                    ast: callee.name,
-                    start: callee.start,
-                    end: callee.end,
-                });
-            }
-            if (callee.type === "MemberExpression") {
-                const memberName = getMemberExpressionPath(callee);
-                results.add({
-                    ast: memberName,
-                    start: callee.start,
-                    end: callee.end,
-                });
-            }
+            getCallExpression(callee, node.arguments, results);
+            // if (callee.type === "Identifier") {
+            //   results.add({
+            //     ast: callee.name,
+            //     start: callee.start,
+            //     end: callee.end,
+            //   });
+            //   if (Array.isArray(node.arguments) && node.arguments.length > 0) {
+            //     node.arguments.forEach((node: any) => {
+            //       if (node.type === 'Identifier') {
+            //         results.add({
+            //           ast: node.name,
+            //           start: node.start,
+            //           end: node.end,
+            //         });
+            //       } else if (node.type === 'MemberExpression') {
+            //         const memberName = getMemberExpressionPath(callee);
+            //         results.add({
+            //           ast: memberName,
+            //           start: node.start,
+            //           end: node.end,
+            //         });
+            //       }
+            //     })
+            //   }
+            // }
+            // if (callee.type === "MemberExpression") {
+            //   const memberName = getMemberExpressionPath(callee);
+            //   results.add({
+            //     ast: memberName,
+            //     start: callee.start,
+            //     end: callee.end,
+            //   });
+            // }
         },
         AssignmentExpression(node) {
             const left = node.left;
@@ -6625,36 +6667,64 @@ function findIdentifiers(code) {
             }
         },
     });
-    return Array.from(results);
+    return Array.from(results).sort((a, b) => a.start - b.start);
 }
 
-function patchElementHook(element, window) {
-    const originHTMLClickEvent = element.onclick;
-    if (typeof originHTMLClickEvent === 'function') {
-        const originHTMLClickEventStr = originHTMLClickEvent.toString();
-        console.log("====事件函数原字符", originHTMLClickEventStr);
-        const targetAttrLists = findIdentifiers(originHTMLClickEventStr);
-        let lastSliceEnd = 0;
-        let replaceHTMLClickEventStr = '';
-        targetAttrLists.forEach(astInfo => {
-            const { ast, start, end } = astInfo;
-            if (!ast.includes('window')) {
-                replaceHTMLClickEventStr += `${originHTMLClickEventStr.slice(lastSliceEnd, start)}window.${ast}`;
-                lastSliceEnd = end;
-            }
-        });
-        replaceHTMLClickEventStr += `${originHTMLClickEventStr.slice(lastSliceEnd)}`;
-        console.log("====事件函数处理后字符", replaceHTMLClickEventStr);
-        const fnBodyStr = replaceHTMLClickEventStr.match(fnBody)?.[1];
-        console.log("====匹配后字符", fnBodyStr);
-        if (fnBodyStr) {
-            element.onclick = (function (window) {
-                return function (event) {
-                    const fn = new Function(fnBodyStr);
-                    fn.call(this);
-                };
-            })();
+function dealAttributesOCPatch(targetString) {
+    const targetAttrLists = findIdentifiers(targetString);
+    let lastSliceEnd = 0;
+    let replaceAttributeEventStr = '';
+    targetAttrLists.forEach(astInfo => {
+        const { ast, start, end } = astInfo;
+        if (!ast.includes('window')) {
+            replaceAttributeEventStr += `${targetString.slice(lastSliceEnd, start)}window.${ast}`;
+            lastSliceEnd = end;
         }
+    });
+    replaceAttributeEventStr += `${targetString.slice(lastSliceEnd)}`;
+    console.log("====事件函数处理后字符", replaceAttributeEventStr);
+    return replaceAttributeEventStr;
+}
+function dealHTMLOCPatch(targetString) {
+    console.log("====事件函数原字符", targetString);
+    const targetAttrLists = findIdentifiers(targetString);
+    let lastSliceEnd = 0;
+    let replaceHTMLClickEventStr = '';
+    targetAttrLists.forEach(astInfo => {
+        const { ast, start, end } = astInfo;
+        if (!ast.includes('window')) {
+            replaceHTMLClickEventStr += `${targetString.slice(lastSliceEnd, start)}window.${ast}`;
+            lastSliceEnd = end;
+        }
+    });
+    replaceHTMLClickEventStr += `${targetString.slice(lastSliceEnd)}`;
+    console.log("====事件函数处理后字符", replaceHTMLClickEventStr);
+    const fnBodyStr = replaceHTMLClickEventStr.match(fnBody)?.[1];
+    return fnBodyStr || '';
+}
+function patchElementHook(element) {
+    const targetHaveGetAttribute = typeof element.getAttribute === 'function';
+    const originHTMLClickEvent = element.onclick;
+    const originAttributeEventStr = targetHaveGetAttribute ? element.getAttribute('onclick') : '';
+    if (targetHaveGetAttribute && element.getAttribute('data-test-scope')) {
+        // @ts-ignore
+        console.log('===子应用window', window.__WUJIE.proxy);
+        console.log('===HTML事件绑定', originHTMLClickEvent);
+        console.log('===attribute获取事件', originAttributeEventStr);
+    }
+    let result = '';
+    if (originAttributeEventStr) {
+        result = dealAttributesOCPatch(originAttributeEventStr);
+    }
+    else if (typeof originHTMLClickEvent === 'function') {
+        result = dealHTMLOCPatch(originHTMLClickEvent.toString());
+    }
+    if (result) {
+        console.log("====执行字符串", result);
+        element.setAttribute('onclick', `(function(window) {
+            ${result}
+        })(window.__WUJIE.proxy)`);
+        console.log("===替换之后的结果", element.getAttribute('onclick'));
     }
 }
 var index = {

package/dist/types/babelParse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"babelParse.d.ts","sourceRoot":"","sources":["../../src/babelParse.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,OAAO;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAmBD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,aA0D3C"}
+{"version":3,"file":"babelParse.d.ts","sourceRoot":"","sources":["../../src/babelParse.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,OAAO;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AA0CD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,aA6E3C"}

package/dist/types/index.d.ts

@@ -1,4 +1,4 @@
-declare function patchElementHook(element: HTMLElement, window: Window): void;
+declare function patchElementHook(element: HTMLElement): void;
 declare const _default: {
     patchElementHook: typeof patchElementHook;
 };

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAEA,iBAAS,gBAAgB,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,QA4B7D;;;;AAED,wBAEE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAqCA,iBAAS,gBAAgB,CAAC,OAAO,EAAE,WAAW,QAuB7C;;;;AAED,wBAEE"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "wujie-event-scope",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "处理wujie子应用HTML事件执行undefined问题",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",

package/src/babelParse.ts

@@ -24,6 +24,29 @@ function getMemberExpressionPath(node: any): string {
   return `${objectName}.${propertyName}`;
 }
 
+function getCallExpression(node: any, args: any, results: Set<AstInfo>) {
+  if (node.type === "Identifier") { 
+    results.add({
+      ast: node.name,
+      start: node.start,
+      end: node.end,
+    });
+    if (Array.isArray(args) && args.length > 0) {
+      args.forEach((node: any) => {
+        getCallExpression(node, node.arguments ,results)
+      })
+    }
+  } else if (node.type === 'MemberExpression') {
+    const memberName = getMemberExpressionPath(node);
+    results.add({
+      ast: memberName,
+      start: node.start,
+      end: node.end,
+    });
+  }
+  return results
+}
+
 export function findIdentifiers(code: string) {
   const results = new Set<AstInfo>();
 
@@ -40,22 +63,41 @@ export function findIdentifiers(code: string) {
 
       if (!callee) return;
 
-      if (callee.type === "Identifier") {
-        results.add({
-          ast: callee.name,
-          start: callee.start,
-          end: callee.end,
-        });
-      }
+      getCallExpression(callee, node.arguments, results)
+      // if (callee.type === "Identifier") {
+      //   results.add({
+      //     ast: callee.name,
+      //     start: callee.start,
+      //     end: callee.end,
+      //   });
+      //   if (Array.isArray(node.arguments) && node.arguments.length > 0) {
+      //     node.arguments.forEach((node: any) => {
+      //       if (node.type === 'Identifier') {
+      //         results.add({
+      //           ast: node.name,
+      //           start: node.start,
+      //           end: node.end,
+      //         });
+      //       } else if (node.type === 'MemberExpression') {
+      //         const memberName = getMemberExpressionPath(callee);
+      //         results.add({
+      //           ast: memberName,
+      //           start: node.start,
+      //           end: node.end,
+      //         });
+      //       }
+      //     })
+      //   }
+      // }
 
-      if (callee.type === "MemberExpression") {
-        const memberName = getMemberExpressionPath(callee);
-        results.add({
-          ast: memberName,
-          start: callee.start,
-          end: callee.end,
-        });
-      }
+      // if (callee.type === "MemberExpression") {
+      //   const memberName = getMemberExpressionPath(callee);
+      //   results.add({
+      //     ast: memberName,
+      //     start: callee.start,
+      //     end: callee.end,
+      //   });
+      // }
     },
     AssignmentExpression(node: any) {
       const left = node.left;
@@ -81,5 +123,5 @@ export function findIdentifiers(code: string) {
     },
   });
 
-  return Array.from(results);
+  return Array.from(results).sort((a, b) => a.start - b.start);
 }

package/src/index.ts

@@ -1,32 +1,62 @@
 import { fnBody } from "./regx"
 import { findIdentifiers } from "./babelParse"
-function patchElementHook(element: HTMLElement, window: Window) {
-    const originHTMLClickEvent = element.onclick;
-    if (typeof originHTMLClickEvent === 'function') {
-        const originHTMLClickEventStr = originHTMLClickEvent.toString();
-        console.log("====事件函数原字符", originHTMLClickEventStr)
-        const targetAttrLists = findIdentifiers(originHTMLClickEventStr);
+
+function dealAttributesOCPatch(targetString: string) {
+    const targetAttrLists = findIdentifiers(targetString);
+    let lastSliceEnd = 0;
+    let replaceAttributeEventStr: string = '';
+    targetAttrLists.forEach(astInfo => {
+        const { ast, start, end } = astInfo
+        if (!ast.includes('window')) {
+            replaceAttributeEventStr += `${targetString.slice(lastSliceEnd, start)}window.${ast}`
+            lastSliceEnd = end
+        }
+    })
+    replaceAttributeEventStr += `${targetString.slice(lastSliceEnd)}`
+    console.log("====事件函数处理后字符", replaceAttributeEventStr)
+    return replaceAttributeEventStr
+}
+
+function dealHTMLOCPatch(targetString: string) {
+        console.log("====事件函数原字符", targetString)
+        const targetAttrLists = findIdentifiers(targetString);
         let lastSliceEnd = 0;
         let replaceHTMLClickEventStr: string = '';
         targetAttrLists.forEach(astInfo => {
             const { ast, start, end } = astInfo
             if (!ast.includes('window')) {
-                replaceHTMLClickEventStr += `${originHTMLClickEventStr.slice(lastSliceEnd, start)}window.${ast}`
+                replaceHTMLClickEventStr += `${targetString.slice(lastSliceEnd, start)}window.${ast}`
                 lastSliceEnd = end
             }
         })
-        replaceHTMLClickEventStr += `${originHTMLClickEventStr.slice(lastSliceEnd)}`
+        replaceHTMLClickEventStr += `${targetString.slice(lastSliceEnd)}`
         console.log("====事件函数处理后字符", replaceHTMLClickEventStr)
         const fnBodyStr = replaceHTMLClickEventStr.match(fnBody)?.[1];
-        console.log("====匹配后字符", fnBodyStr)
-        if (fnBodyStr) {
-            element.onclick = (function (window) {
-                return function (event) {
-                    const fn = new Function(fnBodyStr);
-                    fn.call(this);
-                }
-            })(window)
-        }
+        return fnBodyStr || ''
+}
+
+function patchElementHook(element: HTMLElement) {
+    const targetHaveGetAttribute = typeof element.getAttribute === 'function'
+    const originHTMLClickEvent = element.onclick;
+    const originAttributeEventStr = targetHaveGetAttribute ? element.getAttribute('onclick') : ''
+    if (targetHaveGetAttribute && element.getAttribute('data-test-scope')) {
+        // @ts-ignore
+        console.log('===子应用window', window.__WUJIE.proxy)
+        console.log('===HTML事件绑定', originHTMLClickEvent)
+        console.log('===attribute获取事件', originAttributeEventStr)
+    }
+    let result = '';
+    if (originAttributeEventStr) {
+        result = dealAttributesOCPatch(originAttributeEventStr)
+    } else if (typeof originHTMLClickEvent === 'function') {
+        result = dealHTMLOCPatch(originHTMLClickEvent.toString())
+    }
+    if (result) {
+        console.log("====执行字符串", result)
+        element.setAttribute('onclick', `(function(window) {
+            ${result}
+        })(window.__WUJIE.proxy)`)
+        console.log("===替换之后的结果", element.getAttribute('onclick'))
     }
 }