Removed reliance on downlevelIteration

adrianhelvikspond · adrianhelvikspond · commit 44c90da68008 · 2024-03-19T06:02:43.000+01:00
diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/common.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/common.mustache
@@ -123,15 +123,20 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,
 }
 
 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) {
-        return objectFromEntries([...value.entries()]
-            .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));
+        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));
diff --git a/samples/client/echo_api/typescript-axios/build/common.ts b/samples/client/echo_api/typescript-axios/build/common.ts
@@ -131,15 +131,20 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,
 }
 
 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) {
-        return objectFromEntries([...value.entries()]
-            .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));
+        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));
diff --git a/samples/client/echo_api/typescript-axios/build/package-lock.json b/samples/client/echo_api/typescript-axios/build/package-lock.json
diff --git a/samples/client/echo_api/typescript-axios/build/tsconfig.json b/samples/client/echo_api/typescript-axios/build/tsconfig.json
@@ -4,7 +4,6 @@
     "target": "ES5",
     "module": "commonjs",
     "noImplicitAny": true,
-    "downlevelIteration": true,
     "outDir": "dist",
     "rootDir": ".",
     "lib": [
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
@@ -131,15 +131,20 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,
 }
 
 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) {
-        return objectFromEntries([...value.entries()]
-            .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));
+        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));
diff --git a/samples/client/petstore/typescript-axios/builds/composed-schemas/common.ts b/samples/client/petstore/typescript-axios/builds/composed-schemas/common.ts
@@ -131,15 +131,20 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,
 }
 
 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) {
-        return objectFromEntries([...value.entries()]
-            .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));
+        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));
diff --git a/samples/client/petstore/typescript-axios/builds/default/common.ts b/samples/client/petstore/typescript-axios/builds/default/common.ts
@@ -131,15 +131,20 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,
 }
 
 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) {
-        return objectFromEntries([...value.entries()]
-            .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));
+        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));
diff --git a/samples/client/petstore/typescript-axios/builds/es6-target/common.ts b/samples/client/petstore/typescript-axios/builds/es6-target/common.ts
@@ -131,15 +131,20 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,
 }
 
 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) {
-        return objectFromEntries([...value.entries()]
-            .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));
+        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));
diff --git a/samples/client/petstore/typescript-axios/builds/test-petstore/common.ts b/samples/client/petstore/typescript-axios/builds/test-petstore/common.ts
@@ -131,15 +131,20 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,
 }
 
 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) {
-        return objectFromEntries([...value.entries()]
-            .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));
+        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));
diff --git a/samples/client/petstore/typescript-axios/builds/with-complex-headers/common.ts b/samples/client/petstore/typescript-axios/builds/with-complex-headers/common.ts
@@ -131,15 +131,20 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,
 }
 
 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) {
-        return objectFromEntries([...value.entries()]
-            .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));
+        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));
diff --git a/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/common.ts b/samples/client/petstore/typescript-axios/builds/with-fake-endpoints-models-for-testing-with-http-signature/common.ts
@@ -131,15 +131,20 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,
 }
 
 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) {
-        return objectFromEntries([...value.entries()]
-            .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));
+        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));
diff --git a/samples/client/petstore/typescript-axios/builds/with-interfaces/common.ts b/samples/client/petstore/typescript-axios/builds/with-interfaces/common.ts
@@ -131,15 +131,20 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,
 }
 
 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) {
-        return objectFromEntries([...value.entries()]
-            .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));
+        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));
diff --git a/samples/client/petstore/typescript-axios/builds/with-node-imports/common.ts b/samples/client/petstore/typescript-axios/builds/with-node-imports/common.ts
@@ -132,15 +132,20 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,
 }
 
 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) {
-        return objectFromEntries([...value.entries()]
-            .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));
+        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));
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/common.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version-and-separate-models-and-api/common.ts
diff --git a/samples/client/petstore/typescript-axios/builds/with-npm-version/common.ts b/samples/client/petstore/typescript-axios/builds/with-npm-version/common.ts
diff --git a/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/common.ts b/samples/client/petstore/typescript-axios/builds/with-single-request-parameters/common.ts
diff --git a/samples/client/petstore/typescript-axios/builds/with-string-enums/common.ts b/samples/client/petstore/typescript-axios/builds/with-string-enums/common.ts

Original file line number	Diff line number	Diff line change
`@@ -123,15 +123,20 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`function convertMapsAndSetsToPlain(value: any): any {`
	`126`	`+ if (typeof Set === "undefined") return value;`
	`127`	`+ if (typeof Map === "undefined") return value;`
`126`	`128`	`if (typeof value !== "object" \|\| !value) {`
`127`	`129`	`return value;`
`128`	`130`	`}`
`129`	`131`	`if (value instanceof Set) {`
`130`	`132`	`return Array.from(value).map(item => convertMapsAndSetsToPlain(item));`
`131`	`133`	`}`
`132`	`134`	`if (value instanceof Map) {`
`133`		`- return objectFromEntries([...value.entries()]`
`134`		`- .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));`
	`135`	`+ const entries: Array<[string, any]> = [];`
	`136`	`+ value.forEach((value: any, key: any) => {`
	`137`	`+ entries.push([key, convertMapsAndSetsToPlain(value)])`
	`138`	`+ });`
	`139`	`+ return objectFromEntries(entries);`
`135`	`140`	`}`
`136`	`141`	`if (Array.isArray(value)) {`
`137`	`142`	`return value.map(it => convertMapsAndSetsToPlain(it));`
Original file line number	Diff line number	Diff line change
`@@ -131,15 +131,20 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`function convertMapsAndSetsToPlain(value: any): any {`
	`134`	`+ if (typeof Set === "undefined") return value;`
	`135`	`+ if (typeof Map === "undefined") return value;`
`134`	`136`	`if (typeof value !== "object" \|\| !value) {`
`135`	`137`	`return value;`
`136`	`138`	`}`
`137`	`139`	`if (value instanceof Set) {`
`138`	`140`	`return Array.from(value).map(item => convertMapsAndSetsToPlain(item));`
`139`	`141`	`}`
`140`	`142`	`if (value instanceof Map) {`
`141`		`- return objectFromEntries([...value.entries()]`
`142`		`- .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));`
	`143`	`+ const entries: Array<[string, any]> = [];`
	`144`	`+ value.forEach((value: any, key: any) => {`
	`145`	`+ entries.push([key, convertMapsAndSetsToPlain(value)])`
	`146`	`+ });`
	`147`	`+ return objectFromEntries(entries);`
`143`	`148`	`}`
`144`	`149`	`if (Array.isArray(value)) {`
`145`	`150`	`return value.map(it => convertMapsAndSetsToPlain(it));`
Original file line number	Diff line number	Diff line change
`@@ -132,15 +132,20 @@ export const serializeDataIfNeeded = function (value: any, requestOptions: any,`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`function convertMapsAndSetsToPlain(value: any): any {`
	`135`	`+ if (typeof Set === "undefined") return value;`
	`136`	`+ if (typeof Map === "undefined") return value;`
`135`	`137`	`if (typeof value !== "object" \|\| !value) {`
`136`	`138`	`return value;`
`137`	`139`	`}`
`138`	`140`	`if (value instanceof Set) {`
`139`	`141`	`return Array.from(value).map(item => convertMapsAndSetsToPlain(item));`
`140`	`142`	`}`
`141`	`143`	`if (value instanceof Map) {`
`142`		`- return objectFromEntries([...value.entries()]`
`143`		`- .map(([k, v]) => [k, convertMapsAndSetsToPlain(v)]));`
	`144`	`+ const entries: Array<[string, any]> = [];`
	`145`	`+ value.forEach((value: any, key: any) => {`
	`146`	`+ entries.push([key, convertMapsAndSetsToPlain(value)])`
	`147`	`+ });`
	`148`	`+ return objectFromEntries(entries);`
`144`	`149`	`}`
`145`	`150`	`if (Array.isArray(value)) {`
`146`	`151`	`return value.map(it => convertMapsAndSetsToPlain(it));`