feat(applet): add null-safety to inspector component data

vuejs · Jun 19, 2024 · 382402e · 382402e
1 parent 222da2e
commit 382402e
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 20 deletions.
diff --git a/packages/applet/src/modules/components/index.vue b/packages/applet/src/modules/components/index.vue
@@ -39,17 +39,20 @@ function dfs(node: { id: string, children?: { id: string }[] }, path: string[] =
   if (node.children?.length === 0)
     linkedList.push([...path])
 
-  node.children?.forEach((child) => {
-    dfs(child, path, linkedList)
-  })
+  if (Array.isArray(node.children)) {
+    node.children.forEach((child) => {
+      dfs(child, path, linkedList)
+    })
+  }
+
   path.pop()
   return linkedList
 }
 
 function flattenTreeNodes(tree: CustomInspectorNode[]) {
   const res: CustomInspectorNode[] = []
   const find = (treeNode: CustomInspectorNode[]) => {
-    treeNode.forEach((item) => {
+    treeNode?.forEach((item) => {
       res.push(item)
       if (item.children?.length)
         find(item.children)
@@ -61,7 +64,7 @@ function flattenTreeNodes(tree: CustomInspectorNode[]) {
 
 function getNodesByDepth(list: string[][], depth: number) {
   const nodes: string[] = []
-  list.forEach((item) => {
+  list?.forEach((item) => {
     nodes.push(...item.slice(0, depth + 1))
   })
   return [...new Set(nodes)]

diff --git a/packages/applet/src/modules/custom-inspector/components/state/Index.vue b/packages/applet/src/modules/custom-inspector/components/state/Index.vue
@@ -37,16 +37,19 @@ function dfs(node: { id: string, children?: { id: string }[] }, path: string[] =
   if (node.children?.length === 0)
     linkedList.push([...path])
 
-  node.children?.forEach((child) => {
-    dfs(child, path, linkedList)
-  })
+  if (Array.isArray(node.children)) {
+    node.children.forEach((child) => {
+      dfs(child, path, linkedList)
+    })
+  }
+
   path.pop()
   return linkedList
 }
 
 function getNodesByDepth(list: string[][], depth: number) {
   const nodes: string[] = []
-  list.forEach((item) => {
+  list?.forEach((item) => {
     nodes.push(...item.slice(0, depth + 1))
   })
   return [...new Set(nodes)]
@@ -55,7 +58,7 @@ function getNodesByDepth(list: string[][], depth: number) {
 function flattenTreeNodes(tree: CustomInspectorNode[]) {
   const res: CustomInspectorNode[] = []
   const find = (treeNode: CustomInspectorNode[]) => {
-    treeNode.forEach((item) => {
+    treeNode?.forEach((item) => {
       res.push(item)
       if (item.children?.length)
         find(item.children)

diff --git a/packages/applet/src/modules/pinia/components/store/Index.vue b/packages/applet/src/modules/pinia/components/store/Index.vue
@@ -32,16 +32,19 @@ function dfs(node: { id: string, children?: { id: string }[] }, path: string[] =
   if (node.children?.length === 0)
     linkedList.push([...path])
 
-  node.children?.forEach((child) => {
-    dfs(child, path, linkedList)
-  })
+  if (Array.isArray(node.children)) {
+    node.children.forEach((child) => {
+      dfs(child, path, linkedList)
+    })
+  }
+
   path.pop()
   return linkedList
 }
 
 function getNodesByDepth(list: string[][], depth: number) {
   const nodes: string[] = []
-  list.forEach((item) => {
+  list?.forEach((item) => {
     nodes.push(...item.slice(0, depth + 1))
   })
   return [...new Set(nodes)]
@@ -50,7 +53,7 @@ function getNodesByDepth(list: string[][], depth: number) {
 function flattenTreeNodes(tree: CustomInspectorNode[]) {
   const res: CustomInspectorNode[] = []
   const find = (treeNode: CustomInspectorNode[]) => {
-    treeNode.forEach((item) => {
+    treeNode?.forEach((item) => {
       res.push(item)
       if (item.children?.length)
         find(item.children)

diff --git a/packages/applet/src/modules/router/components/routes/Index.vue b/packages/applet/src/modules/router/components/routes/Index.vue
@@ -32,16 +32,19 @@ function dfs(node: { id: string, children?: { id: string }[] }, path: string[] =
   if (node.children?.length === 0)
     linkedList.push([...path])
 
-  node.children?.forEach((child) => {
-    dfs(child, path, linkedList)
-  })
+  if (Array.isArray(node.children)) {
+    node.children.forEach((child) => {
+      dfs(child, path, linkedList)
+    })
+  }
+
   path.pop()
   return linkedList
 }
 
 function getNodesByDepth(list: string[][], depth: number) {
   const nodes: string[] = []
-  list.forEach((item) => {
+  list?.forEach((item) => {
     nodes.push(...item.slice(0, depth + 1))
   })
   return [...new Set(nodes)]
@@ -50,7 +53,7 @@ function getNodesByDepth(list: string[][], depth: number) {
 function flattenTreeNodes(tree: CustomInspectorNode[]) {
   const res: CustomInspectorNode[] = []
   const find = (treeNode: CustomInspectorNode[]) => {
-    treeNode.forEach((item) => {
+    treeNode?.forEach((item) => {
       res.push(item)
       if (item.children?.length)
         find(item.children)