layerbase 0.4.0 → 0.4.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/dist/commands/interactive.js +9 -14
- package/dist/commands/interactive.js.map +1 -1
- package/dist/commands/login.js +2 -2
- package/dist/commands/login.js.map +1 -1
- package/dist/lib/run-spindb.js +11 -2
- package/dist/lib/run-spindb.js.map +1 -1
- package/dist/ui/run-view.js +22 -0
- package/dist/ui/run-view.js.map +1 -0
- package/package.json +1 -1
|
@@ -3,6 +3,7 @@ import { render, Box, Text } from 'ink';
|
|
|
3
3
|
import { Prompt } from '../ui/prompt.js';
|
|
4
4
|
import { Menu } from '../ui/menu.js';
|
|
5
5
|
import { Connecting } from '../ui/connecting.js';
|
|
6
|
+
import { runView } from '../ui/run-view.js';
|
|
6
7
|
import { loadCredentials } from '../lib/config.js';
|
|
7
8
|
import { decodeTokenClaims } from '../lib/token.js';
|
|
8
9
|
import { resolveInput, availableCommands } from '../lib/commands.js';
|
|
@@ -29,33 +30,27 @@ function printCommands(loggedIn) {
|
|
|
29
30
|
const lines = availableCommands(loggedIn).map((c) => ` ${DIM}/${RESET}${c.name.padEnd(11)}${DIM}${c.summary}${RESET}`);
|
|
30
31
|
process.stdout.write(`Commands:\n${lines.join('\n')}\n\n`);
|
|
31
32
|
}
|
|
32
|
-
function promptOnce(creds) {
|
|
33
|
+
async function promptOnce(creds) {
|
|
33
34
|
// Surface aliases (e.g. /menu for spindb) as their own palette entries so
|
|
34
35
|
// they are discoverable while typing.
|
|
35
36
|
const commands = availableCommands(Boolean(creds)).flatMap((c) => [
|
|
36
37
|
{ name: c.name, summary: c.summary },
|
|
37
38
|
...(c.aliases ?? []).map((alias) => ({ name: alias, summary: c.summary })),
|
|
38
39
|
]);
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
resolve(raw);
|
|
43
|
-
} }));
|
|
44
|
-
});
|
|
40
|
+
// Ctrl+C at the prompt cancels (null), which we treat as /quit.
|
|
41
|
+
const raw = await runView((resolve) => (_jsx(Prompt, { commands: commands, onSubmit: resolve })));
|
|
42
|
+
return raw ?? '/quit';
|
|
45
43
|
}
|
|
46
|
-
function pickDatabase(databases) {
|
|
44
|
+
async function pickDatabase(databases) {
|
|
47
45
|
const items = databases.map((db) => ({
|
|
48
46
|
label: db.name,
|
|
49
47
|
value: db.id,
|
|
50
48
|
hint: `${db.engine} · ${db.status}`,
|
|
51
49
|
}));
|
|
52
50
|
items.push({ label: 'Back', value: BACK });
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
resolve(v === BACK ? null : v);
|
|
57
|
-
} }) })] }));
|
|
58
|
-
});
|
|
51
|
+
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 }) })] })));
|
|
52
|
+
// Ctrl+C (null) or Back both mean "cancel".
|
|
53
|
+
return chosen === null || chosen === BACK ? null : chosen;
|
|
59
54
|
}
|
|
60
55
|
// List the user's databases and let them pick one (used when /connect or /clone
|
|
61
56
|
// is run without a db argument). Returns null on error / empty / 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,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,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,
|
|
1
|
+
{"version":3,"file":"interactive.js","sourceRoot":"","sources":["../../src/commands/interactive.tsx"],"names":[],"mappings":"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"}
|
package/dist/commands/login.js
CHANGED
|
@@ -4,7 +4,7 @@ import { Box, Text, useApp } from 'ink';
|
|
|
4
4
|
import Spinner from 'ink-spinner';
|
|
5
5
|
import { runBrowserLogin } from '../lib/browser-login.js';
|
|
6
6
|
import { DEFAULT_API_URL, whoami } from '../lib/cloud-api.js';
|
|
7
|
-
import { saveCredentials
|
|
7
|
+
import { saveCredentials } from '../lib/config.js';
|
|
8
8
|
export function Login({ flags }) {
|
|
9
9
|
const { exit } = useApp();
|
|
10
10
|
const apiUrl = flags.apiUrl ?? DEFAULT_API_URL;
|
|
@@ -54,7 +54,7 @@ export function Login({ flags }) {
|
|
|
54
54
|
return (_jsxs(Box, { children: [_jsx(Text, { color: "cyan", children: _jsx(Spinner, { type: "dots" }) }), _jsx(Text, { children: " Saving credentials..." })] }));
|
|
55
55
|
}
|
|
56
56
|
if (phase.kind === 'done') {
|
|
57
|
-
return (_jsxs(Text, { color: "green", children: ["
|
|
57
|
+
return (_jsxs(Text, { color: "green", children: ["Authenticated", phase.email ? ` as ${phase.email}` : '', ". Type", ' ', _jsx(Text, { bold: true, children: "ls" }), " to list your cloud databases."] }));
|
|
58
58
|
}
|
|
59
59
|
return _jsx(Text, { color: "red", children: phase.message });
|
|
60
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.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,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.tsx"],"names":[],"mappings":"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"}
|
package/dist/lib/run-spindb.js
CHANGED
|
@@ -32,6 +32,15 @@ function spindbInvocation() {
|
|
|
32
32
|
function spawnSpindb(args, opts = {}) {
|
|
33
33
|
const { command, baseArgs } = spindbInvocation();
|
|
34
34
|
return new Promise((resolve) => {
|
|
35
|
+
// While spindb owns the foreground, let IT handle Ctrl+C. The parent ignores
|
|
36
|
+
// SIGINT so it does not get terminated mid-loop (which exits with a confusing
|
|
37
|
+
// "unsettled top-level await"); when spindb exits we resume the harness.
|
|
38
|
+
const ignoreSigint = () => { };
|
|
39
|
+
process.on('SIGINT', ignoreSigint);
|
|
40
|
+
const settle = (code) => {
|
|
41
|
+
process.removeListener('SIGINT', ignoreSigint);
|
|
42
|
+
resolve(code);
|
|
43
|
+
};
|
|
35
44
|
const child = spawn(command, [...baseArgs, ...args], {
|
|
36
45
|
stdio: opts.quiet ? 'ignore' : 'inherit',
|
|
37
46
|
env: opts.env ? { ...process.env, ...opts.env } : process.env,
|
|
@@ -44,9 +53,9 @@ function spawnSpindb(args, opts = {}) {
|
|
|
44
53
|
'Install spindb (https://github.com/robertjbass/spindb) or make sure ' +
|
|
45
54
|
'it is on your PATH.\n');
|
|
46
55
|
}
|
|
47
|
-
|
|
56
|
+
settle(127);
|
|
48
57
|
});
|
|
49
|
-
child.on('exit', (code) =>
|
|
58
|
+
child.on('exit', (code) => settle(code ?? 0));
|
|
50
59
|
});
|
|
51
60
|
}
|
|
52
61
|
// Hand the terminal to the local spindb CLI, passing through any args. This is
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-spindb.js","sourceRoot":"","sources":["../../src/lib/run-spindb.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACpC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,WAAW,CAAA;AAE3C,+EAA+E;AAC/E,0EAA0E;AAC1E,+EAA+E;AAC/E,SAAS,YAAY;IACnB,MAAM,IAAI,GACR,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IACpE,KAAK,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5D,IAAI,CAAC,GAAG;YAAE,SAAQ;QAClB,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,GAAG,EAAE,CAAC,CAAC;gBAAE,OAAO,IAAI,CAAA;QACxD,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAED,SAAS,mBAAmB;IAC1B,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,EAAE,CAAA;IACzD,IAAI,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC;QAAE,OAAO,MAAM,CAAA;IAC/C,IAAI,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC;QAAE,OAAO,MAAM,CAAA;IAC9C,OAAO,KAAK,CAAA;AACd,CAAC;AAED,SAAS,gBAAgB;IACvB,OAAO,YAAY,EAAE;QACnB,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE;QACrC,CAAC,CAAC,EAAE,OAAO,EAAE,mBAAmB,EAAE,EAAE,QAAQ,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAA;AAC9D,CAAC;AAUD,SAAS,WAAW,CAAC,IAAc,EAAE,OAAqB,EAAE;IAC1D,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,gBAAgB,EAAE,CAAA;IAChD,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,EAAE;QACrC,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,GAAG,QAAQ,EAAE,GAAG,IAAI,CAAC,EAAE;YACnD,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;YACxC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG;YAC7D,sEAAsE;YACtE,KAAK,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO;SACpC,CAAC,CAAA;QACF,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC1B,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;gBAChB,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,yBAAyB,KAAK,CAAC,OAAO,IAAI;oBACxC,sEAAsE;oBACtE,uBAAuB,CAC1B,CAAA;YACH,CAAC;YACD,
|
|
1
|
+
{"version":3,"file":"run-spindb.js","sourceRoot":"","sources":["../../src/lib/run-spindb.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { render } from 'ink';
|
|
2
|
+
// Render an interactive Ink view and resolve when it produces a value, OR when
|
|
3
|
+
// the user cancels with Ctrl+C (Ink unmounts on its own). Without this, a view
|
|
4
|
+
// that only resolves on a submit/select would orphan its promise on Ctrl+C and
|
|
5
|
+
// the process would exit with the confusing "unsettled top-level await" warning.
|
|
6
|
+
// Returns null on cancel.
|
|
7
|
+
export function runView(build) {
|
|
8
|
+
return new Promise((resolve) => {
|
|
9
|
+
let settled = false;
|
|
10
|
+
const finish = (value) => {
|
|
11
|
+
if (settled)
|
|
12
|
+
return;
|
|
13
|
+
settled = true;
|
|
14
|
+
app.unmount();
|
|
15
|
+
resolve(value);
|
|
16
|
+
};
|
|
17
|
+
const app = render(build((value) => finish(value)));
|
|
18
|
+
// Ctrl+C (Ink's default) unmounts the app; treat that as a cancel.
|
|
19
|
+
app.waitUntilExit().then(() => finish(null), () => finish(null));
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=run-view.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-view.js","sourceRoot":"","sources":["../../src/ui/run-view.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAA;AAG5B,+EAA+E;AAC/E,+EAA+E;AAC/E,+EAA+E;AAC/E,iFAAiF;AACjF,0BAA0B;AAC1B,MAAM,UAAU,OAAO,CACrB,KAAoD;IAEpD,OAAO,IAAI,OAAO,CAAW,CAAC,OAAO,EAAE,EAAE;QACvC,IAAI,OAAO,GAAG,KAAK,CAAA;QACnB,MAAM,MAAM,GAAG,CAAC,KAAe,EAAQ,EAAE;YACvC,IAAI,OAAO;gBAAE,OAAM;YACnB,OAAO,GAAG,IAAI,CAAA;YACd,GAAG,CAAC,OAAO,EAAE,CAAA;YACb,OAAO,CAAC,KAAK,CAAC,CAAA;QAChB,CAAC,CAAA;QACD,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;QACnD,mEAAmE;QACnE,GAAG,CAAC,aAAa,EAAE,CAAC,IAAI,CACtB,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAClB,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CACnB,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}
|