@chubbyts/chubbyts-decode-encode 2.1.2 → 2.2.1

package/README.md

@@ -24,17 +24,17 @@ A simple decode/encode solution for json / jsonx / url-encoded / xml / yaml.
 ## Requirements
 
  * node: 20
- * [@chubbyts/chubbyts-throwable-to-error][2]: ^2.0.4
- * [fast-xml-parser][3]: ^5.5.6
- * [qs][4]: ^6.15.0
- * [yaml][5]: ^2.8.2
+ * [@chubbyts/chubbyts-throwable-to-error][2]: ^2.1.1
+ * [fast-xml-parser][3]: ^5.7.1
+ * [qs][4]: ^6.15.1
+ * [yaml][5]: ^2.8.3
 
 ## Installation
 
 Through [NPM](https://www.npmjs.com) as [@chubbyts/chubbyts-decode-encode][1].
 
 ```ts
-npm i @chubbyts/chubbyts-decode-encode@^2.1.2
+npm i @chubbyts/chubbyts-decode-encode@^2.2.1
 ```
 
 ## Usage

package/dist/decoder/jsonx-type-decoder.js

@@ -3,17 +3,12 @@ import { throwableToError } from '@chubbyts/chubbyts-throwable-to-error/dist/thr
 import { DATATYPE_ARRAY, DATATYPE_BOOLEAN, DATATYPE_NULL, DATATYPE_NUMBER, DATATYPE_OBJECT, DATATYPE_STRING, } from '../jsonx-datatypes.js';
 import { DecodeError } from './decoder.js';
 const decodeHtmlEntities = (string) => string.replace(/&#\d+;/gm, (code) => String.fromCharCode(code.match(/\d+/)[0]));
-const isWithName = (node) => typeof node === 'object' &&
-    null !== node &&
-    typeof node[':@'] === 'object' &&
-    node[':@'] !== null &&
-    typeof node[':@']['@_name'] === 'string';
-const isObjectNode = (node) => Object.keys(node)[0] === DATATYPE_OBJECT && Array.isArray(node[DATATYPE_OBJECT]);
-const isArrayNode = (node) => Object.keys(node)[0] === DATATYPE_ARRAY && Array.isArray(node[DATATYPE_ARRAY]);
-const isStringNode = (node) => Object.keys(node)[0] === DATATYPE_STRING && Array.isArray(node[DATATYPE_STRING]);
-const isNumberNode = (node) => Object.keys(node)[0] === DATATYPE_NUMBER && Array.isArray(node[DATATYPE_NUMBER]);
-const isBooleanNode = (node) => Object.keys(node)[0] === DATATYPE_BOOLEAN && Array.isArray(node[DATATYPE_BOOLEAN]);
-const isNullNode = (node) => Object.keys(node)[0] === DATATYPE_NULL && Array.isArray(node[DATATYPE_NULL]);
+const getNodeName = (node) => {
+    return node[':@']?.['@_name'];
+};
+const getNodeType = (node) => {
+    return Object.keys(node)[0];
+};
 const convertNullNode = () => {
     return null;
 };
@@ -27,23 +22,19 @@ const convertStringNode = (node) => {
     return decodeHtmlEntities(node['json:string'][0]['#text']);
 };
 const convertNode = (node) => {
-    if (isObjectNode(node)) {
-        return convertObjectNode(node);
-    }
-    else if (isArrayNode(node)) {
-        return convertArrayNode(node);
-    }
-    else if (isStringNode(node)) {
-        return convertStringNode(node);
-    }
-    else if (isNumberNode(node)) {
-        return convertNumberNode(node);
-    }
-    else if (isBooleanNode(node)) {
-        return convertBooleanNode(node);
-    }
-    else if (isNullNode(node)) {
-        return convertNullNode();
+    switch (getNodeType(node)) {
+        case DATATYPE_OBJECT:
+            return convertObjectNode(node);
+        case DATATYPE_ARRAY:
+            return convertArrayNode(node);
+        case DATATYPE_STRING:
+            return convertStringNode(node);
+        case DATATYPE_NUMBER:
+            return convertNumberNode(node);
+        case DATATYPE_BOOLEAN:
+            return convertBooleanNode(node);
+        case DATATYPE_NULL:
+            return convertNullNode();
     }
     throw new Error(`Unsupported node: ${JSON.stringify(node)}`);
 };
@@ -51,25 +42,11 @@ const convertArrayNode = (node) => {
     return node['json:array'].map(convertNode);
 };
 const convertNodeWithName = (node) => {
-    if (isObjectNode(node) && isWithName(node)) {
-        return [node[':@']['@_name'], convertObjectNode(node)];
+    const name = getNodeName(node);
+    if (undefined === name) {
+        throw new Error(`Unsupported node: ${JSON.stringify(node)}`);
     }
-    else if (isArrayNode(node) && isWithName(node)) {
-        return [node[':@']['@_name'], convertArrayNode(node)];
-    }
-    else if (isStringNode(node) && isWithName(node)) {
-        return [node[':@']['@_name'], convertStringNode(node)];
-    }
-    else if (isNumberNode(node) && isWithName(node)) {
-        return [node[':@']['@_name'], convertNumberNode(node)];
-    }
-    else if (isBooleanNode(node) && isWithName(node)) {
-        return [node[':@']['@_name'], convertBooleanNode(node)];
-    }
-    else if (isNullNode(node) && isWithName(node)) {
-        return [node[':@']['@_name'], convertNullNode()];
-    }
-    throw new Error(`Unsupported node: ${JSON.stringify(node)}`);
+    return [name, convertNode(node)];
 };
 const convertObjectNode = (node) => {
     return Object.fromEntries(node['json:object'].map(convertNodeWithName));
@@ -78,7 +55,7 @@ export const createJsonxTypeDecoder = () => {
     return {
         decode: (encodedData) => {
             try {
-                const parser = new XMLParser({ preserveOrder: true, ignoreAttributes: false, htmlEntities: false });
+                const parser = new XMLParser({ preserveOrder: true, ignoreAttributes: false });
                 return convertNode(parser.parse(encodedData)[1]);
             }
             catch (e) {

package/dist/decoder/url-encoded-type-decoder.js

@@ -16,12 +16,8 @@ const decodeValue = (value) => {
     if (value === 'false') {
         return false;
     }
-    const integer = parseInt(value, 10);
-    if (!isNaN(integer) && integer.toString() === value) {
-        return integer;
-    }
-    const float = parseFloat(value);
-    if (!isNaN(float) && float.toString() === value) {
+    const float = parseFloat(value); // handles integers as well
+    if (float.toString() === value) {
         return float;
     }
     return value;

package/dist/encoder/url-encoded-type-encoder.js

@@ -1,5 +1,5 @@
 import { stringify } from 'qs';
-import { isArray, isBoolean, isNull, isNumber, isObject } from '../data.js';
+import { isArray, isNull, isObject } from '../data.js';
 const encodeValue = (value) => {
     if (isObject(value)) {
         return Object.fromEntries(Object.entries(value).map(([subKey, subValue]) => [subKey, encodeValue(subValue)]));
@@ -7,12 +7,6 @@ const encodeValue = (value) => {
     if (isArray(value)) {
         return value.map(encodeValue);
     }
-    if (isNumber(value)) {
-        return value.toString();
-    }
-    if (isBoolean(value)) {
-        return value ? 'true' : 'false';
-    }
     if (isNull(value)) {
         return 'null';
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chubbyts/chubbyts-decode-encode",
   "type": "module",
-  "version": "2.1.2",
+  "version": "2.2.1",
   "description": "A simple decode/encode solution for json / jsonx / url-encoded / xml / yaml.",
   "keywords": [
     "chubbyts",
@@ -51,28 +51,28 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@chubbyts/chubbyts-throwable-to-error": "^2.0.4",
-    "fast-xml-parser": "^5.5.6",
-    "qs": "^6.15.0",
-    "yaml": "^2.8.2"
+    "@chubbyts/chubbyts-throwable-to-error": "^2.1.1",
+    "fast-xml-parser": "^5.7.1",
+    "qs": "^6.15.1",
+    "yaml": "^2.8.3"
   },
   "devDependencies": {
-    "@chubbyts/chubbyts-eslint": "^5.0.0",
-    "@chubbyts/chubbyts-function-mock": "^2.0.4",
-    "@stryker-mutator/core": "^9.6.0",
-    "@stryker-mutator/vitest-runner": "^9.6.0",
-    "@types/node": "^25.5.0",
+    "@chubbyts/chubbyts-eslint": "^5.1.1",
+    "@chubbyts/chubbyts-function-mock": "^2.1.1",
+    "@stryker-mutator/core": "^9.6.1",
+    "@stryker-mutator/vitest-runner": "^9.6.1",
+    "@types/node": "^25.6.0",
     "@types/qs": "^6.15.0",
-    "@vitest/coverage-v8": "^4.1.0",
-    "prettier": "^3.8.1",
-    "typescript": "^5.9.3",
-    "vitest": "^4.1.0"
+    "@vitest/coverage-v8": "^4.1.4",
+    "prettier": "^3.8.3",
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.4"
   },
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
-    "build": "tsc",
+    "build": "rm -Rf dist && tsc",
     "cs-fix": "prettier --write src tests",
     "cs": "prettier --check src tests",
     "infection": "stryker run",