alchemy 0.81.4 → 0.82.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/alchemy.js +1 -1
- package/lib/cloudflare/d1-database.d.ts +21 -35
- package/lib/cloudflare/d1-database.d.ts.map +1 -1
- package/lib/cloudflare/d1-database.js +57 -100
- package/lib/cloudflare/d1-database.js.map +1 -1
- package/lib/cloudflare/d1-local-migrations.d.ts +3 -4
- package/lib/cloudflare/d1-local-migrations.d.ts.map +1 -1
- package/lib/cloudflare/d1-local-migrations.js +40 -12
- package/lib/cloudflare/d1-local-migrations.js.map +1 -1
- package/lib/cloudflare/d1-migrations.d.ts +0 -8
- package/lib/cloudflare/d1-migrations.d.ts.map +1 -1
- package/lib/cloudflare/d1-migrations.js +0 -35
- package/lib/cloudflare/d1-migrations.js.map +1 -1
- package/lib/cloudflare/d1-sql-file.d.ts +12 -0
- package/lib/cloudflare/d1-sql-file.d.ts.map +1 -0
- package/lib/cloudflare/d1-sql-file.js +38 -0
- package/lib/cloudflare/d1-sql-file.js.map +1 -0
- package/lib/neon/branch.d.ts +10 -17
- package/lib/neon/branch.d.ts.map +1 -1
- package/lib/neon/branch.js +101 -0
- package/lib/neon/branch.js.map +1 -1
- package/lib/state/d1-state-store.js +8 -8
- package/lib/state/d1-state-store.js.map +1 -1
- package/package.json +1 -1
- package/src/cloudflare/d1-database.ts +125 -187
- package/src/cloudflare/d1-local-migrations.ts +56 -18
- package/src/cloudflare/d1-migrations.ts +0 -43
- package/src/cloudflare/d1-sql-file.ts +52 -0
- package/src/neon/branch.ts +134 -0
- package/src/state/d1-state-store.ts +8 -10
- package/workers/tunnel-proxy.js +1 -1
|
@@ -1,16 +1,5 @@
|
|
|
1
|
-
import { glob } from "glob";
|
|
2
|
-
import * as fs from "node:fs/promises";
|
|
3
|
-
import path from "pathe";
|
|
4
1
|
import { logger } from "../util/logger.js";
|
|
5
2
|
import { handleApiError } from "./api-error.js";
|
|
6
|
-
const getPrefix = (name) => {
|
|
7
|
-
const prefix = name.split("_")[0];
|
|
8
|
-
const num = Number.parseInt(prefix, 10);
|
|
9
|
-
return Number.isNaN(num) ? null : num;
|
|
10
|
-
};
|
|
11
|
-
async function readMigrationFile(filePath) {
|
|
12
|
-
return fs.readFile(filePath, "utf-8");
|
|
13
|
-
}
|
|
14
3
|
/**
|
|
15
4
|
* Detects the current schema of the migration table.
|
|
16
5
|
* Returns info about the table structure to determine if migration is needed.
|
|
@@ -112,30 +101,6 @@ async function migrateLegacySchema(options, schema) {
|
|
|
112
101
|
throw new Error(`Failed to migrate legacy migration table: ${error}`);
|
|
113
102
|
}
|
|
114
103
|
}
|
|
115
|
-
/**
|
|
116
|
-
* Reads migration SQL files from the migrationsDir, sorted by filename.
|
|
117
|
-
* @param migrationsDir Directory containing .sql migration files
|
|
118
|
-
*/
|
|
119
|
-
export async function listMigrationsFiles(migrationsDir) {
|
|
120
|
-
const entries = await glob("**/*.sql", {
|
|
121
|
-
cwd: migrationsDir,
|
|
122
|
-
});
|
|
123
|
-
const sqlFiles = entries.sort((a, b) => {
|
|
124
|
-
const aNum = getPrefix(a);
|
|
125
|
-
const bNum = getPrefix(b);
|
|
126
|
-
if (aNum !== null && bNum !== null)
|
|
127
|
-
return aNum - bNum;
|
|
128
|
-
if (aNum !== null)
|
|
129
|
-
return -1;
|
|
130
|
-
if (bNum !== null)
|
|
131
|
-
return 1;
|
|
132
|
-
return a.localeCompare(b);
|
|
133
|
-
});
|
|
134
|
-
return await Promise.all(sqlFiles.map(async (file) => ({
|
|
135
|
-
id: file,
|
|
136
|
-
sql: await readMigrationFile(path.join(migrationsDir, file)),
|
|
137
|
-
})));
|
|
138
|
-
}
|
|
139
104
|
/**
|
|
140
105
|
* Ensures the migrations table exists in the D1 database with wrangler-compatible schema.
|
|
141
106
|
* Handles migration from legacy 2-column schema to 3-column schema if needed.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"d1-migrations.js","sourceRoot":"","sources":["../../src/cloudflare/d1-migrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"d1-migrations.js","sourceRoot":"","sources":["../../src/cloudflare/d1-migrations.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export interface D1SqlFile {
|
|
2
|
+
id: string;
|
|
3
|
+
sql: string;
|
|
4
|
+
hash: string;
|
|
5
|
+
}
|
|
6
|
+
/**
|
|
7
|
+
* Lists SQL files from the directory, sorted by filename.
|
|
8
|
+
* @param directory Directory containing .sql files
|
|
9
|
+
*/
|
|
10
|
+
export declare function listSqlFiles(directory: string): Promise<D1SqlFile[]>;
|
|
11
|
+
export declare function readSqlFile(directory: string, name: string): Promise<D1SqlFile>;
|
|
12
|
+
//# sourceMappingURL=d1-sql-file.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"d1-sql-file.d.ts","sourceRoot":"","sources":["../../src/cloudflare/d1-sql-file.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,CAmB1E;AAED,wBAAsB,WAAW,CAC/B,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,SAAS,CAAC,CAOpB"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import crypto from "node:crypto";
|
|
2
|
+
import fs from "node:fs/promises";
|
|
3
|
+
import path from "pathe";
|
|
4
|
+
/**
|
|
5
|
+
* Lists SQL files from the directory, sorted by filename.
|
|
6
|
+
* @param directory Directory containing .sql files
|
|
7
|
+
*/
|
|
8
|
+
export async function listSqlFiles(directory) {
|
|
9
|
+
const files = await Array.fromAsync(fs.glob("**/*.sql", {
|
|
10
|
+
cwd: directory,
|
|
11
|
+
}));
|
|
12
|
+
const sortedFiles = files.sort((a, b) => {
|
|
13
|
+
const aNum = getPrefix(a);
|
|
14
|
+
const bNum = getPrefix(b);
|
|
15
|
+
if (aNum !== null && bNum !== null)
|
|
16
|
+
return aNum - bNum;
|
|
17
|
+
if (aNum !== null)
|
|
18
|
+
return -1;
|
|
19
|
+
if (bNum !== null)
|
|
20
|
+
return 1;
|
|
21
|
+
return a.localeCompare(b);
|
|
22
|
+
});
|
|
23
|
+
return Promise.all(sortedFiles.map((id) => readSqlFile(directory, id)));
|
|
24
|
+
}
|
|
25
|
+
export async function readSqlFile(directory, name) {
|
|
26
|
+
const sql = await fs.readFile(path.resolve(directory, name), "utf-8");
|
|
27
|
+
const hash = crypto.createHash("sha256").update(sql).digest("hex");
|
|
28
|
+
const file = { id: name, sql, hash };
|
|
29
|
+
// Make the sql property non-enumerable so it's not included in state. This prevents state store errors caused by large sql files.
|
|
30
|
+
Object.defineProperty(file, "sql", { enumerable: false });
|
|
31
|
+
return file;
|
|
32
|
+
}
|
|
33
|
+
const getPrefix = (name) => {
|
|
34
|
+
const prefix = name.split("_")[0];
|
|
35
|
+
const num = Number.parseInt(prefix, 10);
|
|
36
|
+
return Number.isNaN(num) ? null : num;
|
|
37
|
+
};
|
|
38
|
+
//# sourceMappingURL=d1-sql-file.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"d1-sql-file.js","sourceRoot":"","sources":["../../src/cloudflare/d1-sql-file.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,OAAO,CAAC;AAQzB;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,SAAiB;IAClD,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,SAAS,CACjC,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE;QAClB,GAAG,EAAE,SAAS;KACf,CAAC,CACH,CAAC;IAEF,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;QACtD,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QAC1B,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QAE1B,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,IAAI;YAAE,OAAO,IAAI,GAAG,IAAI,CAAC;QACvD,IAAI,IAAI,KAAK,IAAI;YAAE,OAAO,CAAC,CAAC,CAAC;QAC7B,IAAI,IAAI,KAAK,IAAI;YAAE,OAAO,CAAC,CAAC;QAE5B,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;AAC1E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,SAAiB,EACjB,IAAY;IAEZ,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;IACtE,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnE,MAAM,IAAI,GAAc,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;IAChD,kIAAkI;IAClI,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1D,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,EAAE;IACjC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAClC,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACxC,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC;AACxC,CAAC,CAAC"}
|
package/lib/neon/branch.d.ts
CHANGED
|
@@ -33,6 +33,10 @@ export interface NeonBranchProps extends NeonApiOptions {
|
|
|
33
33
|
* The timestamp must be provided in ISO 8601 format; for example: `2024-02-26T12:00:00Z`.
|
|
34
34
|
*/
|
|
35
35
|
parentTimestamp?: string;
|
|
36
|
+
/**
|
|
37
|
+
* When `true`, will adopt an existing branch by `name`.
|
|
38
|
+
*/
|
|
39
|
+
adopt?: boolean;
|
|
36
40
|
/**
|
|
37
41
|
* The timestamp when the branch is scheduled to expire and be automatically deleted.
|
|
38
42
|
* Must be set by the client following the [RFC 3339, section 5.6](https://tools.ietf.org/html/rfc3339#section-5.6) format with precision up to seconds (such as 2025-06-09T18:02:16Z).
|
|
@@ -136,22 +140,11 @@ export interface NeonBranch {
|
|
|
136
140
|
*/
|
|
137
141
|
connectionUris: NeonConnectionUri[];
|
|
138
142
|
}
|
|
139
|
-
export declare const NeonBranch: (((this: any, id: string, props?: {}) => never) & (new (_: never) => never)) | ((this: Context<NeonBranch>, id: string, props: NeonBranchProps) => Promise<
|
|
140
|
-
|
|
141
|
-
name: string;
|
|
143
|
+
export declare const NeonBranch: (((this: any, id: string, props?: {}) => never) & (new (_: never) => never)) | ((this: Context<NeonBranch>, id: string, props: NeonBranchProps) => Promise<NeonBranch>);
|
|
144
|
+
export interface NeonConnectionUriProps extends NeonApiOptions {
|
|
142
145
|
projectId: string;
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
parentTimestamp: string | undefined;
|
|
148
|
-
initSource: "schema-only" | "parent-data" | undefined;
|
|
149
|
-
createdAt: Date;
|
|
150
|
-
updatedAt: Date;
|
|
151
|
-
expiresAt: Date | undefined;
|
|
152
|
-
endpoints: neon.Endpoint[];
|
|
153
|
-
databases: neon.Database[];
|
|
154
|
-
roles: NeonRole[];
|
|
155
|
-
connectionUris: NeonConnectionUri[];
|
|
156
|
-
}>);
|
|
146
|
+
branchId: string;
|
|
147
|
+
databaseName: string;
|
|
148
|
+
roleName: string;
|
|
149
|
+
}
|
|
157
150
|
//# sourceMappingURL=branch.d.ts.map
|
package/lib/neon/branch.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"branch.d.ts","sourceRoot":"","sources":["../../src/neon/branch.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"branch.d.ts","sourceRoot":"","sources":["../../src/neon/branch.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAiB,KAAK,cAAc,EAAE,MAAM,UAAU,CAAC;AAE9D,OAAO,KAAK,KAAK,IAAI,MAAM,oBAAoB,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAIL,KAAK,iBAAiB,EACtB,KAAK,QAAQ,EACd,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,eAAgB,SAAQ,cAAc;IACrD;;;OAGG;IACH,OAAO,EAAE,MAAM,GAAG,WAAW,CAAC;IAC9B;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC;IACjD;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,aAAa,GAAG,aAAa,CAAC;IAC3C;;;;;;;;;;;;;;;;OAgBG;IACH,SAAS,EAAE,IAAI,CAAC,kCAAkC,EAAE,CAAC;CACtD;AAED,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC;;OAEG;IACH,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B;;;OAGG;IACH,eAAe,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC;;OAEG;IACH,UAAU,EAAE,aAAa,GAAG,aAAa,GAAG,SAAS,CAAC;IACtD;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,SAAS,EAAE,IAAI,CAAC;IAChB;;OAEG;IACH,SAAS,EAAE,IAAI,CAAC;IAChB;;;;OAIG;IACH,SAAS,EAAE,IAAI,GAAG,SAAS,CAAC;IAC5B;;OAEG;IACH,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B;;OAEG;IACH,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC3B;;OAEG;IACH,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB;;OAEG;IACH,cAAc,EAAE,iBAAiB,EAAE,CAAC;CACrC;AAED,eAAO,MAAM,UAAU,yFAGb,OAAO,CAAC,UAAU,CAAC,MACrB,MAAM,SACH,eAAe,yBAuIzB,CAAC;AA2GF,MAAM,WAAW,sBAAuB,SAAQ,cAAc;IAC5D,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;CAClB"}
|
package/lib/neon/branch.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { alchemy } from "../alchemy.js";
|
|
1
2
|
import { Resource } from "../resource.js";
|
|
2
3
|
import { createNeonApi } from "./api.js";
|
|
3
4
|
import { formatConnectionUri, formatRole, waitForOperations, } from "./utils.js";
|
|
@@ -27,6 +28,17 @@ export const NeonBranch = Resource("neon::Branch", async function (id, props) {
|
|
|
27
28
|
return this.destroy();
|
|
28
29
|
}
|
|
29
30
|
case "create": {
|
|
31
|
+
if (this.scope.adopt || props.adopt) {
|
|
32
|
+
try {
|
|
33
|
+
return await fetchBranch(api, { ...props, projectId, name });
|
|
34
|
+
}
|
|
35
|
+
catch (error) {
|
|
36
|
+
if (!(error instanceof NeonBranchNotFound)) {
|
|
37
|
+
throw error;
|
|
38
|
+
}
|
|
39
|
+
// branch not found, continue with creation
|
|
40
|
+
}
|
|
41
|
+
}
|
|
30
42
|
const { data } = await api.createProjectBranch({
|
|
31
43
|
path: {
|
|
32
44
|
project_id: projectId,
|
|
@@ -109,4 +121,93 @@ export const NeonBranch = Resource("neon::Branch", async function (id, props) {
|
|
|
109
121
|
}
|
|
110
122
|
}
|
|
111
123
|
});
|
|
124
|
+
async function fetchBranch(api, props) {
|
|
125
|
+
const branchList = [];
|
|
126
|
+
let branchesResponse = await api.listProjectBranches({
|
|
127
|
+
path: { project_id: props.projectId },
|
|
128
|
+
query: {
|
|
129
|
+
search: props.name,
|
|
130
|
+
},
|
|
131
|
+
});
|
|
132
|
+
branchList.push(...(branchesResponse.data?.branches ?? []));
|
|
133
|
+
while (branchesResponse.data?.pagination?.next) {
|
|
134
|
+
branchesResponse = await api.listProjectBranches({
|
|
135
|
+
path: { project_id: props.projectId },
|
|
136
|
+
query: {
|
|
137
|
+
search: props.name,
|
|
138
|
+
cursor: branchesResponse.data.pagination.next,
|
|
139
|
+
},
|
|
140
|
+
});
|
|
141
|
+
branchList.push(...(branchesResponse.data?.branches ?? []));
|
|
142
|
+
}
|
|
143
|
+
const branchesMatchingName = branchList.filter((b) => b.name === props.name);
|
|
144
|
+
if (branchesMatchingName.length === 0) {
|
|
145
|
+
throw new NeonBranchNotFound(props.name);
|
|
146
|
+
}
|
|
147
|
+
if (branchesMatchingName.length > 1) {
|
|
148
|
+
throw new Error(`Multiple branches found with name "${props.name}". Name must be unique when adopting a branch.`);
|
|
149
|
+
}
|
|
150
|
+
const branch = branchesMatchingName[0];
|
|
151
|
+
const databases = await api.listProjectBranchDatabases({
|
|
152
|
+
path: {
|
|
153
|
+
branch_id: branch.id,
|
|
154
|
+
project_id: props.projectId,
|
|
155
|
+
},
|
|
156
|
+
});
|
|
157
|
+
const endpoints = await api.listProjectBranchEndpoints({
|
|
158
|
+
path: { project_id: props.projectId, branch_id: branch.id },
|
|
159
|
+
});
|
|
160
|
+
const roles = await api.listProjectBranchRoles({
|
|
161
|
+
path: {
|
|
162
|
+
project_id: props.projectId,
|
|
163
|
+
branch_id: branch.id,
|
|
164
|
+
},
|
|
165
|
+
});
|
|
166
|
+
const connectionUris = await Promise.all(databases.data.databases.map((database) => api
|
|
167
|
+
.getConnectionUri({
|
|
168
|
+
path: { project_id: props.projectId },
|
|
169
|
+
query: {
|
|
170
|
+
branch_id: branch.id,
|
|
171
|
+
database_name: database.name,
|
|
172
|
+
role_name: database.owner_name,
|
|
173
|
+
pooled: false,
|
|
174
|
+
},
|
|
175
|
+
})
|
|
176
|
+
.then((res) => {
|
|
177
|
+
const url = new URL(res.data.uri);
|
|
178
|
+
return {
|
|
179
|
+
connection_uri: alchemy.secret(res.data.uri),
|
|
180
|
+
connection_parameters: {
|
|
181
|
+
database: database.name,
|
|
182
|
+
host: url.host,
|
|
183
|
+
port: 5432,
|
|
184
|
+
user: url.username,
|
|
185
|
+
password: alchemy.secret(url.password),
|
|
186
|
+
},
|
|
187
|
+
};
|
|
188
|
+
})));
|
|
189
|
+
return {
|
|
190
|
+
id: branch.id,
|
|
191
|
+
projectId: branch.project_id,
|
|
192
|
+
createdAt: new Date(branch.created_at),
|
|
193
|
+
updatedAt: new Date(branch.updated_at),
|
|
194
|
+
expiresAt: branch.expires_at ? new Date(branch.expires_at) : undefined,
|
|
195
|
+
initSource: branch.init_source,
|
|
196
|
+
name: branch.name,
|
|
197
|
+
protected: branch.protected,
|
|
198
|
+
default: branch.default,
|
|
199
|
+
parentBranchId: branch.parent_id,
|
|
200
|
+
parentTimestamp: branch.parent_timestamp,
|
|
201
|
+
parentLsn: branch.parent_lsn,
|
|
202
|
+
roles: roles.data.roles.map(formatRole),
|
|
203
|
+
endpoints: endpoints.data.endpoints,
|
|
204
|
+
databases: databases.data.databases,
|
|
205
|
+
connectionUris,
|
|
206
|
+
};
|
|
207
|
+
}
|
|
208
|
+
class NeonBranchNotFound extends Error {
|
|
209
|
+
constructor(name) {
|
|
210
|
+
super(`Branch ${name} not found`);
|
|
211
|
+
}
|
|
212
|
+
}
|
|
112
213
|
//# sourceMappingURL=branch.js.map
|
package/lib/neon/branch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"branch.js","sourceRoot":"","sources":["../../src/neon/branch.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"branch.js","sourceRoot":"","sources":["../../src/neon/branch.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,10 +44,11 @@ const createDatabaseClient = memoize(async (options) => {
|
|
|
44
44
|
});
|
|
45
45
|
const upsertDatabase = async (api, databaseName) => {
|
|
46
46
|
const { listDatabases, createDatabase } = await import("../cloudflare/d1-database.js");
|
|
47
|
-
const {
|
|
47
|
+
const { listSqlFiles } = await import("../cloudflare/d1-sql-file.js");
|
|
48
|
+
const { applyMigrations } = await import("../cloudflare/d1-migrations.js");
|
|
48
49
|
const migrate = async (databaseId) => {
|
|
49
50
|
await applyMigrations({
|
|
50
|
-
migrationsFiles: await
|
|
51
|
+
migrationsFiles: await listSqlFiles(MIGRATIONS_DIRECTORY),
|
|
51
52
|
migrationsTable: "migrations",
|
|
52
53
|
accountId: api.accountId,
|
|
53
54
|
databaseId,
|
|
@@ -57,18 +58,17 @@ const upsertDatabase = async (api, databaseName) => {
|
|
|
57
58
|
};
|
|
58
59
|
const databases = await listDatabases(api, databaseName);
|
|
59
60
|
if (databases[0]) {
|
|
60
|
-
await migrate(databases[0].
|
|
61
|
+
await migrate(databases[0].uuid);
|
|
61
62
|
return {
|
|
62
|
-
id: databases[0].
|
|
63
|
+
id: databases[0].uuid,
|
|
63
64
|
};
|
|
64
65
|
}
|
|
65
|
-
const
|
|
66
|
+
const database = await createDatabase(api, databaseName, {
|
|
66
67
|
readReplication: { mode: "disabled" },
|
|
67
68
|
});
|
|
68
|
-
|
|
69
|
-
await migrate(res.result.uuid);
|
|
69
|
+
await migrate(database.uuid);
|
|
70
70
|
return {
|
|
71
|
-
id:
|
|
71
|
+
id: database.uuid,
|
|
72
72
|
};
|
|
73
73
|
};
|
|
74
74
|
//# sourceMappingURL=d1-state-store.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"d1-state-store.js","sourceRoot":"","sources":["../../src/state/d1-state-store.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EACL,mBAAmB,GAGpB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAM7C;;GAEG;AACH,MAAM,OAAO,YAAa,SAAQ,eAAe;IAGrC;IAFV,YACE,KAAY,EACJ,UAA+B,EAAE;QAEzC,KAAK,CAAC,KAAK,CAAC,CAAC;QAFL,YAAO,GAAP,OAAO,CAA0B;IAG3C,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,EAAE,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACpD,MAAM,EAAE,0BAA0B,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC;QACvE,MAAM,UAAU,GAAG,IAAI,0BAA0B,CAAC,EAAE,EAAE;YACpD,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK;SACxB,CAAC,CAAC;QACH,OAAO,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC9C,CAAC;CACF;AAED,MAAM,oBAAoB,GAAG,OAAO,CAAC,KAAK,EAAE,OAA4B,EAAE,EAAE;IAC1E,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,UAAU,CAClC,MAAM,CAAC,0BAA0B,CAAC,EAClC,cAAc,CACf,CAAC;IACF,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,MAAM,cAAc,CACnC,GAAG,EACH,OAAO,CAAC,YAAY,IAAI,eAAe,CACxC,CAAC;IACF,MAAM,cAAc,GAAmB,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE;QAC3D,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,uBAAuB,CAK5C,kBAAkB,EAClB,GAAG,CAAC,IAAI,CACN,aAAa,GAAG,CAAC,SAAS,gBAAgB,QAAQ,CAAC,EAAE,MAAM,EAC3D,EAAE,GAAG,EAAE,MAAM,EAAE,EACf;YACE,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;SACF,CACF,CACF,CAAC;QACF,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;QACjC,OAAO;YACL,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;SACzC,CAAC;IACJ,CAAC,CAAC;IACF,OAAO,OAAO,CAAC,cAAc,EAAE;QAC7B,MAAM,EAAE,MAAM,MAAM,CAAC,aAAa,CAAC;KACpC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,MAAM,cAAc,GAAG,KAAK,EAAE,GAAkB,EAAE,YAAoB,EAAE,EAAE;IACxE,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CACpD,8BAA8B,CAC/B,CAAC;IACF,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"d1-state-store.js","sourceRoot":"","sources":["../../src/state/d1-state-store.ts"],"names":[],"mappings":"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"}
|