diff --git a/src/domain/javascriptSemanticAsyncEffects.ts b/src/domain/javascriptSemanticAsyncEffects.ts index 1f765f80f..dd9098967 100644 --- a/src/domain/javascriptSemanticAsyncEffects.ts +++ b/src/domain/javascriptSemanticAsyncEffects.ts @@ -17,6 +17,10 @@ import { } from "./javascriptSemanticState.js"; import { traverseJavaScriptAst } from "./javascriptSemanticTraversal.js"; import { range } from "./javascriptStaticAnalysisHelpers.js"; +import { + dataEffectLiteralString, + dataEffectMemberCallee, +} from "./javascriptSemanticDataEffectHelpers.js"; const EVENT_REGISTER_METHODS = [ "on", @@ -106,7 +110,7 @@ const collectEvent = ( state: JavaScriptSemanticAnalysisState, output: JavaScriptSemanticEventOperation[], ): void => { - const member = memberCallee(node); + const member = dataEffectMemberCallee(node); if (member === null) return; const method = EVENT_METHODS.find( (candidate) => @@ -118,7 +122,7 @@ const collectEvent = ( const eventArgument = node.arguments[0]; const listenerArgument = node.arguments[1]; const emitter = emitterIdentity(member.object, state); - const eventName = literalString(eventArgument); + const eventName = dataEffectLiteralString(eventArgument); output.push({ eventId: `event:${kind}:${String(node.start ?? -1)}:${String(node.end ?? -1)}`, kind, @@ -333,20 +337,6 @@ const bindingId = ( ? (resolveSemanticBindingState(state, node, node.name)?.bindingId ?? null) : null; -const literalString = ( - node: - | t.Expression - | t.SpreadElement - | t.JSXNamespacedName - | t.ArgumentPlaceholder - | undefined, -): string | null => { - if (t.isStringLiteral(node)) return node.value; - if (t.isTemplateLiteral(node) && node.expressions.length === 0) - return node.quasis[0]?.value.cooked ?? node.quasis[0]?.value.raw ?? null; - return null; -}; - const timerDelay = (candidate: TimerCandidate): number | null => { if (candidate.kind !== "schedule" || candidate.method === "setImmediate") return null; @@ -356,10 +346,3 @@ const timerDelay = (candidate: TimerCandidate): number | null => { const timerId = (candidate: TimerCandidate): string => `timer:${candidate.kind}:${String(candidate.node.start ?? -1)}:${String(candidate.node.end ?? -1)}`; - -const memberCallee = ( - node: t.CallExpression | t.OptionalCallExpression, -): t.MemberExpression | t.OptionalMemberExpression | null => - t.isMemberExpression(node.callee) || t.isOptionalMemberExpression(node.callee) - ? node.callee - : null; diff --git a/src/domain/javascriptSemanticChildProcesses.ts b/src/domain/javascriptSemanticChildProcesses.ts index 4565c04ff..c1d59f1df 100644 --- a/src/domain/javascriptSemanticChildProcesses.ts +++ b/src/domain/javascriptSemanticChildProcesses.ts @@ -20,6 +20,10 @@ import { propertyName, range, } from "./javascriptStaticAnalysisHelpers.js"; +import { + dataEffectLiteralString, + dataEffectMemberCallee, +} from "./javascriptSemanticDataEffectHelpers.js"; const CHILD_PROCESS_METHODS = ["spawn", "exec", "execFile", "fork"] as const; const CHILD_LISTENER_METHODS = ["on", "once", "addListener"] as const; @@ -98,7 +102,7 @@ const immutableSpawn = ( candidate: SpawnCandidate, ): JavaScriptSemanticChildProcessSpawn => { const options = spawnOptions(candidate); - const command = literalString(candidate.node.arguments[0]); + const command = dataEffectLiteralString(candidate.node.arguments[0]); return { processId: spawnId(candidate), method: candidate.method, @@ -162,7 +166,7 @@ const childInteraction = ( context: ChildInteractionContext, ): JavaScriptSemanticChildProcessInteraction | null => { const { state, spawnByNode, spawnsByBinding } = context; - const member = memberCallee(node); + const member = dataEffectMemberCallee(node); if (member === null) return null; const method = semanticStaticPropertyName(member.property, member.computed); const binding = objectBinding(member.object, state); @@ -190,7 +194,7 @@ const childInteraction = ( eventName: kind === "listener" ? eventName : null, signalName: kind === "signal" - ? (literalString(node.arguments[0]) ?? "SIGTERM") + ? (dataEffectLiteralString(node.arguments[0]) ?? "SIGTERM") : null, listenerLocation: kind === "listener" && t.isNode(listener) ? range(listener) : null, @@ -216,7 +220,7 @@ const classifyInteraction = ( const listenerMethod = CHILD_LISTENER_METHODS.find( (candidate) => candidate === method, ); - const eventName = literalString(argument); + const eventName = dataEffectLiteralString(argument); return listenerMethod !== undefined && (eventName === "exit" || eventName === "error") ? { kind: "listener", interactionMethod: listenerMethod, eventName } @@ -351,20 +355,6 @@ const assignedBindingId = ( ?.bindingId ?? null); }; -const literalString = ( - node: - | t.Expression - | t.SpreadElement - | t.JSXNamespacedName - | t.ArgumentPlaceholder - | undefined, -): string | null => { - if (t.isStringLiteral(node)) return node.value; - if (t.isTemplateLiteral(node) && node.expressions.length === 0) - return node.quasis[0]?.value.cooked ?? node.quasis[0]?.value.raw ?? null; - return null; -}; - const popCallable = (node: t.Node, stack: string[]): void => { const callableId = semanticCallableIdForNode(node); if (callableId !== null && stack.at(-1) === callableId) stack.pop(); @@ -372,10 +362,3 @@ const popCallable = (node: t.Node, stack: string[]): void => { const spawnId = (candidate: SpawnCandidate): string => `child:spawn:${String(candidate.node.start ?? -1)}:${String(candidate.node.end ?? -1)}`; - -const memberCallee = ( - node: t.CallExpression | t.OptionalCallExpression, -): t.MemberExpression | t.OptionalMemberExpression | null => - t.isMemberExpression(node.callee) || t.isOptionalMemberExpression(node.callee) - ? node.callee - : null; diff --git a/src/domain/javascriptSemanticPromises.ts b/src/domain/javascriptSemanticPromises.ts index 98e022f5f..55edcac4e 100644 --- a/src/domain/javascriptSemanticPromises.ts +++ b/src/domain/javascriptSemanticPromises.ts @@ -19,6 +19,7 @@ import { range, sourceRangesEqual, } from "./javascriptStaticAnalysisHelpers.js"; +import { dataEffectMemberCallee } from "./javascriptSemanticDataEffectHelpers.js"; type PromiseMethod = JavaScriptSemanticPromiseOperation["method"]; type PromiseKind = JavaScriptSemanticPromiseOperation["kind"]; @@ -139,7 +140,7 @@ const promiseCandidateDetails = ( ) return { kind: "constructor", method: "new" }; if (t.isCallExpression(node) || t.isOptionalCallExpression(node)) { - const member = memberCallee(node); + const member = dataEffectMemberCallee(node); if (member === null) return null; const method = semanticStaticPropertyName(member.property, member.computed); if ( @@ -174,13 +175,6 @@ const isPromiseProducer = ( const semanticPromiseId = (kind: PromiseKind, node: t.Node): string => `promise:${kind}:${String(node.start ?? -1)}:${String(node.end ?? -1)}`; -const memberCallee = ( - node: t.CallExpression | t.OptionalCallExpression, -): t.MemberExpression | t.OptionalMemberExpression | null => - t.isMemberExpression(node.callee) || t.isOptionalMemberExpression(node.callee) - ? node.callee - : null; - const promiseOwnership = ( candidate: PromiseCandidate, candidateByNode: WeakMap, @@ -285,7 +279,7 @@ const outerConsumesCandidate = ( outer.kind === "chain" && (t.isCallExpression(outer.node) || t.isOptionalCallExpression(outer.node)) ) { - const member = memberCallee(outer.node); + const member = dataEffectMemberCallee(outer.node); return member !== null && containsNode(member.object, candidate.node); } if ( @@ -338,7 +332,7 @@ const promiseSources = ( const member = t.isCallExpression(candidate.node) || t.isOptionalCallExpression(candidate.node) - ? memberCallee(candidate.node) + ? dataEffectMemberCallee(candidate.node) : null; return member === null ? unresolvedPromise() diff --git a/src/domain/javascriptSemanticResources.ts b/src/domain/javascriptSemanticResources.ts index b611e65fc..c7c9bc87e 100644 --- a/src/domain/javascriptSemanticResources.ts +++ b/src/domain/javascriptSemanticResources.ts @@ -11,6 +11,7 @@ import { type JavaScriptSemanticBindingState, } from "./javascriptSemanticState.js"; import { + dataEffectMemberCallee, outerDataEffectBinding, traverseDataEffects, type DataEffectTraversalContext, @@ -87,7 +88,7 @@ const collectReleases = ( const output: JavaScriptSemanticResourceOperation[] = []; traverseDataEffects(program, context, (node) => { if (!t.isCallExpression(node) && !t.isOptionalCallExpression(node)) return; - const member = memberCallee(node); + const member = dataEffectMemberCallee(node); if (member === null || !t.isIdentifier(member.object)) return; const method = RELEASE_METHODS.find( (candidate) => @@ -189,10 +190,3 @@ const resourceModule = (specifier: string): boolean => const resourceCandidateId = (candidate: ResourceCandidate): string => `resource:acquire:${String(candidate.node.start ?? -1)}:${String(candidate.node.end ?? -1)}`; - -const memberCallee = ( - node: t.CallExpression | t.OptionalCallExpression, -): t.MemberExpression | t.OptionalMemberExpression | null => - t.isMemberExpression(node.callee) || t.isOptionalMemberExpression(node.callee) - ? node.callee - : null;