Merge branch 'develop' into add-sankey-langium-parser

Yokozuna59 · Apr 15, 2024 · 875c4fe · 875c4fe
2 parents e080e96 + 0d8fe3b
commit 875c4fe
Show file tree

Hide file tree

Showing 13 changed files with 623 additions and 1,200 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1 @@
+.gitignore
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -53,7 +53,7 @@ module.exports = {
     '@typescript-eslint/no-floating-promises': 'error',
     '@typescript-eslint/no-misused-promises': 'error',
     '@typescript-eslint/no-unused-vars': 'warn',
-    '@typescript-eslint/consistent-type-definitions': 'warn',
+    '@typescript-eslint/consistent-type-definitions': 'error',
     '@typescript-eslint/ban-ts-comment': [
       'error',
       {

diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-v20.11.1
+20.12.2
diff --git a/Dockerfile b/Dockerfile
@@ -1,2 +1,2 @@
-FROM node:20.11.1-alpine3.19 AS base
+FROM node:20.12.2-alpine3.19 AS base
 RUN wget -qO- https://get.pnpm.io/install.sh | ENV="$HOME/.shrc" SHELL="$(which sh)" sh -
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -20,7 +20,7 @@ services:
       - 9000:9000
       - 3333:3333
   cypress:
-    image: cypress/included:13.7.2
+    image: cypress/included:13.7.3
     stdin_open: true
     tty: true
     working_dir: /mermaid

diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "version": "10.2.4",
   "description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
   "type": "module",
-  "packageManager": "[email protected].6",
+  "packageManager": "[email protected].7",
   "keywords": [
     "diagram",
     "markdown",
@@ -25,8 +25,8 @@
     "dev:vite": "tsx .vite/server.ts",
     "dev:coverage": "pnpm coverage:cypress:clean && VITE_COVERAGE=true pnpm dev:vite",
     "release": "pnpm build",
-    "lint": "cross-env NODE_OPTIONS=--max_old_space_size=8192 eslint --cache --cache-strategy content --ignore-path .gitignore . && pnpm lint:jison && prettier --cache --check .",
-    "lint:fix": "cross-env NODE_OPTIONS=--max_old_space_size=8192 eslint --cache --cache-strategy content --fix --ignore-path .gitignore . && prettier --write . && tsx scripts/fixCSpell.ts",
+    "lint": "cross-env NODE_OPTIONS=--max_old_space_size=8192 eslint --cache --cache-strategy content . && pnpm lint:jison && prettier --cache --check .",
+    "lint:fix": "cross-env NODE_OPTIONS=--max_old_space_size=8192 eslint --cache --cache-strategy content --fix . && prettier --write . && tsx scripts/fixCSpell.ts",
     "lint:jison": "tsx ./scripts/jison/lint.mts",
     "contributors": "tsx scripts/updateContributors.ts",
     "cypress": "cypress run",

diff --git a/packages/mermaid/src/diagrams/class/classTypes.ts b/packages/mermaid/src/diagrams/class/classTypes.ts
@@ -138,7 +138,7 @@ export interface ClassNote {
   text: string;
 }
 
-export type ClassRelation = {
+export interface ClassRelation {
   id1: string;
   id2: string;
   relationTitle1: string;
@@ -152,7 +152,7 @@ export type ClassRelation = {
     type2: number;
     lineType: number;
   };
-};
+}
 
 export interface NamespaceNode {
   id: string;

diff --git a/packages/mermaid/src/diagrams/quadrant-chart/quadrantDb.ts b/packages/mermaid/src/diagrams/quadrant-chart/quadrantDb.ts
@@ -17,7 +17,10 @@ function textSanitizer(text: string) {
   return sanitizeText(text.trim(), config);
 }
 
-type LexTextObj = { text: string; type: 'text' | 'markdown' };
+interface LexTextObj {
+  text: string;
+  type: 'text' | 'markdown';
+}
 
 const quadrantBuilder = new QuadrantBuilder();
 

diff --git a/packages/mermaid/src/docs/package.json b/packages/mermaid/src/docs/package.json
@@ -24,17 +24,17 @@
   },
   "devDependencies": {
     "@iconify-json/carbon": "^1.1.31",
-    "@unocss/reset": "^0.58.6",
+    "@unocss/reset": "^0.59.0",
     "@vite-pwa/vitepress": "^0.4.0",
     "@vitejs/plugin-vue": "^5.0.0",
     "fast-glob": "^3.3.2",
     "https-localhost": "^4.7.1",
     "pathe": "^1.1.2",
-    "unocss": "^0.58.6",
+    "unocss": "^0.59.0",
     "unplugin-vue-components": "^0.26.0",
     "vite": "^5.0.0",
     "vite-plugin-pwa": "^0.19.7",
-    "vitepress": "1.0.2",
+    "vitepress": "1.1.0",
     "workbox-window": "^7.0.0"
   }
 }
diff --git a/packages/parser/src/language/info/module.ts b/packages/parser/src/language/info/module.ts
@@ -19,12 +19,12 @@ import { InfoTokenBuilder } from './tokenBuilder.js';
 /**
  * Declaration of `Info` services.
  */
-type InfoAddedServices = {
+interface InfoAddedServices {
   parser: {
     TokenBuilder: InfoTokenBuilder;
     ValueConverter: CommonValueConverter;
   };
-};
+}
 
 /**
  * Union of Langium default services and `Info` services.

diff --git a/packages/parser/src/language/packet/module.ts b/packages/parser/src/language/packet/module.ts
@@ -19,12 +19,12 @@ import { PacketTokenBuilder } from './tokenBuilder.js';
 /**
  * Declaration of `Packet` services.
  */
-type PacketAddedServices = {
+interface PacketAddedServices {
   parser: {
     TokenBuilder: PacketTokenBuilder;
     ValueConverter: CommonValueConverter;
   };
-};
+}
 
 /**
  * Union of Langium default services and `Packet` services.

diff --git a/packages/parser/src/language/pie/module.ts b/packages/parser/src/language/pie/module.ts
@@ -19,12 +19,12 @@ import { PieValueConverter } from './valueConverter.js';
 /**
  * Declaration of `Pie` services.
  */
-type PieAddedServices = {
+interface PieAddedServices {
   parser: {
     TokenBuilder: PieTokenBuilder;
     ValueConverter: PieValueConverter;
   };
-};
+}
 
 /**
  * Union of Langium default services and `Pie` services.