Corpus parity: formatter-enum expansion, raw:false flag, try/catch for binary chains

codegen/src/emit-typescript.ts

@@ -75,29 +75,48 @@ export function emitTypeScript(spec: SpecIR): string {
   // the hand-written plugins (which only have raw.position).
   const consumedByFormatter = collectFormatterRefs(spec.formatted);
 
+  // Binary decode chains (ascii85 / base64 / deflate / text_decode /
+  // hex_decode) throw on malformed input. The hand-written plugins wrapped
+  // those chains in try/catch and failed gracefully; mirror that.
+  const binaryKinds = new Set([
+    "decode_ascii85",
+    "base64",
+    "deflate",
+    "text_decode",
+    "hex_decode",
+  ]);
+  const needsTryCatch = spec.parse.steps.some((s) => binaryKinds.has(s.kind));
+  const bodyIndent = needsTryCatch ? "      " : "    ";
+  if (needsTryCatch) out.push(`    try {`);
+
   for (const step of spec.parse.steps) {
-    emitParseStep(step, out, "    ");
+    emitParseStep(step, out, bodyIndent);
   }
 
   // Fields or Variants.
   if (spec.variants) {
-    emitVariants(spec.variants, out, "    ", consumedByFormatter);
+    emitVariants(spec.variants, out, bodyIndent, consumedByFormatter);
   } else if (spec.fields) {
     for (const field of spec.fields) {
-      emitField(field, out, "    ", consumedByFormatter);
+      emitField(field, out, bodyIndent, consumedByFormatter);
     }
   }
 
   // Formatter.
-  emitFormatted(spec.formatted, out, "    ");
+  emitFormatted(spec.formatted, out, bodyIndent);
 
   // Success path.
   if (!hasExplicitDecodeLevelSetting(spec)) {
     const level = spec.plugin.decodeLevel.toLowerCase();
     const tsLevel = level === "full" ? "'full'" : "'partial'";
-    out.push(`    this.setDecodeLevel(result, true, ${tsLevel});`);
+    out.push(`${bodyIndent}this.setDecodeLevel(result, true, ${tsLevel});`);
+  }
+  out.push(`${bodyIndent}return result;`);
+  if (needsTryCatch) {
+    out.push(`    } catch {`);
+    out.push(`      return this.failUnknown(result, message.text, options);`);
+    out.push(`    }`);
   }
-  out.push(`    return result;`);
   out.push(`  }`);
   out.push(`}`);
   return out.join("\n") + "\n";
@@ -205,7 +224,7 @@ function emitField(
   const decodeExpr = field.decode
     ? renderDecodeCall(field.decode, renderExpr(field.from))
     : renderExpr(field.from);
-  const skipAutoRaw = consumedByFormatter.has(field.name);
+  const skipAutoRaw = consumedByFormatter.has(field.name) || field.raw === false;
   if (field.when) {
     // Declare outside the if so downstream formatters / variant-shared code
     // can still reference the variable when the guard fails — it'll be
@@ -294,19 +313,39 @@ function emitFormatterCall(item: FormatterCall, out: string[], indent: string):
     out.push(`${indent}hatches.${item.customName}(result);`);
     return;
   }
+  // remaining_fields: trailing CSV fields → remaining.text (mirrors the
+  // Label_44_Base.addRemainingFields pattern).
+  if (item.type === "remaining_fields") {
+    const from = renderArg(item.args["from"]);
+    const start = Number(item.args["start"] ?? 0);
+    out.push(`${indent}if (${from}.length > ${start}) {`);
+    out.push(`${indent}  ResultFormatter.unknownArr(result, ${from}.slice(${start}));`);
+    out.push(`${indent}}`);
+    return;
+  }
   // Map IR formatter type → ResultFormatter method.
   const methodMap: Record<string, string> = {
     position: "position",
     altitude: "altitude",
     speed: "speed",
     heading: "heading",
     timestamp: "timestamp",
+    eta: "eta",
+    out: "out",
+    off: "off",
+    on: "on",
+    in: "in",
+    day: "day",
+    month: "month",
+    departure_day: "departureDay",
+    arrival_day: "arrivalDay",
     callsign: "callsign",
     flight_number: "flightNumber",
     tail_number: "tail",
     airport_origin: "departureAirport",
     airport_destination: "arrivalAirport",
     fuel: "currentFuel",
+    fuel_remaining: "remainingFuel",
     free_text: "unknownArr",
   };
   const method = methodMap[item.type];

codegen/src/ir.ts

@@ -87,6 +87,8 @@ export interface FieldIR {
   decode?: DecodeCall;
   when?: Condition;
   default?: ValueExpr;
+  /** false = intermediate field; do not auto-emit into result.raw. */
+  raw?: boolean;
   description?: string;
 }
 
@@ -126,12 +128,23 @@ export interface FormatterCall {
     | "speed"
     | "heading"
     | "timestamp"
+    | "eta"
+    | "out"
+    | "off"
+    | "on"
+    | "in"
+    | "day"
+    | "month"
+    | "departure_day"
+    | "arrival_day"
     | "callsign"
     | "flight_number"
     | "tail_number"
     | "airport_origin"
     | "airport_destination"
     | "fuel"
+    | "fuel_remaining"
+    | "remaining_fields"
     | "free_text"
     | "custom";
   customName?: string;

codegen/src/parse-spec.ts

@@ -153,6 +153,7 @@ function lowerField(field: any): FieldIR {
     decode: field.decode ? lowerDecode(field.decode) : undefined,
     when: field.when ? lowerCondition(field.when) : undefined,
     default: field.default !== undefined ? lowerExpr(field.default) : undefined,
+    raw: field.raw,
     description: field.description,
   };
 }

runtimes/typescript/utils/result_formatter.ts

@@ -223,7 +223,11 @@ export class ResultFormatter {
     });
   }
 
-  static remainingFuel(decodeResult: DecodeResult, value: number) {
+  static remainingFuel(decodeResult: DecodeResult, value: number | undefined) {
+    // Tolerate undefined/NaN — mirrors the legacy parseFuel() isNaN guard
+    // (and the currentFuel precedent) so when-gated spec fields can call
+    // this unconditionally.
+    if (value === undefined || value === null || Number.isNaN(value)) return;
     decodeResult.raw.fuel_remaining = value;
     decodeResult.formatted.items.push({
       type: 'fuel_remaining',

schema/ads-v1.schema.json

@@ -252,6 +252,11 @@
         "decode": { "$ref": "#/$defs/decode_call" },
         "when": { "$ref": "#/$defs/condition" },
         "default": { "$ref": "#/$defs/value_expr" },
+        "raw": {
+          "type": "boolean",
+          "default": true,
+          "description": "Set false for intermediate fields that feed later fields/formatters but must NOT auto-emit into result.raw."
+        },
         "description": { "type": "string" }
       }
     },
@@ -468,6 +473,17 @@
             "airport_origin",
             "airport_destination",
             "fuel",
+            "fuel_remaining",
+            "eta",
+            "out",
+            "off",
+            "on",
+            "in",
+            "day",
+            "month",
+            "departure_day",
+            "arrival_day",
+            "remaining_fields",
             "free_text",
             "custom"
           ]

spec/labels/16/AUTPOS.yaml

@@ -13,5 +13,7 @@ parse:
   # representable in current DSL.
   custom: label_16_autpos_decode
 formatted:
-  description: "Position Report"
+  # Legacy plugin used defaultResult() — description stays "Unknown" on
+  # failed decodes; the hatch sets "Position Report" on its success path.
+  description: "Unknown"
   custom: label_16_autpos_format

spec/labels/44/ETA.yaml

@@ -47,8 +47,9 @@ formatted:
     - { type: altitude, value: $altitude }
     - { type: airport_origin, value: $departure_icao }
     - { type: airport_destination, value: $arrival_icao }
-    - { type: timestamp, kind: month, value: $month }
-    - { type: timestamp, kind: day, value: $day }
-    - { type: timestamp, kind: current, value: $timestamp }
-    - { type: timestamp, kind: eta, value: $eta_time }
-    - { type: fuel, kind: remaining, value: $fuel_remaining, when_present: true }
+    - { type: month, value: $month }
+    - { type: day, value: $day }
+    - { type: timestamp, value: $timestamp }
+    - { type: eta, value: $eta_time }
+    - { type: fuel_remaining, value: $fuel_remaining }
+    - { type: remaining_fields, from: $data, start: 9 }

spec/labels/44/IN.yaml

@@ -40,7 +40,8 @@ formatted:
     - { type: position, value: $position }
     - { type: airport_origin, value: $departure_icao }
     - { type: airport_destination, value: $arrival_icao }
-    - { type: timestamp, kind: month, value: $month }
-    - { type: timestamp, kind: day, value: $day }
-    - { type: timestamp, kind: in, value: $in_time }
-    - { type: fuel, kind: remaining, value: $fuel_remaining, when_present: true }
+    - { type: month, value: $month }
+    - { type: day, value: $day }
+    - { type: in, value: $in_time }
+    - { type: fuel_remaining, value: $fuel_remaining }
+    - { type: remaining_fields, from: $data, start: 7 }

spec/labels/44/OFF.yaml

@@ -43,8 +43,9 @@ formatted:
     - { type: position, value: $position }
     - { type: airport_origin, value: $departure_icao }
     - { type: airport_destination, value: $arrival_icao }
-    - { type: timestamp, kind: month, value: $month }
-    - { type: timestamp, kind: day, value: $day }
-    - { type: timestamp, kind: off, value: $off_time }
-    - { type: timestamp, kind: eta, value: $eta_time }
-    - { type: fuel, kind: remaining, value: $fuel_remaining, when_present: true }
+    - { type: month, value: $month }
+    - { type: day, value: $day }
+    - { type: off, value: $off_time }
+    - { type: eta, value: $eta_time }
+    - { type: fuel_remaining, value: $fuel_remaining }
+    - { type: remaining_fields, from: $data, start: 8 }

spec/labels/44/ON.yaml

@@ -40,7 +40,8 @@ formatted:
     - { type: position, value: $position }
     - { type: airport_origin, value: $departure_icao }
     - { type: airport_destination, value: $arrival_icao }
-    - { type: timestamp, kind: month, value: $month }
-    - { type: timestamp, kind: day, value: $day }
-    - { type: timestamp, kind: on, value: $on_time }
-    - { type: fuel, kind: remaining, value: $fuel_remaining, when_present: true }
+    - { type: month, value: $month }
+    - { type: day, value: $day }
+    - { type: on, value: $on_time }
+    - { type: fuel_remaining, value: $fuel_remaining }
+    - { type: remaining_fields, from: $data, start: 7 }

spec/labels/44/POS.yaml

@@ -20,6 +20,8 @@ fields:
 
   - name: flight_level_raw
     from: $m.flight_level_or_ground
+    # Intermediate value feeding `altitude`; legacy never stored it in raw.
+    raw: false
     decode:
       fn: custom
       custom: parse_flight_level_or_ground
@@ -58,11 +60,12 @@ formatted:
   description: "Position Report"
   items:
     - { type: position, value: $position }
-    - { type: timestamp, kind: month, value: $month }
-    - { type: timestamp, kind: day, value: $day }
-    - { type: timestamp, kind: current, value: $timestamp }
-    - { type: timestamp, kind: eta, value: $eta }
-    - { type: fuel, units: tons, value: $fuel_in_tons, when_present: true }
+    - { type: month, value: $month }
+    - { type: day, value: $day }
+    - { type: timestamp, value: $timestamp }
+    - { type: eta, value: $eta }
+    # fuel_in_tons is raw-only in the legacy plugin (no formatted item);
+    # the field's auto-raw emit covers it now that no formatter consumes it.
     - { type: airport_origin, value: $departure_icao }
     - { type: airport_destination, value: $arrival_icao }
     - { type: altitude, value: $altitude }

spec/labels/H1/Paren.yaml

@@ -14,5 +14,7 @@ parse:
   # altitude is parsed * 100. Whole-plugin hatch for parity.
   custom: label_h1_paren_parse
 formatted:
-  description: "Position Report"
+  # Legacy plugin used defaultResult() — description stays "Unknown" on
+  # failed decodes; the hatch sets "Position Report" on its success path.
+  description: "Unknown"
   custom: label_h1_paren_format

spec/wildcards/arinc_702.yaml

@@ -11,5 +11,7 @@ parse:
   # recursive H1 message decoding all live in hand-written per-language code.
   custom: arinc_702_dispatch
 formatted:
-  description: "ARINC 702 Message"
+  # Legacy plugin used defaultResult() — description stays "Unknown" unless
+  # Arinc702Helper sets one on a successful decode.
+  description: "Unknown"
   custom: arinc_702_format