@shuffl/cli 0.6.0 → 0.6.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/index.js +10 -3
- package/package.json +3 -3
package/dist/index.js
CHANGED
|
@@ -7,6 +7,8 @@ import { ORPCError, Shuffl } from '@shuffl/sdk';
|
|
|
7
7
|
import { commands } from './commands.generated.js';
|
|
8
8
|
// package.json sits one level above both src/ and dist/.
|
|
9
9
|
const { version } = createRequire(import.meta.url)('../package.json');
|
|
10
|
+
// Sent ahead of the SDK's own in x-shuffl-client, so Shuffl counts CLI use.
|
|
11
|
+
const cliClient = `shuffl-cli/${version}`;
|
|
10
12
|
async function request(run) {
|
|
11
13
|
try {
|
|
12
14
|
return await run();
|
|
@@ -144,7 +146,11 @@ export async function runCli(args, io = {
|
|
|
144
146
|
if (!/^shuffl_company_[A-Za-z0-9_-]{43}$/.test(token))
|
|
145
147
|
throw new Error('Expected a Shuffl company key.');
|
|
146
148
|
const baseUrl = new URL(flags['base-url']).origin;
|
|
147
|
-
const company = await request(() => new Shuffl({
|
|
149
|
+
const company = await request(() => new Shuffl({
|
|
150
|
+
apiKey: token,
|
|
151
|
+
baseUrl,
|
|
152
|
+
client: cliClient,
|
|
153
|
+
}).company.current());
|
|
148
154
|
await save(companyFile, { baseUrl, token });
|
|
149
155
|
io.stdout(json
|
|
150
156
|
? JSON.stringify({ company }) + '\n'
|
|
@@ -157,6 +163,7 @@ export async function runCli(args, io = {
|
|
|
157
163
|
const client = new Shuffl({
|
|
158
164
|
apiKey: token,
|
|
159
165
|
baseUrl,
|
|
166
|
+
client: cliClient,
|
|
160
167
|
});
|
|
161
168
|
const team = await request(() => client.teams.current());
|
|
162
169
|
await save(configFile, { baseUrl, token });
|
|
@@ -211,8 +218,8 @@ export async function runCli(args, io = {
|
|
|
211
218
|
new URL(baseUrl).origin !== new URL(saved.baseUrl).origin)
|
|
212
219
|
throw new Error('Saved credentials belong to a different server. Sign in to the target server first.');
|
|
213
220
|
let method = company
|
|
214
|
-
? new Shuffl({ apiKey: token, baseUrl }).company
|
|
215
|
-
: new Shuffl({ apiKey: token, baseUrl });
|
|
221
|
+
? new Shuffl({ apiKey: token, baseUrl, client: cliClient }).company
|
|
222
|
+
: new Shuffl({ apiKey: token, baseUrl, client: cliClient });
|
|
216
223
|
for (const name of command.path)
|
|
217
224
|
method = method[name];
|
|
218
225
|
const output = await request(() => method(input));
|
package/package.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"dependencies": {
|
|
3
3
|
"@orpc/client": "1.15.3",
|
|
4
|
-
"@shuffl/api-contracts": "0.6.
|
|
5
|
-
"@shuffl/sdk": "0.6.
|
|
4
|
+
"@shuffl/api-contracts": "0.6.1",
|
|
5
|
+
"@shuffl/sdk": "0.6.1"
|
|
6
6
|
},
|
|
7
7
|
"description": "Shuffl command line: every public API operation as a scriptable command with JSON output.",
|
|
8
8
|
"engines": {
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"sideEffects": false,
|
|
34
34
|
"type": "module",
|
|
35
35
|
"types": "./dist/index.d.ts",
|
|
36
|
-
"version": "0.6.
|
|
36
|
+
"version": "0.6.1",
|
|
37
37
|
"bin": {
|
|
38
38
|
"shuffl": "./dist/bin.js"
|
|
39
39
|
}
|