chore: refactor functions

Author: lpatiny

src/parse.ts

@@ -3,27 +3,7 @@ import { getTraversable } from './traversable/getTraversable';
 import { traversableToJSON } from './traversableToJSON';
 
 /**
- * Parse an ArrayBuffer or Uint8Array representing an XML
- * @param {string|ArrayBuffer|Uint8Array} xmlData
- * @param {object} [options={}]
- * @param {string} [options.attributeNamePrefix='$']
- * @param {boolean} [options.attributesNodeName='']
- * @param {string} [options.textNodeName='#text']
- * @param {boolean} [options.trimValues=true] should we remove ascii < 32
- * @param {boolean} [options.ignoreAttributes=false] skip attributes
- * @param {boolean} [options.ignoreNameSpace=false]
- * @param {boolean} [options.dynamicTypingAttributeValue=true] Parse attribute values that looks like number or boolean
- * @param {boolean} [options.allowBooleanAttributes=false]
- * @param {boolean} [options.dynamicTypingNodeValue=true] Parse tag values that looks like number or boolean
- * @param {boolean} [options.arrayMode=false]
- * @param {boolean} [options.cdataTagName=false]
- * @param {function} [options.tagValueProcessor=(v, node) => decoder.decode(v)] Tag values can be modified during parsing. By default we decode the tag value (a Uint8Array) using TextDecoder
- * @param {function} [options.attributeValueProcessor=(v) => v] Attribute values can be modified during parsing
- * @param {function} [options.tagNameProcessor=(v) => v] Callback allowing to rename tag names
- * @param {function} [options.attributeNameProcessor=(v) => v] Callback allowing to rename attribute name
- * @param {boolean} [options.stopNodes=[]] prevent further parsing
- *
- * @returns {string}
+ * Parse an ArrayBuffer or Uint8Array representing an XML and return an object
  */
 export function parse(
   xmlData: string | Uint8Array | ArrayBufferLike,

src/traversable/closingIndexForOpeningTag.ts

@@ -1,4 +1,4 @@
-import { decoder } from './getTraversable';
+import { decoder } from './utils/utf8Decoder';
 
 export function closingIndexForOpeningTag(
   data: Uint8Array,

src/traversable/getTraversable.ts

@@ -6,14 +6,9 @@ import { closingIndexForOpeningTag } from './closingIndexForOpeningTag';
 import { ParseOptions } from './defaultOptions';
 import { findClosingIndex } from './findClosingIndex';
 import { parseAttributesString } from './parseAttributesString';
-
-const utf8Decoder = new TextDecoder();
-
-export const decoder = {
-  decode: (array: BufferSource | Uint8Array) => {
-    return utf8Decoder.decode(array);
-  },
-};
+import { concat } from './utils/concat';
+import { removeNameSpaceIfNeeded } from './utils/removeNameSpaceIfNeeded';
+import { decoder } from './utils/utf8Decoder';
 
 export function getTraversable(xmlData: Uint8Array, options: ParseOptions) {
   const traversable = new XMLNode('!xml');
@@ -227,41 +222,3 @@ export function getTraversable(xmlData: Uint8Array, options: ParseOptions) {
   }
   return traversable;
 }
-
-function concat(
-  a?: string | ArrayLike<number> | undefined,
-  b?: string | ArrayLike<number>,
-) {
-  if (a === undefined) {
-    a = typeof b === 'string' ? '' : new Uint8Array(0);
-  }
-  if (b === undefined) {
-    b = typeof a === 'string' ? '' : new Uint8Array(0);
-  }
-  if (typeof a === 'string' && typeof b === 'string') {
-    return a + b;
-  } else if (
-    typeof a !== 'string' &&
-    typeof b !== 'string' &&
-    ArrayBuffer.isView(a) &&
-    ArrayBuffer.isView(b)
-  ) {
-    const arrayConcat = new Uint8Array(a.length + b.length);
-    arrayConcat.set(a);
-    arrayConcat.set(b, a.length);
-    return arrayConcat;
-  } else {
-    throw new Error(
-      `Unsuported value type for concatenation: ${typeof a} ${typeof b}`,
-    );
-  }
-}
-
-function removeNameSpaceIfNeeded(tagName: string, options: ParseOptions) {
-  if (!options.ignoreNameSpace) return tagName;
-  const colonIndex = tagName.indexOf(':');
-  if (colonIndex !== -1) {
-    tagName = tagName.substr(colonIndex + 1);
-  }
-  return tagName;
-}

src/traversable/utils/concat.ts

@@ -0,0 +1,28 @@
+export function concat(
+  a?: string | ArrayLike<number> | undefined,
+  b?: string | ArrayLike<number>,
+) {
+  if (a === undefined) {
+    a = typeof b === 'string' ? '' : new Uint8Array(0);
+  }
+  if (b === undefined) {
+    b = typeof a === 'string' ? '' : new Uint8Array(0);
+  }
+  if (typeof a === 'string' && typeof b === 'string') {
+    return a + b;
+  } else if (
+    typeof a !== 'string' &&
+    typeof b !== 'string' &&
+    ArrayBuffer.isView(a) &&
+    ArrayBuffer.isView(b)
+  ) {
+    const arrayConcat = new Uint8Array(a.length + b.length);
+    arrayConcat.set(a);
+    arrayConcat.set(b, a.length);
+    return arrayConcat;
+  } else {
+    throw new Error(
+      `Unsuported value type for concatenation: ${typeof a} ${typeof b}`,
+    );
+  }
+}

src/traversable/utils/removeNameSpaceIfNeeded.ts

@@ -0,0 +1,15 @@
+import { ParseOptions } from '../defaultOptions';
+
+export function removeNameSpaceIfNeeded(
+  tagName: string,
+  options: ParseOptions,
+) {
+  if (!options.ignoreNameSpace) {
+    return tagName;
+  }
+  const colonIndex = tagName.indexOf(':');
+  if (colonIndex !== -1) {
+    tagName = tagName.substr(colonIndex + 1);
+  }
+  return tagName;
+}

src/traversable/utils/utf8Decoder.ts

@@ -0,0 +1,7 @@
+const utf8Decoder = new TextDecoder();
+
+export const decoder = {
+  decode: (array: BufferSource | Uint8Array) => {
+    return utf8Decoder.decode(array);
+  },
+};