GEN-3c: fix 'Unbekannter Farbschlag' — unknown=wildcard in matches() + E-pair-aware family fallback (eef=Fuchsschimmel)

gerbil-manager-web/src/genetics/__tests__/genetics.test.ts

@@ -173,8 +173,8 @@ describe('Farbschlag catalog', () => {
   })
 
   it('falls back to Unbekannter Farbschlag for uncatalogued genotypes', () => {
-    // Colourpoint marked + dilute + grey combo not in the catalog.
-    const match = farbschlagFor(fromDisplayString('aa cchmcchm dd ee gg PP spsp rere'))
+    // E-dominant (no Fuchs/Schimmel family) + an uncatalogued cchm/dd/gg/pp combo.
+    const match = farbschlagFor(fromDisplayString('aa cchmcchm dd EE gg pp spsp rere'))
     expect(match.unknown).toBe(true)
     expect(match.name).toBe('Unbekannter Farbschlag')
   })
@@ -222,7 +222,7 @@ describe('Farbschlag catalog', () => {
   it('genotypeToFarbschlag (DATA-1 denormalization contract) returns the plain name', () => {
     expect(genotypeToFarbschlag(wildType())).toBe('Agouti')
     expect(genotypeToFarbschlag(fromDisplayString('aa CC DD EE GG pp spsp rere'))).toBe('Platin')
-    expect(genotypeToFarbschlag(fromDisplayString('aa cchmcchm dd ee gg PP spsp rere'))).toBe(
+    expect(genotypeToFarbschlag(fromDisplayString('aa cchmcchm dd EE gg pp spsp rere'))).toBe(
       'Unbekannter Farbschlag',
     )
   })
@@ -350,3 +350,32 @@ describe('GEN-3a: Schimmel catalog fix (breeder C5)', () => {
     expect(BASE_COLORS.some((e) => e.name === 'Schwarzschimmel')).toBe(false)
   })
 })
+
+describe("GEN-3c: unknown allele displays as '-' (stored as '?')", () => {
+  it("accepts '-' input, stores '?', displays '-'", () => {
+    const g = fromDisplayString('Aa C- DD EE GG Pp spsp rere')
+    expect(g.C).toEqual(['C', '?']) // stored internal contract stays '?'
+    expect(toDisplayString(g)).toBe('Aa C- DD EE GG Pp spsp rere') // displayed as '-'
+  })
+  it("'?' and '-' inputs are equivalent", () => {
+    expect(toDisplayString(fromDisplayString('Aa C? DD EE GG Pp spsp rere'))).toBe(
+      'Aa C- DD EE GG Pp spsp rere',
+    )
+  })
+})
+
+describe('GEN-3c: no Unbekannt when the E locus is known (family fallback)', () => {
+  it('eef with unknown other loci -> Fuchsschimmel (the reported bug case)', () => {
+    expect(genotypeToFarbschlag(fromDisplayString('aa C- D- eef Gg Pp spsp --'))).toBe(
+      'Fuchsschimmel',
+    )
+  })
+  it('ee -> Fuchs family, efef -> a Schimmel (never Unbekannt) even with unknowns', () => {
+    expect(farbschlagFor(fromDisplayString('a- C- D- ee G- P-')).unknown).toBe(false)
+    expect(farbschlagFor(fromDisplayString('A- C- D- efef G- P-')).unknown).toBe(false)
+  })
+  it('unknown allele no longer blocks a match (wildcard, never Unbekannt)', () => {
+    // C unknown must not force Unbekannt — it resolves to SOME named variety.
+    expect(farbschlagFor(fromDisplayString('aa C- DD EE GG PP spsp rere')).unknown).toBe(false)
+  })
+})