Merge new version 2.0.1 into develop && fix usage maybe undefined in chart-advistor

.github/workflows/pre-release.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   build:
-    runs-on: macOS-12
+    runs-on: macOS-13
 
     permissions:
       contents: write

.github/workflows/release-changelog.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   update-changelog-after-publish-a-release:
     name: GitHub Actions Test
-    runs-on: macOS-12
+    runs-on: macOS-13
 
     strategy:
       matrix:

.github/workflows/release.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: macOS-12
+    runs-on: macOS-13
     permissions:
       contents: write
       pull-requests: write

.github/workflows/sync-main-to-develop.yml

@@ -11,7 +11,7 @@ jobs:
   if_merged:
     if: github.event.pull_request.merged == true
 
-    runs-on: macOS-12
+    runs-on: macOS-13
 
     permissions:
       contents: write

.github/workflows/unit-test.yml

@@ -11,27 +11,27 @@
 
 jobs:
   build:
-    runs-on: macOS-12
+    runs-on: macOS-13
 
     strategy:
       matrix:
         node-version: [18.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
       - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
           cache-dependency-path: './common/config/rush/pnpm-lock.yaml'
 
         # Install rush
       - name: Install rush
         run: node common/scripts/install-run-rush.js install --bypass-policy
 
       - name: Compile
         run: node common/scripts/install-run-rush.js compile --only tag:package
       - name: Test
         run: node common/scripts/install-run-rush.js test --only tag:package

common/config/rush/version-policies.json

@@ -2,7 +2,7 @@
   {
     "definitionName": "lockStepVersion",
     "policyName": "vmindMin",
-    "version": "1.2.13",
+    "version": "1.2.14",
     "mainProject": "@visactor/vmind",
     "nextBump": "patch"
   }

packages/calculator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/calculator",
-  "version": "1.2.13",
+  "version": "2.0.1",
   "description": "SQL-like query executor with DSL",
   "main": "lib",
   "module": "es",

packages/chart-advisor/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/chart-advisor",
-  "version": "1.2.13",
+  "version": "2.0.1",
   "description": "图表推荐模块",
   "main": "lib",
   "module": "es",

packages/vmind/CHANGELOG.json

@@ -1,6 +1,30 @@
 {
   "name": "@visactor/vmind",
   "entries": [
+    {
+      "version": "2.0.1",
+      "tag": "@visactor/vmind_v2.0.1",
+      "date": "Fri, 21 Feb 2025 07:38:30 GMT",
+      "comments": {
+        "none": [
+          {
+            "comment": "Overall architecture upgrade"
+          },
+          {
+            "comment": "Support DeepSeek and other custom model with api-key"
+          },
+          {
+            "comment": "12 new chart types added for chart generation"
+          },
+          {
+            "comment": "Add Text2Chart capability"
+          },
+          {
+            "comment": "Add Chart Insight capability"
+          }
+        ]
+      }
+    },
     {
       "version": "1.2.13",
       "tag": "@visactor/vmind_v1.2.13",
@@ -128,4 +152,4 @@
       "comments": {}
     }
   ]
-}
+}

packages/vmind/CHANGELOG.md

@@ -1,6 +1,28 @@
 # Change Log - @visactor/vmind
 
-This log was last generated on Thu, 11 Jul 2024 08:20:22 GMT and should not be manually modified.
+This log was last generated on Fri, 21 Feb 2025 07:38:30 GMT and should not be manually modified.
+
+## 2.0.1
+Fri, 21 Feb 2025 07:38:30 GMT
+
+### Updates
+
+- Overall architecture upgrade
+- Support DeepSeek and other custom model with api-key
+- 12 new chart types added for chart generation
+  - [Range Bar Chart](https://www.visactor.io/vchart/demo/range-column-chart/range-bar)
+  - [Liquid Chart](https://www.visactor.io/vchart/demo/liquid-chart/liquid-chart)
+  - [Linear Progress Bar](https://www.visactor.io/vchart/demo/progress/linear-progress)
+  - [Circular Progress Bar](https://www.visactor.io/vchart/demo/progress/circular-progress)
+  - [Circle Packing Chart](https://www.visactor.io/vchart/demo/circle-packing-chart/basic-circle-packing)
+  - [Sunburst Chart](https://www.visactor.io/vchart/demo/sunburst-chart/basic-sunburst)
+  - [Gauge Chart](https://www.visactor.io/vchart/demo/gauge-chart/basic-gauge)
+  - [Treemap Chart](https://www.visactor.io/vchart/demo/treemap-chart/basic-treemap)
+  - [Heatmap Chart](https://www.visactor.io/vchart/demo/heatmap-chart/basic-heatmap)
+  - [Venn Chart](https://www.visactor.io/vchart/demo/venn-chart/venn-chart)
+  - [Map](https://www.visactor.io/vchart/demo/map-chart/basic-map)
+- Add Text2Chart capability
+- Add Chart Insight capability
 
 ## 1.2.13
 Thu, 11 Jul 2024 08:20:22 GMT

packages/vmind/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vmind",
-  "version": "2.0.1-alpha.1",
+  "version": "2.0.1",
   "main": "cjs/index.js",
   "module": "esm/index.js",
   "types": "esm/index.d.ts",
@@ -93,14 +93,14 @@
   },
   "dependencies": {
     "chroma-js": "^3.1.1",
-    "@visactor/chart-advisor": "workspace:1.2.13",
+    "@visactor/chart-advisor": "workspace:2.0.1",
     "@visactor/vdataset": "~0.17.4",
     "@visactor/vutils": "~0.17.4",
     "axios": "^1.4.0",
     "json5": "~2.2.3",
     "dayjs": "~1.11.10",
     "js-yaml": "~4.1.0",
-    "@visactor/calculator": "workspace:*",
+    "@visactor/calculator": "workspace:2.0.1",
     "alasql": "~4.3.2",
     "@visactor/vchart-theme": "^1.11.2",
     "jstat": "~1.9.6",

packages/vmind/src/atom/chartGenerator/index.ts

@@ -146,12 +146,13 @@ export class ChartGeneratorAtom extends BaseAtom<ChartGeneratorCtx, ChartGenerat
     };
     if (!this.useRule && (this.useChartAdvisor || this.options.useChartAdvisor)) {
       // @todo
-      const { cell, dataset, chartType, advisedList } = getCellContextByAdvisor({
+      const { cell, dataset, chartType, advisedList, usage } = getCellContextByAdvisor({
         ...this.context,
         ...additionalCtx
       });
       this.context = {
         ...this.context,
+        usage,
         cell,
         dataTable: dataset,
         chartType,

packages/vmind/src/schedule/index.ts

@@ -131,7 +131,7 @@ export class Schedule<T extends AtomName[]> {
     for (const key in oldUsage) {
       if (Object.prototype.hasOwnProperty.call(oldUsage, key)) {
         const curKey = key as keyof Usage;
-        result[curKey] = (oldUsage[curKey] || 0) + (newUsage[curKey] || 0);
+        result[curKey] = (oldUsage[curKey] || 0) + (newUsage?.[curKey] || 0);
       }
     }