@shuffl/cli 0.5.12 → 0.6.1

package/dist/index.js

@@ -3,10 +3,12 @@ import { chmod, mkdir, readFile, rename, rm, writeFile, } from 'node:fs/promises
 import { createRequire } from 'node:module';
 import { homedir } from 'node:os';
 import { dirname, join } from 'node:path';
-import { createShuffl, createShufflCompany, ORPCError } from '@shuffl/sdk';
+import { ORPCError, Shuffl } from '@shuffl/sdk';
 import { commands } from './commands.generated.js';
 // package.json sits one level above both src/ and dist/.
 const { version } = createRequire(import.meta.url)('../package.json');
+// Sent ahead of the SDK's own in x-shuffl-client, so Shuffl counts CLI use.
+const cliClient = `shuffl-cli/${version}`;
 async function request(run) {
     try {
         return await run();
@@ -144,7 +146,11 @@ export async function runCli(args, io = {
                 if (!/^shuffl_company_[A-Za-z0-9_-]{43}$/.test(token))
                     throw new Error('Expected a Shuffl company key.');
                 const baseUrl = new URL(flags['base-url']).origin;
-                const company = await request(() => createShufflCompany({ baseUrl, token }).current());
+                const company = await request(() => new Shuffl({
+                    apiKey: token,
+                    baseUrl,
+                    client: cliClient,
+                }).company.current());
                 await save(companyFile, { baseUrl, token });
                 io.stdout(json
                     ? JSON.stringify({ company }) + '\n'
@@ -154,9 +160,10 @@ export async function runCli(args, io = {
             if (!/^shuffl_api_[A-Za-z0-9_-]{43}$/.test(token))
                 throw new Error('Expected a Shuffl API token.');
             const baseUrl = new URL(flags['base-url']).origin;
-            const client = createShuffl({
+            const client = new Shuffl({
+                apiKey: token,
                 baseUrl,
-                token,
+                client: cliClient,
             });
             const team = await request(() => client.teams.current());
             await save(configFile, { baseUrl, token });
@@ -211,8 +218,8 @@ export async function runCli(args, io = {
             new URL(baseUrl).origin !== new URL(saved.baseUrl).origin)
             throw new Error('Saved credentials belong to a different server. Sign in to the target server first.');
         let method = company
-            ? createShufflCompany({ baseUrl, token })
-            : createShuffl({ baseUrl, token });
+            ? new Shuffl({ apiKey: token, baseUrl, client: cliClient }).company
+            : new Shuffl({ apiKey: token, baseUrl, client: cliClient });
         for (const name of command.path)
             method = method[name];
         const output = await request(() => method(input));

package/package.json

@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "@orpc/client": "1.15.3",
-    "@shuffl/api-contracts": "0.5.12",
-    "@shuffl/sdk": "0.5.12"
+    "@shuffl/api-contracts": "0.6.1",
+    "@shuffl/sdk": "0.6.1"
   },
   "description": "Shuffl command line: every public API operation as a scriptable command with JSON output.",
   "engines": {
@@ -33,7 +33,7 @@
   "sideEffects": false,
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "0.5.12",
+  "version": "0.6.1",
   "bin": {
     "shuffl": "./dist/bin.js"
   }