Cmi 69 fr 4.1 generate plant uml diagrams

.gitignore

@@ -11,4 +11,5 @@ syntaxes/
 .idea
 .DS_Store
 cml-ls/
-docs/*.png
+docs/*.png
+*.tsbuildinfo

.yarnrc.yml

@@ -14,4 +14,4 @@ npmScopes:
     npmAuthToken: <TOKEN>
     npmPublishRegistry: "https://npm.pkg.github.com/lstreckeisen"
 
-yarnPath: .yarn/releases/yarn-4.8.1.cjs
+yarnPath: .yarn/releases/yarn-4.9.1.cjs

docs/class_generators.puml

@@ -0,0 +1,19 @@
+@startuml
+
+class ContextMapperCommandHandler {
++ registerCommands(ExecuteCommandAcceptor)
+}
+
+class GeneratorCommandExecutor {
+- serviceRegistry: ServiceRegistry
++ execute(ContextMapperGenerator, unknown[], CancellationToken)
+}
+
+interface ContextMapperGenerator {
++ generate(ContextMappingModel, string, unknown[], CancellationToken)
+}
+
+ContextMapperCommandHandler *-- "1" GeneratorCommandExecutor
+ContextMapperCommandHandler o-- "0..*" ContextMapperGenerator
+
+@enduml

eslint.config.mjs

@@ -1,20 +1,30 @@
-import eslint from '@eslint/js'
-import typescriptEslint from 'typescript-eslint';
+import tsLint from 'typescript-eslint'
+import stylisticLint from '@stylistic/eslint-plugin-ts'
 
-export default typescriptEslint.config({
+const files = ['src/**/*.ts', 'test/**/*.ts']
+
+export default tsLint.config({
         ignores: [
-            'esbuild.mjs',
-            'eslint.config.mjs',
-            '**/generated/**'
-        ],
+            '**/generated/**',
+            '**/*.{js,cjs,mjs}'
+        ]
     },
-    eslint.configs.recommended,
-    typescriptEslint.configs.recommendedTypeChecked,
-    typescriptEslint.configs.stylisticTypeChecked,
+    tsLint.configs.recommendedTypeChecked.map((config) => {
+        return {
+            ...config,
+            files
+        }
+    }),
     {
+        ...stylisticLint.configs.all,
+        files
+    },
+    {
+        files,
         languageOptions: {
             parserOptions: {
-                project: ['./tsconfig.json']
+                project: ['./tsconfig.json'],
+                tsconfigRootDir: import.meta.dirname
             }
         },
         rules: {
@@ -25,7 +35,22 @@ export default typescriptEslint.config({
                     'varsIgnorePattern': '^_',
                     'caughtErrorsIgnorePattern': '^_'
                 }
-            ]
+            ],
+            '@stylistic/ts/indent': ['error', 2],
+            '@stylistic/ts/quotes': ['error', 'single'],
+            '@stylistic/ts/semi': ['error', 'never'],
+            '@stylistic/ts/object-curly-spacing': ['error', 'always'],
+            '@stylistic/ts/quote-props': ['error', 'consistent-as-needed'],
+            '@stylistic/ts/member-delimiter-style': ['error', {
+                multiline: {
+                    delimiter: 'comma',
+                    requireLast: false
+                },
+                singleline: {
+                    delimiter: 'comma',
+                    requireLast: false
+                }
+            }]
         }
     }
-);
+)

package.json

@@ -1,7 +1,7 @@
 {
     "name": "@lstreckeisen/context-mapper-language-server",
     "description": "Langium language server for the ContextMapper DSL",
-    "version": "0.3.0",
+    "version": "0.4.0",
     "license": "Apache-2.0",
     "publishConfig": {
         "registry": "https://npm.pkg.github.com"
@@ -15,21 +15,15 @@
         "type": "url",
         "url": "https://github.com/lstreckeisen/context-mapper-language-server.git"
     },
-    "main": "cml-ls/index.cjs",
-    "bin": {
-        "cml-language-server": "cml-ls/index.cjs"
-    },
     "scripts": {
-        "build": "tsc -b tsconfig.src.json && node esbuild.mjs",
-        "watch": "concurrently -n tsc,esbuild -c blue,yellow \"tsc -b tsconfig.src.json --watch\" \"node esbuild.mjs --watch\"",
-        "lint": "eslint src test --ext ts",
-        "lint:fix": "eslint src test --ext ts --fix",
+        "build": "tsc -b tsconfig.src.json",
+        "lint": "eslint",
+        "lint:fix": "eslint --fix",
         "langium:generate": "langium generate",
         "langium:generate:production": "langium generate --mode=production",
-        "langium:watch": "langium generate --watch",
-        "bundle:language-server": "npx ncc build dist/main.cjs -o cml-ls",
+        "bundle:language-server": "npx ncc build out/language/main.js -o cml-ls",
         "test": "vitest run --coverage",
-        "clean": "rm -rf src/language/generated && rm -rf cml-ls/ && rm -rf dist/"
+        "clean": "rm -rf src/language/generated && rm -rf cml-ls/ && rm -rf out/"
     },
     "dependencies": {
         "langium": "~3.5.0",
@@ -38,17 +32,17 @@
     },
     "devDependencies": {
         "@eslint/js": "^9.26.0",
+        "@stylistic/eslint-plugin-ts": "^4.2.0",
         "@types/node": "^22.15.17",
         "@vercel/ncc": "^0.38.3",
         "@vitest/coverage-v8": "^3.1.3",
         "concurrently": "~9.1.2",
-        "esbuild": "~0.25.4",
         "eslint": "~9.26.0",
         "jiti": "^2.4.2",
         "langium-cli": "~3.5.0",
         "typescript": "~5.8.3",
-        "typescript-eslint": "^8.32.0",
+        "typescript-eslint": "^8.32.1",
         "vitest": "^3.1.3"
     },
-    "packageManager": "yarn@4.8.1"
+    "packageManager": "yarn@4.9.1"
 }