@apollo-annotation/cli 0.1.17 → 0.1.18

package/dist/commands/assembly/sequence.js

@@ -66,8 +66,7 @@ export default class ApolloCmd extends BaseCommand {
         const { flags } = await this.parse(ApolloCmd);
         const endCoord = flags.end ?? Number.MAX_SAFE_INTEGER;
         if (flags.start <= 0 || endCoord <= 0) {
-            this.logToStderr('Start and end coordinates must be greater than 0.');
-            this.exit(1);
+            this.error('Start and end coordinates must be greater than 0.');
         }
         const access = await this.getAccess(flags['config-file'], flags.profile);
         let assembly = undefined;
@@ -76,16 +75,9 @@ export default class ApolloCmd extends BaseCommand {
             [assembly] = idReader([flags.assembly]);
         }
         let refseqIds = [];
-        try {
-            refseqIds = await getRefseqId(access.address, access.accessToken, flags.refseq, assembly);
-        }
-        catch (error) {
-            this.logToStderr(error.message);
-            this.exit(1);
-        }
+        refseqIds = await getRefseqId(access.address, access.accessToken, flags.refseq, assembly);
         if (refseqIds.length === 0) {
-            this.logToStderr('No reference sequence found');
-            this.exit(1);
+            this.error('No reference sequence found');
         }
         const refs = await queryApollo(access.address, access.accessToken, 'refSeqs');
         const refSeqs = (await refs.json());

package/dist/commands/config.js

@@ -5,8 +5,8 @@ import password from '@inquirer/password';
 import select from '@inquirer/select';
 import { Args, Flags } from '@oclif/core';
 import { fetch } from 'undici';
+import { ApolloConf, KEYS, optionDesc } from '../ApolloConf.js';
 import { BaseCommand } from '../baseCommand.js';
-import { Config, ConfigError, KEYS, optionDesc } from '../Config.js';
 import { createFetchErrorMessage, localhostToAddress, wrapLines, } from '../utils.js';
 export default class ApolloConfig extends BaseCommand {
     static summary = 'Get or set apollo configuration options';
@@ -57,9 +57,9 @@ export default class ApolloConfig extends BaseCommand {
                 : path.resolve(configFile);
         if (flags['get-config-file']) {
             this.log(configFile);
-            this.exit(0);
+            return;
         }
-        const config = new Config(configFile);
+        const config = new ApolloConf(configFile);
         if (args.key === undefined) {
             await this.interactiveSetup(config, flags.profile);
         }
@@ -71,33 +71,16 @@ export default class ApolloConfig extends BaseCommand {
             if (flags.profile !== undefined) {
                 profileName = flags.profile;
             }
-            try {
-                if (args.value === undefined) {
-                    const currentValue = config.get(args.key, profileName);
-                    this.log(currentValue);
-                }
-                else {
-                    config.set(args.key, args.value, profileName);
-                }
+            if (args.value === undefined) {
+                const currentValue = config.get(`${profileName}.${args.key}`);
+                this.log(currentValue);
+                return;
             }
-            catch (error) {
-                if (error instanceof Error) {
-                    this.logToStderr(error.message);
-                }
-                this.exit(1);
+            if (args.key === 'accessType') {
+                config.setAccessType(profileName, args.value);
             }
-        }
-        const v = config.validate().error?.message;
-        if (v) {
-            this.logToStderr(v);
-        }
-        try {
-            config.writeConfigFile();
-        }
-        catch (error) {
-            if (error instanceof ConfigError) {
-                this.logToStderr(error.message);
-                this.exit(1);
+            else {
+                config.set(`${profileName}.${args.key}`, args.value);
             }
         }
     }
@@ -107,34 +90,19 @@ export default class ApolloConfig extends BaseCommand {
         }
         let setMe = true;
         while (setMe) {
-            const address = await this.askAddress(config.get(KEYS[KEYS.address], profileName));
-            try {
-                config.set('address', address, profileName);
-                setMe = false;
-            }
-            catch (error) {
-                if (error instanceof ConfigError) {
-                    this.logToStderr(error.message);
-                }
-            }
+            const address = await this.askAddress(config.get(`${profileName}.${KEYS[KEYS.address]}`));
+            config.set(`${profileName}.${KEYS[KEYS.address]}`, address);
+            setMe = false;
         }
-        const address = config.get(KEYS[KEYS.address], profileName);
+        const address = config.get(`${profileName}.${KEYS[KEYS.address]}`);
         let accessType = '';
-        try {
-            accessType = await this.selectAccessType(address);
-        }
-        catch (error) {
-            if (error instanceof ConfigError) {
-                this.logToStderr(error.message);
-                this.exit(1);
-            }
-        }
-        config.set(KEYS[KEYS.accessType], accessType, profileName);
+        accessType = await this.selectAccessType(address);
+        config.setAccessType(profileName, accessType);
         if (accessType === 'root') {
-            const username = await this.askUsername(config.get(KEYS.rootCredentials_username, profileName));
-            config.set('rootCredentials.username', username, profileName);
+            const username = await this.askUsername(config.get(`${profileName}.${KEYS.rootCredentials_username}`));
+            config.set(`${profileName}.rootCredentials.username`, username);
             const password = await this.askPassword();
-            config.set('rootCredentials.password', password, profileName);
+            config.set(`${profileName}.rootCredentials.password`, password);
         }
     }
     async askProfileName(currentProfiles) {

package/dist/commands/feature/add-child.js

@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 /* eslint-disable @typescript-eslint/restrict-plus-operands */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { Flags } from '@oclif/core';
@@ -42,31 +41,27 @@ export default class Get extends BaseCommand {
     async run() {
         const { flags } = await this.parse(Get);
         if (flags.end < flags.start) {
-            this.logToStderr('Error: End coordinate is lower than the start coordinate');
-            this.exit(1);
+            this.error('Error: End coordinate is lower than the start coordinate');
         }
         if (flags.start <= 0) {
-            this.logToStderr('Coordinates must be greater than 0');
-            this.exit(1);
+            this.error('Coordinates must be greater than 0');
         }
         const ff = idReader([flags['feature-id']]);
         if (ff.length !== 1) {
-            this.logToStderr(`Expected only one feature identifier. Got ${ff.length}`);
+            this.error(`Expected only one feature identifier. Got ${ff.length}`);
         }
         const [featureId] = ff;
         const access = await this.getAccess(flags['config-file'], flags.profile);
-        const response = await getFeatureById(access.address, access.accessToken, featureId);
-        if (!response.ok) {
-            const errorMessage = await createFetchErrorMessage(response, 'getFeatureById failed');
+        const res = await getFeatureById(access.address, access.accessToken, featureId);
+        if (!res.ok) {
+            const errorMessage = await createFetchErrorMessage(res, 'getFeatureById failed');
             throw new Error(errorMessage);
         }
-        const feature = JSON.parse(await response.text());
+        const feature = JSON.parse(await res.text());
         const childRes = await this.addChild(access.address, access.accessToken, feature, flags.start - 1, flags.end, flags.type);
         if (!childRes.ok) {
-            const obj = JSON.parse(await response.text());
-            const message = obj['message'];
-            this.logToStderr(message);
-            this.exit(1);
+            const errorMessage = await createFetchErrorMessage(childRes, 'Add child failed');
+            throw new Error(errorMessage);
         }
         this.exit(0);
     }
@@ -74,8 +69,7 @@ export default class Get extends BaseCommand {
         const pStart = parentFeature['start'];
         const pEnd = parentFeature['end'];
         if (start < pStart || end > pEnd) {
-            this.logToStderr(`Error: Child feature coordinates (${start + 1}-${end}) cannot extend beyond parent coordinates (${pStart + 1}-${pEnd})`);
-            this.exit(1);
+            this.error(`Error: Child feature coordinates (${start + 1}-${end}) cannot extend beyond parent coordinates (${pStart + 1}-${pEnd})`);
         }
         const res = await queryApollo(address, accessToken, 'refSeqs');
         const refSeqs = (await res.json());

package/dist/commands/feature/copy.js

@@ -38,36 +38,27 @@ export default class Copy extends BaseCommand {
     async run() {
         const { flags } = await this.parse(Copy);
         if (flags.start <= 0) {
-            this.logToStderr('Start coordinate must be greater than 0');
-            this.exit(1);
+            this.error('Start coordinate must be greater than 0');
         }
         const access = await this.getAccess(flags['config-file'], flags.profile);
-        const response = await getFeatureById(access.address, access.accessToken, flags['feature-id']);
-        if (!response.ok) {
-            const errorMessage = await createFetchErrorMessage(response, 'getFeatureById failed');
+        const res = await getFeatureById(access.address, access.accessToken, flags['feature-id']);
+        if (!res.ok) {
+            const errorMessage = await createFetchErrorMessage(res, 'getFeatureById failed');
             throw new Error(errorMessage);
         }
-        const feature = (await response.json());
+        const feature = (await res.json());
         let refseqIds = [];
-        try {
-            refseqIds = await getRefseqId(access.address, access.accessToken, flags.refseq, flags.assembly);
-        }
-        catch (error) {
-            this.logToStderr(error.message);
-            this.exit(1);
-        }
+        refseqIds = await getRefseqId(access.address, access.accessToken, flags.refseq, flags.assembly);
         if (refseqIds.length === 0) {
-            this.logToStderr('No reference sequence found');
-            this.exit(1);
+            this.error('No reference sequence found');
         }
         const [refseq] = refseqIds;
         const assembly = await getAssemblyFromRefseq(access.address, access.accessToken, refseq);
         const newId = new ObjectId().toHexString();
         const rescopy = await this.copyFeature(access.address, access.accessToken, feature, refseq, flags.start, assembly, newId);
         if (!rescopy.ok) {
-            const message = feature['message'];
-            this.logToStderr(message);
-            this.exit(1);
+            const errorMessage = await createFetchErrorMessage(rescopy, 'Copy feature failed');
+            throw new Error(errorMessage);
         }
         this.exit(0);
     }
@@ -100,11 +91,11 @@ export default class Copy extends BaseCommand {
                 'Content-Type': 'application/json',
             },
         };
-        const response = await fetch(url, auth);
-        if (!response.ok) {
-            const errorMessage = await createFetchErrorMessage(response, 'copyFeature failed');
+        const res = await fetch(url, auth);
+        if (!res.ok) {
+            const errorMessage = await createFetchErrorMessage(res, 'copyFeature failed');
             throw new Error(errorMessage);
         }
-        return response;
+        return res;
     }
 }

package/dist/commands/feature/delete.js

@@ -1,6 +1,4 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/no-unnecessary-condition */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { Flags } from '@oclif/core';
 import { fetch } from 'undici';
@@ -67,30 +65,23 @@ export default class Delete extends BaseCommand {
         }
         const access = await this.getAccess(flags['config-file'], flags.profile);
         for (const featureId of featureIds) {
-            const response = await getFeatureById(access.address, access.accessToken, featureId);
-            if (response.status === 404 && flags.force) {
+            const res = await getFeatureById(access.address, access.accessToken, featureId);
+            if (res.status === 404 && flags.force) {
                 continue;
             }
-            if (!response.ok) {
-                const errorMessage = await createFetchErrorMessage(response, 'getFeatureById failed');
+            if (!res.ok) {
+                const errorMessage = await createFetchErrorMessage(res, 'getFeatureById failed');
                 throw new Error(errorMessage);
             }
-            const feature = JSON.parse(await response.text());
-            if (!response.ok) {
-                const message = feature['message'];
-                this.logToStderr(message);
-                this.exit(1);
-            }
+            const feature = JSON.parse(await res.text());
             if (flags['dry-run']) {
                 this.log(feature);
             }
             else {
                 const delFet = await deleteFeature(access.address, access.accessToken, feature);
                 if (!delFet.ok) {
-                    const json = (await delFet.json());
-                    const message = json['message'];
-                    this.logToStderr(message);
-                    this.exit(1);
+                    const errorMessage = await createFetchErrorMessage(delFet, 'Delete feature failed');
+                    throw new Error(errorMessage);
                 }
             }
         }

package/dist/commands/feature/edit-attribute.js

@@ -47,12 +47,11 @@ export default class EditAttibute extends BaseCommand {
     async run() {
         const { flags } = await this.parse(EditAttibute);
         if (flags.delete && flags.value) {
-            this.logToStderr('Error: Options --delete and --value are mutually exclusive');
-            this.exit(1);
+            this.error('Error: Options --delete and --value are mutually exclusive');
         }
         const ff = idReader([flags['feature-id']]);
         if (ff.length !== 1) {
-            this.logToStderr(`Expected only one feature identifier. Got ${ff.length}`);
+            this.error(`Expected only one feature identifier. Got ${ff.length}`);
         }
         const [featureId] = ff;
         const access = await this.getAccess(flags['config-file'], flags.profile);
@@ -64,7 +63,7 @@ export default class EditAttibute extends BaseCommand {
         const featureJson = JSON.parse(await response.text());
         if (flags.value === undefined && !flags.delete) {
             this.log(JSON.stringify(featureJson.attributes[flags.attribute]));
-            this.exit(0);
+            return;
         }
         if (flags.delete) {
             // eslint-disable-next-line @typescript-eslint/no-dynamic-delete

package/dist/commands/feature/edit-coords.js

@@ -37,34 +37,31 @@ export default class Get extends BaseCommand {
     async run() {
         const { flags } = await this.parse(Get);
         if (flags.start === undefined && flags.end === undefined) {
-            this.logToStderr('Please provide new start and/or end coordinates to edit');
-            this.exit(1);
+            this.error('Please provide new start and/or end coordinates to edit');
         }
         if (flags.start !== undefined && flags.start <= 0) {
-            this.logToStderr('Coordinates must be greater than 0');
-            this.exit(1);
+            this.error('Coordinates must be greater than 0');
         }
         if (flags.start !== undefined &&
             flags.end !== undefined &&
             flags.end < flags.start) {
-            this.logToStderr('Error: The new end coordinate is lower than the new start coordinate');
-            this.exit(1);
+            this.error('Error: The new end coordinate is lower than the new start coordinate');
         }
         if (flags.start !== undefined) {
             flags.start -= 1;
         }
         const ff = idReader([flags['feature-id']]);
         if (ff.length !== 1) {
-            this.logToStderr(`Expected only one feature identifier. Got ${ff.length}`);
+            this.error(`Expected only one feature identifier. Got ${ff.length}`);
         }
         const [featureId] = ff;
         const access = await this.getAccess(flags['config-file'], flags.profile);
-        const response = await getFeatureById(access.address, access.accessToken, featureId);
-        if (!response.ok) {
-            const errorMessage = await createFetchErrorMessage(response, 'getFeatureById failed');
+        const res = await getFeatureById(access.address, access.accessToken, featureId);
+        if (!res.ok) {
+            const errorMessage = await createFetchErrorMessage(res, 'getFeatureById failed');
             throw new Error(errorMessage);
         }
-        const featureJson = JSON.parse(await response.text());
+        const featureJson = JSON.parse(await res.text());
         const assembly = await getAssemblyFromRefseq(access.address, access.accessToken, featureJson['refSeq']);
         const currentEnd = featureJson['end'];
         let edit = ['Start', 'End'];

package/dist/commands/feature/edit-type.js

@@ -24,7 +24,7 @@ export default class Get extends BaseCommand {
         const { flags } = await this.parse(Get);
         const ff = idReader([flags['feature-id']]);
         if (ff.length !== 1) {
-            this.logToStderr(`Expected only one feature identifier. Got ${ff.length}`);
+            this.error(`Expected only one feature identifier. Got ${ff.length}`);
         }
         const [featureId] = ff;
         const access = await this.getAccess(flags['config-file'], flags.profile);
@@ -37,11 +37,11 @@ export default class Get extends BaseCommand {
         const currentType = featureJson['type'];
         if (flags.type === undefined) {
             this.log(currentType);
-            this.exit(0);
+            return;
         }
         if (flags.type === currentType) {
             this.logToStderr(`NOTE: Feature ${featureId} is already of type "${flags.type}"`);
-            this.exit(0);
+            return;
         }
         const assembly = await getAssemblyFromRefseq(access.address, access.accessToken, featureJson['refSeq']);
         const changeJson = {
@@ -66,5 +66,6 @@ export default class Get extends BaseCommand {
             const errorMessage = await createFetchErrorMessage(res, 'edit-type failed');
             throw new Error(errorMessage);
         }
+        this.exit(0);
     }
 }

package/dist/commands/feature/edit.js

@@ -42,21 +42,9 @@ export default class Get extends BaseCommand {
         else if (fs.existsSync(flags['json-input'])) {
             jsonStr = fs.readFileSync(flags['json-input']).toString();
         }
-        let json;
-        try {
-            json = JSON.parse(jsonStr);
-            if (!Array.isArray(json)) {
-                json = [json];
-            }
-        }
-        catch (error) {
-            if (error instanceof Error) {
-                this.logToStderr(`Error parsing json input:\n${error.message}`);
-                this.exit(1);
-            }
-            else {
-                throw error;
-            }
+        let json = JSON.parse(jsonStr);
+        if (!Array.isArray(json)) {
+            json = [json];
         }
         const access = await this.getAccess(flags['config-file'], flags.profile);
         for (const change of json) {

package/dist/commands/feature/get.js

@@ -37,21 +37,10 @@ export default class Get extends BaseCommand {
         const { flags } = await this.parse(Get);
         const endCoord = flags.end ?? Number.MAX_SAFE_INTEGER;
         if (flags.start <= 0 || endCoord <= 0) {
-            this.logToStderr('Start and end coordinates must be greater than 0.');
-            this.exit(1);
+            this.error('Start and end coordinates must be greater than 0.');
         }
         const access = await this.getAccess(flags['config-file'], flags.profile);
-        let refseqIds = [];
-        try {
-            refseqIds = await getRefseqId(access.address, access.accessToken, flags.refseq, flags.assembly);
-        }
-        catch (error) {
-            this.logToStderr(error.message);
-            this.exit(1);
-        }
-        if (refseqIds.length === 0) {
-            this.logToStderr('No reference sequence found');
-        }
+        const refseqIds = await getRefseqId(access.address, access.accessToken, flags.refseq, flags.assembly);
         const results = [];
         for (const refseq of refseqIds) {
             const features = await this.getFeatures(access.address, access.accessToken, refseq, flags.start, endCoord);
@@ -77,11 +66,11 @@ export default class Get extends BaseCommand {
                 'Content-Type': 'application/json',
             },
         };
-        const response = await fetch(url, auth);
-        if (!response.ok) {
-            const errorMessage = await createFetchErrorMessage(response, 'Failed to access Apollo with the current address and/or access token\nThe server returned:\n');
+        const res = await fetch(url, auth);
+        if (!res.ok) {
+            const errorMessage = await createFetchErrorMessage(res, 'Failed to access Apollo with the current address and/or access token\nThe server returned:\n');
             throw new Error(errorMessage);
         }
-        return response;
+        return res;
     }
 }

package/dist/commands/feature/import.js

@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import * as fs from 'node:fs';
 import { Flags } from '@oclif/core';
 import { fetch } from 'undici';
@@ -33,22 +31,18 @@ export default class Import extends BaseCommand {
     async run() {
         const { flags } = await this.parse(Import);
         if (!fs.existsSync(flags['input-file'])) {
-            this.logToStderr(`File "${flags['input-file']}" does not exist`);
-            this.exit(1);
+            this.error(`File "${flags['input-file']}" does not exist`);
         }
         const access = await this.getAccess(flags['config-file'], flags.profile);
         const assembly = await convertAssemblyNameToId(access.address, access.accessToken, [flags.assembly]);
         if (assembly.length === 0) {
-            this.logToStderr(`Assembly "${flags.assembly}" does not exist. Perhaps you want to create this assembly first`);
-            this.exit(1);
+            this.error(`Assembly "${flags.assembly}" does not exist. Perhaps you want to create this assembly first`);
         }
         const uploadId = await uploadFile(access.address, access.accessToken, flags['input-file'], 'text/x-gff3');
-        const response = await importFeatures(access.address, access.accessToken, assembly[0], uploadId, flags['delete-existing']);
-        if (!response.ok) {
-            const json = JSON.parse(await response.text());
-            const message = json['message'];
-            this.logToStderr(message);
-            this.exit(1);
+        const res = await importFeatures(access.address, access.accessToken, assembly[0], uploadId, flags['delete-existing']);
+        if (!res.ok) {
+            const errorMessage = await createFetchErrorMessage(res, 'Import features failed');
+            throw new Error(errorMessage);
         }
         this.exit(0);
     }

package/dist/commands/login.js

@@ -8,8 +8,8 @@ import * as querystring from 'node:querystring';
 import { Errors, Flags, ux } from '@oclif/core';
 import open from 'open';
 import { fetch } from 'undici';
+import { ApolloConf } from '../ApolloConf.js';
 import { BaseCommand } from '../baseCommand.js';
-import { Config, ConfigError } from '../Config.js';
 import { basicCheckConfig, createFetchErrorMessage, getUserCredentials, localhostToAddress, waitFor, wrapLines, } from '../utils.js';
 export default class Login extends BaseCommand {
     static summary = 'Login to Apollo';
@@ -61,21 +61,12 @@ export default class Login extends BaseCommand {
         if (profileName === undefined) {
             profileName = process.env.APOLLO_PROFILE ?? 'default';
         }
-        try {
-            basicCheckConfig(configFile, profileName);
-        }
-        catch (error) {
-            if (error instanceof ConfigError) {
-                this.logToStderr(error.message);
-                this.exit(1);
-            }
-        }
-        const config = new Config(configFile);
-        const accessType = config.get('accessType', profileName);
-        const address = flags.address ?? config.get('address', profileName);
+        basicCheckConfig(configFile, profileName);
+        const config = new ApolloConf(configFile);
+        const accessType = config.get(`${profileName}.accessType`);
+        const address = flags.address ?? config.get(`${profileName}.address`);
         if (address === undefined) {
-            this.logToStderr('Address to apollo must be set');
-            this.exit(1);
+            this.error('Address to apollo must be set');
         }
         let userCredentials = { accessToken: '' };
         try {
@@ -83,11 +74,12 @@ export default class Login extends BaseCommand {
                 await this.checkUserAlreadyLoggedIn();
             }
             if (accessType === 'root' || flags.username !== undefined) {
-                const username = flags.username ?? config.get('rootCredentials.username', profileName);
-                const password = flags.password ?? config.get('rootCredentials.password', profileName);
+                const username = flags.username ??
+                    config.get(`${profileName}.rootCredentials.username`);
+                const password = flags.password ??
+                    config.get(`${profileName}.rootCredentials.password`);
                 if (username === undefined || password === undefined) {
-                    this.logToStderr('Username and password must be set');
-                    this.exit(1);
+                    this.error('Username and password must be set');
                 }
                 userCredentials = await this.startRootLogin(address, username, password);
             }
@@ -95,8 +87,7 @@ export default class Login extends BaseCommand {
                 userCredentials = await this.startGuestLogin(address);
             }
             else if (accessType === undefined) {
-                this.logToStderr('Undefined access type');
-                this.exit(1);
+                this.error('Undefined access type');
             }
             else {
                 userCredentials = await this.startAuthorizationCodeFlow(address, accessType, flags.port);
@@ -105,16 +96,13 @@ export default class Login extends BaseCommand {
         catch (error) {
             if ((error instanceof Errors.CLIError && error.message === 'ctrl-c') ||
                 error instanceof Errors.ExitError) {
-                this.exit(0);
+                return;
             }
-            else if (error instanceof Error) {
-                this.logToStderr(error.stack);
-                ux.action.stop(error.message);
-                this.exit(1);
+            if (error instanceof Error) {
+                throw error;
             }
         }
-        config.set('accessToken', userCredentials.accessToken, profileName);
-        config.writeConfigFile();
+        config.set(`${profileName}.accessToken`, userCredentials.accessToken);
     }
     async checkUserAlreadyLoggedIn() {
         const userCredentials = getUserCredentials();

package/dist/commands/logout.js

@@ -1,6 +1,6 @@
 import path from 'node:path';
+import { ApolloConf, KEYS } from '../ApolloConf.js';
 import { BaseCommand } from '../baseCommand.js';
-import { Config, ConfigError, KEYS } from '../Config.js';
 import { basicCheckConfig, wrapLines } from '../utils.js';
 export default class Logout extends BaseCommand {
     static summary = 'Logout of Apollo';
@@ -25,17 +25,8 @@ export default class Logout extends BaseCommand {
         if (configFile === undefined) {
             configFile = path.join(this.config.configDir, 'config.yaml');
         }
-        try {
-            basicCheckConfig(configFile, profileName);
-        }
-        catch (error) {
-            if (error instanceof ConfigError) {
-                this.logToStderr(error.message);
-                this.exit(1);
-            }
-        }
-        const config = new Config(configFile);
-        config.set(KEYS.accessToken, '', profileName);
-        config.writeConfigFile();
+        basicCheckConfig(configFile, profileName);
+        const config = new ApolloConf(configFile);
+        config.delete(`${profileName}.${KEYS.accessToken}`);
     }
 }

package/dist/commands/status.js

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unnecessary-condition */
 import path from 'node:path';
+import { ApolloConf, KEYS } from '../ApolloConf.js';
 import { BaseCommand } from '../baseCommand.js';
-import { Config, ConfigError, KEYS } from '../Config.js';
 import { basicCheckConfig, wrapLines } from '../utils.js';
 export default class Status extends BaseCommand {
     static summary = 'View authentication status';
@@ -17,17 +17,9 @@ export default class Status extends BaseCommand {
         if (configFile === undefined) {
             configFile = path.join(this.config.configDir, 'config.yaml');
         }
-        try {
-            basicCheckConfig(configFile, profileName);
-        }
-        catch (error) {
-            if (error instanceof ConfigError) {
-                this.logToStderr(error.message);
-                this.exit(1);
-            }
-        }
-        const config = new Config(configFile);
-        const accessToken = config.get(KEYS.accessToken, profileName);
+        basicCheckConfig(configFile, profileName);
+        const config = new ApolloConf(configFile);
+        const accessToken = config.get(`${profileName}.${KEYS.accessToken}`);
         if (accessToken === undefined || accessToken.trim() === '') {
             this.log(`${profileName}: Logged out`);
         }