Merge pull request #12666 from keymanapp/fix/developer/package-compil…

…er-box-info-fields fix(developer): box package compiler info fields
keymanapp · Nov 25, 2024 · c80a0ae · c80a0ae
2 parents 2f401f5 + b0000ae
commit c80a0ae
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/developer/src/common/web/utils/src/types/kps/kps-file-reader.ts b/developer/src/common/web/utils/src/types/kps/kps-file-reader.ts
@@ -66,6 +66,17 @@ export class KpsFileReader {
     boxXmlArray(data.Package?.StartMenu?.Items, 'Item');
     boxXmlArray(data.Package?.Strings, 'String');
 
+    if(data.Package?.Info) {
+      // If no properties are defined on an <Info> subitem, then it will be a
+      // string, and needs to be boxed into a KpsInfoItem object
+      const info: any = data.Package.Info;
+      for(const k of Object.keys(info)) {
+        if(typeof info[k] == 'string') {
+          info[k] = { _: info[k], $: { URL: '' } };
+        }
+      }
+    }
+
     return data;
   }
 };
diff --git a/developer/src/kmc-package/src/compiler/kmp-compiler.ts b/developer/src/kmc-package/src/compiler/kmp-compiler.ts
@@ -415,9 +415,9 @@ export class KmpCompiler implements KeymanCompiler {
     ];
 
     for (let [src,dst,isMarkdown] of keys) {
-      if (kpsInfo[src]) {
+      if (kpsInfo[src]?._ && (kpsInfo[src]._.trim() || kpsInfo[src].$?.URL)) {
         kmpInfo[dst] = {
-          description: (kpsInfo[src]._ ?? (typeof kpsInfo[src] == 'string' ? kpsInfo[src].toString() : '')).trim()
+          description: (kpsInfo[src]._ ?? '').trim()
         };
         if(isMarkdown) {
           kmpInfo[dst].description = markdownToHTML(kmpInfo[dst].description, false).trim();