deps: Simplify vendored types and reduce dependencies for orchestrion transforms

js/package.json

@@ -181,6 +181,7 @@
     "@types/async": "^3.2.24",
     "@types/cli-progress": "^3.11.5",
     "@types/cors": "^2.8.17",
+    "@types/esquery": "^1.5.4",
     "@types/express": "^5.0.0",
     "@types/http-errors": "^2.0.4",
     "@types/mustache": "^4.2.5",
@@ -210,7 +211,6 @@
   },
   "dependencies": {
     "@next/env": "^14.2.3",
-    "@types/estree": "^1.0.8",
     "@vercel/functions": "^1.0.2",
     "acorn": "^8.16.0",
     "acorn-import-attributes": "^1.9.5",

js/src/auto-instrumentations/orchestrion-js/transforms.ts

@@ -249,7 +249,7 @@ function wrap(
 
   block.body.unshift(...common);
 
-  esquery.query(block, "[id.name=__apm$wrapped]")[0].init = node;
+  (esquery.query(block, "[id.name=__apm$wrapped]")[0] as AnyNode).init = node;
 
   return block;
 }

js/src/auto-instrumentations/orchestrion-js/vendor-deps.d.ts

@@ -3,20 +3,15 @@
  * licensed under Apache-2.0. Modified by Braintrust.
  */
 
-declare module "esquery" {
-  const esquery: {
-    parse(selector: string): unknown;
-    traverse(
-      ast: unknown,
-      selector: unknown,
-      visitor: (node: any, parent: any, ancestry: any[]) => void,
-    ): void;
-    query(ast: unknown, selector: string): any[];
-  };
-  export = esquery;
-}
-
 declare module "semifies" {
   function semifies(version: string, range: string): boolean;
   export = semifies;
 }
+
+declare module "acorn-import-attributes" {
+  import type { Parser } from "acorn";
+
+  export function importAttributesOrAssertions(
+    BaseParser: typeof Parser,
+  ): typeof Parser;
+}

js/tests/typecheck.d.ts

@@ -1,3 +1,2 @@
-declare module "esquery";
 declare module "module-details-from-path";
 declare module "semifies";