@apideck/unify 0.24.0 → 0.25.0

package/src/funcs/webhookWebhooksCreate.ts

@@ -10,7 +10,7 @@ import { safeParse } from "../lib/schemas.js";
 import { RequestOptions } from "../lib/sdks.js";
 import { extractSecurity, resolveGlobalSecurity } from "../lib/security.js";
 import { pathToFunc } from "../lib/url.js";
-import { APIError } from "../models/errors/apierror.js";
+import { ApideckError } from "../models/errors/apideckerror.js";
 import {
   ConnectionError,
   InvalidRequestError,
@@ -19,6 +19,7 @@ import {
   UnexpectedClientError,
 } from "../models/errors/httpclienterrors.js";
 import * as errors from "../models/errors/index.js";
+import { ResponseValidationError } from "../models/errors/responsevalidationerror.js";
 import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
 import * as operations from "../models/operations/index.js";
 import { APICall, APIPromise } from "../types/async.js";
@@ -42,13 +43,14 @@ export function webhookWebhooksCreate(
     | errors.PaymentRequiredResponse
     | errors.NotFoundResponse
     | errors.UnprocessableResponse
-    | APIError
-    | SDKValidationError
-    | UnexpectedClientError
-    | InvalidRequestError
+    | ApideckError
+    | ResponseValidationError
+    | ConnectionError
     | RequestAbortedError
     | RequestTimeoutError
-    | ConnectionError
+    | InvalidRequestError
+    | UnexpectedClientError
+    | SDKValidationError
   >
 > {
   return new APIPromise($do(
@@ -71,13 +73,14 @@ async function $do(
       | errors.PaymentRequiredResponse
       | errors.NotFoundResponse
       | errors.UnprocessableResponse
-      | APIError
-      | SDKValidationError
-      | UnexpectedClientError
-      | InvalidRequestError
+      | ApideckError
+      | ResponseValidationError
+      | ConnectionError
       | RequestAbortedError
       | RequestTimeoutError
-      | ConnectionError
+      | InvalidRequestError
+      | UnexpectedClientError
+      | SDKValidationError
     >,
     APICall,
   ]
@@ -173,13 +176,14 @@ async function $do(
     | errors.PaymentRequiredResponse
     | errors.NotFoundResponse
     | errors.UnprocessableResponse
-    | APIError
-    | SDKValidationError
-    | UnexpectedClientError
-    | InvalidRequestError
+    | ApideckError
+    | ResponseValidationError
+    | ConnectionError
     | RequestAbortedError
     | RequestTimeoutError
-    | ConnectionError
+    | InvalidRequestError
+    | UnexpectedClientError
+    | SDKValidationError
   >(
     M.json(201, operations.WebhookWebhooksAddResponse$inboundSchema, {
       key: "CreateWebhookResponse",

package/src/funcs/webhookWebhooksDelete.ts

@@ -10,7 +10,7 @@ import { safeParse } from "../lib/schemas.js";
 import { RequestOptions } from "../lib/sdks.js";
 import { extractSecurity, resolveGlobalSecurity } from "../lib/security.js";
 import { pathToFunc } from "../lib/url.js";
-import { APIError } from "../models/errors/apierror.js";
+import { ApideckError } from "../models/errors/apideckerror.js";
 import {
   ConnectionError,
   InvalidRequestError,
@@ -19,6 +19,7 @@ import {
   UnexpectedClientError,
 } from "../models/errors/httpclienterrors.js";
 import * as errors from "../models/errors/index.js";
+import { ResponseValidationError } from "../models/errors/responsevalidationerror.js";
 import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
 import * as operations from "../models/operations/index.js";
 import { APICall, APIPromise } from "../types/async.js";
@@ -42,13 +43,14 @@ export function webhookWebhooksDelete(
     | errors.PaymentRequiredResponse
     | errors.NotFoundResponse
     | errors.UnprocessableResponse
-    | APIError
-    | SDKValidationError
-    | UnexpectedClientError
-    | InvalidRequestError
+    | ApideckError
+    | ResponseValidationError
+    | ConnectionError
     | RequestAbortedError
     | RequestTimeoutError
-    | ConnectionError
+    | InvalidRequestError
+    | UnexpectedClientError
+    | SDKValidationError
   >
 > {
   return new APIPromise($do(
@@ -71,13 +73,14 @@ async function $do(
       | errors.PaymentRequiredResponse
       | errors.NotFoundResponse
       | errors.UnprocessableResponse
-      | APIError
-      | SDKValidationError
-      | UnexpectedClientError
-      | InvalidRequestError
+      | ApideckError
+      | ResponseValidationError
+      | ConnectionError
       | RequestAbortedError
       | RequestTimeoutError
-      | ConnectionError
+      | InvalidRequestError
+      | UnexpectedClientError
+      | SDKValidationError
     >,
     APICall,
   ]
@@ -178,13 +181,14 @@ async function $do(
     | errors.PaymentRequiredResponse
     | errors.NotFoundResponse
     | errors.UnprocessableResponse
-    | APIError
-    | SDKValidationError
-    | UnexpectedClientError
-    | InvalidRequestError
+    | ApideckError
+    | ResponseValidationError
+    | ConnectionError
     | RequestAbortedError
     | RequestTimeoutError
-    | ConnectionError
+    | InvalidRequestError
+    | UnexpectedClientError
+    | SDKValidationError
   >(
     M.json(200, operations.WebhookWebhooksDeleteResponse$inboundSchema, {
       key: "DeleteWebhookResponse",

package/src/funcs/webhookWebhooksGet.ts

@@ -10,7 +10,7 @@ import { safeParse } from "../lib/schemas.js";
 import { RequestOptions } from "../lib/sdks.js";
 import { extractSecurity, resolveGlobalSecurity } from "../lib/security.js";
 import { pathToFunc } from "../lib/url.js";
-import { APIError } from "../models/errors/apierror.js";
+import { ApideckError } from "../models/errors/apideckerror.js";
 import {
   ConnectionError,
   InvalidRequestError,
@@ -19,6 +19,7 @@ import {
   UnexpectedClientError,
 } from "../models/errors/httpclienterrors.js";
 import * as errors from "../models/errors/index.js";
+import { ResponseValidationError } from "../models/errors/responsevalidationerror.js";
 import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
 import * as operations from "../models/operations/index.js";
 import { APICall, APIPromise } from "../types/async.js";
@@ -42,13 +43,14 @@ export function webhookWebhooksGet(
     | errors.PaymentRequiredResponse
     | errors.NotFoundResponse
     | errors.UnprocessableResponse
-    | APIError
-    | SDKValidationError
-    | UnexpectedClientError
-    | InvalidRequestError
+    | ApideckError
+    | ResponseValidationError
+    | ConnectionError
     | RequestAbortedError
     | RequestTimeoutError
-    | ConnectionError
+    | InvalidRequestError
+    | UnexpectedClientError
+    | SDKValidationError
   >
 > {
   return new APIPromise($do(
@@ -71,13 +73,14 @@ async function $do(
       | errors.PaymentRequiredResponse
       | errors.NotFoundResponse
       | errors.UnprocessableResponse
-      | APIError
-      | SDKValidationError
-      | UnexpectedClientError
-      | InvalidRequestError
+      | ApideckError
+      | ResponseValidationError
+      | ConnectionError
       | RequestAbortedError
       | RequestTimeoutError
-      | ConnectionError
+      | InvalidRequestError
+      | UnexpectedClientError
+      | SDKValidationError
     >,
     APICall,
   ]
@@ -177,13 +180,14 @@ async function $do(
     | errors.PaymentRequiredResponse
     | errors.NotFoundResponse
     | errors.UnprocessableResponse
-    | APIError
-    | SDKValidationError
-    | UnexpectedClientError
-    | InvalidRequestError
+    | ApideckError
+    | ResponseValidationError
+    | ConnectionError
     | RequestAbortedError
     | RequestTimeoutError
-    | ConnectionError
+    | InvalidRequestError
+    | UnexpectedClientError
+    | SDKValidationError
   >(
     M.json(200, operations.WebhookWebhooksOneResponse$inboundSchema, {
       key: "GetWebhookResponse",

package/src/funcs/webhookWebhooksList.ts

@@ -11,7 +11,7 @@ import { safeParse } from "../lib/schemas.js";
 import { RequestOptions } from "../lib/sdks.js";
 import { extractSecurity, resolveGlobalSecurity } from "../lib/security.js";
 import { pathToFunc } from "../lib/url.js";
-import { APIError } from "../models/errors/apierror.js";
+import { ApideckError } from "../models/errors/apideckerror.js";
 import {
   ConnectionError,
   InvalidRequestError,
@@ -20,6 +20,7 @@ import {
   UnexpectedClientError,
 } from "../models/errors/httpclienterrors.js";
 import * as errors from "../models/errors/index.js";
+import { ResponseValidationError } from "../models/errors/responsevalidationerror.js";
 import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
 import * as operations from "../models/operations/index.js";
 import { APICall, APIPromise } from "../types/async.js";
@@ -50,13 +51,14 @@ export function webhookWebhooksList(
       | errors.PaymentRequiredResponse
       | errors.NotFoundResponse
       | errors.UnprocessableResponse
-      | APIError
-      | SDKValidationError
-      | UnexpectedClientError
-      | InvalidRequestError
+      | ApideckError
+      | ResponseValidationError
+      | ConnectionError
       | RequestAbortedError
       | RequestTimeoutError
-      | ConnectionError
+      | InvalidRequestError
+      | UnexpectedClientError
+      | SDKValidationError
     >,
     { cursor: string }
   >
@@ -82,13 +84,14 @@ async function $do(
         | errors.PaymentRequiredResponse
         | errors.NotFoundResponse
         | errors.UnprocessableResponse
-        | APIError
-        | SDKValidationError
-        | UnexpectedClientError
-        | InvalidRequestError
+        | ApideckError
+        | ResponseValidationError
+        | ConnectionError
         | RequestAbortedError
         | RequestTimeoutError
-        | ConnectionError
+        | InvalidRequestError
+        | UnexpectedClientError
+        | SDKValidationError
       >,
       { cursor: string }
     >,
@@ -189,13 +192,14 @@ async function $do(
     | errors.PaymentRequiredResponse
     | errors.NotFoundResponse
     | errors.UnprocessableResponse
-    | APIError
-    | SDKValidationError
-    | UnexpectedClientError
-    | InvalidRequestError
+    | ApideckError
+    | ResponseValidationError
+    | ConnectionError
     | RequestAbortedError
     | RequestTimeoutError
-    | ConnectionError
+    | InvalidRequestError
+    | UnexpectedClientError
+    | SDKValidationError
   >(
     M.json(200, operations.WebhookWebhooksAllResponse$inboundSchema, {
       key: "GetWebhooksResponse",
@@ -230,13 +234,14 @@ async function $do(
         | errors.PaymentRequiredResponse
         | errors.NotFoundResponse
         | errors.UnprocessableResponse
-        | APIError
-        | SDKValidationError
-        | UnexpectedClientError
-        | InvalidRequestError
+        | ApideckError
+        | ResponseValidationError
+        | ConnectionError
         | RequestAbortedError
         | RequestTimeoutError
-        | ConnectionError
+        | InvalidRequestError
+        | UnexpectedClientError
+        | SDKValidationError
       >
     >;
     "~next"?: { cursor: string };

package/src/funcs/webhookWebhooksUpdate.ts

@@ -10,7 +10,7 @@ import { safeParse } from "../lib/schemas.js";
 import { RequestOptions } from "../lib/sdks.js";
 import { extractSecurity, resolveGlobalSecurity } from "../lib/security.js";
 import { pathToFunc } from "../lib/url.js";
-import { APIError } from "../models/errors/apierror.js";
+import { ApideckError } from "../models/errors/apideckerror.js";
 import {
   ConnectionError,
   InvalidRequestError,
@@ -19,6 +19,7 @@ import {
   UnexpectedClientError,
 } from "../models/errors/httpclienterrors.js";
 import * as errors from "../models/errors/index.js";
+import { ResponseValidationError } from "../models/errors/responsevalidationerror.js";
 import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
 import * as operations from "../models/operations/index.js";
 import { APICall, APIPromise } from "../types/async.js";
@@ -42,13 +43,14 @@ export function webhookWebhooksUpdate(
     | errors.PaymentRequiredResponse
     | errors.NotFoundResponse
     | errors.UnprocessableResponse
-    | APIError
-    | SDKValidationError
-    | UnexpectedClientError
-    | InvalidRequestError
+    | ApideckError
+    | ResponseValidationError
+    | ConnectionError
     | RequestAbortedError
     | RequestTimeoutError
-    | ConnectionError
+    | InvalidRequestError
+    | UnexpectedClientError
+    | SDKValidationError
   >
 > {
   return new APIPromise($do(
@@ -71,13 +73,14 @@ async function $do(
       | errors.PaymentRequiredResponse
       | errors.NotFoundResponse
       | errors.UnprocessableResponse
-      | APIError
-      | SDKValidationError
-      | UnexpectedClientError
-      | InvalidRequestError
+      | ApideckError
+      | ResponseValidationError
+      | ConnectionError
       | RequestAbortedError
       | RequestTimeoutError
-      | ConnectionError
+      | InvalidRequestError
+      | UnexpectedClientError
+      | SDKValidationError
     >,
     APICall,
   ]
@@ -181,13 +184,14 @@ async function $do(
     | errors.PaymentRequiredResponse
     | errors.NotFoundResponse
     | errors.UnprocessableResponse
-    | APIError
-    | SDKValidationError
-    | UnexpectedClientError
-    | InvalidRequestError
+    | ApideckError
+    | ResponseValidationError
+    | ConnectionError
     | RequestAbortedError
     | RequestTimeoutError
-    | ConnectionError
+    | InvalidRequestError
+    | UnexpectedClientError
+    | SDKValidationError
   >(
     M.json(200, operations.WebhookWebhooksUpdateResponse$inboundSchema, {
       key: "UpdateWebhookResponse",

package/src/index.ts

@@ -4,4 +4,6 @@
 
 export * from "./lib/config.js";
 export * as files from "./lib/files.js";
+export { HTTPClient } from "./lib/http.js";
+export type { Fetcher, HTTPClientOptions } from "./lib/http.js";
 export * from "./sdk/sdk.js";

package/src/lib/config.ts

@@ -68,7 +68,7 @@ export function serverURLFromOptions(options: SDKOptions): URL | null {
 export const SDK_METADATA = {
   language: "typescript",
   openapiDocVersion: "10.17.2",
-  sdkVersion: "0.24.0",
-  genVersion: "2.616.1",
-  userAgent: "speakeasy-sdk/typescript 0.24.0 2.616.1 10.17.2 @apideck/unify",
+  sdkVersion: "0.25.0",
+  genVersion: "2.624.0",
+  userAgent: "speakeasy-sdk/typescript 0.25.0 2.624.0 10.17.2 @apideck/unify",
 } as const;

package/src/lib/matchers.ts

@@ -3,11 +3,10 @@
  */
 
 import { APIError } from "../models/errors/apierror.js";
-import { SDKValidationError } from "../models/errors/sdkvalidationerror.js";
-import { Result } from "../types/fp.js";
+import { ResponseValidationError } from "../models/errors/responsevalidationerror.js";
+import { ERR, OK, Result } from "../types/fp.js";
 import { matchResponse, matchStatusCode, StatusCodePredicate } from "./http.js";
 import { isPlainObject } from "./is-plain-object.js";
-import { safeParse } from "./schemas.js";
 
 export type Encoding =
   | "jsonl"
@@ -182,13 +181,13 @@ export type MatchFunc<T, E> = (
 
 export function match<T, E>(
   ...matchers: Array<Matcher<T, E>>
-): MatchFunc<T, E | APIError | SDKValidationError> {
+): MatchFunc<T, E | APIError | ResponseValidationError> {
   return async function matchFunc(
     response: Response,
     request: Request,
     options?: { resultKey?: string; extraFields?: Record<string, unknown> },
   ): Promise<
-    [result: Result<T, E | APIError | SDKValidationError>, raw: unknown]
+    [result: Result<T, E | APIError | ResponseValidationError>, raw: unknown]
   > {
     let raw: unknown;
     let matcher: Matcher<T, E> | undefined;
@@ -207,20 +206,22 @@ export function match<T, E>(
     }
 
     if (!matcher) {
-      await discardResponseBody(response);
       return [{
         ok: false,
-        error: new APIError("Unexpected API response status or content-type", {
+        error: new APIError("Unexpected Status or Content-Type", {
           response,
           request,
+          body: await response.text().catch(() => ""),
         }),
       }, raw];
     }
 
     const encoding = matcher.enc;
+    let body = "";
     switch (encoding) {
       case "json":
-        raw = await response.json();
+        body = await response.text();
+        raw = JSON.parse(body);
         break;
       case "jsonl":
         raw = response.body;
@@ -232,16 +233,19 @@ export function match<T, E>(
         raw = response.body;
         break;
       case "text":
-        raw = await response.text();
+        body = await response.text();
+        raw = body;
         break;
       case "sse":
         raw = response.body;
         break;
       case "nil":
-        raw = await discardResponseBody(response);
+        body = await response.text();
+        raw = undefined;
         break;
       case "fail":
-        raw = await discardResponseBody(response);
+        body = await response.text();
+        raw = undefined;
         break;
       default:
         encoding satisfies never;
@@ -251,7 +255,7 @@ export function match<T, E>(
     if (matcher.enc === "fail") {
       return [{
         ok: false,
-        error: new APIError("API error occurred", { response, request }),
+        error: new APIError("API error occurred", { request, response, body }),
       }, raw];
     }
 
@@ -263,6 +267,9 @@ export function match<T, E>(
         ...options?.extraFields,
         ...(matcher.hdrs ? { Headers: unpackHeaders(response.headers) } : null),
         ...(isPlainObject(raw) ? raw : null),
+        request$: request,
+        response$: response,
+        body$: body,
       };
     } else if (resultKey) {
       data = {
@@ -278,18 +285,20 @@ export function match<T, E>(
     }
 
     if ("err" in matcher) {
-      const result = safeParse(
+      const result = safeParseResponse(
         data,
         (v: unknown) => matcher.schema.parse(v),
         "Response validation failed",
+        { request, response, body },
       );
       return [result.ok ? { ok: false, error: result.value } : result, raw];
     } else {
       return [
-        safeParse(
+        safeParseResponse(
           data,
           (v: unknown) => matcher.schema.parse(v),
           "Response validation failed",
+          { request, response, body },
         ),
         raw,
       ];
@@ -312,25 +321,22 @@ export function unpackHeaders(headers: Headers): Record<string, string[]> {
   return out;
 }
 
-/**
- * Discards the response body to free up resources.
- *
- * To learn why this is need, see the undici docs:
- * https://undici.nodejs.org/#/?id=garbage-collection
- */
-export async function discardResponseBody(res: Response) {
-  const reader = res.body?.getReader();
-  if (reader == null) {
-    return;
-  }
-
+function safeParseResponse<Inp, Out>(
+  rawValue: Inp,
+  fn: (value: Inp) => Out,
+  errorMessage: string,
+  httpMeta: { response: Response; request: Request; body: string },
+): Result<Out, ResponseValidationError> {
   try {
-    let done = false;
-    while (!done) {
-      const res = await reader.read();
-      done = res.done;
-    }
-  } finally {
-    reader.releaseLock();
+    return OK(fn(rawValue));
+  } catch (err) {
+    return ERR(
+      new ResponseValidationError(errorMessage, {
+        cause: err,
+        rawValue,
+        rawMessage: errorMessage,
+        ...httpMeta,
+      }),
+    );
   }
 }

package/src/models/components/connectionimportdata.ts

@@ -27,17 +27,12 @@ export type Credentials = {
   expiresIn?: number | null | undefined;
 };
 
-/**
- * Connection settings. Values will persist to `form_fields` with corresponding id
- */
-export type Settings = {};
-
 export type ConnectionImportData = {
   credentials?: Credentials | undefined;
   /**
    * Connection settings. Values will persist to `form_fields` with corresponding id
    */
-  settings?: Settings | null | undefined;
+  settings?: { [k: string]: any } | null | undefined;
   /**
    * Attach your own consumer specific metadata
    */
@@ -119,50 +114,6 @@ export function credentialsFromJSON(
   );
 }
 
-/** @internal */
-export const Settings$inboundSchema: z.ZodType<
-  Settings,
-  z.ZodTypeDef,
-  unknown
-> = z.object({});
-
-/** @internal */
-export type Settings$Outbound = {};
-
-/** @internal */
-export const Settings$outboundSchema: z.ZodType<
-  Settings$Outbound,
-  z.ZodTypeDef,
-  Settings
-> = z.object({});
-
-/**
- * @internal
- * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
- */
-export namespace Settings$ {
-  /** @deprecated use `Settings$inboundSchema` instead. */
-  export const inboundSchema = Settings$inboundSchema;
-  /** @deprecated use `Settings$outboundSchema` instead. */
-  export const outboundSchema = Settings$outboundSchema;
-  /** @deprecated use `Settings$Outbound` instead. */
-  export type Outbound = Settings$Outbound;
-}
-
-export function settingsToJSON(settings: Settings): string {
-  return JSON.stringify(Settings$outboundSchema.parse(settings));
-}
-
-export function settingsFromJSON(
-  jsonString: string,
-): SafeParseResult<Settings, SDKValidationError> {
-  return safeParse(
-    jsonString,
-    (x) => Settings$inboundSchema.parse(JSON.parse(x)),
-    `Failed to parse 'Settings' from JSON`,
-  );
-}
-
 /** @internal */
 export const ConnectionImportData$inboundSchema: z.ZodType<
   ConnectionImportData,
@@ -170,14 +121,14 @@ export const ConnectionImportData$inboundSchema: z.ZodType<
   unknown
 > = z.object({
   credentials: z.lazy(() => Credentials$inboundSchema).optional(),
-  settings: z.nullable(z.lazy(() => Settings$inboundSchema)).optional(),
+  settings: z.nullable(z.record(z.any())).optional(),
   metadata: z.nullable(z.record(z.any())).optional(),
 });
 
 /** @internal */
 export type ConnectionImportData$Outbound = {
   credentials?: Credentials$Outbound | undefined;
-  settings?: Settings$Outbound | null | undefined;
+  settings?: { [k: string]: any } | null | undefined;
   metadata?: { [k: string]: any } | null | undefined;
 };
 
@@ -188,7 +139,7 @@ export const ConnectionImportData$outboundSchema: z.ZodType<
   ConnectionImportData
 > = z.object({
   credentials: z.lazy(() => Credentials$outboundSchema).optional(),
-  settings: z.nullable(z.lazy(() => Settings$outboundSchema)).optional(),
+  settings: z.nullable(z.record(z.any())).optional(),
   metadata: z.nullable(z.record(z.any())).optional(),
 });
 

package/src/models/components/journalentry.ts

@@ -53,6 +53,7 @@ export const JournalEntryStatus = {
   Voided: "voided",
   Rejected: "rejected",
   Deleted: "deleted",
+  Other: "other",
 } as const;
 /**
  * Journal entry status