refactor(cli): remove paths from getProjectId()

Remove the `paths` var from `getProjectId()` function.

This means we can keep track of which call is the first/second call,
without needing a `paths` var (useful when we support diagrams without a
path).

Intead we use `Cache.previousSelectedProjectId` and
`Cache.usePreviousSelectedProjectId`.

Author: aloisklink

packages/cli/src/commander.ts

@@ -172,10 +172,22 @@ function linkCmd() {
         const linkedDiagram = await link(existingFile, client, {
           cache: linkCache,
           title: path,
-          async getProjectId(cache) {
+          async getProjectId(cache, documentTitle) {
+            if (cache.previousSelectedProjectId !== undefined) {
+              if (cache.usePreviousSelectedProjectId === undefined) {
+                cache.usePreviousSelectedProjectId = confirm({
+                  message: `Would you like to upload all diagrams to this project?`,
+                  default: true,
+                });
+              }
+              if (await cache.usePreviousSelectedProjectId) {
+                return cache.previousSelectedProjectId;
+              }
+            }
+
             cache.projects = cache.projects ?? client.getProjects();
             const projectId = await select({
-              message: `Select a project to upload ${path} to`,
+              message: `Select a project to upload ${documentTitle} to`,
               choices: [
                 ...(await cache.projects).map((project) => {
                   return {
@@ -189,15 +201,7 @@ function linkCmd() {
               ],
             });
 
-            if (path === paths[0] && paths.length > 1) {
-              const useProjectIdForAllDiagrams = await confirm({
-                message: `Would you like to upload all ${paths.length} diagrams to this project?`,
-                default: true,
-              });
-              if (useProjectIdForAllDiagrams) {
-                cache.selectedProjectId = projectId;
-              }
-            }
+            cache.previousSelectedProjectId = projectId;
 
             return projectId;
           },

packages/cli/src/methods.ts

@@ -6,12 +6,22 @@ import { extractFrontMatter, injectFrontMatter, removeFrontMatterKeys } from './
 /**
  * Cached data to use when pulling/pushing/linking multiple files at once.
  */
-interface Cache {
+export interface Cache {
   /**
-   * If set, the user has said to use the projectId to create all documents
+   * If `true`, the user has said to use the projectId to create all documents
    * in.
+   *
+   * If `undefined`, ask the user if they want to use their first chosen project
+   * id for every other document.
+   *
+   * If `false`, don't ask the user.
    */
-  selectedProjectId?: string;
+  usePreviousSelectedProjectId?: Promise<boolean>;
+  /**
+   * Previously selected project ID.
+   * Will be reused if {@link usePreviousSelectedProjectId} is `true`.
+   */
+  previousSelectedProjectId?: string;
   /**
    * Cached response from {@link MermaidChart.getProjects}.
    */
@@ -25,8 +35,8 @@ interface CommonOptions {
 
 interface LinkOptions extends CommonOptions {
   /** Function that asks the user which project id they want to upload a diagram to */
-  getProjectId: (cache: LinkOptions['cache']) => Promise<string>;
-  // cache to be shared between link calls
+  getProjectId: (cache: LinkOptions['cache'], documentTitle: string) => Promise<string>;
+  // cache to be shared between link calls. This object may be modified between calls.
   cache: Cache;
 }
 
@@ -48,7 +58,7 @@ export async function link(diagram: string, client: MermaidChart, options: LinkO
 
   const { title, getProjectId, cache } = options;
 
-  const projectId = cache.selectedProjectId ?? (await getProjectId(cache));
+  const projectId = await getProjectId(cache, title);
 
   const createdDocument = await client.createDocument(projectId);