alchemy 0.7.2 → 0.8.0

package/lib/aws/table.js

@@ -45,9 +45,9 @@ export const Table = Resource("dynamo::Table", async function (id, props) {
             await ignore(ResourceNotFoundException.name, () => client.send(new DeleteTableCommand({
                 TableName: props.tableName,
             })));
-        }, (error) => error instanceof ResourceInUseException ||
-            error instanceof InternalServerError, 10, // Max attempts
-        200);
+        }, isRetryableError, 10, // Max attempts
+        200 // Initial delay in ms
+        );
         // Wait for table to be deleted
         let tableDeleted = false;
         let retryCount = 0;
@@ -143,8 +143,9 @@ export const Table = Resource("dynamo::Table", async function (id, props) {
                     throw error;
                 }
             }
-        }, (error) => error instanceof ResourceInUseException, 10, // Max attempts
-        200);
+        }, isRetryableError, 10, // Max attempts
+        200 // Initial delay in ms
+        );
         // Wait for table to be active with timeout
         let tableActive = false;
         let tableDescription;
@@ -185,3 +186,19 @@ export const Table = Resource("dynamo::Table", async function (id, props) {
         });
     }
 });
+const retryableErrors = [
+    "ResourceInUseException",
+    "ResourceNotFoundException",
+    "InternalServerError",
+    "ThrottlingException",
+    "ProvisionedThroughputExceededException",
+    "LimitExceededException",
+    "RequestLimitExceeded",
+];
+function isRetryableError(error) {
+    return (error instanceof ResourceInUseException ||
+        error instanceof InternalServerError ||
+        retryableErrors.includes(error?.name) ||
+        retryableErrors.includes(error?.code) ||
+        error?.$metadata?.httpStatusCode === 500);
+}

package/lib/cloudflare/r2-rest-state-store.js

@@ -1,6 +1,7 @@
 import { deserialize, serialize } from "../serde";
 import { withExponentialBackoff } from "../util/retry";
 import { createCloudflareApi, } from "./api";
+import { CloudflareApiError, handleApiError } from "./api-error";
 /**
  * State store implementation using Cloudflare R2 API
  * Uses R2 for immediate consistency compared to KV's eventual consistency
@@ -69,17 +70,12 @@ export class R2RestStateStore {
             const response = await withExponentialBackoff(async () => {
                 const response = await this.api.get(listPath);
                 if (!response.ok) {
-                    const errorData = await response.json().catch(() => ({
-                        errors: [{ message: response.statusText }],
-                    }));
-                    throw new Error(`Error listing R2 objects: ${errorData.errors?.[0]?.message || response.statusText}`);
+                    await handleApiError(response, "list", "bucket", this.bucketName);
                 }
                 return response;
             }, 
             // Retry on transient errors
-            (error) => error.message?.includes("502") ||
-                error.message?.includes("503") ||
-                error.message?.includes("timeout"), 5, // 5 retry attempts
+            isRetryableError, 5, // 5 retry attempts
             1000 // Start with 1 second delay
             );
             const data = (await response.json());
@@ -117,21 +113,13 @@ export class R2RestStateStore {
         try {
             const response = await withExponentialBackoff(async () => {
                 const response = await this.api.get(`/accounts/${this.api.accountId}/r2/buckets/${this.bucketName}/objects/${this.getObjectKey(key)}`);
-                if (!response.ok) {
-                    if (response.status === 404) {
-                        return response;
-                    }
-                    const errorData = await response.json().catch(() => ({
-                        errors: [{ message: response.statusText }],
-                    }));
-                    throw new Error(`Error getting R2 object: ${errorData.errors?.[0]?.message || response.statusText}`);
+                if (!response.ok && response.status !== 404) {
+                    await handleApiError(response, "get", "object", key);
                 }
                 return response;
             }, 
             // Retry on transient errors
-            (error) => error.message?.includes("502") ||
-                error.message?.includes("503") ||
-                error.message?.includes("timeout"), 5, // 5 retry attempts
+            isRetryableError, 5, // 5 retry attempts
             1000 // Start with 1 second delay
             );
             if (response.status === 404) {
@@ -202,15 +190,12 @@ export class R2RestStateStore {
                 },
             });
             if (!response.ok) {
-                const errorData = await response.json().catch(() => ({
-                    errors: [{ message: response.statusText }],
-                }));
-                throw new Error(`Error writing to R2: ${errorData.errors?.[0]?.message || response.statusText}`);
+                await handleApiError(response, "put", "object", objectKey);
             }
             return response;
         }, 
         // Retry on transient errors
-        (error) => error.message?.includes("503") || error.message?.includes("timeout"), 5, // 5 retry attempts
+        isRetryableError, 5, // 5 retry attempts
         1000 // Start with 1 second delay
         );
     }
@@ -224,17 +209,10 @@ export class R2RestStateStore {
         await withExponentialBackoff(async () => {
             const response = await this.api.delete(`/accounts/${this.api.accountId}/r2/buckets/${this.bucketName}/objects/${this.getObjectKey(key)}`);
             if (!response.ok && response.status !== 404) {
-                const errorData = await response.json().catch(() => ({
-                    errors: [{ message: response.statusText }],
-                }));
-                throw new Error(`Error deleting from R2: ${errorData.errors?.[0]?.message || response.statusText}`);
+                await handleApiError(response, "delete", "object", key);
             }
             return response;
-        }, 
-        // Retry on transient errors
-        (error) => error.message?.includes("502") ||
-            error.message?.includes("503") ||
-            error.message?.includes("timeout"), 5, // 5 retry attempts
+        }, isRetryableError, 5, // 5 retry attempts
         1000 // Start with 1 second delay
         );
     }
@@ -275,3 +253,13 @@ export class R2RestStateStore {
         }
     }
 }
+function isRetryableError(error) {
+    if (error instanceof CloudflareApiError) {
+        return (error.status === 500 ||
+            error.status === 502 ||
+            error.status === 503 ||
+            error.message.includes("timeout") ||
+            error.message.includes("internal error"));
+    }
+    return false;
+}

package/lib/cloudflare/worker.js

@@ -431,6 +431,10 @@ async function bundleWorkerScript(props) {
         minify: true,
         options: {
             keepNames: true, // Important for Durable Object classes
+            loader: {
+                ".sql": "text",
+                ".json": "json",
+            },
         },
     };
     // Merge with user-provided options

package/lib/esbuild/bundle.d.ts

@@ -94,14 +94,21 @@ export interface Bundle extends Resource<"esbuild::Bundle"> {
  */
 export declare const Bundle: (((this: any, id: string, props?: {}) => never) & (new (_: never) => never)) | ((this: Context<Bundle>, id: string, props: BundleProps) => Promise<Bundle>);
 export declare function bundle(props: BundleProps): Promise<esbuild.BuildResult<{
-    bundle: boolean;
+    entryPoints: string[];
+    outfile: string;
+    bundle: true;
+    format: "iife" | "cjs" | "esm" | undefined;
+    target: string | string[] | undefined;
+    minify: boolean | undefined;
+    sourcemap: boolean | "inline" | "external" | "both" | undefined;
+    external: string[];
+    platform: "browser" | "node" | "neutral" | undefined;
+    metafile: true;
+    write: true;
     splitting?: boolean;
     preserveSymlinks?: boolean;
-    outfile: string;
-    metafile: boolean;
     outdir?: string;
     outbase?: string;
-    external: string[];
     packages?: "bundle" | "external";
     alias?: Record<string, string>;
     loader?: {
@@ -110,7 +117,6 @@ export declare function bundle(props: BundleProps): Promise<esbuild.BuildResult<
     resolveExtensions?: string[];
     mainFields?: string[];
     conditions?: string[];
-    write: boolean;
     allowOverwrite?: boolean;
     tsconfig?: string;
     outExtension?: {
@@ -127,30 +133,21 @@ export declare function bundle(props: BundleProps): Promise<esbuild.BuildResult<
     footer?: {
         [type: string]: string;
     };
-    entryPoints: string[] | Record<string, string> | {
-        in: string;
-        out: string;
-    }[];
     stdin?: esbuild.StdinOptions;
     plugins?: esbuild.Plugin[];
     absWorkingDir?: string;
     nodePaths?: string[];
-    sourcemap: boolean | "linked" | "inline" | "external" | "both";
     legalComments?: "none" | "inline" | "eof" | "linked" | "external";
     sourceRoot?: string;
     sourcesContent?: boolean;
-    format: esbuild.Format;
     globalName?: string;
-    target: string | string[];
     supported?: Record<string, boolean>;
-    platform: esbuild.Platform;
     mangleProps?: RegExp;
     reserveProps?: RegExp;
     mangleQuoted?: boolean;
     mangleCache?: Record<string, string | false>;
     drop?: esbuild.Drop[];
     dropLabels?: string[];
-    minify: boolean;
     minifyWhitespace?: boolean;
     minifyIdentifiers?: boolean;
     minifySyntax?: boolean;

package/lib/esbuild/bundle.js

@@ -47,8 +47,8 @@ export const Bundle = Resource("esbuild::Bundle", {
 });
 export async function bundle(props) {
     const outputPath = getOutputPath(props);
-    // Build the bundle
     return await esbuild.build({
+        ...props.options,
         entryPoints: [props.entryPoint],
         outfile: outputPath,
         bundle: true,
@@ -56,11 +56,14 @@ export async function bundle(props) {
         target: props.target,
         minify: props.minify,
         sourcemap: props.sourcemap,
-        external: props.external,
+        external: [
+            "node:async_hooks",
+            ...(props.external ?? []),
+            ...(props.options?.external ?? []),
+        ],
         platform: props.platform,
         metafile: true,
         write: true,
-        ...props.options,
     });
 }
 function getOutputPath(props) {

package/lib/web/vitepress/process-front-matter-files.js

@@ -35,7 +35,7 @@ export async function processFrontmatterFiles(directoryPath, linkPrefix) {
             const frontmatter = frontmatterMatch[1];
             const orderMatch = frontmatter.match(/order:\s*(\d+)/);
             if (orderMatch) {
-                order = parseInt(orderMatch[1]);
+                order = parseFloat(orderMatch[1]);
             }
             const titleMatch = frontmatter.match(/title:\s*(.+)/);
             if (titleMatch) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "type": "module",
   "module": "./lib/index.js",
   "scripts": {

package/src/aws/table.ts

@@ -143,7 +143,7 @@ export const Table = Resource(
   async function (
     this: Context<Table>,
     id: string,
-    props: TableProps,
+    props: TableProps
   ): Promise<Table> {
     const client = new DynamoDBClient({});
 
@@ -154,15 +154,13 @@ export const Table = Resource(
             client.send(
               new DeleteTableCommand({
                 TableName: props.tableName,
-              }),
-            ),
+              })
+            )
           );
         },
-        (error) =>
-          error instanceof ResourceInUseException ||
-          error instanceof InternalServerError,
+        isRetryableError,
         10, // Max attempts
-        200, // Initial delay in ms
+        200 // Initial delay in ms
       );
 
       // Wait for table to be deleted
@@ -175,7 +173,7 @@ export const Table = Resource(
           await client.send(
             new DescribeTableCommand({
               TableName: props.tableName,
-            }),
+            })
           );
           // If we get here, table still exists
           retryCount++;
@@ -193,7 +191,7 @@ export const Table = Resource(
 
       if (!tableDeleted) {
         throw new Error(
-          `Timed out waiting for table ${props.tableName} to be deleted`,
+          `Timed out waiting for table ${props.tableName} to be deleted`
         );
       }
 
@@ -233,7 +231,7 @@ export const Table = Resource(
             const describeResponse = await client.send(
               new DescribeTableCommand({
                 TableName: props.tableName,
-              }),
+              })
             );
 
             // If table exists and is ACTIVE, no need to create it
@@ -267,16 +265,16 @@ export const Table = Resource(
                         Value,
                       }))
                     : undefined,
-                }),
+                })
               );
             } else {
               throw error;
             }
           }
         },
-        (error) => error instanceof ResourceInUseException,
+        isRetryableError,
         10, // Max attempts
-        200, // Initial delay in ms
+        200 // Initial delay in ms
       );
 
       // Wait for table to be active with timeout
@@ -290,7 +288,7 @@ export const Table = Resource(
           const response = await client.send(
             new DescribeTableCommand({
               TableName: props.tableName,
-            }),
+            })
           );
 
           tableActive = response.Table?.TableStatus === "ACTIVE";
@@ -313,7 +311,7 @@ export const Table = Resource(
 
       if (!tableActive) {
         throw new Error(
-          `Timed out waiting for table ${props.tableName} to become active`,
+          `Timed out waiting for table ${props.tableName} to become active`
         );
       }
 
@@ -324,5 +322,25 @@ export const Table = Resource(
         tableId: tableDescription!.TableId!,
       });
     }
-  },
+  }
 );
+
+const retryableErrors = [
+  "ResourceInUseException",
+  "ResourceNotFoundException",
+  "InternalServerError",
+  "ThrottlingException",
+  "ProvisionedThroughputExceededException",
+  "LimitExceededException",
+  "RequestLimitExceeded",
+];
+
+function isRetryableError(error: any) {
+  return (
+    error instanceof ResourceInUseException ||
+    error instanceof InternalServerError ||
+    retryableErrors.includes(error?.name) ||
+    retryableErrors.includes(error?.code) ||
+    error?.$metadata?.httpStatusCode === 500
+  );
+}

package/src/cloudflare/r2-rest-state-store.ts

@@ -7,6 +7,7 @@ import {
   type CloudflareApiOptions,
   createCloudflareApi,
 } from "./api";
+import { CloudflareApiError, handleApiError } from "./api-error";
 
 /**
  * Options for CloudflareR2StateStore
@@ -106,21 +107,13 @@ export class R2RestStateStore implements StateStore {
           const response = await this.api.get(listPath);
 
           if (!response.ok) {
-            const errorData: any = await response.json().catch(() => ({
-              errors: [{ message: response.statusText }],
-            }));
-            throw new Error(
-              `Error listing R2 objects: ${errorData.errors?.[0]?.message || response.statusText}`
-            );
+            await handleApiError(response, "list", "bucket", this.bucketName);
           }
 
           return response;
         },
         // Retry on transient errors
-        (error) =>
-          error.message?.includes("502") ||
-          error.message?.includes("503") ||
-          error.message?.includes("timeout"),
+        isRetryableError,
         5, // 5 retry attempts
         1000 // Start with 1 second delay
       );
@@ -173,26 +166,14 @@ export class R2RestStateStore implements StateStore {
             `/accounts/${this.api.accountId}/r2/buckets/${this.bucketName}/objects/${this.getObjectKey(key)}`
           );
 
-          if (!response.ok) {
-            if (response.status === 404) {
-              return response;
-            }
-
-            const errorData: any = await response.json().catch(() => ({
-              errors: [{ message: response.statusText }],
-            }));
-            throw new Error(
-              `Error getting R2 object: ${errorData.errors?.[0]?.message || response.statusText}`
-            );
+          if (!response.ok && response.status !== 404) {
+            await handleApiError(response, "get", "object", key);
           }
 
           return response;
         },
         // Retry on transient errors
-        (error) =>
-          error.message?.includes("502") ||
-          error.message?.includes("503") ||
-          error.message?.includes("timeout"),
+        isRetryableError,
         5, // 5 retry attempts
         1000 // Start with 1 second delay
       );
@@ -280,19 +261,12 @@ export class R2RestStateStore implements StateStore {
         );
 
         if (!response.ok) {
-          const errorData: any = await response.json().catch(() => ({
-            errors: [{ message: response.statusText }],
-          }));
-          throw new Error(
-            `Error writing to R2: ${errorData.errors?.[0]?.message || response.statusText}`
-          );
+          await handleApiError(response, "put", "object", objectKey);
         }
-
         return response;
       },
       // Retry on transient errors
-      (error) =>
-        error.message?.includes("503") || error.message?.includes("timeout"),
+      isRetryableError,
       5, // 5 retry attempts
       1000 // Start with 1 second delay
     );
@@ -313,21 +287,12 @@ export class R2RestStateStore implements StateStore {
         );
 
         if (!response.ok && response.status !== 404) {
-          const errorData: any = await response.json().catch(() => ({
-            errors: [{ message: response.statusText }],
-          }));
-          throw new Error(
-            `Error deleting from R2: ${errorData.errors?.[0]?.message || response.statusText}`
-          );
+          await handleApiError(response, "delete", "object", key);
         }
 
         return response;
       },
-      // Retry on transient errors
-      (error) =>
-        error.message?.includes("502") ||
-        error.message?.includes("503") ||
-        error.message?.includes("timeout"),
+      isRetryableError,
       5, // 5 retry attempts
       1000 // Start with 1 second delay
     );
@@ -373,3 +338,16 @@ export class R2RestStateStore implements StateStore {
     }
   }
 }
+
+function isRetryableError(error: any): boolean {
+  if (error instanceof CloudflareApiError) {
+    return (
+      error.status === 500 ||
+      error.status === 502 ||
+      error.status === 503 ||
+      error.message.includes("timeout") ||
+      error.message.includes("internal error")
+    );
+  }
+  return false;
+}

package/src/cloudflare/worker.ts

@@ -720,6 +720,10 @@ async function bundleWorkerScript<B extends Bindings>(props: WorkerProps) {
     minify: true,
     options: {
       keepNames: true, // Important for Durable Object classes
+      loader: {
+        ".sql": "text",
+        ".json": "json",
+      },
     },
   };
 

package/src/esbuild/bundle.ts

@@ -116,7 +116,7 @@ export const Bundle = Resource(
   async function (
     this: Context<Bundle>,
     id: string,
-    props: BundleProps,
+    props: BundleProps
   ): Promise<Bundle> {
     // Determine output path
     const outputPath = getOutputPath(props);
@@ -145,13 +145,13 @@ export const Bundle = Resource(
       path: outputPath,
       hash,
     });
-  },
+  }
 );
 
 export async function bundle(props: BundleProps) {
   const outputPath = getOutputPath(props);
-  // Build the bundle
   return await esbuild.build({
+    ...props.options,
     entryPoints: [props.entryPoint],
     outfile: outputPath,
     bundle: true,
@@ -159,11 +159,14 @@ export async function bundle(props: BundleProps) {
     target: props.target,
     minify: props.minify,
     sourcemap: props.sourcemap,
-    external: props.external,
+    external: [
+      "node:async_hooks",
+      ...(props.external ?? []),
+      ...(props.options?.external ?? []),
+    ],
     platform: props.platform,
     metafile: true,
     write: true,
-    ...props.options,
   });
 }
 
@@ -172,7 +175,7 @@ function getOutputPath(props: BundleProps) {
     props.outfile ||
     path.join(
       props.outdir || "dist",
-      path.basename(props.entryPoint, path.extname(props.entryPoint)) + ".js",
+      path.basename(props.entryPoint, path.extname(props.entryPoint)) + ".js"
     )
   );
 }

package/src/web/vitepress/process-front-matter-files.ts

@@ -58,7 +58,7 @@ export async function processFrontmatterFiles(
           const frontmatter = frontmatterMatch[1];
           const orderMatch = frontmatter.match(/order:\s*(\d+)/);
           if (orderMatch) {
-            order = parseInt(orderMatch[1]);
+            order = parseFloat(orderMatch[1]);
           }
           const titleMatch = frontmatter.match(/title:\s*(.+)/);
           if (titleMatch) {