Plug-20 Fix mermaid/sdk CLI Test Cases Failing Issues

.github/workflows/build.yml

@@ -18,26 +18,24 @@ jobs:
         uses: actions/checkout@v4
 
       - uses: pnpm/action-setup@v2
-        with:
-          version: 8
 
       - name: Setup Node.js ${{ matrix.node }}
         uses: actions/setup-node@v4
         with:
           cache: pnpm
           node-version: ${{ matrix.node }}
 
-      - name: Install dependencies for ${{ matrix.pkg }}
+      - name: Install dependencies
         run: |
-          pnpm install --frozen-lockfile --filter='...${{ matrix.pkg }}'
-
-      - name: Lint (if present) ${{ matrix.pkg }}
-        run: pnpm --if-present --filter='${{ matrix.pkg }}' lint
+          pnpm install --frozen-lockfile
 
       - name: Test ${{ matrix.pkg }}
         run: |
           pnpm --filter='${{ matrix.pkg }}' test
 
+      - name: Lint (if present) ${{ matrix.pkg }}
+        run: pnpm --if-present --filter='${{ matrix.pkg }}' lint
+
       - name: E2E tests (if present) for ${{ matrix.pkg }}
         env:
           TEST_MERMAIDCHART_API_TOKEN: ${{ secrets.TEST_MERMAIDCHART_API_TOKEN }}

packages/cli/package.json

@@ -55,7 +55,7 @@
     "@inquirer/confirm": "^2.0.15",
     "@inquirer/input": "^1.2.14",
     "@inquirer/select": "^1.3.1",
-    "@mermaidchart/sdk": "^0.2.1-alpha.0",
+    "@mermaidchart/sdk": "workspace:^",
     "commander": "^11.1.0",
     "remark": "^15.0.1",
     "remark-frontmatter": "^5.0.0",

packages/cli/src/commander.ts

@@ -37,7 +37,7 @@
  *  - The config file exists, but is not a valid TOML file.
  *  - The config file does not exist, and `ignoreENONET` is `false`.
  */
-async function readConfigFromConfigArg(configPath: string, ignoreENONET: boolean = false) {
+async function readConfigFromConfigArg(configPath: string, ignoreENONET = false) {
   try {
     return await readConfig(configPath);
   } catch (error) {
@@ -91,7 +91,7 @@
 
       const user = await client.getUser();
 
       console.log(user.emailAddress);
     });
 }
 
@@ -131,7 +131,7 @@
 
       await writeConfig(optsWithGlobals['config'], { ...config, auth_token: answer });
 
       console.log(`API token for ${user.emailAddress} saved to ${optsWithGlobals['config']}`);
     });
 }
 
@@ -143,17 +143,17 @@
       const { auth_token, ...config } = await readConfig(optsWithGlobals['config']);
 
       if (auth_token === undefined) {
         console.log(`Nothing to do, there's no auth_token in ${optsWithGlobals['config']}`);
       }
 
       await writeConfig(optsWithGlobals['config'], config);
 
       try {
         const user = await (await createClient(optsWithGlobals)).getUser();
         console.log(`API token for ${user.emailAddress} removed from ${optsWithGlobals['config']}`);
       } catch (error) {
         // API token might have been expired
         console.log(`API token removed from ${optsWithGlobals['config']}`);
       }
     });
 }
@@ -247,14 +247,14 @@
           const newFile = await pull(text, client, { title: path });
 
           if (text === newFile) {
             console.log(`✅ - ${path} is up to date`);
           } else {
             if (options['check']) {
               console.log(`❌ - ${path} would be updated`);
               process.exitCode = 1;
             } else {
               await writeFile(path, newFile, { encoding: 'utf8' });
               console.log(`✅ - ${path} was updated`);
             }
           }
         }),
@@ -319,7 +319,7 @@
       const config = await readConfigFromConfigArg(configPath, ignoreENONET);
       for (const key in config) {
         if (!(key in optionNameMap)) {
           console.warn(`Warning: Ignoring unrecognized config key: ${key} in ${configPath}`);
           continue;
         }
         const optionCommanderName = optionNameMap[key as keyof typeof optionNameMap];

packages/cli/src/methods.ts

@@ -65,7 +65,7 @@
 
   if (frontmatter.metadata.id) {
     if (ignoreAlreadyLinked) {
       console.log(`○ - ${title} is already linked`);
       return diagram; // no change required
     } else {
       throw new CommanderError(
@@ -94,7 +94,7 @@
   return diagramWithId;
 }
 
-interface PullOptions extends CommonOptions {}
+type PullOptions = CommonOptions;
 
 /**
  * Pulls down a diagram from MermaidChart.com
@@ -123,7 +123,7 @@
   return newFile;
 }
 
-interface PushOptions extends CommonOptions {}
+type PushOptions = CommonOptions;
 
 /**
  * Push the given diagram to MermaidChart.com

packages/sdk/src/index.ts

@@ -83,7 +83,7 @@ export class MermaidChart {
       utm_source: string;
       utm_medium: string;
       utm_campaign: string;
-    }
+    };
   } = {}): Promise<AuthorizationData> {
     if (!this.redirectURI) {
       throw new Error('redirectURI is not set');
@@ -107,7 +107,7 @@ export class MermaidChart {
           utm_source: trackingParams.utm_source,
           utm_medium: trackingParams.utm_medium,
           utm_campaign: trackingParams.utm_campaign,
-        }
+        },
       }),
     });
 
@@ -266,4 +266,4 @@ export class MermaidChart {
     const raw = await this.axios.get<string>(URLS.raw(document, theme).svg);
     return raw.data;
   }
-}
+}