refactor: use node lookup method instead of custom code

src/manifest/fileReferences.ts

@@ -1,7 +1,7 @@
 import { Node } from 'jsonc-parser';
 import { Range, TextDocument } from 'vscode';
 
-import { getPluginsArrayNode, rangeForOffset } from './utils/iteratePlugins';
+import { findPluginsNode, rangeForOffset } from './utils/iteratePlugins';
 
 function rangeForMatch(document: TextDocument, match: { index: number; length: number }) {
   return new Range(
@@ -15,7 +15,7 @@ export function iterateFileReferences(
   node: Node | undefined,
   callback: (props: { fileReference: string; range: Range; match: RegExpMatchArray }) => void
 ) {
-  const pluginsNode = getPluginsArrayNode(node);
+  const pluginsNode = findPluginsNode(node);
   const pluginsRange = pluginsNode ? rangeForOffset(document, pluginsNode) : null;
 
   const matches = document.getText().matchAll(/"(\.\/.*)"/g);

src/manifest/utils/iteratePlugins.ts

@@ -1,4 +1,4 @@
-import { Node } from 'jsonc-parser';
+import { findNodeAtLocation, Node } from 'jsonc-parser';
 import { Position, Range, TextDocument } from 'vscode';
 
 import { parseExpoJson } from './parseExpoJson';
@@ -20,23 +20,12 @@ export interface PluginRange {
   props?: JsonRange;
 }
 
-export function getPluginsArrayNode(appJson: Node | undefined) {
-  if (appJson?.children) {
-    for (const child of appJson.children) {
-      const children = child.children;
-      if (children) {
-        if (children && children.length === 2 && isPlugins(children[0].value)) {
-          return children[1];
-        }
-      }
-    }
-  }
-
-  return null;
+export function findPluginsNode(appJson: Node | undefined) {
+  return appJson ? findNodeAtLocation(appJson, ['plugins']) : null;
 }
 
 function iteratePlugins(appJson: Node | undefined, iterator: (node: Node) => void) {
-  const pluginsNode = getPluginsArrayNode(appJson);
+  const pluginsNode = findPluginsNode(appJson);
 
   if (pluginsNode?.children) {
     pluginsNode.children.forEach(iterator);
@@ -113,15 +102,11 @@ export function parseSourceRanges(text: string): { appJson?: Node; plugins: Plug
 
 export function positionIsInPlugins(document: TextDocument, position: Position) {
   const { node } = parseExpoJson(document.getText());
-  const pluginsNode = getPluginsArrayNode(node);
+  const pluginsNode = findPluginsNode(node);
   if (pluginsNode) {
     const range = rangeForOffset(document, pluginsNode);
     return range.contains(position);
   }
 
   return false;
 }
-
-function isPlugins(value: string) {
-  return value === 'plugins';
-}

src/manifest/utils/parseExpoJson.ts

@@ -1,4 +1,4 @@
-import { Node, ParseError, parseTree } from 'jsonc-parser';
+import { Node, ParseError, parseTree, findNodeAtLocation } from 'jsonc-parser';
 import path from 'path';
 import { TextDocument } from 'vscode';
 
@@ -19,27 +19,21 @@ export function parseExpoJson(text: string): { node: Node | undefined; errors: P
   if (text in expoJsonCache) {
     return { node: expoJsonCache[text], errors: [] };
   }
+
   const errors: ParseError[] = [];
-  function findUpExpoObject(node: Node | undefined): Node | undefined {
-    if (node?.children) {
-      for (const child of node.children) {
-        if (
-          child.type === 'property' &&
-          child.children?.[0]?.value === 'expo' &&
-          child.children?.[1]?.type === 'object'
-        ) {
-          return findUpExpoObject(child.children[1]);
-        }
-      }
-    }
-    return node;
+  const tree = parseTree(text, errors);
+
+  if (!tree) {
+    return { errors, node: undefined };
   }
-  // Ensure we get the expo object if it exists.
-  const node = findUpExpoObject(parseTree(text, errors));
-  if (node) {
+
+  const expo = findNodeAtLocation(tree, ['expo']);
+
+  if (expo) {
     expoJsonCache = {
-      [text]: node,
+      [text]: expo,
     };
   }
-  return { node, errors };
+
+  return { errors, node: expo };
 }