Revert "Fix: Incorrect serialisation of maps and sets in typescript-a…

…xios (#1…" (OpenAPITools#18452) This reverts commit 8152052.
rodrigoma3 · Apr 22, 2024 · 36911c7 · 36911c7
1 parent c64d569
commit 36911c7
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 615 deletions.
diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/common.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/common.mustache
@@ -118,50 +118,10 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,
         ? configuration.isJsonMime(requestOptions.headers['Content-Type'])
         : nonString;
     return needsSerialization
-        ? JSON.stringify(value !== undefined ? convertMapsAndSetsToPlain(value) : {})
+        ? JSON.stringify(value !== undefined ? value : {})
         : (value || "");
 }
 
-function convertMapsAndSetsToPlain(value: any): any {
-    if (typeof Set === "undefined") return value;
-    if (typeof Map === "undefined") return value;
-    if (typeof value !== "object" || !value) {
-        return value;
-    }
-    if (value instanceof Set) {
-        return Array.from(value).map(item => convertMapsAndSetsToPlain(item));
-    }
-    if (value instanceof Map) {
-        const entries: Array<[string, any]> = [];
-        value.forEach((value: any, key: any) => {
-            entries.push([key, convertMapsAndSetsToPlain(value)])
-        });
-        return objectFromEntries(entries);
-    }
-    if (Array.isArray(value)) {
-        return value.map(it => convertMapsAndSetsToPlain(it));
-    }
-    return objectFromEntries(objectEntries(value)
-        .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));
-}
-
-/**
- * Ponyfill for Object.entries
- */
-function objectEntries(object: Record<string, any>): Array<[string, any]> {
-    return Object.keys(object).map(key => [key, object[key]]);
-}
-
-/**
- * Ponyfill for Object.fromEntries
- */
-function objectFromEntries(entries: any): Record<string, any> {
-    return [...entries].reduce((object, [key, val]) => {
-        object[key] = val;
-        return object;
-    }, {});
-}
-
 /**
  *
  * @export

diff --git a/samples/client/echo_api/typescript-axios/build/common.ts b/samples/client/echo_api/typescript-axios/build/common.ts
@@ -126,50 +126,10 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,
         ? configuration.isJsonMime(requestOptions.headers['Content-Type'])
         : nonString;
     return needsSerialization
-        ? JSON.stringify(value !== undefined ? convertMapsAndSetsToPlain(value) : {})
+        ? JSON.stringify(value !== undefined ? value : {})
         : (value || "");
 }
 
-function convertMapsAndSetsToPlain(value: any): any {
-    if (typeof Set === "undefined") return value;
-    if (typeof Map === "undefined") return value;
-    if (typeof value !== "object" || !value) {
-        return value;
-    }
-    if (value instanceof Set) {
-        return Array.from(value).map(item => convertMapsAndSetsToPlain(item));
-    }
-    if (value instanceof Map) {
-        const entries: Array<[string, any]> = [];
-        value.forEach((value: any, key: any) => {
-            entries.push([key, convertMapsAndSetsToPlain(value)])
-        });
-        return objectFromEntries(entries);
-    }
-    if (Array.isArray(value)) {
-        return value.map(it => convertMapsAndSetsToPlain(it));
-    }
-    return objectFromEntries(objectEntries(value)
-        .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));
-}
-
-/**
- * Ponyfill for Object.entries
- */
-function objectEntries(object: Record<string, any>): Array<[string, any]> {
-    return Object.keys(object).map(key => [key, object[key]]);
-}
-
-/**
- * Ponyfill for Object.fromEntries
- */
-function objectFromEntries(entries: any): Record<string, any> {
-    return [...entries].reduce((object, [key, val]) => {
-        object[key] = val;
-        return object;
-    }, {});
-}
-
 /**
  *
  * @export

diff --git a/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/common.ts b/samples/client/others/typescript-axios/with-separate-models-and-api-inheritance/common.ts
@@ -126,50 +126,10 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,
         ? configuration.isJsonMime(requestOptions.headers['Content-Type'])
         : nonString;
     return needsSerialization
-        ? JSON.stringify(value !== undefined ? convertMapsAndSetsToPlain(value) : {})
+        ? JSON.stringify(value !== undefined ? value : {})
         : (value || "");
 }
 
-function convertMapsAndSetsToPlain(value: any): any {
-    if (typeof Set === "undefined") return value;
-    if (typeof Map === "undefined") return value;
-    if (typeof value !== "object" || !value) {
-        return value;
-    }
-    if (value instanceof Set) {
-        return Array.from(value).map(item => convertMapsAndSetsToPlain(item));
-    }
-    if (value instanceof Map) {
-        const entries: Array<[string, any]> = [];
-        value.forEach((value: any, key: any) => {
-            entries.push([key, convertMapsAndSetsToPlain(value)])
-        });
-        return objectFromEntries(entries);
-    }
-    if (Array.isArray(value)) {
-        return value.map(it => convertMapsAndSetsToPlain(it));
-    }
-    return objectFromEntries(objectEntries(value)
-        .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));
-}
-
-/**
- * Ponyfill for Object.entries
- */
-function objectEntries(object: Record<string, any>): Array<[string, any]> {
-    return Object.keys(object).map(key => [key, object[key]]);
-}
-
-/**
- * Ponyfill for Object.fromEntries
- */
-function objectFromEntries(entries: any): Record<string, any> {
-    return [...entries].reduce((object, [key, val]) => {
-        object[key] = val;
-        return object;
-    }, {});
-}
-
 /**
  *
  * @export

diff --git a/samples/client/petstore/typescript-axios/builds/composed-schemas/common.ts b/samples/client/petstore/typescript-axios/builds/composed-schemas/common.ts
@@ -126,50 +126,10 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,
         ? configuration.isJsonMime(requestOptions.headers['Content-Type'])
         : nonString;
     return needsSerialization
-        ? JSON.stringify(value !== undefined ? convertMapsAndSetsToPlain(value) : {})
+        ? JSON.stringify(value !== undefined ? value : {})
         : (value || "");
 }
 
-function convertMapsAndSetsToPlain(value: any): any {
-    if (typeof Set === "undefined") return value;
-    if (typeof Map === "undefined") return value;
-    if (typeof value !== "object" || !value) {
-        return value;
-    }
-    if (value instanceof Set) {
-        return Array.from(value).map(item => convertMapsAndSetsToPlain(item));
-    }
-    if (value instanceof Map) {
-        const entries: Array<[string, any]> = [];
-        value.forEach((value: any, key: any) => {
-            entries.push([key, convertMapsAndSetsToPlain(value)])
-        });
-        return objectFromEntries(entries);
-    }
-    if (Array.isArray(value)) {
-        return value.map(it => convertMapsAndSetsToPlain(it));
-    }
-    return objectFromEntries(objectEntries(value)
-        .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));
-}
-
-/**
- * Ponyfill for Object.entries
- */
-function objectEntries(object: Record<string, any>): Array<[string, any]> {
-    return Object.keys(object).map(key => [key, object[key]]);
-}
-
-/**
- * Ponyfill for Object.fromEntries
- */
-function objectFromEntries(entries: any): Record<string, any> {
-    return [...entries].reduce((object, [key, val]) => {
-        object[key] = val;
-        return object;
-    }, {});
-}
-
 /**
  *
  * @export

diff --git a/samples/client/petstore/typescript-axios/builds/default/common.ts b/samples/client/petstore/typescript-axios/builds/default/common.ts
@@ -126,50 +126,10 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,
         ? configuration.isJsonMime(requestOptions.headers['Content-Type'])
         : nonString;
     return needsSerialization
-        ? JSON.stringify(value !== undefined ? convertMapsAndSetsToPlain(value) : {})
+        ? JSON.stringify(value !== undefined ? value : {})
         : (value || "");
 }
 
-function convertMapsAndSetsToPlain(value: any): any {
-    if (typeof Set === "undefined") return value;
-    if (typeof Map === "undefined") return value;
-    if (typeof value !== "object" || !value) {
-        return value;
-    }
-    if (value instanceof Set) {
-        return Array.from(value).map(item => convertMapsAndSetsToPlain(item));
-    }
-    if (value instanceof Map) {
-        const entries: Array<[string, any]> = [];
-        value.forEach((value: any, key: any) => {
-            entries.push([key, convertMapsAndSetsToPlain(value)])
-        });
-        return objectFromEntries(entries);
-    }
-    if (Array.isArray(value)) {
-        return value.map(it => convertMapsAndSetsToPlain(it));
-    }
-    return objectFromEntries(objectEntries(value)
-        .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));
-}
-
-/**
- * Ponyfill for Object.entries
- */
-function objectEntries(object: Record<string, any>): Array<[string, any]> {
-    return Object.keys(object).map(key => [key, object[key]]);
-}
-
-/**
- * Ponyfill for Object.fromEntries
- */
-function objectFromEntries(entries: any): Record<string, any> {
-    return [...entries].reduce((object, [key, val]) => {
-        object[key] = val;
-        return object;
-    }, {});
-}
-
 /**
  *
  * @export

diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/common.ts b/samples/client/petstore/typescript-axios/builds/es6-target/common.ts
@@ -126,50 +126,10 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,
         ? configuration.isJsonMime(requestOptions.headers['Content-Type'])
         : nonString;
     return needsSerialization
-        ? JSON.stringify(value !== undefined ? convertMapsAndSetsToPlain(value) : {})
+        ? JSON.stringify(value !== undefined ? value : {})
         : (value || "");
 }
 
-function convertMapsAndSetsToPlain(value: any): any {
-    if (typeof Set === "undefined") return value;
-    if (typeof Map === "undefined") return value;
-    if (typeof value !== "object" || !value) {
-        return value;
-    }
-    if (value instanceof Set) {
-        return Array.from(value).map(item => convertMapsAndSetsToPlain(item));
-    }
-    if (value instanceof Map) {
-        const entries: Array<[string, any]> = [];
-        value.forEach((value: any, key: any) => {
-            entries.push([key, convertMapsAndSetsToPlain(value)])
-        });
-        return objectFromEntries(entries);
-    }
-    if (Array.isArray(value)) {
-        return value.map(it => convertMapsAndSetsToPlain(it));
-    }
-    return objectFromEntries(objectEntries(value)
-        .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));
-}
-
-/**
- * Ponyfill for Object.entries
- */
-function objectEntries(object: Record<string, any>): Array<[string, any]> {
-    return Object.keys(object).map(key => [key, object[key]]);
-}
-
-/**
- * Ponyfill for Object.fromEntries
- */
-function objectFromEntries(entries: any): Record<string, any> {
-    return [...entries].reduce((object, [key, val]) => {
-        object[key] = val;
-        return object;
-    }, {});
-}
-
 /**
  *
  * @export

diff --git a/samples/client/petstore/typescript-axios/builds/test-petstore/common.ts b/samples/client/petstore/typescript-axios/builds/test-petstore/common.ts
@@ -126,50 +126,10 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,
         ? configuration.isJsonMime(requestOptions.headers['Content-Type'])
         : nonString;
     return needsSerialization
-        ? JSON.stringify(value !== undefined ? convertMapsAndSetsToPlain(value) : {})
+        ? JSON.stringify(value !== undefined ? value : {})
         : (value || "");
 }
 
-function convertMapsAndSetsToPlain(value: any): any {
-    if (typeof Set === "undefined") return value;
-    if (typeof Map === "undefined") return value;
-    if (typeof value !== "object" || !value) {
-        return value;
-    }
-    if (value instanceof Set) {
-        return Array.from(value).map(item => convertMapsAndSetsToPlain(item));
-    }
-    if (value instanceof Map) {
-        const entries: Array<[string, any]> = [];
-        value.forEach((value: any, key: any) => {
-            entries.push([key, convertMapsAndSetsToPlain(value)])
-        });
-        return objectFromEntries(entries);
-    }
-    if (Array.isArray(value)) {
-        return value.map(it => convertMapsAndSetsToPlain(it));
-    }
-    return objectFromEntries(objectEntries(value)
-        .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));
-}
-
-/**
- * Ponyfill for Object.entries
- */
-function objectEntries(object: Record<string, any>): Array<[string, any]> {
-    return Object.keys(object).map(key => [key, object[key]]);
-}
-
-/**
- * Ponyfill for Object.fromEntries
- */
-function objectFromEntries(entries: any): Record<string, any> {
-    return [...entries].reduce((object, [key, val]) => {
-        object[key] = val;
-        return object;
-    }, {});
-}
-
 /**
  *
  * @export