cleanup

Author: fakemonster

oxide-openapi-gen-ts/src/__snapshots__/http-client.ts

@@ -66,9 +66,9 @@ function encodeQueryParam(key: string, value: unknown) {
   )}`;
 }
 
-export const handleResponseWithMapper =
-  (valueMapper: ValueMapper) =>
-  async <Data>(response: Response): Promise<ApiResult<Data>> => {
+export const handleResponseWithMapper = (valueMapper: ValueMapper) => {
+  const processResponseBody = mapObj(snakeToCamel, valueMapper);
+  return async <Data>(response: Response): Promise<ApiResult<Data>> => {
     const respText = await response.text();
 
     // catch JSON parse or processing errors
@@ -77,9 +77,7 @@ export const handleResponseWithMapper =
       // don't bother trying to parse empty responses like 204s
       // TODO: is empty object what we want here?
       respJson =
-        respText.length > 0
-          ? mapObj(snakeToCamel, valueMapper)(JSON.parse(respText))
-          : {};
+        respText.length > 0 ? processResponseBody(JSON.parse(respText)) : {};
     } catch (e) {
       return {
         type: "client_error",
@@ -104,6 +102,7 @@ export const handleResponseWithMapper =
       data: respJson as Data,
     };
   };
+};
 
 // has to be any. the particular query params types don't like unknown
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

oxide-openapi-gen-ts/src/__snapshots__/util.ts

@@ -64,8 +64,8 @@ export const makeParseIfDate =
   (dateProps: Set<string>, dateArrayProps: Set<string>): ValueMapper =>
   (k, v) => {
     if (k === undefined) return v;
+    if (Array.isArray(v)) return dateArrayProps.has(k) ? v.map(parseDate) : v;
     if (dateProps.has(k)) return parseDate(v);
-    if (dateArrayProps.has(k) && Array.isArray(v)) return v.map(parseDate);
     return v;
   };
 

oxide-openapi-gen-ts/src/client/static/http-client.ts

@@ -66,9 +66,9 @@ function encodeQueryParam(key: string, value: unknown) {
   )}`;
 }
 
-export const handleResponseWithMapper =
-  (valueMapper: ValueMapper) =>
-  async <Data>(response: Response): Promise<ApiResult<Data>> => {
+export const handleResponseWithMapper = (valueMapper: ValueMapper) => {
+  const processResponseBody = mapObj(snakeToCamel, valueMapper);
+  return async <Data>(response: Response): Promise<ApiResult<Data>> => {
     const respText = await response.text();
 
     // catch JSON parse or processing errors
@@ -77,9 +77,7 @@ export const handleResponseWithMapper =
       // don't bother trying to parse empty responses like 204s
       // TODO: is empty object what we want here?
       respJson =
-        respText.length > 0
-          ? mapObj(snakeToCamel, valueMapper)(JSON.parse(respText))
-          : {};
+        respText.length > 0 ? processResponseBody(JSON.parse(respText)) : {};
     } catch (e) {
       return {
         type: "client_error",
@@ -104,6 +102,7 @@ export const handleResponseWithMapper =
       data: respJson as Data,
     };
   };
+};
 
 // has to be any. the particular query params types don't like unknown
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

oxide-openapi-gen-ts/src/client/static/util.test.ts

@@ -131,6 +131,20 @@ describe("makeParseIfDate", () => {
     expect((value[1] as Date).getTime()).toEqual(timestamp);
   });
 
+  it("handles a name present in both sets for both strings and arrays of strings", () => {
+    const parse = makeParseIfDate(new Set(["at"]), new Set(["at"]));
+
+    const single = parse("at", dateStr);
+    expect(single).toBeInstanceOf(Date);
+    expect((single as Date).getTime()).toEqual(timestamp);
+
+    const array = parse("at", [dateStr, dateStr]) as unknown[];
+    expect(array.map((d) => (d as Date).getTime())).toEqual([
+      timestamp,
+      timestamp,
+    ]);
+  });
+
   it.each([
     "2023-01-01T12:00:00Z",
     "2023-01-01T12:00:00.1Z",

oxide-openapi-gen-ts/src/client/static/util.ts

@@ -64,8 +64,8 @@ export const makeParseIfDate =
   (dateProps: Set<string>, dateArrayProps: Set<string>): ValueMapper =>
   (k, v) => {
     if (k === undefined) return v;
+    if (Array.isArray(v)) return dateArrayProps.has(k) ? v.map(parseDate) : v;
     if (dateProps.has(k)) return parseDate(v);
-    if (dateArrayProps.has(k) && Array.isArray(v)) return v.map(parseDate);
     return v;
   };