dub 0.34.2 → 0.35.0

package/src/models/operations/upsertlink.ts

@@ -1,7 +1,8 @@
 /*
- * Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT.
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
  */
 
+import { remap as remap$ } from "../../lib/primitives.js";
 import * as components from "../components/index.js";
 import * as z from "zod";
 
@@ -118,6 +119,26 @@ export type UpsertLinkRequestBody = {
      * Allow search engines to index your short link. Defaults to `false` if not provided. Learn more: https://d.to/noindex
      */
     doIndex?: boolean | undefined;
+    /**
+     * The UTM source of the short link. If set, this will populate or override the UTM source in the destination URL.
+     */
+    utmSource?: string | null | undefined;
+    /**
+     * The UTM medium of the short link. If set, this will populate or override the UTM medium in the destination URL.
+     */
+    utmMedium?: string | null | undefined;
+    /**
+     * The UTM campaign of the short link. If set, this will populate or override the UTM campaign in the destination URL.
+     */
+    utmCampaign?: string | null | undefined;
+    /**
+     * The UTM term of the short link. If set, this will populate or override the UTM term in the destination URL.
+     */
+    utmTerm?: string | null | undefined;
+    /**
+     * The UTM content of the short link. If set, this will populate or override the UTM content in the destination URL.
+     */
+    utmContent?: string | null | undefined;
 };
 
 /** @internal */
@@ -182,33 +203,48 @@ export const UpsertLinkRequestBody$inboundSchema: z.ZodType<
     UpsertLinkRequestBody,
     z.ZodTypeDef,
     unknown
-> = z.object({
-    url: z.string(),
-    domain: z.string().optional(),
-    key: z.string().optional(),
-    externalId: z.nullable(z.string()).optional(),
-    prefix: z.string().optional(),
-    trackConversion: z.boolean().default(false),
-    archived: z.boolean().default(false),
-    publicStats: z.boolean().default(false),
-    tagId: z.nullable(z.string()).optional(),
-    tagIds: z.union([z.string(), z.array(z.string())]).optional(),
-    tagNames: z.union([z.string(), z.array(z.string())]).optional(),
-    comments: z.nullable(z.string()).optional(),
-    expiresAt: z.nullable(z.string()).optional(),
-    expiredUrl: z.nullable(z.string()).optional(),
-    password: z.nullable(z.string()).optional(),
-    proxy: z.boolean().default(false),
-    title: z.nullable(z.string()).optional(),
-    description: z.nullable(z.string()).optional(),
-    image: z.nullable(z.string()).optional(),
-    video: z.nullable(z.string()).optional(),
-    rewrite: z.boolean().default(false),
-    ios: z.nullable(z.string()).optional(),
-    android: z.nullable(z.string()).optional(),
-    geo: z.nullable(components.LinkGeoTargeting$inboundSchema).optional(),
-    doIndex: z.boolean().default(false),
-});
+> = z
+    .object({
+        url: z.string(),
+        domain: z.string().optional(),
+        key: z.string().optional(),
+        externalId: z.nullable(z.string()).optional(),
+        prefix: z.string().optional(),
+        trackConversion: z.boolean().default(false),
+        archived: z.boolean().default(false),
+        publicStats: z.boolean().default(false),
+        tagId: z.nullable(z.string()).optional(),
+        tagIds: z.union([z.string(), z.array(z.string())]).optional(),
+        tagNames: z.union([z.string(), z.array(z.string())]).optional(),
+        comments: z.nullable(z.string()).optional(),
+        expiresAt: z.nullable(z.string()).optional(),
+        expiredUrl: z.nullable(z.string()).optional(),
+        password: z.nullable(z.string()).optional(),
+        proxy: z.boolean().default(false),
+        title: z.nullable(z.string()).optional(),
+        description: z.nullable(z.string()).optional(),
+        image: z.nullable(z.string()).optional(),
+        video: z.nullable(z.string()).optional(),
+        rewrite: z.boolean().default(false),
+        ios: z.nullable(z.string()).optional(),
+        android: z.nullable(z.string()).optional(),
+        geo: z.nullable(components.LinkGeoTargeting$inboundSchema).optional(),
+        doIndex: z.boolean().default(false),
+        utm_source: z.nullable(z.string()).optional(),
+        utm_medium: z.nullable(z.string()).optional(),
+        utm_campaign: z.nullable(z.string()).optional(),
+        utm_term: z.nullable(z.string()).optional(),
+        utm_content: z.nullable(z.string()).optional(),
+    })
+    .transform((v) => {
+        return remap$(v, {
+            utm_source: "utmSource",
+            utm_medium: "utmMedium",
+            utm_campaign: "utmCampaign",
+            utm_term: "utmTerm",
+            utm_content: "utmContent",
+        });
+    });
 
 /** @internal */
 export type UpsertLinkRequestBody$Outbound = {
@@ -237,6 +273,11 @@ export type UpsertLinkRequestBody$Outbound = {
     android?: string | null | undefined;
     geo?: components.LinkGeoTargeting$Outbound | null | undefined;
     doIndex: boolean;
+    utm_source?: string | null | undefined;
+    utm_medium?: string | null | undefined;
+    utm_campaign?: string | null | undefined;
+    utm_term?: string | null | undefined;
+    utm_content?: string | null | undefined;
 };
 
 /** @internal */
@@ -244,33 +285,48 @@ export const UpsertLinkRequestBody$outboundSchema: z.ZodType<
     UpsertLinkRequestBody$Outbound,
     z.ZodTypeDef,
     UpsertLinkRequestBody
-> = z.object({
-    url: z.string(),
-    domain: z.string().optional(),
-    key: z.string().optional(),
-    externalId: z.nullable(z.string()).optional(),
-    prefix: z.string().optional(),
-    trackConversion: z.boolean().default(false),
-    archived: z.boolean().default(false),
-    publicStats: z.boolean().default(false),
-    tagId: z.nullable(z.string()).optional(),
-    tagIds: z.union([z.string(), z.array(z.string())]).optional(),
-    tagNames: z.union([z.string(), z.array(z.string())]).optional(),
-    comments: z.nullable(z.string()).optional(),
-    expiresAt: z.nullable(z.string()).optional(),
-    expiredUrl: z.nullable(z.string()).optional(),
-    password: z.nullable(z.string()).optional(),
-    proxy: z.boolean().default(false),
-    title: z.nullable(z.string()).optional(),
-    description: z.nullable(z.string()).optional(),
-    image: z.nullable(z.string()).optional(),
-    video: z.nullable(z.string()).optional(),
-    rewrite: z.boolean().default(false),
-    ios: z.nullable(z.string()).optional(),
-    android: z.nullable(z.string()).optional(),
-    geo: z.nullable(components.LinkGeoTargeting$outboundSchema).optional(),
-    doIndex: z.boolean().default(false),
-});
+> = z
+    .object({
+        url: z.string(),
+        domain: z.string().optional(),
+        key: z.string().optional(),
+        externalId: z.nullable(z.string()).optional(),
+        prefix: z.string().optional(),
+        trackConversion: z.boolean().default(false),
+        archived: z.boolean().default(false),
+        publicStats: z.boolean().default(false),
+        tagId: z.nullable(z.string()).optional(),
+        tagIds: z.union([z.string(), z.array(z.string())]).optional(),
+        tagNames: z.union([z.string(), z.array(z.string())]).optional(),
+        comments: z.nullable(z.string()).optional(),
+        expiresAt: z.nullable(z.string()).optional(),
+        expiredUrl: z.nullable(z.string()).optional(),
+        password: z.nullable(z.string()).optional(),
+        proxy: z.boolean().default(false),
+        title: z.nullable(z.string()).optional(),
+        description: z.nullable(z.string()).optional(),
+        image: z.nullable(z.string()).optional(),
+        video: z.nullable(z.string()).optional(),
+        rewrite: z.boolean().default(false),
+        ios: z.nullable(z.string()).optional(),
+        android: z.nullable(z.string()).optional(),
+        geo: z.nullable(components.LinkGeoTargeting$outboundSchema).optional(),
+        doIndex: z.boolean().default(false),
+        utmSource: z.nullable(z.string()).optional(),
+        utmMedium: z.nullable(z.string()).optional(),
+        utmCampaign: z.nullable(z.string()).optional(),
+        utmTerm: z.nullable(z.string()).optional(),
+        utmContent: z.nullable(z.string()).optional(),
+    })
+    .transform((v) => {
+        return remap$(v, {
+            utmSource: "utm_source",
+            utmMedium: "utm_medium",
+            utmCampaign: "utm_campaign",
+            utmTerm: "utm_term",
+            utmContent: "utm_content",
+        });
+    });
 
 /**
  * @internal

package/src/sdk/analytics.ts

@@ -1,5 +1,5 @@
 /*
- * Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT.
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
  */
 
 import { SDKHooks } from "../hooks/hooks.js";
@@ -8,6 +8,7 @@ import { encodeFormQuery as encodeFormQuery$ } from "../lib/encodings.js";
 import { HTTPClient } from "../lib/http.js";
 import * as schemas$ from "../lib/schemas.js";
 import { ClientSDK, RequestOptions } from "../lib/sdks.js";
+import { extractSecurity } from "../lib/security.js";
 import * as errors from "../models/errors/index.js";
 import * as operations from "../models/operations/index.js";
 
@@ -62,6 +63,7 @@ export class Analytics extends ClientSDK {
         const query$ = encodeFormQuery$({
             browser: payload$.browser,
             city: payload$.city,
+            continent: payload$.continent,
             country: payload$.country,
             device: payload$.device,
             domain: payload$.domain,
@@ -86,14 +88,8 @@ export class Analytics extends ClientSDK {
             Accept: "application/json",
         });
 
-        let security$;
-        if (typeof this.options$.token === "function") {
-            security$ = { token: await this.options$.token() };
-        } else if (this.options$.token) {
-            security$ = { token: this.options$.token };
-        } else {
-            security$ = {};
-        }
+        const token$ = await extractSecurity(this.options$.token);
+        const security$ = token$ == null ? {} : { token: token$ };
         const context = {
             operationID: "retrieveAnalytics",
             oAuth2Scopes: [],

package/src/sdk/domains.ts

@@ -1,17 +1,22 @@
 /*
- * Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT.
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
  */
 
 import { SDKHooks } from "../hooks/hooks.js";
 import { SDKOptions, serverURLFromOptions } from "../lib/config.js";
-import { encodeJSON as encodeJSON$, encodeSimple as encodeSimple$ } from "../lib/encodings.js";
+import {
+    encodeFormQuery as encodeFormQuery$,
+    encodeJSON as encodeJSON$,
+    encodeSimple as encodeSimple$,
+} from "../lib/encodings.js";
 import { HTTPClient } from "../lib/http.js";
 import * as schemas$ from "../lib/schemas.js";
 import { ClientSDK, RequestOptions } from "../lib/sdks.js";
+import { extractSecurity } from "../lib/security.js";
 import * as components from "../models/components/index.js";
 import * as errors from "../models/errors/index.js";
 import * as operations from "../models/operations/index.js";
-import * as z from "zod";
+import { createPageIterator, PageIterator, Paginator } from "../types/operations.js";
 
 export class Domains extends ClientSDK {
     private readonly options$: SDKOptions & { hooks?: SDKHooks };
@@ -46,23 +51,34 @@ export class Domains extends ClientSDK {
      * @remarks
      * Retrieve a list of domains associated with the authenticated workspace.
      */
-    async list(options?: RequestOptions): Promise<Array<components.DomainSchema>> {
+    async list(
+        request?: operations.ListDomainsRequest | undefined,
+        options?: RequestOptions
+    ): Promise<PageIterator<operations.ListDomainsResponse>> {
+        const input$ = typeof request === "undefined" ? {} : request;
+
+        const payload$ = schemas$.parse(
+            input$,
+            (value$) => operations.ListDomainsRequest$outboundSchema.parse(value$),
+            "Input validation failed"
+        );
+        const body$ = null;
+
         const path$ = this.templateURLComponent("/domains")();
 
-        const query$ = "";
+        const query$ = encodeFormQuery$({
+            archived: payload$.archived,
+            page: payload$.page,
+            pageSize: payload$.pageSize,
+            search: payload$.search,
+        });
 
         const headers$ = new Headers({
             Accept: "application/json",
         });
 
-        let security$;
-        if (typeof this.options$.token === "function") {
-            security$ = { token: await this.options$.token() };
-        } else if (this.options$.token) {
-            security$ = { token: this.options$.token };
-        } else {
-            security$ = {};
-        }
+        const token$ = await extractSecurity(this.options$.token);
+        const security$ = token$ == null ? {} : { token: token$ };
         const context = {
             operationID: "listDomains",
             oAuth2Scopes: [],
@@ -78,6 +94,7 @@ export class Domains extends ClientSDK {
                 path: path$,
                 headers: headers$,
                 query: query$,
+                body: body$,
                 timeoutMs: options?.timeoutMs || this.options$.timeoutMs || -1,
             },
             options
@@ -106,8 +123,8 @@ export class Domains extends ClientSDK {
             HttpMeta: { Response: response, Request: request$ },
         };
 
-        const [result$] = await this.matcher<Array<components.DomainSchema>>()
-            .json(200, z.array(components.DomainSchema$inboundSchema))
+        const [result$, raw$] = await this.matcher<operations.ListDomainsResponse>()
+            .json(200, operations.ListDomainsResponse$inboundSchema, { key: "Result" })
             .json(400, errors.BadRequest$inboundSchema, { err: true })
             .json(401, errors.Unauthorized$inboundSchema, { err: true })
             .json(403, errors.Forbidden$inboundSchema, { err: true })
@@ -120,7 +137,36 @@ export class Domains extends ClientSDK {
             .fail(["4XX", "5XX"])
             .match(response, { extraFields: responseFields$ });
 
-        return result$;
+        const nextFunc = (responseData: unknown): Paginator<operations.ListDomainsResponse> => {
+            const page = input$.page || 0;
+            const nextPage = page + 1;
+
+            if (!responseData) {
+                return () => null;
+            }
+
+            const results = responseData;
+
+            if (!Array.isArray(results) || !results.length) {
+                return () => null;
+            }
+            const limit = input$.pageSize || 0;
+            if (results.length < limit) {
+                return () => null;
+            }
+
+            return () =>
+                this.list(
+                    {
+                        ...input$,
+                        page: nextPage,
+                    },
+                    options
+                );
+        };
+
+        const page$ = { ...result$, next: nextFunc(raw$) };
+        return { ...page$, ...createPageIterator(page$) };
     }
 
     /**
@@ -152,14 +198,8 @@ export class Domains extends ClientSDK {
             Accept: "application/json",
         });
 
-        let security$;
-        if (typeof this.options$.token === "function") {
-            security$ = { token: await this.options$.token() };
-        } else if (this.options$.token) {
-            security$ = { token: this.options$.token };
-        } else {
-            security$ = {};
-        }
+        const token$ = await extractSecurity(this.options$.token);
+        const security$ = token$ == null ? {} : { token: token$ };
         const context = {
             operationID: "createDomain",
             oAuth2Scopes: [],
@@ -253,14 +293,8 @@ export class Domains extends ClientSDK {
             Accept: "application/json",
         });
 
-        let security$;
-        if (typeof this.options$.token === "function") {
-            security$ = { token: await this.options$.token() };
-        } else if (this.options$.token) {
-            security$ = { token: this.options$.token };
-        } else {
-            security$ = {};
-        }
+        const token$ = await extractSecurity(this.options$.token);
+        const security$ = token$ == null ? {} : { token: token$ };
         const context = {
             operationID: "deleteDomain",
             oAuth2Scopes: [],
@@ -357,14 +391,8 @@ export class Domains extends ClientSDK {
             Accept: "application/json",
         });
 
-        let security$;
-        if (typeof this.options$.token === "function") {
-            security$ = { token: await this.options$.token() };
-        } else if (this.options$.token) {
-            security$ = { token: this.options$.token };
-        } else {
-            security$ = {};
-        }
+        const token$ = await extractSecurity(this.options$.token);
+        const security$ = token$ == null ? {} : { token: token$ };
         const context = {
             operationID: "updateDomain",
             oAuth2Scopes: [],

package/src/sdk/index.ts

@@ -1,5 +1,5 @@
 /*
- * Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT.
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
  */
 
 export * from "./sdk.js";

package/src/sdk/links.ts

@@ -1,5 +1,5 @@
 /*
- * Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT.
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
  */
 
 import { SDKHooks } from "../hooks/hooks.js";
@@ -12,9 +12,11 @@ import {
 import { HTTPClient } from "../lib/http.js";
 import * as schemas$ from "../lib/schemas.js";
 import { ClientSDK, RequestOptions } from "../lib/sdks.js";
+import { extractSecurity } from "../lib/security.js";
 import * as components from "../models/components/index.js";
 import * as errors from "../models/errors/index.js";
 import * as operations from "../models/operations/index.js";
+import { createPageIterator, PageIterator, Paginator } from "../types/operations.js";
 import * as z from "zod";
 
 export class Links extends ClientSDK {
@@ -53,7 +55,7 @@ export class Links extends ClientSDK {
     async list(
         request?: operations.GetLinksRequest | undefined,
         options?: RequestOptions
-    ): Promise<Array<components.LinkSchema>> {
+    ): Promise<PageIterator<operations.GetLinksResponse>> {
         const input$ = typeof request === "undefined" ? {} : request;
 
         const payload$ = schemas$.parse(
@@ -68,6 +70,7 @@ export class Links extends ClientSDK {
         const query$ = encodeFormQuery$({
             domain: payload$.domain,
             page: payload$.page,
+            pageSize: payload$.pageSize,
             search: payload$.search,
             showArchived: payload$.showArchived,
             sort: payload$.sort,
@@ -82,14 +85,8 @@ export class Links extends ClientSDK {
             Accept: "application/json",
         });
 
-        let security$;
-        if (typeof this.options$.token === "function") {
-            security$ = { token: await this.options$.token() };
-        } else if (this.options$.token) {
-            security$ = { token: this.options$.token };
-        } else {
-            security$ = {};
-        }
+        const token$ = await extractSecurity(this.options$.token);
+        const security$ = token$ == null ? {} : { token: token$ };
         const context = {
             operationID: "getLinks",
             oAuth2Scopes: [],
@@ -134,8 +131,8 @@ export class Links extends ClientSDK {
             HttpMeta: { Response: response, Request: request$ },
         };
 
-        const [result$] = await this.matcher<Array<components.LinkSchema>>()
-            .json(200, z.array(components.LinkSchema$inboundSchema))
+        const [result$, raw$] = await this.matcher<operations.GetLinksResponse>()
+            .json(200, operations.GetLinksResponse$inboundSchema, { key: "Result" })
             .json(400, errors.BadRequest$inboundSchema, { err: true })
             .json(401, errors.Unauthorized$inboundSchema, { err: true })
             .json(403, errors.Forbidden$inboundSchema, { err: true })
@@ -148,7 +145,36 @@ export class Links extends ClientSDK {
             .fail(["4XX", "5XX"])
             .match(response, { extraFields: responseFields$ });
 
-        return result$;
+        const nextFunc = (responseData: unknown): Paginator<operations.GetLinksResponse> => {
+            const page = input$.page || 0;
+            const nextPage = page + 1;
+
+            if (!responseData) {
+                return () => null;
+            }
+
+            const results = responseData;
+
+            if (!Array.isArray(results) || !results.length) {
+                return () => null;
+            }
+            const limit = input$.pageSize || 0;
+            if (results.length < limit) {
+                return () => null;
+            }
+
+            return () =>
+                this.list(
+                    {
+                        ...input$,
+                        page: nextPage,
+                    },
+                    options
+                );
+        };
+
+        const page$ = { ...result$, next: nextFunc(raw$) };
+        return { ...page$, ...createPageIterator(page$) };
     }
 
     /**
@@ -180,14 +206,8 @@ export class Links extends ClientSDK {
             Accept: "application/json",
         });
 
-        let security$;
-        if (typeof this.options$.token === "function") {
-            security$ = { token: await this.options$.token() };
-        } else if (this.options$.token) {
-            security$ = { token: this.options$.token };
-        } else {
-            security$ = {};
-        }
+        const token$ = await extractSecurity(this.options$.token);
+        const security$ = token$ == null ? {} : { token: token$ };
         const context = {
             operationID: "createLink",
             oAuth2Scopes: [],
@@ -286,14 +306,8 @@ export class Links extends ClientSDK {
             Accept: "application/json",
         });
 
-        let security$;
-        if (typeof this.options$.token === "function") {
-            security$ = { token: await this.options$.token() };
-        } else if (this.options$.token) {
-            security$ = { token: this.options$.token };
-        } else {
-            security$ = {};
-        }
+        const token$ = await extractSecurity(this.options$.token);
+        const security$ = token$ == null ? {} : { token: token$ };
         const context = {
             operationID: "getLinksCount",
             oAuth2Scopes: [],
@@ -387,14 +401,8 @@ export class Links extends ClientSDK {
             Accept: "application/json",
         });
 
-        let security$;
-        if (typeof this.options$.token === "function") {
-            security$ = { token: await this.options$.token() };
-        } else if (this.options$.token) {
-            security$ = { token: this.options$.token };
-        } else {
-            security$ = {};
-        }
+        const token$ = await extractSecurity(this.options$.token);
+        const security$ = token$ == null ? {} : { token: token$ };
         const context = {
             operationID: "getLinkInfo",
             oAuth2Scopes: [],
@@ -491,14 +499,8 @@ export class Links extends ClientSDK {
             Accept: "application/json",
         });
 
-        let security$;
-        if (typeof this.options$.token === "function") {
-            security$ = { token: await this.options$.token() };
-        } else if (this.options$.token) {
-            security$ = { token: this.options$.token };
-        } else {
-            security$ = {};
-        }
+        const token$ = await extractSecurity(this.options$.token);
+        const security$ = token$ == null ? {} : { token: token$ };
         const context = {
             operationID: "deleteLink",
             oAuth2Scopes: [],
@@ -598,14 +600,8 @@ export class Links extends ClientSDK {
             Accept: "application/json",
         });
 
-        let security$;
-        if (typeof this.options$.token === "function") {
-            security$ = { token: await this.options$.token() };
-        } else if (this.options$.token) {
-            security$ = { token: this.options$.token };
-        } else {
-            security$ = {};
-        }
+        const token$ = await extractSecurity(this.options$.token);
+        const security$ = token$ == null ? {} : { token: token$ };
         const context = {
             operationID: "updateLink",
             oAuth2Scopes: [],
@@ -696,14 +692,8 @@ export class Links extends ClientSDK {
             Accept: "application/json",
         });
 
-        let security$;
-        if (typeof this.options$.token === "function") {
-            security$ = { token: await this.options$.token() };
-        } else if (this.options$.token) {
-            security$ = { token: this.options$.token };
-        } else {
-            security$ = {};
-        }
+        const token$ = await extractSecurity(this.options$.token);
+        const security$ = token$ == null ? {} : { token: token$ };
         const context = {
             operationID: "bulkCreateLinks",
             oAuth2Scopes: [],
@@ -795,14 +785,8 @@ export class Links extends ClientSDK {
             Accept: "application/json",
         });
 
-        let security$;
-        if (typeof this.options$.token === "function") {
-            security$ = { token: await this.options$.token() };
-        } else if (this.options$.token) {
-            security$ = { token: this.options$.token };
-        } else {
-            security$ = {};
-        }
+        const token$ = await extractSecurity(this.options$.token);
+        const security$ = token$ == null ? {} : { token: token$ };
         const context = {
             operationID: "bulkUpdateLinks",
             oAuth2Scopes: [],
@@ -893,14 +877,8 @@ export class Links extends ClientSDK {
             Accept: "application/json",
         });
 
-        let security$;
-        if (typeof this.options$.token === "function") {
-            security$ = { token: await this.options$.token() };
-        } else if (this.options$.token) {
-            security$ = { token: this.options$.token };
-        } else {
-            security$ = {};
-        }
+        const token$ = await extractSecurity(this.options$.token);
+        const security$ = token$ == null ? {} : { token: token$ };
         const context = {
             operationID: "upsertLink",
             oAuth2Scopes: [],