From a12bcc6a80e3244ae21ac76a46c32746c49b9d30 Mon Sep 17 00:00:00 2001
From: olzzon <github@olzzon.dk>
Date: Mon, 6 May 2024 15:00:46 +0200
Subject: [PATCH] fix: objId was parsed as a number, and thus would remove e.g.
 00's in the end

---
 packages/helper/src/utils/Utils.ts            | 31 +++++++++++++++++++
 .../helper/src/utils/__tests__/Utils.spec.ts  | 22 +++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/packages/helper/src/utils/Utils.ts b/packages/helper/src/utils/Utils.ts
index b2a499d0..8fa464ed 100644
--- a/packages/helper/src/utils/Utils.ts
+++ b/packages/helper/src/utils/Utils.ts
@@ -10,6 +10,20 @@ export function pad(n: string, width: number, z?: string): string {
 }
 
 export function xml2js(messageString: string): { [key: string]: any } {
+	/**
+	 * objId should be handled as a string, not as a number
+	 * so we need to force it as text in the messageString
+	 * and reconvert it after it has been parsed by xmlParser
+	 * all objects in this set will be forced to be strings:
+	 */
+	const forcedStringObject = new Set(['objId', 'objID'])
+	for (const object of forcedStringObject) {
+		const regex = new RegExp(`<${object}>(.*?)</${object}>`, 'g')
+		messageString = messageString.replace(regex, (_match, p1) => {
+			return `<${object}>_str_${p1}</${object}>`
+		})
+	}
+
 	const object = xmlParser(messageString, { compact: false, trim: true, nativeType: true })
 	// common tags we typically want to know the order of the contents of:
 	const orderedTags = new Set(['storyBody', 'mosAbstract', 'description', 'p', 'em', 'span', 'h1', 'h2', 'i', 'b'])
@@ -37,6 +51,15 @@ export function xml2js(messageString: string): { [key: string]: any } {
 
 				const childEl = element.elements[0]
 				const name = childEl.$name || childEl.$type || 'unknownElement'
+
+				/**
+				 * forcedStringObjects has been forced to be strings, not numbers
+				 * use the original value by removing _str_
+				 */
+				if (typeof childEl.text === 'string' && childEl.text.includes('_str_')) {
+					childEl.text = childEl.text.replace(/_str_/, '')
+				}
+
 				if (childEl.$type && childEl.$type === 'text') {
 					if (childEl.$name === undefined) {
 						// pure text node, hoist it up:
@@ -75,6 +98,14 @@ export function xml2js(messageString: string): { [key: string]: any } {
 						// make array compact:
 						const array: any = []
 						for (const childEl of element.elements) {
+							/**
+							 * forcedStringObjects has been forced to be strings, not numbers
+							 * use the original value by removing _str_
+							 */
+							if (typeof childEl.text === 'string' && childEl.text.includes('_str_')) {
+								childEl.text = childEl.text.replace(/_str_/, '')
+							}
+
 							if (childEl.$type && childEl.$type === 'text') {
 								if (Object.keys(childEl).length > 2) {
 									array.push(childEl)
diff --git a/packages/helper/src/utils/__tests__/Utils.spec.ts b/packages/helper/src/utils/__tests__/Utils.spec.ts
index bfba8e1c..fa3a4299 100644
--- a/packages/helper/src/utils/__tests__/Utils.spec.ts
+++ b/packages/helper/src/utils/__tests__/Utils.spec.ts
@@ -146,3 +146,25 @@ test('xml2js with simple data', () => {
 		})
 	}
 })
+
+test('xml2js handle objID with nubmerformatting as string', () => {
+	const o: any = xml2js(`
+<content>
+	<navn>Jon Gelius</navn>
+	<objId>000987.6540</objId>
+	<tittel/>
+	<tematekst/>
+	<infotekst/>
+	<_valid>true</_valid>
+</content>
+	`)
+
+	expect(o.content).toEqual({
+		navn: 'Jon Gelius',
+		objId: '000987.6540',
+		tittel: {},
+		tematekst: {},
+		infotekst: {},
+		_valid: true,
+	})
+})
\ No newline at end of file