mirror of
https://github.com/morluto/rea.git
synced 2026-11-16 11:43:20 +00:00
* refactor: prune internal seams and preserve configuration ownership * fix(setup): keep YAML aliases and inherited registration settings on refresh - Reuse an unchanged YAML collection only while every alias in it still resolves after the edit; otherwise rebuild it so the alias becomes its value. A sibling anchor replaced or moved in the same refresh no longer leaves an unresolved alias in Hermes or Goose output. - Keep a connection selector whose existing value already chooses stdio (for example an inherited Hermes transport: stdio) instead of superseding it; remote selectors are still replaced. Explicit stdio selectors are therefore no longer rewritten (Kimi expectation updated). - When the whole Hermes registration is inherited through a merge, override it with that merge and write only the changed fields. * fix(setup): edit registration fields whose YAML key is an alias A key written as an alias to a string scalar (for example *field with field: &field env) was treated as a source-only key, so any change to its value was refused in Hermes and Goose. Resolve such keys to their string, keep the aliased spelling while its anchor survives the edit, and write the plain key when the same edit rebuilds the anchor. * test(process): bound cleanup-boundary waits and always release gates Both cancellation tests awaited a bare started promise and released their gates only on success, so a missed boundary waited for the outer deadline and could leave cleanup parked. Use awaitAcknowledgement and release and join the cleanup in finally. * fix(setup): repair only aliases an edit leaves unresolved Replace the pre-edit alias survival guess, which expanded aliases to sibling anchors that survive unchanged, with an exact repair: record what each alias in the replaced value resolves to, write the edit, then replace only aliases left without a preceding anchor by that value. - Keep an aliased key's source position, so its anchor stays ahead of later aliases. - Treat an aliased key as its string only when no other key in the map resolves to the same string; an ambiguous one stays guarded. - Override an inherited Hermes registration only when the requested entry keeps every inherited field, so an explicit replacement can drop remote selectors. * fix(setup): repair aliases whose binding an edit changes, keeping comments An alias whose own anchor was removed could resolve to an earlier anchor with the same name and silently change value. Record the node each alias resolved to and repair any alias that no longer resolves to that node. Carry the alias's comments and spacing onto the repaired value. * test(setup): split the Hermes anchor and merge refresh cases * fix(setup): refuse removing an overridden key its merge would restore The merge-retention check skipped keys the mapping also overrides, so dropping such a key (for example a remote url during an explicit stdio replacement) let the retained merge restore it. Check removal before skipping overridden keys, so the edit is refused with the existing message instead of producing a registration that cannot be applied.
219 lines
8.3 KiB
TypeScript
219 lines
8.3 KiB
TypeScript
import type * as t from "@babel/types";
|
|
import type { JavaScriptBundlerFactoryRoles } from "./javascriptBundlerFactoryRoles.js";
|
|
import type { JavaScriptOpenReceiverFact } from "./javascriptSemanticReceiverFacts.js";
|
|
import type { JavaScriptRpcScan } from "./javascriptRpcEndpoint.js";
|
|
import type { JavaScriptStaticPathIntrinsicQuery } from "./javascriptStaticAnalysisHelpers.js";
|
|
import type { JavaScriptExpressionShapeResolver } from "./javascriptSemanticExpressionShapes.js";
|
|
|
|
import type {
|
|
JavaScriptBundlerRegistration,
|
|
JavaScriptRolePath,
|
|
JavaScriptStaticAnalysis,
|
|
JavaScriptStaticEndpoint,
|
|
JavaScriptStaticReference,
|
|
JavaScriptStaticStorage,
|
|
} from "./javascriptStaticAnalysisTypes.js";
|
|
import type {
|
|
ElectronAppPathChangeFinding,
|
|
ElectronCallPath,
|
|
ElectronBrowserWindowFinding,
|
|
ElectronContextBridgeFinding,
|
|
ElectronIpcFinding,
|
|
ElectronNativeAddonBindingFinding,
|
|
ElectronSenderValidationFinding,
|
|
ElectronProtocolFinding,
|
|
ElectronDynamicCodeFinding,
|
|
ElectronUtilityProcessFinding,
|
|
ElectronWindowConstructor,
|
|
} from "./electronStaticAnalysisTypes.js";
|
|
import { JavaScriptModuleRangeIndex } from "./javascriptStaticAnalysisFindings.js";
|
|
|
|
/** Source offsets for one recovered bundle module factory. */
|
|
export interface JavaScriptModuleRange {
|
|
readonly start: number;
|
|
readonly end: number;
|
|
readonly key: string;
|
|
readonly runtime: string;
|
|
readonly requireName: string | null;
|
|
}
|
|
|
|
/** Static finding retained with its source offset until module attribution. */
|
|
export interface LocatedJavaScriptFinding<Value> {
|
|
readonly offset: number;
|
|
readonly value: Value;
|
|
}
|
|
|
|
/** Mutable collections used during one inert AST traversal. */
|
|
export interface JavaScriptAnalysisAccumulator {
|
|
readonly pendingBundlerExports: {
|
|
readonly factory: t.Node;
|
|
readonly roles: JavaScriptBundlerFactoryRoles;
|
|
readonly exports: string[];
|
|
}[];
|
|
/** Factory parameter defaults the bundler calling convention never runs. */
|
|
readonly unusedFactoryDefaults: Set<t.Node>;
|
|
readonly pendingModuleRequireCalls: (
|
|
| t.CallExpression
|
|
| t.OptionalCallExpression
|
|
| t.NewExpression
|
|
)[];
|
|
readonly appPathChanges: LocatedJavaScriptFinding<ElectronAppPathChangeFinding>[];
|
|
electronCallPaths?: readonly ElectronCallPath[];
|
|
electronCallPathLimits?: Set<"wrapper_visits" | "wrapper_depth">;
|
|
readonly references: LocatedJavaScriptFinding<JavaScriptStaticReference>[];
|
|
readonly endpoints: LocatedJavaScriptFinding<JavaScriptStaticEndpoint>[];
|
|
/** Target and receiver identities awaiting the shared mutation index. */
|
|
readonly pendingNetworkCalls: {
|
|
readonly node:
|
|
| t.CallExpression
|
|
| t.OptionalCallExpression
|
|
| t.NewExpression;
|
|
readonly name: string;
|
|
}[];
|
|
readonly pendingSqliteCalls: {
|
|
readonly node:
|
|
| t.CallExpression
|
|
| t.OptionalCallExpression
|
|
| t.NewExpression;
|
|
readonly name: string;
|
|
}[];
|
|
readonly storage: LocatedJavaScriptFinding<JavaScriptStaticStorage>[];
|
|
readonly roles: LocatedJavaScriptFinding<JavaScriptRolePath>[];
|
|
readonly sourceMaps: JavaScriptStaticAnalysis["source_map_urls"][number][];
|
|
readonly registrations: JavaScriptBundlerRegistration[];
|
|
readonly browserWindows: LocatedJavaScriptFinding<ElectronBrowserWindowFinding>[];
|
|
readonly pendingBrowserWindows: {
|
|
readonly node: t.NewExpression;
|
|
readonly constructor: ElectronWindowConstructor;
|
|
}[];
|
|
readonly contextBridgeApis: LocatedJavaScriptFinding<ElectronContextBridgeFinding>[];
|
|
readonly ipc: LocatedJavaScriptFinding<ElectronIpcFinding>[];
|
|
readonly senderValidations: LocatedJavaScriptFinding<ElectronSenderValidationFinding>[];
|
|
readonly utilityProcesses: LocatedJavaScriptFinding<ElectronUtilityProcessFinding>[];
|
|
readonly nativeAddonBindings: LocatedJavaScriptFinding<ElectronNativeAddonBindingFinding>[];
|
|
readonly pendingNativeAddonBindings: (
|
|
| t.VariableDeclarator
|
|
| t.AssignmentExpression
|
|
)[];
|
|
readonly protocols: LocatedJavaScriptFinding<ElectronProtocolFinding>[];
|
|
readonly dynamicCode: LocatedJavaScriptFinding<ElectronDynamicCodeFinding>[];
|
|
readonly pendingDynamicCode: (t.NewExpression | t.CallExpression)[];
|
|
readonly moduleRangeIndex: JavaScriptModuleRangeIndex;
|
|
/** Binding identities proven as third-parameter loaders of recovered factories. */
|
|
readonly factoryRequireBindingIds: Set<string>;
|
|
readonly seen: Set<string>;
|
|
bundlerExportHelpersObserved: boolean;
|
|
visitedNodes: number;
|
|
unknownFindings: number;
|
|
}
|
|
|
|
/** Shared source and accumulator for helper inspections. */
|
|
export interface JavaScriptFindingContext {
|
|
/** Native path/URL identities established by shared lexical and mutation owners. */
|
|
readonly pathIntrinsics?: JavaScriptStaticPathIntrinsicQuery;
|
|
readonly electronExportIntact?: (path: readonly string[]) => boolean;
|
|
readonly browserWindowReceiver?: (
|
|
node: t.Node,
|
|
site: t.Node,
|
|
suffix: readonly string[],
|
|
) =>
|
|
| {
|
|
readonly owner: t.NewExpression;
|
|
readonly path: readonly string[];
|
|
readonly authority: { readonly loader_authority?: "candidate" };
|
|
}
|
|
| undefined;
|
|
readonly xhrOpenRequest?: (node: t.Node) => boolean;
|
|
readonly rendererLoad?: (
|
|
callee: t.Node,
|
|
site: t.Node,
|
|
) => { readonly loader_authority?: "candidate" } | undefined;
|
|
readonly rpcScan: JavaScriptRpcScan;
|
|
/** Shared bounded argv/nullish argument shapes for optional-slot signatures. */
|
|
readonly expressionShapes: JavaScriptExpressionShapeResolver;
|
|
readonly source: string;
|
|
readonly accumulator: JavaScriptAnalysisAccumulator;
|
|
readonly vitePreloadDependencyTable: {
|
|
readonly helper: t.Node;
|
|
readonly dependencies: readonly (string | undefined)[];
|
|
} | null;
|
|
readonly openReceiverFacts?: ReadonlyMap<number, JavaScriptOpenReceiverFact>;
|
|
/** Proven Electron export path segments by root offset. */
|
|
readonly electronBindings?: ReadonlyMap<number, readonly string[]>;
|
|
/** Conditional Electron export paths, keyed by call/construction root. */
|
|
readonly electronCandidateBindings?: ReadonlyMap<number, readonly string[]>;
|
|
/** Normalized invocation target from the shared Electron and intrinsic owners. */
|
|
readonly electronInvocationPath?: (
|
|
node: t.CallExpression | t.OptionalCallExpression,
|
|
) => readonly string[] | undefined;
|
|
/** A possible shared-app mutation does not establish concrete API identity. */
|
|
readonly electronAppPathChangePossible?: (node: t.Node) => boolean;
|
|
readonly electronCandidateAppPathChangePossible?: (node: t.Node) => boolean;
|
|
}
|
|
|
|
/** Candidate import, require, worker, or service-worker reference. */
|
|
export interface JavaScriptReferenceInput {
|
|
readonly operation?: JavaScriptStaticReference["operation"];
|
|
readonly node: t.Node;
|
|
readonly kind: JavaScriptStaticReference["kind"];
|
|
readonly specifier: string | undefined;
|
|
readonly resolutionBasePath?: string;
|
|
readonly loader?: JavaScriptStaticReference["loader"];
|
|
readonly loaderAuthority?: "candidate";
|
|
}
|
|
|
|
/** Candidate route or network endpoint literal. */
|
|
export interface JavaScriptEndpointInput {
|
|
readonly node: t.Node;
|
|
readonly kind: JavaScriptStaticEndpoint["kind"];
|
|
readonly value: string;
|
|
readonly mechanism: string;
|
|
readonly interpretation?: "candidate";
|
|
readonly resolution?: "partial";
|
|
}
|
|
|
|
/** Values required to append one module-attributable static finding. */
|
|
export interface LocatedJavaScriptFindingInput<
|
|
Value extends { readonly module_key: string | null },
|
|
> {
|
|
readonly collection: LocatedJavaScriptFinding<Value>[];
|
|
readonly key: string;
|
|
readonly node: t.Node;
|
|
readonly value: Value;
|
|
}
|
|
|
|
/** Create isolated mutable state for one source analysis. */
|
|
export const createJavaScriptAnalysisAccumulator = (
|
|
sourceLength: number,
|
|
): JavaScriptAnalysisAccumulator => ({
|
|
pendingBundlerExports: [],
|
|
unusedFactoryDefaults: new Set(),
|
|
pendingModuleRequireCalls: [],
|
|
appPathChanges: [],
|
|
references: [],
|
|
endpoints: [],
|
|
pendingNetworkCalls: [],
|
|
storage: [],
|
|
pendingSqliteCalls: [],
|
|
roles: [],
|
|
sourceMaps: [],
|
|
registrations: [],
|
|
browserWindows: [],
|
|
pendingBrowserWindows: [],
|
|
contextBridgeApis: [],
|
|
ipc: [],
|
|
senderValidations: [],
|
|
utilityProcesses: [],
|
|
nativeAddonBindings: [],
|
|
pendingNativeAddonBindings: [],
|
|
protocols: [],
|
|
dynamicCode: [],
|
|
pendingDynamicCode: [],
|
|
moduleRangeIndex: new JavaScriptModuleRangeIndex(sourceLength),
|
|
factoryRequireBindingIds: new Set(),
|
|
seen: new Set(),
|
|
bundlerExportHelpersObserved: false,
|
|
visitedNodes: 0,
|
|
unknownFindings: 0,
|
|
});
|