From b27d776287c1549893ee46d48cf707568854734a Mon Sep 17 00:00:00 2001 From: David Nahodyl Date: Thu, 2 May 2024 15:22:02 -0400 Subject: [PATCH 1/3] fix(Layout): convert boolean true/false for omits to the required "true" or "false" strings --- src/Layout.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/Layout.ts b/src/Layout.ts index 02bcd16..25479d1 100644 --- a/src/Layout.ts +++ b/src/Layout.ts @@ -103,7 +103,7 @@ export type GetResponse< export type Query = Partial<{ [key in keyof T] : T[key] | string; }> & { - omit ?: boolean; + omit ?: boolean | 'true' | 'false'; }; export type File = { @@ -236,8 +236,18 @@ export default class Layout = {}, ignoreEmptyResult = false ) : Promise> { + // convert any boolean "omit" values in the query in the query to "true" or "false" strings + const queryArray = Array.isArray(query) ? query : [query]; + const omitConvertedQuery = queryArray.map(query => { + if (typeof query.omit === 'boolean') { + query.omit = query.omit ? 'true' : 'false'; + } + + return query; + }); + const request : Record = { - query: Array.isArray(query) ? query : [query], + query: omitConvertedQuery, }; for (const [key, value] of Object.entries(params)) { From 4023fc833cb3ee1dee98625b162a823e40475383 Mon Sep 17 00:00:00 2001 From: David Nahodyl Date: Thu, 2 May 2024 17:24:20 -0400 Subject: [PATCH 2/3] fix(Layout): simplified Query type and omit string conversion --- src/Layout.ts | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/Layout.ts b/src/Layout.ts index 25479d1..84623b5 100644 --- a/src/Layout.ts +++ b/src/Layout.ts @@ -103,7 +103,7 @@ export type GetResponse< export type Query = Partial<{ [key in keyof T] : T[key] | string; }> & { - omit ?: boolean | 'true' | 'false'; + omit ?: boolean; }; export type File = { @@ -237,17 +237,11 @@ export default class Layout> { // convert any boolean "omit" values in the query in the query to "true" or "false" strings - const queryArray = Array.isArray(query) ? query : [query]; - const omitConvertedQuery = queryArray.map(query => { - if (typeof query.omit === 'boolean') { - query.omit = query.omit ? 'true' : 'false'; - } - - return query; - }); - const request : Record = { - query: omitConvertedQuery, + query: (Array.isArray(query) ? query : [query]).map(query => ({ + ...query, + omit: query.omit?.toString(), + })), }; for (const [key, value] of Object.entries(params)) { From 777d43b2a309fbae17bb4794effbb76909d3550a Mon Sep 17 00:00:00 2001 From: David Nahodyl Date: Thu, 2 May 2024 17:57:34 -0400 Subject: [PATCH 3/3] fix(Layout): removed comment --- src/Layout.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Layout.ts b/src/Layout.ts index 84623b5..0d4617c 100644 --- a/src/Layout.ts +++ b/src/Layout.ts @@ -236,7 +236,6 @@ export default class Layout = {}, ignoreEmptyResult = false ) : Promise> { - // convert any boolean "omit" values in the query in the query to "true" or "false" strings const request : Record = { query: (Array.isArray(query) ? query : [query]).map(query => ({ ...query,