Flatten trigger specs

Author: apasel422

ts/src/flexible-event/main.ts

@@ -113,12 +113,10 @@ if (options.json_file !== undefined) {
       new Config(
         source.maxEventLevelReports,
         source.attributionScopes,
-        source.triggerSpecs.flatMap((spec) =>
-          new Array<PerTriggerDataConfig>(spec.triggerData.size).fill(
-            new PerTriggerDataConfig(
-              spec.eventReportWindows.endTimes.length,
-              spec.summaryBuckets.length
-            )
+        new Array<PerTriggerDataConfig>(source.triggerData.size).fill(
+          new PerTriggerDataConfig(
+            source.eventReportWindows.endTimes.length,
+            source.maxEventLevelReports
           )
         )
       )

ts/src/header-validator/source.test.ts

@@ -1,7 +1,7 @@
 import { SourceType } from '../source-type'
 import * as vsv from '../vendor-specific-values'
 import { Maybe } from './maybe'
-import { Source, SummaryOperator, TriggerDataMatching } from './source'
+import { Source, TriggerDataMatching } from './source'
 import * as testutil from './util.test'
 import * as jsontest from './validate-json.test'
 import * as source from './validate-source'
@@ -69,17 +69,11 @@ const testCases: TestCase[] = [
       priority: 2n,
       sourceEventId: 3n,
       maxEventLevelReports: 2,
-      triggerSpecs: [
-        {
-          eventReportWindows: {
-            startTime: 0,
-            endTimes: [3601],
-          },
-          summaryBuckets: [1, 2],
-          summaryOperator: SummaryOperator.count,
-          triggerData: new Set([0, 1, 2, 3, 4, 5, 6, 7]),
-        },
-      ],
+      eventReportWindows: {
+        startTime: 0,
+        endTimes: [3601],
+      },
+      triggerData: new Set([0, 1, 2, 3, 4, 5, 6, 7]),
       triggerDataMatching: TriggerDataMatching.modulus,
       aggregatableDebugReporting: {
         budget: 1234,

ts/src/header-validator/source.ts

@@ -10,18 +10,6 @@ export type FilterData = Map<string, Set<string>>
 export type AggregationKeys = Map<string, bigint>
 export type NamedBudgets = Map<string, number>
 
-export enum SummaryOperator {
-  count = 'count',
-  value_sum = 'value_sum',
-}
-
-export type TriggerSpec = {
-  eventReportWindows: EventReportWindows
-  summaryBuckets: number[]
-  summaryOperator: SummaryOperator
-  triggerData: Set<number>
-}
-
 export type SourceAggregatableDebugReportingConfig =
   reg.AggregatableDebugReportingConfig & {
     budget: number
@@ -49,7 +37,8 @@ export type Source = reg.CommonDebug &
     maxEventLevelReports: number
     sourceEventId: bigint
 
-    triggerSpecs: TriggerSpec[]
+    eventReportWindows: EventReportWindows
+    triggerData: Set<number>
     triggerDataMatching: TriggerDataMatching
 
     eventLevelEpsilon: number

ts/src/header-validator/to-json.ts

@@ -81,29 +81,6 @@ function serializeAggregatableDebugReportingConfig(
   }
 }
 
-type EventReportWindows = {
-  event_report_windows: { start_time: number; end_times: number[] }
-}
-
-function serializeEventReportWindows(
-  e: source.EventReportWindows
-): EventReportWindows {
-  return {
-    event_report_windows: {
-      start_time: e.startTime,
-      end_times: [...e.endTimes],
-    },
-  }
-}
-
-type TriggerData = {
-  trigger_data: number[]
-}
-
-function serializeTriggerData(d: Set<number>): TriggerData {
-  return { trigger_data: Array.from(d) }
-}
-
 type SourceAggregatableDebugReportingConfig =
   AggregatableDebugReportingConfig & {
     budget: number
@@ -135,53 +112,29 @@ function serializeAttributionScopes(
   }
 }
 
-type NotFullFlexSource = Partial<EventReportWindows> & {
-  trigger_data: number[]
-}
-
-function serializeFlexSource(s: source.Source): NotFullFlexSource {
-  if (s.triggerSpecs.length === 0) {
-    return { trigger_data: [] }
-  }
-
-  if (s.triggerSpecs.length === 1) {
-    return {
-      ...serializeEventReportWindows(s.triggerSpecs[0]!.eventReportWindows),
-      ...serializeTriggerData(s.triggerSpecs[0]!.triggerData),
-    }
-  }
-
-  throw new TypeError()
-}
-
 type Source = CommonDebug &
-  Priority &
-  NotFullFlexSource & {
+  Priority & {
     aggregation_keys: { [key: string]: string }
     named_budgets?: { [key: string]: number }
     aggregatable_report_window: number
     destination: string[]
     destination_limit_priority: string
     event_level_epsilon: number
+    event_report_windows: { start_time: number; end_times: number[] }
     expiry: number
     filter_data: { [key: string]: string[] }
     max_event_level_reports: number
     source_event_id: string
+    trigger_data: number[]
     trigger_data_matching: string
     aggregatable_debug_reporting?: SourceAggregatableDebugReportingConfig
     attribution_scopes?: AttributionScopes
   }
 
-export interface Options {}
-
-export function serializeSource(
-  s: source.Source,
-  _: Readonly<Options>
-): string {
+export function serializeSource(s: source.Source): string {
   const source: Source = {
     ...serializeCommonDebug(s),
     ...serializePriority(s),
-    ...serializeFlexSource(s),
 
     aggregation_keys: Object.fromEntries(
       Array.from(s.aggregationKeys.entries(), ([key, val]) => [
@@ -201,9 +154,14 @@ export function serializeSource(
     destination: Array.from(s.destination),
     destination_limit_priority: s.destinationLimitPriority.toString(),
     event_level_epsilon: s.eventLevelEpsilon,
+    event_report_windows: {
+      start_time: s.eventReportWindows.startTime,
+      end_times: [...s.eventReportWindows.endTimes],
+    },
     expiry: s.expiry,
     max_event_level_reports: s.maxEventLevelReports,
     source_event_id: s.sourceEventId.toString(),
+    trigger_data: Array.from(s.triggerData),
     trigger_data_matching: s.triggerDataMatching,
     ...ifNotNull(
       'aggregatable_debug_reporting',
@@ -352,10 +310,7 @@ type Trigger = CommonDebug &
     attribution_scopes?: string[]
   }
 
-export function serializeTrigger(
-  t: trigger.Trigger,
-  _: Readonly<Options>
-): string {
+export function serializeTrigger(t: trigger.Trigger): string {
   const trigger: Trigger = {
     ...serializeCommonDebug(t),
     ...serializeFilterPair(t),