alchemy 0.82.0 → 0.82.2

package/bin/alchemy.js

@@ -37096,7 +37096,7 @@ function envPaths(name$1, { suffix = "nodejs" } = {}) {
 //#endregion
 //#region package.json
 var name = "alchemy";
-var version = "0.82.0";
+var version = "0.82.2";
 var license = "Apache-2.0";
 var author = "Sam Goodwin <sam@alchemy.run>";
 var homepage = "https://alchemy.run";
@@ -37279,6 +37279,7 @@ var dependencies = {
 	"@smithy/node-config-provider": "^4.0.0",
 	"@smithy/types": "^4.6.0",
 	"aws4fetch": "^1.0.20",
+	"drizzle-orm": "^0.45.1",
 	"env-paths": "^3.0.0",
 	"esbuild": "^0.25.1",
 	"execa": "^9.6.0",
@@ -37315,7 +37316,6 @@ var peerDependencies = {
 	"@libsql/client": "^0.15.12",
 	"@opennextjs/cloudflare": "^1.6.5",
 	"astro": "^5.13.2",
-	"drizzle-orm": "^0.44.2",
 	"rwsdk": "^0.1.36",
 	"stripe": "^18.5.0",
 	"vite": ">=6.0.0",
@@ -37336,7 +37336,6 @@ var peerDependenciesMeta = {
 	"@opennextjs/cloudflare": { "optional": true },
 	"@libsql/client": { "optional": true },
 	"astro": { "optional": true },
-	"drizzle-orm": { "optional": true },
 	"rwsdk": { "optional": true },
 	"stripe": { "optional": true },
 	"vite": { "optional": true }
@@ -37377,8 +37376,8 @@ var devDependencies = {
 	"cpx": "^1.5.0",
 	"debug": "^4.4.1",
 	"dofs": "^0.1.0",
-	"drizzle-kit": "^0.31.4",
-	"drizzle-orm": "^0.44.2",
+	"drizzle-kit": "^0.31.8",
+	"drizzle-orm": "^0.45.1",
 	"fs-extra": "^11.3.0",
 	"globby": "^14.1.0",
 	"grammy": "^1.37.0",

package/lib/cloudflare/d1-database.d.ts

@@ -1,6 +1,6 @@
 import { type CloudflareApi, type CloudflareApiOptions } from "./api.ts";
 export type D1DatabaseJurisdiction = "default" | "eu" | "fedramp";
-type PrimaryLocationHint = "wnam" | "enam" | "weur" | "eeur" | "apac" | "auto" | (string & {});
+type PrimaryLocationHint = "wnam" | "enam" | "weur" | "eeur" | "apac" | "oc" | (string & {});
 /**
  * Properties for creating or updating a D1 Database
  */
@@ -57,14 +57,10 @@ export interface D1DatabaseProps extends CloudflareApiOptions {
         name: string;
     };
     /**
-     * These files will be generated internally with the D1Database wrapper function when migrationsDir is specified
-     *
-     * @private
+     * The names of SQL files to import.
+     * After migrations are applied, these files will be run using [Cloudflare's D1 import API](https://developers.cloudflare.com/d1/best-practices/import-export-data/).
      */
-    migrationsFiles?: Array<{
-        id: string;
-        sql: string;
-    }>;
+    importFiles?: string[];
     /**
      * Name of the table used to track migrations. Only used if migrationsDir is specified. Defaults to 'd1_migrations'
      * This is analogous to wrangler's `migrations_table`.
@@ -100,7 +96,7 @@ export declare function isD1Database(resource: any): resource is D1Database;
 /**
  * Output returned after D1 Database creation/update
  */
-export type D1Database = Pick<D1DatabaseProps, "migrationsDir" | "migrationsTable" | "primaryLocationHint" | "readReplication"> & {
+export type D1Database = Pick<D1DatabaseProps, "migrationsDir" | "migrationsTable" | "primaryLocationHint" | "readReplication" | "importFiles"> & {
     type: "d1";
     /**
      * The unique ID of the database (UUID)
@@ -206,50 +202,40 @@ export type D1Database = Pick<D1DatabaseProps, "migrationsDir" | "migrationsTabl
  * @see https://developers.cloudflare.com/d1/
  */
 export declare function D1Database(id: string, props?: Omit<D1DatabaseProps, "migrationsFiles">): Promise<D1Database>;
-interface CloudflareD1Response {
-    result: {
-        uuid?: string;
-        name: string;
-        file_size: number;
-        num_tables: number;
-        version: string;
-        primary_location_hint?: string;
-        read_replication?: {
-            mode: "auto" | "disabled";
-        };
-        jurisdiction?: string;
+interface D1ResponseObject {
+    uuid: string;
+    name: string;
+    created_at: string;
+    version: string;
+    num_tables: number;
+    file_size: number;
+    running_in_region: "EEUR" | "APAC" | "WNAM" | "ENAM" | "WEUR" | "EEUR" | "OC";
+    read_replication: {
+        mode: "auto" | "disabled";
     };
-    success: boolean;
-    errors: Array<{
-        code: number;
-        message: string;
-    }>;
-    messages: string[];
+    jurisdiction: "eu" | "fedramp" | null;
 }
 /**
  * Create a new D1 database
  */
-export declare function createDatabase(api: CloudflareApi, databaseName: string, props: D1DatabaseProps): Promise<CloudflareD1Response>;
+export declare function createDatabase(api: CloudflareApi, databaseName: string, props: Pick<D1DatabaseProps, "jurisdiction" | "primaryLocationHint" | "readReplication">): Promise<D1ResponseObject>;
 /**
  * Get a D1 database
  */
-export declare function getDatabase(api: CloudflareApi, databaseId?: string, props?: D1DatabaseProps): Promise<CloudflareD1Response>;
+export declare function getDatabase(api: CloudflareApi, databaseId: string): Promise<D1ResponseObject>;
 /**
  * Delete a D1 database
  */
-export declare function deleteDatabase(api: CloudflareApi, databaseId?: string, props?: D1DatabaseProps): Promise<void>;
+export declare function deleteDatabase(api: CloudflareApi, databaseId: string): Promise<void>;
 /**
  * List all D1 databases in an account
  */
-export declare function listDatabases(api: CloudflareApi, name?: string, props?: D1DatabaseProps): Promise<{
-    name: string;
-    id: string;
-}[]>;
+export declare function listDatabases(api: CloudflareApi, name?: string): Promise<D1ResponseObject[]>;
 /**
  * Update a D1 database
  *
  * Note: According to Cloudflare API, only read_replication.mode can be modified during updates.
  */
-export declare function updateDatabase(api: CloudflareApi, databaseId: string, props: D1DatabaseProps): Promise<CloudflareD1Response>;
+export declare function updateReadReplicationMode(api: CloudflareApi, databaseId: string, readReplicationMode: "auto" | "disabled"): Promise<D1ResponseObject>;
 export {};
 //# sourceMappingURL=d1-database.d.ts.map

package/lib/cloudflare/d1-database.d.ts.map

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

package/lib/cloudflare/d1-database.js

@@ -1,12 +1,14 @@
 import { Resource, ResourceKind } from "../resource.js";
 import { Scope } from "../scope.js";
 import { logger } from "../util/logger.js";
-import { CloudflareApiError, handleApiError } from "./api-error.js";
+import { CloudflareApiError } from "./api-error.js";
+import { extractCloudflareResult } from "./api-response.js";
 import { createCloudflareApi, } from "./api.js";
-import { withJurisdiction } from "./bucket.js";
 import { cloneD1Database } from "./d1-clone.js";
+import { importD1Database } from "./d1-import.js";
 import { applyLocalD1Migrations } from "./d1-local-migrations.js";
-import { applyMigrations, listMigrationsFiles } from "./d1-migrations.js";
+import { applyMigrations } from "./d1-migrations.js";
+import { listSqlFiles, readSqlFile } from "./d1-sql-file.js";
 import { deleteMiniflareBinding } from "./miniflare/delete.js";
 const DEFAULT_MIGRATIONS_TABLE = "d1_migrations";
 export function isD1Database(resource) {
@@ -89,12 +91,16 @@ export function isD1Database(resource) {
  * @see https://developers.cloudflare.com/d1/
  */
 export async function D1Database(id, props = {}) {
-    const migrationsFiles = props.migrationsDir
-        ? await listMigrationsFiles(props.migrationsDir)
-        : [];
+    const [migrationsFiles, importFiles] = await Promise.all([
+        props.migrationsDir ? await listSqlFiles(props.migrationsDir) : [],
+        props.importFiles
+            ? await Promise.all(props.importFiles.map((file) => readSqlFile(Scope.current.rootDir, file)))
+            : [],
+    ]);
     return _D1Database(id, {
         ...props,
         migrationsFiles,
+        importFiles,
         dev: {
             ...(props.dev ?? {}),
             // force local migrations to run even if the database was already deployed live
@@ -111,16 +117,17 @@ const _D1Database = Resource("cloudflare::D1Database", async function (id, props
     }
     const local = this.scope.local && !props.dev?.remote;
     const dev = {
-        id: this.output?.dev?.id ?? this.output?.id ?? id,
+        id: this.output?.dev?.id ?? this.output?.id ?? databaseName,
         remote: props.dev?.remote ?? false,
     };
     const adopt = props.adopt ?? this.scope.adopt;
     if (local) {
-        if (props.migrationsFiles && props.migrationsFiles.length > 0) {
+        if (props.migrationsFiles?.length || props.importFiles?.length) {
             await applyLocalD1Migrations({
                 databaseId: dev.id,
                 migrationsTable: props.migrationsTable ?? DEFAULT_MIGRATIONS_TABLE,
-                migrations: props.migrationsFiles,
+                migrations: props.migrationsFiles ?? [],
+                imports: props.importFiles ?? [],
                 rootDir: this.scope.rootDir,
             });
         }
@@ -142,7 +149,7 @@ const _D1Database = Resource("cloudflare::D1Database", async function (id, props
             await deleteMiniflareBinding(this.scope, "d1", this.output.dev.id);
         }
         if (props.delete !== false && this.output?.id) {
-            await deleteDatabase(api, this.output.id, props);
+            await deleteDatabase(api, this.output.id);
         }
         // Return void (a deleted database has no content)
         return this.destroy();
@@ -155,13 +162,9 @@ const _D1Database = Resource("cloudflare::D1Database", async function (id, props
         !this.output?.id) {
         try {
             dbData = await createDatabase(api, databaseName, props);
-            // Read replication cannot be set during creation, so update it after creation
-            if (props.readReplication && dbData.result.uuid) {
-                dbData = await updateDatabase(api, dbData.result.uuid, props);
-            }
             // If clone property is provided, perform cloning after database creation
-            if (props.clone && dbData.result.uuid) {
-                await cloneDb(api, props.clone, dbData.result.uuid, jurisdiction);
+            if (props.clone && dbData.uuid) {
+                await cloneDb(api, props.clone, dbData.uuid);
             }
         }
         catch (error) {
@@ -171,16 +174,16 @@ const _D1Database = Resource("cloudflare::D1Database", async function (id, props
                 error.message.includes("already exists")) {
                 logger.log(`Database ${databaseName} already exists, adopting it`);
                 // Find the existing database by name
-                const databases = await listDatabases(api, databaseName, props);
+                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, props);
+                dbData = await getDatabase(api, existingDb.uuid);
                 // Update the database with the provided properties
                 if (props.readReplication) {
-                    dbData = await updateDatabase(api, existingDb.id, props);
+                    dbData = await updateReadReplicationMode(api, existingDb.uuid, props.readReplication?.mode);
                 }
             }
             else {
@@ -200,7 +203,7 @@ const _D1Database = Resource("cloudflare::D1Database", async function (id, props
             throw new Error(`Cannot update jurisdiction from '${this.output.jurisdiction}' to '${props.jurisdiction}' after database creation.`);
         }
         // Update the database with new properties
-        dbData = await updateDatabase(api, this.output.id, props);
+        dbData = await updateReadReplicationMode(api, this.output.id, props.readReplication?.mode ?? "disabled");
     }
     else {
         // If no ID exists, fall back to creating a new database
@@ -210,15 +213,11 @@ const _D1Database = Resource("cloudflare::D1Database", async function (id, props
     if (props.migrationsFiles && props.migrationsFiles.length > 0) {
         try {
             const migrationsTable = props.migrationsTable || DEFAULT_MIGRATIONS_TABLE;
-            const databaseId = dbData.result.uuid || this.output?.id;
-            if (!databaseId) {
-                throw new Error("Database ID not found for migrations");
-            }
             await applyMigrations({
                 migrationsFiles: props.migrationsFiles,
                 migrationsTable,
                 accountId: api.accountId,
-                databaseId,
+                databaseId: dbData.uuid,
                 api,
             });
         }
@@ -227,13 +226,18 @@ const _D1Database = Resource("cloudflare::D1Database", async function (id, props
             throw migrationErr;
         }
     }
-    if (!dbData.result.uuid) {
-        // TODO(sam): why would this ever happen?
-        throw new Error("Database ID not found");
+    if (props.importFiles?.length) {
+        await Promise.all(props.importFiles.map(async (file) => {
+            await importD1Database(api, {
+                databaseId: dbData.uuid,
+                sqlData: file.sql,
+                filename: file.id,
+            });
+        }));
     }
     return {
         type: "d1",
-        id: dbData.result.uuid,
+        id: dbData.uuid,
         name: databaseName,
         readReplication: props.readReplication,
         primaryLocationHint: props.primaryLocationHint,
@@ -251,95 +255,50 @@ export async function createDatabase(api, databaseName, props) {
     const createPayload = {
         name: databaseName,
         jurisdiction: props.jurisdiction !== "default" ? props.jurisdiction : undefined,
+        primary_location_hint: props.primaryLocationHint,
     };
-    if (props.primaryLocationHint) {
-        createPayload.primary_location_hint = props.primaryLocationHint;
+    const database = await extractCloudflareResult(`create D1 database "${databaseName}"`, api.post(`/accounts/${api.accountId}/d1/database`, createPayload));
+    if (!database.uuid) {
+        // this is included in the spec as optional... why is it optional? we may never know...
+        throw new Error("Missing UUID for created database");
     }
-    const createResponse = await api.post(`/accounts/${api.accountId}/d1/database`, createPayload, {
-        headers: withJurisdiction(props),
-    });
-    if (!createResponse.ok) {
-        return await handleApiError(createResponse, "creating", "D1 database", databaseName);
+    if (props.readReplication?.mode) {
+        return await updateReadReplicationMode(api, database.uuid, props.readReplication?.mode);
     }
-    return (await createResponse.json());
+    return database;
 }
 /**
  * Get a D1 database
  */
-export async function getDatabase(api, databaseId, props = {}) {
-    if (!databaseId) {
-        throw new Error("Database ID is required");
-    }
-    const response = await api.get(`/accounts/${api.accountId}/d1/database/${databaseId}`, {
-        headers: withJurisdiction(props),
-    });
-    if (!response.ok) {
-        return await handleApiError(response, "getting", "D1 database", databaseId);
-    }
-    return (await response.json());
+export async function getDatabase(api, databaseId) {
+    return await extractCloudflareResult(`get D1 database "${databaseId}"`, api.get(`/accounts/${api.accountId}/d1/database/${databaseId}`));
 }
 /**
  * Delete a D1 database
  */
-export async function deleteDatabase(api, databaseId, props = {}) {
-    if (!databaseId) {
-        logger.log("No database ID provided, skipping delete");
-        return;
-    }
-    // Delete D1 database
-    const deleteResponse = await api.delete(`/accounts/${api.accountId}/d1/database/${databaseId}`, {
-        headers: withJurisdiction(props),
-    });
-    if (!deleteResponse.ok && deleteResponse.status !== 404) {
-        const errorData = await deleteResponse.json().catch(() => ({
-            errors: [{ message: deleteResponse.statusText }],
-        }));
-        throw new CloudflareApiError(`Error deleting D1 database '${databaseId}': ${errorData.errors?.[0]?.message || deleteResponse.statusText}`, deleteResponse);
-    }
+export async function deleteDatabase(api, databaseId) {
+    await extractCloudflareResult(`delete D1 database "${databaseId}"`, api.delete(`/accounts/${api.accountId}/d1/database/${databaseId}`));
 }
 /**
  * List all D1 databases in an account
  */
-export async function listDatabases(api, name, props = {}) {
+export async function listDatabases(api, name) {
     // Construct query string if name is provided
     const queryParams = name ? `?name=${encodeURIComponent(name)}` : "";
-    const response = await api.get(`/accounts/${api.accountId}/d1/database${queryParams}`, {
-        headers: withJurisdiction(props),
-    });
-    if (!response.ok) {
-        throw new CloudflareApiError(`Failed to list databases: ${response.statusText}`, response);
-    }
-    const data = (await response.json());
-    if (!data.success) {
-        const errorMessage = data.errors?.[0]?.message || "Unknown error";
-        throw new Error(`Failed to list databases: ${errorMessage}`);
-    }
-    // Transform API response
-    return (data.result || []).map((db) => ({
-        name: db.name,
-        id: db.uuid,
-    }));
+    // TODO(john): handle pagination (wasn't handled originally)
+    return await extractCloudflareResult(`list D1 databases${name ? ` with name "${name}"` : ""}`, api.get(`/accounts/${api.accountId}/d1/database${queryParams}`));
 }
 /**
  * Update a D1 database
  *
  * Note: According to Cloudflare API, only read_replication.mode can be modified during updates.
  */
-export async function updateDatabase(api, databaseId, props) {
-    const updatePayload = {};
-    // Only include read_replication in update payload
-    if (props.readReplication) {
-        updatePayload.read_replication = {
-            mode: props.readReplication.mode,
-        };
-    }
-    const updateResponse = await api.patch(`/accounts/${api.accountId}/d1/database/${databaseId}`, updatePayload, {
-        headers: withJurisdiction(props),
-    });
-    if (!updateResponse.ok) {
-        return await handleApiError(updateResponse, "updating", "D1 database", databaseId);
-    }
-    return (await updateResponse.json());
+export async function updateReadReplicationMode(api, databaseId, readReplicationMode) {
+    return await extractCloudflareResult(`update read replication mode for D1 database "${databaseId}"`, api.patch(`/accounts/${api.accountId}/d1/database/${databaseId}`, {
+        read_replication: {
+            mode: readReplicationMode,
+        },
+    }));
 }
 /**
  * Helper function to clone data from a source database to a target database
@@ -349,7 +308,7 @@ export async function updateDatabase(api, databaseId, props) {
  * @param sourceDb Source database specification (can be an ID, a name, or a D1Database object)
  * @param targetDbId Target database ID
  */
-async function cloneDb(api, sourceDb, targetDbId, jurisdiction) {
+async function cloneDb(api, sourceDb, targetDbId) {
     let sourceId;
     // Determine source database ID
     if ("id" in sourceDb && sourceDb.id) {
@@ -358,14 +317,12 @@ async function cloneDb(api, sourceDb, targetDbId, jurisdiction) {
     }
     else if ("name" in sourceDb && sourceDb.name) {
         // Look up ID by name
-        const databases = await listDatabases(api, sourceDb.name, {
-            jurisdiction,
-        });
+        const databases = await listDatabases(api, sourceDb.name);
         const foundDb = databases.find((db) => db.name === sourceDb.name);
         if (!foundDb) {
             throw new Error(`Source database with name '${sourceDb.name}' not found for cloning`);
         }
-        sourceId = foundDb.id;
+        sourceId = foundDb.uuid;
     }
     else if ("type" in sourceDb && sourceDb.type === "d1" && "id" in sourceDb) {
         // It's a D1Database object

package/lib/cloudflare/d1-database.js.map

@@ -1 +1 @@
-{"version":3,"file":"d1-database.js","sourceRoot":"","sources":["../../src/cloudflare/d1-database.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"d1-database.js","sourceRoot":"","sources":["../../src/cloudflare/d1-database.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EACL,mBAAmB,GAGpB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAkB,MAAM,kBAAkB,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAE/D,MAAM,wBAAwB,GAAG,eAAe,CAAC;AAgHjD,MAAM,UAAU,YAAY,CAAC,QAAa;IACxC,OAAO,QAAQ,EAAE,CAAC,YAAY,CAAC,KAAK,wBAAwB,CAAC;AAC/D,CAAC;AA8CD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2EG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,EAAU,EACV,QAAkD,EAAE;IAEpD,MAAM,CAAC,eAAe,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACvD,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,YAAY,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE;QAClE,KAAK,CAAC,WAAW;YACf,CAAC,CAAC,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC7B,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CACzC,CACF;YACH,CAAC,CAAC,EAAE;KACP,CAAC,CAAC;IAEH,OAAO,WAAW,CAAC,EAAE,EAAE;QACrB,GAAG,KAAK;QACR,eAAe;QACf,WAAW;QACX,GAAG,EAAE;YACH,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,EAAE,CAAC;YACpB,+EAA+E;YAC/E,0FAA0F;YAC1F,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK;SAC3B;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,WAAW,GAAG,QAAQ,CAC1B,wBAAwB,EACxB,KAAK,WAEH,EAAU,EACV,KAGC;IAED,MAAM,YAAY,GAChB,KAAK,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;IACvE,MAAM,YAAY,GAAG,KAAK,CAAC,YAAY,IAAI,SAAS,CAAC;IAErD,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,EAAE,IAAI,KAAK,YAAY,EAAE,CAAC;QAClE,IAAI,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;IAED,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC;IACrD,MAAM,GAAG,GAAG;QACV,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,YAAY;QAC3D,MAAM,EAAE,KAAK,CAAC,GAAG,EAAE,MAAM,IAAI,KAAK;KACnC,CAAC;IACF,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;IAE9C,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,KAAK,CAAC,eAAe,EAAE,MAAM,IAAI,KAAK,CAAC,WAAW,EAAE,MAAM,EAAE,CAAC;YAC/D,MAAM,sBAAsB,CAAC;gBAC3B,UAAU,EAAE,GAAG,CAAC,EAAE;gBAClB,eAAe,EAAE,KAAK,CAAC,eAAe,IAAI,wBAAwB;gBAClE,UAAU,EAAE,KAAK,CAAC,eAAe,IAAI,EAAE;gBACvC,OAAO,EAAE,KAAK,CAAC,WAAW,IAAI,EAAE;gBAChC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;aAC5B,CAAC,CAAC;QACL,CAAC;QACD,OAAO;YACL,IAAI,EAAE,IAAI;YACV,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE;YACzB,IAAI,EAAE,YAAY;YAClB,eAAe,EAAE,KAAK,CAAC,eAAe;YACtC,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;YAC9C,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,eAAe,EAAE,KAAK,CAAC,eAAe,IAAI,wBAAwB;YAClE,GAAG;YACH,YAAY;SACb,CAAC;IACJ,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAE7C,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC;YACxB,MAAM,sBAAsB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACrE,CAAC;QACD,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC;YAC9C,MAAM,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC5C,CAAC;QACD,kDAAkD;QAClD,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IACD,IAAI,MAAwB,CAAC;IAE7B,IACE,IAAI,CAAC,KAAK,KAAK,QAAQ;QACvB,+EAA+E;QAC/E,wEAAwE;QACxE,2EAA2E;QAC3E,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,EAChB,CAAC;QACD,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC;YAExD,yEAAyE;YACzE,IAAI,KAAK,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC/B,MAAM,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,0EAA0E;YAC1E,IACE,KAAK;gBACL,KAAK,YAAY,kBAAkB;gBACnC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EACxC,CAAC;gBACD,MAAM,CAAC,GAAG,CAAC,YAAY,YAAY,8BAA8B,CAAC,CAAC;gBACnE,qCAAqC;gBACrC,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;gBACzD,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;gBAEpE,IAAI,CAAC,UAAU,EAAE,CAAC;oBAChB,MAAM,IAAI,KAAK,CACb,qCAAqC,YAAY,gBAAgB,CAClE,CAAC;gBACJ,CAAC;gBAED,wCAAwC;gBACxC,MAAM,GAAG,MAAM,WAAW,CAAC,GAAG,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;gBAEjD,mDAAmD;gBACnD,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;oBAC1B,MAAM,GAAG,MAAM,yBAAyB,CACtC,GAAG,EACH,UAAU,CAAC,IAAI,EACf,KAAK,CAAC,eAAe,EAAE,IAAI,CAC5B,CAAC;gBACJ,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,qFAAqF;gBACrF,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;SAAM,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC;QAC3B,kDAAkD;QAClD,IACE,KAAK,CAAC,mBAAmB;YACzB,KAAK,CAAC,mBAAmB,KAAK,IAAI,CAAC,MAAM,EAAE,mBAAmB,EAC9D,CAAC;YACD,MAAM,IAAI,KAAK,CACb,2CAA2C,IAAI,CAAC,MAAM,CAAC,mBAAmB,SAAS,KAAK,CAAC,mBAAmB,4BAA4B,CACzI,CAAC;QACJ,CAAC;QACD,IACE,CAAC,KAAK,CAAC,YAAY,IAAI,SAAS,CAAC;YACjC,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,IAAI,SAAS,CAAC,EACxC,CAAC;YACD,MAAM,IAAI,KAAK,CACb,oCAAoC,IAAI,CAAC,MAAM,CAAC,YAAY,SAAS,KAAK,CAAC,YAAY,4BAA4B,CACpH,CAAC;QACJ,CAAC;QACD,0CAA0C;QAC1C,MAAM,GAAG,MAAM,yBAAyB,CACtC,GAAG,EACH,IAAI,CAAC,MAAM,CAAC,EAAE,EACd,KAAK,CAAC,eAAe,EAAE,IAAI,IAAI,UAAU,CAC1C,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,wDAAwD;QACxD,MAAM,GAAG,MAAM,cAAc,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,CAAC,CAAC;IAC1D,CAAC;IAED,6BAA6B;IAC7B,IAAI,KAAK,CAAC,eAAe,IAAI,KAAK,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9D,IAAI,CAAC;YACH,MAAM,eAAe,GACnB,KAAK,CAAC,eAAe,IAAI,wBAAwB,CAAC;YACpD,MAAM,eAAe,CAAC;gBACpB,eAAe,EAAE,KAAK,CAAC,eAAe;gBACtC,eAAe;gBACf,SAAS,EAAE,GAAG,CAAC,SAAS;gBACxB,UAAU,EAAE,MAAM,CAAC,IAAI;gBACvB,GAAG;aACJ,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,YAAY,EAAE,CAAC;YACtB,MAAM,CAAC,KAAK,CAAC,gCAAgC,EAAE,YAAY,CAAC,CAAC;YAC7D,MAAM,YAAY,CAAC;QACrB,CAAC;IACH,CAAC;IACD,IAAI,KAAK,CAAC,WAAW,EAAE,MAAM,EAAE,CAAC;QAC9B,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YACnC,MAAM,gBAAgB,CAAC,GAAG,EAAE;gBAC1B,UAAU,EAAE,MAAM,CAAC,IAAI;gBACvB,OAAO,EAAE,IAAI,CAAC,GAAG;gBACjB,QAAQ,EAAE,IAAI,CAAC,EAAE;aAClB,CAAC,CAAC;QACL,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IACD,OAAO;QACL,IAAI,EAAE,IAAI;QACV,EAAE,EAAE,MAAM,CAAC,IAAI;QACf,IAAI,EAAE,YAAY;QAClB,eAAe,EAAE,KAAK,CAAC,eAAe;QACtC,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;QAC9C,GAAG;QACH,aAAa,EAAE,KAAK,CAAC,aAAa;QAClC,eAAe,EAAE,KAAK,CAAC,eAAe,IAAI,wBAAwB;QAClE,YAAY;KACb,CAAC;AACJ,CAAC,CACF,CAAC;AAcF;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,GAAkB,EAClB,YAAoB,EACpB,KAGC;IAED,yBAAyB;IACzB,MAAM,aAAa,GAWf;QACF,IAAI,EAAE,YAAY;QAClB,YAAY,EACV,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS;QACnE,qBAAqB,EAAE,KAAK,CAAC,mBAAmB;KACjD,CAAC;IACF,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAC5C,uBAAuB,YAAY,GAAG,EACtC,GAAG,CAAC,IAAI,CAAC,aAAa,GAAG,CAAC,SAAS,cAAc,EAAE,aAAa,CAAC,CAClE,CAAC;IACF,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACnB,uFAAuF;QACvF,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACvD,CAAC;IACD,IAAI,KAAK,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC;QAChC,OAAO,MAAM,yBAAyB,CACpC,GAAG,EACH,QAAQ,CAAC,IAAI,EACb,KAAK,CAAC,eAAe,EAAE,IAAI,CAC5B,CAAC;IACJ,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,GAAkB,EAClB,UAAkB;IAElB,OAAO,MAAM,uBAAuB,CAClC,oBAAoB,UAAU,GAAG,EACjC,GAAG,CAAC,GAAG,CAAC,aAAa,GAAG,CAAC,SAAS,gBAAgB,UAAU,EAAE,CAAC,CAChE,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,GAAkB,EAClB,UAAkB;IAElB,MAAM,uBAAuB,CAC3B,uBAAuB,UAAU,GAAG,EACpC,GAAG,CAAC,MAAM,CAAC,aAAa,GAAG,CAAC,SAAS,gBAAgB,UAAU,EAAE,CAAC,CACnE,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,GAAkB,EAClB,IAAa;IAEb,6CAA6C;IAC7C,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAEpE,4DAA4D;IAC5D,OAAO,MAAM,uBAAuB,CAClC,oBAAoB,IAAI,CAAC,CAAC,CAAC,eAAe,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,EACxD,GAAG,CAAC,GAAG,CAAC,aAAa,GAAG,CAAC,SAAS,eAAe,WAAW,EAAE,CAAC,CAChE,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,GAAkB,EAClB,UAAkB,EAClB,mBAAwC;IAExC,OAAO,MAAM,uBAAuB,CAClC,iDAAiD,UAAU,GAAG,EAC9D,GAAG,CAAC,KAAK,CAAC,aAAa,GAAG,CAAC,SAAS,gBAAgB,UAAU,EAAE,EAAE;QAChE,gBAAgB,EAAE;YAChB,IAAI,EAAE,mBAAmB;SAC1B;KACF,CAAC,CACH,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,KAAK,UAAU,OAAO,CACpB,GAAkB,EAClB,QAAwD,EACxD,UAAkB;IAElB,IAAI,QAAgB,CAAC;IAErB,+BAA+B;IAC/B,IAAI,IAAI,IAAI,QAAQ,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;QACpC,2BAA2B;QAC3B,QAAQ,GAAG,QAAQ,CAAC,EAAE,CAAC;IACzB,CAAC;SAAM,IAAI,MAAM,IAAI,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC/C,qBAAqB;QACrB,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC1D,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,CAAC,CAAC;QAElE,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CACb,8BAA8B,QAAQ,CAAC,IAAI,yBAAyB,CACrE,CAAC;QACJ,CAAC;QAED,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1B,CAAC;SAAM,IAAI,MAAM,IAAI,QAAQ,IAAI,QAAQ,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC5E,2BAA2B;QAC3B,QAAQ,GAAG,QAAQ,CAAC,EAAE,CAAC;IACzB,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAC5E,CAAC;IAED,sBAAsB;IACtB,MAAM,CAAC,GAAG,CAAC,8BAA8B,QAAQ,OAAO,UAAU,EAAE,CAAC,CAAC;IACtE,MAAM,eAAe,CAAC,GAAG,EAAE;QACzB,gBAAgB,EAAE,QAAQ;QAC1B,gBAAgB,EAAE,UAAU;KAC7B,CAAC,CAAC;AACL,CAAC"}

package/lib/cloudflare/d1-local-migrations.d.ts

@@ -1,11 +1,10 @@
+import type { D1SqlFile } from "./d1-sql-file.ts";
 export interface D1LocalMigrationOptions {
     rootDir: string;
     databaseId: string;
     migrationsTable: string;
-    migrations: {
-        id: string;
-        sql: string;
-    }[];
+    migrations: Array<D1SqlFile>;
+    imports: Array<D1SqlFile>;
 }
 export declare const applyLocalD1Migrations: (options: D1LocalMigrationOptions) => Promise<void>;
 //# sourceMappingURL=d1-local-migrations.d.ts.map

package/lib/cloudflare/d1-local-migrations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"d1-local-migrations.d.ts","sourceRoot":"","sources":["../../src/cloudflare/d1-local-migrations.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC3C;AAED,eAAO,MAAM,sBAAsB,GACjC,SAAS,uBAAuB,kBA4CjC,CAAC"}
+{"version":3,"file":"d1-local-migrations.d.ts","sourceRoot":"","sources":["../../src/cloudflare/d1-local-migrations.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGlD,MAAM,WAAW,uBAAuB;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAC7B,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;CAC3B;AAED,eAAO,MAAM,sBAAsB,GACjC,SAAS,uBAAuB,kBAgFjC,CAAC"}

package/lib/cloudflare/d1-local-migrations.js

@@ -11,26 +11,54 @@ export const applyLocalD1Migrations = async (options) => {
     });
     try {
         await miniflare.ready;
-        // TODO(sam): don't use `any` once prisma is fixed upstream
         const db = await miniflare.getD1Database("DB");
         const session = db.withSession("first-primary");
-        await session
-            .prepare(`CREATE TABLE IF NOT EXISTS ${options.migrationsTable} (
+        const tableInfo = await session
+            .prepare(`PRAGMA table_info(${options.migrationsTable});`)
+            .all();
+        if (tableInfo.results.length === 0) {
+            await session
+                .prepare(`CREATE TABLE ${options.migrationsTable} (
         id INTEGER PRIMARY KEY AUTOINCREMENT,
         name TEXT NOT NULL,
-        applied_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL
+        applied_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+        type TEXT NOT NULL
     )`)
-            .run();
-        const appliedMigrations = await session
-            .prepare(`SELECT name FROM ${options.migrationsTable} ORDER BY applied_at ASC`)
+                .run();
+        }
+        else if (!tableInfo.results.some((col) => col.name === "type")) {
+            await session
+                .prepare(`ALTER TABLE ${options.migrationsTable} ADD COLUMN type TEXT NOT NULL DEFAULT 'migration';`)
+                .run();
+        }
+        const applied = await session
+            .prepare(`SELECT name, type FROM ${options.migrationsTable} ORDER BY applied_at ASC`)
             .all();
-        const insertRecord = session.prepare(`INSERT INTO ${options.migrationsTable} (name) VALUES (?)`);
-        for (const migration of options.migrations) {
-            if (appliedMigrations.results.some((m) => m.name === migration.id)) {
+        const insertRecord = session.prepare(`INSERT INTO ${options.migrationsTable} (name, type) VALUES (?, ?)`);
+        for (const { id, sql } of options.migrations) {
+            if (applied.results.some((m) => m.name === id)) {
+                continue;
+            }
+            const statements = sql
+                .split("--> statement-breakpoint")
+                .filter((s) => s.trim())
+                .map((s) => session.prepare(s));
+            statements.push(insertRecord.bind(id, "migration"));
+            await session.batch(statements);
+        }
+        for (const { id, sql, hash } of options.imports) {
+            const name = `${id}-${hash}`;
+            if (applied.results.some((m) => m.name === name)) {
                 continue;
             }
-            await session.prepare(migration.sql).run();
-            await insertRecord.bind(migration.id).run();
+            // Split into statements to prevent D1_ERROR: statement too long: SQLITE_TOOBIG.
+            // This is split naively by semicolons followed by newlines - not perfect but should work 99% of the time.
+            const statements = sql
+                .split(/;\r?\n/)
+                .filter((s) => s.trim())
+                .map((s) => session.prepare(s));
+            statements.push(insertRecord.bind(name, "import"));
+            await session.batch(statements);
         }
     }
     finally {

package/lib/cloudflare/d1-local-migrations.js.map

@@ -1 +1 @@
-{"version":3,"file":"d1-local-migrations.js","sourceRoot":"","sources":["../../src/cloudflare/d1-local-migrations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAS7D,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EACzC,OAAgC,EAChC,EAAE;IACF,MAAM,SAAS,GAAG,IAAI,EAAE,CAAC,SAAS,CAAC;QACjC,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,IAAI;QACb,kBAAkB,EAAE,qBAAqB,CAAC,OAAO,CAAC,OAAO,CAAC;QAC1D,SAAS,EAAE,IAAI;QACf,WAAW,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,UAAU,EAAE;QACvC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;KACnE,CAAC,CAAC;IACH,IAAI,CAAC;QACH,MAAM,SAAS,CAAC,KAAK,CAAC;QACtB,2DAA2D;QAC3D,MAAM,EAAE,GAAQ,MAAM,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACpD,MAAM,OAAO,GAAQ,EAAE,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QACrD,MAAM,OAAO;aACV,OAAO,CACN,8BAA8B,OAAO,CAAC,eAAe;;;;MAIvD,CACC;aACA,GAAG,EAAE,CAAC;QACT,MAAM,iBAAiB,GAEnB,MAAM,OAAO;aACd,OAAO,CACN,oBAAoB,OAAO,CAAC,eAAe,0BAA0B,CACtE;aACA,GAAG,EAAE,CAAC;QACT,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAClC,eAAe,OAAO,CAAC,eAAe,oBAAoB,CAC3D,CAAC;QACF,KAAK,MAAM,SAAS,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YAC3C,IAAI,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;gBACnE,SAAS;YACX,CAAC;YACD,MAAM,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;YAC3C,MAAM,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;QAC9C,CAAC;IACH,CAAC;YAAS,CAAC;QACT,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;IAC5B,CAAC;AACH,CAAC,CAAC"}
+{"version":3,"file":"d1-local-migrations.js","sourceRoot":"","sources":["../../src/cloudflare/d1-local-migrations.ts"],"names":[],"mappings":"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"}

package/lib/cloudflare/d1-migrations.d.ts

@@ -10,14 +10,6 @@ export interface D1MigrationOptions {
     api: CloudflareApi;
     quiet?: boolean;
 }
-/**
- * Reads migration SQL files from the migrationsDir, sorted by filename.
- * @param migrationsDir Directory containing .sql migration files
- */
-export declare function listMigrationsFiles(migrationsDir: string): Promise<Array<{
-    id: string;
-    sql: string;
-}>>;
 /**
  * Ensures the migrations table exists in the D1 database with wrangler-compatible schema.
  * Handles migration from legacy 2-column schema to 3-column schema if needed.

package/lib/cloudflare/d1-migrations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"d1-migrations.d.ts","sourceRoot":"","sources":["../../src/cloudflare/d1-migrations.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C,MAAM,WAAW,kBAAkB;IACjC,eAAe,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpD,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,aAAa,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AA6ID;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,KAAK,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC,CAsB7C;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,IAAI,CAAC,CA0Cf;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAStB;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,kBAAkB,EAC3B,GAAG,EAAE,MAAM,GACV,OAAO,CAAC;IACT,MAAM,EAAE;QACN;YACE,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YACxB,OAAO,EAAE,OAAO,CAAC;YACjB,IAAI,EAAE,GAAG,CAAC;SACX;KACF,CAAC;IACF,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC,CAgBD;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAsDf"}
+{"version":3,"file":"d1-migrations.d.ts","sourceRoot":"","sources":["../../src/cloudflare/d1-migrations.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAE9C,MAAM,WAAW,kBAAkB;IACjC,eAAe,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACpD,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,aAAa,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAmID;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,IAAI,CAAC,CA0Cf;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAStB;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,kBAAkB,EAC3B,GAAG,EAAE,MAAM,GACV,OAAO,CAAC;IACT,MAAM,EAAE;QACN;YACE,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YACxB,OAAO,EAAE,OAAO,CAAC;YACjB,IAAI,EAAE,GAAG,CAAC;SACX;KACF,CAAC;IACF,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC,CAgBD;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAsDf"}