ts-ag 1.0.28 → 1.0.29

package/dist/lambda/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/lambda/client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAE7B,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AA2D7E,QAAA,MAAM,WAAW,uEAAwE,CAAC;AAC1F,KAAK,UAAU,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAE/C,MAAM,MAAM,kBAAkB,CAAC,GAAG,SAAS,YAAY,IAAI,CACzD,IAAI,SAAS,GAAG,CAAC,MAAM,CAAC,EACxB,MAAM,SAAS,OAAO,CAAC,GAAG,EAAE;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC,QAAQ,CAAC,EAErD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,EAClC,OAAO,CAAC,EAAE,WAAW,KAClB,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;AAE7C,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC,kBAAkB,CAAC;AAE/D;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,SAAS,YAAY,EACvD,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,EAC7E,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,GACV,kBAAkB,CAAC,GAAG,CAAC,CAmBzB"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/lambda/client.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAE7B,OAAO,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAiE7E,QAAA,MAAM,WAAW,uEAAwE,CAAC;AAC1F,KAAK,UAAU,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAE/C,MAAM,MAAM,kBAAkB,CAAC,GAAG,SAAS,YAAY,IAAI,CACzD,IAAI,SAAS,GAAG,CAAC,MAAM,CAAC,EACxB,MAAM,SAAS,OAAO,CAAC,GAAG,EAAE;IAAE,IAAI,EAAE,IAAI,CAAA;CAAE,CAAC,CAAC,QAAQ,CAAC,EAErD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,EAClC,OAAO,CAAC,EAAE,WAAW,KAClB,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;AAE7C,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC,kBAAkB,CAAC;AAE/D;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,SAAS,YAAY,EACvD,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,EAC7E,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,MAAM,GACV,kBAAkB,CAAC,GAAG,CAAC,CAmBzB"}

package/dist/lambda/client.js

@@ -35,12 +35,18 @@ environment, apiUrl, headers) {
         body: bodyMethods.includes(method) ? JSON.stringify(input) : undefined,
         credentials: 'include'
     });
+    const contentType = response.headers.get('content-type') ?? '';
     let retrieved = false;
     response.json = async () => {
         if (retrieved === false) {
             retrieved = response.text();
         }
-        return await parse(await retrieved);
+        if (contentType === 'application/devalue') {
+            return await parse(await retrieved);
+        }
+        else {
+            return JSON.parse(await retrieved);
+        }
     };
     return response;
 }

package/dist/lambda/handlerUtils.d.ts

@@ -1,4 +1,4 @@
-import type { APIGatewayProxyResultV2, Context } from 'aws-lambda';
+import type { APIGatewayProxyResultV2, Context, APIGatewayProxyEventV2WithLambdaAuthorizer } from 'aws-lambda';
 export type SuccessCode = 200 | 201 | 204;
 export type ErrorCode = 400 | 401 | 403 | 404 | 409 | 500;
 export type ErrorBody = {
@@ -14,7 +14,7 @@ export type ErrorBody = {
 export type ErrorRawProxyResultV2 = {
     statusCode: ErrorCode;
     headers?: {
-        [header: string]: boolean | number | string;
+        [header: string]: string;
     } | undefined;
     body?: ErrorBody;
     isBase64Encoded?: boolean | undefined;
@@ -23,7 +23,7 @@ export type ErrorRawProxyResultV2 = {
 export type OkRawProxyResultV2 = {
     statusCode: SuccessCode;
     headers?: {
-        [header: string]: boolean | number | string;
+        [header: string]: string;
     } | undefined;
     body?: object | undefined;
     isBase64Encoded?: boolean | undefined;
@@ -34,7 +34,7 @@ export type OkRawProxyResultV2 = {
  */
 export type RawProxyResultV2 = ErrorRawProxyResultV2 | OkRawProxyResultV2;
 export type APIGatewayHandler<E> = (event: E, context: Context) => Promise<APIGatewayProxyResultV2>;
-export type RawApiGatewayHandler<E> = (event: E, context: Context) => Promise<RawProxyResultV2>;
+export type RawApiGatewayHandler<E extends APIGatewayProxyEventV2WithLambdaAuthorizer<any>> = (event: E, context: Context) => Promise<RawProxyResultV2>;
 /**
  * Wraps a handler that returns the body as an object rather than a string.
  *
@@ -49,5 +49,5 @@ export type AuthorizerContext = {
 export const wrapHandler = baseWrapHandler<APIGatewayProxyEventV2WithLambdaAuthorizer<AuthorizerContext>>
 
 */
-export declare function wrapHandler<E>(handler: RawApiGatewayHandler<E>): APIGatewayHandler<E>;
+export declare function wrapHandler<E extends APIGatewayProxyEventV2WithLambdaAuthorizer<any>>(handler: RawApiGatewayHandler<E>): APIGatewayHandler<E>;
 //# sourceMappingURL=handlerUtils.d.ts.map

package/dist/lambda/handlerUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handlerUtils.d.ts","sourceRoot":"","sources":["../../src/lambda/handlerUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAGnE,MAAM,MAAM,WAAW,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AAC1C,MAAM,MAAM,SAAS,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AAE1D,MAAM,MAAM,SAAS,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC;AAErF;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,UAAU,EAAE,SAAS,CAAC;IACtB,OAAO,CAAC,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IACtE,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,EAAE,WAAW,CAAC;IACxB,OAAO,CAAC,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IACtE,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CAChC,CAAC;AACF;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,qBAAqB,GAAG,kBAAkB,CAAC;AAG1E,MAAM,MAAM,iBAAiB,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAGpG,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAEhG;;;;;;;;;;;;;EAaE;AACF,wBAAgB,WAAW,CAAC,CAAC,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAKrF"}
+{"version":3,"file":"handlerUtils.d.ts","sourceRoot":"","sources":["../../src/lambda/handlerUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,OAAO,EAAE,0CAA0C,EAAE,MAAM,YAAY,CAAC;AAG/G,MAAM,MAAM,WAAW,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AAC1C,MAAM,MAAM,SAAS,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AAE1D,MAAM,MAAM,SAAS,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC;AAErF;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,UAAU,EAAE,SAAS,CAAC;IACtB,OAAO,CAAC,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IACnD,IAAI,CAAC,EAAE,SAAS,CAAC;IACjB,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,EAAE,WAAW,CAAC;IACxB,OAAO,CAAC,EAAE;QAAE,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC;IACnD,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,eAAe,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CAChC,CAAC;AACF;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,qBAAqB,GAAG,kBAAkB,CAAC;AAG1E,MAAM,MAAM,iBAAiB,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,uBAAuB,CAAC,CAAC;AAGpG,MAAM,MAAM,oBAAoB,CAAC,CAAC,SAAS,0CAA0C,CAAC,GAAG,CAAC,IAAI,CAC5F,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,OAAO,KACb,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAE/B;;;;;;;;;;;;;EAaE;AACF,wBAAgB,WAAW,CAAC,CAAC,SAAS,0CAA0C,CAAC,GAAG,CAAC,EACnF,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC,GAC/B,iBAAiB,CAAC,CAAC,CAAC,CAatB"}

package/dist/lambda/handlerUtils.js

@@ -16,6 +16,13 @@ export const wrapHandler = baseWrapHandler<APIGatewayProxyEventV2WithLambdaAutho
 export function wrapHandler(handler) {
     return async (event, context) => {
         const result = await handler(event, context);
-        return { ...result, body: result.body ? stringify(result.body) : undefined };
+        if (result.body) {
+            const headers = new Headers(result.headers);
+            headers.set('Content-Type', 'application/devalue');
+            return { ...result, headers: Object.fromEntries(headers), body: stringify(result.body) };
+        }
+        else {
+            return { ...result, body: undefined };
+        }
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-ag",
-  "version": "1.0.28",
+  "version": "1.0.29",
   "description": "Useful TS stuff",
   "bugs": "https://github.com/ageorgeh/ts-ag/issues",
   "author": "Alexander Hornung",

package/src/lambda/client.ts

@@ -50,13 +50,19 @@ async function _apiRequest<T = Response>(
     body: bodyMethods.includes(method as any) ? JSON.stringify(input) : undefined,
     credentials: 'include'
   });
+  const contentType = response.headers.get('content-type') ?? '';
 
   let retrieved: Promise<string> | false = false;
   response.json = async () => {
     if (retrieved === false) {
       retrieved = response.text();
     }
-    return await parse(await retrieved);
+
+    if (contentType === 'application/devalue') {
+      return await parse(await retrieved);
+    } else {
+      return JSON.parse(await retrieved);
+    }
   };
   return response as unknown as T;
 }

package/src/lambda/handlerUtils.ts

@@ -1,4 +1,4 @@
-import type { APIGatewayProxyResultV2, Context } from 'aws-lambda';
+import type { APIGatewayProxyResultV2, Context, APIGatewayProxyEventV2WithLambdaAuthorizer } from 'aws-lambda';
 import { stringify } from 'devalue';
 
 export type SuccessCode = 200 | 201 | 204;
@@ -11,7 +11,7 @@ export type ErrorBody = { message: string; field?: { name: string; value: string
  */
 export type ErrorRawProxyResultV2 = {
   statusCode: ErrorCode;
-  headers?: { [header: string]: boolean | number | string } | undefined;
+  headers?: { [header: string]: string } | undefined;
   body?: ErrorBody;
   isBase64Encoded?: boolean | undefined;
   cookies?: string[] | undefined;
@@ -19,7 +19,7 @@ export type ErrorRawProxyResultV2 = {
 
 export type OkRawProxyResultV2 = {
   statusCode: SuccessCode;
-  headers?: { [header: string]: boolean | number | string } | undefined;
+  headers?: { [header: string]: string } | undefined;
   body?: object | undefined;
   isBase64Encoded?: boolean | undefined;
   cookies?: string[] | undefined;
@@ -33,7 +33,10 @@ export type RawProxyResultV2 = ErrorRawProxyResultV2 | OkRawProxyResultV2;
 export type APIGatewayHandler<E> = (event: E, context: Context) => Promise<APIGatewayProxyResultV2>;
 
 // The type of the handler passed into wrapHandler
-export type RawApiGatewayHandler<E> = (event: E, context: Context) => Promise<RawProxyResultV2>;
+export type RawApiGatewayHandler<E extends APIGatewayProxyEventV2WithLambdaAuthorizer<any>> = (
+  event: E,
+  context: Context
+) => Promise<RawProxyResultV2>;
 
 /**
  * Wraps a handler that returns the body as an object rather than a string.
@@ -49,9 +52,19 @@ export type AuthorizerContext = {
 export const wrapHandler = baseWrapHandler<APIGatewayProxyEventV2WithLambdaAuthorizer<AuthorizerContext>>
 
 */
-export function wrapHandler<E>(handler: RawApiGatewayHandler<E>): APIGatewayHandler<E> {
+export function wrapHandler<E extends APIGatewayProxyEventV2WithLambdaAuthorizer<any>>(
+  handler: RawApiGatewayHandler<E>
+): APIGatewayHandler<E> {
   return async (event: E, context: Context): Promise<APIGatewayProxyResultV2> => {
     const result = await handler(event, context);
-    return { ...result, body: result.body ? stringify(result.body) : undefined };
+
+    if (result.body) {
+      const headers = new Headers(result.headers);
+      headers.set('Content-Type', 'application/devalue');
+
+      return { ...result, headers: Object.fromEntries(headers), body: stringify(result.body) };
+    } else {
+      return { ...result, body: undefined };
+    }
   };
 }

package/src/lambda/handlerUtils.unit.test.ts

@@ -15,7 +15,7 @@ describe('wrapHandler', () => {
     const response = await wrapped({} as never, {} as never);
 
     expect(response.statusCode).toBe(200);
-    expect(response.headers).toEqual({ 'content-type': 'application/json' });
+    expect(response.headers).toEqual({ 'content-type': 'application/devalue' });
     expect(response.cookies).toEqual(['a=1']);
     expect(typeof response.body).toBe('string');
     expect(parse(response.body as string)).toEqual({ ok: true, nested: { value: 123 } });