layerbase 1.2.1 → 1.4.0
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/README.md +68 -1
- package/dist/cli.js +64 -4
- package/dist/cli.js.map +1 -1
- package/dist/commands/import.js +34 -18
- package/dist/commands/import.js.map +1 -1
- package/dist/commands/interactive.js +13 -5
- package/dist/commands/interactive.js.map +1 -1
- package/dist/commands/ls.js +14 -1
- package/dist/commands/ls.js.map +1 -1
- package/dist/commands/promote.js +289 -0
- package/dist/commands/promote.js.map +1 -0
- package/dist/lib/cloud-api.js +22 -2
- package/dist/lib/cloud-api.js.map +1 -1
- package/dist/lib/commands.js +11 -0
- package/dist/lib/commands.js.map +1 -1
- package/dist/lib/confirm.js +10 -0
- package/dist/lib/confirm.js.map +1 -1
- package/dist/lib/database-list.js +49 -0
- package/dist/lib/database-list.js.map +1 -0
- package/dist/lib/env-file.js +70 -0
- package/dist/lib/env-file.js.map +1 -0
- package/dist/lib/promote-source.js +319 -0
- package/dist/lib/promote-source.js.map +1 -0
- package/dist/lib/run-spindb.js +98 -13
- package/dist/lib/run-spindb.js.map +1 -1
- package/dist/ui/app.js.map +1 -1
- package/package.json +1 -1
- package/skills/layerbase/SKILL.md +8 -0
package/README.md
CHANGED
|
@@ -33,6 +33,7 @@ This installs two commands, `layerbase` and a shorter `lbase`. For a two-letter
|
|
|
33
33
|
lbase # spindb's interactive menu (local databases)
|
|
34
34
|
lbase create my-db --engine postgres # any spindb command, verbatim
|
|
35
35
|
lbase login # sign in through your browser
|
|
36
|
+
lbase promote ./app.db # put a local database in the cloud, data included
|
|
36
37
|
lbase cloud ls # list your cloud databases
|
|
37
38
|
lbase psql my-cloud-db # connect with the right client, no password typed
|
|
38
39
|
```
|
|
@@ -68,7 +69,7 @@ These are the only verbs layerbase owns; everything else is spindb.
|
|
|
68
69
|
| `lbase login --api-key <key>` | Save a personal `sk_` API key for headless use (no browser). |
|
|
69
70
|
| `lbase logout` | Remove the stored credentials. |
|
|
70
71
|
| `lbase whoami` | Show the signed-in account (and API-key usage in key mode) (`--json`). |
|
|
71
|
-
| `lbase cloud ls` | List your cloud databases (`--json` for scripting). |
|
|
72
|
+
| `lbase cloud ls` | List your cloud databases and branches (`--json` for scripting). |
|
|
72
73
|
| `lbase cloud create <name> --engine <e> [--ttl 2h]` | Provision a database (`--ttl` makes it transient). |
|
|
73
74
|
| `lbase cloud delete <db> --yes` | Delete a database (`--yes`/`-y` to skip the prompt). |
|
|
74
75
|
| `lbase cloud start <db>` / `stop <db>` | Start or stop a database. |
|
|
@@ -82,6 +83,7 @@ These are the only verbs layerbase owns; everything else is spindb.
|
|
|
82
83
|
| `lbase psql <db>` | Connect to a cloud Postgres-family database. |
|
|
83
84
|
| `lbase redis-cli <db>` | Connect to a cloud Redis / Valkey database. |
|
|
84
85
|
| `lbase mysql <db>` | Connect to a cloud MySQL / MariaDB database. |
|
|
86
|
+
| `lbase promote <file-or-container>` | Create a cloud database from a local file or spindb container, data included. |
|
|
85
87
|
| `lbase migrate --source <id> --target <db>` | Migrate an external database into a cloud database. |
|
|
86
88
|
| `lbase import <dumpfile> --target <db>` | Import a dump file into a cloud database. |
|
|
87
89
|
| `lbase agent init [--global]` | Install the Layerbase skill for AI coding agents. |
|
|
@@ -90,11 +92,76 @@ These are the only verbs layerbase owns; everything else is spindb.
|
|
|
90
92
|
|
|
91
93
|
`<db>` accepts a cloud database id or its name. Add `--print` to
|
|
92
94
|
`cloud connect` to show the connection details instead of launching a client.
|
|
95
|
+
|
|
96
|
+
`cloud ls` lists databases **and their branches** in one table. When the account
|
|
97
|
+
has branches, a `PARENT` column names each branch's parent database (`-` on a
|
|
98
|
+
primary) and a footer splits the rows, because branches do not count toward your
|
|
99
|
+
plan's database limit: never read the row count as your database count. In
|
|
100
|
+
`--json`, a branch is any row with `parentId` set (`parentName` names its
|
|
101
|
+
parent); rows are passed through from the API untouched.
|
|
93
102
|
`lbase cloud` with no subcommand prints the cloud help. Cloud mutation commands
|
|
94
103
|
(`create`, `delete`, `start`, `stop`, `branch`) run against the cloud API and
|
|
95
104
|
need an API key (see [Headless auth](#headless-auth-ci-and-agents)); every one
|
|
96
105
|
supports `--json` and returns a meaningful exit code.
|
|
97
106
|
|
|
107
|
+
## Promote a local database to the cloud
|
|
108
|
+
|
|
109
|
+
`lbase promote` is the graduation path for a prototype: it creates a **new**
|
|
110
|
+
cloud database sized to the source, imports the data, and prints the connection
|
|
111
|
+
string. One command instead of create, dump, and import.
|
|
112
|
+
|
|
113
|
+
```bash
|
|
114
|
+
lbase promote ./app.db # SQLite file
|
|
115
|
+
lbase promote ./analytics.duckdb # DuckDB file
|
|
116
|
+
lbase promote ./dump.sql # Postgres-dialect SQL dump
|
|
117
|
+
lbase promote my-local-pg # a local spindb container
|
|
118
|
+
lbase promote ./app.db --write-env --yes # and rewrite DATABASE_URL in ./.env
|
|
119
|
+
```
|
|
120
|
+
|
|
121
|
+
The source is **detected, never guessed**: binary files are identified by their
|
|
122
|
+
header (a `.db` that is really a DuckDB file is treated as DuckDB), `.sql` is a
|
|
123
|
+
Postgres-dialect dump, and a bare name is looked up against your local spindb
|
|
124
|
+
containers. Anything ambiguous fails with an actionable message; `--from
|
|
125
|
+
pglite|sqlite|duckdb|sql|spindb` forces the kind.
|
|
126
|
+
|
|
127
|
+
| Source | Cloud target |
|
|
128
|
+
| --- | --- |
|
|
129
|
+
| SQLite file (`.db`, `.sqlite`, `.sqlite3`) | `sqlite` (SQLite storage behind the Postgres wire) |
|
|
130
|
+
| DuckDB file (`.duckdb`) | `duckdb` |
|
|
131
|
+
| SQL dump (`.sql`), PGlite dump | `postgresql` |
|
|
132
|
+
| spindb container | the same engine in the cloud |
|
|
133
|
+
|
|
134
|
+
`--target libsql` is accepted but currently refused: cloud libSQL restores from a
|
|
135
|
+
data-directory archive, not from a SQLite file, so there is no path that puts a
|
|
136
|
+
local `.db` into it yet. Use the default (`--target pgsqlite`), or
|
|
137
|
+
`lbase migrate --source turso` for an already-hosted libSQL database.
|
|
138
|
+
Desktop-only engines (MongoDB, CockroachDB, SurrealDB) are refused with the
|
|
139
|
+
licensing reason and the closest cloud alternative, and a spindb engine whose
|
|
140
|
+
local backup format the cloud import endpoint cannot restore is refused with a
|
|
141
|
+
pointer at `lbase migrate`. Every refusal happens **before** anything is created,
|
|
142
|
+
so an unsupported source never leaves an empty database behind.
|
|
143
|
+
|
|
144
|
+
**PGlite data directories** are not supported directly (that would put several MB
|
|
145
|
+
of WASM in every install). Dump the directory first and promote the `.sql`:
|
|
146
|
+
|
|
147
|
+
```js
|
|
148
|
+
const db = await PGlite.create('./pgdata') // @electric-sql/pglite
|
|
149
|
+
const dump = await pgDump({ pg: db }) // @electric-sql/pglite-tools/pg_dump
|
|
150
|
+
await writeFile('./dump.sql', await dump.text()) // node:fs/promises
|
|
151
|
+
```
|
|
152
|
+
|
|
153
|
+
```bash
|
|
154
|
+
lbase promote ./dump.sql
|
|
155
|
+
```
|
|
156
|
+
|
|
157
|
+
`--write-env` is opt-in: it rewrites `DATABASE_URL` in `./.env` (creating the
|
|
158
|
+
file when missing), leaves every other line untouched, ignores commented-out
|
|
159
|
+
assignments, and prints what it did. `--json` prints one result object with the
|
|
160
|
+
database, the connection string, the dashboard URL, and the bytes uploaded.
|
|
161
|
+
`--name` overrides the derived database name. If the import fails after the
|
|
162
|
+
database is created, promote says the database exists and is empty and prints the
|
|
163
|
+
exact retry and delete commands; it never deletes anything on your behalf.
|
|
164
|
+
|
|
98
165
|
## Migrations and imports
|
|
99
166
|
|
|
100
167
|
`lbase migrate` imports an external database **into an existing cloud database**,
|
package/dist/cli.js
CHANGED
|
@@ -17,6 +17,7 @@ import { runBranch } from './commands/cloud-branch.js';
|
|
|
17
17
|
import { runAgentInit } from './commands/agent-init.js';
|
|
18
18
|
import { runMigrate } from './commands/migrate.js';
|
|
19
19
|
import { runImport } from './commands/import.js';
|
|
20
|
+
import { runPromote } from './commands/promote.js';
|
|
20
21
|
const VERSION = getVersion();
|
|
21
22
|
const UNIFIED_HELP = `
|
|
22
23
|
Layerbase ${VERSION} - local-first database CLI (also as lbase)
|
|
@@ -38,6 +39,7 @@ const UNIFIED_HELP = `
|
|
|
38
39
|
cloud clone <db> [name] Clone a cloud database into local spindb
|
|
39
40
|
cloud connection-string <db> Print the connection string (reveals password)
|
|
40
41
|
psql / mysql / redis-cli <db> Connect to a cloud database by engine
|
|
42
|
+
promote <file-or-container> Put a local database in the cloud, data included
|
|
41
43
|
migrate --source <s> --target <db> Import an external database into a cloud DB
|
|
42
44
|
import <dumpfile> --target <db> Import a dump file into a cloud database
|
|
43
45
|
agent init [--global] Install the Layerbase skill for AI agents
|
|
@@ -58,6 +60,7 @@ const UNIFIED_HELP = `
|
|
|
58
60
|
$ lbase # spindb's interactive menu
|
|
59
61
|
$ lbase create my-db --engine sqlite
|
|
60
62
|
$ lbase login
|
|
63
|
+
$ lbase promote ./app.db --write-env
|
|
61
64
|
$ lbase cloud ls --json
|
|
62
65
|
$ LAYERBASE_API_KEY=sk_... lbase cloud create ci-db --engine postgresql --ttl 2h
|
|
63
66
|
$ lbase psql my-cloud-db
|
|
@@ -134,6 +137,52 @@ const IMPORT_HELP = `
|
|
|
134
137
|
very large files; the server enforces the hard size cap. --json prints a final
|
|
135
138
|
{ ok, message, database, engine, bytesUploaded } result.
|
|
136
139
|
`;
|
|
140
|
+
const PROMOTE_HELP = `
|
|
141
|
+
layerbase promote - put a local database in the cloud, data included
|
|
142
|
+
|
|
143
|
+
layerbase promote <file-or-container> [--target pgsqlite] [--name <db>]
|
|
144
|
+
[--from <kind>] [--write-env] [--yes] [--json]
|
|
145
|
+
|
|
146
|
+
It creates a NEW cloud database sized to the source, imports the data, and
|
|
147
|
+
prints the connection string. One command instead of create + dump + import.
|
|
148
|
+
|
|
149
|
+
Sources (detected from the argument, never guessed)
|
|
150
|
+
./app.db, ./app.sqlite, ./app.sqlite3 SQLite file (verified by its header)
|
|
151
|
+
./analytics.duckdb DuckDB file (verified by its header)
|
|
152
|
+
./dump.sql Postgres-dialect SQL dump
|
|
153
|
+
my-local-pg a local spindb container, dumped
|
|
154
|
+
with spindb's own backup command
|
|
155
|
+
--from pglite ./dump.sql a PGlite dump (see below)
|
|
156
|
+
|
|
157
|
+
Targets
|
|
158
|
+
SQLite sources land on the cloud SQLite engine (SQLite storage behind the
|
|
159
|
+
Postgres wire, so psql and every Postgres driver work). --target libsql is
|
|
160
|
+
accepted but refused for now: libSQL restores from a data-directory archive,
|
|
161
|
+
not from a SQLite file. DuckDB -> DuckDB, SQL dumps and PGlite -> PostgreSQL,
|
|
162
|
+
a spindb container -> the same engine in the cloud. Desktop-only engines
|
|
163
|
+
(MongoDB, CockroachDB, SurrealDB) are refused with the licensing reason and
|
|
164
|
+
the closest cloud alternative.
|
|
165
|
+
|
|
166
|
+
PGlite data directories
|
|
167
|
+
Not supported directly (that would ship several MB of WASM in every
|
|
168
|
+
install). Dump the directory first with @electric-sql/pglite-tools' pgDump
|
|
169
|
+
and promote the resulting .sql; promote prints the snippet if you point it
|
|
170
|
+
at a directory.
|
|
171
|
+
|
|
172
|
+
Flags
|
|
173
|
+
--name <db> name the cloud database (default: the file or container name)
|
|
174
|
+
--target <t> pgsqlite (default) or libsql, for SQLite sources
|
|
175
|
+
--from <kind> force the source kind: pglite, sqlite, duckdb, sql, spindb
|
|
176
|
+
--write-env rewrite DATABASE_URL in ./.env (opt-in, creates the file if
|
|
177
|
+
missing, never touches other lines)
|
|
178
|
+
--yes (-y) skip the confirmation prompt
|
|
179
|
+
--json print one machine-readable result object
|
|
180
|
+
|
|
181
|
+
Needs a Layerbase API key (LAYERBASE_API_KEY, --api-key, or a browser login
|
|
182
|
+
that cached one). If the import fails after the database is created, promote
|
|
183
|
+
says so, leaves the empty database in place, and prints the exact retry and
|
|
184
|
+
delete commands rather than deleting anything itself.
|
|
185
|
+
`;
|
|
137
186
|
function printHelp() {
|
|
138
187
|
process.stdout.write(`${UNIFIED_HELP}\n`);
|
|
139
188
|
}
|
|
@@ -263,9 +312,13 @@ const cli = meow(UNIFIED_HELP, {
|
|
|
263
312
|
yes: { type: 'boolean', default: false, shortFlag: 'y' },
|
|
264
313
|
force: { type: 'boolean', default: false },
|
|
265
314
|
global: { type: 'boolean', default: false },
|
|
266
|
-
// migrate / import flags.
|
|
315
|
+
// migrate / import / promote flags.
|
|
267
316
|
source: { type: 'string' },
|
|
268
317
|
target: { type: 'string' },
|
|
318
|
+
// promote-only flags.
|
|
319
|
+
from: { type: 'string' },
|
|
320
|
+
name: { type: 'string' },
|
|
321
|
+
writeEnv: { type: 'boolean', default: false },
|
|
269
322
|
sourceDb: { type: 'string' },
|
|
270
323
|
connectionString: { type: 'string' },
|
|
271
324
|
sourceKey: { type: 'string' },
|
|
@@ -280,9 +333,9 @@ const cli = meow(UNIFIED_HELP, {
|
|
|
280
333
|
dbPassword: { type: 'string' },
|
|
281
334
|
},
|
|
282
335
|
});
|
|
283
|
-
// The --api-key flag wins over LAYERBASE_API_KEY and the stored key
|
|
284
|
-
// before any cloud command runs.
|
|
285
|
-
configureCloudAuth({ apiKey: cli.flags.apiKey });
|
|
336
|
+
// The --api-key flag wins over LAYERBASE_API_KEY and the stored key, and
|
|
337
|
+
// --api-url over the stored host. Set once before any cloud command runs.
|
|
338
|
+
configureCloudAuth({ apiKey: cli.flags.apiKey, apiUrl: cli.flags.apiUrl });
|
|
286
339
|
const EXEC_COMMANDS = new Set(['psql', 'redis-cli', 'mysql']);
|
|
287
340
|
const [command = '', ...rest] = cli.input;
|
|
288
341
|
if (command === 'help') {
|
|
@@ -331,6 +384,13 @@ else if (command === 'import') {
|
|
|
331
384
|
}
|
|
332
385
|
process.exit(await runImport({ args: rest, flags: cli.flags }));
|
|
333
386
|
}
|
|
387
|
+
else if (command === 'promote') {
|
|
388
|
+
if (wantsHelp(rest)) {
|
|
389
|
+
process.stdout.write(`${PROMOTE_HELP}\n`);
|
|
390
|
+
process.exit(0);
|
|
391
|
+
}
|
|
392
|
+
process.exit(await runPromote({ args: rest, flags: cli.flags }));
|
|
393
|
+
}
|
|
334
394
|
else if (command === 'cloud') {
|
|
335
395
|
await runCloud(rest, cli.flags);
|
|
336
396
|
}
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.tsx"],"names":[],"mappings":";AAAA,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AAC5B,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AAC9B,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EACL,SAAS,EACT,UAAU,EACV,QAAQ,EACR,OAAO,GACR,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.tsx"],"names":[],"mappings":"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"}
|
package/dist/commands/import.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { readFileSync, statSync } from 'node:fs';
|
|
2
2
|
import { importFromR2, listDatabases, presignImport, resolveDatabaseId, uploadToPresignedUrl, } from '../lib/cloud-api.js';
|
|
3
|
-
import { confirm } from '../lib/confirm.js';
|
|
3
|
+
import { confirm, decideConfirmation } from '../lib/confirm.js';
|
|
4
4
|
import { reportError, writeJson } from '../lib/cli-output.js';
|
|
5
5
|
// Warn (not block) above this size; the cloud enforces its own hard cap and
|
|
6
6
|
// returns the authoritative maxBytes from the presign call.
|
|
7
7
|
const LARGE_FILE_WARN_BYTES = 50 * 1024 * 1024;
|
|
8
|
-
function formatBytes(bytes) {
|
|
8
|
+
export function formatBytes(bytes) {
|
|
9
9
|
if (bytes < 1024)
|
|
10
10
|
return `${bytes} B`;
|
|
11
11
|
const units = ['KB', 'MB', 'GB', 'TB'];
|
|
@@ -17,6 +17,21 @@ function formatBytes(bytes) {
|
|
|
17
17
|
}
|
|
18
18
|
return `${value.toFixed(1)} ${units[unit]}`;
|
|
19
19
|
}
|
|
20
|
+
// The shipped import path, factored out so `promote` restores through EXACTLY
|
|
21
|
+
// the same presign -> PUT -> restore sequence as `layerbase import` instead of
|
|
22
|
+
// growing a second one. The caller owns validation, confirmation, and output;
|
|
23
|
+
// `onProgress` is how it renders the two long steps.
|
|
24
|
+
export async function uploadAndImport(options) {
|
|
25
|
+
const { filePath, size, targetId, onProgress } = options;
|
|
26
|
+
const presign = await presignImport(targetId);
|
|
27
|
+
if (size > presign.maxBytes) {
|
|
28
|
+
throw new Error(`File too large: ${formatBytes(size)}. Maximum import size is ${formatBytes(presign.maxBytes)}.`);
|
|
29
|
+
}
|
|
30
|
+
onProgress?.('Uploading dump...');
|
|
31
|
+
await uploadToPresignedUrl(presign.uploadUrl, readFileSync(filePath));
|
|
32
|
+
onProgress?.('Restoring...');
|
|
33
|
+
return importFromR2({ targetId, r2Key: presign.r2Key });
|
|
34
|
+
}
|
|
20
35
|
// `layerbase import <dumpfile> --target <db-id-or-name> [--yes] [--json]`
|
|
21
36
|
export async function runImport(options) {
|
|
22
37
|
const { args, flags } = options;
|
|
@@ -58,11 +73,15 @@ export async function runImport(options) {
|
|
|
58
73
|
process.stdout.write(`Import ${filePath} (${formatBytes(size)}) into ${targetName}.\n` +
|
|
59
74
|
' This restores the dump over the target and may overwrite existing data.\n');
|
|
60
75
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
76
|
+
const decision = decideConfirmation({
|
|
77
|
+
yes: flags.yes ?? false,
|
|
78
|
+
interactive,
|
|
79
|
+
});
|
|
80
|
+
if (decision === 'refuse') {
|
|
81
|
+
process.stderr.write('Refusing to import without confirmation. Pass --yes (-y) to run non-interactively.\n');
|
|
82
|
+
return 1;
|
|
83
|
+
}
|
|
84
|
+
if (decision === 'prompt') {
|
|
66
85
|
const ok = await confirm('Import this dump?');
|
|
67
86
|
if (!ok) {
|
|
68
87
|
process.stdout.write('Aborted.\n');
|
|
@@ -70,17 +89,14 @@ export async function runImport(options) {
|
|
|
70
89
|
}
|
|
71
90
|
}
|
|
72
91
|
// 3. Presign, size-check against the authoritative cloud cap, upload, import.
|
|
73
|
-
const
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
if (!json)
|
|
82
|
-
process.stdout.write('Restoring...\n');
|
|
83
|
-
const result = await importFromR2({ targetId, r2Key: presign.r2Key });
|
|
92
|
+
const result = await uploadAndImport({
|
|
93
|
+
filePath,
|
|
94
|
+
size,
|
|
95
|
+
targetId,
|
|
96
|
+
onProgress: json
|
|
97
|
+
? undefined
|
|
98
|
+
: (message) => process.stdout.write(`${message}\n`),
|
|
99
|
+
});
|
|
84
100
|
if (json) {
|
|
85
101
|
writeJson({ ok: true, ...result });
|
|
86
102
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import.js","sourceRoot":"","sources":["../../src/commands/import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAChD,OAAO,EACL,YAAY,EACZ,aAAa,EACb,aAAa,EACb,iBAAiB,EACjB,oBAAoB,GACrB,MAAM,iBAAiB,CAAA;AAExB,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"import.js","sourceRoot":"","sources":["../../src/commands/import.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ import { loadCredentials } from '../lib/config.js';
|
|
|
8
8
|
import { decodeTokenClaims } from '../lib/token.js';
|
|
9
9
|
import { resolveInput, availableCommands } from '../lib/commands.js';
|
|
10
10
|
import { listDatabases } from '../lib/cloud-api.js';
|
|
11
|
+
import { branchHint } from '../lib/database-list.js';
|
|
11
12
|
import { runSpindb } from '../lib/run-spindb.js';
|
|
12
13
|
import { connectToDatabase } from '../commands/connect.js';
|
|
13
14
|
import { runClone } from '../commands/clone.js';
|
|
@@ -47,11 +48,18 @@ async function promptOnce(creds) {
|
|
|
47
48
|
return raw ?? '/quit';
|
|
48
49
|
}
|
|
49
50
|
async function pickDatabase(databases) {
|
|
50
|
-
const items = databases.map((db) =>
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
51
|
+
const items = databases.map((db) => {
|
|
52
|
+
// A branch and its parent can look identical here (same engine, same
|
|
53
|
+
// status), so name the parent when the row is a branch.
|
|
54
|
+
const branch = branchHint(db);
|
|
55
|
+
return {
|
|
56
|
+
label: db.name,
|
|
57
|
+
value: db.id,
|
|
58
|
+
hint: branch
|
|
59
|
+
? `${db.engine} · ${db.status} · ${branch}`
|
|
60
|
+
: `${db.engine} · ${db.status}`,
|
|
61
|
+
};
|
|
62
|
+
});
|
|
55
63
|
items.push({ label: 'Back', value: BACK });
|
|
56
64
|
const chosen = await runView((resolve) => (_jsxs(Box, { flexDirection: "column", paddingY: 1, children: [_jsx(Text, { bold: true, children: "Pick a database to connect to" }), _jsx(Box, { marginTop: 1, children: _jsx(Menu, { items: items, onSelect: resolve }) })] })));
|
|
57
65
|
// Ctrl+C (null) or Back both mean "cancel".
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interactive.js","sourceRoot":"","sources":["../../src/commands/interactive.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAA;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAA;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAA;AAG9B,MAAM,WAAW,GAAG,wBAAwB,CAAA;AAC5C,MAAM,GAAG,GAAG,SAAS,CAAA;AACrB,MAAM,KAAK,GAAG,SAAS,CAAA;AACvB,MAAM,IAAI,GAAG,UAAU,CAAA;AAEvB,SAAS,WAAW,CAAC,KAA+B;IAClD,IAAI,CAAC,KAAK;QAAE,OAAO,eAAe,CAAA;IAClC,IAAI,CAAC,KAAK,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,WAAW,CAAA;IAC9E,MAAM,KAAK,GAAG,iBAAiB,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,KAAK,CAAA;IACnD,OAAO,KAAK,CAAC,CAAC,CAAC,gBAAgB,KAAK,EAAE,CAAC,CAAC,CAAC,WAAW,CAAA;AACtD,CAAC;AAED,SAAS,WAAW,CAAC,KAA+B;IAClD,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,KAAK,WAAW,cAAc,KAAK,IAAI,GAAG,0BAA0B,KAAK,IAAI;QAC3E,GAAG,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,gCAAgC,KAAK,MAAM,CACzE,CAAA;AACH,CAAC;AAED,SAAS,aAAa,CAAC,QAAiB;IACtC,MAAM,KAAK,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC,GAAG,CAC3C,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,GAAG,IAAI,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,OAAO,GAAG,KAAK,EAAE,CACzE,CAAA;IACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;AAC5D,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,KAA+B;IACvD,0EAA0E;IAC1E,sCAAsC;IACtC,MAAM,QAAQ,GAAG,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QAChE,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE;QACpC,GAAG,CAAC,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACnC,IAAI,EAAE,KAAK;YACX,OAAO,EAAE,cAAc,CAAC,CAAC,IAAI,EAAE;SAChC,CAAC,CAAC;KACJ,CAAC,CAAA;IACF,gEAAgE;IAChE,MAAM,GAAG,GAAG,MAAM,OAAO,CAAS,CAAC,OAAO,EAAE,EAAE,CAAC,CAC7C,KAAC,MAAM,IAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,GAAI,CAClD,CAAC,CAAA;IACF,OAAO,GAAG,IAAI,OAAO,CAAA;AACvB,CAAC;AAED,KAAK,UAAU,YAAY,CACzB,SAA0B;IAE1B,MAAM,KAAK,GAAe,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"interactive.js","sourceRoot":"","sources":["../../src/commands/interactive.tsx"],"names":[],"mappings":"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"}
|
package/dist/commands/ls.js
CHANGED
|
@@ -4,6 +4,7 @@ import { Box, Text, useApp } from 'ink';
|
|
|
4
4
|
import Spinner from 'ink-spinner';
|
|
5
5
|
import { listDatabases } from '../lib/cloud-api.js';
|
|
6
6
|
import { reportError } from '../lib/cli-output.js';
|
|
7
|
+
import { hasBranches, parentLabel, summaryLine } from '../lib/database-list.js';
|
|
7
8
|
const STATUS_COLOR = {
|
|
8
9
|
running: 'green',
|
|
9
10
|
hibernated: 'yellow',
|
|
@@ -17,6 +18,14 @@ function pad(value, width) {
|
|
|
17
18
|
? value
|
|
18
19
|
: value + ' '.repeat(width - value.length);
|
|
19
20
|
}
|
|
21
|
+
// Same as pad, but never overflows the column. Used for PARENT, whose value is
|
|
22
|
+
// another database's name (or, against an older API, a raw uuid).
|
|
23
|
+
function fit(value, width) {
|
|
24
|
+
if (value.length < width)
|
|
25
|
+
return pad(value, width);
|
|
26
|
+
// Keep one trailing space so a long value cannot run into the next column.
|
|
27
|
+
return `${value.slice(0, width - 4)}... `;
|
|
28
|
+
}
|
|
20
29
|
// Transient (TTL) databases show their expiry so they are not mistaken for a
|
|
21
30
|
// stranded database. Normal databases render a dash.
|
|
22
31
|
function expiryLabel(db) {
|
|
@@ -67,6 +76,10 @@ export function List({ json }) {
|
|
|
67
76
|
if (state.databases.length === 0) {
|
|
68
77
|
return _jsx(Text, { children: "No databases yet. Create one at https://layerbase.com." });
|
|
69
78
|
}
|
|
70
|
-
|
|
79
|
+
// The PARENT column only appears when the account actually has branches, so
|
|
80
|
+
// the table stays exactly as wide as before for everyone else.
|
|
81
|
+
const showParent = hasBranches(state.databases);
|
|
82
|
+
const summary = summaryLine(state.databases);
|
|
83
|
+
return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { bold: true, children: [pad('NAME', 24), pad('ENGINE', 14), showParent ? pad('PARENT', 20) : '', pad('STATUS', 14), pad('EXPIRES', 20), "ID"] }), state.databases.map((db) => (_jsxs(Text, { children: [pad(db.name, 24), pad(db.engine, 14), showParent ? fit(parentLabel(db), 20) : '', _jsx(Text, { color: STATUS_COLOR[db.status] ?? 'white', children: pad(db.status, 14) }), pad(expiryLabel(db), 20), db.id] }, db.id))), summary ? (_jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: summary }) })) : null] }));
|
|
71
84
|
}
|
|
72
85
|
//# sourceMappingURL=ls.js.map
|
package/dist/commands/ls.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ls.js","sourceRoot":"","sources":["../../src/commands/ls.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC3C,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AACvC,OAAO,OAAO,MAAM,aAAa,CAAA;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"ls.js","sourceRoot":"","sources":["../../src/commands/ls.tsx"],"names":[],"mappings":"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"}
|