mirror of
https://github.com/morluto/rea.git
synced 2026-11-18 04:34:13 +00:00
refactor(javascript): centralize source coordinate operations
This commit is contained in:
1 parent
dd3497e133
commit
ddce4bb446
11 files changed
+78
-93
No files matched your search
@@ -1,3 +1,4 @@
|
||||
import { javascriptSourceRangeContains } from "./javascriptSourceCoordinates.js";
|
||||
import * as t from "@babel/types";
|
||||
|
||||
import type {
|
||||
@@ -270,7 +271,7 @@ const parameterAcceptsArgument = (
|
||||
if (!t.isFunction(node)) return false;
|
||||
const parameters = runtimeFunctionParameters(node);
|
||||
const parameterIndex = parameters.findIndex((parameter) =>
|
||||
rangeContains(range(parameter), location),
|
||||
javascriptSourceRangeContains(range(parameter), location),
|
||||
);
|
||||
if (parameterIndex === argumentIndex) return true;
|
||||
return (
|
||||
@@ -280,16 +281,5 @@ const parameterAcceptsArgument = (
|
||||
);
|
||||
};
|
||||
|
||||
const rangeContains = (
|
||||
outer: JavaScriptSemanticArgumentFlow["parameterLocation"],
|
||||
inner: JavaScriptSemanticArgumentFlow["parameterLocation"],
|
||||
): boolean =>
|
||||
(outer.start.line < inner.start.line ||
|
||||
(outer.start.line === inner.start.line &&
|
||||
outer.start.column <= inner.start.column)) &&
|
||||
(outer.end.line > inner.end.line ||
|
||||
(outer.end.line === inner.end.line &&
|
||||
outer.end.column >= inner.end.column));
|
||||
|
||||
const uniqueCallableIds = (values: readonly string[]): string[] =>
|
||||
[...new Set(values)].sort(compareUnicodeCodePoints);
|
||||
@@ -1,3 +1,4 @@
|
||||
import { javascriptSourceRangeKey } from "./javascriptSourceCoordinates.js";
|
||||
import * as t from "@babel/types";
|
||||
|
||||
import type {
|
||||
@@ -340,7 +341,7 @@ const indexReturnSites = (
|
||||
): ReadonlyMap<string, string> => {
|
||||
const output = new Map<string, string>();
|
||||
for (const site of callable.returnSites) {
|
||||
const key = returnSiteKey(site.location);
|
||||
const key = javascriptSourceRangeKey(site.location);
|
||||
if (!output.has(key)) output.set(key, site.returnSiteId);
|
||||
}
|
||||
return output;
|
||||
@@ -366,7 +367,7 @@ const createReturnSiteLookup = (
|
||||
returnSiteIds = indexReturnSites(callable);
|
||||
returnSiteIdsByCallable.set(callableId, returnSiteIds);
|
||||
}
|
||||
return returnSiteIds.get(returnSiteKey(location)) ?? null;
|
||||
return returnSiteIds.get(javascriptSourceRangeKey(location)) ?? null;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -381,11 +382,6 @@ const indexCallablesById = (
|
||||
return output;
|
||||
};
|
||||
|
||||
const returnSiteKey = (
|
||||
location: JavaScriptSemanticPromiseOperation["location"],
|
||||
): string =>
|
||||
`${location.start.line}:${location.start.column}:${location.end.line}:${location.end.column}`;
|
||||
|
||||
const promiseSources = (
|
||||
candidate: PromiseCandidate,
|
||||
candidateByNode: WeakMap<t.Node, PromiseCandidate>,
|
||||
|
||||
@@ -1,4 +1,28 @@
|
||||
import { z } from "zod";
|
||||
import type {
|
||||
JavaScriptSourcePoint,
|
||||
JavaScriptSourceRange,
|
||||
} from "./javascriptStaticAnalysisTypes.js";
|
||||
|
||||
/** Compare parser coordinates by line, then UTF-16 column. */
|
||||
export const compareJavaScriptSourcePoints = (
|
||||
left: JavaScriptSourcePoint,
|
||||
right: JavaScriptSourcePoint,
|
||||
): number => left.line - right.line || left.column - right.column;
|
||||
|
||||
/** Include equal endpoints without implying runtime reachability. */
|
||||
export const javascriptSourceRangeContains = (
|
||||
outer: JavaScriptSourceRange,
|
||||
inner: JavaScriptSourceRange,
|
||||
): boolean =>
|
||||
compareJavaScriptSourcePoints(outer.start, inner.start) <= 0 &&
|
||||
compareJavaScriptSourcePoints(outer.end, inner.end) >= 0;
|
||||
|
||||
/** Exact artifact-local coordinate key; callers supply the artifact identity. */
|
||||
export const javascriptSourceRangeKey = (
|
||||
range: JavaScriptSourceRange,
|
||||
): string =>
|
||||
`${range.start.line}:${range.start.column}-${range.end.line}:${range.end.column}`;
|
||||
|
||||
const sourcePointSchema = z.strictObject({
|
||||
line: z.number().int().min(1),
|
||||
@@ -9,11 +33,7 @@ const sourcePointSchema = z.strictObject({
|
||||
export const javascriptSourceRangeSchema = z
|
||||
.strictObject({ start: sourcePointSchema, end: sourcePointSchema })
|
||||
.superRefine((range, context) => {
|
||||
if (
|
||||
range.end.line < range.start.line ||
|
||||
(range.end.line === range.start.line &&
|
||||
range.end.column < range.start.column)
|
||||
)
|
||||
if (compareJavaScriptSourcePoints(range.end, range.start) < 0)
|
||||
context.addIssue({
|
||||
code: "custom",
|
||||
path: ["end"],
|
||||
|
||||
Reference in new issue
Block a user