diff --git a/src/domain/javascript/javascriptApplicationAnalysis.ts b/src/domain/javascript/javascriptApplicationAnalysis.ts index 12adcafe0b..aab8c9029b 100644 --- a/src/domain/javascript/javascriptApplicationAnalysis.ts +++ b/src/domain/javascript/javascriptApplicationAnalysis.ts @@ -56,8 +56,7 @@ const electronBoundarySummarySchema = z.strictObject({ resolved_utility_entrypoints: countSchema, native_addon_bindings: countSchema, resolved_native_addon_bindings: countSchema, - /** Absent in evidence produced before protocol registrations were reported. */ - protocol_registrations: countSchema.exactOptional(), + protocol_registrations: countSchema, /** `node:vm` compilations whose logic may live in an opaque bytecode cache. */ v8_cached_data_compilations: countSchema.exactOptional(), /** @@ -82,10 +81,7 @@ const reconstructionStatisticsSchema = z.strictObject({ text_bytes_read: countSchema, invalid_utf8_files: countSchema, parsed_javascript_files: countSchema, - // Old saved evidence predates this field: absence must stay unknown, not - // become a measured zero. The producer always writes it (required by the - // application-layer result type); readers treat a missing value as unknown. - skipped_javascript_files: countSchema.exactOptional(), + skipped_javascript_files: countSchema, visited_ast_nodes: countSchema, findings: countSchema, modules: countSchema, diff --git a/src/domain/javascript/javascriptApplicationAnalysisSteps.test.ts b/src/domain/javascript/javascriptApplicationAnalysisSteps.test.ts index 38425345c7..a6b89df361 100644 --- a/src/domain/javascript/javascriptApplicationAnalysisSteps.test.ts +++ b/src/domain/javascript/javascriptApplicationAnalysisSteps.test.ts @@ -102,7 +102,6 @@ describe("immutable JavaScript result reuse", () => { it("borrows imported immutable results only after complete format validation", () => { const input = example(); - delete input.statistics.skipped_javascript_files; freezeJsonSnapshot(input); const result = complete( parseOwnedJavaScriptApplicationAnalysisSteps(input), @@ -111,7 +110,6 @@ describe("immutable JavaScript result reuse", () => { expect(result).toEqual( javascriptApplicationAnalysisResultSchema.parse(input), ); - expect(result.statistics).not.toHaveProperty("skipped_javascript_files"); expect(complete(parseOwnedJavaScriptApplicationAnalysisSteps(input))).toBe( input, ); @@ -426,19 +424,17 @@ describe("graphs transferred to their sealing steps", () => { }); }); -describe("skipped_javascript_files backward compatibility", () => { - it("preserves omission for saved evidence that predates the skipped counter", () => { - const legacy = structuredClone( +describe("skipped_javascript_files", () => { + it("refuses a result without the skipped counter", () => { + const withoutCounter = structuredClone( JAVASCRIPT_APPLICATION_EVIDENCE_EXAMPLE.normalized_result, ) as Record; - const statistics = legacy.statistics as Record; + const statistics = withoutCounter.statistics as Record; delete statistics.skipped_javascript_files; - const result = javascriptApplicationAnalysisResultSchema.parse(legacy); - // A pre-change result can contain the very resource-skipped files this - // field reports, but it has no counter: unknown must not become a - // measured zero that comparisons would treat as "nothing skipped". - expect("skipped_javascript_files" in result.statistics).toBe(false); - expect(result.statistics.skipped_javascript_files).toBeUndefined(); + expect( + javascriptApplicationAnalysisResultSchema.safeParse(withoutCounter).error + ?.issues[0]?.path, + ).toEqual(["statistics", "skipped_javascript_files"]); }); it("keeps the producer-written skipped count in current evidence", () => { @@ -452,14 +448,15 @@ describe("skipped_javascript_files backward compatibility", () => { }); }); -describe("Electron boundary summary compatibility", () => { - it("reads results produced before protocol registrations were counted", () => { +describe("Electron boundary summary", () => { + it("refuses a summary without the protocol registration count", () => { const current = example(); const { protocol_registrations: _count, ...summary } = current.summary; - const parsed = javascriptApplicationAnalysisResultSchema.parse({ - ...current, - summary, - }); - expect(parsed.summary).not.toHaveProperty("protocol_registrations"); + expect( + javascriptApplicationAnalysisResultSchema.safeParse({ + ...current, + summary, + }).error?.issues[0]?.path, + ).toEqual(["summary", "protocol_registrations"]); }); }); diff --git a/src/domain/webBundleAnalysis.ts b/src/domain/webBundleAnalysis.ts index 4da6dfb5cd..29ff270d0e 100644 --- a/src/domain/webBundleAnalysis.ts +++ b/src/domain/webBundleAnalysis.ts @@ -267,14 +267,14 @@ const findingSchema = z.object({ }); const originalSourceSchema = z.object({ - source_index: z.int().min(0).optional(), - declaration_index: z.int().min(0).optional(), + source_index: z.int().min(0), + declaration_index: z.int().min(0), source: z.string().nullable(), artifact: webTextArtifactSchema.nullable(), }); const originalModuleEdgeSchema = z.object({ - // Historical observations omit this link to original_sources declarations. - declaration_index: z.int().min(0).optional(), + /** The original_sources declaration this edge was read from. */ + declaration_index: z.int().min(0), from_source: z.string(), kind: z.enum(["static_import", "dynamic_import", "require"]), specifier: z.string(), diff --git a/tests/boundary/browser/webSourceMapFetcher.test.ts b/tests/boundary/browser/webSourceMapFetcher.test.ts index b6413bc39e..f7e7e96cce 100644 --- a/tests/boundary/browser/webSourceMapFetcher.test.ts +++ b/tests/boundary/browser/webSourceMapFetcher.test.ts @@ -109,7 +109,7 @@ it.each(["regular", "indexed"])( })), ); expect(webSourceMapsSchema.parse(result)).toEqual(result); - const historical = { + expectInvalidSourceMaps({ ...result, items: [ { @@ -119,8 +119,21 @@ it.each(["regular", "indexed"])( ), }, ], - }; - expect(webSourceMapsSchema.parse(historical)).toEqual(historical); + }); + for (const omit of ["source_index", "declaration_index"] as const) + expectInvalidSourceMaps({ + ...result, + items: [ + { + ...item, + original_sources: item.original_sources.map((source) => + Object.fromEntries( + Object.entries(source).filter(([key]) => key !== omit), + ), + ), + }, + ], + }); expectInvalidSourceMaps({ ...result, items: [