@valtown/sdk 0.23.0 → 0.25.0

package/resources/vals/versions.mjs

@@ -1,6 +1,5 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 import { APIResource } from "../../resource.mjs";
-import * as VersionsAPI from "./versions.mjs";
 import { PageCursorURL } from "../../pagination.mjs";
 export class Versions extends APIResource {
     /**
@@ -36,7 +35,5 @@ export class Versions extends APIResource {
 }
 export class VersionListResponsesPageCursorURL extends PageCursorURL {
 }
-(function (Versions) {
-    Versions.VersionListResponsesPageCursorURL = VersionsAPI.VersionListResponsesPageCursorURL;
-})(Versions || (Versions = {}));
+Versions.VersionListResponsesPageCursorURL = VersionListResponsesPageCursorURL;
 //# sourceMappingURL=versions.mjs.map

package/resources/vals/versions.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"versions.mjs","sourceRoot":"","sources":["../../src/resources/vals/versions.ts"],"names":[],"mappings":"AAAA,sFAAsF;OAE/E,EAAE,WAAW,EAAE;OAEf,KAAK,WAAW;OAEhB,EAAE,aAAa,EAA4B;AAElD,MAAM,OAAO,QAAS,SAAQ,WAAW;IACvC;;OAEG;IACH,MAAM,CACJ,KAAa,EACb,IAAyB,EACzB,OAA6B;QAE7B,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,KAAK,WAAW,EAAE,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;IAC/E,CAAC;IAED;;OAEG;IACH,QAAQ,CACN,KAAa,EACb,OAAe,EACf,KAA4B,EAC5B,OAA6B;QAE7B,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,aAAa,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;IAC1F,CAAC;IAED;;OAEG;IACH,IAAI,CACF,KAAa,EACb,KAAwB,EACxB,OAA6B;QAE7B,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,KAAK,WAAW,EAAE,iCAAiC,EAAE;YAC9F,KAAK;YACL,GAAG,OAAO;SACX,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAa,EAAE,OAAe,EAAE,OAA6B;QAClE,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,KAAK,aAAa,OAAO,EAAE,EAAE;YAClE,GAAG,OAAO;YACV,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE;SAChD,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,iCAAkC,SAAQ,aAAkC;CAAG;AA2D5F,WAAiB,QAAQ;IAET,0CAAiC,GAAG,WAAW,CAAC,iCAAiC,CAAC;AAIlG,CAAC,EANgB,QAAQ,KAAR,QAAQ,QAMxB"}
+{"version":3,"file":"versions.mjs","sourceRoot":"","sources":["../../src/resources/vals/versions.ts"],"names":[],"mappings":"AAAA,sFAAsF;OAE/E,EAAE,WAAW,EAAE;OAGf,EAAE,aAAa,EAA4B;AAElD,MAAM,OAAO,QAAS,SAAQ,WAAW;IACvC;;OAEG;IACH,MAAM,CACJ,KAAa,EACb,IAAyB,EACzB,OAA6B;QAE7B,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,KAAK,WAAW,EAAE,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;IAC/E,CAAC;IAED;;OAEG;IACH,QAAQ,CACN,KAAa,EACb,OAAe,EACf,KAA4B,EAC5B,OAA6B;QAE7B,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,aAAa,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;IAC1F,CAAC;IAED;;OAEG;IACH,IAAI,CACF,KAAa,EACb,KAAwB,EACxB,OAA6B;QAE7B,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,KAAK,WAAW,EAAE,iCAAiC,EAAE;YAC9F,KAAK;YACL,GAAG,OAAO;SACX,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,KAAa,EAAE,OAAe,EAAE,OAA6B;QAClE,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,KAAK,aAAa,OAAO,EAAE,EAAE;YAClE,GAAG,OAAO;YACV,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE;SAChD,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,iCAAkC,SAAQ,aAAkC;CAAG;AA2D5F,QAAQ,CAAC,iCAAiC,GAAG,iCAAiC,CAAC"}

package/shims/node.d.ts

@@ -1,6 +1,7 @@
                               
                               
                               
+                              
 import * as types from "../_shims/node-types.js";
 declare module '../_shims/manual-types' {
     namespace manual {

package/shims/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/shims/node.ts"],"names":[],"mappings":";;;AACA,OAAO,KAAK,KAAK,MAAM,sBAAsB,CAAC;AAK9C,OAAO,QAAQ,wBAAwB,CAAC;IACtC,UAAiB,MAAM,CAAC;QAEtB,KAAY,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;QAEhC,MAAM,QAAQ,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;QAElC,KAAY,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAEpC,KAAY,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QAE5C,KAAY,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QAE5C,KAAY,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAEtC,KAAY,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;QAE9C,KAAY,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;QAE9C,KAAY,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAEtC,KAAY,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAEpC,KAAY,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QAE5C,KAAY,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC;QAEpD,KAAY,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC;QAEpD,KAAY,mBAAmB,GAAG,KAAK,CAAC,mBAAmB,CAAC;QAE5D,MAAM,QAAQ,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAExC,MAAM,QAAQ,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QAEhC,MAAM,QAAQ,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QAEhC,KAAY,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAEtC,KAAY,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;QAE9C,MAAM,QAAQ,cAAc,GAAG,KAAK,CAAC,cAAc,CAAC;KACrD;CACF"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../src/shims/node.ts"],"names":[],"mappings":";;;;AACA,OAAO,KAAK,KAAK,MAAM,sBAAsB,CAAC;AAK9C,OAAO,QAAQ,wBAAwB,CAAC;IACtC,UAAiB,MAAM,CAAC;QAEtB,KAAY,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;QAEhC,MAAM,QAAQ,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;QAElC,KAAY,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAEpC,KAAY,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QAE5C,KAAY,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QAE5C,KAAY,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAEtC,KAAY,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;QAE9C,KAAY,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;QAE9C,KAAY,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAEtC,KAAY,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAEpC,KAAY,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QAE5C,KAAY,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC;QAEpD,KAAY,eAAe,GAAG,KAAK,CAAC,eAAe,CAAC;QAEpD,KAAY,mBAAmB,GAAG,KAAK,CAAC,mBAAmB,CAAC;QAE5D,MAAM,QAAQ,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAExC,MAAM,QAAQ,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QAEhC,MAAM,QAAQ,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QAEhC,KAAY,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAEtC,KAAY,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;QAE9C,MAAM,QAAQ,cAAc,GAAG,KAAK,CAAC,cAAc,CAAC;KACrD;CACF"}

package/src/_shims/node-types.d.ts

@@ -7,7 +7,7 @@ import * as fd from 'formdata-node';
 export { type Agent } from 'node:http';
 export { type Readable } from 'node:stream';
 export { type ReadStream as FsReadStream } from 'node:fs';
-export { ReadableStream } from 'web-streams-polyfill';
+export { ReadableStream } from 'node:stream/web';
 
 export const fetch: typeof nf.default;
 

package/src/core.ts

@@ -84,8 +84,10 @@ export class APIPromise<T> extends Promise<T> {
     });
   }
 
-  _thenUnwrap<U>(transform: (data: T) => U): APIPromise<U> {
-    return new APIPromise(this.responsePromise, async (props) => transform(await this.parseResponse(props)));
+  _thenUnwrap<U>(transform: (data: T, props: APIResponseProps) => U): APIPromise<U> {
+    return new APIPromise(this.responsePromise, async (props) =>
+      transform(await this.parseResponse(props), props),
+    );
   }
 
   /**
@@ -161,7 +163,7 @@ export abstract class APIClient {
     maxRetries = 2,
     timeout = 60000, // 1 minute
     httpAgent,
-    fetch: overridenFetch,
+    fetch: overriddenFetch,
   }: {
     baseURL: string;
     maxRetries?: number | undefined;
@@ -174,7 +176,7 @@ export abstract class APIClient {
     this.timeout = validatePositiveInteger('timeout', timeout);
     this.httpAgent = httpAgent;
 
-    this.fetch = overridenFetch ?? fetch;
+    this.fetch = overriddenFetch ?? fetch;
   }
 
   protected authHeaders(opts: FinalRequestOptions): Headers {
@@ -274,7 +276,10 @@ export abstract class APIClient {
     return null;
   }
 
-  buildRequest<Req>(options: FinalRequestOptions<Req>): { req: RequestInit; url: string; timeout: number } {
+  buildRequest<Req>(
+    options: FinalRequestOptions<Req>,
+    { retryCount = 0 }: { retryCount?: number } = {},
+  ): { req: RequestInit; url: string; timeout: number } {
     const { method, path, query, headers: headers = {} } = options;
 
     const body =
@@ -306,7 +311,7 @@ export abstract class APIClient {
       headers[this.idempotencyHeader] = options.idempotencyKey;
     }
 
-    const reqHeaders = this.buildHeaders({ options, headers, contentLength });
+    const reqHeaders = this.buildHeaders({ options, headers, contentLength, retryCount });
 
     const req: RequestInit = {
       method,
@@ -325,10 +330,12 @@ export abstract class APIClient {
     options,
     headers,
     contentLength,
+    retryCount,
   }: {
     options: FinalRequestOptions;
     headers: Record<string, string | null | undefined>;
     contentLength: string | null | undefined;
+    retryCount: number;
   }): Record<string, string> {
     const reqHeaders: Record<string, string> = {};
     if (contentLength) {
@@ -344,6 +351,16 @@ export abstract class APIClient {
       delete reqHeaders['content-type'];
     }
 
+    // Don't set the retry count header if it was already set or removed through default headers or by the
+    // caller. We check `defaultHeaders` and `headers`, which can contain nulls, instead of `reqHeaders` to
+    // account for the removal case.
+    if (
+      getHeader(defaultHeaders, 'x-stainless-retry-count') === undefined &&
+      getHeader(headers, 'x-stainless-retry-count') === undefined
+    ) {
+      reqHeaders['x-stainless-retry-count'] = String(retryCount);
+    }
+
     this.validateHeaders(reqHeaders, headers);
 
     return reqHeaders;
@@ -379,7 +396,7 @@ export abstract class APIClient {
     error: Object | undefined,
     message: string | undefined,
     headers: Headers | undefined,
-  ) {
+  ): APIError {
     return APIError.generate(status, error, message, headers);
   }
 
@@ -395,13 +412,14 @@ export abstract class APIClient {
     retriesRemaining: number | null,
   ): Promise<APIResponseProps> {
     const options = await optionsInput;
+    const maxRetries = options.maxRetries ?? this.maxRetries;
     if (retriesRemaining == null) {
-      retriesRemaining = options.maxRetries ?? this.maxRetries;
+      retriesRemaining = maxRetries;
     }
 
     await this.prepareOptions(options);
 
-    const { req, url, timeout } = this.buildRequest(options);
+    const { req, url, timeout } = this.buildRequest(options, { retryCount: maxRetries - retriesRemaining });
 
     await this.prepareRequest(req, { url, options });
 
@@ -504,20 +522,24 @@ export abstract class APIClient {
 
     const timeout = setTimeout(() => controller.abort(), ms);
 
+    const fetchOptions = {
+      signal: controller.signal as any,
+      ...options,
+    };
+    if (fetchOptions.method) {
+      // Custom methods like 'patch' need to be uppercased
+      // See https://github.com/nodejs/undici/issues/2294
+      fetchOptions.method = fetchOptions.method.toUpperCase();
+    }
+
     return (
-      this.getRequestClient()
-        // use undefined this binding; fetch errors if bound to something else in browser/cloudflare
-        .fetch.call(undefined, url, { signal: controller.signal as any, ...options })
-        .finally(() => {
-          clearTimeout(timeout);
-        })
+      // use undefined this binding; fetch errors if bound to something else in browser/cloudflare
+      this.fetch.call(undefined, url, fetchOptions).finally(() => {
+        clearTimeout(timeout);
+      })
     );
   }
 
-  protected getRequestClient(): RequestClient {
-    return { fetch: this.fetch };
-  }
-
   private shouldRetry(response: Response): boolean {
     // Note this is not a standard header.
     const shouldRetryHeader = response.headers.get('x-should-retry');
@@ -650,9 +672,9 @@ export abstract class AbstractPage<Item> implements AsyncIterable<Item> {
     return await this.#client.requestAPIList(this.constructor as any, nextOptions);
   }
 
-  async *iterPages() {
+  async *iterPages(): AsyncGenerator<this> {
     // eslint-disable-next-line @typescript-eslint/no-this-alias
-    let page: AbstractPage<Item> = this;
+    let page: this = this;
     yield page;
     while (page.hasNextPage()) {
       page = await page.getNextPage();
@@ -660,7 +682,7 @@ export abstract class AbstractPage<Item> implements AsyncIterable<Item> {
     }
   }
 
-  async *[Symbol.asyncIterator]() {
+  async *[Symbol.asyncIterator](): AsyncGenerator<Item> {
     for await (const page of this.iterPages()) {
       for (const item of page.getPaginatedItems()) {
         yield item;
@@ -703,7 +725,7 @@ export class PagePromise<
    *      console.log(item)
    *    }
    */
-  async *[Symbol.asyncIterator]() {
+  async *[Symbol.asyncIterator](): AsyncGenerator<Item> {
     const page = await this;
     for await (const item of page) {
       yield item;
@@ -958,8 +980,8 @@ export const safeJSON = (text: string) => {
   }
 };
 
-// https://stackoverflow.com/a/19709846
-const startsWithSchemeRegexp = new RegExp('^(?:[a-z]+:)?//', 'i');
+// https://url.spec.whatwg.org/#url-scheme-string
+const startsWithSchemeRegexp = /^[a-z][a-z0-9+.-]*:/i;
 const isAbsoluteURL = (url: string): boolean => {
   return startsWithSchemeRegexp.test(url);
 };
@@ -1120,7 +1142,15 @@ export const isHeadersProtocol = (headers: any): headers is HeadersProtocol => {
   return typeof headers?.get === 'function';
 };
 
-export const getRequiredHeader = (headers: HeadersLike, header: string): string => {
+export const getRequiredHeader = (headers: HeadersLike | Headers, header: string): string => {
+  const foundHeader = getHeader(headers, header);
+  if (foundHeader === undefined) {
+    throw new Error(`Could not find ${header} header`);
+  }
+  return foundHeader;
+};
+
+export const getHeader = (headers: HeadersLike | Headers, header: string): string | undefined => {
   const lowerCasedHeader = header.toLowerCase();
   if (isHeadersProtocol(headers)) {
     // to deal with the case where the header looks like Stainless-Event-Id
@@ -1146,7 +1176,7 @@ export const getRequiredHeader = (headers: HeadersLike, header: string): string
     }
   }
 
-  throw new Error(`Could not find ${header} header`);
+  return undefined;
 };
 
 /**

package/src/error.ts

@@ -4,17 +4,19 @@ import { castToError, Headers } from './core';
 
 export class ValTownError extends Error {}
 
-export class APIError extends ValTownError {
-  readonly status: number | undefined;
-  readonly headers: Headers | undefined;
-  readonly error: Object | undefined;
-
-  constructor(
-    status: number | undefined,
-    error: Object | undefined,
-    message: string | undefined,
-    headers: Headers | undefined,
-  ) {
+export class APIError<
+  TStatus extends number | undefined = number | undefined,
+  THeaders extends Headers | undefined = Headers | undefined,
+  TError extends Object | undefined = Object | undefined,
+> extends ValTownError {
+  /** HTTP status for the response that caused the error */
+  readonly status: TStatus;
+  /** HTTP headers for the response that caused the error */
+  readonly headers: THeaders;
+  /** JSON body of the response that caused the error */
+  readonly error: TError;
+
+  constructor(status: TStatus, error: TError, message: string | undefined, headers: THeaders) {
     super(`${APIError.makeMessage(status, error, message)}`);
     this.status = status;
     this.headers = headers;
@@ -47,8 +49,8 @@ export class APIError extends ValTownError {
     errorResponse: Object | undefined,
     message: string | undefined,
     headers: Headers | undefined,
-  ) {
-    if (!status) {
+  ): APIError {
+    if (!status || !headers) {
       return new APIConnectionError({ message, cause: castToError(errorResponse) });
     }
 
@@ -90,17 +92,13 @@ export class APIError extends ValTownError {
   }
 }
 
-export class APIUserAbortError extends APIError {
-  override readonly status: undefined = undefined;
-
+export class APIUserAbortError extends APIError<undefined, undefined, undefined> {
   constructor({ message }: { message?: string } = {}) {
     super(undefined, undefined, message || 'Request was aborted.', undefined);
   }
 }
 
-export class APIConnectionError extends APIError {
-  override readonly status: undefined = undefined;
-
+export class APIConnectionError extends APIError<undefined, undefined, undefined> {
   constructor({ message, cause }: { message?: string | undefined; cause?: Error | undefined }) {
     super(undefined, undefined, message || 'Connection error.', undefined);
     // in some environments the 'cause' property is already declared
@@ -115,32 +113,18 @@ export class APIConnectionTimeoutError extends APIConnectionError {
   }
 }
 
-export class BadRequestError extends APIError {
-  override readonly status: 400 = 400;
-}
+export class BadRequestError extends APIError<400, Headers> {}
 
-export class AuthenticationError extends APIError {
-  override readonly status: 401 = 401;
-}
+export class AuthenticationError extends APIError<401, Headers> {}
 
-export class PermissionDeniedError extends APIError {
-  override readonly status: 403 = 403;
-}
+export class PermissionDeniedError extends APIError<403, Headers> {}
 
-export class NotFoundError extends APIError {
-  override readonly status: 404 = 404;
-}
+export class NotFoundError extends APIError<404, Headers> {}
 
-export class ConflictError extends APIError {
-  override readonly status: 409 = 409;
-}
+export class ConflictError extends APIError<409, Headers> {}
 
-export class UnprocessableEntityError extends APIError {
-  override readonly status: 422 = 422;
-}
+export class UnprocessableEntityError extends APIError<422, Headers> {}
 
-export class RateLimitError extends APIError {
-  override readonly status: 429 = 429;
-}
+export class RateLimitError extends APIError<429, Headers> {}
 
-export class InternalServerError extends APIError {}
+export class InternalServerError extends APIError<number, Headers> {}

package/src/index.ts

@@ -1,11 +1,26 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import * as Errors from './error';
-import * as Uploads from './uploads';
 import { type Agent } from './_shims/index';
 import * as Core from './core';
+import * as Errors from './error';
 import * as Pagination from './pagination';
+import { type PageCursorURLParams, PageCursorURLResponse } from './pagination';
+import * as Uploads from './uploads';
 import * as API from './resources/index';
+import { BlobListParams, BlobListResponse, BlobStoreParams, Blobs } from './resources/blobs';
+import { EmailSendParams, EmailSendResponse, Emails } from './resources/emails';
+import { Sqlite, SqliteBatchParams, SqliteBatchResponse, SqliteExecuteParams } from './resources/sqlite';
+import { Alias } from './resources/alias/alias';
+import { Me } from './resources/me/me';
+import { Search } from './resources/search/search';
+import { Users } from './resources/users/users';
+import {
+  ValCancelEvaluationResponse,
+  ValCreateOrUpdateParams,
+  ValCreateParams,
+  ValUpdateParams,
+  Vals,
+} from './resources/vals/vals';
 
 export interface ClientOptions {
   /**
@@ -189,7 +204,68 @@ export class ValTown extends Core.APIClient {
   static fileFromPath = Uploads.fileFromPath;
 }
 
-export const {
+ValTown.Search = Search;
+ValTown.Alias = Alias;
+ValTown.Me = Me;
+ValTown.Blobs = Blobs;
+ValTown.Users = Users;
+ValTown.Sqlite = Sqlite;
+ValTown.Vals = Vals;
+ValTown.Emails = Emails;
+export declare namespace ValTown {
+  export type RequestOptions = Core.RequestOptions;
+
+  export import PageCursorURL = Pagination.PageCursorURL;
+  export {
+    type PageCursorURLParams as PageCursorURLParams,
+    type PageCursorURLResponse as PageCursorURLResponse,
+  };
+
+  export { Search as Search };
+
+  export { Alias as Alias };
+
+  export { Me as Me };
+
+  export {
+    Blobs as Blobs,
+    type BlobListResponse as BlobListResponse,
+    type BlobListParams as BlobListParams,
+    type BlobStoreParams as BlobStoreParams,
+  };
+
+  export { Users as Users };
+
+  export {
+    Sqlite as Sqlite,
+    type SqliteBatchResponse as SqliteBatchResponse,
+    type SqliteBatchParams as SqliteBatchParams,
+    type SqliteExecuteParams as SqliteExecuteParams,
+  };
+
+  export {
+    Vals as Vals,
+    type ValCancelEvaluationResponse as ValCancelEvaluationResponse,
+    type ValCreateParams as ValCreateParams,
+    type ValUpdateParams as ValUpdateParams,
+    type ValCreateOrUpdateParams as ValCreateOrUpdateParams,
+  };
+
+  export {
+    Emails as Emails,
+    type EmailSendResponse as EmailSendResponse,
+    type EmailSendParams as EmailSendParams,
+  };
+
+  export type BasicVal = API.BasicVal;
+  export type ExtendedVal = API.ExtendedVal;
+  export type PaginationLinks = API.PaginationLinks;
+  export type ResultSet = API.ResultSet;
+  export type User = API.User;
+}
+
+export { toFile, fileFromPath } from './uploads';
+export {
   ValTownError,
   APIError,
   APIConnectionError,
@@ -203,51 +279,6 @@ export const {
   InternalServerError,
   PermissionDeniedError,
   UnprocessableEntityError,
-} = Errors;
-
-export import toFile = Uploads.toFile;
-export import fileFromPath = Uploads.fileFromPath;
-
-export namespace ValTown {
-  export import RequestOptions = Core.RequestOptions;
-
-  export import PageCursorURL = Pagination.PageCursorURL;
-  export import PageCursorURLParams = Pagination.PageCursorURLParams;
-  export import PageCursorURLResponse = Pagination.PageCursorURLResponse;
-
-  export import Search = API.Search;
-
-  export import Alias = API.Alias;
-
-  export import Me = API.Me;
-
-  export import Blobs = API.Blobs;
-  export import BlobListResponse = API.BlobListResponse;
-  export import BlobListParams = API.BlobListParams;
-  export import BlobStoreParams = API.BlobStoreParams;
-
-  export import Users = API.Users;
-
-  export import Sqlite = API.Sqlite;
-  export import SqliteBatchResponse = API.SqliteBatchResponse;
-  export import SqliteBatchParams = API.SqliteBatchParams;
-  export import SqliteExecuteParams = API.SqliteExecuteParams;
-
-  export import Vals = API.Vals;
-  export import ValCancelEvaluationResponse = API.ValCancelEvaluationResponse;
-  export import ValCreateParams = API.ValCreateParams;
-  export import ValUpdateParams = API.ValUpdateParams;
-  export import ValCreateOrUpdateParams = API.ValCreateOrUpdateParams;
-
-  export import Emails = API.Emails;
-  export import EmailSendResponse = API.EmailSendResponse;
-  export import EmailSendParams = API.EmailSendParams;
-
-  export import BasicVal = API.BasicVal;
-  export import ExtendedVal = API.ExtendedVal;
-  export import PaginationLinks = API.PaginationLinks;
-  export import ResultSet = API.ResultSet;
-  export import User = API.User;
-}
+} from './error';
 
 export default ValTown;

package/src/resources/alias/alias.ts

@@ -2,6 +2,7 @@
 
 import { APIResource } from '../../resource';
 import * as UsernameAPI from './username/username';
+import { Username } from './username/username';
 
 /**
  * Methods to translate between human-readable names and IDs
@@ -10,6 +11,8 @@ export class Alias extends APIResource {
   username: UsernameAPI.Username = new UsernameAPI.Username(this._client);
 }
 
-export namespace Alias {
-  export import Username = UsernameAPI.Username;
+Alias.Username = Username;
+
+export declare namespace Alias {
+  export { Username as Username };
 }

package/src/resources/alias/username/index.ts

@@ -1,4 +1,4 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export { Username } from './username';
-export { ValNameRetrieveResponse, ValName } from './val-name';
+export { ValName, type ValNameRetrieveResponse } from './val-name';

package/src/resources/alias/username/username.ts

@@ -4,6 +4,7 @@ import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
 import * as Shared from '../../shared';
 import * as ValNameAPI from './val-name';
+import { ValName, ValNameRetrieveResponse } from './val-name';
 
 export class Username extends APIResource {
   valName: ValNameAPI.ValName = new ValNameAPI.ValName(this._client);
@@ -16,7 +17,8 @@ export class Username extends APIResource {
   }
 }
 
-export namespace Username {
-  export import ValName = ValNameAPI.ValName;
-  export import ValNameRetrieveResponse = ValNameAPI.ValNameRetrieveResponse;
+Username.ValName = ValName;
+
+export declare namespace Username {
+  export { ValName as ValName, type ValNameRetrieveResponse as ValNameRetrieveResponse };
 }

package/src/resources/alias/username/val-name.ts

@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ValNameAPI from './val-name';
 
 export class ValName extends APIResource {
   /**
@@ -83,6 +82,8 @@ export interface ValNameRetrieveResponse {
    * The version of this val, starting at zero
    */
   version: number;
+
+  versionCreatedAt?: string;
 }
 
 export namespace ValNameRetrieveResponse {
@@ -118,6 +119,6 @@ export namespace ValNameRetrieveResponse {
   }
 }
 
-export namespace ValName {
-  export import ValNameRetrieveResponse = ValNameAPI.ValNameRetrieveResponse;
+export declare namespace ValName {
+  export { type ValNameRetrieveResponse as ValNameRetrieveResponse };
 }

package/src/resources/blobs.ts

@@ -3,7 +3,6 @@
 import { APIResource } from '../resource';
 import { isRequestOptions } from '../core';
 import * as Core from '../core';
-import * as BlobsAPI from './blobs';
 import { type Response } from '../_shims/index';
 
 /**
@@ -85,8 +84,10 @@ export interface BlobListParams {
 
 export type BlobStoreParams = Core.Uploadable;
 
-export namespace Blobs {
-  export import BlobListResponse = BlobsAPI.BlobListResponse;
-  export import BlobListParams = BlobsAPI.BlobListParams;
-  export import BlobStoreParams = BlobsAPI.BlobStoreParams;
+export declare namespace Blobs {
+  export {
+    type BlobListResponse as BlobListResponse,
+    type BlobListParams as BlobListParams,
+    type BlobStoreParams as BlobStoreParams,
+  };
 }

package/src/resources/emails.ts

@@ -3,7 +3,6 @@
 import { APIResource } from '../resource';
 import { isRequestOptions } from '../core';
 import * as Core from '../core';
-import * as EmailsAPI from './emails';
 
 /**
  * Val Town supports sending emails from vals
@@ -179,7 +178,6 @@ export namespace EmailSendParams {
   }
 }
 
-export namespace Emails {
-  export import EmailSendResponse = EmailsAPI.EmailSendResponse;
-  export import EmailSendParams = EmailsAPI.EmailSendParams;
+export declare namespace Emails {
+  export { type EmailSendResponse as EmailSendResponse, type EmailSendParams as EmailSendParams };
 }

package/src/resources/index.ts

@@ -2,16 +2,16 @@
 
 export * from './shared';
 export { Alias } from './alias/alias';
-export { BlobListResponse, BlobListParams, BlobStoreParams, Blobs } from './blobs';
-export { EmailSendResponse, EmailSendParams, Emails } from './emails';
+export { Blobs, type BlobListResponse, type BlobListParams, type BlobStoreParams } from './blobs';
+export { Emails, type EmailSendResponse, type EmailSendParams } from './emails';
 export { Me } from './me/me';
 export { Search } from './search/search';
-export { SqliteBatchResponse, SqliteBatchParams, SqliteExecuteParams, Sqlite } from './sqlite';
+export { Sqlite, type SqliteBatchResponse, type SqliteBatchParams, type SqliteExecuteParams } from './sqlite';
 export { Users } from './users/users';
 export {
-  ValCancelEvaluationResponse,
-  ValCreateParams,
-  ValUpdateParams,
-  ValCreateOrUpdateParams,
   Vals,
+  type ValCancelEvaluationResponse,
+  type ValCreateParams,
+  type ValUpdateParams,
+  type ValCreateOrUpdateParams,
 } from './vals/vals';