alchemy 0.45.6 → 0.46.1

package/lib/util/neverthrow.d.ts

@@ -0,0 +1,16 @@
+import { ResultAsync } from "neverthrow";
+export declare const ensure: <T, E>(result: ResultAsync<T, E>, finalizer: () => any) => ResultAsync<T, E>;
+export declare const detached: <T, E>() => {
+    result: ResultAsync<T, E>;
+    ok: (value: T) => void;
+    err: (error: E) => void;
+};
+export declare const singleFlight: <Args extends any[], Value, Error>(fn: (...args: Args) => ResultAsync<Value, Error>) => (...args: Args) => ResultAsync<Value, Error>;
+export declare class HTTPError extends Error {
+    readonly status: number;
+    constructor(message: string, status: number);
+}
+export declare const fetchResult: (url: string, init?: RequestInit) => ResultAsync<Response, HTTPError>;
+export declare const fetchJSON: <T, E>(url: string, init?: RequestInit) => ResultAsync<T, HTTPError | E>;
+export declare const decodeJSON: <T, E>(response: Response) => ResultAsync<T, HTTPError | E>;
+//# sourceMappingURL=neverthrow.d.ts.map

package/lib/util/neverthrow.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"neverthrow.d.ts","sourceRoot":"","sources":["../../src/util/neverthrow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,WAAW,EAAe,MAAM,YAAY,CAAC;AAG/D,eAAO,MAAM,MAAM,GAAI,CAAC,EAAE,CAAC,EACzB,QAAQ,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,EACzB,WAAW,MAAM,GAAG,sBAGrB,CAAC;AAEF,eAAO,MAAM,QAAQ,GAAI,CAAC,EAAE,CAAC;;gBAIb,CAAC;iBACA,CAAC;CAEjB,CAAC;AAEF,eAAO,MAAM,YAAY,GAAI,IAAI,SAAS,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,EAC3D,IAAI,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,MAGxC,GAAG,MAAM,IAAI,KAAG,WAAW,CAAC,KAAK,EAAE,KAAK,CAYjD,CAAC;AAEF,qBAAa,SAAU,SAAQ,KAAK;aAGhB,MAAM,EAAE,MAAM;gBAD9B,OAAO,EAAE,MAAM,EACC,MAAM,EAAE,MAAM;CAIjC;AAGD,eAAO,MAAM,WAAW,GAAI,KAAK,MAAM,EAAE,OAAM,WAAgB,qCAK9D,CAAC;AAEF,eAAO,MAAM,SAAS,GAAI,CAAC,EAAE,CAAC,EAAE,KAAK,MAAM,EAAE,OAAM,WAAgB,kCAElE,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,CAAC,EAAE,CAAC,EAAE,UAAU,QAAQ,kCAKlD,CAAC"}

package/lib/util/neverthrow.js

@@ -0,0 +1,46 @@
+import { err, ok, ResultAsync } from "neverthrow";
+import { promiseWithResolvers } from "./promise-with-resolvers.js";
+export const ensure = (result, finalizer) => {
+    return result.andTee(finalizer).orTee(finalizer);
+};
+export const detached = () => {
+    const { promise, resolve } = promiseWithResolvers();
+    return {
+        result: new ResultAsync(promise),
+        ok: (value) => resolve(ok(value)),
+        err: (error) => resolve(err(error)),
+    };
+};
+export const singleFlight = (fn) => {
+    const results = new Map();
+    return (...args) => {
+        const key = JSON.stringify(args ?? []);
+        const cached = results.get(key);
+        if (cached) {
+            return cached;
+        }
+        const result = fn(...args);
+        results.set(key, result);
+        return ensure(result, () => {
+            results.delete(key);
+        });
+    };
+};
+export class HTTPError extends Error {
+    status;
+    constructor(message, status) {
+        super(message);
+        this.status = status;
+    }
+}
+// TODO: merge this with safe-fetch?
+export const fetchResult = (url, init = {}) => {
+    return ResultAsync.fromPromise(fetch(url, init), () => new HTTPError(`Failed to ${init.method ?? "GET"} ${url}`, 0));
+};
+export const fetchJSON = (url, init = {}) => {
+    return fetchResult(url, init).andThen((decodeJSON));
+};
+export const decodeJSON = (response) => {
+    return ResultAsync.fromPromise(response.json(), () => new HTTPError("Failed to decode JSON", response.status)).andThen((json) => (response.ok ? ok(json) : err(json)));
+};
+//# sourceMappingURL=neverthrow.js.map

package/lib/util/neverthrow.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"neverthrow.js","sourceRoot":"","sources":["../../src/util/neverthrow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,WAAW,EAAe,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,MAAM,CAAC,MAAM,MAAM,GAAG,CACpB,MAAyB,EACzB,SAAoB,EACpB,EAAE;IACF,OAAO,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;AACnD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG,GAAS,EAAE;IACjC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,oBAAoB,EAAgB,CAAC;IAClE,OAAO;QACL,MAAM,EAAE,IAAI,WAAW,CAAC,OAAO,CAAC;QAChC,EAAE,EAAE,CAAC,KAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;QACpC,GAAG,EAAE,CAAC,KAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;KACvC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,EAAgD,EAChD,EAAE;IACF,MAAM,OAAO,GAAG,IAAI,GAAG,EAAqC,CAAC;IAC7D,OAAO,CAAC,GAAG,IAAU,EAA6B,EAAE;QAClD,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,MAAM,MAAM,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;QAC3B,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACzB,OAAO,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE;YACzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,OAAO,SAAU,SAAQ,KAAK;IAGhB;IAFlB,YACE,OAAe,EACC,MAAc;QAE9B,KAAK,CAAC,OAAO,CAAC,CAAC;QAFC,WAAM,GAAN,MAAM,CAAQ;IAGhC,CAAC;CACF;AAED,oCAAoC;AACpC,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAW,EAAE,OAAoB,EAAE,EAAE,EAAE;IACjE,OAAO,WAAW,CAAC,WAAW,CAC5B,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,EAChB,GAAG,EAAE,CAAC,IAAI,SAAS,CAAC,aAAa,IAAI,CAAC,MAAM,IAAI,KAAK,IAAI,GAAG,EAAE,EAAE,CAAC,CAAC,CACnE,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAO,GAAW,EAAE,OAAoB,EAAE,EAAE,EAAE;IACrE,OAAO,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,CAAA,UAAgB,CAAA,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,CAAO,QAAkB,EAAE,EAAE;IACrD,OAAO,WAAW,CAAC,WAAW,CAC5B,QAAQ,CAAC,IAAI,EAAE,EACf,GAAG,EAAE,CAAC,IAAI,SAAS,CAAC,uBAAuB,EAAE,QAAQ,CAAC,MAAM,CAAC,CAC9D,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,IAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAS,CAAC,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC"}

package/package.json

@@ -1,31 +1,31 @@
 {
   "name": "alchemy",
-  "version": "0.45.6",
-  "type": "module",
-  "module": "./lib/index.js",
+  "version": "0.46.1",
   "license": "Apache-2.0",
+  "author": "Sam Goodwin <sam@alchemy.run>",
+  "homepage": "https://alchemy.run",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/sam-goodwin/alchemy.git",
     "directory": "alchemy"
   },
+  "type": "module",
+  "module": "./lib/index.js",
+  "bin": {
+    "alchemy": "bin/alchemy.mjs"
+  },
   "scripts": {
     "build:cli": "bun ./scripts/bundle-cli.ts",
     "build:workers": "bun ./scripts/build-workers.ts",
     "build": "rm -rf ./*.tsbuildinfo && rm -rf ./lib && tsc -b && bun run build:cli && bun run build:workers",
-    "db:generate": "drizzle-kit generate",
+    "drizzle:generate": "bun run scripts/drizzle-generate.ts",
     "docs:gen": "rm -rf ./docs && typedoc",
     "postbuild": "cpx 'src/**/*/types.d.ts' lib && cpx 'src/**/*.txt' lib",
     "publish:npm": "cp ../README.md . && bun run build && bun run build:cli && npm publish && rm README.md"
   },
-  "bin": {
-    "alchemy": "bin/alchemy.mjs"
-  },
-  "author": "Sam Goodwin <sam@alchemy.run>",
-  "homepage": "https://alchemy.run",
   "files": [
     "bin",
-    "drizzle",
+    "drizzle/default",
     "lib",
     "src",
     "templates",
@@ -112,9 +112,9 @@
       "bun": "./src/web/shadcn.ts",
       "import": "./lib/web/shadcn.js"
     },
-    "./sqlite": {
-      "bun": "./src/sqlite/index.ts",
-      "import": "./lib/sqlite/index.js"
+    "./state": {
+      "bun": "./src/state/index.ts",
+      "import": "./lib/state/index.js"
     },
     "./web/astro": {
       "bun": "./src/web/astro.ts",
@@ -149,6 +149,8 @@
     "kleur": "^4.1.5",
     "libsodium-wrappers": "^0.7.15",
     "miniflare": "^4.20250617.4",
+    "neverthrow": "^8.2.0",
+    "open": "^10.1.2",
     "pathe": "^2.0.3",
     "turndown": "^7.0.0",
     "unenv": "2.0.0-rc.15",
@@ -174,10 +176,11 @@
     "arktype": "^2.0.0",
     "cloudflare": "^4.0.0",
     "drizzle-orm": "^0.44.2",
+    "execa": "^9.6.0",
     "hono": "^4.0.0",
     "prettier": "^3.0.0",
     "stripe": "^17.0.0",
-    "zod": "^3.0.0"
+    "zod": "^4.0.5"
   },
   "devDependencies": {
     "@ai-sdk/anthropic": "^1.1.6",
@@ -206,7 +209,6 @@
     "cpx": "^1.5.0",
     "dofs": "^0.1.0",
     "drizzle-kit": "^0.31.4",
-    "execa": "^9.6.0",
     "fs-extra": "^11.3.0",
     "globby": "^14.1.0",
     "libsodium-wrappers": "^0.7.15",
@@ -214,7 +216,7 @@
     "openpgp": "^6.1.0",
     "picocolors": "^1.1.1",
     "prettier": "^3.5.3",
-    "trpc-cli": "^0.9.2",
+    "trpc-cli": "^0.10.0",
     "turndown": "^7.2.0",
     "typedoc": "^0.28.1",
     "typedoc-plugin-markdown": "^4.6.0",

package/src/apply.ts

@@ -1,5 +1,6 @@
 import { alchemy } from "./alchemy.ts";
 import { context } from "./context.ts";
+import { destroy } from "./destroy.ts";
 import {
   PROVIDERS,
   ResourceFQN,
@@ -33,7 +34,14 @@ export function apply<Out extends Resource>(
   return _apply(resource, props, options);
 }
 
-export class ReplacedSignal extends Error {}
+export class ReplacedSignal extends Error {
+  public force: boolean;
+
+  constructor(force?: boolean) {
+    super();
+    this.force = force ?? false;
+  }
+}
 
 async function _apply<Out extends Resource>(
   resource: PendingResource<Out>,
@@ -165,7 +173,7 @@ async function _apply<Out extends Resource>(
       props: state.oldProps,
       state,
       isReplacement: false,
-      replace: () => {
+      replace: async (force?: boolean) => {
         if (phase === "create") {
           throw new Error(
             `Resource ${resource[ResourceKind]} ${resource[ResourceFQN]} cannot be replaced in create phase.`,
@@ -177,8 +185,19 @@ async function _apply<Out extends Resource>(
           );
         }
 
+        if (force) {
+          await destroy(resource, {
+            quiet: scope.quiet,
+            strategy: "sequential",
+            replace: {
+              props: state.oldProps,
+              output: resource,
+            },
+          });
+        }
+
         isReplaced = true;
-        throw new ReplacedSignal();
+        throw new ReplacedSignal(force);
       },
     });
 
@@ -227,13 +246,15 @@ async function _apply<Out extends Resource>(
             )(resource[ResourceID], props),
         );
 
-        const pendingDeletions =
-          (await scope.get<PendingDeletions>("pendingDeletions")) ?? [];
-        pendingDeletions.push({
-          resource: oldOutput,
-          oldProps: state.oldProps,
-        });
-        await scope.set("pendingDeletions", pendingDeletions);
+        if (!error.force) {
+          const pendingDeletions =
+            (await scope.get<PendingDeletions>("pendingDeletions")) ?? [];
+          pendingDeletions.push({
+            resource: oldOutput,
+            oldProps: state.oldProps,
+          });
+          await scope.set("pendingDeletions", pendingDeletions);
+        }
       } else {
         throw error;
       }

package/src/build-date.ts

@@ -5,4 +5,4 @@
  * The build date used as the default worker compatibility date.
  * This is set to the date when the package was built.
  */
-export const BUILD_DATE = "2025-07-12";
+export const BUILD_DATE = "2025-07-15";

package/src/cloudflare/ai.ts

@@ -9,7 +9,7 @@
  * ```ts
  * import { Worker, Ai } from "alchemy/cloudflare";
  *
- * const ai = new Ai();
+ * const ai = Ai();
  *
  * await Worker("my-worker", {
  *   name: "my-worker",
@@ -22,12 +22,17 @@
  *
  * @see https://developers.cloudflare.com/workers-ai/
  */
-export class Ai<Models extends AiModelListType = AiModelListType> {
-  public readonly type = "ai";
+export function Ai<Models extends AiModelListType = AiModelListType>() {
+  return {
+    type: "ai",
+    _phantom: undefined! as Models,
+  } as const;
+}
 
+export type Ai<Models extends AiModelListType = AiModelListType> = {
+  type: "ai";
   /**
    * @internal
    */
-  ///@ts-ignore
   _phantom: Models;
-}
+};

package/src/cloudflare/analytics-engine.ts

@@ -6,21 +6,30 @@ export interface AnalyticsEngineDatasetProps {
   dataset: string;
 }
 
+export type AnalyticsEngineDataset = {
+  type: "analytics_engine";
+  id: string;
+  dataset: string;
+};
+
 /**
+ * Creates a binding for an Analytics Engine dataset.
+ *
  * @example
+ * ```ts
  * // Create a binding for an Analytics Engine dataset
- * const dataset = new AnalyticsEngineDataset("ae-dataset", {
+ * const dataset = AnalyticsEngineDataset("ae-dataset", {
  *   dataset: "WEATHER",
  * });
+ * ```
  */
-export class AnalyticsEngineDataset {
-  public readonly type = "analytics_engine" as const;
-  public readonly dataset: string;
-
-  constructor(
-    public readonly id: string,
-    input: AnalyticsEngineDatasetProps,
-  ) {
-    this.dataset = input.dataset;
-  }
+export function AnalyticsEngineDataset(
+  id: string,
+  props: AnalyticsEngineDatasetProps,
+): AnalyticsEngineDataset {
+  return {
+    type: "analytics_engine",
+    id,
+    dataset: props.dataset,
+  };
 }

package/src/cloudflare/{types.ts → api-response.ts}

@@ -47,6 +47,11 @@ export interface CloudflareApiError {
    * Error message
    */
   message: string;
+
+  /**
+   * Error documentation URL
+   */
+  documentation_url?: string;
 }
 
 /**
@@ -68,3 +73,29 @@ export async function extractCloudflareError(
     return `HTTP ${response.status}: ${response.statusText}`;
   }
 }
+
+export async function extractCloudflareResult<T>(
+  label: string,
+  promise: Promise<Response>,
+): Promise<T> {
+  const response = await promise.catch(() => {
+    throw new Error(`Failed to ${label}: Failed to fetch`);
+  });
+  const json = (await response.json().catch(() => {
+    throw new Error(
+      `Failed to ${label} (${response.status}): The API returned an invalid response`,
+    );
+  })) as CloudflareApiResponse<T>;
+  if (json.success) {
+    return json.result;
+  } else {
+    const error = new Error(
+      `Failed to ${label} (${response.status} ${response.statusText}):\n${json.errors.map((e) => `- [${e.code}] ${e.message}${e.documentation_url ? ` (${e.documentation_url})` : ""}`).join("\n")}`,
+    );
+    Error.captureStackTrace(error, extractCloudflareResult);
+    Object.assign(error, {
+      status: response.status,
+    });
+    throw error;
+  }
+}

package/src/cloudflare/api.ts

@@ -1,12 +1,12 @@
-import { alchemy } from "../alchemy.ts";
 import type { Secret } from "../secret.ts";
 import { withExponentialBackoff } from "../util/retry.ts";
 import { safeFetch } from "../util/safe-fetch.ts";
 import {
   getCloudflareAuthHeaders,
+  normalizeAuthOptions,
   type CloudflareAuthOptions,
 } from "./auth.ts";
-import { getCloudflareAccounts, getUserEmailFromApiKey } from "./user.ts";
+import { getCloudflareAccountId } from "./user.ts";
 
 /**
  * Options for Cloudflare API requests
@@ -42,6 +42,12 @@ export interface CloudflareApiOptions {
   email?: string;
 }
 
+/** Used to propagate normalized auth options from a parent resource to `createCloudflareApi` in a child resource */
+export type InternalCloudflareApiOptions = CloudflareAuthOptions & {
+  baseUrl?: string;
+  accountId: string;
+};
+
 /**
  * Creates a CloudflareApi instance with automatic account ID discovery if not provided
  *
@@ -49,44 +55,18 @@ export interface CloudflareApiOptions {
  * @returns Promise resolving to a CloudflareApi instance
  */
 export async function createCloudflareApi(
-  options: Partial<CloudflareApiOptions> = {},
+  options: Partial<CloudflareApiOptions> | InternalCloudflareApiOptions = {},
 ): Promise<CloudflareApi> {
-  const apiKey =
-    options.apiKey ??
-    (process.env.CLOUDFLARE_API_KEY
-      ? alchemy.secret(process.env.CLOUDFLARE_API_KEY)
-      : undefined);
-  const apiToken =
-    options.apiToken ??
-    (process.env.CLOUDFLARE_API_TOKEN
-      ? alchemy.secret(process.env.CLOUDFLARE_API_TOKEN)
-      : undefined);
-  let email = options.email ?? process.env.CLOUDFLARE_EMAIL;
-  if (apiKey && !email) {
-    email = await getUserEmailFromApiKey(apiKey.unencrypted);
-  }
+  const authOptions = await normalizeAuthOptions(options);
   const accountId =
     options.accountId ??
     process.env.CLOUDFLARE_ACCOUNT_ID ??
     process.env.CF_ACCOUNT_ID ??
-    (
-      await getCloudflareAccounts({
-        apiKey,
-        apiToken,
-        email,
-      } as CloudflareAuthOptions)
-    )[0]?.id;
-  if (accountId === undefined) {
-    throw new Error(
-      "Either accountId or CLOUDFLARE_ACCOUNT_ID must be provided",
-    );
-  }
+    (await getCloudflareAccountId(authOptions));
   return new CloudflareApi({
     baseUrl: options.baseUrl,
     accountId,
-    email,
-    apiKey,
-    apiToken,
+    authOptions,
   });
 }
 
@@ -96,9 +76,6 @@ export async function createCloudflareApi(
 export class CloudflareApi {
   public readonly accountId: string;
   public readonly baseUrl: string;
-  public readonly apiKey: Secret | undefined;
-  public readonly apiToken: Secret | undefined;
-  public readonly email: string | undefined;
   public readonly authOptions: CloudflareAuthOptions;
 
   /**
@@ -108,30 +85,14 @@ export class CloudflareApi {
    *
    * @param options API options
    */
-  constructor(
-    options: CloudflareApiOptions & {
-      accountId: string;
-    },
-  ) {
+  constructor(options: {
+    baseUrl?: string;
+    accountId: string;
+    authOptions: CloudflareAuthOptions;
+  }) {
     this.accountId = options.accountId;
     this.baseUrl = options.baseUrl ?? "https://api.cloudflare.com/client/v4";
-    this.apiKey = options.apiKey;
-    this.apiToken = options.apiToken;
-    this.email = options.email;
-
-    if (this.apiKey && this.apiToken) {
-      throw new Error("'apiKey' and 'apiToken' cannot both be provided");
-    } else if (this.apiKey && !this.email) {
-      throw new Error("'email' must be provided if 'apiKey' is provided");
-    }
-    this.authOptions = this.apiKey
-      ? {
-          apiKey: this.apiKey,
-          email: this.email!,
-        }
-      : {
-          apiToken: this.apiToken,
-        };
+    this.authOptions = options.authOptions;
   }
 
   /**