@chubbyts/chubbyts-decode-encode 1.0.0 → 1.0.3

package/README.md

@@ -24,16 +24,17 @@ A simple decode/encode solution for json / jsonx / url-encoded / xml / yaml.
 ## Requirements
 
  * node: 14
- * [fast-xml-parser][2]: ^4.0.8
- * [object-path][3]: ^0.11.8
- * [yaml][4]: ^2.1.1
+ * [@chubbyts/chubbyts-throwable-to-error][2]: ^1.0.0
+ * [fast-xml-parser][3]: ^4.0.8
+ * [qs][4]: ^6.10.5
+ * [yaml][5]: ^2.1.1
 
 ## Installation
 
 Through [NPM](https://www.npmjs.com) as [@chubbyts/chubbyts-decode-encode][1].
 
 ```ts
-npm i @chubbyts/chubbyts-decode-encode@^1.0.0
+npm i @chubbyts/chubbyts-decode-encode@^1.0.3
 ```
 
 ## Usage
@@ -177,6 +178,7 @@ const contentType = yamlTypeEncoder.contentType;
 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
-[4]: https://www.npmjs.com/package/yaml
+[2]: https://www.npmjs.com/package/@chubbyts/chubbyts-throwable-to-error
+[3]: https://www.npmjs.com/package/fast-xml-parser
+[4]: https://www.npmjs.com/package/qs
+[5]: https://www.npmjs.com/package/yaml

package/dist/decoder/index.d.ts

@@ -1,4 +1,6 @@
 import { Data } from '..';
+export declare class DecodeError extends Error {
+}
 export declare type TypeDecoder = {
     decode: (encodedData: string) => Data;
     contentType: string;

package/dist/decoder/index.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDecoder = void 0;
+exports.createDecoder = exports.DecodeError = void 0;
+class DecodeError extends Error {
+}
+exports.DecodeError = DecodeError;
 const createDecoder = (decoderTypes) => {
     const decoderTypeMap = new Map(decoderTypes.map((DecoderType) => [DecoderType.contentType, DecoderType]));
     const contentTypes = Array.from(decoderTypeMap.keys());

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

@@ -1,9 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createJsonTypeDecoder = void 0;
+const throwable_to_error_1 = require("@chubbyts/chubbyts-throwable-to-error/dist/throwable-to-error");
+const _1 = require(".");
 const createJsonTypeDecoder = () => {
     const decode = (encodedData) => {
-        return JSON.parse(encodedData);
+        try {
+            return JSON.parse(encodedData);
+        }
+        catch (e) {
+            const error = (0, throwable_to_error_1.throwableToError)(e);
+            const decodeError = new _1.DecodeError(error.message);
+            decodeError.stack = error.stack;
+            throw decodeError;
+        }
     };
     const contentType = 'application/json';
     return {

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

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createJsonxTypeDecoder = void 0;
+const _1 = require(".");
 const fast_xml_parser_1 = require("fast-xml-parser");
 const jsonx_datatypes_1 = require("../jsonx-datatypes");
+const throwable_to_error_1 = require("@chubbyts/chubbyts-throwable-to-error/dist/throwable-to-error");
 const decodeHtmlEntities = (string) => string.replace(/&#\d+;/gm, (code) => String.fromCharCode(code.match(/\d+/)[0]));
 const isWithName = (node) => typeof node === 'object' &&
     null !== node &&
@@ -77,9 +79,16 @@ const convertObjectNode = (node) => {
 };
 const createJsonxTypeDecoder = () => {
     const decode = (encodedData) => {
-        const parser = new fast_xml_parser_1.XMLParser({ preserveOrder: true, ignoreAttributes: false, htmlEntities: false });
-        const parsedData = parser.parse(encodedData);
-        return convertNode(parsedData[1]);
+        try {
+            const parser = new fast_xml_parser_1.XMLParser({ preserveOrder: true, ignoreAttributes: false, htmlEntities: false });
+            return convertNode(parser.parse(encodedData)[1]);
+        }
+        catch (e) {
+            const error = (0, throwable_to_error_1.throwableToError)(e);
+            const decodeError = new _1.DecodeError(error.message);
+            decodeError.stack = error.stack;
+            throw decodeError;
+        }
     };
     const contentType = 'application/jsonx+xml';
     return {

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 = 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/decoder/yaml-type-decoder.js

@@ -1,10 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createYamlTypeDecoder = void 0;
+const _1 = require(".");
 const yaml_1 = require("yaml");
+const throwable_to_error_1 = require("@chubbyts/chubbyts-throwable-to-error/dist/throwable-to-error");
 const createYamlTypeDecoder = () => {
     const decode = (encodedData) => {
-        return (0, yaml_1.parse)(encodedData);
+        try {
+            return (0, yaml_1.parse)(encodedData);
+        }
+        catch (e) {
+            const error = (0, throwable_to_error_1.throwableToError)(e);
+            const decodeError = new _1.DecodeError(error.message);
+            decodeError.stack = error.stack;
+            throw decodeError;
+        }
     };
     const contentType = 'application/x-yaml';
     return {

package/dist/encoder/index.d.ts

@@ -1,4 +1,6 @@
 import { Data } from '..';
+export declare class EncoderError extends Error {
+}
 export declare type TypeEncoder = {
     encode: (data: Data) => string;
     contentType: string;

package/dist/encoder/index.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createEncoder = void 0;
+exports.createEncoder = exports.EncoderError = void 0;
+class EncoderError extends Error {
+}
+exports.EncoderError = EncoderError;
 const createEncoder = (encoderTypes) => {
     const encoderTypeMap = new Map(encoderTypes.map((encoderType) => [encoderType.contentType, encoderType]));
     const contentTypes = Array.from(encoderTypeMap.keys());

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

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createJsonxTypeEncoder = void 0;
+const _1 = require(".");
 const __1 = require("..");
 const jsonx_datatypes_1 = require("../jsonx-datatypes");
 const fast_xml_parser_1 = require("fast-xml-parser");
+const throwable_to_error_1 = require("@chubbyts/chubbyts-throwable-to-error/dist/throwable-to-error");
 const encodeHtmlEntities = (string) => string.replace(/[\u00A0-\u9999<>\&]/g, (i) => '&#' + i.charCodeAt(0) + ';');
 const createXmlNode = () => {
     return {
@@ -147,20 +149,28 @@ const createObjectNode = (value, key = undefined) => {
     };
 };
 const createJsonxTypeEncoder = (prettyPrint = false) => {
+    const builder = new fast_xml_parser_1.XMLBuilder({
+        preserveOrder: true,
+        ignoreAttributes: false,
+        processEntities: false,
+        format: prettyPrint,
+    });
     const encode = (data) => {
-        const builder = new fast_xml_parser_1.XMLBuilder({
-            preserveOrder: true,
-            ignoreAttributes: false,
-            processEntities: false,
-            format: prettyPrint,
-        });
-        return builder.build([
-            createXmlNode(),
-            {
-                ...createNode(data),
-                ...createJsonxAttributes(),
-            },
-        ]);
+        try {
+            return builder.build([
+                createXmlNode(),
+                {
+                    ...createNode(data),
+                    ...createJsonxAttributes(),
+                },
+            ]);
+        }
+        catch (e) {
+            const error = (0, throwable_to_error_1.throwableToError)(e);
+            const decodeError = new _1.EncoderError(error.message);
+            decodeError.stack = error.stack;
+            throw decodeError;
+        }
     };
     const contentType = 'application/jsonx+xml';
     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 + '[' + key + ']' : 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.0",
+  "version": "1.0.3",
   "description": "A simple decode/encode solution for json / jsonx / url-encoded / xml / yaml.",
   "keywords": [
     "chubbyts",
@@ -48,8 +48,9 @@
     "node": ">=14"
   },
   "dependencies": {
+    "@chubbyts/chubbyts-throwable-to-error": "^1.0.0",
     "fast-xml-parser": "^4.0.8",
-    "object-path": "^0.11.8",
+    "qs": "^6.10.5",
     "yaml": "^2.1.1"
   },
   "devDependencies": {
@@ -57,7 +58,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",