@polar-sh/sdk 0.9.0 → 0.10.0

package/src/funcs/usersSubscriptionsList.ts

@@ -4,9 +4,9 @@
 
 import { PolarCore } from "../core.js";
 import { dlv } from "../lib/dlv.js";
-import { encodeFormQuery as encodeFormQuery$ } from "../lib/encodings.js";
-import * as m$ from "../lib/matchers.js";
-import * as schemas$ from "../lib/schemas.js";
+import { encodeFormQuery } from "../lib/encodings.js";
+import * as M from "../lib/matchers.js";
+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";
@@ -36,7 +36,7 @@ import {
  * List my subscriptions.
  */
 export async function usersSubscriptionsList(
-  client$: PolarCore,
+  client: PolarCore,
   request: operations.UsersSubscriptionsListRequest,
   options?: RequestOptions,
 ): Promise<
@@ -54,64 +54,64 @@ export async function usersSubscriptionsList(
     >
   >
 > {
-  const input$ = request;
+  const input = request;
 
-  const parsed$ = schemas$.safeParse(
-    input$,
-    (value$) =>
-      operations.UsersSubscriptionsListRequest$outboundSchema.parse(value$),
+  const parsed = safeParse(
+    input,
+    (value) =>
+      operations.UsersSubscriptionsListRequest$outboundSchema.parse(value),
     "Input validation failed",
   );
-  if (!parsed$.ok) {
-    return haltIterator(parsed$);
+  if (!parsed.ok) {
+    return haltIterator(parsed);
   }
-  const payload$ = parsed$.value;
-  const body$ = null;
+  const payload = parsed.value;
+  const body = null;
 
-  const path$ = pathToFunc("/v1/users/subscriptions/")();
+  const path = pathToFunc("/v1/users/subscriptions/")();
 
-  const query$ = encodeFormQuery$({
-    "active": payload$.active,
-    "limit": payload$.limit,
-    "organization_id": payload$.organization_id,
-    "page": payload$.page,
-    "product_id": payload$.product_id,
-    "query": payload$.query,
-    "sorting": payload$.sorting,
+  const query = encodeFormQuery({
+    "active": payload.active,
+    "limit": payload.limit,
+    "organization_id": payload.organization_id,
+    "page": payload.page,
+    "product_id": payload.product_id,
+    "query": payload.query,
+    "sorting": payload.sorting,
   });
 
-  const headers$ = new Headers({
+  const headers = new Headers({
     Accept: "application/json",
   });
 
-  const accessToken$ = await extractSecurity(client$.options$.accessToken);
-  const security$ = accessToken$ == null ? {} : { accessToken: accessToken$ };
+  const secConfig = await extractSecurity(client._options.accessToken);
+  const securityInput = secConfig == null ? {} : { accessToken: secConfig };
   const context = {
     operationID: "users:subscriptions:list",
     oAuth2Scopes: [],
-    securitySource: client$.options$.accessToken,
+    securitySource: client._options.accessToken,
   };
-  const securitySettings$ = resolveGlobalSecurity(security$);
+  const requestSecurity = resolveGlobalSecurity(securityInput);
 
-  const requestRes = client$.createRequest$(context, {
-    security: securitySettings$,
+  const requestRes = client._createRequest(context, {
+    security: requestSecurity,
     method: "GET",
-    path: path$,
-    headers: headers$,
-    query: query$,
-    body: body$,
-    timeoutMs: options?.timeoutMs || client$.options$.timeoutMs || -1,
+    path: path,
+    headers: headers,
+    query: query,
+    body: body,
+    timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1,
   }, options);
   if (!requestRes.ok) {
     return haltIterator(requestRes);
   }
-  const request$ = requestRes.value;
+  const req = requestRes.value;
 
-  const doResult = await client$.do$(request$, {
+  const doResult = await client._do(req, {
     context,
     errorCodes: ["422", "4XX", "5XX"],
     retryConfig: options?.retries
-      || client$.options$.retryConfig,
+      || client._options.retryConfig,
     retryCodes: options?.retryCodes || ["429", "500", "502", "503", "504"],
   });
   if (!doResult.ok) {
@@ -119,11 +119,11 @@ export async function usersSubscriptionsList(
   }
   const response = doResult.value;
 
-  const responseFields$ = {
-    HttpMeta: { Response: response, Request: request$ },
+  const responseFields = {
+    HttpMeta: { Response: response, Request: req },
   };
 
-  const [result$, raw$] = await m$.match<
+  const [result, raw] = await M.match<
     operations.UsersSubscriptionsListResponse,
     | errors.HTTPValidationError
     | SDKError
@@ -134,14 +134,14 @@ export async function usersSubscriptionsList(
     | RequestTimeoutError
     | ConnectionError
   >(
-    m$.json(200, operations.UsersSubscriptionsListResponse$inboundSchema, {
+    M.json(200, operations.UsersSubscriptionsListResponse$inboundSchema, {
       key: "Result",
     }),
-    m$.jsonErr(422, errors.HTTPValidationError$inboundSchema),
-    m$.fail(["4XX", "5XX"]),
-  )(response, { extraFields: responseFields$ });
-  if (!result$.ok) {
-    return haltIterator(result$);
+    M.jsonErr(422, errors.HTTPValidationError$inboundSchema),
+    M.fail(["4XX", "5XX"]),
+  )(response, { extraFields: responseFields });
+  if (!result.ok) {
+    return haltIterator(result);
   }
 
   const nextFunc = (
@@ -159,7 +159,7 @@ export async function usersSubscriptionsList(
       | ConnectionError
     >
   > => {
-    const page = input$?.page || 0;
+    const page = input?.page || 0;
     const nextPage = page + 1;
     const numPages = dlv(responseData, "pagination.max_page");
     if (numPages == null || numPages <= page) {
@@ -173,22 +173,22 @@ export async function usersSubscriptionsList(
     if (!Array.isArray(results) || !results.length) {
       return () => null;
     }
-    const limit = input$?.limit || 0;
+    const limit = input?.limit || 0;
     if (results.length < limit) {
       return () => null;
     }
 
     return () =>
       usersSubscriptionsList(
-        client$,
+        client,
         {
-          ...input$,
+          ...input,
           page: nextPage,
         },
         options,
       );
   };
 
-  const page$ = { ...result$, next: nextFunc(raw$) };
-  return { ...page$, ...createPageIterator(page$, (v) => !v.ok) };
+  const page = { ...result, next: nextFunc(raw) };
+  return { ...page, ...createPageIterator(page, (v) => !v.ok) };
 }

package/src/funcs/usersSubscriptionsUpdate.ts

@@ -3,12 +3,9 @@
  */
 
 import { PolarCore } from "../core.js";
-import {
-  encodeJSON as encodeJSON$,
-  encodeSimple as encodeSimple$,
-} from "../lib/encodings.js";
-import * as m$ from "../lib/matchers.js";
-import * as schemas$ from "../lib/schemas.js";
+import { encodeJSON, encodeSimple } from "../lib/encodings.js";
+import * as M from "../lib/matchers.js";
+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";
@@ -33,13 +30,12 @@ import { Result } from "../types/fp.js";
  * Update a subscription.
  */
 export async function usersSubscriptionsUpdate(
-  client$: PolarCore,
+  client: PolarCore,
   request: operations.UsersSubscriptionsUpdateRequest,
   options?: RequestOptions,
 ): Promise<
   Result<
     components.UserSubscription,
-    | errors.FreeSubscriptionUpgrade
     | errors.ResourceNotFound
     | errors.HTTPValidationError
     | SDKError
@@ -51,63 +47,63 @@ export async function usersSubscriptionsUpdate(
     | ConnectionError
   >
 > {
-  const input$ = request;
+  const input = request;
 
-  const parsed$ = schemas$.safeParse(
-    input$,
-    (value$) =>
-      operations.UsersSubscriptionsUpdateRequest$outboundSchema.parse(value$),
+  const parsed = safeParse(
+    input,
+    (value) =>
+      operations.UsersSubscriptionsUpdateRequest$outboundSchema.parse(value),
     "Input validation failed",
   );
-  if (!parsed$.ok) {
-    return parsed$;
+  if (!parsed.ok) {
+    return parsed;
   }
-  const payload$ = parsed$.value;
-  const body$ = encodeJSON$("body", payload$.UserSubscriptionUpdate, {
+  const payload = parsed.value;
+  const body = encodeJSON("body", payload.UserSubscriptionUpdate, {
     explode: true,
   });
 
-  const pathParams$ = {
-    id: encodeSimple$("id", payload$.id, {
+  const pathParams = {
+    id: encodeSimple("id", payload.id, {
       explode: false,
       charEncoding: "percent",
     }),
   };
 
-  const path$ = pathToFunc("/v1/users/subscriptions/{id}")(pathParams$);
+  const path = pathToFunc("/v1/users/subscriptions/{id}")(pathParams);
 
-  const headers$ = new Headers({
+  const headers = new Headers({
     "Content-Type": "application/json",
     Accept: "application/json",
   });
 
-  const accessToken$ = await extractSecurity(client$.options$.accessToken);
-  const security$ = accessToken$ == null ? {} : { accessToken: accessToken$ };
+  const secConfig = await extractSecurity(client._options.accessToken);
+  const securityInput = secConfig == null ? {} : { accessToken: secConfig };
   const context = {
     operationID: "users:subscriptions:update",
     oAuth2Scopes: [],
-    securitySource: client$.options$.accessToken,
+    securitySource: client._options.accessToken,
   };
-  const securitySettings$ = resolveGlobalSecurity(security$);
+  const requestSecurity = resolveGlobalSecurity(securityInput);
 
-  const requestRes = client$.createRequest$(context, {
-    security: securitySettings$,
+  const requestRes = client._createRequest(context, {
+    security: requestSecurity,
     method: "PATCH",
-    path: path$,
-    headers: headers$,
-    body: body$,
-    timeoutMs: options?.timeoutMs || client$.options$.timeoutMs || -1,
+    path: path,
+    headers: headers,
+    body: body,
+    timeoutMs: options?.timeoutMs || client._options.timeoutMs || -1,
   }, options);
   if (!requestRes.ok) {
     return requestRes;
   }
-  const request$ = requestRes.value;
+  const req = requestRes.value;
 
-  const doResult = await client$.do$(request$, {
+  const doResult = await client._do(req, {
     context,
-    errorCodes: ["403", "404", "422", "4XX", "5XX"],
+    errorCodes: ["404", "422", "4XX", "5XX"],
     retryConfig: options?.retries
-      || client$.options$.retryConfig,
+      || client._options.retryConfig,
     retryCodes: options?.retryCodes || ["429", "500", "502", "503", "504"],
   });
   if (!doResult.ok) {
@@ -115,13 +111,12 @@ export async function usersSubscriptionsUpdate(
   }
   const response = doResult.value;
 
-  const responseFields$ = {
-    HttpMeta: { Response: response, Request: request$ },
+  const responseFields = {
+    HttpMeta: { Response: response, Request: req },
   };
 
-  const [result$] = await m$.match<
+  const [result] = await M.match<
     components.UserSubscription,
-    | errors.FreeSubscriptionUpgrade
     | errors.ResourceNotFound
     | errors.HTTPValidationError
     | SDKError
@@ -132,15 +127,14 @@ export async function usersSubscriptionsUpdate(
     | RequestTimeoutError
     | ConnectionError
   >(
-    m$.json(200, components.UserSubscription$inboundSchema),
-    m$.jsonErr(403, errors.FreeSubscriptionUpgrade$inboundSchema),
-    m$.jsonErr(404, errors.ResourceNotFound$inboundSchema),
-    m$.jsonErr(422, errors.HTTPValidationError$inboundSchema),
-    m$.fail(["4XX", "5XX"]),
-  )(response, { extraFields: responseFields$ });
-  if (!result$.ok) {
-    return result$;
+    M.json(200, components.UserSubscription$inboundSchema),
+    M.jsonErr(404, errors.ResourceNotFound$inboundSchema),
+    M.jsonErr(422, errors.HTTPValidationError$inboundSchema),
+    M.fail(["4XX", "5XX"]),
+  )(response, { extraFields: responseFields });
+  if (!result.ok) {
+    return result;
   }
 
-  return result$;
+  return result;
 }

package/src/lib/config.ts

@@ -60,7 +60,7 @@ export function serverURLFromOptions(options: SDKOptions): URL | null {
 export const SDK_METADATA = {
   language: "typescript",
   openapiDocVersion: "0.1.0",
-  sdkVersion: "0.9.0",
-  genVersion: "2.416.6",
-  userAgent: "speakeasy-sdk/typescript 0.9.0 2.416.6 0.1.0 @polar-sh/sdk",
+  sdkVersion: "0.10.0",
+  genVersion: "2.421.3",
+  userAgent: "speakeasy-sdk/typescript 0.10.0 2.421.3 0.1.0 @polar-sh/sdk",
 } as const;

package/src/lib/sdks.ts

@@ -72,11 +72,11 @@ const isBrowserLike = webWorkerLike
   || (typeof window === "object" && typeof window.document !== "undefined");
 
 export class ClientSDK {
-  private readonly httpClient: HTTPClient;
-  protected readonly baseURL: URL | null;
-  protected readonly hooks$: SDKHooks;
-  protected readonly logger?: Logger | undefined;
-  public readonly options$: SDKOptions & { hooks?: SDKHooks };
+  readonly #httpClient: HTTPClient;
+  readonly #hooks: SDKHooks;
+  readonly #logger?: Logger | undefined;
+  protected readonly _baseURL: URL | null;
+  public readonly _options: SDKOptions & { hooks?: SDKHooks };
 
   constructor(options: SDKOptions = {}) {
     const opt = options as unknown;
@@ -86,36 +86,36 @@ export class ClientSDK {
       && "hooks" in opt
       && opt.hooks instanceof SDKHooks
     ) {
-      this.hooks$ = opt.hooks;
+      this.#hooks = opt.hooks;
     } else {
-      this.hooks$ = new SDKHooks();
+      this.#hooks = new SDKHooks();
     }
-    this.options$ = { ...options, hooks: this.hooks$ };
+    this._options = { ...options, hooks: this.#hooks };
 
     const url = serverURLFromOptions(options);
     if (url) {
       url.pathname = url.pathname.replace(/\/+$/, "") + "/";
     }
-    const { baseURL, client } = this.hooks$.sdkInit({
+    const { baseURL, client } = this.#hooks.sdkInit({
       baseURL: url,
       client: options.httpClient || new HTTPClient(),
     });
-    this.baseURL = baseURL;
-    this.httpClient = client;
-    this.logger = options.debugLogger;
-    if (!this.logger && env().POLAR_DEBUG) {
-      this.logger = console;
+    this._baseURL = baseURL;
+    this.#httpClient = client;
+    this.#logger = options.debugLogger;
+    if (!this.#logger && env().POLAR_DEBUG) {
+      this.#logger = console;
     }
   }
 
-  public createRequest$(
+  public _createRequest(
     context: HookContext,
     conf: RequestConfig,
     options?: RequestOptions,
   ): Result<Request, InvalidRequestError | UnexpectedClientError> {
     const { method, path, query, headers: opHeaders, security } = conf;
 
-    const base = conf.baseURL ?? this.baseURL;
+    const base = conf.baseURL ?? this._baseURL;
     if (!base) {
       return ERR(new InvalidRequestError("No base URL provided for operation"));
     }
@@ -199,7 +199,7 @@ export class ClientSDK {
 
     let input;
     try {
-      input = this.hooks$.beforeCreateRequest(context, {
+      input = this.#hooks.beforeCreateRequest(context, {
         url: reqURL,
         options: {
           ...fetchOptions,
@@ -219,7 +219,7 @@ export class ClientSDK {
     return OK(new Request(input.url, input.options));
   }
 
-  public async do$(
+  public async _do(
     request: Request,
     options: {
       context: HookContext;
@@ -242,25 +242,25 @@ export class ClientSDK {
 
     return retry(
       async () => {
-        const req = await this.hooks$.beforeRequest(context, request.clone());
-        await logRequest(this.logger, req).catch((e) =>
-          this.logger?.log("Failed to log request:", e)
+        const req = await this.#hooks.beforeRequest(context, request.clone());
+        await logRequest(this.#logger, req).catch((e) =>
+          this.#logger?.log("Failed to log request:", e)
         );
 
-        let response = await this.httpClient.request(req);
+        let response = await this.#httpClient.request(req);
 
         if (matchStatusCode(response, errorCodes)) {
-          const result = await this.hooks$.afterError(context, response, null);
+          const result = await this.#hooks.afterError(context, response, null);
           if (result.error) {
             throw result.error;
           }
           response = result.response || response;
         } else {
-          response = await this.hooks$.afterSuccess(context, response);
+          response = await this.#hooks.afterSuccess(context, response);
         }
 
-        await logResponse(this.logger, response, req)
-          .catch(e => this.logger?.log("Failed to log response:", e));
+        await logResponse(this.#logger, response, req)
+          .catch(e => this.#logger?.log("Failed to log response:", e));
 
         return response;
       },

package/src/models/components/index.ts

@@ -71,7 +71,6 @@ export * from "./benefitlicensekeyssubscriber.js";
 export * from "./benefitlicensekeyssubscriberproperties.js";
 export * from "./benefitlicensekeysupdate.js";
 export * from "./benefittype.js";
-export * from "./bodysubscriptionsimport.js";
 export * from "./bylineprofile.js";
 export * from "./checkout.js";
 export * from "./checkoutcreate.js";
@@ -169,10 +168,14 @@ export * from "./productpriceonetimecustom.js";
 export * from "./productpriceonetimecustomcreate.js";
 export * from "./productpriceonetimefixed.js";
 export * from "./productpriceonetimefixedcreate.js";
+export * from "./productpriceonetimefree.js";
+export * from "./productpriceonetimefreecreate.js";
 export * from "./productpriceoutput.js";
-export * from "./productpricerecurringcreate.js";
 export * from "./productpricerecurringcustom.js";
 export * from "./productpricerecurringfixed.js";
+export * from "./productpricerecurringfixedcreate.js";
+export * from "./productpricerecurringfree.js";
+export * from "./productpricerecurringfreecreate.js";
 export * from "./productpricerecurringinput.js";
 export * from "./productpricerecurringoutput.js";
 export * from "./productpricetype.js";
@@ -194,14 +197,11 @@ export * from "./s3fileuploadmultipart.js";
 export * from "./s3fileuploadpart.js";
 export * from "./security.js";
 export * from "./state.js";
-export * from "./subscriptioncreateemail.js";
 export * from "./subscriptioninput.js";
 export * from "./subscriptionoutput.js";
 export * from "./subscriptionrecurringinterval.js";
-export * from "./subscriptionsimported.js";
 export * from "./subscriptionsortproperty.js";
 export * from "./subscriptionstatus.js";
-export * from "./subscriptiontiertype.js";
 export * from "./subscriptionuser.js";
 export * from "./subtype.js";
 export * from "./tokenresponse.js";
@@ -211,7 +211,6 @@ export * from "./useradvertisementcampaignenable.js";
 export * from "./useradvertisementcampaignupdate.js";
 export * from "./useradvertisementsortproperty.js";
 export * from "./userbenefitsortproperty.js";
-export * from "./userfreesubscriptioncreate.js";
 export * from "./userinfoorganization.js";
 export * from "./userinfouser.js";
 export * from "./userorder.js";

package/src/models/components/orderproduct.ts

@@ -4,11 +4,6 @@
 
 import * as z from "zod";
 import { remap as remap$ } from "../../lib/primitives.js";
-import {
-  SubscriptionTierType,
-  SubscriptionTierType$inboundSchema,
-  SubscriptionTierType$outboundSchema,
-} from "./subscriptiontiertype.js";
 
 export type OrderProduct = {
   /**
@@ -43,14 +38,6 @@ export type OrderProduct = {
    * The ID of the organization owning the product.
    */
   organizationId: string;
-  /**
-   * @deprecated field: This will be removed in a future release, please migrate away from it as soon as possible.
-   */
-  type: SubscriptionTierType | null;
-  /**
-   * @deprecated field: This will be removed in a future release, please migrate away from it as soon as possible.
-   */
-  isHighlighted: boolean | null;
 };
 
 /** @internal */
@@ -69,8 +56,6 @@ export const OrderProduct$inboundSchema: z.ZodType<
   is_recurring: z.boolean(),
   is_archived: z.boolean(),
   organization_id: z.string(),
-  type: z.nullable(SubscriptionTierType$inboundSchema),
-  is_highlighted: z.nullable(z.boolean()),
 }).transform((v) => {
   return remap$(v, {
     "created_at": "createdAt",
@@ -78,7 +63,6 @@ export const OrderProduct$inboundSchema: z.ZodType<
     "is_recurring": "isRecurring",
     "is_archived": "isArchived",
     "organization_id": "organizationId",
-    "is_highlighted": "isHighlighted",
   });
 });
 
@@ -92,8 +76,6 @@ export type OrderProduct$Outbound = {
   is_recurring: boolean;
   is_archived: boolean;
   organization_id: string;
-  type: string | null;
-  is_highlighted: boolean | null;
 };
 
 /** @internal */
@@ -110,8 +92,6 @@ export const OrderProduct$outboundSchema: z.ZodType<
   isRecurring: z.boolean(),
   isArchived: z.boolean(),
   organizationId: z.string(),
-  type: z.nullable(SubscriptionTierType$outboundSchema),
-  isHighlighted: z.nullable(z.boolean()),
 }).transform((v) => {
   return remap$(v, {
     createdAt: "created_at",
@@ -119,7 +99,6 @@ export const OrderProduct$outboundSchema: z.ZodType<
     isRecurring: "is_recurring",
     isArchived: "is_archived",
     organizationId: "organization_id",
-    isHighlighted: "is_highlighted",
   });
 });
 

package/src/models/components/ordersubscription.ts

@@ -39,7 +39,7 @@ export type OrderSubscription = {
   endedAt: Date | null;
   userId: string;
   productId: string;
-  priceId: string | null;
+  priceId: string;
 };
 
 /** @internal */
@@ -72,7 +72,7 @@ export const OrderSubscription$inboundSchema: z.ZodType<
   ),
   user_id: z.string(),
   product_id: z.string(),
-  price_id: z.nullable(z.string()),
+  price_id: z.string(),
 }).transform((v) => {
   return remap$(v, {
     "created_at": "createdAt",
@@ -105,7 +105,7 @@ export type OrderSubscription$Outbound = {
   ended_at: string | null;
   user_id: string;
   product_id: string;
-  price_id: string | null;
+  price_id: string;
 };
 
 /** @internal */
@@ -128,7 +128,7 @@ export const OrderSubscription$outboundSchema: z.ZodType<
   endedAt: z.nullable(z.date().transform(v => v.toISOString())),
   userId: z.string(),
   productId: z.string(),
-  priceId: z.nullable(z.string()),
+  priceId: z.string(),
 }).transform((v) => {
   return remap$(v, {
     createdAt: "created_at",