Move utility functions

This avoids importing most dependencies when not used.

src/cli/android-znca-api-server-frida.ts

@@ -6,10 +6,12 @@ import frida, { Session } from 'frida';
 import express from 'express';
 import bodyParser from 'body-parser';
 import type { Arguments as ParentArguments } from '../cli.js';
-import { ArgumentsCamelCase, Argv, dir, getJwks, initStorage, YargsArguments } from '../util.js';
-import { Jwt } from '../util.js';
 import { NintendoAccountIdTokenJwtPayload } from '../api/na.js';
 import { ZNCA_CLIENT_ID, ZncJwtPayload } from '../api/znc.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../util/yargs.js';
+import { dir } from '../util/product.js';
+import { initStorage } from '../util/storage.js';
+import { getJwks, Jwt } from '../util/jwt.js';
 
 const debug = createDebug('cli:android-znca-api-server-frida');
 const debugApi = createDebug('cli:android-znca-api-server-frida:api');

src/cli/app.ts

@@ -2,7 +2,7 @@ import { createRequire } from 'module';
 import { execFileSync } from 'child_process';
 import createDebug from 'debug';
 import type { Arguments as ParentArguments } from '../cli.js';
-import { ArgumentsCamelCase, Argv, YargsArguments } from '../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../util/yargs.js';
 
 const debug = createDebug('cli:app');
 

src/cli/nooklink.ts

@@ -1,6 +1,6 @@
 import createDebug from 'debug';
 import type { Arguments as ParentArguments } from '../cli.js';
-import { Argv, YargsArguments } from '../util.js';
+import { Argv, YargsArguments } from '../util/yargs.js';
 import * as commands from './nooklink/index.js';
 
 const debug = createDebug('cli:nooklink');

src/cli/nooklink/dump-newspapers.ts

@@ -3,7 +3,8 @@ import * as path from 'path';
 import createDebug from 'debug';
 import mkdirp from 'mkdirp';
 import type { Arguments as ParentArguments } from '../nooklink.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getUserToken } from '../../common/auth/nooklink.js';
 
 const debug = createDebug('cli:nooklink:dump-newspapers');

src/cli/nooklink/island.ts

@@ -1,7 +1,8 @@
 import createDebug from 'debug';
 import Table from '../util/table.js';
 import type { Arguments as ParentArguments } from '../nooklink.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getUserToken, getWebServiceToken } from '../../common/auth/nooklink.js';
 
 const debug = createDebug('cli:nooklink:island');

src/cli/nooklink/keyboard.ts

@@ -1,7 +1,8 @@
 import { promisify } from 'util';
 import createDebug from 'debug';
 import type { Arguments as ParentArguments } from '../nooklink.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getUserToken } from '../../common/auth/nooklink.js';
 
 const debug = createDebug('cli:nooklink:keyboard');

src/cli/nooklink/newspaper.ts

@@ -1,7 +1,8 @@
 import createDebug from 'debug';
 import Table from '../util/table.js';
 import type { Arguments as ParentArguments } from '../nooklink.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getUserToken } from '../../common/auth/nooklink.js';
 
 const debug = createDebug('cli:nooklink:newspaper');

src/cli/nooklink/newspapers.ts

@@ -1,7 +1,8 @@
 import createDebug from 'debug';
 import Table from '../util/table.js';
 import type { Arguments as ParentArguments } from '../nooklink.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getUserToken } from '../../common/auth/nooklink.js';
 
 const debug = createDebug('cli:nooklink:newspapers');

src/cli/nooklink/post-reaction.ts

@@ -1,6 +1,7 @@
 import createDebug from 'debug';
 import type { Arguments as ParentArguments } from '../nooklink.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getUserToken } from '../../common/auth/nooklink.js';
 
 const debug = createDebug('cli:nooklink:post-reaction');

src/cli/nooklink/reactions.ts

@@ -1,7 +1,8 @@
 import createDebug from 'debug';
 import Table from '../util/table.js';
 import type { Arguments as ParentArguments } from '../nooklink.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getUserToken } from '../../common/auth/nooklink.js';
 
 const debug = createDebug('cli:nooklink:reactions');

src/cli/nooklink/user.ts

@@ -1,6 +1,7 @@
 import createDebug from 'debug';
 import type { Arguments as ParentArguments } from '../nooklink.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getUserToken } from '../../common/auth/nooklink.js';
 
 const debug = createDebug('cli:nooklink:user');

src/cli/nooklink/users.ts

@@ -1,7 +1,8 @@
 import createDebug from 'debug';
 import Table from '../util/table.js';
 import type { Arguments as ParentArguments } from '../nooklink.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getWebServiceToken } from '../../common/auth/nooklink.js';
 
 const debug = createDebug('cli:nooklink:users');

src/cli/nso.ts

@@ -1,6 +1,6 @@
 import createDebug from 'debug';
 import type { Arguments as ParentArguments } from '../cli.js';
-import { Argv, YargsArguments } from '../util.js';
+import { Argv, YargsArguments } from '../util/yargs.js';
 import * as commands from './nso/index.js';
 
 const debug = createDebug('cli:nso');

src/cli/nso/announcements.ts

@@ -1,7 +1,8 @@
 import createDebug from 'debug';
 import Table from '../util/table.js';
 import type { Arguments as ParentArguments } from '../nso.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getToken } from '../../common/auth/nso.js';
 
 const debug = createDebug('cli:nso:announcements');

src/cli/nso/auth.ts

@@ -2,7 +2,8 @@ import * as util from 'util';
 import createDebug from 'debug';
 import * as crypto from 'crypto';
 import type { Arguments as ParentArguments } from '../nso.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getToken } from '../../common/auth/nso.js';
 import { getNintendoAccountSessionToken } from '../../api/na.js';
 import { ZNCA_CLIENT_ID } from '../../api/znc.js';

src/cli/nso/friends.ts

@@ -2,7 +2,9 @@ import createDebug from 'debug';
 import Table from '../util/table.js';
 import { PresenceState } from '../../api/znc-types.js';
 import type { Arguments as ParentArguments } from '../nso.js';
-import { ArgumentsCamelCase, Argv, hrduration, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
+import { hrduration } from '../../util/misc.js';
 import { getToken } from '../../common/auth/nso.js';
 
 const debug = createDebug('cli:nso:friends');

src/cli/nso/http-server.ts

@@ -6,7 +6,8 @@ import { v4 as uuidgen } from 'uuid';
 import { Announcement, CurrentUser, Friend, GetActiveEventResult, Presence, WebService } from '../../api/znc-types.js';
 import ZncApi from '../../api/znc.js';
 import type { Arguments as ParentArguments } from '../nso.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getToken, SavedToken } from '../../common/auth/nso.js';
 import { NotificationManager, ZncNotifications } from '../../common/notify.js';
 

src/cli/nso/notify.ts

@@ -3,7 +3,8 @@ import createDebug from 'debug';
 import persist from 'node-persist';
 import notifier from 'node-notifier';
 import type { Arguments as ParentArguments } from '../nso.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getToken } from '../../common/auth/nso.js';
 import { getIksmToken } from '../../common/auth/splatnet2.js';
 import { EmbeddedSplatNet2Monitor, NotificationManager, ZncNotifications } from '../../common/notify.js';

src/cli/nso/permissions.ts

@@ -1,7 +1,8 @@
 import createDebug from 'debug';
 import { PresencePermissions } from '../../api/znc-types.js';
 import type { Arguments as ParentArguments } from '../nso.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getToken } from '../../common/auth/nso.js';
 
 const debug = createDebug('cli:nso:permissions');

src/cli/nso/presence.ts

@@ -1,6 +1,7 @@
 import createDebug from 'debug';
 import type { Arguments as ParentArguments } from '../nso.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getToken } from '../../common/auth/nso.js';
 import { DiscordPresencePlayTime } from '../../discord/util.js';
 import { handleEnableSplatNet2Monitoring } from './notify.js';

src/cli/nso/token.ts

@@ -1,7 +1,8 @@
 import * as util from 'util';
 import createDebug from 'debug';
 import type { Arguments as ParentArguments } from '../nso.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getToken } from '../../common/auth/nso.js';
 
 const debug = createDebug('cli:nso:token');

src/cli/nso/user.ts

@@ -1,6 +1,7 @@
 import createDebug from 'debug';
 import type { Arguments as ParentArguments } from '../nso.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getToken } from '../../common/auth/nso.js';
 
 const debug = createDebug('cli:nso:user');

src/cli/nso/webservices.ts

@@ -1,7 +1,8 @@
 import createDebug from 'debug';
 import Table from '../util/table.js';
 import type { Arguments as ParentArguments } from '../nso.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getToken } from '../../common/auth/nso.js';
 
 const debug = createDebug('cli:nso:webservices');

src/cli/nso/webservicetoken.ts

@@ -1,6 +1,7 @@
 import createDebug from 'debug';
 import type { Arguments as ParentArguments } from '../nso.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getToken } from '../../common/auth/nso.js';
 
 const debug = createDebug('cli:nso:webservicetoken');

src/cli/nso/znc-proxy-tokens.ts

@@ -2,9 +2,10 @@ import createDebug from 'debug';
 import fetch from 'node-fetch';
 import Table from '../util/table.js';
 import type { Arguments as ParentArguments } from '../nso.js';
-import { Argv, initStorage } from '../../util.js';
 import { getToken } from '../../common/auth/nso.js';
 import { AuthPolicy, AuthToken } from './http-server.js';
+import { Argv } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 
 const debug = createDebug('cli:nso:znc-proxy-tokens');
 

src/cli/pctl.ts

@@ -1,6 +1,6 @@
 import createDebug from 'debug';
 import type { Arguments as ParentArguments } from '../cli.js';
-import { Argv, YargsArguments } from '../util.js';
+import { Argv, YargsArguments } from '../util/yargs.js';
 import * as commands from './pctl/index.js';
 
 const debug = createDebug('cli:pctl');

src/cli/pctl/auth.ts

@@ -2,7 +2,8 @@ import * as util from 'util';
 import * as crypto from 'crypto';
 import createDebug from 'debug';
 import type { Arguments as ParentArguments } from '../pctl.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getPctlToken } from '../../common/auth/moon.js';
 import { getNintendoAccountSessionToken } from '../../api/na.js';
 import { ZNMA_CLIENT_ID } from '../../api/moon.js';

src/cli/pctl/daily-summaries.ts

@@ -1,7 +1,9 @@
 import createDebug from 'debug';
 import Table from '../util/table.js';
 import type { Arguments as ParentArguments } from '../pctl.js';
-import { ArgumentsCamelCase, Argv, hrduration, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
+import { hrduration } from '../../util/misc.js';
 import { getPctlToken } from '../../common/auth/moon.js';
 
 const debug = createDebug('cli:pctl:daily-summaries');

src/cli/pctl/devices.ts

@@ -1,7 +1,8 @@
 import createDebug from 'debug';
 import Table from '../util/table.js';
 import type { Arguments as ParentArguments } from '../pctl.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getPctlToken } from '../../common/auth/moon.js';
 
 const debug = createDebug('cli:pctl:devices');

src/cli/pctl/dump-summaries.ts

@@ -3,7 +3,8 @@ import * as fs from 'fs/promises';
 import createDebug from 'debug';
 import mkdirp from 'mkdirp';
 import type { Arguments as ParentArguments } from '../pctl.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getPctlToken } from '../../common/auth/moon.js';
 import { DailySummaryResult } from '../../api/moon-types.js';
 import MoonApi from '../../api/moon.js';

src/cli/pctl/monthly-summaries.ts

@@ -1,7 +1,8 @@
 import createDebug from 'debug';
 import Table from '../util/table.js';
 import type { Arguments as ParentArguments } from '../pctl.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getPctlToken } from '../../common/auth/moon.js';
 
 const debug = createDebug('cli:pctl:monthly-summaries');

src/cli/pctl/monthly-summary.ts

@@ -1,7 +1,8 @@
 import createDebug from 'debug';
 import Table from '../util/table.js';
 import type { Arguments as ParentArguments } from '../pctl.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getPctlToken } from '../../common/auth/moon.js';
 
 const debug = createDebug('cli:pctl:monthly-summary');

src/cli/pctl/settings.ts

@@ -1,6 +1,7 @@
 import createDebug from 'debug';
 import type { Arguments as ParentArguments } from '../pctl.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getPctlToken } from '../../common/auth/moon.js';
 
 const debug = createDebug('cli:pctl:settings');

src/cli/pctl/token.ts

@@ -1,7 +1,8 @@
 import * as util from 'util';
 import createDebug from 'debug';
 import type { Arguments as ParentArguments } from '../pctl.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getPctlToken } from '../../common/auth/moon.js';
 
 const debug = createDebug('cli:pctl:token');

src/cli/pctl/user.ts

@@ -1,7 +1,8 @@
 import createDebug from 'debug';
 import type { Arguments as ParentArguments } from '../pctl.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
 import { getPctlToken } from '../../common/auth/moon.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 
 const debug = createDebug('cli:pctl:user');
 

src/cli/splatnet2.ts

@@ -1,6 +1,6 @@
 import createDebug from 'debug';
 import type { Arguments as ParentArguments } from '../cli.js';
-import { Argv, YargsArguments } from '../util.js';
+import { Argv, YargsArguments } from '../util/yargs.js';
 import * as commands from './splatnet2/index.js';
 
 const debug = createDebug('cli:splatnet2');

src/cli/splatnet2/battles.ts

@@ -1,7 +1,8 @@
 import createDebug from 'debug';
 import Table from '../util/table.js';
 import type { Arguments as ParentArguments } from '../splatnet2.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getIksmToken } from '../../common/auth/splatnet2.js';
 
 const debug = createDebug('cli:splatnet2:battles');

src/cli/splatnet2/challenges.ts

@@ -1,7 +1,8 @@
 import createDebug from 'debug';
 import Table from '../util/table.js';
 import type { Arguments as ParentArguments } from '../splatnet2.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getIksmToken } from '../../common/auth/splatnet2.js';
 
 const debug = createDebug('cli:splatnet2:challenges');

src/cli/splatnet2/dump-records.ts

@@ -3,7 +3,8 @@ import * as fs from 'fs/promises';
 import createDebug from 'debug';
 import mkdirp from 'mkdirp';
 import type { Arguments as ParentArguments } from '../splatnet2.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getIksmToken } from '../../common/auth/splatnet2.js';
 import { dumpChallenges, dumpHeroRecords, dumpProfileImage, dumpRecords } from '../../common/splatnet2/dump-records.js';
 

src/cli/splatnet2/dump-results.ts

@@ -2,7 +2,8 @@ import * as path from 'path';
 import createDebug from 'debug';
 import mkdirp from 'mkdirp';
 import type { Arguments as ParentArguments } from '../splatnet2.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getIksmToken } from '../../common/auth/splatnet2.js';
 import { dumpCoopResults, dumpResults } from '../../common/splatnet2/dump-results.js';
 

src/cli/splatnet2/hero.ts

@@ -1,7 +1,8 @@
 import createDebug from 'debug';
 import Table from '../util/table.js';
 import type { Arguments as ParentArguments } from '../splatnet2.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getIksmToken } from '../../common/auth/splatnet2.js';
 
 const debug = createDebug('cli:splatnet2:hero');

src/cli/splatnet2/monitor.ts

@@ -1,7 +1,8 @@
 import * as path from 'path';
 import createDebug from 'debug';
 import { getIksmToken } from '../../common/auth/splatnet2.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { Arguments as ParentArguments } from '../splatnet2.js';
 import { SplatNet2RecordsMonitor } from '../../common/splatnet2/monitor.js';
 

src/cli/splatnet2/schedule.ts

@@ -1,7 +1,8 @@
 import createDebug from 'debug';
 import Table from '../util/table.js';
 import type { Arguments as ParentArguments } from '../splatnet2.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getIksmToken } from '../../common/auth/splatnet2.js';
 
 const debug = createDebug('cli:splatnet2:schedule');

src/cli/splatnet2/stages.ts

@@ -1,7 +1,8 @@
 import createDebug from 'debug';
 import Table from '../util/table.js';
 import type { Arguments as ParentArguments } from '../splatnet2.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getIksmToken } from '../../common/auth/splatnet2.js';
 
 const debug = createDebug('cli:splatnet2:stages');

src/cli/splatnet2/user.ts

@@ -1,6 +1,7 @@
 import createDebug from 'debug';
 import type { Arguments as ParentArguments } from '../splatnet2.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getIksmToken } from '../../common/auth/splatnet2.js';
 
 const debug = createDebug('cli:splatnet2:user');

src/cli/splatnet2/weapons.ts

@@ -1,7 +1,8 @@
 import createDebug from 'debug';
 import Table from '../util/table.js';
 import type { Arguments as ParentArguments } from '../splatnet2.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getIksmToken } from '../../common/auth/splatnet2.js';
 
 const debug = createDebug('cli:splatnet2:weapons');

src/cli/update.ts

@@ -3,7 +3,8 @@ import * as fs from 'fs/promises';
 import fetch from 'node-fetch';
 import createDebug from 'debug';
 import mkdirp from 'mkdirp';
-import { dir, paths, version } from '../util.js';
+import { dir, version } from '../util/product.js';
+import { paths } from '../util/storage.js';
 
 const debug = createDebug('cli:update');
 

src/cli/users.ts

@@ -1,7 +1,8 @@
 import createDebug from 'debug';
 import Table from './util/table.js';
 import type { Arguments as ParentArguments } from '../cli.js';
-import { Argv, initStorage } from '../util.js';
+import { Argv } from '../util/yargs.js';
+import { initStorage } from '../util/storage.js';
 import { SavedToken } from '../common/auth/nso.js';
 import { SavedMoonToken } from '../common/auth/moon.js';
 

src/cli/util.ts

@@ -1,6 +1,7 @@
 import createDebug from 'debug';
 import type { Arguments as ParentArguments } from '../cli.js';
-import { Argv, dev, YargsArguments } from '../util.js';
+import { Argv, YargsArguments } from '../util/yargs.js';
+import { dev } from '../util/product.js';
 import * as commands from './util/index.js';
 
 const debug = createDebug('cli:util');

src/cli/util/captureid.ts

@@ -2,7 +2,7 @@ import * as crypto from 'crypto';
 import { Buffer } from 'buffer';
 import createDebug from 'debug';
 import type { Arguments as ParentArguments } from '../util.js';
-import { Argv } from '../../util.js';
+import { Argv } from '../../util/yargs.js';
 
 const debug = createDebug('cli:util:captureid');
 

src/cli/util/discord-activity.ts

@@ -4,7 +4,8 @@ import { getPresenceFromUrl } from '../../api/znc-proxy.js';
 import { ActiveEvent, CurrentUser, Friend, Game, Presence, PresenceState } from '../../api/znc-types.js';
 import type { Arguments as ParentArguments } from '../util.js';
 import { DiscordPresenceContext, DiscordPresencePlayTime, getDiscordPresence, getInactiveDiscordPresence } from '../../discord/util.js';
-import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
+import { initStorage } from '../../util/storage.js';
 import { getToken } from '../../common/auth/nso.js';
 
 const debug = createDebug('cli:util:discord-activity');

src/cli/util/discord-rpc.ts

@@ -2,7 +2,7 @@ import createDebug from 'debug';
 import type { Arguments as ParentArguments } from '../util.js';
 import { DiscordRpcClient, getAllIpcSockets } from '../../discord/rpc.js';
 import { defaultTitle } from '../../discord/titles.js';
-import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
 
 const debug = createDebug('cli:util:discord-rpc');
 debug.enabled = true;

src/cli/util/export-discord-titles.ts

@@ -1,7 +1,7 @@
 import createDebug from 'debug';
 import fetch from 'node-fetch';
 import type { Arguments as ParentArguments } from '../util.js';
-import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util.js';
+import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util/yargs.js';
 import { titles as unsorted_titles } from '../../discord/titles.js';
 import { DiscordApplicationRpc, getDiscordApplicationRpc } from './discord-activity.js';
 import { Title } from '../../discord/util.js';

src/cli/util/validate-discord-titles.ts

@@ -1,6 +1,6 @@
 import createDebug from 'debug';
 import type { Arguments as ParentArguments } from '../util.js';
-import { ArgumentsCamelCase } from '../../util.js';
+import { ArgumentsCamelCase } from '../../util/yargs.js';
 import * as publishers from '../../discord/titles/index.js';
 
 const debug = createDebug('cli:util:validate-discord-titles');