@chubbyts/chubbyts-decode-encode 1.0.1 → 1.0.2

package/README.md

@@ -25,7 +25,7 @@ A simple decode/encode solution for json / jsonx / url-encoded / xml / yaml.
 
  * node: 14
  * [fast-xml-parser][2]: ^4.0.8
- * [object-path][3]: ^0.11.8
+ * [qs][3]: ^6.10.5
  * [yaml][4]: ^2.1.1
 
 ## Installation
@@ -33,7 +33,7 @@ A simple decode/encode solution for json / jsonx / url-encoded / xml / yaml.
 Through [NPM](https://www.npmjs.com) as [@chubbyts/chubbyts-decode-encode][1].
 
 ```ts
-npm i @chubbyts/chubbyts-decode-encode@^1.0.1
+npm i @chubbyts/chubbyts-decode-encode@^1.0.2
 ```
 
 ## Usage
@@ -178,5 +178,5 @@ Dominik Zogg 2022
 
 [1]: https://www.npmjs.com/package/@chubbyts/chubbyts-decode-encode
 [2]: https://www.npmjs.com/package/fast-xml-parser
-[3]: https://www.npmjs.com/package/object-path
+[3]: https://www.npmjs.com/package/qs
 [4]: https://www.npmjs.com/package/yaml

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

@@ -1,8 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createUrlEncodedTypeDecoder = void 0;
-const object_path_1 = require("object-path");
-const optimizeValue = (value) => {
+const __1 = require("..");
+const qs_1 = require("qs");
+const decodeValue = (value) => {
+    if ((0, __1.isObject)(value)) {
+        return Object.fromEntries(Object.entries(value).map(([subKey, subValue]) => [subKey, decodeValue(subValue)]));
+    }
+    if ((0, __1.isArray)(value)) {
+        return value.map(decodeValue);
+    }
     if (value === 'null') {
         return null;
     }
@@ -24,14 +31,7 @@ const optimizeValue = (value) => {
 };
 const createUrlEncodedTypeDecoder = () => {
     const decode = (encodedData) => {
-        let data = {};
-        encodedData.split('&').forEach((keyValue) => {
-            const [rawKey, rawValue] = keyValue.split('=');
-            const key = decodeURIComponent(rawKey.replace(/\[[^\]]+\]/gm, (match) => `.${match.match(/[^\[\]]+/)[0]}`));
-            const value = optimizeValue(decodeURIComponent(rawValue));
-            (0, object_path_1.set)(data, key, value);
-        });
-        return data;
+        return decodeValue((0, qs_1.parse)(encodedData, { depth: 100 }));
     };
     const contentType = 'application/x-www-form-urlencoded';
     return {

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

@@ -1,44 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createUrlEncodedTypeEncoder = void 0;
+const qs_1 = require("qs");
 const __1 = require("..");
-const getValueAsString = (value) => {
-    if (null === value) {
-        return 'null';
+const encodeValue = (value) => {
+    if ((0, __1.isObject)(value)) {
+        return Object.fromEntries(Object.entries(value).map(([subKey, subValue]) => [subKey, encodeValue(subValue)]));
     }
-    if (typeof value === 'boolean') {
-        return value ? 'true' : 'false';
+    if ((0, __1.isArray)(value)) {
+        return value.map(encodeValue);
     }
-    if (typeof value === 'number') {
+    if ((0, __1.isNumber)(value)) {
         return value.toString();
     }
-    return value;
-};
-const getKeyValue = (path, key, value) => {
-    const subPath = '' !== path ? path + '[' + encodeURIComponent(key) + ']' : encodeURIComponent(key);
-    if ((0, __1.isObject)(value) || (0, __1.isArray)(value)) {
-        const queryPart = buildQuery(value, subPath);
-        return queryPart !== '' ? queryPart + '&' : '';
-    }
-    return subPath + '=' + encodeURIComponent(getValueAsString(value)) + '&';
-};
-const buildQuery = (data, path = '') => {
-    let query = '';
-    if ((0, __1.isObject)(data)) {
-        Object.keys(data).forEach((key) => {
-            query += getKeyValue(path, key, data[key]);
-        });
+    if ((0, __1.isBoolean)(value)) {
+        return value ? 'true' : 'false';
     }
-    else if ((0, __1.isArray)(data)) {
-        data.forEach((value, i) => {
-            query += getKeyValue(path, i.toString(), value);
-        });
+    if ((0, __1.isNull)(value)) {
+        return 'null';
     }
-    return query.substring(0, query.length - 1);
+    return value;
 };
 const createUrlEncodedTypeEncoder = () => {
     const encode = (data) => {
-        return buildQuery(JSON.parse(JSON.stringify(data)));
+        return (0, qs_1.stringify)(encodeValue(data), { encodeValuesOnly: true });
     };
     const contentType = 'application/x-www-form-urlencoded';
     return {

package/dist/encoder/yaml-type-encoder.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createYamlTypeEncoder = void 0;
 const yaml_1 = require("yaml");
 const createYamlTypeEncoder = () => {
-    const encode = (data) => (0, yaml_1.stringify)(JSON.parse(JSON.stringify(data)), { indent: 4 });
+    const encode = (data) => (0, yaml_1.stringify)(data, { indent: 4 });
     const contentType = 'application/x-yaml';
     return {
         encode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chubbyts/chubbyts-decode-encode",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A simple decode/encode solution for json / jsonx / url-encoded / xml / yaml.",
   "keywords": [
     "chubbyts",
@@ -49,7 +49,7 @@
   },
   "dependencies": {
     "fast-xml-parser": "^4.0.8",
-    "object-path": "^0.11.8",
+    "qs": "^6.10.5",
     "yaml": "^2.1.1"
   },
   "devDependencies": {
@@ -57,7 +57,7 @@
     "@stryker-mutator/jest-runner": "^6.0.2",
     "@types/jest": "^27.5.1",
     "@types/node": "^14",
-    "@types/object-path": "^0.11.1",
+    "@types/qs": "^6.9.7",
     "jest": "^28.1.0",
     "prettier": "^2.6.2",
     "ts-jest": "^28.0.3",