@dittowords/cli 2.8.0 → 3.0.0

package/bin/ditto.js

@@ -10,82 +10,91 @@ const commander_1 = require("commander");
 require("v8-compile-cache");
 const init_1 = require("./init/init");
 const pull_1 = require("./pull");
+const quit_1 = require("./utils/quit");
 const add_project_1 = __importDefault(require("./add-project"));
 const remove_project_1 = __importDefault(require("./remove-project"));
 const processMetaOption_1 = __importDefault(require("./utils/processMetaOption"));
-/**
- * Catch and report unexpected error.
- * @param {any} error The thrown error object.
- * @returns {void}
- */
-function quit(exitCode = 2) {
-    console.log("\nExiting Ditto CLI...\n");
-    process.exitCode = exitCode;
-    process.exit();
-}
+const COMMANDS = [
+    {
+        name: "pull",
+        description: "Sync copy from Ditto into the current working directory",
+    },
+    {
+        name: "project",
+        description: "Add a Ditto project to sync copy from",
+        commands: [
+            {
+                name: "add",
+                description: "Add a Ditto project to sync copy from",
+            },
+            {
+                name: "remove",
+                description: "Stop syncing copy from a Ditto project",
+            },
+        ],
+    },
+];
 const setupCommands = () => {
     commander_1.program.name("ditto-cli");
-    commander_1.program
-        .command("pull")
-        .description("Sync copy from Ditto into working directory")
-        .action(() => checkInit("pull"));
-    const projectDescription = "Add a Ditto project to sync copy from";
-    const projectCommand = commander_1.program
-        .command("project")
-        .description(projectDescription)
-        .action(() => checkInit("project"));
-    projectCommand
-        .command("add")
-        .description(projectDescription)
-        .action(() => checkInit("project"));
-    projectCommand
-        .command("remove")
-        .description("Stop syncing copy from a Ditto project")
-        .action(() => checkInit("project remove"));
+    COMMANDS.forEach((config) => {
+        const cmd = commander_1.program
+            .command(config.name)
+            .description(config.description)
+            .action(() => executeCommand(config.name));
+        if ("commands" in config) {
+            config.commands.forEach((nestedCommand) => {
+                cmd
+                    .command(nestedCommand.name)
+                    .description(nestedCommand.description)
+                    .action(() => executeCommand(`${config.name} ${nestedCommand.name}`));
+            });
+        }
+    });
 };
 const setupOptions = () => {
-    commander_1.program.option("-m, --meta <data...>", "Optional metadata for this command to send arbitrary data to the backend. Ex: -m githubActionRequest:true trigger:manual");
+    commander_1.program.option("-m, --meta <data...>", "Include arbitrary data in requests to the Ditto API. Ex: -m githubActionRequest:true trigger:manual");
 };
-const checkInit = async (command) => {
-    if ((0, init_1.needsInit)() && command !== "project remove") {
+const executeCommand = async (command) => {
+    const needsInitialization = (0, init_1.needsTokenOrSource)();
+    if (needsInitialization) {
         try {
             await (0, init_1.init)();
-            if (command === "pull")
-                main(); // re-run to actually pull text now that init is finished
         }
         catch (error) {
-            quit();
+            (0, quit_1.quit)("Exiting Ditto CLI...");
+            return;
         }
     }
-    else {
-        const { meta } = commander_1.program.opts();
-        switch (command) {
-            case "pull":
-                (0, pull_1.pull)({ meta: (0, processMetaOption_1.default)(meta) });
-                break;
-            case "project":
-            case "project add":
-                (0, add_project_1.default)();
-                break;
-            case "project remove":
-                (0, remove_project_1.default)();
-                break;
-            case "none":
-                setupCommands();
-                commander_1.program.help();
-                break;
-            default:
-                quit();
+    const { meta } = commander_1.program.opts();
+    switch (command) {
+        case "none":
+        case "pull": {
+            return (0, pull_1.pull)({ meta: (0, processMetaOption_1.default)(meta) });
+        }
+        case "project":
+        case "project add": {
+            // initialization already includes the selection of a source,
+            // so if `project add` is called during initialization, don't
+            // prompt the user to select a source again
+            if (needsInitialization)
+                return;
+            return (0, add_project_1.default)();
+        }
+        case "project remove": {
+            return (0, remove_project_1.default)();
+        }
+        default: {
+            (0, quit_1.quit)("Exiting Ditto CLI...");
+            return;
         }
     }
 };
 const main = async () => {
+    setupCommands();
+    setupOptions();
     if (process.argv.length <= 2 && process.argv[1].includes("ditto-cli")) {
-        await checkInit("none");
-    }
-    else {
-        setupCommands();
-        setupOptions();
+        await executeCommand("none");
+        return;
     }
     commander_1.program.parse(process.argv);
 };

package/bin/ditto.js.map

@@ -1 +1 @@
-{"version":3,"file":"ditto.js","sourceRoot":"","sources":["../lib/ditto.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ditto.js","sourceRoot":"","sources":["../lib/ditto.ts"],"names":[],"mappings":"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"}

package/bin/http/fetchVariants.js

@@ -0,0 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchVariants = void 0;
+const api_1 = __importDefault(require("../api"));
+async function fetchVariants(source, options = {}) {
+    if (!source.variants) {
+        return null;
+    }
+    const { shouldFetchComponentLibrary, validProjects } = source;
+    const config = {
+        params: { ...options?.meta },
+    };
+    // if we're not syncing from the component library, then we pass the project ids
+    // to limit the list of returned variants to only those that are relevant for the
+    // specified projects
+    if (validProjects.length && !shouldFetchComponentLibrary) {
+        config.params.projectIds = validProjects.map(({ id }) => id);
+    }
+    const { data } = await api_1.default.get("/variants", config);
+    return data;
+}
+exports.fetchVariants = fetchVariants;
+//# sourceMappingURL=fetchVariants.js.map

package/bin/http/fetchVariants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetchVariants.js","sourceRoot":"","sources":["../../lib/http/fetchVariants.ts"],"names":[],"mappings":";;;;;;AACA,iDAAyB;AAIlB,KAAK,UAAU,aAAa,CACjC,MAAyB,EACzB,UAAuB,EAAE;IAEzB,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;QACpB,OAAO,IAAI,CAAC;KACb;IAED,MAAM,EAAE,2BAA2B,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC;IAE9D,MAAM,MAAM,GAAuB;QACjC,MAAM,EAAE,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE;KAC7B,CAAC;IAEF,gFAAgF;IAChF,iFAAiF;IACjF,qBAAqB;IACrB,IAAI,aAAa,CAAC,MAAM,IAAI,CAAC,2BAA2B,EAAE;QACxD,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;KAC9D;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,aAAG,CAAC,GAAG,CAAsB,WAAW,EAAE,MAAM,CAAC,CAAC;IAEzE,OAAO,IAAI,CAAC;AACd,CAAC;AAxBD,sCAwBC"}

package/bin/init/init.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.init = exports.needsInit = void 0;
+exports.init = exports.needsTokenOrSource = void 0;
 // Related to initializing a user/environment to ditto.
 // expected to be run once per project.
 const boxen_1 = __importDefault(require("boxen"));
@@ -11,9 +11,11 @@ const chalk_1 = __importDefault(require("chalk"));
 const project_1 = require("./project");
 const token_1 = require("./token");
 const config_1 = __importDefault(require("../config"));
+const output_1 = __importDefault(require("../output"));
 const sourcesToText_1 = __importDefault(require("../utils/sourcesToText"));
-const needsInit = () => (0, token_1.needsToken)() || (0, project_1.needsSource)();
-exports.needsInit = needsInit;
+const quit_1 = require("../utils/quit");
+const needsTokenOrSource = () => (0, token_1.needsToken)() || (0, project_1.needsSource)();
+exports.needsTokenOrSource = needsTokenOrSource;
 function welcome() {
     const msg = chalk_1.default.white(`${chalk_1.default.bold("Welcome to the", chalk_1.default.magentaBright("Ditto CLI"))}.
 
@@ -25,9 +27,18 @@ const init = async () => {
     if ((0, token_1.needsToken)()) {
         await (0, token_1.collectAndSaveToken)();
     }
-    const { hasSourceData, validProjects, shouldFetchComponentLibrary } = config_1.default.parseSourceInformation();
+    const { hasSourceData, validProjects, shouldFetchComponentLibrary, hasTopLevelComponentsField, hasTopLevelProjectsField, } = config_1.default.parseSourceInformation();
+    if (hasTopLevelProjectsField) {
+        return (0, quit_1.quit)(`${output_1.default.errorText(`Support for ${output_1.default.warnText("projects")} as a top-level field has been removed; please configure ${output_1.default.warnText("sources.projects")} instead.`)}
+See ${output_1.default.url("https://github.com/dittowords/cli")} for more information.`);
+    }
+    if (hasTopLevelComponentsField) {
+        return (0, quit_1.quit)(`${output_1.default.errorText("Support for `components` as a top-level field has been removed; please configure `sources.components` instead.")}
+See ${output_1.default.url("https://github.com/dittowords/cli")} for more information.`);
+    }
     if (!hasSourceData) {
-        await (0, project_1.collectAndSaveProject)(true);
+        console.log(`Looks like there are no Ditto sources selected for your current directory: ${output_1.default.info(process.cwd())}.`);
+        await (0, project_1.collectAndSaveSource)({ initialize: true, components: true });
         return;
     }
     const message = "You're currently set up to sync text from " +
@@ -35,5 +46,5 @@ const init = async () => {
     console.log(message);
 };
 exports.init = init;
-exports.default = { needsInit: exports.needsInit, init: exports.init };
+exports.default = { init: exports.init };
 //# sourceMappingURL=init.js.map

package/bin/init/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../lib/init/init.ts"],"names":[],"mappings":";;;;;;AAAA,uDAAuD;AACvD,uCAAuC;AACvC,kDAA0B;AAC1B,kDAA0B;AAG1B,uCAA+D;AAC/D,mCAA0D;AAE1D,uDAA+B;AAC/B,2EAAmD;AAE5C,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,IAAA,kBAAU,GAAE,IAAI,IAAA,qBAAW,GAAE,CAAC;AAAhD,QAAA,SAAS,aAAuC;AAE7D,SAAS,OAAO;IACd,MAAM,GAAG,GAAG,eAAK,CAAC,KAAK,CAAC,GAAG,eAAK,CAAC,IAAI,CACnC,gBAAgB,EAChB,eAAK,CAAC,aAAa,CAAC,WAAW,CAAC,CACjC;;6BAE0B,CAAC,CAAC;IAC7B,OAAO,CAAC,GAAG,CAAC,IAAA,eAAK,EAAC,GAAG,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAC1C,CAAC;AAEM,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;IAC7B,OAAO,EAAE,CAAC;IAEV,IAAI,IAAA,kBAAU,GAAE,EAAE;QAChB,MAAM,IAAA,2BAAmB,GAAE,CAAC;KAC7B;IAED,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,2BAA2B,EAAE,GACjE,gBAAM,CAAC,sBAAsB,EAAE,CAAC;IAElC,IAAI,CAAC,aAAa,EAAE;QAClB,MAAM,IAAA,+BAAqB,EAAC,IAAI,CAAC,CAAC;QAClC,OAAO;KACR;IAED,MAAM,OAAO,GACX,4CAA4C;QAC5C,IAAA,uBAAa,EAAC,aAAa,EAAE,2BAA2B,CAAC,CAAC;IAE5D,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACvB,CAAC,CAAC;AApBW,QAAA,IAAI,QAoBf;AAEF,kBAAe,EAAE,SAAS,EAAT,iBAAS,EAAE,IAAI,EAAJ,YAAI,EAAE,CAAC"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../lib/init/init.ts"],"names":[],"mappings":";;;;;;AAAA,uDAAuD;AACvD,uCAAuC;AACvC,kDAA0B;AAC1B,kDAA0B;AAG1B,uCAA8D;AAC9D,mCAA0D;AAE1D,uDAA+B;AAC/B,uDAA+B;AAC/B,2EAAmD;AACnD,wCAAqC;AAE9B,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,IAAA,kBAAU,GAAE,IAAI,IAAA,qBAAW,GAAE,CAAC;AAAzD,QAAA,kBAAkB,sBAAuC;AAEtE,SAAS,OAAO;IACd,MAAM,GAAG,GAAG,eAAK,CAAC,KAAK,CAAC,GAAG,eAAK,CAAC,IAAI,CACnC,gBAAgB,EAChB,eAAK,CAAC,aAAa,CAAC,WAAW,CAAC,CACjC;;6BAE0B,CAAC,CAAC;IAC7B,OAAO,CAAC,GAAG,CAAC,IAAA,eAAK,EAAC,GAAG,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAC1C,CAAC;AAEM,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;IAC7B,OAAO,EAAE,CAAC;IAEV,IAAI,IAAA,kBAAU,GAAE,EAAE;QAChB,MAAM,IAAA,2BAAmB,GAAE,CAAC;KAC7B;IAED,MAAM,EACJ,aAAa,EACb,aAAa,EACb,2BAA2B,EAC3B,0BAA0B,EAC1B,wBAAwB,GACzB,GAAG,gBAAM,CAAC,sBAAsB,EAAE,CAAC;IAEpC,IAAI,wBAAwB,EAAE;QAC5B,OAAO,IAAA,WAAI,EAAC,GAAG,gBAAM,CAAC,SAAS,CAC7B,eAAe,gBAAM,CAAC,QAAQ,CAC5B,UAAU,CACX,4DAA4D,gBAAM,CAAC,QAAQ,CAC1E,kBAAkB,CACnB,WAAW,CACb;MACC,gBAAM,CAAC,GAAG,CAAC,mCAAmC,CAAC,wBAAwB,CAAC,CAAC;KAC5E;IAED,IAAI,0BAA0B,EAAE;QAC9B,OAAO,IAAA,WAAI,EACT,GAAG,gBAAM,CAAC,SAAS,CACjB,gHAAgH,CACjH;MACD,gBAAM,CAAC,GAAG,CAAC,mCAAmC,CAAC,wBAAwB,CACxE,CAAC;KACH;IAED,IAAI,CAAC,aAAa,EAAE;QAClB,OAAO,CAAC,GAAG,CACT,8EAA8E,gBAAM,CAAC,IAAI,CACvF,OAAO,CAAC,GAAG,EAAE,CACd,GAAG,CACL,CAAC;QACF,MAAM,IAAA,8BAAoB,EAAC,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;QACnE,OAAO;KACR;IAED,MAAM,OAAO,GACX,4CAA4C;QAC5C,IAAA,uBAAa,EAAC,aAAa,EAAE,2BAA2B,CAAC,CAAC;IAE5D,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACvB,CAAC,CAAC;AAlDW,QAAA,IAAI,QAkDf;AAEF,kBAAe,EAAE,IAAI,EAAJ,YAAI,EAAE,CAAC"}

package/bin/init/project.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._testing = exports.collectAndSaveProject = exports.needsSource = void 0;
+exports._testing = exports.collectAndSaveSource = exports.needsSource = void 0;
 const ora_1 = __importDefault(require("ora"));
 const api_1 = __importDefault(require("../api"));
 const config_1 = __importDefault(require("../config"));
@@ -12,21 +12,16 @@ const output_1 = __importDefault(require("../output"));
 const token_1 = require("./token");
 const getSelectedProjects_1 = require("../utils/getSelectedProjects");
 const promptForProject_1 = __importDefault(require("../utils/promptForProject"));
-function quit(exitCode = 2) {
-    console.log("\nExiting Ditto CLI...\n");
-    process.exitCode = exitCode;
-    process.exit();
-}
+const quit_1 = require("../utils/quit");
 function saveProject(file, name, id) {
-    // old functionality included "ditto_component_library" in the `projects`
-    // array, but we want to always treat the component library as a separate
-    // entity and use the new notation of a top-level `components` key
     if (id === "components") {
-        config_1.default.writeProjectConfigData(file, { components: true });
+        config_1.default.writeProjectConfigData(file, {
+            sources: { components: { enabled: true } },
+        });
         return;
     }
-    const projects = [...(0, getSelectedProjects_1.getSelectedProjects)(), { name, id }];
-    config_1.default.writeProjectConfigData(file, { projects });
+    const projects = [...(0, getSelectedProjects_1.getSelectedProjects)(file), { name, id }];
+    config_1.default.writeProjectConfigData(file, { sources: { projects } });
 }
 const needsSource = () => {
     return !config_1.default.parseSourceInformation().hasSourceData;
@@ -37,8 +32,8 @@ async function askForAnotherToken() {
     const message = "Looks like the API key you have saved no longer works. Please enter another one.";
     await (0, token_1.collectAndSaveToken)(message);
 }
-async function listProjects(token, projectsAlreadySelected, componentsSelected) {
-    const spinner = (0, ora_1.default)("Fetching projects in your workspace...");
+async function listProjects(token, projectsAlreadySelected) {
+    const spinner = (0, ora_1.default)("Fetching sources in your workspace...");
     spinner.start();
     let response;
     try {
@@ -52,49 +47,47 @@ async function listProjects(token, projectsAlreadySelected, componentsSelected)
         spinner.stop();
         throw e;
     }
+    const projectsAlreadySelectedSet = projectsAlreadySelected.reduce((set, project) => set.add(project.id.toString()), new Set());
+    const result = response.data.filter(({ id }) => 
+    // covers an edge case where v0 of the API includes the component library
+    // in the response from the `/project-names` endpoint
+    id !== "ditto_component_library" &&
+        !projectsAlreadySelectedSet.has(id.toString()));
     spinner.stop();
-    return response.data.filter(({ id }) => {
-        if (id === "ditto_component_library") {
-            return !componentsSelected;
-        }
-        else {
-            return !projectsAlreadySelected.some((project) => project.id === id);
-        }
-    });
+    return result;
 }
-async function collectProject(token, initialize) {
-    const path = process.cwd();
-    if (initialize) {
-        console.log(`Looks like there are no Ditto projects selected for your current directory: ${output_1.default.info(path)}.`);
-    }
+async function collectSource(token, includeComponents) {
     const projectsAlreadySelected = (0, getSelectedProjects_1.getSelectedProjects)();
-    const usingComponents = (0, getSelectedProjects_1.getIsUsingComponents)();
-    const projects = await listProjects(token, projectsAlreadySelected, usingComponents);
-    if (!(projects && projects.length)) {
+    const componentSourceSelected = (0, getSelectedProjects_1.getIsUsingComponents)();
+    let sources = await listProjects(token, projectsAlreadySelected);
+    if (includeComponents && !componentSourceSelected) {
+        sources = [
+            { id: "ditto_component_library", name: "Ditto Component Library" },
+            ...sources,
+        ];
+    }
+    if (!sources?.length) {
         console.log("You're currently syncing all projects in your workspace.");
         console.log(output_1.default.warnText("Not seeing a project that you were expecting? Verify that developer mode is enabled on that project. More info: https://www.dittowords.com/docs/ditto-developer-mode"));
         return null;
     }
-    const nonInitPrompt = usingComponents
-        ? "Add a project"
-        : "Add a project or library";
     return (0, promptForProject_1.default)({
-        projects,
-        message: initialize
-            ? "Choose the project or library you'd like to sync text from"
-            : nonInitPrompt,
+        projects: sources,
+        message: "Choose the source you'd like to sync text from",
     });
 }
-const collectAndSaveProject = async (initialize = false) => {
+const collectAndSaveSource = async ({ components = false } = {
+    components: false,
+}) => {
     try {
         const token = config_1.default.getToken(consts_1.default.CONFIG_FILE, consts_1.default.API_HOST);
-        const project = await collectProject(token, initialize);
+        const project = await collectSource(token, components);
         if (!project) {
-            quit(0);
+            (0, quit_1.quit)("", 0);
             return;
         }
         console.log("\n" +
-            `Thanks for adding ${output_1.default.info(project.name)} to your selected projects.\n` +
+            `Thanks for adding ${output_1.default.info(project.name)} to your selected sources.\n` +
             `We saved your updated configuration to: ${output_1.default.info(consts_1.default.PROJECT_CONFIG_FILE)}\n`);
         saveProject(consts_1.default.PROJECT_CONFIG_FILE, project.name, project.id);
     }
@@ -102,14 +95,14 @@ const collectAndSaveProject = async (initialize = false) => {
         console.log(e);
         if (e.response && e.response.status === 404) {
             await askForAnotherToken();
-            await (0, exports.collectAndSaveProject)();
+            await (0, exports.collectAndSaveSource)({ components });
         }
         else {
-            quit();
+            (0, quit_1.quit)("", 2);
         }
     }
 };
-exports.collectAndSaveProject = collectAndSaveProject;
+exports.collectAndSaveSource = collectAndSaveSource;
 exports._testing = { saveProject, needsSource: exports.needsSource };
-exports.default = { needsSource: exports.needsSource, collectAndSaveProject: exports.collectAndSaveProject };
+exports.default = { needsSource: exports.needsSource, collectAndSaveSource: exports.collectAndSaveSource };
 //# sourceMappingURL=project.js.map

package/bin/init/project.js.map

@@ -1 +1 @@
-{"version":3,"file":"project.js","sourceRoot":"","sources":["../../lib/init/project.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"project.js","sourceRoot":"","sources":["../../lib/init/project.ts"],"names":[],"mappings":"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"}

package/bin/init/token.js

@@ -11,6 +11,7 @@ const api_1 = require("../api");
 const consts_1 = __importDefault(require("../consts"));
 const output_1 = __importDefault(require("../output"));
 const config_1 = __importDefault(require("../config"));
+const quit_1 = require("../utils/quit");
 const needsToken = (configFile, host = consts_1.default.API_HOST) => {
     if (config_1.default.getTokenFromEnv()) {
         return false;
@@ -29,22 +30,28 @@ exports.needsToken = needsToken;
 async function checkToken(token) {
     const axios = (0, api_1.create)(token);
     const endpoint = "/token-check";
-    const resOrError = await axios
-        .get(endpoint)
-        .catch((error) => {
-        if (error.code === "ENOTFOUND") {
-            return output_1.default.errorText(`Can't connect to API: ${output_1.default.url(error.hostname)}`);
-        }
-        if (error.response.status === 401 || error.response.status === 404) {
-            return output_1.default.errorText("This API key isn't valid. Please try another.");
-        }
-        return output_1.default.warnText("We're having trouble reaching the Ditto API.");
-    })
-        .catch(() => output_1.default.errorText("Sorry! We're having trouble reaching the Ditto API."));
-    if (typeof resOrError === "string")
+    let resOrError;
+    try {
+        resOrError = await axios.get(endpoint).catch((error) => {
+            if (error.code === "ENOTFOUND") {
+                return output_1.default.errorText(`Can't connect to API: ${output_1.default.url(error.hostname)}`);
+            }
+            if (error.response.status === 401 || error.response.status === 404) {
+                return output_1.default.errorText("This API key isn't valid. Please try another.");
+            }
+            return output_1.default.warnText("We're having trouble reaching the Ditto API.");
+        });
+    }
+    catch (e) {
+        output_1.default.errorText(e);
+        output_1.default.errorText("Sorry! We're having trouble reaching the Ditto API.");
+    }
+    if (typeof resOrError === "string") {
         return resOrError;
-    if (resOrError.status === 200)
+    }
+    if (resOrError?.status === 200) {
         return true;
+    }
     return output_1.default.errorText("This API key isn't valid. Please try another.");
 }
 async function collectToken(message) {
@@ -62,11 +69,6 @@ async function collectToken(message) {
     });
     return response.token;
 }
-function quit(exitCode = 2) {
-    console.log("API key was not saved.");
-    process.exitCode = exitCode;
-    process.exit();
-}
 /**
  *
  * @param {string | null} message
@@ -81,7 +83,7 @@ const collectAndSaveToken = async (message = null) => {
         return token;
     }
     catch (error) {
-        quit();
+        (0, quit_1.quit)("API token was not saved");
     }
 };
 exports.collectAndSaveToken = collectAndSaveToken;

package/bin/init/token.js.map

@@ -1 +1 @@
-{"version":3,"file":"token.js","sourceRoot":"","sources":["../../lib/init/token.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"token.js","sourceRoot":"","sources":["../../lib/init/token.ts"],"names":[],"mappings":"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"}