fix: topsheet doesn't parse XML correctly

sfcta · Mar 10, 2022 · 107c277 · 107c277
1 parent b553082
commit 107c277
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/components/TopSheet/TopSheetWorker.worker.ts b/src/components/TopSheet/TopSheetWorker.worker.ts
@@ -8,7 +8,6 @@ import YAML from 'yaml'
 import { FileSystemConfig, YamlConfigs } from '@/Globals'
 import HTTPFileSystem from '@/js/HTTPFileSystem'
 import { findMatchingGlobInFiles, parseXML } from '@/js/util'
-import globalStore from '@/store'
 
 type TableRow = {
   title: string
@@ -377,7 +376,8 @@ async function parseVariousFileTypes(fileKey: string, filename: string, text: st
     const xml = (await parseXML(text, {
       mergeAttrs: true,
       explicitArray: false,
-      attrValueProcessors: [parseNumbers],
+      parseAttributeValue: true,
+      attributeNamePrefix: '',
     })) as any
 
     // Do a splitty lookup if the xmlElement is specified

diff --git a/src/js/util.ts b/src/js/util.ts
@@ -69,10 +69,13 @@ export async function parseXML(xml: string, settings: any = {}) {
   }
 
   // Allow user to pass in an array of "always as array" XML paths:
-  if (settings.alwaysArray)
+  if (settings.alwaysArray) {
     defaultConfig.isArray = (name: string, jpath: string) => {
       if (settings.alwaysArray.indexOf(jpath) !== -1) return true
     }
+  } else {
+    delete defaultConfig.isArray
+  }
 
   const options = Object.assign(defaultConfig, settings)
   const parser = new XMLParser(options)