From e99813b3e3c6810b055a4a0748dfd15366d1b6fa Mon Sep 17 00:00:00 2001
From: Marc Durdin <marc@durdin.net>
Date: Wed, 22 Apr 2026 15:33:26 +0200
Subject: [PATCH] chore(common): cleanup optionals in ldml keyboard reader

`boxArrays` had some optional chaining that was either not needed,
and/or was used in an inappropriate context, for example within the
iterable argument to a `for` statement, which would have caused an "not
iterable" error if it ever actually resolved to `undefined`.

This should have no material impact on the code, but helps to clarify
code readability.

Test-bot: skip
---
 .../ldml-keyboard/ldml-keyboard-xml-reader.ts | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/developer/src/common/web/utils/src/types/ldml-keyboard/ldml-keyboard-xml-reader.ts b/developer/src/common/web/utils/src/types/ldml-keyboard/ldml-keyboard-xml-reader.ts
index f25b03582d..d2ac028e72 100644
--- a/developer/src/common/web/utils/src/types/ldml-keyboard/ldml-keyboard-xml-reader.ts
+++ b/developer/src/common/web/utils/src/types/ldml-keyboard/ldml-keyboard-xml-reader.ts
@@ -100,31 +100,31 @@ export class LDMLKeyboardXMLSourceFileReader implements EventResolver {
     boxXmlArray(source?.keyboard3?.locales, 'locale');
     boxXmlArray(source?.keyboard3, 'transforms');
     if(source?.keyboard3?.layers) {
-      for(const layers of source?.keyboard3?.layers) {
+      for(const layers of source.keyboard3.layers) {
         boxXmlArray(layers, 'layer');
-        if(layers?.layer) {
-          for(const layer of layers?.layer) {
+        if(layers.layer) {
+          for(const layer of layers.layer) {
             boxXmlArray(layer, 'row');
           }
         }
       }
     }
     if(source?.keyboard3?.forms?.form) {
-      boxXmlArray(source?.keyboard3?.forms, 'form');
-      for(const form of source?.keyboard3?.forms?.form) {
+      boxXmlArray(source.keyboard3.forms, 'form');
+      for(const form of source.keyboard3.forms.form) {
         boxXmlArray(form, 'scanCodes');
       }
     }
     if(source?.keyboard3?.flicks) {
-      boxXmlArray(source?.keyboard3?.flicks, 'flick');
-      for(const flick of source?.keyboard3?.flicks?.flick) {
+      boxXmlArray(source.keyboard3.flicks, 'flick');
+      for(const flick of source.keyboard3.flicks.flick) {
         boxXmlArray(flick, 'flickSegment');
       }
     }
     if(source?.keyboard3?.variables) {
-      boxXmlArray(source?.keyboard3?.variables, 'set');
-      boxXmlArray(source?.keyboard3?.variables, 'string');
-      boxXmlArray(source?.keyboard3?.variables, 'uset');
+      boxXmlArray(source.keyboard3.variables, 'set');
+      boxXmlArray(source.keyboard3.variables, 'string');
+      boxXmlArray(source.keyboard3.variables, 'uset');
     }
     if(source?.keyboard3?.transforms) {
       for(const transforms of source.keyboard3.transforms)  {