alchemy 0.32.0 → 0.33.0

package/lib/stripe/price.js

@@ -38,17 +38,56 @@ import { createStripeClient, handleStripeDeleteError } from "./client.js";
  * });
  *
  * @example
- * // Create a tiered price with tax behavior
- * const tieredPrice = await Price("enterprise", {
+ * // Create a graduated tiered price with usage-based billing
+ * const tieredPrice = await Price("api-usage", {
  *   currency: "usd",
- *   unitAmount: 10000, // $100.00
  *   product: "prod_xyz",
  *   billingScheme: "tiered",
- *   taxBehavior: "exclusive",
- *   metadata: {
- *     tier: "enterprise",
- *     features: "all"
- *   }
+ *   tiersMode: "graduated",
+ *   recurring: {
+ *     interval: "month",
+ *     usageType: "metered"
+ *   },
+ *   tiers: [
+ *     {
+ *       upTo: 10000,
+ *       unitAmount: 0 // First 10k API calls free
+ *     },
+ *     {
+ *       upTo: 50000,
+ *       unitAmount: 2 // $0.02 per call up to 50k
+ *     },
+ *     {
+ *       upTo: "inf",
+ *       unitAmount: 1 // $0.01 per call beyond 50k
+ *     }
+ *   ]
+ * });
+ *
+ * @example
+ * // Create a volume-based tiered price with overage cap
+ * const volumePrice = await Price("storage", {
+ *   currency: "usd",
+ *   product: "prod_xyz",
+ *   billingScheme: "tiered",
+ *   tiersMode: "volume",
+ *   recurring: {
+ *     interval: "month"
+ *   },
+ *   tiers: [
+ *     {
+ *       upTo: 100,
+ *       unitAmount: 500 // $5 per GB for up to 100GB
+ *     },
+ *     {
+ *       upTo: 1000,
+ *       unitAmount: 400 // $4 per GB for 101-1000GB
+ *     },
+ *     {
+ *       upTo: "inf",
+ *       flatAmount: 300000 // Cap at $3000 for unlimited storage
+ *     }
+ *   ]
  * });
  */
 export const Price = Resource("stripe::Price", async function (_id, props) {
@@ -65,6 +104,16 @@ export const Price = Resource("stripe::Price", async function (_id, props) {
         }
         return this.destroy();
     }
+    // Validate tier-related constraints
+    if (props.tiers && props.billingScheme !== "tiered") {
+        throw new Error("Tiers can only be used with billingScheme: 'tiered'");
+    }
+    if (props.tiers && (props.unitAmount || props.unitAmountDecimal)) {
+        throw new Error("Cannot set both tiers and unitAmount/unitAmountDecimal");
+    }
+    if (props.tiersMode && !props.tiers) {
+        throw new Error("tiersMode requires tiers to be defined");
+    }
     try {
         let price;
         if (this.phase === "update" && this.output?.id) {
@@ -75,6 +124,7 @@ export const Price = Resource("stripe::Price", async function (_id, props) {
                 nickname: props.nickname,
                 lookup_key: props.lookupKey,
                 transfer_lookup_key: props.transferLookupKey,
+                expand: ["tiers"],
             };
             price = await stripe.prices.update(this.output.id, updateParams);
         }
@@ -90,6 +140,7 @@ export const Price = Resource("stripe::Price", async function (_id, props) {
                 tax_behavior: props.taxBehavior,
                 lookup_key: props.lookupKey,
                 transfer_lookup_key: props.transferLookupKey,
+                expand: ["tiers"],
             };
             // Add unit amount fields
             if (props.unitAmount !== undefined) {
@@ -107,6 +158,26 @@ export const Price = Resource("stripe::Price", async function (_id, props) {
                     aggregate_usage: props.recurring.aggregateUsage,
                 };
             }
+            // Add tier configuration if present
+            if (props.tiers) {
+                createParams.tiers = props.tiers.map((tier) => ({
+                    up_to: tier.upTo === "inf" ? "inf" : tier.upTo,
+                    flat_amount: tier.flatAmount,
+                    flat_amount_decimal: tier.flatAmountDecimal,
+                    unit_amount: tier.unitAmount,
+                    unit_amount_decimal: tier.unitAmountDecimal,
+                }));
+            }
+            if (props.tiersMode) {
+                createParams.tiers_mode = props.tiersMode;
+            }
+            // Add transform quantity if present
+            if (props.transformQuantity) {
+                createParams.transform_quantity = {
+                    divide_by: props.transformQuantity.divideBy,
+                    round: props.transformQuantity.round,
+                };
+            }
             if (props.lookupKey) {
                 const existingPrices = await stripe.prices.list({
                     lookup_keys: [props.lookupKey],
@@ -121,11 +192,15 @@ export const Price = Resource("stripe::Price", async function (_id, props) {
                             nickname: props.nickname,
                             lookup_key: props.lookupKey,
                             transfer_lookup_key: props.transferLookupKey,
+                            expand: ["tiers"],
                         };
                         price = await stripe.prices.update(existingPrice.id, updateParams);
                     }
                     else {
-                        price = existingPrices.data[0];
+                        // Need to retrieve with expanded tiers
+                        price = await stripe.prices.retrieve(existingPrices.data[0].id, {
+                            expand: ["tiers"],
+                        });
                     }
                 }
                 else {
@@ -148,6 +223,23 @@ export const Price = Resource("stripe::Price", async function (_id, props) {
                     .aggregate_usage,
             }
             : undefined;
+        // Transform Stripe tiers array to our format
+        const tiers = price.tiers
+            ? price.tiers.map((tier) => ({
+                flatAmount: tier.flat_amount || undefined,
+                flatAmountDecimal: tier.flat_amount_decimal || undefined,
+                unitAmount: tier.unit_amount || undefined,
+                unitAmountDecimal: tier.unit_amount_decimal || undefined,
+                upTo: tier.up_to === null ? "inf" : tier.up_to,
+            }))
+            : undefined;
+        // Transform transform_quantity if present
+        const transformQuantity = price.transform_quantity
+            ? {
+                divideBy: price.transform_quantity.divide_by,
+                round: price.transform_quantity.round,
+            }
+            : undefined;
         // Map Stripe API response to our output format
         return this({
             id: price.id,
@@ -165,6 +257,9 @@ export const Price = Resource("stripe::Price", async function (_id, props) {
             livemode: price.livemode,
             type: price.type,
             lookupKey: price.lookup_key || undefined,
+            tiers: tiers,
+            tiersMode: price.tiers_mode ?? undefined,
+            transformQuantity: transformQuantity,
         });
     }
     catch (error) {

package/lib/stripe/price.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy",
-  "version": "0.32.0",
+  "version": "0.33.0",
   "type": "module",
   "module": "./lib/index.js",
   "license": "Apache-2.0",

package/src/cloudflare/astro.ts

@@ -1,17 +1,9 @@
-import { writeFile } from "node:fs/promises";
 import path from "node:path";
-import { alchemy } from "../alchemy.ts";
-import { Exec } from "../os/exec.ts";
-import { Scope } from "../scope.ts";
-import { Assets } from "./assets.ts";
+import type { Assets } from "./assets.ts";
 import type { Bindings } from "./bindings.ts";
-import type { Website, WebsiteProps } from "./website.ts";
-import {
-  DEFAULT_COMPATIBILITY_DATE,
-  Worker,
-  type WorkerProps,
-} from "./worker.ts";
-import { WranglerJson } from "./wrangler.json.ts";
+import type { WebsiteProps } from "./website.ts";
+import { Website } from "./website.ts";
+import type { Worker } from "./worker.ts";
 
 /**
  * Properties for creating an Astro resource.
@@ -71,7 +63,7 @@ export type Astro<B extends Bindings> = B extends { ASSETS: any }
  */
 export async function Astro<B extends Bindings>(
   id: string,
-  props?: Partial<AstroProps<B>>,
+  props: AstroProps<B>,
 ): Promise<Astro<B>> {
   if (props?.bindings?.ASSETS) {
     throw new Error("ASSETS binding is reserved for internal use");
@@ -83,94 +75,15 @@ export async function Astro<B extends Bindings>(
       ? props?.assets
       : (props?.assets?.dist ?? "dist");
 
-  return alchemy.run(
-    id,
-    {
-      parent: Scope.current,
+  return Website(id, {
+    ...props,
+    noBundle: props.noBundle ?? true,
+    main,
+    assets: {
+      dist: assetsDir,
+      not_found_handling: "none",
+      run_worker_first: false,
     },
-    async () => {
-      const cwd = path.resolve(props?.cwd || process.cwd());
-      const fileName =
-        typeof wrangler === "boolean"
-          ? "wrangler.jsonc"
-          : typeof wrangler === "string"
-            ? wrangler
-            : (wrangler?.path ?? "wrangler.jsonc");
-      const wranglerPath =
-        fileName && path.relative(cwd, path.join(cwd, fileName));
-      const wranglerMain =
-        typeof wrangler === "object"
-          ? (wrangler.main ?? props?.main)
-          : props?.main;
-
-      const workerName = props?.name ?? id;
-
-      const workerProps = {
-        ...props,
-        compatibilityDate:
-          props?.compatibilityDate ?? DEFAULT_COMPATIBILITY_DATE,
-        compatibilityFlags: [
-          "nodejs_compat",
-          ...(props?.compatibilityFlags ?? []),
-        ],
-        name: workerName,
-        entrypoint: main,
-        assets: {
-          html_handling: "auto-trailing-slash",
-          not_found_handling: "single-page-application",
-          run_worker_first: false,
-          ...(typeof props?.assets === "string" ? {} : props?.assets),
-        },
-        script: props?.main
-          ? undefined
-          : `
-export default {
-  async fetch(request, env) {
-    return new Response("Not Found", { status: 404 });
-  },
-};`,
-        url: true,
-        adopt: true,
-      } as WorkerProps<any> & { name: string };
-
-      if (wrangler) {
-        await WranglerJson("wrangler.jsonc", {
-          path: wranglerPath,
-          worker: workerProps,
-          main: wranglerMain,
-          // hard-code the assets directory because we haven't yet included the assets binding
-          assets: {
-            binding: "ASSETS",
-            directory: assetsDir,
-          },
-        });
-      }
-
-      if (props?.command) {
-        await Exec("build", {
-          cwd,
-          command: props?.command,
-          env: props?.env,
-          memoize: props?.memoize,
-        });
-      }
-
-      await writeFile(
-        path.join(cwd, assetsDir, ".assetsignore"),
-        ["_worker.js", "_routes.json"].join("\n"),
-      );
-
-      return (await Worker("worker", {
-        ...workerProps,
-        bindings: {
-          ...workerProps.bindings,
-          // we don't include the Assets binding until after build to make sure the asset manifest is correct
-          // we generate the wrangler.json using all the bind
-          ASSETS: await Assets("assets", {
-            path: assetsDir,
-          }),
-        },
-      } as WorkerProps<any> & { name: string })) as Website<B>;
-    },
-  );
+    wrangler,
+  });
 }

package/src/cloudflare/vite.ts

@@ -4,7 +4,8 @@ import type { Bindings } from "./bindings.ts";
 import { Website, type WebsiteProps } from "./website.ts";
 import type { Worker } from "./worker.ts";
 
-export interface ViteProps<B extends Bindings> extends WebsiteProps<B> {}
+export interface ViteProps<B extends Bindings>
+  extends Omit<WebsiteProps<B>, "spa"> {}
 
 // don't allow the ASSETS to be overriden
 export type Vite<B extends Bindings> = B extends { ASSETS: any }
@@ -18,9 +19,11 @@ export async function Vite<B extends Bindings>(
   const defaultAssets = path.join("dist", "client");
   return Website(id, {
     ...props,
+    spa: true,
     assets:
       typeof props.assets === "object"
         ? {
+            ...props.assets,
             dist: props.assets.dist ?? defaultAssets,
           }
         : (props.assets ?? defaultAssets),

package/src/cloudflare/website.ts

@@ -87,6 +87,13 @@ export interface WebsiteProps<B extends Bindings>
         // override main
         main?: string;
       };
+
+  /**
+   * Configures default routing to support client-side routing for Single Page Applications (SPA)
+   *
+   * @default false
+   */
+  spa?: boolean;
 }
 
 export type Website<B extends Bindings> = B extends { ASSETS: any }
@@ -137,7 +144,7 @@ export async function Website<B extends Bindings>(
         entrypoint: props.main,
         assets: {
           html_handling: "auto-trailing-slash",
-          not_found_handling: "single-page-application",
+          not_found_handling: props.spa ? "single-page-application" : "none",
           run_worker_first: false,
           ...(typeof props.assets === "string" ? {} : props.assets),
         },

package/src/cloudflare/worker-assets.ts

@@ -164,10 +164,6 @@ export function createAssetConfig(config?: AssetsConfig): AssetsConfig {
     if (config.run_worker_first !== undefined) {
       assetConfig.run_worker_first = config.run_worker_first;
     }
-
-    if (config.serve_directly !== undefined) {
-      assetConfig.serve_directly = config.serve_directly;
-    }
   }
 
   return assetConfig;

package/src/cloudflare/worker.ts

@@ -80,7 +80,8 @@ export interface AssetsConfig {
 
   /**
    * Determines the redirects and rewrites of requests for HTML content
-   * @default "auto-trailing-slash"
+   *
+   * @default auto-trailing-slash
    */
   html_handling?:
     | "auto-trailing-slash"
@@ -90,22 +91,18 @@ export interface AssetsConfig {
 
   /**
    * Determines the response when a request does not match a static asset, and there is no Worker script
+   *
+   * @default none
    */
   not_found_handling?: "none" | "404-page" | "single-page-application";
 
   /**
    * When true, requests will always invoke the Worker script.
    * Otherwise, attempt to serve an asset matching the request, falling back to the Worker script.
+   *
+   * @default false
    */
   run_worker_first?: boolean;
-
-  /**
-   * When true and the incoming request matches an asset, that will be served instead of invoking the Worker script.
-   * When false, requests will always invoke the Worker script.
-   * @default true
-   * @deprecated
-   */
-  serve_directly?: boolean;
 }
 
 export interface BaseWorkerProps<