Merge branch 'main' into feat/support-multiple-files-at-once-in-cli

Fix merge conflict in packages/cli/src/commander.ts

Author: aloisklink

packages/cli/src/commander.ts

@@ -6,7 +6,7 @@ import {
 } from '@commander-js/extra-typings';
 import { readFile, writeFile } from 'fs/promises';
 import { MermaidChart } from '@mermaidchart/sdk';
-
+import { createRequire } from 'node:module';
 import confirm from '@inquirer/confirm';
 import input from '@inquirer/input';
 import select, { Separator } from '@inquirer/select';
@@ -264,8 +264,11 @@ function pushCmd() {
 }
 
 export function createCommanderCommand() {
+  const require = createRequire(import.meta.url);
+  const pkg = require('../package.json');
+
   const program = createCommand('mermaid-cli')
-    .version('0.1.0-alpha.0') // TODO: how can we keep this synced with package.json
+    .version(pkg.version)
     .description(
       'CLI for interacting with https://MermaidChart.com, the platform that makes collaborating with Mermaid diagrams easy.',
     )

packages/office/src/lib/client/featureSet.ts

@@ -23,8 +23,8 @@ export enum FeatureName {
 const features: Record<FeatureName, FeatureState> = {
   editor: FeatureState.UnderDevelopment,
   dashboard: FeatureState.UnderDevelopment,
-  userBehavior: FeatureState.StageAndProd,
-  cookieBot: FeatureState.OnlyInProd
+  userBehavior: FeatureState.NotInProd,
+  cookieBot: FeatureState.NotInProd
 };
 
 /**

packages/office/src/lib/client/stores/documents.ts

@@ -2,6 +2,7 @@ import { writable } from 'svelte/store';
 import { getDiagramType } from '$lib/utils';
 import { loading } from './loading';
 import type { MCDocument, MermaidChart } from '$lib/mermaidChartApi';
+import { showUserMessage } from './messaging';
 
 interface MCDocumentDB {
   filterStr: string;
@@ -15,6 +16,17 @@ const defaultDB: MCDocumentDB = {
   documents: {}
 };
 
+const fullDocumentList: MCDocument[] = [];
+
+const addToFullList = (document: MCDocument) => {
+  const existingDoc = fullDocumentList.find((doc) => doc.documentID === document.documentID);
+  if (existingDoc) {
+    return
+  } else {
+    fullDocumentList.push(document);
+  }
+}
+
 function createDocumentStore() {
   const { subscribe, set, update } = writable(defaultDB);
   return {
@@ -24,8 +36,15 @@ function createDocumentStore() {
       const documents: MCDocument[] = [];
 
       for (const projectID of projectIDList) {
-        const projectDocuments = await mermaidChartApi.getDocuments(projectID);
-        documents.push(...projectDocuments);
+        try {
+          const projectDocuments = await mermaidChartApi.getDocuments(projectID);
+          documents.push(...projectDocuments);
+        } catch {
+          loading.setState(false, '');
+          return showUserMessage(
+            'Failed to load documents for project with ID: ' + projectID,
+            'error');
+        }
       }
 
       const res = update((documentDB) => {
@@ -37,6 +56,7 @@ function createDocumentStore() {
               document.diagramType = getDiagramType(document.code);
               documentDB.documents[document.documentID] = document;
               documentDB.documentIds.push(document.documentID);
+              addToFullList(document);
             }
           }
           documentDB.documentIds.sort((a, b) => doSort(a, b, 'updatedAt', documentDB.documents, 'asc'));

packages/office/src/lib/client/util/sendEvents.ts

@@ -5,6 +5,7 @@ import { analyticsEnabled } from '../stores/analytics';
 import { minutesToMilliSeconds } from '$lib/utils';
 import type { MCUser } from '$lib/mermaidChartApi';
 import log from '$lib/log';
+import { FeatureName, shouldUseFeature } from '../featureSet';
 
 let initialized = false;
 
@@ -75,16 +76,18 @@ const delaysPerEvent: Record<string, number> = {
 const timeouts: Record<string, number> = {};
 
 export function sendBehaviorEvent(description: string, event: BehaviorEvent) {
-  if (timeouts[event.eventID]) {
-    clearTimeout(timeouts[event.eventID]);
-  }
-  if (delaysPerEvent[event.eventID] === undefined) {
-    sendEvent(description, event);
-  } else {
-    timeouts[event.eventID] = window.setTimeout(() => {
+  if(shouldUseFeature(FeatureName.UserBehavior)) {
+    if (timeouts[event.eventID]) {
+      clearTimeout(timeouts[event.eventID]);
+    }
+    if (delaysPerEvent[event.eventID] === undefined) {
       sendEvent(description, event);
-      delete timeouts[event.eventID];
-    }, delaysPerEvent[event.eventID]);
+    } else {
+      timeouts[event.eventID] = window.setTimeout(() => {
+        sendEvent(description, event);
+        delete timeouts[event.eventID];
+      }, delaysPerEvent[event.eventID]);
+    }
   }
 }
 

packages/office/src/routes/+layout.svelte

@@ -15,18 +15,20 @@
   let syncDiagramsInDocument: () => Promise<void>;
 
   onMount(() => {
-    initializeMixPanel(
-      publicEnv.PUBLIC_MIXPANEL_TOKEN, 
-      $sessionStore.id, 
-      $sessionStore);
+    if(shouldUseFeature(FeatureName.UserBehavior)) {
+      initializeMixPanel(
+        publicEnv.PUBLIC_MIXPANEL_TOKEN, 
+        $sessionStore.id, 
+        $sessionStore);
 
-    window.addEventListener(
-      'CookiebotOnConsentReady',
-      () => {
-        updateConsent(window.Cookiebot?.consent);
-      },
-      false
-    );
+      window.addEventListener(
+        'CookiebotOnConsentReady',
+        () => {
+          updateConsent(window.Cookiebot?.consent);
+        },
+        false
+      );
+    }
   });
 </script>
 

packages/sdk/CHANGELOG.md

@@ -5,25 +5,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.0] - 2024-04-11
+
 ### Added
 
 - Compile an ESM version of this codebase for Node.JS v18.
 - Add `MermaidChart#getDiagram(diagramID)` function to get a diagram.
-- Add `MermaidChart#createDocument(projectID)` function to create a digram in a project.
+- Add `MermaidChart#createDocument(projectID)` function to create a diagram in a project.
 - Add `MermaidChart#setDocument(document)` function to update a diagram.
 - Add `MermaidChart#deleteDocument(documentID)` function to delete a diagram.
 - Add `MermaidChart#baseURL` is now public.
 
 ### Fixed
 
-- Fix `MCDocument` `major`/`minor` type to `number`.
-- Add `code` field to `MCDocument` type
-
-### Fixed
-
+- **BREAKING:** Fix `MCDocument` `major`/`minor` type to `number`.
+- Add `code` field to `MCDocument` type.
 - `MermaidChart#getAuthorizationData()` now correctly sets `state` in the URL
   by default.
 - `MermaidChart#handleAuthorizationResponse()` now supports relative URLs.
 
 ## [0.1.1] - 2023-09-08
+
 - Browser-only build.

packages/sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mermaidchart/sdk",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Access the MermaidChart services with OAuth and type safety.",
   "browser": "dist/bundle.iife.js",
   "types": "dist/index.d.ts",

packages/sdk/src/index.e2e.test.ts

@@ -98,8 +98,7 @@ describe('setDocument', () => {
     });
   });
 
-  // TODO: this function never seems to return an error, see MC-1060
-  it.skip('should throw an error on invalid data', async() => {
+  it('should throw an error on invalid data', async() => {
     const newDocument = await client.createDocument(testProjectId);
     documentsToDelete.add(newDocument.documentID);