Return effective value when error is warning (#1468)

WICG · Nov 16, 2024 · 40ef03f · 40ef03f
1 parent bc4f4cc
commit 40ef03f
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/ts/src/header-validator/validate-json.ts b/ts/src/header-validator/validate-json.ts
@@ -244,22 +244,26 @@ export function array<T, C extends Context = Context>(
 }
 
 function withErrorAsWarning<C extends Context, I, O>(
-  f: CtxFunc<C, I, O>
-): CtxFunc<C, I, O> {
+  f: CtxFunc<C, I, Maybe<O>>,
+  valueIfError: O
+): CtxFunc<C, I, Maybe<O>> {
   return (i, ctx) => {
     const prev = ctx.errorAsWarning
     ctx.errorAsWarning = true
     const result = f(i, ctx)
     ctx.errorAsWarning = prev
-    return result
+    return result.value === undefined ? Maybe.some(valueIfError) : result
   }
 }
 
 export const commonDebugFields: StructFields<CommonDebug> = {
-  debugKey: field('debug_key', withDefault(withErrorAsWarning(uint64), null)),
+  debugKey: field(
+    'debug_key',
+    withDefault(withErrorAsWarning(uint64, null), null)
+  ),
   debugReporting: field(
     'debug_reporting',
-    withDefault(withErrorAsWarning(bool), false)
+    withDefault(withErrorAsWarning(bool, false), false)
   ),
 }