Integrating langauge tests again in generator and enhancing tests

- Updated relevant dependencies and aligned version in the repo

.editorconfig

@@ -6,3 +6,4 @@ indent_size = 4
 end_of_line = lf
 charset = utf-8
 insert_final_newline = true
+trim_trailing_whitespace = true

.vscode/settings.json

@@ -11,7 +11,6 @@
         "javascript",
         "typescript"
     ],
-    "vitest.enable": true,
     "[json]": {
         "editor.defaultFormatter": "vscode.json-language-features"
     },

examples/arithmetics/package.json

@@ -68,7 +68,7 @@
     },
     "dependencies": {
         "chalk": "~5.3.0",
-        "commander": "~11.0.0",
+        "commander": "~11.1.0",
         "langium": "~3.0.0",
         "vscode-languageclient": "~9.0.1",
         "vscode-languageserver": "~9.0.1"

examples/domainmodel/package.json

@@ -59,7 +59,7 @@
     },
     "dependencies": {
         "chalk": "~5.3.0",
-        "commander": "~11.0.0",
+        "commander": "~11.1.0",
         "langium": "~3.0.0",
         "lodash": "~4.17.21",
         "vscode-languageclient": "~9.0.1",

examples/requirements/package.json

@@ -70,7 +70,7 @@
     },
     "dependencies": {
         "chalk": "~5.3.0",
-        "commander": "~11.0.0",
+        "commander": "~11.1.0",
         "langium": "~3.0.0",
         "vscode-languageclient": "~9.0.1",
         "vscode-languageserver": "~9.0.1"

examples/statemachine/package.json

@@ -58,7 +58,7 @@
     },
     "dependencies": {
         "chalk": "~5.3.0",
-        "commander": "~11.0.0",
+        "commander": "~11.1.0",
         "langium": "~3.0.0",
         "vscode-languageclient": "~9.0.1",
         "vscode-languageserver": "~9.0.1"

package.json

@@ -14,6 +14,7 @@
     "lint": "npm run lint --workspaces",
     "test": "vitest",
     "test-ui": "vitest --ui",
+    "test:run": "vitest run",
     "coverage": "vitest run --coverage",
     "validate-exports": "npm run validate-exports --workspace=langium",
     "version:dependencies": "node ./scripts/update-version.js && npm install",
@@ -27,16 +28,16 @@
     "@types/vscode": "~1.67.0",
     "@typescript-eslint/eslint-plugin": "~6.4.1",
     "@typescript-eslint/parser": "~6.4.1",
-    "@vitest/coverage-v8": "~1.0.0",
-    "@vitest/ui": "~1.5.0",
+    "@vitest/coverage-v8": "~1.6.0",
+    "@vitest/ui": "~1.6.0",
     "concurrently": "~8.2.1",
     "esbuild": "~0.19.2",
     "eslint": "~8.56.0",
     "eslint-plugin-header": "~3.1.1",
     "editorconfig": "~2.0.0",
     "shx": "~0.3.4",
     "typescript": "~5.1.6",
-    "vitest": "~1.5.0"
+    "vitest": "~1.6.0"
   },
   "overrides": {
    "@types/node": "~16.18.41"

packages/generator-langium/package.json

@@ -36,10 +36,10 @@
     "chalk": "~5.3.0",
     "lodash": "~4.17.21",
     "which": "~4.0.0",
-    "yeoman-generator": "~7.1.1"
+    "yeoman-generator": "~7.1.0"
   },
   "devDependencies": {
-    "@types/lodash": "~4.17.0",
+    "@types/lodash": "~4.17.5",
     "@types/which": "~3.0.3",
     "@yeoman/types": "~1.2.0",
     "yeoman-test": "~8.2.0",

packages/generator-langium/src/index.ts

@@ -179,6 +179,7 @@ export class LangiumGenerator extends Generator {
         const pathBase = path.join(__dirname, BASE_DIR);
         this.sourceRoot(pathBase);
         const mainPackageJson = this.fs.readJSON(path.join(this.sourceRoot(), 'package.json'));
+        const tsConfigBuildJson = this.fs.readJSON(path.join(this.sourceRoot(), 'tsconfig.build.json'));
 
         const baseFiles = [
             '.eslintrc.json',
@@ -197,18 +198,19 @@ export class LangiumGenerator extends Generator {
         this.fs.copy(this.templatePath('gitignore.txt'), this._extensionPath('.gitignore'));
 
         this.sourceRoot(path.join(__dirname, `${BASE_DIR}/${PACKAGE_LANGUAGE}`));
-        // omit .vscode-extensions.json for now
         const languageFiles = [
             'package.json',
             'langium-config.json',
             'langium-quickstart.md',
             'tsconfig.json',
             'tsconfig.src.json',
-            'tsconfig.test.json',
             'vitest.config.ts',
             'src',
-            'test'
         ];
+        if (this.answers.includeTest) {
+            languageFiles.push('tsconfig.test.json');
+            languageFiles.push('test');
+        }
         for (const path of languageFiles) {
             this.fs.copy(
                 this.templatePath(path),
@@ -217,6 +219,24 @@ export class LangiumGenerator extends Generator {
             );
         }
 
+        if (this.answers.includeTest) {
+            mainPackageJson.scripts.test = 'npm run --workspace packages/language test';
+
+            // ensure reference is directly behind ./packages/language/tsconfig.src.json
+            tsConfigBuildJson.references.push({ path: './packages/language/tsconfig.test.json' });
+
+            const languagePackageJson = this.fs.readJSON(this._extensionPath('packages/language/package.json'));
+            languagePackageJson.devDependencies.vitest = '~1.6.0';
+            languagePackageJson.scripts.test = 'vitest run';
+            this.fs.delete(this._extensionPath('packages/language/package.json'));
+            this.fs.writeJSON(this._extensionPath('packages/language/package.json'), languagePackageJson, undefined, 4);
+
+            const extensionsJson = this.fs.readJSON(this._extensionPath('.vscode/extensions.json'));
+            extensionsJson.recommendations.push('vitest.explorer');
+            this.fs.delete(this._extensionPath('.vscode/extensions.json'));
+            this.fs.writeJSON(this._extensionPath('.vscode/extensions.json'), extensionsJson, undefined, 4);
+        }
+
         if (this.answers.includeCLI) {
             this.sourceRoot(path.join(__dirname, `${BASE_DIR}/${PACKAGE_CLI}`));
             const cliFiles = [
@@ -233,6 +253,7 @@ export class LangiumGenerator extends Generator {
                 );
             }
             mainPackageJson.workspaces.push('packages/cli');
+            tsConfigBuildJson.references.push({ path: './packages/cli/tsconfig.json' });
         }
 
         if (this.answers.includeWeb) {
@@ -254,6 +275,7 @@ export class LangiumGenerator extends Generator {
                 );
             }
             mainPackageJson.workspaces.push('packages/web');
+            tsConfigBuildJson.references.push({ path: './packages/web/tsconfig.json' });
         }
 
         if (this.answers.includeVSCode) {
@@ -274,44 +296,14 @@ export class LangiumGenerator extends Generator {
                 );
             }
             mainPackageJson.workspaces.push('packages/extension');
+            tsConfigBuildJson.references.push({ path: './packages/extension/tsconfig.json' });
         }
 
         this.fs.writeJSON(this._extensionPath('.package.json'), mainPackageJson, undefined, 4);
-        this.fs.copy(
-            this._extensionPath('.package.json'),
-            this._extensionPath('package.json'),
-            templateCopyOptions
-        );
-        this.fs.delete(this._extensionPath('.package.json'));
-
-        // if (this.answers.includeTest) {
-        //     this.sourceRoot(path.join(__dirname, TEMPLATE_TEST_DIR));
-
-        //     this.fs.copy(
-        //         this.templatePath('.'),
-        //         this._extensionPath(),
-        //         templateCopyOptions
-        //     );
-
-        //     // update the scripts section in the package.json to use 'tsconfig.src.json' for building
-        //     const pkgJson = this.fs.readJSON(this.templatePath('.package.json'));
-        //     this.fs.extendJSON(this._extensionPath('package-template.json'), pkgJson, undefined, 4);
-
-        //     // update the 'includes' property in the existing 'tsconfig.json' and adds '"noEmit": true'
-        //     const tsconfigJson = this.fs.readJSON(this.templatePath('.tsconfig.json'));
-        //     this.fs.extendJSON(this._extensionPath('tsconfig.json'), tsconfigJson, undefined, 4);
-
-        //     // the initial '.vscode/extensions.json' can't be extended as above, as it contains comments, which is tolerated by vscode,
-        //     //  but not by `this.fs.extendJSON(...)`, so
-        //     this.fs.copy(this.templatePath('.vscode-extensions.json'), this._extensionPath('.vscode/extensions.json'), templateCopyOptions);
-        // }
-
-        // this.fs.copy(
-        //     this._extensionPath('package-template.json'),
-        //     this._extensionPath('package.json'),
-        //     templateCopyOptions
-        // );
-        // this.fs.delete(this._extensionPath('package-template.json'));
+        this.fs.move(this._extensionPath('.package.json'), this._extensionPath('package.json'), templateCopyOptions);
+
+        this.fs.writeJSON(this._extensionPath('.tsconfig.build.json'), tsConfigBuildJson, undefined, 4);
+        this.fs.move(this._extensionPath('.tsconfig.build.json'), this._extensionPath('tsconfig.build.json'), templateCopyOptions);
     }
 
     async install(): Promise<void> {

packages/generator-langium/templates/.vscode/extensions.json

@@ -1,8 +1,4 @@
 {
-    // See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
-    // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
-
-    // List of extensions which should be recommended for users of this workspace.
     "recommendations": [
         "langium.langium-vscode"
     ]

packages/generator-langium/templates/package.json

@@ -1,9 +1,9 @@
 {
-    "name": "<%= extension-name %>",
+    "name": "<%= extension-name %>-base",
     "description": "Base workspace package",
     "version": "0.0.1",
     "type": "module",
-    "private": true,    
+    "private": true,
     "files": [
         "out",
         "src"
@@ -14,13 +14,12 @@
         "build": "npm run compile && npm run build --workspaces",
         "lint": "eslint src --ext ts",
         "langium:generate": "npm run --workspace packages/language langium:generate",
-        "langium:watch": "npm run --workspace packages/language langium:watch",
-        "test": "vitest run"
+        "langium:watch": "npm run --workspace packages/language langium:watch"
     },
     "devDependencies": {
         "@types/node": "^18.0.0",
-        "@typescript-eslint/parser": "~7.11.0",
-        "@typescript-eslint/eslint-plugin": "~7.11.0",
+        "@typescript-eslint/parser": "~7.13.0",
+        "@typescript-eslint/eslint-plugin": "~7.13.0",
         "eslint": "~8.57.0",
         "typescript": "~5.4.5"
     },

packages/generator-langium/templates/packages/cli/package.json

@@ -20,9 +20,7 @@
     "dependencies": {
         "<%= extension-name %>-language": "0.0.1",
         "chalk": "~5.3.0",
-        "commander": "~11.0.0"
-    },
-    "devDependencies": {  
+        "commander": "~11.1.0"
     },
     "volta": {
         "node": "18.20.3",

packages/generator-langium/templates/packages/extension/package.json

@@ -39,6 +39,6 @@
     "devDependencies": {
         "@types/vscode": "~1.67.0",
         "concurrently": "~8.2.1",
-        "esbuild": "~0.20.2"
+        "esbuild": "~0.21.5"
     }
 }

packages/generator-langium/templates/packages/language/package.json

@@ -34,8 +34,7 @@
         "langium": "~3.0.0"        
     },
     "devDependencies": {
-        "langium-cli": "~3.0.3",
-        "vitest": "~1.6.0"
+        "langium-cli": "~3.0.3"
     },
     "volta": {
         "node": "18.20.3",

packages/generator-langium/templates/packages/web/package.json

@@ -27,8 +27,8 @@
     },
     "devDependencies": {
         "@codingame/esbuild-import-meta-url-plugin": "~1.0.2",
-        "vite": "~5.2.12",
-        "http-server": "~14.1.1"    
+        "vite": "~5.2.13",
+        "http-server": "~14.1.1"
     },
     "volta": {
         "node": "18.20.3",

packages/generator-langium/templates/packages/web/vite.config.ts

@@ -1,4 +1,3 @@
-/* eslint-disable header/header */
 import { defineConfig } from 'vite';
 import * as path from 'path';
 import importMetaUrlPlugin from '@codingame/esbuild-import-meta-url-plugin';

packages/generator-langium/templates/tsconfig.build.json

@@ -1,10 +1,6 @@
 {
     "files": [],
     "references": [
-        { "path": "./packages/language/tsconfig.src.json" },
-        { "path": "./packages/language/tsconfig.test.json" },
-        { "path": "./packages/cli/tsconfig.json" },
-        { "path": "./packages/web/tsconfig.json" },
-        { "path": "./packages/extension/tsconfig.json" }
+        { "path": "./packages/language/tsconfig.src.json" }
     ]
  }