@dittowords/cli 2.7.1 → 3.0.0

package/bin/utils/promptForProject.js.map

@@ -1 +1 @@
-{"version":3,"file":"promptForProject.js","sourceRoot":"","sources":["../../lib/utils/promptForProject.ts"],"names":[],"mappings":";;;;;AAAA,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAE7C,uDAA+B;AAG/B,SAAS,mBAAmB,CAAC,OAAgB;IAC3C,OAAO,CACL,OAAO,CAAC,IAAI;QACZ,GAAG;QACH,gBAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,kCAAkC,OAAO,CAAC,EAAE,EAAE,CAAC,CAC7E,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,QAAgB;IACrC,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,IAAI,CAAC;KACb;IAED,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAEjE,IAAI,EAAE,KAAK,KAAK,EAAE;QAChB,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,yBAAyB,EAAE,CAAC;KAChD;IAED,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;AACtB,CAAC;AAQD,MAAM,gBAAgB,GAAG,KAAK,EAAE,EAC9B,OAAO,EACP,QAAQ,EACR,KAAK,GAAG,EAAE,GACU,EAAE,EAAE;IACxB,gBAAM,CAAC,EAAE,EAAE,CAAC;IAEZ,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC;QAC9B,IAAI,EAAE,SAAS;QACf,OAAO;QACP,KAAK;QACL,OAAO;KACR,CAAC,CAAC;IAEH,IAAI,QAAQ,CAAC;IAEb,IAAI;QACF,QAAQ,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC;KAC/B;IAAC,OAAO,CAAC,EAAE;QACV,oDAAoD;QACpD,4CAA4C;QAC5C,QAAQ,GAAG,IAAI,CAAC;KACjB;IAED,OAAO,aAAa,CAAC,QAAQ,CAAC,CAAC;AACjC,CAAC,CAAC;AAEF,kBAAe,gBAAgB,CAAC"}
+{"version":3,"file":"promptForProject.js","sourceRoot":"","sources":["../../lib/utils/promptForProject.ts"],"names":[],"mappings":";;;;;AAAA,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAE7C,uDAA+B;AAE/B,qDAAgD;AAEhD,SAAS,mBAAmB,CAAC,OAAgB;IAC3C,OAAO,CACL,OAAO,CAAC,IAAI,GAAG,GAAG,GAAG,gBAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,IAAA,6BAAY,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAC5E,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,QAAgB;IACrC,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,IAAI,CAAC;KACb;IAED,MAAM,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAEjE,IAAI,EAAE,KAAK,KAAK,EAAE;QAChB,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,yBAAyB,EAAE,CAAC;KAChD;IAED,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;AACtB,CAAC;AAQD,MAAM,gBAAgB,GAAG,KAAK,EAAE,EAC9B,OAAO,EACP,QAAQ,EACR,KAAK,GAAG,EAAE,GACU,EAAE,EAAE;IACxB,gBAAM,CAAC,EAAE,EAAE,CAAC;IAEZ,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG,IAAI,YAAY,CAAC;QAC9B,IAAI,EAAE,SAAS;QACf,OAAO;QACP,KAAK;QACL,OAAO;KACR,CAAC,CAAC;IAEH,IAAI,QAAQ,CAAC;IAEb,IAAI;QACF,QAAQ,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC;KAC/B;IAAC,OAAO,CAAC,EAAE;QACV,oDAAoD;QACpD,4CAA4C;QAC5C,QAAQ,GAAG,IAAI,CAAC;KACjB;IAED,OAAO,aAAa,CAAC,QAAQ,CAAC,CAAC;AACjC,CAAC,CAAC;AAEF,kBAAe,gBAAgB,CAAC"}

package/bin/utils/quit.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.quit = void 0;
+function quit(message, exitCode = 2) {
+    console.log(`\n${message}\n`);
+    process.exitCode = exitCode;
+    process.exit();
+}
+exports.quit = quit;
+//# sourceMappingURL=quit.js.map

package/bin/utils/quit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"quit.js","sourceRoot":"","sources":["../../lib/utils/quit.ts"],"names":[],"mappings":";;;AAAA,SAAgB,IAAI,CAAC,OAAe,EAAE,QAAQ,GAAG,CAAC;IAChD,OAAO,CAAC,GAAG,CAAC,KAAK,OAAO,IAAI,CAAC,CAAC;IAC9B,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC5B,OAAO,CAAC,IAAI,EAAE,CAAC;AACjB,CAAC;AAJD,oBAIC"}

package/lib/add-project.ts

@@ -1,16 +1,11 @@
-import { collectAndSaveProject } from "./init/project";
+import { collectAndSaveSource } from "./init/project";
 import projectsToText from "./utils/projectsToText";
 import {
   getSelectedProjects,
   getIsUsingComponents,
 } from "./utils/getSelectedProjects";
 import output from "./output";
-
-function quit(exitCode = 2) {
-  console.log("Project selection was not updated.");
-  process.exitCode = exitCode;
-  process.exit();
-}
+import { quit } from "./utils/quit";
 
 const addProject = async () => {
   const projects = getSelectedProjects();
@@ -38,13 +33,15 @@ const addProject = async () => {
         )}`
       );
     }
-    await collectAndSaveProject(false);
+    await collectAndSaveSource({
+      components: false,
+    });
   } catch (error) {
     console.log(
       `\nSorry, there was an error adding a project to your workspace: `,
       error
     );
-    quit();
+    quit("Project selection was not updated.");
   }
 };
 

package/lib/api.ts

@@ -1,5 +1,4 @@
 import axios from "axios";
-import https from "https";
 
 import config from "./config";
 import consts from "./consts";
@@ -10,10 +9,6 @@ export const create = (token?: string) => {
     headers: {
       Authorization: `token ${token}`,
     },
-    httpsAgent: new https.Agent({
-      requestCert: true,
-      rejectUnauthorized: false,
-    }),
   });
 };
 

package/lib/config.ts

@@ -3,16 +3,30 @@ import path from "path";
 import url from "url";
 import yaml from "js-yaml";
 
+import output from "./output";
 import consts from "./consts";
 import { Project, ConfigYAML } from "./types";
 
-function createFileIfMissing(filename: string) {
+export const DEFAULT_CONFIG_JSON: ConfigYAML = {
+  sources: {
+    components: { enabled: true },
+  },
+  variants: true,
+  format: "flat",
+};
+
+export const DEFAULT_CONFIG = yaml.dump(DEFAULT_CONFIG_JSON);
+
+function createFileIfMissing(filename: string, defaultContents?: any) {
   const dir = path.dirname(filename);
 
+  // create the directory if it doesn't already exist
   if (!fs.existsSync(dir)) fs.mkdirSync(dir);
 
+  // create the file if it doesn't already exist
   if (!fs.existsSync(filename)) {
-    fs.closeSync(fs.openSync(filename, "w"));
+    // create the file, writing the `defaultContents` if provided
+    fs.writeFileSync(filename, defaultContents || "", "utf-8");
   }
 }
 
@@ -26,11 +40,13 @@ function jsonIsGlobalYAML(
   return (
     !!json &&
     typeof json === "object" &&
-    Object.values(json).every((arr) =>
-      arr.every(
-        (val: any) =>
-          typeof val === "object" && Object.keys(val).includes("token")
-      )
+    Object.values(json).every(
+      (arr) =>
+        (arr as any).every &&
+        arr.every(
+          (val: any) =>
+            typeof val === "object" && Object.keys(val).includes("token")
+        )
     )
   );
 }
@@ -45,7 +61,7 @@ function readProjectConfigData(
   file = consts.PROJECT_CONFIG_FILE,
   defaultData = {}
 ): ConfigYAML {
-  createFileIfMissing(file);
+  createFileIfMissing(file, DEFAULT_CONFIG);
   const fileContents = fs.readFileSync(file, "utf8");
   const yamlData = yaml.load(fileContents);
   if (jsonIsConfigYAML(yamlData)) {
@@ -73,10 +89,20 @@ function readGlobalConfigData(
   return defaultData;
 }
 
-function writeProjectConfigData(file: string, data: object) {
-  createFileIfMissing(file);
+function writeProjectConfigData(file: string, data: Partial<ConfigYAML>) {
+  createFileIfMissing(file, DEFAULT_CONFIG);
   const existingData = readProjectConfigData(file);
-  const yamlStr = yaml.dump({ ...existingData, ...data });
+
+  const configData: ConfigYAML = {
+    ...existingData,
+    ...data,
+    sources: {
+      ...existingData.sources,
+      ...data.sources,
+    },
+  };
+
+  const yamlStr = yaml.dump(configData);
   fs.writeFileSync(file, yamlStr, "utf8");
 }
 
@@ -160,14 +186,22 @@ function dedupeProjectName(projectNames: Set<string>, projectName: string) {
  * - an array of valid, deduped projects
  * - the `variants` and `format` config options
  */
-function parseSourceInformation() {
-  const { projects, components, variants, format, status } =
-    readProjectConfigData();
+function parseSourceInformation(file?: string) {
+  const {
+    sources,
+    variants,
+    format,
+    status,
+    richText,
+    projects: projectsRoot,
+    components: componentsRoot,
+  } = readProjectConfigData(file);
+
+  const projects = sources?.projects || [];
 
   const projectNames = new Set<string>();
   const validProjects: Project[] = [];
-
-  let componentLibraryInProjects = false;
+  let hasComponentLibraryInProjects = false;
 
   (projects || []).forEach((project) => {
     const isValid = project.id && project.name;
@@ -176,7 +210,7 @@ function parseSourceInformation() {
     }
 
     if (project.id === "ditto_component_library") {
-      componentLibraryInProjects = true;
+      hasComponentLibraryInProjects = true;
       return;
     }
 
@@ -186,8 +220,7 @@ function parseSourceInformation() {
     validProjects.push(project);
   });
 
-  const shouldFetchComponentLibrary =
-    !!components || componentLibraryInProjects;
+  const shouldFetchComponentLibrary = Boolean(sources?.components?.enabled);
 
   const hasSourceData = !!validProjects.length || shouldFetchComponentLibrary;
 
@@ -198,6 +231,11 @@ function parseSourceInformation() {
     variants: variants || false,
     format,
     status,
+    richText,
+    hasTopLevelProjectsField: !!projectsRoot,
+    hasTopLevelComponentsField: !!componentsRoot,
+    hasComponentLibraryInProjects,
+    componentFolders: sources?.components?.folders || null,
   };
 }
 

package/lib/ditto.ts

@@ -4,93 +4,109 @@ import { program } from "commander";
 // to use V8's code cache to speed up instantiation time
 import "v8-compile-cache";
 
-import { init, needsInit } from "./init/init";
+import { init, needsTokenOrSource } from "./init/init";
 import { pull } from "./pull";
-
+import { quit } from "./utils/quit";
 import addProject from "./add-project";
 import removeProject from "./remove-project";
+
 import processMetaOption from "./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();
-}
+type Command = "pull" | "project" | "project add" | "project remove";
+
+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",
+      },
+    ],
+  },
+] as const;
 
 const setupCommands = () => {
   program.name("ditto-cli");
-  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 = program
-    .command("project")
-    .description(projectDescription)
-    .action(() => checkInit("project"));
 
-  projectCommand
-    .command("add")
-    .description(projectDescription)
-    .action(() => checkInit("project"));
+  COMMANDS.forEach((config) => {
+    const cmd = program
+      .command(config.name)
+      .description(config.description)
+      .action(() => executeCommand(config.name));
 
-  projectCommand
-    .command("remove")
-    .description("Stop syncing copy from a Ditto project")
-    .action(() => checkInit("project remove"));
+    if ("commands" in config) {
+      config.commands.forEach((nestedCommand) => {
+        cmd
+          .command(nestedCommand.name)
+          .description(nestedCommand.description)
+          .action(() => executeCommand(`${config.name} ${nestedCommand.name}`));
+      });
+    }
+  });
 };
 
 const setupOptions = () => {
   program.option(
     "-m, --meta <data...>",
-    "Optional metadata for this command to send arbitrary data to the backend. Ex: -m githubActionRequest:true trigger:manual"
+    "Include arbitrary data in requests to the Ditto API. Ex: -m githubActionRequest:true trigger:manual"
   );
 };
 
-const checkInit = async (command: string) => {
-  if (needsInit() && command !== "project remove") {
+const executeCommand = async (command: Command | "none"): Promise<void> => {
+  const needsInitialization = needsTokenOrSource();
+  if (needsInitialization) {
     try {
       await init();
-      if (command === "pull") main(); // re-run to actually pull text now that init is finished
     } catch (error) {
-      quit();
+      quit("Exiting Ditto CLI...");
+      return;
     }
-  } else {
-    const { meta } = program.opts();
-    switch (command) {
-      case "pull":
-        pull({ meta: processMetaOption(meta) });
-        break;
-      case "project":
-      case "project add":
-        addProject();
-        break;
-      case "project remove":
-        removeProject();
-        break;
-      case "none":
-        setupCommands();
-        program.help();
-        break;
-      default:
-        quit();
+  }
+
+  const { meta } = program.opts();
+  switch (command) {
+    case "none":
+    case "pull": {
+      return pull({ meta: processMetaOption(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 addProject();
+    }
+    case "project remove": {
+      return removeProject();
+    }
+    default: {
+      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;
   }
+
   program.parse(process.argv);
 };
 

package/lib/http/fetchVariants.ts

@@ -0,0 +1,30 @@
+import { AxiosRequestConfig } from "axios";
+import api from "../api";
+import { PullOptions } from "../pull";
+import { SourceInformation } from "../types";
+
+export async function fetchVariants(
+  source: SourceInformation,
+  options: PullOptions = {}
+) {
+  if (!source.variants) {
+    return null;
+  }
+
+  const { shouldFetchComponentLibrary, validProjects } = source;
+
+  const config: AxiosRequestConfig = {
+    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.get<{ apiID: string }[]>("/variants", config);
+
+  return data;
+}

package/lib/init/init.ts

@@ -4,13 +4,15 @@ import boxen from "boxen";
 import chalk from "chalk";
 import projectsToText from "../utils/projectsToText";
 
-import { needsSource, collectAndSaveProject } from "./project";
+import { needsSource, collectAndSaveSource } from "./project";
 import { needsToken, collectAndSaveToken } from "./token";
 
 import config from "../config";
+import output from "../output";
 import sourcesToText from "../utils/sourcesToText";
+import { quit } from "../utils/quit";
 
-export const needsInit = () => needsToken() || needsSource();
+export const needsTokenOrSource = () => needsToken() || needsSource();
 
 function welcome() {
   const msg = chalk.white(`${chalk.bold(
@@ -29,11 +31,41 @@ export const init = async () => {
     await collectAndSaveToken();
   }
 
-  const { hasSourceData, validProjects, shouldFetchComponentLibrary } =
-    config.parseSourceInformation();
+  const {
+    hasSourceData,
+    validProjects,
+    shouldFetchComponentLibrary,
+    hasTopLevelComponentsField,
+    hasTopLevelProjectsField,
+  } = config.parseSourceInformation();
+
+  if (hasTopLevelProjectsField) {
+    return quit(`${output.errorText(
+      `Support for ${output.warnText(
+        "projects"
+      )} as a top-level field has been removed; please configure ${output.warnText(
+        "sources.projects"
+      )} instead.`
+    )}
+See ${output.url("https://github.com/dittowords/cli")} for more information.`);
+  }
+
+  if (hasTopLevelComponentsField) {
+    return quit(
+      `${output.errorText(
+        "Support for `components` as a top-level field has been removed; please configure `sources.components` instead."
+      )}
+See ${output.url("https://github.com/dittowords/cli")} for more information.`
+    );
+  }
 
   if (!hasSourceData) {
-    await collectAndSaveProject(true);
+    console.log(
+      `Looks like there are no Ditto sources selected for your current directory: ${output.info(
+        process.cwd()
+      )}.`
+    );
+    await collectAndSaveSource({ initialize: true, components: true });
     return;
   }
 
@@ -44,4 +76,4 @@ export const init = async () => {
   console.log(message);
 };
 
-export default { needsInit, init };
+export default { init };

package/lib/init/project.test.ts

@@ -42,8 +42,8 @@ describe("saveProject", () => {
   it("creates a config file with config data", () => {
     const fileContents = fs.readFileSync(configFile, "utf8");
     const data = yaml.load(fileContents);
-    expect(data.projects).toBeDefined();
-    expect(data.projects[0].name).toEqual(projectName);
-    expect(data.projects[0].id).toEqual(projectId);
+    expect(data.sources.projects).toBeDefined();
+    expect(data.sources.projects[0].name).toEqual(projectName);
+    expect(data.sources.projects[0].id).toEqual(projectId);
   });
 });

package/lib/init/project.ts

@@ -12,25 +12,18 @@ import {
 import promptForProject from "../utils/promptForProject";
 import { AxiosResponse } from "axios";
 import { Project, Token } from "../types";
-
-function quit(exitCode = 2) {
-  console.log("\nExiting Ditto CLI...\n");
-  process.exitCode = exitCode;
-  process.exit();
-}
+import { quit } from "../utils/quit";
 
 function saveProject(file: string, name: string, id: string) {
-  // 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.writeProjectConfigData(file, { components: true });
+    config.writeProjectConfigData(file, {
+      sources: { components: { enabled: true } },
+    });
     return;
   }
 
-  const projects = [...getSelectedProjects(), { name, id }];
-
-  config.writeProjectConfigData(file, { projects });
+  const projects = [...getSelectedProjects(file), { name, id }];
+  config.writeProjectConfigData(file, { sources: { projects } });
 }
 
 export const needsSource = () => {
@@ -44,12 +37,8 @@ async function askForAnotherToken() {
   await collectAndSaveToken(message);
 }
 
-async function listProjects(
-  token: Token,
-  projectsAlreadySelected: Project[],
-  componentsSelected: boolean
-) {
-  const spinner = ora("Fetching projects in your workspace...");
+async function listProjects(token: Token, projectsAlreadySelected: Project[]) {
+  const spinner = ora("Fetching sources in your workspace...");
   spinner.start();
 
   let response: AxiosResponse<{ id: string; name: string }[]>;
@@ -64,35 +53,37 @@ async function listProjects(
     throw e;
   }
 
+  const projectsAlreadySelectedSet = projectsAlreadySelected.reduce(
+    (set, project) => set.add(project.id.toString()),
+    new Set<string>()
+  );
+
+  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 }: Project) => {
-    if (id === "ditto_component_library") {
-      return !componentsSelected;
-    } else {
-      return !projectsAlreadySelected.some((project) => project.id === id);
-    }
-  });
-}
 
-async function collectProject(token: Token, initialize: boolean) {
-  const path = process.cwd();
-  if (initialize) {
-    console.log(
-      `Looks like there are no Ditto projects selected for your current directory: ${output.info(
-        path
-      )}.`
-    );
-  }
+  return result;
+}
 
+async function collectSource(token: Token, includeComponents: boolean) {
   const projectsAlreadySelected = getSelectedProjects();
-  const usingComponents = getIsUsingComponents();
-  const projects = await listProjects(
-    token,
-    projectsAlreadySelected,
-    usingComponents
-  );
+  const componentSourceSelected = getIsUsingComponents();
+
+  let sources = await listProjects(token, projectsAlreadySelected);
+  if (includeComponents && !componentSourceSelected) {
+    sources = [
+      { id: "ditto_component_library", name: "Ditto Component Library" },
+      ...sources,
+    ];
+  }
 
-  if (!(projects && projects.length)) {
+  if (!sources?.length) {
     console.log("You're currently syncing all projects in your workspace.");
     console.log(
       output.warnText(
@@ -102,24 +93,22 @@ async function collectProject(token: Token, initialize: boolean) {
     return null;
   }
 
-  const nonInitPrompt = usingComponents
-    ? "Add a project"
-    : "Add a project or library";
-
   return promptForProject({
-    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",
   });
 }
 
-export const collectAndSaveProject = async (initialize = false) => {
+export const collectAndSaveSource = async (
+  { components = false }: { initialize?: boolean; components?: boolean } = {
+    components: false,
+  }
+) => {
   try {
     const token = config.getToken(consts.CONFIG_FILE, consts.API_HOST);
-    const project = await collectProject(token, initialize);
+    const project = await collectSource(token, components);
     if (!project) {
-      quit(0);
+      quit("", 0);
       return;
     }
 
@@ -127,7 +116,7 @@ export const collectAndSaveProject = async (initialize = false) => {
       "\n" +
         `Thanks for adding ${output.info(
           project.name
-        )} to your selected projects.\n` +
+        )} to your selected sources.\n` +
         `We saved your updated configuration to: ${output.info(
           consts.PROJECT_CONFIG_FILE
         )}\n`
@@ -138,13 +127,13 @@ export const collectAndSaveProject = async (initialize = false) => {
     console.log(e);
     if (e.response && e.response.status === 404) {
       await askForAnotherToken();
-      await collectAndSaveProject();
+      await collectAndSaveSource({ components });
     } else {
-      quit();
+      quit("", 2);
     }
   }
 };
 
 export const _testing = { saveProject, needsSource };
 
-export default { needsSource, collectAndSaveProject };
+export default { needsSource, collectAndSaveSource };