@dittowords/cli 2.5.0 → 2.5.1

package/lib/add-project.js

@@ -1,6 +1,10 @@
 const { collectAndSaveProject } = require("./init/project");
 const projectsToText = require("./utils/projectsToText");
-const getSelectedProjects = require("./utils/getSelectedProjects");
+const {
+  getSelectedProjects,
+  getIsUsingComponents,
+} = require("./utils/getSelectedProjects");
+const output = require("./output");
 
 function quit(exitCode = 2) {
   console.log("Project selection was not updated.");
@@ -10,13 +14,30 @@ function quit(exitCode = 2) {
 
 const addProject = async () => {
   const projects = getSelectedProjects();
+  const usingComponents = getIsUsingComponents();
 
   try {
-    console.log(
-      `\nYou're currently set up to sync text from the following projects: ${projectsToText(
-        projects
-      )}`
-    );
+    if (usingComponents) {
+      if (projects.length) {
+        console.log(
+          `\nYou're currently set up to sync text from the ${output.info(
+            "Component Library"
+          )} and from the following projects: ${projectsToText(projects)}`
+        );
+      } else {
+        console.log(
+          `\nYou're currently only set up to sync text from the ${output.info(
+            "Component Library"
+          )}`
+        );
+      }
+    } else if (projects.length) {
+      console.log(
+        `\nYou're currently set up to sync text from the following projects: ${projectsToText(
+          projects
+        )}`
+      );
+    }
     await collectAndSaveProject(false);
   } catch (error) {
     console.log(

package/lib/init/project.js

@@ -5,7 +5,10 @@ const config = require("../config");
 const consts = require("../consts");
 const output = require("../output");
 const { collectAndSaveToken } = require("../init/token");
-const getSelectedProjects = require("../utils/getSelectedProjects");
+const {
+  getSelectedProjects,
+  getIsUsingComponents,
+} = require("../utils/getSelectedProjects");
 const promptForProject = require("../utils/promptForProject");
 
 function quit(exitCode = 2) {
@@ -15,10 +18,10 @@ function quit(exitCode = 2) {
 }
 
 function saveProject(file, name, id) {
-  // old functionality included "ditto_component_library" in the `projects`
+  // old functionality included "components" 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 === "ditto_component_library") {
+  if (id === "components") {
     config.writeData(file, { components: true });
     return;
   }
@@ -39,7 +42,11 @@ async function askForAnotherToken() {
   await collectAndSaveToken(message);
 }
 
-async function listProjects(token, projectsAlreadySelected) {
+async function listProjects(
+  token,
+  projectsAlreadySelected,
+  componentsSelected
+) {
   const spinner = ora("Fetching projects in your workspace...");
   spinner.start();
 
@@ -58,9 +65,13 @@ async function listProjects(token, projectsAlreadySelected) {
 
   spinner.stop();
 
-  return projects.data.filter(
-    ({ id }) => !projectsAlreadySelected.some((project) => project.id === id)
-  );
+  return projects.data.filter(({ id }) => {
+    if (id === "ditto_component_library") {
+      return !componentsSelected;
+    } else {
+      return !projectsAlreadySelected.some((project) => project.id === id);
+    }
+  });
 }
 
 async function collectProject(token, initialize) {
@@ -74,19 +85,32 @@ async function collectProject(token, initialize) {
   }
 
   const projectsAlreadySelected = getSelectedProjects();
-  const projects = await listProjects(token, projectsAlreadySelected);
+  const usingComponents = getIsUsingComponents();
+  const projects = await listProjects(
+    token,
+    projectsAlreadySelected,
+    usingComponents
+  );
 
   if (!(projects && projects.length)) {
     console.log("You're currently syncing all projects in your workspace.");
-    console.log(output.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"));
+    console.log(
+      output.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 promptForProject({
     projects,
     message: initialize
-      ? "Choose the project you'd like to sync text from"
-      : "Add a project",
+      ? "Choose the project or library you'd like to sync text from"
+      : nonInitPrompt,
   });
 }
 

package/lib/remove-project.js

@@ -1,12 +1,16 @@
 const config = require("./config");
 const consts = require("./consts");
 const output = require("./output");
-const getSelectedProjects = require("./utils/getSelectedProjects");
+const {
+  getSelectedProjects,
+  getIsUsingComponents,
+} = require("./utils/getSelectedProjects");
 const promptForProject = require("./utils/promptForProject");
 
 async function removeProject() {
   const projects = getSelectedProjects();
-  if (!projects.length) {
+  const isUsingComponents = getIsUsingComponents();
+  if (!projects.length && !isUsingComponents) {
     console.log(
       "\n" +
         "No projects found in your workspace.\n" +
@@ -15,13 +19,24 @@ async function removeProject() {
     return;
   }
 
+  const allProjects = isUsingComponents
+    ? [
+        { id: "ditto_component_library", name: "Ditto Component Library" },
+        ...projects,
+      ]
+    : projects;
+
   const projectToRemove = await promptForProject({
-    projects,
-    message: "Select a project to remove",
+    projects: allProjects,
+    message: isUsingComponents
+      ? "Select a project or library to remove"
+      : "Select a project to remove",
   });
   if (!projectToRemove) return;
 
   config.writeData(consts.PROJECT_CONFIG_FILE, {
+    components:
+      isUsingComponents && projectToRemove.id !== "ditto_component_library",
     projects: projects.filter(({ id }) => id !== projectToRemove.id),
   });
 

package/lib/utils/getSelectedProjects.js

@@ -32,4 +32,13 @@ function getSelectedProjects(configFile = PROJECT_CONFIG_FILE) {
   return contentJson.projects.filter(({ name, id }) => name && id);
 }
 
-module.exports = getSelectedProjects;
+const getIsUsingComponents = (configFile = PROJECT_CONFIG_FILE) => {
+  if (!fs.existsSync(configFile)) return [];
+
+  const contentYaml = fs.readFileSync(configFile, "utf8");
+  const contentJson = yamlToJson(contentYaml);
+
+  return contentJson && contentJson.components;
+};
+
+module.exports = { getSelectedProjects, getIsUsingComponents };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dittowords/cli",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "Command Line Interface for Ditto (dittowords.com).",
   "main": "bin/index.js",
   "scripts": {