rename combined services to std services, rename w/out lsp to 'core'

examples/arithmetics/src/cli/cli-util.ts

@@ -4,13 +4,13 @@
  * terms of the MIT License, which is available in the project root.
  ******************************************************************************/
 
-import type { AstNode, LangiumDocument, LangiumServices } from 'langium';
+import type { AstNode, LangiumDocument, LangiumCoreServices } from 'langium';
 import { URI } from 'langium';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import chalk from 'chalk';
 
-export async function extractDocument<T extends AstNode>(fileName: string, extensions: readonly string[], services: LangiumServices): Promise<LangiumDocument<T>> {
+export async function extractDocument<T extends AstNode>(fileName: string, extensions: readonly string[], services: LangiumCoreServices): Promise<LangiumDocument<T>> {
     if (!extensions.includes(path.extname(fileName))) {
         console.error(chalk.yellow(`Please, choose a file with one of these extensions: ${extensions}.`));
         process.exit(1);
@@ -38,6 +38,6 @@ export async function extractDocument<T extends AstNode>(fileName: string, exten
     return document as LangiumDocument<T>;
 }
 
-export async function extractAstNode<T extends AstNode>(fileName: string, extensions: string[], services: LangiumServices): Promise<T> {
+export async function extractAstNode<T extends AstNode>(fileName: string, extensions: string[], services: LangiumCoreServices): Promise<T> {
     return (await extractDocument(fileName, extensions, services)).parseResult.value as T;
 }

examples/arithmetics/src/language-server/arithmetics-module.ts

@@ -4,9 +4,9 @@
  * terms of the MIT License, which is available in the project root.
  ******************************************************************************/
 
-import type { DefaultSharedModuleContext, LangiumServices, Module, PartialLangiumServices } from 'langium';
+import type { DefaultSharedModuleContext, LangiumCoreServices, Module, PartialLangiumCoreServices } from 'langium';
 import { createDefaultModule, createDefaultSharedModule, inject } from 'langium';
-import { type LangiumSharedServicesWithLSP, createSharedLSPModule } from 'langium/lsp';
+import { type LangiumSharedServices, createSharedLSPModule } from 'langium/lsp';
 import { ArithmeticsGeneratedModule, ArithmeticsGeneratedSharedModule } from './generated/module.js';
 import { ArithmeticsValidator, registerValidationChecks } from './arithmetics-validator.js';
 import { ArithmeticsScopeProvider } from './arithmetics-scope-provider.js';
@@ -24,14 +24,14 @@ export type ArithmeticsAddedServices = {
  * Union of Langium default services and your custom services - use this as constructor parameter
  * of custom service classes.
  */
-export type ArithmeticsServices = LangiumServices & ArithmeticsAddedServices
+export type ArithmeticsServices = LangiumCoreServices & ArithmeticsAddedServices
 
 /**
  * Dependency injection module that overrides Langium default services and contributes the
  * 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 ArithmeticsModule: Module<ArithmeticsServices, PartialLangiumServices & ArithmeticsAddedServices> = {
+export const ArithmeticsModule: Module<ArithmeticsServices, PartialLangiumCoreServices & ArithmeticsAddedServices> = {
     references: {
         ScopeProvider: (services) => new ArithmeticsScopeProvider(services)
     },
@@ -56,7 +56,7 @@ export const ArithmeticsModule: Module<ArithmeticsServices, PartialLangiumServic
  * @returns An object wrapping the shared services and the language-specific services
  */
 export function createArithmeticsServices(context: DefaultSharedModuleContext): {
-    shared: LangiumSharedServicesWithLSP,
+    shared: LangiumSharedServices,
     arithmetics: ArithmeticsServices
 } {
     const shared = inject(

examples/arithmetics/src/language-server/generated/module.ts

@@ -3,7 +3,7 @@
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 
-import type { LangiumGeneratedServices, LangiumGeneratedSharedServices, LangiumSharedServices, LangiumServices, LanguageMetaData, Module } from 'langium';
+import type { LangiumGeneratedServices, LangiumGeneratedSharedServices, LangiumSharedCoreServices, LangiumCoreServices, LanguageMetaData, Module } from 'langium';
 import { ArithmeticsAstReflection } from './ast.js';
 import { ArithmeticsGrammar } from './grammar.js';
 
@@ -13,11 +13,11 @@ export const ArithmeticsLanguageMetaData = {
     caseInsensitive: true
 } as const satisfies LanguageMetaData;
 
-export const ArithmeticsGeneratedSharedModule: Module<LangiumSharedServices, LangiumGeneratedSharedServices> = {
+export const ArithmeticsGeneratedSharedModule: Module<LangiumSharedCoreServices, LangiumGeneratedSharedServices> = {
     AstReflection: () => new ArithmeticsAstReflection()
 };
 
-export const ArithmeticsGeneratedModule: Module<LangiumServices, LangiumGeneratedServices> = {
+export const ArithmeticsGeneratedModule: Module<LangiumCoreServices, LangiumGeneratedServices> = {
     Grammar: () => ArithmeticsGrammar(),
     LanguageMetaData: () => ArithmeticsLanguageMetaData,
     parser: {}

examples/domainmodel/src/cli/cli-util.ts

@@ -4,15 +4,15 @@
  * terms of the MIT License, which is available in the project root.
  ******************************************************************************/
 
-import type { AstNode, LangiumDocument, LangiumServices } from 'langium';
+import type { AstNode, LangiumDocument, LangiumCoreServices } from 'langium';
 import type { WorkspaceFolder } from 'vscode-languageserver';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import chalk from 'chalk';
 import { URI } from 'langium';
-import type { LangiumServicesWithLSP } from 'langium/lsp';
+import type { LangiumServices } from 'langium/lsp';
 
-export async function extractDocument<T extends AstNode>(fileName: string, extensions: readonly string[], services: LangiumServices): Promise<LangiumDocument<T>> {
+export async function extractDocument<T extends AstNode>(fileName: string, extensions: readonly string[], services: LangiumCoreServices): Promise<LangiumDocument<T>> {
     if (!extensions.includes(path.extname(fileName))) {
         console.error(chalk.yellow(`Please, choose a file with one of these extensions: ${extensions}.`));
         process.exit(1);
@@ -44,7 +44,7 @@ export async function extractAstNode<T extends AstNode>(fileName: string, extens
     return (await extractDocument(fileName, extensions, services)).parseResult.value as T;
 }
 
-export async function setRootFolder(fileName: string, services: LangiumServicesWithLSP, root?: string): Promise<void> {
+export async function setRootFolder(fileName: string, services: LangiumServices, root?: string): Promise<void> {
     if (!root) {
         root = path.dirname(fileName);
     }

examples/domainmodel/src/language-server/domain-model-module.ts

@@ -4,15 +4,15 @@
  * terms of the MIT License, which is available in the project root.
  ******************************************************************************/
 
-import type { LangiumServices, Module, PartialLangiumServices, DefaultSharedModuleContext } from 'langium';
+import type { LangiumCoreServices, Module, PartialLangiumCoreServices, DefaultSharedModuleContext } from 'langium';
 import { inject, createDefaultSharedModule, createDefaultModule } from 'langium';
 import { DomainModelGeneratedModule, DomainModelGeneratedSharedModule } from './generated/module.js';
 import { DomainModelValidator, registerValidationChecks } from './domain-model-validator.js';
 import { DomainModelScopeComputation } from './domain-model-scope.js';
 import { QualifiedNameProvider } from './domain-model-naming.js';
 import { DomainModelFormatter } from './domain-model-formatter.js';
 import { DomainModelRenameProvider } from './domain-model-rename-refactoring.js';
-import { createSharedLSPModule, createLSPModule, type LangiumLSPServices, type PartialLangiumLSPServices, type LangiumSharedServicesWithLSP } from 'langium/lsp';
+import { createSharedLSPModule, createLSPModule, type LangiumLSPServices, type PartialLangiumLSPServices, type LangiumSharedServices } from 'langium/lsp';
 
 export type DomainModelAddedServices = {
     references: {
@@ -23,9 +23,9 @@ export type DomainModelAddedServices = {
     }
 }
 
-export type DomainModelServices = LangiumServices & DomainModelAddedServices & LangiumLSPServices;
+export type DomainModelServices = LangiumCoreServices & DomainModelAddedServices & LangiumLSPServices;
 
-export const DomainModelModule: Module<DomainModelServices, PartialLangiumServices & PartialLangiumLSPServices & DomainModelAddedServices> = {
+export const DomainModelModule: Module<DomainModelServices, PartialLangiumCoreServices & PartialLangiumLSPServices & DomainModelAddedServices> = {
     references: {
         ScopeComputation: (services) => new DomainModelScopeComputation(services),
         QualifiedNameProvider: () => new QualifiedNameProvider()
@@ -40,7 +40,7 @@ export const DomainModelModule: Module<DomainModelServices, PartialLangiumServic
 };
 
 export function createDomainModelServices(context: DefaultSharedModuleContext): {
-    shared: LangiumSharedServicesWithLSP,
+    shared: LangiumSharedServices,
     domainmodel: DomainModelServices
 } {
     const shared = inject(

examples/domainmodel/src/language-server/generated/module.ts

@@ -3,7 +3,7 @@
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 
-import type { LangiumGeneratedServices, LangiumGeneratedSharedServices, LangiumSharedServices, LangiumServices, LanguageMetaData, Module, IParserConfig } from 'langium';
+import type { LangiumGeneratedServices, LangiumGeneratedSharedServices, LangiumSharedCoreServices, LangiumCoreServices, LanguageMetaData, Module, IParserConfig } from 'langium';
 import { DomainModelAstReflection } from './ast.js';
 import { DomainModelGrammar } from './grammar.js';
 
@@ -19,11 +19,11 @@ export const parserConfig: IParserConfig = {
     maxLookahead: 3,
 };
 
-export const DomainModelGeneratedSharedModule: Module<LangiumSharedServices, LangiumGeneratedSharedServices> = {
+export const DomainModelGeneratedSharedModule: Module<LangiumSharedCoreServices, LangiumGeneratedSharedServices> = {
     AstReflection: () => new DomainModelAstReflection()
 };
 
-export const DomainModelGeneratedModule: Module<LangiumServices, LangiumGeneratedServices> = {
+export const DomainModelGeneratedModule: Module<LangiumCoreServices, LangiumGeneratedServices> = {
     Grammar: () => DomainModelGrammar(),
     LanguageMetaData: () => DomainModelLanguageMetaData,
     parser: {

examples/requirements/src/cli/cli-util.ts

@@ -4,7 +4,7 @@
  * terms of the MIT License, which is available in the project root.
  ******************************************************************************/
 
-import type { LangiumDocument, LangiumServices } from 'langium';
+import type { LangiumDocument, LangiumCoreServices } from 'langium';
 import type { RequirementModel, TestModel } from '../language-server/generated/ast.js';
 import type { WorkspaceFolder } from 'vscode-languageclient';
 import chalk from 'chalk';
@@ -21,7 +21,7 @@ import { isTestModel } from '../language-server/generated/ast.js';
  * @returns a tuple with the document indicated by the fileName and a list of
  *          documents from the workspace.
  */
-export async function extractDocuments(fileName: string, services: LangiumServices): Promise<[LangiumDocument, LangiumDocument[]]> {
+export async function extractDocuments(fileName: string, services: LangiumCoreServices): Promise<[LangiumDocument, LangiumDocument[]]> {
     const extensions = services.LanguageMetaData.fileExtensions;
     if (!extensions.includes(path.extname(fileName))) {
         console.error(chalk.yellow(`Please choose a file with one of these extensions: ${extensions}.`));
@@ -66,7 +66,7 @@ export async function extractDocuments(fileName: string, services: LangiumServic
  * @returns a tuple with the model indicated by the fileName and a list of
  *          test models from the workspace.
 chr */
-export async function extractRequirementModelWithTestModels(fileName: string, services: LangiumServices): Promise<[RequirementModel, TestModel[]]> {
+export async function extractRequirementModelWithTestModels(fileName: string, services: LangiumCoreServices): Promise<[RequirementModel, TestModel[]]> {
     const [mainDocument, allDocuments] = await extractDocuments(fileName, services);
     return [
         mainDocument.parseResult?.value as RequirementModel,

examples/requirements/src/language-server/generated/module.ts

@@ -3,7 +3,7 @@
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 
-import type { LangiumGeneratedServices, LangiumGeneratedSharedServices, LangiumSharedServices, LangiumServices, LanguageMetaData, Module } from 'langium';
+import type { LangiumGeneratedServices, LangiumGeneratedSharedServices, LangiumSharedCoreServices, LangiumCoreServices, LanguageMetaData, Module } from 'langium';
 import { RequirementsAndTestsAstReflection } from './ast.js';
 import { RequirementsGrammar, TestsGrammar } from './grammar.js';
 
@@ -19,17 +19,17 @@ export const TestsLanguageMetaData = {
     caseInsensitive: false
 } as const satisfies LanguageMetaData;
 
-export const RequirementsAndTestsGeneratedSharedModule: Module<LangiumSharedServices, LangiumGeneratedSharedServices> = {
+export const RequirementsAndTestsGeneratedSharedModule: Module<LangiumSharedCoreServices, LangiumGeneratedSharedServices> = {
     AstReflection: () => new RequirementsAndTestsAstReflection()
 };
 
-export const RequirementsGeneratedModule: Module<LangiumServices, LangiumGeneratedServices> = {
+export const RequirementsGeneratedModule: Module<LangiumCoreServices, LangiumGeneratedServices> = {
     Grammar: () => RequirementsGrammar(),
     LanguageMetaData: () => RequirementsLanguageMetaData,
     parser: {}
 };
 
-export const TestsGeneratedModule: Module<LangiumServices, LangiumGeneratedServices> = {
+export const TestsGeneratedModule: Module<LangiumCoreServices, LangiumGeneratedServices> = {
     Grammar: () => TestsGrammar(),
     LanguageMetaData: () => TestsLanguageMetaData,
     parser: {}

examples/requirements/src/language-server/requirements-and-tests-lang-module.ts

@@ -13,7 +13,7 @@ import { RequirementsLangModule } from './requirements-lang-module.js';
 import { registerRequirementsValidationChecks } from './requirements-lang-validator.js';
 import { TestsLangModule } from './tests-lang-module.js';
 import { registerTestsValidationChecks } from './tests-lang-validator.js';
-import { createSharedLSPModule, type LangiumSharedServicesWithLSP } from 'langium/lsp';
+import { createSharedLSPModule, type LangiumSharedServices } from 'langium/lsp';
 
 /**
  * Create the full set of services required by Langium.
@@ -31,7 +31,7 @@ import { createSharedLSPModule, type LangiumSharedServicesWithLSP } from 'langiu
  * @returns An object wrapping the shared services and the language-specific services
  */
 export function createRequirementsAndTestsLangServices(context: DefaultSharedModuleContext): {
-    shared: LangiumSharedServicesWithLSP,
+    shared: LangiumSharedServices,
     requirements: RequirementsLangServices,
     tests: TestsLangServices
 } {

examples/requirements/src/language-server/requirements-lang-module.ts

@@ -4,7 +4,7 @@
  * terms of the MIT License, which is available in the project root.
  ******************************************************************************/
 
-import type { LangiumServices, Module, PartialLangiumServices } from 'langium';
+import type { LangiumCoreServices, Module, PartialLangiumCoreServices } from 'langium';
 import { RequirementsLangValidator } from './requirements-lang-validator.js';
 
 /**
@@ -20,14 +20,14 @@ export type RequirementsLangAddedServices = {
  * Union of Langium default services and your custom services - use this as constructor parameter
  * of custom service classes.
  */
-export type RequirementsLangServices = LangiumServices & RequirementsLangAddedServices
+export type RequirementsLangServices = LangiumCoreServices & RequirementsLangAddedServices
 
 /**
  * Dependency injection module that overrides Langium default services and contributes the
  * 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 RequirementsLangModule: Module<RequirementsLangServices, PartialLangiumServices & RequirementsLangAddedServices> = {
+export const RequirementsLangModule: Module<RequirementsLangServices, PartialLangiumCoreServices & RequirementsLangAddedServices> = {
     validation: {
         RequirementsLangValidator: (services) => new RequirementsLangValidator(services)
     }

examples/requirements/src/language-server/tests-lang-module.ts

@@ -4,7 +4,7 @@
  * terms of the MIT License, which is available in the project root.
  ******************************************************************************/
 
-import type { LangiumServices, Module, PartialLangiumServices } from 'langium';
+import type { LangiumCoreServices, Module, PartialLangiumCoreServices } from 'langium';
 import { TestsLangValidator } from './tests-lang-validator.js';
 
 /**
@@ -20,14 +20,14 @@ export type TestsLangAddedServices = {
  * Union of Langium default services and your custom services - use this as constructor parameter
  * of custom service classes.
  */
-export type TestsLangServices = LangiumServices & TestsLangAddedServices
+export type TestsLangServices = LangiumCoreServices & TestsLangAddedServices
 
 /**
  * Dependency injection module that overrides Langium default services and contributes the
  * 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 TestsLangModule: Module<TestsLangServices, PartialLangiumServices & TestsLangAddedServices> = {
+export const TestsLangModule: Module<TestsLangServices, PartialLangiumCoreServices & TestsLangAddedServices> = {
     validation: {
         TestsLangValidator: () => new TestsLangValidator()
     }

examples/statemachine/src/cli/cli-util.ts

@@ -7,10 +7,10 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import chalk from 'chalk';
-import type { AstNode, LangiumDocument, LangiumServices } from 'langium';
+import type { AstNode, LangiumDocument, LangiumCoreServices } from 'langium';
 import { URI } from 'langium';
 
-export async function extractDocument(fileName: string, extensions: readonly string[], services: LangiumServices): Promise<LangiumDocument> {
+export async function extractDocument(fileName: string, extensions: readonly string[], services: LangiumCoreServices): Promise<LangiumDocument> {
     if (!extensions.includes(path.extname(fileName))) {
         console.error(chalk.yellow(`Please, choose a file with one of these extensions: ${extensions}.`));
         process.exit(1);
@@ -38,7 +38,7 @@ export async function extractDocument(fileName: string, extensions: readonly str
     return document;
 }
 
-export async function extractAstNode<T extends AstNode>(fileName: string, extensions: readonly string[], services: LangiumServices): Promise<T> {
+export async function extractAstNode<T extends AstNode>(fileName: string, extensions: readonly string[], services: LangiumCoreServices): Promise<T> {
     return (await extractDocument(fileName, extensions, services)).parseResult?.value as T;
 }
 

examples/statemachine/src/language-server/generated/module.ts

@@ -3,7 +3,7 @@
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 
-import type { LangiumGeneratedServices, LangiumGeneratedSharedServices, LangiumSharedServices, LangiumServices, LanguageMetaData, Module } from 'langium';
+import type { LangiumGeneratedServices, LangiumGeneratedSharedServices, LangiumSharedCoreServices, LangiumCoreServices, LanguageMetaData, Module } from 'langium';
 import { StatemachineAstReflection } from './ast.js';
 import { StatemachineGrammar } from './grammar.js';
 
@@ -13,11 +13,11 @@ export const StatemachineLanguageMetaData = {
     caseInsensitive: false
 } as const satisfies LanguageMetaData;
 
-export const StatemachineGeneratedSharedModule: Module<LangiumSharedServices, LangiumGeneratedSharedServices> = {
+export const StatemachineGeneratedSharedModule: Module<LangiumSharedCoreServices, LangiumGeneratedSharedServices> = {
     AstReflection: () => new StatemachineAstReflection()
 };
 
-export const StatemachineGeneratedModule: Module<LangiumServices, LangiumGeneratedServices> = {
+export const StatemachineGeneratedModule: Module<LangiumCoreServices, LangiumGeneratedServices> = {
     Grammar: () => StatemachineGrammar(),
     LanguageMetaData: () => StatemachineLanguageMetaData,
     parser: {}