Type checking (Closes #18)

examples/bigger-example.rcp

@@ -30,7 +30,7 @@ agent Line
             )
 
 agent Robot
-        local: btype : int, lnk : channel, basgn : bool, brdy : 0..2, no  : int
+        local: btype : 0..3, lnk : channel, basgn : bool, brdy : 0..2, no  : int
         init: btype == 1 & lnk == empty & basgn == false & brdy == 0 & no == 0
         relabel:
             type <- btype

examples/errors/typing-errors.rcp

@@ -0,0 +1,13 @@
+enum channel {radio, speaker}
+
+property-variables: friendly : bool
+
+agent Droid
+    local: status : int, mood : bool
+    init: true
+    relabel:
+        friendly <- mood
+    receive-guard: true
+    repeat: {true} *? [mood := true]
+
+system = Droid(R2D2, true) || Droid(C3PO, true)

examples/get-supply.rcp

@@ -12,7 +12,7 @@ agent Client
     repeat: (
             splyAtSelf: {true} SUPPLY@(myself)()[]
             +
-            getAtX: {true} GET@(x)[]
+            getAtX: {true} GET@(x)()[]
             +
             bcastSend: {true} *! true(MSG := myself)[x := myself]
             + 

examples/warnings/typing-warnings.rcp

@@ -0,0 +1,13 @@
+enum channel {radio, speaker}
+
+property-variables: friendly : bool
+
+agent Droid
+    local: status : int, mood : bool
+    init: true
+    relabel:
+        friendly <- mood
+    receive-guard: true
+    repeat: {true} *? [mood := true]
+
+system = Droid(R2D2, true) || Droid(C3PO, true)

package.json

@@ -31,10 +31,9 @@
     "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 --ext ts",
         "langium:generate": "langium generate",
         "langium:watch": "langium generate --watch",
-        "vscode:prepublish": "npm run esbuild-base -- --minify && npm run lint",
+        "vscode:prepublish": "npm run esbuild-base -- --minify",
         "esbuild-base": "esbuild ./src/extension/main.ts --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node",
         "build:web": "npm run build",
         "bundle": "vite build",
@@ -45,28 +44,26 @@
         "test": "vitest run"
     },
     "dependencies": {
-        "chalk": "~5.3.0",
+        "chalk": "~5.6.0",
         "commander": "~11.0.0",
-        "langium": "~3.4.0",
-        "monaco-languageclient": "~8.1.1",
+        "langium": "~3.5.0",
+        "monaco-languageclient": "~9.11.0",
+        "typir": "~0.2.2",
+        "typir-langium": "~0.2.2",
         "vscode-languageclient": "~9.0.1",
         "vscode-languageserver": "~9.0.1"
     },
     "devDependencies": {
         "@codingame/esbuild-import-meta-url-plugin": "~1.0.2",
-        "@types/node": "^18.0.0",
+        "@types/node": "^24.0.0",
         "@types/vscode": "~1.94.0",
-        "@typescript-eslint/eslint-plugin": "~7.3.1",
-        "@typescript-eslint/parser": "~7.3.1",
-        "concurrently": "~8.2.1",
+        "concurrently": "~9.2.0",
         "esbuild": "^0.25.5",
-        "eslint": "~8.57.0",
         "http-server": "~14.1.1",
-        "langium-cli": "~3.4.0",
-        "typescript": "~5.1.6",
-        "vite": "^6.3.6",
+        "langium-cli": "~3.5.0",
+        "typescript": "~5.9.2",
+        "vite": "^7.0.0",
         "vitest": "^3.2.0",
-        "vscode": "npm:@codingame/monaco-vscode-api@~3.2.3",
         "@vscode/vsce": "^3.4.0"
     },
     "volta": {

src/language/r-check-module.ts

@@ -1,31 +1,35 @@
-import type { AstNode, AstNodeDescription, LangiumDocument, Module, PrecomputedScopes, ReferenceInfo, Scope } from 'langium';
+import type { AstNode, AstNodeDescription, LangiumDocument, LangiumSharedCoreServices, Module, PrecomputedScopes, ReferenceInfo, Scope } from 'langium';
 import { AstUtils, DefaultScopeComputation, DefaultScopeProvider, inject } from 'langium';
 import { CancellationToken } from 'vscode-languageserver';
-import { Enum, Model, QualifiedRef, isEnum, isQualifiedRef, isPropVar, isCommand, Command} from './generated/ast.js';
+import { Model, QualifiedRef, isEnum, isQualifiedRef, isPropVar, isCommand, Command, RCheckAstType, reflection} from './generated/ast.js';
 import { RCheckGeneratedModule, RCheckGeneratedSharedModule } from './generated/module.js';
 import { RCheckValidator, registerValidationChecks } from './r-check-validator.js';
 import { createDefaultModule, createDefaultSharedModule, DefaultSharedModuleContext, LangiumServices, LangiumSharedServices, PartialLangiumServices } from 'langium/lsp';
+import { createTypirLangiumServices, initializeLangiumTypirServices, TypirLangiumServices } from 'typir-langium';
+import { RCheckTypeSystem } from './r-check-type-checking.js';
 
 
 export class RCheckScopeProvider extends DefaultScopeProvider {
     override getScope(context: ReferenceInfo): Scope {
-        const superScope: Scope = super.getScope(context);
-        const globalDescriptions: AstNodeDescription[] = superScope.getAllElements().toArray();
-        const document: LangiumDocument = AstUtils.getDocument(context.container);
+        const superScope = super.getScope(context); // This is the GLOBAL scope
+        const document = AstUtils.getDocument(context.container);
+
+        const documentDescriptions: AstNodeDescription[] = [];
         for (const childNode of AstUtils.streamAllContents(document.parseResult.value)) {
             // Export enum cases globally (but limited to current file)
             if (isEnum(childNode)) {
-                const enumNode: Enum = childNode as Enum;
-                for(const caseNode of enumNode.cases){
-                    globalDescriptions.push(this.descriptions.createDescription(caseNode, caseNode.name, document));
+                for(const caseNode of childNode.cases){
+                    documentDescriptions.push(this.descriptions.createDescription(caseNode, caseNode.name, document));
                 }
             }
             // Export @-prefixed names for property variables
             if (isPropVar(childNode)) {
-                globalDescriptions.push(this.descriptions.createDescription(childNode, "@" + childNode.name, document))
+                documentDescriptions.push(this.descriptions.createDescription(childNode, "@" + childNode.name, document))
             }
         }
-        return this.createScope(globalDescriptions);
+
+        // Add local names visible only in this document, layered above global scope.
+        return this.createScope(documentDescriptions, superScope);
     }
 }
 
@@ -127,7 +131,8 @@ export class RCheckScopeComputation extends DefaultScopeComputation {
 export type RCheckAddedServices = {
     validation: {
         RCheckValidator: RCheckValidator
-    }
+    },
+    typir: TypirLangiumServices<RCheckAstType>,
 }
 
 /**
@@ -141,13 +146,16 @@ export type RCheckServices = LangiumServices & RCheckAddedServices
  * declared custom services. The Langium defaults can be partially specified to override only
  * selected services, while the custom services must be fully specified.
  */
-export const RCheckModule: Module<RCheckServices, PartialLangiumServices & RCheckAddedServices> = {
-    validation: {
-        RCheckValidator: () => new RCheckValidator()
-    },
-    references : {
-        ScopeComputation : (services) => new RCheckScopeComputation(services),
-        ScopeProvider: (services) => new RCheckScopeProvider(services)
+export function createRCheckModule(shared: LangiumSharedCoreServices): Module<RCheckServices, PartialLangiumServices & RCheckAddedServices> {
+    return {
+        validation: {
+            RCheckValidator: () => new RCheckValidator(),
+        },
+        typir: () => createTypirLangiumServices(shared, reflection, new RCheckTypeSystem(), { /* customize Typir services here */ }),
+        references: {
+            ScopeComputation: (services) => new RCheckScopeComputation(services),
+            ScopeProvider: (services) => new RCheckScopeProvider(services),
+        },
     }
 };
 
@@ -177,9 +185,10 @@ export function createRCheckServices(context: DefaultSharedModuleContext): {
     const RCheck = inject(
         createDefaultModule({ shared }),
         RCheckGeneratedModule,
-        RCheckModule
+        createRCheckModule(shared),
     );
     shared.ServiceRegistry.register(RCheck);
+    initializeLangiumTypirServices(RCheck, RCheck.typir);
     registerValidationChecks(RCheck);
     return { shared, RCheck };
 }