Skip to content

Commit 5f9dc0e

Browse files
authored
fix(js-x-ray): use new externalIdentifierLookup function for ast utilities (#371)
1 parent 8cecf23 commit 5f9dc0e

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

workspaces/js-x-ray/src/probes/isRequire/RequireCallExpressionWalker.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,11 @@ export class RequireCallExpressionWalker {
9696
): void {
9797
const nodeArguments = getCallExpressionArguments(
9898
node,
99-
{ tracer: this.tracer }
99+
{
100+
externalIdentifierLookup: (name) => this.tracer.literalIdentifiers.get(name) ?? null
101+
}
100102
);
103+
101104
if (nodeArguments !== null && nodeArguments.length > 0) {
102105
this.dependencies.add(
103106
Buffer.from(nodeArguments.at(0)!, "base64").toString()

workspaces/js-x-ray/src/probes/isRequire/isRequire.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,11 @@ function main(
113113

114114
// require(["ht", "tp"])
115115
case "ArrayExpression": {
116-
const value = [...arrayExpressionToString(arg, { tracer })]
116+
const value = [
117+
...arrayExpressionToString(arg, {
118+
externalIdentifierLookup: (name) => tracer.literalIdentifiers.get(name) ?? null
119+
})
120+
]
117121
.join("")
118122
.trim();
119123

@@ -139,7 +143,8 @@ function main(
139143

140144
try {
141145
const iter = concatBinaryExpression(arg, {
142-
tracer, stopOnUnsupportedNode: true
146+
externalIdentifierLookup: (name) => tracer.literalIdentifiers.get(name) ?? null,
147+
stopOnUnsupportedNode: true
143148
});
144149

145150
sourceFile.addDependency([...iter].join(""), node.loc);

workspaces/js-x-ray/src/probes/isSyncIO.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,12 @@ function validateNode(
4242
node: ESTree.Node,
4343
{ tracer }: SourceFile
4444
): [boolean, any?] {
45-
const id = getCallExpressionIdentifier(node, { tracer });
45+
const id = getCallExpressionIdentifier(
46+
node,
47+
{
48+
externalIdentifierLookup: (name) => tracer.literalIdentifiers.get(name) ?? null
49+
}
50+
);
4651
if (
4752
id === null ||
4853
!kTracedNodeCoreModules.some((moduleName) => tracer.importedModules.has(moduleName))

0 commit comments

Comments
 (0)