alchemy 0.12.20 → 0.13.0

package/src/cloudflare/bundle/hybrid-nodejs-compat.ts

@@ -1,14 +1,12 @@
-/**
- * Copied from https://github.com/cloudflare/workers-sdk/blob/main/packages/wrangler/src/deployment-bundle/esbuild-plugins/hybrid-nodejs-compat.ts#L17
- */
-
 import type { Plugin, PluginBuild } from "esbuild";
 import assert from "node:assert";
 import { builtinModules } from "node:module";
 import nodePath from "node:path";
-import { dedent } from "../../util/dedent";
-// import dedent from "ts-dedent";
-// import { getBasePath } from "../../paths";
+import { dedent } from "../../util/dedent.js";
+
+/**
+ * Copied from https://github.com/cloudflare/workers-sdk/blob/main/packages/wrangler/src/deployment-bundle/esbuild-plugins/hybrid-nodejs-compat.ts#L17
+ */
 
 const REQUIRED_NODE_BUILT_IN_NAMESPACE = "node-built-in-modules";
 const REQUIRED_UNENV_ALIAS_NAMESPACE = "required-unenv-alias";
@@ -58,7 +56,7 @@ function errorOnServiceWorkerFormat(build: PluginBuild) {
       const pathList = new Intl.ListFormat("en-US").format(
         Array.from(paths.keys())
           .map((p) => `"${p}"`)
-          .sort()
+          .sort(),
       );
       return {
         errors: [
@@ -100,7 +98,7 @@ function handleRequireCallsToNodeJSBuiltins(build: PluginBuild) {
             module.exports = libDefault;`,
         loader: "js",
       };
-    }
+    },
   );
 }
 
@@ -114,7 +112,7 @@ function handleRequireCallsToNodeJSBuiltins(build: PluginBuild) {
 function handleUnenvAliasedPackages(
   build: PluginBuild,
   alias: Record<string, string>,
-  external: readonly string[]
+  external: readonly string[],
 ) {
   // esbuild expects alias paths to be absolute
   const aliasAbsolute: Record<string, string> = {};
@@ -127,7 +125,7 @@ function handleUnenvAliasedPackages(
   }
 
   const UNENV_ALIAS_RE = new RegExp(
-    `^(${Object.keys(aliasAbsolute).join("|")})$`
+    `^(${Object.keys(aliasAbsolute).join("|")})$`,
   );
 
   build.onResolve({ filter: UNENV_ALIAS_RE }, (args) => {
@@ -166,7 +164,7 @@ function handleUnenvAliasedPackages(
                 );`,
         loader: "js",
       };
-    }
+    },
   );
 }
 
@@ -179,13 +177,13 @@ function handleUnenvAliasedPackages(
 function handleNodeJSGlobals(
   build: PluginBuild,
   inject: Record<string, string | readonly string[]>,
-  polyfill: readonly string[]
+  polyfill: readonly string[],
 ) {
   const UNENV_VIRTUAL_MODULE_RE = /_virtual_unenv_global_polyfill-(.+)$/;
   const prefix = nodePath.resolve(
     // getBasePath(),
     import.meta.dirname,
-    "_virtual_unenv_global_polyfill-"
+    "_virtual_unenv_global_polyfill-",
   );
 
   /**
@@ -211,10 +209,9 @@ function handleNodeJSGlobals(
       injectsByModule.set(module, []);
       virtualModulePathToSpecifier.set(
         prefix + module.replaceAll("/", "-"),
-        module
+        module,
       );
     }
-    // eslint-disable-next-line  @typescript-eslint/no-non-null-assertion
     injectsByModule.get(module)!.push({ injectedName, exportName, importName });
   }
 
@@ -237,7 +234,7 @@ function handleNodeJSGlobals(
     assert(injects, `Expected ${module} to inject values`);
 
     const imports = injects.map(({ exportName, importName }) =>
-      importName === exportName ? exportName : `${exportName} as ${importName}`
+      importName === exportName ? exportName : `${exportName} as ${importName}`,
     );
 
     return {

package/src/cloudflare/custom-domain.ts

@@ -2,7 +2,7 @@ import type { Context } from "../context.js";
 import { Resource } from "../resource.js";
 import { handleApiError } from "./api-error.js";
 import {
-  CloudflareApi,
+  type CloudflareApi,
   createCloudflareApi,
   type CloudflareApiOptions,
 } from "./api.js";
@@ -91,7 +91,7 @@ export const CustomDomain = Resource(
   async function (
     this: Context<CustomDomain>,
     logicalId: string, // Changed param name from id to logicalId for clarity
-    props: CustomDomainProps
+    props: CustomDomainProps,
   ): Promise<CustomDomain> {
     // Create Cloudflare API client with automatic account discovery
     const api = await createCloudflareApi(props);
@@ -110,11 +110,10 @@ export const CustomDomain = Resource(
     if (this.phase === "delete") {
       await deleteCustomDomain(this, api, logicalId, props);
       return this.destroy();
-    } else {
-      // Create or Update phase
-      return await ensureCustomDomain(this, api, logicalId, props);
     }
-  }
+    // Create or Update phase
+    return await ensureCustomDomain(this, api, logicalId, props);
+  },
 );
 
 // Helper function to delete the custom domain binding
@@ -122,29 +121,29 @@ async function deleteCustomDomain(
   context: Context<CustomDomain>,
   api: CloudflareApi,
   logicalId: string,
-  props: CustomDomainProps
+  props: CustomDomainProps,
 ): Promise<void> {
   const domainHostname = props.name;
   const domainIdToDelete = context.output?.id;
 
   if (!domainIdToDelete) {
     console.warn(
-      `Cannot delete CustomDomain ${logicalId} (${domainHostname}): Missing domain ID in state. Assuming already deleted.`
+      `Cannot delete CustomDomain ${logicalId} (${domainHostname}): Missing domain ID in state. Assuming already deleted.`,
     );
     return; // Exit early if no ID
   }
 
   console.log(
-    `Deleting CustomDomain binding ${domainIdToDelete} for ${domainHostname}`
+    `Deleting CustomDomain binding ${domainIdToDelete} for ${domainHostname}`,
   );
   const response = await api.delete(
-    `/accounts/${api.accountId}/workers/domains/${domainIdToDelete}`
+    `/accounts/${api.accountId}/workers/domains/${domainIdToDelete}`,
   );
 
   console.log(
     `Delete result for ${domainIdToDelete} (${domainHostname}):`,
     response.status,
-    response.statusText
+    response.statusText,
   );
 
   // 404 is acceptable during deletion for idempotency
@@ -153,11 +152,11 @@ async function deleteCustomDomain(
       response,
       "deleting",
       "custom domain binding",
-      domainIdToDelete
+      domainIdToDelete,
     );
     // Throw after handling to ensure failure is reported
     throw new Error(
-      `Failed to delete custom domain binding ${domainIdToDelete}: ${response.statusText}`
+      `Failed to delete custom domain binding ${domainIdToDelete}: ${response.statusText}`,
     );
   }
 }
@@ -167,7 +166,7 @@ async function ensureCustomDomain(
   context: Context<CustomDomain>,
   api: CloudflareApi,
   logicalId: string,
-  props: CustomDomainProps
+  props: CustomDomainProps,
 ): Promise<CustomDomain> {
   const environment = props.environment || "production";
   const domainHostname = props.name;
@@ -175,7 +174,7 @@ async function ensureCustomDomain(
   // Check if domain binding already exists for this account
   console.log(`Checking existing domain bindings for account ${api.accountId}`);
   const listResponse = await api.get(
-    `/accounts/${api.accountId}/workers/domains`
+    `/accounts/${api.accountId}/workers/domains`,
   );
 
   if (!listResponse.ok) {
@@ -184,11 +183,11 @@ async function ensureCustomDomain(
       listResponse,
       "listing",
       "worker domains",
-      `Account ${api.accountId}`
+      `Account ${api.accountId}`,
     );
     // If listing fails, we cannot proceed reliably
     throw new Error(
-      `Failed to list worker domains for account ${api.accountId}: ${listResponse.statusText}`
+      `Failed to list worker domains for account ${api.accountId}: ${listResponse.statusText}`,
     );
   }
 
@@ -199,13 +198,13 @@ async function ensureCustomDomain(
 
   if (!listData.success || !listData.result) {
     throw new Error(
-      `Failed to parse list worker domains response: ${JSON.stringify(listData)}`
+      `Failed to parse list worker domains response: ${JSON.stringify(listData)}`,
     );
   }
 
   // Find the specific binding by hostname AND zoneId
   const existingBinding = listData.result.find(
-    (b) => b.hostname === domainHostname && b.zone_id === props.zoneId
+    (b) => b.hostname === domainHostname && b.zone_id === props.zoneId,
   );
 
   let currentDomainId = existingBinding?.id;
@@ -215,7 +214,7 @@ async function ensureCustomDomain(
     `Domain binding status for ${domainHostname} (Zone: ${props.zoneId}):`,
     bindingExists
       ? `Found (ID: ${currentDomainId}, Worker: ${existingBinding.service}, Env: ${existingBinding.environment})`
-      : "Not found"
+      : "Not found",
   );
 
   // Determine if we need to update (binding exists but has different service or environment)
@@ -232,7 +231,7 @@ async function ensureCustomDomain(
   if (!bindingExists || needsUpdate) {
     operationPerformed = bindingExists ? "update" : "create";
     console.log(
-      `${operationPerformed === "update" ? "Updating" : "Creating"} domain binding: ${domainHostname} (Zone: ${props.zoneId}) → ${props.workerName}:${environment}`
+      `${operationPerformed === "update" ? "Updating" : "Creating"} domain binding: ${domainHostname} (Zone: ${props.zoneId}) → ${props.workerName}:${environment}`,
     );
 
     const putPayload = {
@@ -244,7 +243,7 @@ async function ensureCustomDomain(
 
     const putResponse = await api.put(
       `/accounts/${api.accountId}/workers/domains`,
-      putPayload
+      putPayload,
     );
 
     if (!putResponse.ok) {
@@ -252,11 +251,11 @@ async function ensureCustomDomain(
         putResponse,
         operationPerformed === "update" ? "updating" : "creating",
         "custom domain binding",
-        domainHostname
+        domainHostname,
       );
       // Throw after handling to prevent inconsistent state
       throw new Error(
-        `Failed to ${operationPerformed} custom domain binding: ${putResponse.statusText}`
+        `Failed to ${operationPerformed} custom domain binding: ${putResponse.statusText}`,
       );
     }
 
@@ -267,18 +266,18 @@ async function ensureCustomDomain(
 
     if (!putResult.success || !putResult.result) {
       throw new Error(
-        `Failed to parse ${operationPerformed} domain binding response: ${JSON.stringify(putResult)}`
+        `Failed to parse ${operationPerformed} domain binding response: ${JSON.stringify(putResult)}`,
       );
     }
 
     resultantBinding = putResult.result;
     currentDomainId = resultantBinding.id; // Update ID from the PUT response
     console.log(
-      `Successfully ${operationPerformed}d binding, new ID: ${currentDomainId}`
+      `Successfully ${operationPerformed}d binding, new ID: ${currentDomainId}`,
     );
   } else {
     console.log(
-      `Domain binding already exists and is up to date: ${domainHostname} (ID: ${currentDomainId}) → ${props.workerName}:${environment}`
+      `Domain binding already exists and is up to date: ${domainHostname} (ID: ${currentDomainId}) → ${props.workerName}:${environment}`,
     );
   }
 
@@ -291,7 +290,7 @@ async function ensureCustomDomain(
       currentDomainId,
     });
     throw new Error(
-      `Failed to get final state for custom domain ${domainHostname}`
+      `Failed to get final state for custom domain ${domainHostname}`,
     );
   }
 

package/src/cloudflare/d1-database.ts

@@ -2,7 +2,7 @@ import type { Context } from "../context.js";
 import { Resource } from "../resource.js";
 import { CloudflareApiError, handleApiError } from "./api-error.js";
 import {
-  CloudflareApi,
+  type CloudflareApi,
   createCloudflareApi,
   type CloudflareApiOptions,
 } from "./api.js";
@@ -125,7 +125,7 @@ export type D1Database = Resource<"cloudflare::D1Database"> &
 
 export async function D1Database(
   id: string,
-  props: Omit<D1DatabaseProps, "migrationsFiles">
+  props: Omit<D1DatabaseProps, "migrationsFiles">,
 ) {
   const migrationsFiles = props.migrationsDir
     ? await listMigrationsFiles(props.migrationsDir)
@@ -180,7 +180,7 @@ export const D1DatabaseResource = Resource(
   async function (
     this: Context<D1Database>,
     id: string,
-    props: D1DatabaseProps = {}
+    props: D1DatabaseProps = {},
   ): Promise<D1Database> {
     const api = await createCloudflareApi(props);
     const databaseName = props.name ?? id;
@@ -195,99 +195,98 @@ export const D1DatabaseResource = Resource(
 
       // Return void (a deleted database has no content)
       return this.destroy();
-    } else {
-      let dbData: CloudflareD1Response;
-
-      if (this.phase === "create") {
-        console.log("Creating D1 database:", databaseName);
-        try {
-          dbData = await createDatabase(api, databaseName, props);
-        } catch (error) {
-          // Check if this is a "database already exists" error and adopt is enabled
-          if (
-            props.adopt &&
-            error instanceof CloudflareApiError &&
-            error.message.includes("already exists")
-          ) {
-            console.log(`Database ${databaseName} already exists, adopting it`);
-            // Find the existing database by name
-            const databases = await listDatabases(api, databaseName);
-            const existingDb = databases.find((db) => db.name === databaseName);
-
-            if (!existingDb) {
-              throw new Error(
-                `Failed to find existing database '${databaseName}' for adoption`
-              );
-            }
-
-            // Get the database details using its ID
-            dbData = await getDatabase(api, existingDb.id);
-
-            // Update the database with the provided properties
-            if (props.readReplication) {
-              console.log(
-                `Updating adopted database ${databaseName} with new properties`
-              );
-              dbData = await updateDatabase(api, existingDb.id, props);
-            }
-          } else {
-            // Re-throw the error if adopt is false or it's not a "database already exists" error
-            throw error;
+    }
+    let dbData: CloudflareD1Response;
+
+    if (this.phase === "create") {
+      console.log("Creating D1 database:", databaseName);
+      try {
+        dbData = await createDatabase(api, databaseName, props);
+      } catch (error) {
+        // Check if this is a "database already exists" error and adopt is enabled
+        if (
+          props.adopt &&
+          error instanceof CloudflareApiError &&
+          error.message.includes("already exists")
+        ) {
+          console.log(`Database ${databaseName} already exists, adopting it`);
+          // Find the existing database by name
+          const databases = await listDatabases(api, databaseName);
+          const existingDb = databases.find((db) => db.name === databaseName);
+
+          if (!existingDb) {
+            throw new Error(
+              `Failed to find existing database '${databaseName}' for adoption`,
+            );
+          }
+
+          // Get the database details using its ID
+          dbData = await getDatabase(api, existingDb.id);
+
+          // Update the database with the provided properties
+          if (props.readReplication) {
+            console.log(
+              `Updating adopted database ${databaseName} with new properties`,
+            );
+            dbData = await updateDatabase(api, existingDb.id, props);
           }
-        }
-      } else {
-        // Update operation
-        if (this.output?.id) {
-          console.log("Updating D1 database:", databaseName);
-          // Update the database with new properties
-          dbData = await updateDatabase(api, this.output.id, props);
         } else {
-          // If no ID exists, fall back to creating a new database
-          console.log(
-            "No existing database ID found, creating new D1 database:",
-            databaseName
-          );
-          dbData = await createDatabase(api, databaseName, props);
+          // Re-throw the error if adopt is false or it's not a "database already exists" error
+          throw error;
         }
       }
+    } else {
+      // Update operation
+      if (this.output?.id) {
+        console.log("Updating D1 database:", databaseName);
+        // Update the database with new properties
+        dbData = await updateDatabase(api, this.output.id, props);
+      } else {
+        // If no ID exists, fall back to creating a new database
+        console.log(
+          "No existing database ID found, creating new D1 database:",
+          databaseName,
+        );
+        dbData = await createDatabase(api, databaseName, props);
+      }
+    }
 
-      // Run migrations if provided
-      if (props.migrationsFiles && props.migrationsFiles.length > 0) {
-        try {
-          const migrationsTable = props.migrationsTable || "d1_migrations";
-          const databaseId = dbData.result.uuid || this.output?.id;
-
-          if (!databaseId) {
-            throw new Error("Database ID not found for migrations");
-          }
+    // Run migrations if provided
+    if (props.migrationsFiles && props.migrationsFiles.length > 0) {
+      try {
+        const migrationsTable = props.migrationsTable || "d1_migrations";
+        const databaseId = dbData.result.uuid || this.output?.id;
 
-          await applyMigrations({
-            migrationsFiles: props.migrationsFiles,
-            migrationsTable,
-            accountId: api.accountId,
-            databaseId,
-            api,
-          });
-        } catch (migrationErr) {
-          console.error("Failed to apply D1 migrations:", migrationErr);
-          throw migrationErr;
+        if (!databaseId) {
+          throw new Error("Database ID not found for migrations");
         }
-      }
 
-      return this({
-        type: "d1",
-        id: dbData.result.uuid || "",
-        name: databaseName,
-        fileSize: dbData.result.file_size,
-        numTables: dbData.result.num_tables,
-        version: dbData.result.version,
-        readReplication: dbData.result.read_replication,
-        primaryLocationHint: props.primaryLocationHint,
-        accountId: api.accountId,
-        migrationsDir: props.migrationsDir,
-      });
+        await applyMigrations({
+          migrationsFiles: props.migrationsFiles,
+          migrationsTable,
+          accountId: api.accountId,
+          databaseId,
+          api,
+        });
+      } catch (migrationErr) {
+        console.error("Failed to apply D1 migrations:", migrationErr);
+        throw migrationErr;
+      }
     }
-  }
+
+    return this({
+      type: "d1",
+      id: dbData.result.uuid || "",
+      name: databaseName,
+      fileSize: dbData.result.file_size,
+      numTables: dbData.result.num_tables,
+      version: dbData.result.version,
+      readReplication: dbData.result.read_replication,
+      primaryLocationHint: props.primaryLocationHint,
+      accountId: api.accountId,
+      migrationsDir: props.migrationsDir,
+    });
+  },
 );
 
 interface CloudflareD1Response {
@@ -313,7 +312,7 @@ interface CloudflareD1Response {
 export async function createDatabase(
   api: CloudflareApi,
   databaseName: string,
-  props: D1DatabaseProps
+  props: D1DatabaseProps,
 ): Promise<CloudflareD1Response> {
   // Create new D1 database
   const createPayload: any = {
@@ -326,7 +325,7 @@ export async function createDatabase(
 
   const createResponse = await api.post(
     `/accounts/${api.accountId}/d1/database`,
-    createPayload
+    createPayload,
   );
 
   if (!createResponse.ok) {
@@ -334,7 +333,7 @@ export async function createDatabase(
       createResponse,
       "creating",
       "D1 database",
-      databaseName
+      databaseName,
     );
   }
 
@@ -346,14 +345,14 @@ export async function createDatabase(
  */
 export async function getDatabase(
   api: CloudflareApi,
-  databaseId?: string
+  databaseId?: string,
 ): Promise<CloudflareD1Response> {
   if (!databaseId) {
     throw new Error("Database ID is required");
   }
 
   const response = await api.get(
-    `/accounts/${api.accountId}/d1/database/${databaseId}`
+    `/accounts/${api.accountId}/d1/database/${databaseId}`,
   );
 
   if (!response.ok) {
@@ -368,7 +367,7 @@ export async function getDatabase(
  */
 export async function deleteDatabase(
   api: CloudflareApi,
-  databaseId?: string
+  databaseId?: string,
 ): Promise<void> {
   if (!databaseId) {
     console.log("No database ID provided, skipping delete");
@@ -377,7 +376,7 @@ export async function deleteDatabase(
 
   // Delete D1 database
   const deleteResponse = await api.delete(
-    `/accounts/${api.accountId}/d1/database/${databaseId}`
+    `/accounts/${api.accountId}/d1/database/${databaseId}`,
   );
 
   if (!deleteResponse.ok && deleteResponse.status !== 404) {
@@ -386,7 +385,7 @@ export async function deleteDatabase(
     }));
     throw new CloudflareApiError(
       `Error deleting D1 database '${databaseId}': ${errorData.errors?.[0]?.message || deleteResponse.statusText}`,
-      deleteResponse
+      deleteResponse,
     );
   }
 }
@@ -396,19 +395,19 @@ export async function deleteDatabase(
  */
 export async function listDatabases(
   api: CloudflareApi,
-  name?: string
+  name?: string,
 ): Promise<{ name: string; id: string }[]> {
   // Construct query string if name is provided
   const queryParams = name ? `?name=${encodeURIComponent(name)}` : "";
 
   const response = await api.get(
-    `/accounts/${api.accountId}/d1/database${queryParams}`
+    `/accounts/${api.accountId}/d1/database${queryParams}`,
   );
 
   if (!response.ok) {
     throw new CloudflareApiError(
       `Failed to list databases: ${response.statusText}`,
-      response
+      response,
     );
   }
 
@@ -441,7 +440,7 @@ export async function listDatabases(
 export async function updateDatabase(
   api: CloudflareApi,
   databaseId: string,
-  props: D1DatabaseProps
+  props: D1DatabaseProps,
 ): Promise<CloudflareD1Response> {
   // Get current database state to check for non-mutable changes
   const currentDB = await getDatabase(api, databaseId);
@@ -452,7 +451,7 @@ export async function updateDatabase(
     props.primaryLocationHint !== currentDB.result.primary_location_hint
   ) {
     throw new Error(
-      "Cannot update primaryLocationHint after database creation. Only readReplication.mode can be modified."
+      "Cannot update primaryLocationHint after database creation. Only readReplication.mode can be modified.",
     );
   }
 
@@ -467,7 +466,7 @@ export async function updateDatabase(
 
   const updateResponse = await api.patch(
     `/accounts/${api.accountId}/d1/database/${databaseId}`,
-    updatePayload
+    updatePayload,
   );
 
   if (!updateResponse.ok) {
@@ -475,7 +474,7 @@ export async function updateDatabase(
       updateResponse,
       "updating",
       "D1 database",
-      databaseId
+      databaseId,
     );
   }