Upgrade to Langium 2.1.3

.eslintrc.js

@@ -2,11 +2,21 @@
 module.exports = {
     root: true,
     extends: ['./configs/base.eslintrc.js', './configs/warnings.eslintrc.js', './configs/errors.eslintrc.js'],
-    ignorePatterns: ['**/{node_modules,lib}', '**/.eslintrc.js', 'extensions/**/generated'],
+    ignorePatterns: [
+        '**/{node_modules,lib}',
+        '**/.eslintrc.js',
+        'extensions/**/generated',
+        '**/*jest.config.js',
+        '**/*.eslintrc.js',
+        '**/*.eslintrc.cjs',
+        '**/language-server/generated/**'
+    ],
     parserOptions: {
         tsconfigRootDir: __dirname,
         project: 'tsconfig.eslint.json'
     },
+    parser: '@typescript-eslint/parser',
+    plugins: ['@typescript-eslint'],
     settings: {
         react: {
             version: 'detect'

.github/workflows/build-and-test.yml

@@ -50,14 +50,14 @@ jobs:
         run: yarn test
         env:
           # The test result file name can be controlled using the following environment variable.
-          JEST_JUNIT_OUTPUT_NAME: unit-test-results-${{ runner.os }}.xml
+          JEST_JUNIT_OUTPUT_NAME: ${{ runner.os }}-unit-test-results
 
       # Upload Unit Test Results (The different files for the OSes will end up in the same artifact).
       - name: Upload Unit Test Results
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: unit-test-tesults
+          name: unit-test-results
           # Include the unit-test-results folders (which is in the root of the workspace).
           path: unit-test-results
           retention-days: 30
@@ -95,12 +95,12 @@ jobs:
       - name: Download Unit Test Results
         uses: actions/download-artifact@v3
         with:
-          name: unit-test-tesults
-          path: unit-test-tesults
+          name: unit-test-results
+          path: unit-test-results
       # Publish Test Results
       - name: Publish Unit Test Results
         uses: EnricoMi/publish-unit-test-result-action@v2
         with:
           check_name: Unit Test Results
           files: |
-            unit-test-tesults/**/*.xml
+            unit-test-results/**/*.xml

.vscode/launch.json

@@ -40,6 +40,7 @@
         "${workspaceFolder}/applications/electron-app/src-gen/backend/server.js",
         "${workspaceFolder}/applications/electron-app/src-gen/backend/main.js",
         "${workspaceFolder}/extensions/*/out/**/*.js",
+        "${workspaceFolder}/extensions/*/out/**/*.cjs",
         "${workspaceFolder}/packages/*/lib/**/*.js",
         "${workspaceFolder}/node_modules/langium/lib/**/*.js",
         "${workspaceFolder}/node_modules/@eclipse-glsp/*/lib/**/*.js"
@@ -79,6 +80,7 @@
         "${workspaceFolder}/applications/electron-app/src-gen/backend/server.js",
         "${workspaceFolder}/applications/electron-app/src-gen/backend/main.js",
         "${workspaceFolder}/extensions/*/out/**/*.js",
+        "${workspaceFolder}/extensions/*/out/**/*.cjs",
         "${workspaceFolder}/packages/*/lib/**/*.js",
         "${workspaceFolder}/node_modules/langium/lib/**/*.js",
         "${workspaceFolder}/node_modules/@eclipse-glsp/*/lib/**/*.js"
@@ -116,18 +118,75 @@
       ]
     },
     {
-      "name": "Debug Jest Tests",
+      "name": "Debug All CJS Jest Tests",
       "type": "node",
       "request": "launch",
       "runtimeArgs": [
         "--inspect-brk",
         "${workspaceRoot}/node_modules/jest/bin/jest.js",
         "--runInBand",
-        "--config=${workspaceRoot}/config/jest.config.js",
-        "--testPathPattern={extensions|packages}/*/test/**/*.test.ts"
+        "--config=${workspaceRoot}/configs/jest.config.js"
       ],
       "console": "integratedTerminal",
       "internalConsoleOptions": "neverOpen"
+    },
+    {
+      "name": "Debug All ESM Jest Tests",
+      "type": "node",
+      "request": "launch",
+      "runtimeArgs": [
+        "--experimental-vm-modules",
+        "--inspect-brk",
+        "${workspaceRoot}/node_modules/jest/bin/jest.js",
+        "--runInBand",
+        "--config=${workspaceRoot}/configs/esm.jest.config.js"
+      ],
+      "env": {
+        "NODE_NO_WARNINGS": "1"
+      },
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen"
+    },
+    {
+      "name": "Debug Open CJS Jest Test",
+      "type": "node",
+      "request": "launch",
+      "runtimeArgs": [
+        "--inspect-brk",
+        "${workspaceRoot}/node_modules/jest/bin/jest.js",
+        "--runInBand",
+        "--config=${workspaceRoot}/configs/jest.config.js",
+        "${file}"
+      ],
+      "env": {
+        "NODE_NO_WARNINGS": "1"
+      },
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen"
+    },
+    {
+      "name": "Debug Open ESM Jest Test",
+      "type": "node",
+      "request": "launch",
+      "runtimeArgs": [
+        "--experimental-vm-modules",
+        "--inspect-brk",
+        "${workspaceRoot}/node_modules/jest/bin/jest.js",
+        "--runInBand",
+        "--config=${workspaceRoot}/configs/esm.jest.config.js",
+        "${file}"
+      ],
+      "env": {
+        "NODE_NO_WARNINGS": "1"
+      },
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen"
+    }
+  ],
+  "compounds": [
+    {
+      "name": "Debug All Jest Tests",
+      "configurations": ["Debug All CJS Jest Tests", "Debug All ESM Jest Tests"]
     }
   ]
 }

.vscode/settings.json

@@ -40,5 +40,6 @@
   "[yaml]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
-  "jest.jestCommandLine": "npm exec -- jest --config=configs/jest.config.js"
+  "jest.jestCommandLine": "yarn test",
+  "jest.debugMode": true
 }

applications/browser-app/jest.config.js

@@ -1,5 +1,7 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
 const baseConfig = require('../../configs/base.jest.config');
 
 module.exports = {
-    ...baseConfig
+    ...baseConfig,
+    displayName: 'Browser App'
 };

applications/electron-app/jest.config.js

@@ -1,5 +1,7 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
 const baseConfig = require('../../configs/base.jest.config');
 
 module.exports = {
-    ...baseConfig
+    ...baseConfig,
+    displayName: 'Electron App'
 };

configs/base.esm.jest.config.js

@@ -0,0 +1,20 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+const baseConfig = require('./base.jest.config');
+
+module.exports = {
+    ...baseConfig,
+    extensionsToTreatAsEsm: ['.ts', '.tsx'],
+    moduleNameMapper: {
+        '^(\\.{1,2}/.*)\\.js$': '$1'
+    },
+    transform: {
+        // '^.+\\.[tj]sx?$' to process js/ts with `ts-jest`
+        // '^.+\\.m?[tj]sx?$' to process js/ts/mjs/mts with `ts-jest`
+        '^.+\\.tsx?$': [
+            'ts-jest',
+            {
+                useESM: true
+            }
+        ]
+    }
+};

configs/base.jest.config.js

@@ -1,6 +1,20 @@
 /** @type {import('ts-jest').JestConfigWithTsJest} */
+const path = require('path');
+
 module.exports = {
     preset: 'ts-jest',
     testEnvironment: 'node',
-    testPathIgnorePatterns: ['./node_modules/']
+    testPathIgnorePatterns: ['./node_modules/'],
+    reporters: [
+        [
+            'jest-junit',
+            {
+                outputDirectory: path.join(__dirname, '..', 'unit-test-results'),
+                outputName: 'jest-report',
+                uniqueOutputName: 'true'
+            }
+        ],
+        ['github-actions', { silent: false }],
+        'summary'
+    ]
 };

configs/esm.jest.config.js

@@ -0,0 +1,5 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+module.exports = {
+    rootDir: '../',
+    projects: ['<rootDir>/extensions/*']
+};

configs/jest.config.js

@@ -1,5 +1,5 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
 module.exports = {
     rootDir: '../',
-    projects: ['<rootDir>/applications/*', '<rootDir>/extensions/*', '<rootDir>/packages/*'],
-    reporters: ['default', ['jest-junit', { outputDirectory: 'unit-test-results', outputName: 'jest-report.xml' }]]
+    projects: ['<rootDir>/applications/*', '<rootDir>/packages/*']
 };

e2e-tests/package.json

@@ -13,7 +13,8 @@
     "lint": "eslint -c ../.eslintrc.js --ext .ts ./src",
     "playwright:install": "yarn playwright install --with-deps",
     "prepare": "yarn clean && yarn build && yarn lint",
-    "test": "yarn playwright test"
+    "test": "",
+    "ui-test": "yarn playwright test"
   },
   "dependencies": {
     "@playwright/test": "^1.37.1",

extensions/crossmodel-lang/.eslintrc.cjs

@@ -0,0 +1,9 @@
+/** @type {import('eslint').Linter.Config} */
+module.exports = {
+    extends: ['../../.eslintrc.js'],
+    ignorePatterns: ['language-server/generated/**', 'jest.config.cjs', 'jest.setup.js'],
+    rules: {
+        // turn import issues off as eslint cannot handle ES modules
+        'import/no-unresolved': 'off'
+    }
+};

extensions/crossmodel-lang/esbuild.mjs

@@ -0,0 +1,56 @@
+//@ts-check
+import * as esbuild from 'esbuild';
+
+const watch = process.argv.includes('--watch');
+const minify = process.argv.includes('--minify');
+
+const success = watch ? 'Watch build succeeded' : 'Build succeeded';
+
+function getTime() {
+    const date = new Date();
+    return `[${`${padZeroes(date.getHours())}:${padZeroes(date.getMinutes())}:${padZeroes(date.getSeconds())}`}] `;
+}
+
+function padZeroes(i) {
+    return i.toString().padStart(2, '0');
+}
+
+const plugins = [
+    {
+        name: 'watch-plugin',
+        setup(build) {
+            build.onEnd(result => {
+                if (result.errors.length === 0) {
+                    console.log(getTime() + success);
+                }
+            });
+        }
+    }
+];
+
+const ctx = await esbuild.context({
+    // Entry points for the vscode extension and the language server
+    entryPoints: ['src/extension.ts', 'src/main.ts'],
+    outdir: 'out',
+    bundle: true,
+    target: 'ES2017',
+    // VSCode's extension host is still using cjs, so we need to transform the code
+    format: 'cjs',
+    // To prevent confusing node, we explicitly use the `.cjs` extension
+    outExtension: {
+        '.js': '.cjs'
+    },
+    loader: { '.ts': 'ts' },
+    external: ['vscode'],
+    platform: 'node',
+    sourcemap: !minify,
+    minify,
+    plugins
+});
+
+if (watch) {
+    await ctx.watch();
+} else {
+    await ctx.rebuild();
+    ctx.dispose();
+}

extensions/crossmodel-lang/jest.config.cjs

@@ -0,0 +1,7 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} */
+const baseConfig = require('../../configs/base.esm.jest.config');
+
+module.exports = {
+    ...baseConfig,
+    displayName: 'Extension'
+};