alchemy 0.67.0 → 0.68.0

package/src/cloudflare/vectorize-index.ts

@@ -51,18 +51,14 @@ export interface VectorizeIndexProps extends CloudflareApiOptions {
   adopt?: boolean;
 }
 
-export function isVectorizeIndex(
-  resource: Resource,
-): resource is VectorizeIndex {
-  return resource[ResourceKind] === "cloudflare::VectorizeIndex";
+export function isVectorizeIndex(resource: any): resource is VectorizeIndex {
+  return resource?.[ResourceKind] === "cloudflare::VectorizeIndex";
 }
 
 /**
  * Output returned after Vectorize Index creation/update
  */
-export interface VectorizeIndex
-  extends Resource<"cloudflare::VectorizeIndex">,
-    VectorizeIndexProps {
+export interface VectorizeIndex extends VectorizeIndexProps {
   type: "vectorize";
 
   /**
@@ -176,10 +172,10 @@ export const VectorizeIndex = Resource(
             `Attempted to update Vectorize index ${indexName} but only the delete property can be changed.`,
           );
         }
-        return this({
+        return {
           ...this.output,
           delete: props.delete,
-        });
+        };
       }
 
       // Check if this is a no-op update
@@ -194,7 +190,7 @@ export const VectorizeIndex = Resource(
             `Attempted to update Vectorize index ${indexName} but it was a no-op.`,
           );
         }
-        return this(this.output);
+        return this.output;
       }
 
       // Update operation is not supported by Vectorize API
@@ -204,7 +200,7 @@ export const VectorizeIndex = Resource(
       );
     }
 
-    return this({
+    return {
       type: "vectorize",
       id: indexName,
       name: indexName,
@@ -218,7 +214,7 @@ export const VectorizeIndex = Resource(
       createdAt: indexData.result.created_on
         ? new Date(indexData.result.created_on).getTime()
         : undefined,
-    });
+    };
   },
 );
 

package/src/cloudflare/vectorize-metadata-index.ts

@@ -30,17 +30,15 @@ export interface VectorizeMetadataIndexProps extends CloudflareApiOptions {
 }
 
 export function isVectorizeMetadataIndex(
-  resource: Resource,
+  resource: any,
 ): resource is VectorizeMetadataIndex {
-  return resource[ResourceKind] === "cloudflare::VectorizeMetadataIndex";
+  return resource?.[ResourceKind] === "cloudflare::VectorizeMetadataIndex";
 }
 
 /**
  * Output returned after Vectorize Metadata Index creation/deletion
  */
-export interface VectorizeMetadataIndex
-  extends Resource<"cloudflare::VectorizeMetadataIndex">,
-    VectorizeMetadataIndexProps {
+export interface VectorizeMetadataIndex extends VectorizeMetadataIndexProps {
   /**
    * ID of this metadata index (derived from propertyName)
    */
@@ -126,7 +124,7 @@ export const VectorizeMetadataIndex = Resource(
             `Attempted to update Vectorize metadata index ${this.props.propertyName} but it was a no-op.`,
           );
         }
-        return this(this.output);
+        return this.output;
       }
       // Update operation is not supported
       throw new Error(
@@ -136,14 +134,14 @@ export const VectorizeMetadataIndex = Resource(
     }
     const indexData = await createMetadataIndex(api, indexName, props);
 
-    return this({
+    return {
       id: propertyName, // Use propertyName as ID
       index: props.index,
       propertyName: props.propertyName,
       indexType: props.indexType,
       accountId: api.accountId,
       mutationId: indexData.result.mutationId,
-    });
+    };
   },
 );
 

package/src/cloudflare/website.ts

@@ -344,7 +344,7 @@ export async function Website<B extends Bindings>(
       ...worker.bindings,
       ...(!scope.local
         ? {
-            ASSETS: await Assets("assets", {
+            ASSETS: await Assets({
               path: path.relative(process.cwd(), paths.assets),
             }),
           }

package/src/cloudflare/worker-assets.ts

@@ -1,11 +1,9 @@
-import crypto from "node:crypto";
 import fs from "node:fs/promises";
-import path from "node:path";
 import { AsyncQueue } from "../util/async-queue.ts";
 import { withExponentialBackoff } from "../util/retry.ts";
 import { extractCloudflareResult } from "./api-response.ts";
 import type { CloudflareApi } from "./api.ts";
-import type { AssetFile, Assets } from "./assets.ts";
+import { Assets } from "./assets.ts";
 import type { AssetsConfig, WorkerProps } from "./worker.ts";
 
 export interface AssetUploadResult {
@@ -47,7 +45,12 @@ export async function uploadAssets(
   // Process the assets configuration once at the beginning
   const processedConfig = createAssetConfig(assetConfig);
 
-  const { manifest, filesByHash } = await prepareAssetManifest(assets);
+  const manifest: Record<string, FileMetadata> = {};
+  const filesByHash = new Map<string, Assets.FileMetadata>();
+  for (const file of await Assets.read(assets.path)) {
+    manifest[file.name] = { hash: file.hash, size: file.size };
+    filesByHash.set(file.hash, file);
+  }
 
   // Start the upload session
   const uploadSession = await extractCloudflareResult<{
@@ -130,31 +133,11 @@ export function createAssetConfig(config?: AssetsConfig): AssetsConfig {
   return assetConfig;
 }
 
-/**
- * Prepares the asset manifest for the assets upload session
- *
- * @param assets Assets resource containing files to upload
- * @returns Asset manifest and files by hash
- */
-export async function prepareAssetManifest(assets: Assets) {
-  const manifest: Record<string, FileMetadata> = {};
-  const filesByHash = new Map<string, AssetFile>();
-  await Promise.all(
-    assets.files.map(async (file) => {
-      const { hash, size } = await calculateFileMetadata(file.filePath);
-      const key = file.path.startsWith("/") ? file.path : `/${file.path}`;
-      manifest[key] = { hash, size };
-      filesByHash.set(hash, file);
-    }),
-  );
-  return { manifest, filesByHash };
-}
-
 async function uploadBucket(
   api: CloudflareApi,
   jwt: string,
   bucket: string[],
-  filesByHash: Map<string, AssetFile>,
+  filesByHash: Map<string, Assets.FileMetadata>,
 ) {
   const formData = new FormData();
   await Promise.all(
@@ -163,9 +146,9 @@ async function uploadBucket(
       if (!file) {
         throw new Error(`Could not find file with hash ${fileHash}`);
       }
-      const fileContent = await fs.readFile(file.filePath);
+      const fileContent = await fs.readFile(file.path);
       const blob = new Blob([fileContent.toString("base64")], {
-        type: file.contentType,
+        type: file.type,
       });
       formData.append(fileHash, blob, fileHash);
     }),
@@ -184,32 +167,3 @@ async function uploadBucket(
   );
   return uploadResult.jwt;
 }
-
-/**
- * Calculate the SHA-256 hash and size of a file
- *
- * @param filePath Path to the file
- * @returns Hash (first 32 chars of SHA-256) and size of the file
- */
-export async function calculateFileMetadata(
-  filePath: string,
-): Promise<{ hash: string; size: number }> {
-  const contents = await fs.readFile(filePath);
-
-  const hash = crypto.createHash("sha256");
-  hash.update(contents);
-
-  const extension = path.extname(filePath).substring(1);
-  hash.update(extension);
-
-  if (contents.length > 26214400) {
-    throw new Error(
-      `File "${filePath}" is too large to upload as an asset to Cloudflare (the file is ${(contents.length / 1024 / 1024).toFixed(2)} MB; the maximum size is 25MB).`,
-    );
-  }
-
-  return {
-    hash: hash.digest("hex").slice(0, 32),
-    size: contents.length,
-  };
-}

package/src/cloudflare/worker-stub.ts

@@ -43,7 +43,7 @@ export interface WorkerStubProps<
  */
 export interface WorkerStub<
   RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
-> extends Resource<"cloudflare::WorkerStub"> {
+> {
   type: "service";
   /**
    * The name of the worker
@@ -64,8 +64,8 @@ export interface WorkerStub<
   __rpc__?: RPC;
 }
 
-export function isWorkerStub(resource: Resource): resource is WorkerStub {
-  return resource[ResourceKind] === "cloudflare::WorkerStub";
+export function isWorkerStub(resource: any): resource is WorkerStub {
+  return resource?.[ResourceKind] === "cloudflare::WorkerStub";
 }
 
 /**
@@ -120,12 +120,12 @@ export const WorkerStub = Resource("cloudflare::WorkerStub", async function <
       : undefined;
 
   // Return the worker stub info
-  return this({
+  return {
     type: "service",
     __rpc__: props.rpc as unknown as RPC,
     ...props,
     url: subdomain?.url,
-  }) as WorkerStub<RPC>;
+  } as WorkerStub<RPC>;
 });
 
 async function exists(

package/src/cloudflare/worker-subdomain.ts

@@ -37,8 +37,7 @@ interface WorkerSubdomainProps extends CloudflareApiOptions {
   dev?: boolean;
 }
 
-export interface WorkerSubdomain
-  extends Resource<"cloudflare::WorkerSubdomain"> {
+export interface WorkerSubdomain {
   /**
    * The `workers.dev` URL for the worker or preview version.
    */
@@ -49,13 +48,13 @@ export const WorkerSubdomain = Resource(
   "cloudflare::WorkerSubdomain",
   async function (
     this: Context<WorkerSubdomain>,
-    id: string,
+    _id: string,
     props: WorkerSubdomainProps,
   ) {
     if (this.scope.local && props.dev) {
-      return this({
+      return {
         url: this.output?.url ?? "https://unavailable.alchemy.run",
-      });
+      };
     }
 
     const api = await createCloudflareApi(props);
@@ -74,9 +73,9 @@ export const WorkerSubdomain = Resource(
     } else {
       url = `https://${props.scriptName}.${base}`;
     }
-    return this(id, {
+    return {
       url,
-    });
+    };
   },
 );
 

package/src/cloudflare/worker.ts

@@ -432,8 +432,8 @@ export type WorkerProps<
   RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
 > = InlineWorkerProps<B, RPC> | EntrypointWorkerProps<B, RPC>;
 
-export function isWorker(resource: Resource): resource is Worker<any> {
-  return resource[ResourceKind] === "cloudflare::Worker";
+export function isWorker(resource: any): resource is Worker<any> {
+  return resource?.[ResourceKind] === "cloudflare::Worker";
 }
 
 /**
@@ -442,109 +442,108 @@ export function isWorker(resource: Resource): resource is Worker<any> {
 export type Worker<
   B extends Bindings | undefined = Bindings | undefined,
   RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
-> = Resource<"cloudflare::Worker"> &
-  Omit<WorkerProps<B>, "url" | "script" | "routes" | "domains"> & {
-    /** @internal phantom property */
-    __rpc__?: RPC;
+> = Omit<WorkerProps<B>, "url" | "script" | "routes" | "domains"> & {
+  /** @internal phantom property */
+  __rpc__?: RPC;
 
-    type: "service";
+  type: "service";
 
-    /**
-     * The ID of the worker
-     */
-    id: string;
+  /**
+   * The ID of the worker
+   */
+  id: string;
 
-    /**
-     * The name of the worker
-     */
-    name: string;
+  /**
+   * The name of the worker
+   */
+  name: string;
 
-    /**
-     * The root directory of the project
-     * @default process.cwd()
-     */
-    cwd: string;
+  /**
+   * The root directory of the project
+   * @default process.cwd()
+   */
+  cwd: string;
 
-    /**
-     * Time at which the worker was created
-     */
-    createdAt: number;
+  /**
+   * Time at which the worker was created
+   */
+  createdAt: number;
 
-    /**
-     * Time at which the worker was last updated
-     */
-    updatedAt: number;
+  /**
+   * Time at which the worker was last updated
+   */
+  updatedAt: number;
 
-    /**
-     * The worker's URL if enabled
-     * Format: {name}.{subdomain}.workers.dev
-     *
-     * @default true
-     */
-    url?: string;
+  /**
+   * The worker's URL if enabled
+   * Format: {name}.{subdomain}.workers.dev
+   *
+   * @default true
+   */
+  url?: string;
 
-    /**
-     * The bindings that were created
-     */
-    bindings: B;
+  /**
+   * The bindings that were created
+   */
+  bindings: B;
 
-    /**
-     * Configuration for static assets
-     */
-    assets?: AssetsConfig;
+  /**
+   * Configuration for static assets
+   */
+  assets?: AssetsConfig;
 
-    /**
-     * The routes that were created for this worker
-     */
-    routes?: Route[];
+  /**
+   * The routes that were created for this worker
+   */
+  routes?: Route[];
 
-    /**
-     * The custom domains that were created for this worker
-     */
-    domains?: CustomDomain[];
+  /**
+   * The custom domains that were created for this worker
+   */
+  domains?: CustomDomain[];
 
-    // phantom property (for typeof myWorker.Env)
-    Env: B extends Bindings
-      ? {
-          [bindingName in keyof B]: Bound<B[bindingName]>;
-        }
-      : undefined;
+  // phantom property (for typeof myWorker.Env)
+  Env: B extends Bindings
+    ? {
+        [bindingName in keyof B]: Bound<B[bindingName]>;
+      }
+    : undefined;
 
-    /**
-     * The compatibility date for the worker
-     */
-    compatibilityDate: string;
+  /**
+   * The compatibility date for the worker
+   */
+  compatibilityDate: string;
 
-    /**
-     * The compatibility flags for the worker
-     */
-    compatibilityFlags: string[];
+  /**
+   * The compatibility flags for the worker
+   */
+  compatibilityFlags: string[];
 
-    /**
-     * The dispatch namespace this worker is deployed to
-     */
-    namespace?: string | DispatchNamespace;
+  /**
+   * The dispatch namespace this worker is deployed to
+   */
+  namespace?: string | DispatchNamespace;
 
-    /**
-     * Version label for this worker deployment
-     */
-    version?: string;
+  /**
+   * Version label for this worker deployment
+   */
+  version?: string;
 
-    /**
-     * Smart placement configuration for the worker
-     */
-    placement?: {
-      mode: "smart";
-    };
+  /**
+   * Smart placement configuration for the worker
+   */
+  placement?: {
+    mode: "smart";
+  };
 
-    /**
-     * Whether the worker has a remote deployment
-     * @internal
-     */
-    dev?: {
-      hasRemote: boolean;
-    };
+  /**
+   * Whether the worker has a remote deployment
+   * @internal
+   */
+  dev?: {
+    hasRemote: boolean;
   };
+};
 
 /**
  * A Cloudflare Worker is a serverless function that can be deployed to the Cloudflare network.
@@ -614,7 +613,7 @@ export type Worker<
  *
  * @example
  * // Create a worker with static assets:
- * const staticAssets = await Assets("static", {
+ * const staticAssets = await Assets({
  *   path: "./src/assets"
  * });
  *
@@ -901,7 +900,7 @@ const _Worker = Resource(
           containers: options.containers,
         },
       );
-      return this({
+      return {
         ...props,
         type: "service",
         id,
@@ -920,7 +919,7 @@ const _Worker = Resource(
           hasRemote: this.output?.dev?.hasRemote ?? false,
         },
         Env: undefined!,
-      } as unknown as Worker<B>);
+      } as unknown as Worker<B>;
     }
 
     if (this.phase === "create" || this.output.dev?.hasRemote === false) {
@@ -1045,7 +1044,7 @@ const _Worker = Resource(
     );
 
     const now = new Date();
-    return this({
+    return {
       ...props,
       type: "service",
       id,
@@ -1074,7 +1073,7 @@ const _Worker = Resource(
       dev: {
         hasRemote: true,
       },
-    } as unknown as Worker<B>);
+    } as unknown as Worker<B>;
   },
 );
 
@@ -1190,6 +1189,7 @@ async function provisionResources<B extends Bindings>(
       apiToken: props.apiToken,
       email: props.email,
       baseUrl: props.baseUrl,
+      profile: props.profile,
     } satisfies CloudflareApiOptions,
   };
 

package/src/cloudflare/zone.ts

@@ -263,7 +263,7 @@ export interface ZoneData {
 /**
  * Output returned after Zone creation/update
  */
-export interface Zone extends Resource<"cloudflare::Zone">, ZoneData {}
+export interface Zone extends ZoneData {}
 
 /**
  * A Cloudflare Zone represents a domain and its configuration settings on Cloudflare.
@@ -425,7 +425,7 @@ export const Zone = Resource(
       this.props?.botManagement,
     );
 
-    return this({
+    return {
       id: zoneData.id,
       name: zoneData.name,
       type: zoneData.type,
@@ -440,7 +440,7 @@ export const Zone = Resource(
         ? new Date(zoneData.activated_on).getTime()
         : null,
       settings: await getZoneSettings(api, zoneData.id),
-    });
+    };
   },
 );
 

package/src/context.ts

@@ -6,24 +6,26 @@ import {
   ResourceScope,
   ResourceSeq,
   type Resource,
+  type ResourceAttributes,
   type ResourceProps,
 } from "./resource.ts";
 import type { Scope } from "./scope.ts";
 import type { State } from "./state.ts";
 
 export type Context<
-  Out extends Resource,
+  Out extends ResourceAttributes,
   Props extends ResourceProps = ResourceProps,
 > = CreateContext<Out> | UpdateContext<Out, Props> | DeleteContext<Out, Props>;
 
-export interface CreateContext<Out extends Resource> extends BaseContext<Out> {
+export interface CreateContext<Out extends ResourceAttributes>
+  extends BaseContext<Out> {
   phase: "create";
   output?: undefined;
   props?: undefined;
 }
 
 export interface UpdateContext<
-  Out extends Resource,
+  Out extends ResourceAttributes,
   Props extends ResourceProps = ResourceProps,
 > extends BaseContext<Out> {
   phase: "update";
@@ -32,7 +34,7 @@ export interface UpdateContext<
 }
 
 export interface DeleteContext<
-  Out extends Resource,
+  Out extends ResourceAttributes,
   Props extends ResourceProps = ResourceProps,
 > extends BaseContext<Out> {
   phase: "delete";
@@ -40,7 +42,7 @@ export interface DeleteContext<
   props: Props;
 }
 
-export interface BaseContext<Out extends Resource> {
+export interface BaseContext<Out extends ResourceAttributes> {
   quiet: boolean;
   stage: string;
   id: ResourceID;
@@ -94,7 +96,7 @@ export interface BaseContext<Out extends Resource> {
 export function context<
   Kind extends string,
   Props extends ResourceProps | undefined,
-  Out extends Resource,
+  Out extends ResourceAttributes,
 >({
   scope,
   phase,
@@ -114,7 +116,7 @@ export function context<
   fqn: ResourceFQN;
   seq: number;
   props: Props;
-  state: State<Kind, Props, Out>;
+  state: State<Kind, Props, Out & Resource>;
   replace: (force?: boolean) => never;
   isReplacement?: boolean;
 }): Context<Out> {

package/src/destroy.ts

@@ -50,10 +50,10 @@ function isScopeArgs(a: any): a is [scope: Scope, options?: DestroyOptions] {
 /**
  * Prune all resources from an Output and "down", i.e. that branches from it.
  */
-export async function destroy<Type extends string>(
+export async function destroy(
   ...args:
     | [scope: Scope, options?: DestroyOptions]
-    | [resource: Resource<Type> | undefined | null, options?: DestroyOptions]
+    | [resource: any | undefined | null, options?: DestroyOptions]
 ): Promise<void> {
   if (isScopeArgs(args)) {
     const [scope] = args;

package/src/dns/import-dns.ts

@@ -62,9 +62,7 @@ export interface ImportDnsRecordsProps {
 /**
  * Output returned after DNS records import
  */
-export interface ImportDnsRecords
-  extends Resource<"dns::ImportDnsRecords">,
-    ImportDnsRecordsProps {
+export interface ImportDnsRecords extends ImportDnsRecordsProps {
   /**
    * The DNS records as a flat array, directly compatible with DnsRecords function
    */
@@ -204,11 +202,11 @@ export const ImportDnsRecords = Resource(
     }
 
     // Return the resource with fetched records as a flat array
-    return this({
+    return {
       domain: props.domain,
       recordTypes: [...recordTypes],
       records: allRecords,
       importedAt: Date.now(),
-    });
+    };
   },
 );