alchemy 0.65.0 → 0.66.0

package/src/state/file-system-state-store.ts

@@ -6,7 +6,6 @@ import { deserialize, serialize } from "../serde.ts";
 import type { State, StateStore } from "../state.ts";
 import { ignore } from "../util/ignore.ts";
 
-const stateRootDir = path.join(process.cwd(), ".alchemy");
 const ALCHEMY_SEPERATOR_CHAR = process.platform === "win32" ? "-" : ":";
 
 export class FileSystemStateStore implements StateStore {
@@ -18,7 +17,7 @@ export class FileSystemStateStore implements StateStore {
       rootDir?: string;
     },
   ) {
-    this.dir = path.join(options?.rootDir ?? stateRootDir, ...scope.chain);
+    this.dir = path.join(options?.rootDir ?? scope.dotAlchemy, ...scope.chain);
   }
 
   async init(): Promise<void> {

package/src/state/sqlite-state-store.ts

@@ -1,7 +1,8 @@
 import type { Config as LibSQLConfig } from "@libsql/client";
-import fs from "node:fs";
+import fs from "node:fs/promises";
 import path from "node:path";
 import type { Scope } from "../scope.ts";
+import { exists } from "../util/exists.ts";
 import { memoize } from "../util/memoize.ts";
 import { importPeer } from "../util/peer.ts";
 import { MIGRATIONS_DIRECTORY } from "./migrations.ts";
@@ -27,6 +28,7 @@ interface BunSQLiteStateStoreOptions {
   readwrite?: boolean;
   safeIntegers?: boolean;
   strict?: boolean;
+  dotAlchemy?: string;
 }
 
 interface LibSQLStateStoreOptions extends Omit<LibSQLConfig, "url"> {
@@ -50,6 +52,11 @@ interface LibSQLStateStoreOptions extends Omit<LibSQLConfig, "url"> {
    * https://github.com/libsql/libsql-client-ts#supported-urls
    */
   url?: string;
+  /**
+   * The path to the .alchemy directory.
+   * @default "./.alchemy"
+   */
+  dotAlchemy?: string;
 }
 
 interface AutoSQLiteStateStoreOptions {
@@ -64,6 +71,12 @@ interface AutoSQLiteStateStoreOptions {
    * @default ".alchemy/state.sqlite"
    */
   filename?: string;
+
+  /**
+   * The path to the .alchemy directory.
+   * @default "./.alchemy"
+   */
+  dotAlchemy?: string;
 }
 
 type SQLiteStateStoreOptions =
@@ -80,7 +93,10 @@ export class SQLiteStateStore extends StateStoreProxy {
   }
 
   async provision(): Promise<StateStoreProxy.Dispatch> {
-    const db = await createDatabase(this.options);
+    const db = await createDatabase({
+      ...(this.options ?? {}),
+      dotAlchemy: this.scope.dotAlchemy,
+    });
     const { SQLiteStateStoreOperations } = await import("./operations.js");
     const operations = new SQLiteStateStoreOperations(db, {
       chain: this.scope.chain,
@@ -97,17 +113,23 @@ const createDatabase = memoize(
       case "libsql":
         return await createLibSQLDatabase(options);
       default: {
-        return await createDefaultDatabase(options?.filename);
+        return await createDefaultDatabase(
+          options?.filename,
+          options?.dotAlchemy,
+        );
       }
     }
   },
 );
 
-async function createDefaultDatabase(filename: string | undefined) {
+async function createDefaultDatabase(
+  filename: string | undefined,
+  dotAlchemy: string | undefined,
+) {
   if ("Bun" in globalThis) {
-    return createBunSQLiteDatabase({ engine: "bun", filename });
+    return createBunSQLiteDatabase({ engine: "bun", filename, dotAlchemy });
   }
-  return createLibSQLDatabase({ engine: "libsql", filename });
+  return createLibSQLDatabase({ engine: "libsql", filename, dotAlchemy });
 }
 
 async function createBunSQLiteDatabase(
@@ -122,8 +144,8 @@ async function createBunSQLiteDatabase(
   const filename =
     options?.filename ??
     process.env.ALCHEMY_STATE_FILE ??
-    ".alchemy/state.sqlite";
-  ensureDirectory(filename);
+    path.join(options?.dotAlchemy ?? ".alchemy", "state.sqlite");
+  await ensureDirectory(filename);
   const { Database } = await import("bun:sqlite");
   const { drizzle } = await importPeer(
     import("drizzle-orm/bun-sqlite"),
@@ -135,7 +157,11 @@ async function createBunSQLiteDatabase(
   // options are passed in, so here's some ugly destructuring!
   const { engine: _engine, filename: _filename, ...rest } = options ?? {};
   const bunOptions = Object.keys(rest).length > 0 ? rest : undefined;
-  const client = new Database(filename, bunOptions);
+  const client = new Database(filename, {
+    readwrite: true,
+    create: true,
+    ...bunOptions,
+  });
   client.exec("PRAGMA journal_mode = WAL;");
   const db = drizzle(client, {
     schema,
@@ -149,10 +175,11 @@ async function createLibSQLDatabase(
 ) {
   const url =
     options?.url ??
-    `file:${options?.filename ?? process.env.ALCHEMY_STATE_FILE ?? ".alchemy/state.sqlite"}`;
+    `file:${options?.filename ?? process.env.ALCHEMY_STATE_FILE ?? path.join(options?.dotAlchemy ?? ".alchemy", "state.sqlite")}`;
+
   const filename = url.startsWith("file:") ? url.slice(5) : undefined;
   if (filename) {
-    ensureDirectory(filename);
+    await ensureDirectory(filename);
   }
   const { drizzle } = await importPeer(
     import("drizzle-orm/libsql"),
@@ -173,9 +200,9 @@ async function createLibSQLDatabase(
   return db;
 }
 
-const ensureDirectory = (filename: string) => {
+const ensureDirectory = async (filename: string) => {
   const dir = path.dirname(filename);
-  if (!fs.existsSync(dir)) {
-    fs.mkdirSync(dir, { recursive: true });
+  if (!(await exists(dir))) {
+    await fs.mkdir(dir, { recursive: true });
   }
 };

package/src/stripe/customer.ts

@@ -92,10 +92,6 @@ export interface CustomerProps {
    * An integer amount in cents that represents the customer's current balance
    */
   balance?: number;
-  /**
-   * If you provide a coupon code, the customer will have a discount applied on all recurring charges
-   */
-  coupon?: string;
   /**
    * An arbitrary string attached to the object
    */
@@ -136,10 +132,6 @@ export interface CustomerProps {
    * Customer's preferred languages, ordered by preference
    */
   preferredLocales?: string[];
-  /**
-   * The ID of a promotion code to apply to the customer
-   */
-  promotionCode?: string;
   /**
    * The customer's shipping information
    */
@@ -311,7 +303,6 @@ export const Customer = Resource(
               }
             : undefined,
           balance: props.balance,
-          coupon: props.coupon,
           description: props.description,
           email: props.email,
           invoice_prefix: props.invoicePrefix,
@@ -320,7 +311,6 @@ export const Customer = Resource(
           next_invoice_sequence: props.nextInvoiceSequence,
           phone: props.phone,
           preferred_locales: props.preferredLocales,
-          promotion_code: props.promotionCode,
           shipping: props.shipping as any,
           source: props.source,
           tax_exempt: props.taxExempt,
@@ -354,7 +344,6 @@ export const Customer = Resource(
               }
             : undefined,
           balance: props.balance,
-          coupon: props.coupon,
           description: props.description,
           email: props.email,
           invoice_prefix: props.invoicePrefix,
@@ -364,7 +353,6 @@ export const Customer = Resource(
           payment_method: props.paymentMethod,
           phone: props.phone,
           preferred_locales: props.preferredLocales,
-          promotion_code: props.promotionCode,
           shipping: props.shipping as any,
           source: props.source,
           tax_exempt: props.taxExempt,
@@ -404,7 +392,6 @@ export const Customer = Resource(
                   }
                 : undefined,
               balance: props.balance,
-              coupon: props.coupon,
               description: props.description,
               email: props.email,
               invoice_prefix: props.invoicePrefix,
@@ -413,7 +400,6 @@ export const Customer = Resource(
               next_invoice_sequence: props.nextInvoiceSequence,
               phone: props.phone,
               preferred_locales: props.preferredLocales,
-              promotion_code: props.promotionCode,
               shipping: props.shipping as any,
               source: props.source,
               tax_exempt: props.taxExempt,

package/src/stripe/price.ts

@@ -4,41 +4,60 @@ import { Resource } from "../resource.ts";
 import type { Secret } from "../secret.ts";
 import { logger } from "../util/logger.ts";
 import { createStripeClient, handleStripeDeleteError } from "./client.ts";
+import type { Meter } from "./meter.ts";
 
 /**
  * Properties for price recurring configuration
  */
-export interface PriceRecurring {
-  /**
-   * Specifies billing frequency. Either 'day', 'week', 'month' or 'year'.
-   */
-  interval: Stripe.PriceCreateParams.Recurring.Interval;
-
-  /**
-   * The number of intervals between subscription billings. For example, interval=month and interval_count=3 bills every 3 months.
-   */
-  intervalCount?: number;
-
-  /**
-   * Configures how the quantity per period should be determined, can be either 'metered' or 'licensed'.
-   * 'licensed' will automatically bill the quantity set for a plan when adding it to a subscription,
-   * 'metered' will aggregate the total usage based on usage records.
-   */
-  usageType?: Stripe.PriceCreateParams.Recurring.UsageType;
-
-  /**
-   * Specifies a usage aggregation strategy for prices of `usage_type=metered`. Allowed values are `sum` for summing up all usage during a period,
-   * `last_during_period` for picking the last usage record reported within a period,
-   * `last_ever` for picking the last usage record ever (across period bounds) or `max` which picks the usage record with the maximum reported usage during a period.
-   */
-  aggregateUsage?: Stripe.PriceCreateParams.Recurring.AggregateUsage;
-
-  /**
-   * The ID of the billing meter this price is associated with.
-   * Only applicable when usageType = 'metered'.
-   */
-  meter?: string;
-}
+export type PriceRecurring =
+  // If usageType is 'metered', meter is required
+  | {
+      /**
+       * Specifies billing frequency. Either 'day', 'week', 'month' or 'year'.
+       */
+      interval: Stripe.PriceCreateParams.Recurring.Interval;
+
+      /**
+       * The number of intervals between subscription billings. For example, interval=month and interval_count=3 bills every 3 months.
+       */
+      intervalCount?: number;
+
+      /**
+       * Configures how the quantity per period should be determined, can be either 'metered' or 'licensed'.
+       * 'metered' will aggregate the total usage based on usage records.
+       */
+      usageType: "metered";
+
+      /**
+       * The ID of the billing meter this price is associated with.
+       * Required when usageType = 'metered'.
+       */
+      meter: string | Meter;
+    }
+  // If usageType is 'licensed' or not provided, meter is not allowed
+  | {
+      /**
+       * Specifies billing frequency. Either 'day', 'week', 'month' or 'year'.
+       */
+      interval: Stripe.PriceCreateParams.Recurring.Interval;
+
+      /**
+       * The number of intervals between subscription billings. For example, interval=month and interval_count=3 bills every 3 months.
+       */
+      intervalCount?: number;
+
+      /**
+       * Configures how the quantity per period should be determined, can be either 'metered' or 'licensed'.
+       * 'licensed' will automatically bill the quantity set for a plan when adding it to a subscription.
+       */
+      usageType?: "licensed" | undefined;
+
+      /**
+       * The ID of the billing meter this price is associated with.
+       * Not applicable when usageType is not 'metered'.
+       */
+      meter?: never;
+    };
 
 type TaxBehavior = Stripe.PriceCreateParams.TaxBehavior;
 type BillingScheme = Stripe.PriceCreateParams.BillingScheme;
@@ -262,19 +281,6 @@ export interface Price extends Resource<"stripe::Price">, PriceProps {
  * });
  *
  * @example
- * // Create a metered price for usage-based billing
- * const meteredPrice = await Price("storage", {
- *   currency: "usd",
- *   unitAmount: 25, // $0.25 per GB
- *   product: "prod_xyz",
- *   recurring: {
- *     interval: "month",
- *     usageType: "metered",
- *     aggregateUsage: "sum"
- *   }
- * });
- *
- * @example
  * // Create a graduated tiered price with usage-based billing
  * const tieredPrice = await Price("api-usage", {
  *   currency: "usd",
@@ -428,22 +434,21 @@ export const Price = Resource(
             interval: props.recurring.interval,
             interval_count: props.recurring.intervalCount,
             usage_type: props.recurring.usageType,
-            aggregate_usage: props.recurring.aggregateUsage,
           };
 
           // Add meter to recurring if present (only for metered usage type)
-          if (props.recurring.meter) {
-            if (props.recurring.usageType !== "metered") {
-              throw new Error(
-                "Meter can only be set for prices with recurring.usageType = 'metered'",
-              );
-            }
-            // Extend the recurring params with meter
+          if (
+            props.recurring.usageType === "metered" &&
+            props.recurring.meter
+          ) {
             (
               createParams.recurring as Stripe.PriceCreateParams.Recurring & {
                 meter: string;
               }
-            ).meter = props.recurring.meter;
+            ).meter =
+              typeof props.recurring.meter === "string"
+                ? props.recurring.meter
+                : props.recurring.meter.id;
           }
         }
 
@@ -514,8 +519,6 @@ export const Price = Resource(
             intervalCount: price.recurring.interval_count,
             usageType: price.recurring
               .usage_type as Stripe.PriceCreateParams.Recurring.UsageType,
-            aggregateUsage: price.recurring
-              .aggregate_usage as Stripe.PriceCreateParams.Recurring.AggregateUsage,
             meter: (
               price.recurring as Stripe.Price.Recurring & { meter?: string }
             ).meter,
@@ -552,7 +555,7 @@ export const Price = Resource(
         active: price.active,
         billingScheme: price.billing_scheme as BillingScheme,
         nickname: price.nickname || undefined,
-        recurring: recurring,
+        recurring: recurring as PriceRecurring,
         metadata: price.metadata || undefined,
         taxBehavior: price.tax_behavior as TaxBehavior,
         createdAt: price.created,

package/src/test/vitest.ts

@@ -112,7 +112,10 @@ export function test(
         return new D1StateStore(scope);
       default:
         return new SQLiteStateStore(scope, {
-          filename: `.alchemy/${path.relative(process.cwd(), meta.filename)}.sqlite`,
+          filename: path.join(
+            scope.dotAlchemy,
+            `${path.relative(process.cwd(), meta.filename)}.sqlite`,
+          ),
         });
     }
   };

package/src/util/assert-never.ts

@@ -1,3 +1,3 @@
 export function assertNever(value: never, message?: string): never {
-  throw new Error(message ?? `Unexpected value: ${value}`);
+  throw new Error(message ?? `Unexpected value: ${JSON.stringify(value)}`);
 }

package/src/util/cli.ts

@@ -55,16 +55,16 @@ interface AlchemyInfo {
   appName: string;
 }
 
-let loggerApi: LoggerApi | null = null;
+let loggers: {
+  [appName: string]: LoggerApi;
+} = {};
+
 export const createLoggerInstance = (
   alchemyInfo: AlchemyInfo,
   customLogger?: LoggerApi,
 ) => {
-  if (loggerApi) return loggerApi;
-
-  // Use custom logger if provided, otherwise use the basic fallback logger
-  loggerApi = customLogger ?? createFallbackLogger(alchemyInfo);
-  return loggerApi;
+  return (loggers[alchemyInfo.appName] ??=
+    customLogger ?? createFallbackLogger(alchemyInfo));
 };
 
 export const createDummyLogger = (): LoggerApi => {
@@ -79,13 +79,15 @@ export const createDummyLogger = (): LoggerApi => {
 };
 
 export const createFallbackLogger = (alchemyInfo: AlchemyInfo): LoggerApi => {
-  console.log(dedent`
-    ${colorize("Alchemy", "cyanBright")} (v${packageJson.version})
-    App: ${alchemyInfo.appName}
-    Phase: ${alchemyInfo.phase}
-    Stage: ${alchemyInfo.stage}
-    
-  `);
+  if (alchemyInfo.phase !== "read") {
+    console.log(dedent`
+      ${colorize("Alchemy", "cyanBright")} (v${packageJson.version})
+      App: ${alchemyInfo.appName}
+      Phase: ${alchemyInfo.phase}
+      Stage: ${alchemyInfo.stage}
+      
+    `);
+  }
 
   return {
     log: console.log,

package/src/util/memoize.ts

@@ -25,7 +25,7 @@ export function memoize<F extends (...args: any[]) => Promise<any>>(
   };
 }
 
-export const defaultKeyFn = (...args: any[]) => {
+export function defaultKeyFn(...args: any[]): string {
   return createHash("sha256")
     .update(
       JSON.stringify(args, (_, value) => {
@@ -38,4 +38,4 @@ export const defaultKeyFn = (...args: any[]) => {
       }),
     )
     .digest("hex");
-};
+}

package/src/util/root-dir.ts

@@ -0,0 +1 @@
+export const ALCHEMY_ROOT = process.env.ALCHEMY_ROOT ?? process.cwd();

package/templates/nextjs/alchemy.run.ts

@@ -5,12 +5,12 @@ import { Nextjs } from "alchemy/cloudflare";
 
 const app = await alchemy("{projectName}");
 
-export const website = await Nextjs("website", {
+export const worker = await Nextjs("website", {
   name: `${app.name}-${app.stage}-website`,
 });
 
 console.log({
-  url: website.url,
+  url: worker.url,
 });
 
 await app.finalize();

package/workers/cloudflare-state-store.js

@@ -5397,7 +5397,7 @@ var migrations_default = {
 
 // src/util/assert-never.ts
 function assertNever(value, message) {
-  throw new Error(message ?? `Unexpected value: ${value}`);
+  throw new Error(message ?? `Unexpected value: ${JSON.stringify(value)}`);
 }
 
 // src/state/schema.ts