@s2-dev/streamstore 0.15.9 → 0.15.12

package/dist/esm/models/operations/read.d.ts

@@ -30,30 +30,39 @@ export type ReadRequest = {
      */
     tailOffset?: number | undefined;
     /**
-     * Limit total records to return.
+     * Start reading from the tail if the requested position is beyond it.
      *
      * @remarks
-     * If this is provided, tailing will be disabled.
+     * Otherwise, a `416 Range Not Satisfiable` response is returned.
+     */
+    clamp?: boolean | undefined;
+    /**
+     * Record count limit.
+     *
+     * @remarks
+     * Non-streaming reads are capped by the default limit of 1000 records.
      */
     count?: number | undefined;
     /**
-     * Limit total metered bytes to return.
+     * Metered bytes limit.
      *
      * @remarks
-     * If this is provided, tailing will be disabled.
+     * Non-streaming reads are capped by the default limit of 1 MiB.
      */
     bytes?: number | undefined;
     /**
      * Exclusive timestamp to read until.
-     *
-     * @remarks
-     * If this is provided, tailing will be disabled.
      */
     until?: number | undefined;
     /**
-     * Clamp the start position at the tail position.
+     * Duration in seconds to wait for new records.
+     *
+     * @remarks
+     * The default duration is 0 if there is a bound on `count`, `bytes`, or `until`, and otherwise infinite.
+     * Non-streaming reads are always bounded on `count` and `bytes`, so you can achieve long poll semantics by specifying a non-zero duration up to 60 seconds.
+     * In the context of an SSE or S2S streaming read, the duration will bound how much time can elapse between records throughout the lifetime of the session.
      */
-    clamp?: boolean | undefined;
+    wait?: number | undefined;
     /**
      * Basin name for basin-specific endpoints
      */
@@ -69,10 +78,11 @@ export type ReadRequest$Outbound = {
     seq_num?: number | undefined;
     timestamp?: number | undefined;
     tail_offset?: number | undefined;
+    clamp?: boolean | undefined;
     count?: number | undefined;
     bytes?: number | undefined;
     until?: number | undefined;
-    clamp?: boolean | undefined;
+    wait?: number | undefined;
     "s2-basin": string;
 };
 /** @internal */

package/dist/esm/models/operations/read.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../../../src/models/operations/read.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAGzD,OAAO,EAAE,MAAM,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAErE,eAAO,MAAM,cAAc,8CAKjB,CAAC;AAEX,MAAM,MAAM,WAAW,GAAG;IACxB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,UAAU,CAAC,QAAQ,GAAG,SAAS,CAAC;IAC3C;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,YAAY,GACpB,UAAU,CAAC,SAAS,GACpB,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AAEtC,gBAAgB;AAChB,eAAO,MAAM,yBAAyB,EAAE,CAAC,CAAC,OAAO,CAC/C,WAAW,EACX,CAAC,CAAC,UAAU,EACZ,OAAO,CAmBP,CAAC;AAEH,gBAAgB;AAChB,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,gBAAgB;AAChB,eAAO,MAAM,0BAA0B,EAAE,CAAC,CAAC,OAAO,CAChD,oBAAoB,EACpB,CAAC,CAAC,UAAU,EACZ,WAAW,CAmBX,CAAC;AAEH;;;GAGG;AACH,yBAAiB,YAAY,CAAC;IAC5B,2DAA2D;IACpD,MAAM,aAAa,+CAA4B,CAAC;IACvD,4DAA4D;IACrD,MAAM,cAAc,4DAA6B,CAAC;IACzD,sDAAsD;IACtD,KAAY,QAAQ,GAAG,oBAAoB,CAAC;CAC7C;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAElE;AAED,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,GACjB,eAAe,CAAC,WAAW,EAAE,kBAAkB,CAAC,CAMlD;AAED,gBAAgB;AAChB,eAAO,MAAM,0BAA0B,EAAE,CAAC,CAAC,OAAO,CAChD,YAAY,EACZ,CAAC,CAAC,UAAU,EACZ,OAAO,CASP,CAAC;AAEH,gBAAgB;AAChB,MAAM,MAAM,qBAAqB,GAAG,UAAU,CAAC,kBAAkB,GAAG,KAAK,CAAC;AAE1E,gBAAgB;AAChB,eAAO,MAAM,2BAA2B,EAAE,CAAC,CAAC,OAAO,CACjD,qBAAqB,EACrB,CAAC,CAAC,UAAU,EACZ,YAAY,CAC+C,CAAC;AAE9D;;;GAGG;AACH,yBAAiB,aAAa,CAAC;IAC7B,4DAA4D;IACrD,MAAM,aAAa,gDAA6B,CAAC;IACxD,6DAA6D;IACtD,MAAM,cAAc,sEAA8B,CAAC;IAC1D,uDAAuD;IACvD,KAAY,QAAQ,GAAG,qBAAqB,CAAC;CAC9C;AAED,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,YAAY,GAAG,MAAM,CAErE;AAED,wBAAgB,oBAAoB,CAClC,UAAU,EAAE,MAAM,GACjB,eAAe,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAMnD"}
+{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../../../src/models/operations/read.ts"],"names":[],"mappings":"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"}

package/dist/esm/models/operations/read.js

@@ -19,10 +19,11 @@ export const ReadRequest$inboundSchema = z.object({
     seq_num: z.number().int().optional(),
     timestamp: z.number().int().optional(),
     tail_offset: z.number().int().optional(),
+    clamp: z.boolean().optional(),
     count: z.number().int().optional(),
     bytes: z.number().int().optional(),
     until: z.number().int().optional(),
-    clamp: z.boolean().optional(),
+    wait: z.number().int().optional(),
     "s2-basin": z.string(),
 }).transform((v) => {
     return remap$(v, {
@@ -39,10 +40,11 @@ export const ReadRequest$outboundSchema = z.object({
     seqNum: z.number().int().optional(),
     timestamp: z.number().int().optional(),
     tailOffset: z.number().int().optional(),
+    clamp: z.boolean().optional(),
     count: z.number().int().optional(),
     bytes: z.number().int().optional(),
     until: z.number().int().optional(),
-    clamp: z.boolean().optional(),
+    wait: z.number().int().optional(),
     s2Basin: z.string(),
 }).transform((v) => {
     return remap$(v, {
@@ -72,7 +74,9 @@ export function readRequestFromJSON(jsonString) {
 /** @internal */
 export const ReadResponse$inboundSchema = z.union([
     components.ReadBatch$inboundSchema,
-    z.instanceof((ReadableStream)).transform(stream => {
+    z
+        .instanceof((ReadableStream))
+        .transform(stream => {
         return new EventStream(stream, rawEvent => {
             if (rawEvent.data === "[DONE]")
                 return { done: true };

package/dist/esm/models/operations/read.js.map

@@ -1 +1 @@
-{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../src/models/operations/read.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"read.js","sourceRoot":"","sources":["../../../../src/models/operations/read.ts"],"names":[],"mappings":"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"}

package/docs/sdks/records/README.md

@@ -31,10 +31,7 @@ async function run() {
     s2Basin: "<value>",
   });
 
-  for await (const event of result) {
-    // Handle the event
-    console.log(event);
-  }
+  console.log(result);
 }
 
 run();
@@ -61,10 +58,7 @@ async function run() {
   });
   if (res.ok) {
     const { value: result } = res;
-    for await (const event of result) {
-    // Handle the event
-    console.log(event);
-  }
+    console.log(result);
   } else {
     console.log("recordsRead failed:", res.error);
   }

package/examples/accessTokensListAccessTokens.example.ts

@@ -8,7 +8,7 @@ dotenv.config();
  * Example usage of the @s2-dev/streamstore SDK
  *
  * To run this example from the examples directory:
- * npm run build && npx tsx accessTokensListAccessTokens.ts
+ * npm run build && npx tsx accessTokensListAccessTokens.example.ts
  */
 
 import { S2 } from "@s2-dev/streamstore";
@@ -18,7 +18,7 @@ const s2 = new S2({
 });
 
 async function main() {
-  const result = await s2.listAccessTokens({});
+  const result = await s2.accessTokens.listAccessTokens({});
 
   console.log(result);
 }

package/examples/package-lock.json

@@ -18,7 +18,7 @@
     },
     "..": {
       "name": "@s2-dev/streamstore",
-      "version": "0.15.9",
+      "version": "0.15.12",
       "dependencies": {
         "jsonpath-rfc9535": "1.1.0",
         "uuid": "^9.0.1",
@@ -40,8 +40,8 @@
         "express": "^4.21.2",
         "globals": "^15.14.0",
         "tshy": "^2.0.0",
-        "typescript": "^5.4.5",
-        "typescript-eslint": "^8.22.0"
+        "typescript": "~5.8.3",
+        "typescript-eslint": "^8.26.0"
       },
       "peerDependencies": {
         "@modelcontextprotocol/sdk": ">=1.5.0 <1.10.0"

package/jsr.json

@@ -2,7 +2,7 @@
 
 {
   "name": "@s2-dev/streamstore",
-  "version": "0.15.9",
+  "version": "0.15.12",
   "exports": {
     ".": "./src/index.ts",    
     "./models/errors": "./src/models/errors/index.ts",    

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@s2-dev/streamstore",
-  "version": "0.15.9",
+  "version": "0.15.12",
   "author": "Speakeasy",
   "type": "module",
   "bin": {
@@ -53,8 +53,8 @@
     "express": "^4.21.2",
     "globals": "^15.14.0",
     "tshy": "^2.0.0",
-    "typescript": "^5.4.5",
-    "typescript-eslint": "^8.22.0"
+    "typescript": "~5.8.3",
+    "typescript-eslint": "^8.26.0"
   },
   "dependencies": {
     "jsonpath-rfc9535": "1.1.0",

package/src/funcs/basinsListBasins.ts

@@ -236,6 +236,9 @@ async function $do(
     if (typeof nextCursor !== "string") {
       return { next: () => null };
     }
+    if (nextCursor.trim() === "") {
+      return { next: () => null };
+    }
 
     const nextVal = () =>
       basinsListBasins(

package/src/funcs/recordsRead.ts

@@ -115,6 +115,7 @@ async function $do(
     "tail_offset": payload.tail_offset,
     "timestamp": payload.timestamp,
     "until": payload.until,
+    "wait": payload.wait,
   });
 
   const headers = new Headers(compactMap({

package/src/funcs/streamsListStreams.ts

@@ -248,6 +248,9 @@ async function $do(
     if (typeof nextCursor !== "string") {
       return { next: () => null };
     }
+    if (nextCursor.trim() === "") {
+      return { next: () => null };
+    }
 
     const nextVal = () =>
       streamsListStreams(

package/src/lib/config.ts

@@ -58,8 +58,8 @@ export function serverURLFromOptions(options: SDKOptions): URL | null {
 export const SDK_METADATA = {
   language: "typescript",
   openapiDocVersion: "1.0.0",
-  sdkVersion: "0.15.9",
-  genVersion: "2.671.2",
+  sdkVersion: "0.15.12",
+  genVersion: "2.716.10",
   userAgent:
-    "speakeasy-sdk/typescript 0.15.9 2.671.2 1.0.0 @s2-dev/streamstore",
+    "speakeasy-sdk/typescript 0.15.12 2.716.10 1.0.0 @s2-dev/streamstore",
 } as const;

package/src/lib/event-streams.ts

@@ -2,19 +2,18 @@
  * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
  */
 
-export type ServerEvent<T> = {
+export type SseMessage<T> = {
   data?: T | undefined;
   event?: string | undefined;
   id?: string | undefined;
   retry?: number | undefined;
 };
-
-export class EventStream<T extends ServerEvent<unknown>>
+export class EventStream<T extends SseMessage<unknown>>
   extends ReadableStream<T>
 {
   constructor(
     responseBody: ReadableStream<Uint8Array>,
-    parse: (x: ServerEvent<string>) => IteratorResult<T, undefined>,
+    parse: (x: SseMessage<string>) => IteratorResult<T, undefined>,
   ) {
     const upstream = responseBody.getReader();
     let buffer: Uint8Array = new Uint8Array();
@@ -107,15 +106,14 @@ function findBoundary(
   }
   return null;
 }
-
-function parseMessage<T extends ServerEvent<unknown>>(
+function parseMessage<T extends SseMessage<unknown>>(
   chunk: Uint8Array,
-  parse: (x: ServerEvent<string>) => IteratorResult<T, undefined>,
+  parse: (x: SseMessage<string>) => IteratorResult<T, undefined>,
 ) {
   const text = new TextDecoder().decode(chunk);
   const lines = text.split(/\r\n|\r|\n/);
   const dataLines: string[] = [];
-  const ret: ServerEvent<string> = {};
+  const ret: SseMessage<string> = {};
   let ignore = true;
   for (const line of lines) {
     if (!line || line.startsWith(":")) continue;

package/src/lib/security.ts

@@ -84,7 +84,10 @@ type SecurityInputOAuth2 = {
 type SecurityInputOAuth2ClientCredentials = {
   type: "oauth2:client_credentials";
   value:
-    | { clientID?: string | undefined; clientSecret?: string | undefined }
+    | {
+      clientID?: string | undefined;
+      clientSecret?: string | undefined;
+    }
     | null
     | string
     | undefined;

package/src/lib/url.ts

@@ -10,7 +10,7 @@ export function pathToFunc(
   pathPattern: string,
   options?: { charEncoding?: "percent" | "none" },
 ): (params?: Params) => string {
-  const paramRE = /\{([a-zA-Z0-9_]+?)\}/g;
+  const paramRE = /\{([a-zA-Z0-9_][a-zA-Z0-9_-]*?)\}/g;
 
   return function buildURLPath(params: Record<string, unknown> = {}): string {
     return pathPattern.replace(paramRE, function (_, placeholder) {

package/src/mcp-server/mcp-server.ts

@@ -19,7 +19,7 @@ const routes = buildRouteMap({
 export const app = buildApplication(routes, {
   name: "mcp",
   versionInfo: {
-    currentVersion: "0.15.9",
+    currentVersion: "0.15.12",
   },
 });
 

package/src/mcp-server/server.ts

@@ -45,7 +45,7 @@ export function createMCPServer(deps: {
 }) {
   const server = new McpServer({
     name: "S2",
-    version: "0.15.9",
+    version: "0.15.12",
   });
 
   const client = new S2Core({

package/src/models/components/index.ts

@@ -21,6 +21,7 @@ export * from "./createstreamrequest.js";
 export * from "./deleteonemptyconfig.js";
 export * from "./deleteonemptyreconfiguration.js";
 export * from "./gauge.js";
+export * from "./infiniteretention.js";
 export * from "./issueaccesstokenresponse.js";
 export * from "./label.js";
 export * from "./listaccesstokensresponse.js";

package/src/models/components/infiniteretention.ts

@@ -0,0 +1,58 @@
+/*
+ * Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+ */
+
+import * as z from "zod";
+import { safeParse } from "../../lib/schemas.js";
+import { Result as SafeParseResult } from "../../types/fp.js";
+import { SDKValidationError } from "../errors/sdkvalidationerror.js";
+
+export type InfiniteRetention = {};
+
+/** @internal */
+export const InfiniteRetention$inboundSchema: z.ZodType<
+  InfiniteRetention,
+  z.ZodTypeDef,
+  unknown
+> = z.object({});
+
+/** @internal */
+export type InfiniteRetention$Outbound = {};
+
+/** @internal */
+export const InfiniteRetention$outboundSchema: z.ZodType<
+  InfiniteRetention$Outbound,
+  z.ZodTypeDef,
+  InfiniteRetention
+> = 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 InfiniteRetention$ {
+  /** @deprecated use `InfiniteRetention$inboundSchema` instead. */
+  export const inboundSchema = InfiniteRetention$inboundSchema;
+  /** @deprecated use `InfiniteRetention$outboundSchema` instead. */
+  export const outboundSchema = InfiniteRetention$outboundSchema;
+  /** @deprecated use `InfiniteRetention$Outbound` instead. */
+  export type Outbound = InfiniteRetention$Outbound;
+}
+
+export function infiniteRetentionToJSON(
+  infiniteRetention: InfiniteRetention,
+): string {
+  return JSON.stringify(
+    InfiniteRetention$outboundSchema.parse(infiniteRetention),
+  );
+}
+
+export function infiniteRetentionFromJSON(
+  jsonString: string,
+): SafeParseResult<InfiniteRetention, SDKValidationError> {
+  return safeParse(
+    jsonString,
+    (x) => InfiniteRetention$inboundSchema.parse(JSON.parse(x)),
+    `Failed to parse 'InfiniteRetention' from JSON`,
+  );
+}

package/src/models/components/metric.ts

@@ -51,7 +51,7 @@ export type Three = {
  * @remarks
  * bucket.
  */
-export type Two = {
+export type Metric2 = {
   accumulation: Accumulation;
 };
 
@@ -62,7 +62,7 @@ export type Metric1 = {
   scalar: Scalar;
 };
 
-export type Metric = Metric1 | Two | Three | Four;
+export type Metric = Metric1 | Metric2 | Three | Four;
 
 /** @internal */
 export const Four$inboundSchema: z.ZodType<Four, z.ZodTypeDef, unknown> = z
@@ -156,46 +156,49 @@ export function threeFromJSON(
 }
 
 /** @internal */
-export const Two$inboundSchema: z.ZodType<Two, z.ZodTypeDef, unknown> = z
-  .object({
+export const Metric2$inboundSchema: z.ZodType<Metric2, z.ZodTypeDef, unknown> =
+  z.object({
     accumulation: Accumulation$inboundSchema,
   });
 
 /** @internal */
-export type Two$Outbound = {
+export type Metric2$Outbound = {
   accumulation: Accumulation$Outbound;
 };
 
 /** @internal */
-export const Two$outboundSchema: z.ZodType<Two$Outbound, z.ZodTypeDef, Two> = z
-  .object({
-    accumulation: Accumulation$outboundSchema,
-  });
+export const Metric2$outboundSchema: z.ZodType<
+  Metric2$Outbound,
+  z.ZodTypeDef,
+  Metric2
+> = z.object({
+  accumulation: Accumulation$outboundSchema,
+});
 
 /**
  * @internal
  * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
  */
-export namespace Two$ {
-  /** @deprecated use `Two$inboundSchema` instead. */
-  export const inboundSchema = Two$inboundSchema;
-  /** @deprecated use `Two$outboundSchema` instead. */
-  export const outboundSchema = Two$outboundSchema;
-  /** @deprecated use `Two$Outbound` instead. */
-  export type Outbound = Two$Outbound;
+export namespace Metric2$ {
+  /** @deprecated use `Metric2$inboundSchema` instead. */
+  export const inboundSchema = Metric2$inboundSchema;
+  /** @deprecated use `Metric2$outboundSchema` instead. */
+  export const outboundSchema = Metric2$outboundSchema;
+  /** @deprecated use `Metric2$Outbound` instead. */
+  export type Outbound = Metric2$Outbound;
 }
 
-export function twoToJSON(two: Two): string {
-  return JSON.stringify(Two$outboundSchema.parse(two));
+export function metric2ToJSON(metric2: Metric2): string {
+  return JSON.stringify(Metric2$outboundSchema.parse(metric2));
 }
 
-export function twoFromJSON(
+export function metric2FromJSON(
   jsonString: string,
-): SafeParseResult<Two, SDKValidationError> {
+): SafeParseResult<Metric2, SDKValidationError> {
   return safeParse(
     jsonString,
-    (x) => Two$inboundSchema.parse(JSON.parse(x)),
-    `Failed to parse 'Two' from JSON`,
+    (x) => Metric2$inboundSchema.parse(JSON.parse(x)),
+    `Failed to parse 'Metric2' from JSON`,
   );
 }
 
@@ -250,7 +253,7 @@ export function metric1FromJSON(
 export const Metric$inboundSchema: z.ZodType<Metric, z.ZodTypeDef, unknown> = z
   .union([
     z.lazy(() => Metric1$inboundSchema),
-    z.lazy(() => Two$inboundSchema),
+    z.lazy(() => Metric2$inboundSchema),
     z.lazy(() => Three$inboundSchema),
     z.lazy(() => Four$inboundSchema),
   ]);
@@ -258,7 +261,7 @@ export const Metric$inboundSchema: z.ZodType<Metric, z.ZodTypeDef, unknown> = z
 /** @internal */
 export type Metric$Outbound =
   | Metric1$Outbound
-  | Two$Outbound
+  | Metric2$Outbound
   | Three$Outbound
   | Four$Outbound;
 
@@ -269,7 +272,7 @@ export const Metric$outboundSchema: z.ZodType<
   Metric
 > = z.union([
   z.lazy(() => Metric1$outboundSchema),
-  z.lazy(() => Two$outboundSchema),
+  z.lazy(() => Metric2$outboundSchema),
   z.lazy(() => Three$outboundSchema),
   z.lazy(() => Four$outboundSchema),
 ]);

package/src/models/components/retentionpolicy.ts

@@ -6,24 +6,83 @@ import * as z from "zod";
 import { safeParse } from "../../lib/schemas.js";
 import { Result as SafeParseResult } from "../../types/fp.js";
 import { SDKValidationError } from "../errors/sdkvalidationerror.js";
+import {
+  InfiniteRetention,
+  InfiniteRetention$inboundSchema,
+  InfiniteRetention$Outbound,
+  InfiniteRetention$outboundSchema,
+} from "./infiniteretention.js";
+
+/**
+ * Retain records unless explicitly trimmed.
+ */
+export type Two = {
+  infinite: InfiniteRetention;
+};
 
 /**
  * Age in seconds for automatic trimming of records older than this threshold.
  *
  * @remarks
- * If this is set to 0, the stream will have infinite retention.
+ * This must be set to a value greater than 0 seconds.
+ * (While S2 is in public preview, this is capped at 28 days. Let us know if you'd like the cap removed.)
  */
 export type One = {
   /**
    * Age in seconds for automatic trimming of records older than this threshold.
    *
    * @remarks
-   * If this is set to 0, the stream will have infinite retention.
+   * This must be set to a value greater than 0 seconds.
+   * (While S2 is in public preview, this is capped at 28 days. Let us know if you'd like the cap removed.)
    */
   age: number;
 };
 
-export type RetentionPolicy = One;
+export type RetentionPolicy = One | Two;
+
+/** @internal */
+export const Two$inboundSchema: z.ZodType<Two, z.ZodTypeDef, unknown> = z
+  .object({
+    infinite: InfiniteRetention$inboundSchema,
+  });
+
+/** @internal */
+export type Two$Outbound = {
+  infinite: InfiniteRetention$Outbound;
+};
+
+/** @internal */
+export const Two$outboundSchema: z.ZodType<Two$Outbound, z.ZodTypeDef, Two> = z
+  .object({
+    infinite: InfiniteRetention$outboundSchema,
+  });
+
+/**
+ * @internal
+ * @deprecated This namespace will be removed in future versions. Use schemas and types that are exported directly from this module.
+ */
+export namespace Two$ {
+  /** @deprecated use `Two$inboundSchema` instead. */
+  export const inboundSchema = Two$inboundSchema;
+  /** @deprecated use `Two$outboundSchema` instead. */
+  export const outboundSchema = Two$outboundSchema;
+  /** @deprecated use `Two$Outbound` instead. */
+  export type Outbound = Two$Outbound;
+}
+
+export function twoToJSON(two: Two): string {
+  return JSON.stringify(Two$outboundSchema.parse(two));
+}
+
+export function twoFromJSON(
+  jsonString: string,
+): SafeParseResult<Two, SDKValidationError> {
+  return safeParse(
+    jsonString,
+    (x) => Two$inboundSchema.parse(JSON.parse(x)),
+    `Failed to parse 'Two' from JSON`,
+  );
+}
 
 /** @internal */
 export const One$inboundSchema: z.ZodType<One, z.ZodTypeDef, unknown> = z
@@ -74,17 +133,20 @@ export const RetentionPolicy$inboundSchema: z.ZodType<
   RetentionPolicy,
   z.ZodTypeDef,
   unknown
-> = z.lazy(() => One$inboundSchema);
+> = z.union([z.lazy(() => One$inboundSchema), z.lazy(() => Two$inboundSchema)]);
 
 /** @internal */
-export type RetentionPolicy$Outbound = One$Outbound;
+export type RetentionPolicy$Outbound = One$Outbound | Two$Outbound;
 
 /** @internal */
 export const RetentionPolicy$outboundSchema: z.ZodType<
   RetentionPolicy$Outbound,
   z.ZodTypeDef,
   RetentionPolicy
-> = z.lazy(() => One$outboundSchema);
+> = z.union([
+  z.lazy(() => One$outboundSchema),
+  z.lazy(() => Two$outboundSchema),
+]);
 
 /**
  * @internal

package/src/models/errors/index.ts

@@ -7,5 +7,6 @@ export * from "./appendconditionfailed.js";
 export * from "./errorresponse.js";
 export * from "./httpclienterrors.js";
 export * from "./responsevalidationerror.js";
+export * from "./s2error.js";
 export * from "./sdkvalidationerror.js";
 export * from "./tailresponse.js";