diff --git a/js/package.json b/js/package.json index 573969f9f..f49db7201 100644 --- a/js/package.json +++ b/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", diff --git a/js/src/auto-instrumentations/orchestrion-js/transforms.ts b/js/src/auto-instrumentations/orchestrion-js/transforms.ts index 15d4bfd1b..92a1adfaa 100644 --- a/js/src/auto-instrumentations/orchestrion-js/transforms.ts +++ b/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; } diff --git a/js/src/auto-instrumentations/orchestrion-js/vendor-deps.d.ts b/js/src/auto-instrumentations/orchestrion-js/vendor-deps.d.ts index 2d0407a33..c510f8cc6 100644 --- a/js/src/auto-instrumentations/orchestrion-js/vendor-deps.d.ts +++ b/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; +} diff --git a/js/tests/typecheck.d.ts b/js/tests/typecheck.d.ts index 5cb6f1a5a..67e21c726 100644 --- a/js/tests/typecheck.d.ts +++ b/js/tests/typecheck.d.ts @@ -1,3 +1,2 @@ -declare module "esquery"; declare module "module-details-from-path"; declare module "semifies"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ce6d6ea1c..309371333 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -341,9 +341,6 @@ importers: '@next/env': specifier: ^14.2.3 version: 14.2.3 - '@types/estree': - specifier: ^1.0.8 - version: 1.0.9 '@vercel/functions': specifier: ^1.0.2 version: 1.0.2 @@ -450,6 +447,9 @@ importers: '@types/cors': specifier: ^2.8.17 version: 2.8.17 + '@types/esquery': + specifier: ^1.5.4 + version: 1.5.4 '@types/express': specifier: ^5.0.0 version: 5.0.1 @@ -1795,6 +1795,9 @@ packages: '@types/eslint@9.6.1': resolution: {integrity: sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==} + '@types/esquery@1.5.4': + resolution: {integrity: sha512-yYO4Q8H+KJHKW1rEeSzHxcZi90durqYgWVfnh5K6ZADVBjBv2e1NEveYX5yT2bffgN7RqzH3k9930m+i2yBoMA==} + '@types/estree@1.0.8': resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==} @@ -5519,6 +5522,10 @@ snapshots: '@types/estree': 1.0.9 '@types/json-schema': 7.0.15 + '@types/esquery@1.5.4': + dependencies: + '@types/estree': 1.0.9 + '@types/estree@1.0.8': {} '@types/estree@1.0.9': {}