Merge branch 'master' of github.com:chenweiyi/vue-hook-optimizer

zcf0508 · Sep 14, 2023 · 963a24f · 963a24f
2 parents 0e3812a + 9e8ac17
commit 963a24f
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-hook-optimizer",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "description": "a tool that helps refactor and optimize hook abstractions in Vue components",
   "packageManager": "[email protected]",
   "homepage": "https://github.com/zcf0508/vue-hook-optimizer",

diff --git a/packages/playground/package.json b/packages/playground/package.json
@@ -24,5 +24,5 @@
     "nuxt": "^3.6.5",
     "unocss": "^0.54.2"
   },
-  "version": "0.0.25"
+  "version": "0.0.26"
 }
diff --git a/packages/playground/server/api/analyze.ts b/packages/playground/server/api/analyze.ts
@@ -24,7 +24,10 @@ export default defineEventHandler(async (ctx) => {
       graph = analyzeSetupScript(sfc.descriptor.scriptSetup?.content!);
     }
     else if(sfc.descriptor.script?.content) {
-      if (sfc.descriptor.script.lang === 'tsx' || sfc.descriptor.script.lang === 'jsx') {
+      if (
+        (sfc.descriptor.script.lang === 'tsx' || sfc.descriptor.script.lang === 'jsx') 
+        && !sfc.descriptor.template?.content
+      ) {
         const res = await analyzeTsx(sfc.descriptor.script?.content!);
         graph = res.graph;
         nodes = res.nodesUsedInTemplate;

diff --git a/packages/vscode/package.json b/packages/vscode/package.json
@@ -2,7 +2,7 @@
   "publisher": "zcf0508",
   "name": "vue-hook-optimizer-ext",
   "displayName": "vue-hook-optimizer",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "private": true,
   "packageManager": "[email protected]",
   "description": "",

diff --git a/packages/vscode/src/analyze.ts b/packages/vscode/src/analyze.ts
@@ -25,7 +25,10 @@ export async function analyze(code: string) {
     );
   }
   else if(sfc.descriptor.script?.content) {
-    if (sfc.descriptor.script.lang === 'tsx' || sfc.descriptor.script.lang === 'jsx') {
+    if (
+      (sfc.descriptor.script.lang === 'tsx' || sfc.descriptor.script.lang === 'jsx')
+      && !sfc.descriptor.template?.content
+    ) {
       const res = await analyzeTsx(sfc.descriptor.script?.content!,
         (sfc.descriptor.script.loc.start.line || 1) - 1,
       );

diff --git a/src/analyze/options.ts b/src/analyze/options.ts
@@ -16,6 +16,7 @@ export function analyze(
   const ast = babelParse(content, { sourceType: 'module',
     plugins: [
       'typescript',
+      'jsx',
     ],
   });
 
@@ -166,12 +167,21 @@ export function analyze(
             // 3 filter data by return
             traverse(setupNode, {
               ReturnStatement(path2) {
+                // only process return in setupNode scope
+                if(path2.scope !== path1.scope) {
+                  return; 
+                }
+
                 if(path2.node.argument?.type === 'ObjectExpression') {
                   const returnNode = path2.node.argument;
                   traverse(returnNode, {
                     ObjectProperty(path3) {
                       if(path3.parent === returnNode) {
-                        if(path3.node.key.type === 'Identifier' && path3.node.value.type === 'Identifier') {
+                        if(
+                          path3.node.key.type === 'Identifier' 
+                          && path3.node.value.type === 'Identifier'
+                          && tempNodes.has(path3.node.value.name)
+                        ) {
                           const valName = path3.node.value.name;
                           if(!graph.nodes.has(valName)) {
                             graph.nodes.add(valName);
@@ -234,7 +244,7 @@ export function analyze(
                     },
                   }, path2.scope, path2);
                 } else {
-                  console.warn('setup return type is not ObjectExpression');
+                  console.warn(`setup return type(${path2.node.argument?.type}) is not ObjectExpression`);
                 }
               },
             }, path1.scope, path1);

diff --git a/src/analyze/setupScript.ts b/src/analyze/setupScript.ts
@@ -514,6 +514,7 @@ export function analyze(
   const ast = babelParse(content, { sourceType: 'module',
     plugins: [
       'typescript',
+      'jsx',
     ],
   });
 

diff --git a/src/analyze/template.ts b/src/analyze/template.ts
@@ -44,6 +44,15 @@ export function analyze(
         }
       }
     },
+    // component
+    CallExpression(path) {
+      if(path.node.callee.type === 'Identifier' && path.node.callee.name === '_resolveComponent') {
+        if(path.node.arguments[0].type === 'StringLiteral') {
+          const name = path.node.arguments[0].value; 
+          name && nodes.add(name);
+        }
+      }
+    },
   });
 
   return nodes;

diff --git a/test/options-setup/TestComponent.graph.ts b/test/options-setup/TestComponent.graph.ts
@@ -2,23 +2,25 @@ import { NodeType, TypedNode } from '@/analyze/utils';
 
 const edges = new Map<TypedNode, Set<TypedNode>>();
 
-const number: TypedNode = {label: 'number', type: NodeType.var, info: {line: 65, column: 6}};
-const count: TypedNode = {label: 'count', type: NodeType.var, info: {line: 67, column: 10}};
-const plus: TypedNode = {label: 'plus', type: NodeType.fun, info: {line: 70, column: 6}};
-const add: TypedNode = {label: 'add', type: NodeType.fun, info: {line: 74, column: 6}};
-const a: TypedNode = {label: 'a', type: NodeType.var, info: {line: 81, column: 10}};
-const b: TypedNode = {label: 'b', type: NodeType.var, info: {line: 82, column: 10}};
-const c: TypedNode = {label: 'c', type: NodeType.var, info: {line: 87, column: 6}};
+const number: TypedNode = {label: 'number', type: NodeType.var, info: {line: 66, column: 6}};
+const count: TypedNode = {label: 'count', type: NodeType.var, info: {line: 68, column: 10}};
+const plus: TypedNode = {label: 'plus', type: NodeType.fun, info: {line: 71, column: 6}};
+const add: TypedNode = {label: 'add', type: NodeType.fun, info: {line: 75, column: 6}};
+// const a: TypedNode = {label: 'a', type: NodeType.var, info: {line: 82, column: 10}};
+const b: TypedNode = {label: 'b', type: NodeType.var, info: {line: 83, column: 10}};
+const c: TypedNode = {label: 'c', type: NodeType.var, info: {line: 89, column: 6}};
+const ComponentD: TypedNode = { label: 'ComponentD', type: NodeType.var, info: {line: 84, column: 10}};
 
 edges.set(number, new Set([]));
 edges.set(b, new Set([count]));
 edges.set(c, new Set([count]));
 edges.set(count, new Set([]));
 edges.set(plus, new Set([plus]));
 edges.set(add, new Set([number, add, count]));
+edges.set(ComponentD, new Set([]));
 // edges.set(a, new Set([count]));
 
 export const graph = {
-  nodes: new Set([number, b, count, c, plus, add]),
+  nodes: new Set([number, b, count, c, plus, add, ComponentD]),
   edges,
 };
diff --git a/test/options-setup/TestComponent.nodes.ts b/test/options-setup/TestComponent.nodes.ts
@@ -1 +1 @@
-export const nodes = new Set(['msg', 'plus', 'count', 'number', 'add']);
+export const nodes = new Set(['msg', 'plus', 'count', 'number', 'add', 'ComponentD']);
diff --git a/test/options-setup/TestComponent.vue b/test/options-setup/TestComponent.vue
@@ -50,9 +50,10 @@
     Edit
     <code>components/HelloWorld.vue</code> to test hot module replacement.
   </p>
+  <ComponentD></ComponentD>
 </template>
 
-<script lang="ts">
+<script lang="tsx">
 export default {
   name: 'TestComponent',
   props: {
@@ -81,13 +82,16 @@ export default {
 
     const a = {count};
     const b = count;
+    const ComponentD = (<>hello d</>)
 
     return {
       ...toRefs(data),
       b,
       c: count,
       ...methods,
+      ComponentD,
     }
+    
   }
 }
 </script>

diff --git a/tsconfig.json b/tsconfig.json
@@ -15,6 +15,7 @@
     "resolveJsonModule": true,
     "skipLibCheck": true,
     "skipDefaultLibCheck": true,
+    "jsx": "preserve",
     "baseUrl": "./",
     "paths": {
       "@/*": [