ce-storefront 0.11.2 → 0.11.3

package/src/funcs/ordersCreateOrder.ts

@@ -36,7 +36,7 @@ export function ordersCreateOrder(
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    operations.CreateOrderResponseBody,
+    operations.CreateOrderResponse,
     | errors.BadRequest
     | errors.Unauthorized
     | errors.NotFound
@@ -63,7 +63,7 @@ async function $do(
 ): Promise<
   [
     Result<
-      operations.CreateOrderResponseBody,
+      operations.CreateOrderResponse,
       | errors.BadRequest
       | errors.Unauthorized
       | errors.NotFound
@@ -144,7 +144,7 @@ async function $do(
   };
 
   const [result] = await M.match<
-    operations.CreateOrderResponseBody,
+    operations.CreateOrderResponse,
     | errors.BadRequest
     | errors.Unauthorized
     | errors.NotFound
@@ -156,13 +156,15 @@ async function $do(
     | RequestTimeoutError
     | ConnectionError
   >(
-    M.json(200, operations.CreateOrderResponseBody$inboundSchema),
+    M.json(200, operations.CreateOrderResponse$inboundSchema, {
+      key: "object",
+    }),
     M.jsonErr(400, errors.BadRequest$inboundSchema),
     M.jsonErr(401, errors.Unauthorized$inboundSchema),
     M.jsonErr(404, errors.NotFound$inboundSchema),
     M.fail("4XX"),
     M.fail("5XX"),
-  )(response, { extraFields: responseFields });
+  )(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }

package/src/funcs/ordersGetOrderDetail.ts

@@ -36,7 +36,7 @@ export function ordersGetOrderDetail(
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    operations.GetOrderDetailResponseBody,
+    operations.GetOrderDetailResponse,
     | errors.Unauthorized
     | errors.NotFound
     | CeError
@@ -62,7 +62,7 @@ async function $do(
 ): Promise<
   [
     Result<
-      operations.GetOrderDetailResponseBody,
+      operations.GetOrderDetailResponse,
       | errors.Unauthorized
       | errors.NotFound
       | CeError
@@ -148,7 +148,7 @@ async function $do(
   };
 
   const [result] = await M.match<
-    operations.GetOrderDetailResponseBody,
+    operations.GetOrderDetailResponse,
     | errors.Unauthorized
     | errors.NotFound
     | CeError
@@ -159,12 +159,14 @@ async function $do(
     | RequestTimeoutError
     | ConnectionError
   >(
-    M.json(200, operations.GetOrderDetailResponseBody$inboundSchema),
+    M.json(200, operations.GetOrderDetailResponse$inboundSchema, {
+      key: "object",
+    }),
     M.jsonErr(401, errors.Unauthorized$inboundSchema),
     M.jsonErr(404, errors.NotFound$inboundSchema),
     M.fail("4XX"),
     M.fail("5XX"),
-  )(response, { extraFields: responseFields });
+  )(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }

package/src/funcs/ordersGetPaymentStatus.ts

@@ -35,7 +35,7 @@ export function ordersGetPaymentStatus(
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    operations.GetPaymentStatusResponseBody,
+    operations.GetPaymentStatusResponse,
     | CeError
     | SDKValidationError
     | UnexpectedClientError
@@ -59,7 +59,7 @@ async function $do(
 ): Promise<
   [
     Result<
-      operations.GetPaymentStatusResponseBody,
+      operations.GetPaymentStatusResponse,
       | CeError
       | SDKValidationError
       | UnexpectedClientError
@@ -138,8 +138,12 @@ async function $do(
   }
   const response = doResult.value;
 
+  const responseFields = {
+    HttpMeta: { Response: response, Request: req },
+  };
+
   const [result] = await M.match<
-    operations.GetPaymentStatusResponseBody,
+    operations.GetPaymentStatusResponse,
     | CeError
     | SDKValidationError
     | UnexpectedClientError
@@ -148,10 +152,12 @@ async function $do(
     | RequestTimeoutError
     | ConnectionError
   >(
-    M.json(200, operations.GetPaymentStatusResponseBody$inboundSchema),
+    M.json(200, operations.GetPaymentStatusResponse$inboundSchema, {
+      key: "object",
+    }),
     M.fail("4XX"),
     M.fail("5XX"),
-  )(response);
+  )(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }

package/src/funcs/ordersListOrderShipments.ts

@@ -36,7 +36,7 @@ export function ordersListOrderShipments(
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    operations.ListOrderShipmentsResponseBody,
+    operations.ListOrderShipmentsResponse,
     | errors.Unauthorized
     | errors.NotFound
     | CeError
@@ -62,7 +62,7 @@ async function $do(
 ): Promise<
   [
     Result<
-      operations.ListOrderShipmentsResponseBody,
+      operations.ListOrderShipmentsResponse,
       | errors.Unauthorized
       | errors.NotFound
       | CeError
@@ -148,7 +148,7 @@ async function $do(
   };
 
   const [result] = await M.match<
-    operations.ListOrderShipmentsResponseBody,
+    operations.ListOrderShipmentsResponse,
     | errors.Unauthorized
     | errors.NotFound
     | CeError
@@ -159,12 +159,14 @@ async function $do(
     | RequestTimeoutError
     | ConnectionError
   >(
-    M.json(200, operations.ListOrderShipmentsResponseBody$inboundSchema),
+    M.json(200, operations.ListOrderShipmentsResponse$inboundSchema, {
+      key: "object",
+    }),
     M.jsonErr(401, errors.Unauthorized$inboundSchema),
     M.jsonErr(404, errors.NotFound$inboundSchema),
     M.fail("4XX"),
     M.fail("5XX"),
-  )(response, { extraFields: responseFields });
+  )(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }

package/src/funcs/ordersListOrders.ts

@@ -35,7 +35,7 @@ export function ordersListOrders(
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    operations.ListOrdersResponseBody,
+    operations.ListOrdersResponse,
     | CeError
     | SDKValidationError
     | UnexpectedClientError
@@ -59,7 +59,7 @@ async function $do(
 ): Promise<
   [
     Result<
-      operations.ListOrdersResponseBody,
+      operations.ListOrdersResponse,
       | CeError
       | SDKValidationError
       | UnexpectedClientError
@@ -140,8 +140,12 @@ async function $do(
   }
   const response = doResult.value;
 
+  const responseFields = {
+    HttpMeta: { Response: response, Request: req },
+  };
+
   const [result] = await M.match<
-    operations.ListOrdersResponseBody,
+    operations.ListOrdersResponse,
     | CeError
     | SDKValidationError
     | UnexpectedClientError
@@ -150,10 +154,10 @@ async function $do(
     | RequestTimeoutError
     | ConnectionError
   >(
-    M.json(200, operations.ListOrdersResponseBody$inboundSchema),
+    M.json(200, operations.ListOrdersResponse$inboundSchema, { key: "object" }),
     M.fail([401, "4XX"]),
     M.fail("5XX"),
-  )(response);
+  )(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }

package/src/funcs/ordersRetryOrderPayment.ts

@@ -36,7 +36,7 @@ export function ordersRetryOrderPayment(
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    operations.RetryOrderPaymentResponseBody,
+    operations.RetryOrderPaymentResponse,
     | errors.BadRequest
     | errors.Unauthorized
     | errors.NotFound
@@ -63,7 +63,7 @@ async function $do(
 ): Promise<
   [
     Result<
-      operations.RetryOrderPaymentResponseBody,
+      operations.RetryOrderPaymentResponse,
       | errors.BadRequest
       | errors.Unauthorized
       | errors.NotFound
@@ -151,7 +151,7 @@ async function $do(
   };
 
   const [result] = await M.match<
-    operations.RetryOrderPaymentResponseBody,
+    operations.RetryOrderPaymentResponse,
     | errors.BadRequest
     | errors.Unauthorized
     | errors.NotFound
@@ -163,13 +163,15 @@ async function $do(
     | RequestTimeoutError
     | ConnectionError
   >(
-    M.json(200, operations.RetryOrderPaymentResponseBody$inboundSchema),
+    M.json(200, operations.RetryOrderPaymentResponse$inboundSchema, {
+      key: "object",
+    }),
     M.jsonErr(400, errors.BadRequest$inboundSchema),
     M.jsonErr(401, errors.Unauthorized$inboundSchema),
     M.jsonErr(404, errors.NotFound$inboundSchema),
     M.fail("4XX"),
     M.fail("5XX"),
-  )(response, { extraFields: responseFields });
+  )(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }

package/src/funcs/shippingCheckDeliveryAvailability.ts

@@ -36,7 +36,7 @@ export function shippingCheckDeliveryAvailability(
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    operations.CheckDeliveryAvailabilityResponseBody,
+    operations.CheckDeliveryAvailabilityResponse,
     | errors.Unauthorized
     | CeError
     | SDKValidationError
@@ -61,7 +61,7 @@ async function $do(
 ): Promise<
   [
     Result<
-      operations.CheckDeliveryAvailabilityResponseBody,
+      operations.CheckDeliveryAvailabilityResponse,
       | errors.Unauthorized
       | CeError
       | SDKValidationError
@@ -149,7 +149,7 @@ async function $do(
   };
 
   const [result] = await M.match<
-    operations.CheckDeliveryAvailabilityResponseBody,
+    operations.CheckDeliveryAvailabilityResponse,
     | errors.Unauthorized
     | CeError
     | SDKValidationError
@@ -159,11 +159,13 @@ async function $do(
     | RequestTimeoutError
     | ConnectionError
   >(
-    M.json(200, operations.CheckDeliveryAvailabilityResponseBody$inboundSchema),
+    M.json(200, operations.CheckDeliveryAvailabilityResponse$inboundSchema, {
+      key: "object",
+    }),
     M.jsonErr(401, errors.Unauthorized$inboundSchema),
     M.fail("4XX"),
     M.fail("5XX"),
-  )(response, { extraFields: responseFields });
+  )(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }

package/src/funcs/shippingCheckServiceability.ts

@@ -35,7 +35,7 @@ export function shippingCheckServiceability(
   options?: RequestOptions,
 ): APIPromise<
   Result<
-    operations.ShippingMethodsResponseBody,
+    operations.ShippingMethodsResponse,
     | CeError
     | SDKValidationError
     | UnexpectedClientError
@@ -59,7 +59,7 @@ async function $do(
 ): Promise<
   [
     Result<
-      operations.ShippingMethodsResponseBody,
+      operations.ShippingMethodsResponse,
       | CeError
       | SDKValidationError
       | UnexpectedClientError
@@ -137,8 +137,12 @@ async function $do(
   }
   const response = doResult.value;
 
+  const responseFields = {
+    HttpMeta: { Response: response, Request: req },
+  };
+
   const [result] = await M.match<
-    operations.ShippingMethodsResponseBody,
+    operations.ShippingMethodsResponse,
     | CeError
     | SDKValidationError
     | UnexpectedClientError
@@ -147,10 +151,12 @@ async function $do(
     | RequestTimeoutError
     | ConnectionError
   >(
-    M.json(200, operations.ShippingMethodsResponseBody$inboundSchema),
+    M.json(200, operations.ShippingMethodsResponse$inboundSchema, {
+      key: "object",
+    }),
     M.fail("4XX"),
     M.fail("5XX"),
-  )(response);
+  )(response, req, { extraFields: responseFields });
   if (!result.ok) {
     return [result, { status: "complete", request: req, response }];
   }

package/src/lib/config.ts

@@ -76,7 +76,7 @@ export function serverURLFromOptions(options: SDKOptions): URL | null {
 export const SDK_METADATA = {
   language: "typescript",
   openapiDocVersion: "1.0",
-  sdkVersion: "0.11.2",
-  genVersion: "2.607.0",
-  userAgent: "speakeasy-sdk/typescript 0.11.2 2.607.0 1.0 ce-storefront",
+  sdkVersion: "0.11.3",
+  genVersion: "2.610.0",
+  userAgent: "speakeasy-sdk/typescript 0.11.3 2.610.0 1.0 ce-storefront",
 } as const;

package/src/lib/matchers.ts

@@ -176,6 +176,7 @@ export type MatchedError<Matchers> = Matchers extends Matcher<any, infer E>[]
   : never;
 export type MatchFunc<T, E> = (
   response: Response,
+  request: Request,
   options?: { resultKey?: string; extraFields?: Record<string, unknown> },
 ) => Promise<[result: Result<T, E>, raw: unknown]>;
 
@@ -184,6 +185,7 @@ export function match<T, E>(
 ): MatchFunc<T, E | CeError | SDKValidationError> {
   return async function matchFunc(
     response: Response,
+    request: Request,
     options?: { resultKey?: string; extraFields?: Record<string, unknown> },
   ): Promise<
     [result: Result<T, E | CeError | SDKValidationError>, raw: unknown]
@@ -205,15 +207,14 @@ export function match<T, E>(
     }
 
     if (!matcher) {
-      const responseBody = await response.text();
+      await discardResponseBody(response);
       return [{
         ok: false,
-        error: new CeError(
-          "Unexpected API response status or content-type",
+        error: new CeError("Unexpected API response status or content-type", {
           response,
-          responseBody,
-        ),
-      }, responseBody];
+          request,
+        }),
+      }, raw];
     }
 
     const encoding = matcher.enc;
@@ -240,7 +241,7 @@ export function match<T, E>(
         raw = await discardResponseBody(response);
         break;
       case "fail":
-        raw = await response.text();
+        raw = await discardResponseBody(response);
         break;
       default:
         encoding satisfies never;
@@ -250,11 +251,7 @@ export function match<T, E>(
     if (matcher.enc === "fail") {
       return [{
         ok: false,
-        error: new CeError(
-          "API error occurred",
-          response,
-          typeof raw === "string" ? raw : "",
-        ),
+        error: new CeError("API error occurred", { response, request }),
       }, raw];
     }
 
@@ -273,14 +270,11 @@ export function match<T, E>(
         ...(matcher.hdrs ? { Headers: unpackHeaders(response.headers) } : null),
         [resultKey]: raw,
       };
-    } else if (matcher.hdrs) {
+    } else {
       data = {
         ...options?.extraFields,
         ...(matcher.hdrs ? { Headers: unpackHeaders(response.headers) } : null),
-        ...(isPlainObject(raw) ? raw : null),
       };
-    } else {
-      data = raw;
     }
 
     if ("err" in matcher) {

package/src/models/components/httpmetadata.ts

@@ -0,0 +1,87 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import * as z from "zod";
+import { remap as remap$ } from "../../lib/primitives.js";
+import { safeParse } from "../../lib/schemas.js";
+import { Result as SafeParseResult } from "../../types/fp.js";
+import { SDKValidationError } from "../errors/sdkvalidationerror.js";
+
+export type HTTPMetadata = {
+  /**
+   * Raw HTTP response; suitable for custom response parsing
+   */
+  response: Response;
+  /**
+   * Raw HTTP request; suitable for debugging
+   */
+  request: Request;
+};
+
+/** @internal */
+export const HTTPMetadata$inboundSchema: z.ZodType<
+  HTTPMetadata,
+  z.ZodTypeDef,
+  unknown
+> = z.object({
+  Response: z.instanceof(Response),
+  Request: z.instanceof(Request),
+}).transform((v) => {
+  return remap$(v, {
+    "Response": "response",
+    "Request": "request",
+  });
+});
+
+/** @internal */
+export type HTTPMetadata$Outbound = {
+  Response: never;
+  Request: never;
+};
+
+/** @internal */
+export const HTTPMetadata$outboundSchema: z.ZodType<
+  HTTPMetadata$Outbound,
+  z.ZodTypeDef,
+  HTTPMetadata
+> = z.object({
+  response: z.instanceof(Response).transform(() => {
+    throw new Error("Response cannot be serialized");
+  }),
+  request: z.instanceof(Request).transform(() => {
+    throw new Error("Response cannot be serialized");
+  }),
+}).transform((v) => {
+  return remap$(v, {
+    response: "Response",
+    request: "Request",
+  });
+});
+
+/**
+ * @internal
+ * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
+ */
+export namespace HTTPMetadata$ {
+  /** @deprecated use `HTTPMetadata$inboundSchema` instead. */
+  export const inboundSchema = HTTPMetadata$inboundSchema;
+  /** @deprecated use `HTTPMetadata$outboundSchema` instead. */
+  export const outboundSchema = HTTPMetadata$outboundSchema;
+  /** @deprecated use `HTTPMetadata$Outbound` instead. */
+  export type Outbound = HTTPMetadata$Outbound;
+}
+
+export function httpMetadataToJSON(httpMetadata: HTTPMetadata): string {
+  return JSON.stringify(HTTPMetadata$outboundSchema.parse(httpMetadata));
+}
+
+export function httpMetadataFromJSON(
+  jsonString: string,
+): SafeParseResult<HTTPMetadata, SDKValidationError> {
+  return safeParse(
+    jsonString,
+    (x) => HTTPMetadata$inboundSchema.parse(JSON.parse(x)),
+    `Failed to parse 'HTTPMetadata' from JSON`,
+  );
+}

package/src/models/components/index.ts

@@ -22,6 +22,7 @@ export * from "./dateattribute.js";
 export * from "./discountbasedpromotion.js";
 export * from "./fixedpricepromotion.js";
 export * from "./freegoodspromotion.js";
+export * from "./httpmetadata.js";
 export * from "./item.js";
 export * from "./juspaypaymentgatewayparams.js";
 export * from "./juspaypaymentinfo.js";

package/src/models/errors/ceerror.ts

@@ -3,25 +3,19 @@
  */
 
 export class CeError extends Error {
-  public readonly statusCode: number;
-  public readonly contentType: string;
-
   constructor(
     message: string,
-    public readonly rawResponse: Response,
-    public readonly body: string = "",
+    public readonly httpMeta: {
+      response: Response;
+      request: Request;
+    },
   ) {
-    const statusCode = rawResponse.status;
-    const contentType = rawResponse.headers.get("content-type") || "";
-    const bodyString = body.length > 0 ? `\n${body}` : "";
-
     super(
-      `${message}: Status ${statusCode} Content-Type ${contentType} Body ${bodyString}`,
+      `${message}: Status ${httpMeta.response.status} Content-Type ${
+        httpMeta.response.headers.get("content-type") || ""
+      }`,
     );
 
-    this.statusCode = statusCode;
-    this.contentType = contentType;
-
     this.name = "CeError";
   }
 }

package/src/models/operations/applycoupon.ts

@@ -37,6 +37,14 @@ export type ApplyCouponResponseBody = {
   content: ApplyCouponContent;
 };
 
+export type ApplyCouponResponse = {
+  httpMeta: components.HTTPMetadata;
+  /**
+   * OK
+   */
+  object?: ApplyCouponResponseBody | undefined;
+};
+
 /** @internal */
 export const ApplyCouponRequestBody$inboundSchema: z.ZodType<
   ApplyCouponRequestBody,
@@ -277,3 +285,68 @@ export function applyCouponResponseBodyFromJSON(
     `Failed to parse 'ApplyCouponResponseBody' from JSON`,
   );
 }
+
+/** @internal */
+export const ApplyCouponResponse$inboundSchema: z.ZodType<
+  ApplyCouponResponse,
+  z.ZodTypeDef,
+  unknown
+> = z.object({
+  HttpMeta: components.HTTPMetadata$inboundSchema,
+  object: z.lazy(() => ApplyCouponResponseBody$inboundSchema).optional(),
+}).transform((v) => {
+  return remap$(v, {
+    "HttpMeta": "httpMeta",
+  });
+});
+
+/** @internal */
+export type ApplyCouponResponse$Outbound = {
+  HttpMeta: components.HTTPMetadata$Outbound;
+  object?: ApplyCouponResponseBody$Outbound | undefined;
+};
+
+/** @internal */
+export const ApplyCouponResponse$outboundSchema: z.ZodType<
+  ApplyCouponResponse$Outbound,
+  z.ZodTypeDef,
+  ApplyCouponResponse
+> = z.object({
+  httpMeta: components.HTTPMetadata$outboundSchema,
+  object: z.lazy(() => ApplyCouponResponseBody$outboundSchema).optional(),
+}).transform((v) => {
+  return remap$(v, {
+    httpMeta: "HttpMeta",
+  });
+});
+
+/**
+ * @internal
+ * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
+ */
+export namespace ApplyCouponResponse$ {
+  /** @deprecated use `ApplyCouponResponse$inboundSchema` instead. */
+  export const inboundSchema = ApplyCouponResponse$inboundSchema;
+  /** @deprecated use `ApplyCouponResponse$outboundSchema` instead. */
+  export const outboundSchema = ApplyCouponResponse$outboundSchema;
+  /** @deprecated use `ApplyCouponResponse$Outbound` instead. */
+  export type Outbound = ApplyCouponResponse$Outbound;
+}
+
+export function applyCouponResponseToJSON(
+  applyCouponResponse: ApplyCouponResponse,
+): string {
+  return JSON.stringify(
+    ApplyCouponResponse$outboundSchema.parse(applyCouponResponse),
+  );
+}
+
+export function applyCouponResponseFromJSON(
+  jsonString: string,
+): SafeParseResult<ApplyCouponResponse, SDKValidationError> {
+  return safeParse(
+    jsonString,
+    (x) => ApplyCouponResponse$inboundSchema.parse(JSON.parse(x)),
+    `Failed to parse 'ApplyCouponResponse' from JSON`,
+  );
+}