mirror of
https://github.com/morluto/rea.git
synced 2026-11-06 14:56:32 +00:00
merge: reconcile concurrent main fixes with issue remediation
This commit is contained in:
commit
0c4bf68ce8
74 files changed
+3773
-562
No files matched your search
@@ -88,6 +88,7 @@ export const inspectCall = (
|
||||
node,
|
||||
kind: "require",
|
||||
specifier: requireCall.specifier,
|
||||
operation: requireCall.operation,
|
||||
...(requireCall.resolutionBasePath === undefined
|
||||
? {}
|
||||
: { resolutionBasePath: requireCall.resolutionBasePath }),
|
||||
@@ -253,6 +254,7 @@ const requireCallSpecifier = (
|
||||
resolveMemberChanged = false,
|
||||
): {
|
||||
readonly specifier: string | undefined;
|
||||
readonly operation: "load" | "resolve";
|
||||
readonly resolutionBasePath?: string;
|
||||
} | null => {
|
||||
const call = semanticRequireCallAt(
|
||||
@@ -267,9 +269,13 @@ const requireCallSpecifier = (
|
||||
!call.sourceRelative
|
||||
) {
|
||||
context.accumulator.unknownFindings += 1;
|
||||
return { specifier: undefined };
|
||||
return {
|
||||
specifier: undefined,
|
||||
operation: resolveMemberChanged ? "load" : call.operation,
|
||||
};
|
||||
}
|
||||
return {
|
||||
operation: call.operation,
|
||||
specifier: argumentValue(call.arguments?.[0]),
|
||||
...(call.sourceRelativePath === undefined
|
||||
? {}
|
||||
@@ -305,6 +311,7 @@ export const finishModuleRequireCalls = (
|
||||
node,
|
||||
kind: "require",
|
||||
specifier: call.specifier,
|
||||
operation: call.operation,
|
||||
...(call.resolutionBasePath === undefined
|
||||
? {}
|
||||
: { resolutionBasePath: call.resolutionBasePath }),
|
||||
@@ -934,10 +941,11 @@ export const addReference = (
|
||||
: { specifier, expression: null };
|
||||
addLocatedFinding(context, {
|
||||
collection: context.accumulator.references,
|
||||
key: `reference\0${input.kind}\0${reference.specifier ?? reference.expression}\0${input.resolutionBasePath ?? ""}`,
|
||||
key: `reference\0${input.kind}\0${input.operation ?? "load"}\0${reference.specifier ?? reference.expression}\0${input.resolutionBasePath ?? ""}`,
|
||||
node: input.node,
|
||||
value: {
|
||||
kind: input.kind,
|
||||
operation: input.operation ?? "load",
|
||||
...reference,
|
||||
...(input.resolutionBasePath === undefined
|
||||
? {}
|
||||
|
||||
Reference in new issue
Block a user