From 1e2ad40c19c43d4a00a530edeaf14ff04ba011b2 Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Thu, 16 Jan 2025 11:04:22 +0700
Subject: [PATCH] fix(developer): filter incorrect fonts out of .keyboard_info

The font collection code was somewhat wrong in kmc-keyboard-info. It
collected all fonts referenced in the package, even for multi-keyboard
packages, which meant that the .keyboard_info file listed all fonts for
all languages. Furthermore, if a font was referenced in multiple
language entries in the .kps, then it would be repeated for each
language in the .keyboard_info. This patch addresses both of these bugs.

The good news is that this makes some of the .keyboard_info files
smaller. In particular, fv_all.keyboard_info goes from 4675 lines down
to 695 lines!

Fixes: #12852
Cherry-pick-of: #12909
---
 .../src/keyboard-info-compiler.ts               | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/developer/src/kmc-keyboard-info/src/keyboard-info-compiler.ts b/developer/src/kmc-keyboard-info/src/keyboard-info-compiler.ts
index ed704c6e8c..3605b81f8d 100644
--- a/developer/src/kmc-keyboard-info/src/keyboard-info-compiler.ts
+++ b/developer/src/kmc-keyboard-info/src/keyboard-info-compiler.ts
@@ -493,9 +493,6 @@ export class KeyboardInfoCompiler implements KeymanCompiler {
       keyboard_info.languages[language] = {};
     }
 
-    const fontSource = [].concat(...kmpJsonData.keyboards.map(e => e.displayFont ? [e.displayFont] : []), ...kmpJsonData.keyboards.map(e => e.webDisplayFonts ?? []));
-    const oskFontSource = [].concat(...kmpJsonData.keyboards.map(e => e.oskFont ? [e.oskFont] : []), ...kmpJsonData.keyboards.map(e => e.webOskFonts ?? []));
-
     for(const bcp47 of Object.keys(keyboard_info.languages)) {
       const language = keyboard_info.languages[bcp47];
 
@@ -520,6 +517,20 @@ export class KeyboardInfoCompiler implements KeymanCompiler {
       // do it right now.
       //
 
+      // The code below:
+      // 1. Only includes fonts associated with keyboards which support the current bcp47 (filter)
+      // 2. Joins the displayFont and webDisplayFonts data, and removes duplicates (...new Set())
+
+      const supportedKeyboards = kmpJsonData.keyboards.filter(k => k.languages.find(lang => lang.id == bcp47));
+      const fontSource = [...new Set([].concat(
+        ...supportedKeyboards.map(e => e.displayFont ? [e.displayFont] : []),
+        ...supportedKeyboards.map(e => e.webDisplayFonts ?? [])
+      ))];
+      const oskFontSource = [...new Set([].concat(
+        ...supportedKeyboards.map(e => e.oskFont ? [e.oskFont] : []),
+        ...supportedKeyboards.map(e => e.webOskFonts ?? [])
+      ))];
+
       if(fontSource.length) {
         language.font = await this.fontSourceToKeyboardInfoFont(kpsFilename, kmpJsonData, fontSource);
         if(language.font == null) {