diff --git a/package.json b/package.json index 830c3b2bd..e30d0a278 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "jison": "^0.4.18", "js-yaml": "^4.1.0", "jsdom": "^22.0.0", - "langium-cli": "2.1.0", + "langium-cli": "3.0.1", "lint-staged": "^13.2.1", "nyc": "^15.1.0", "path-browserify": "^1.0.1", diff --git a/packages/parser/package.json b/packages/parser/package.json index aa9c08f42..b937e37b9 100644 --- a/packages/parser/package.json +++ b/packages/parser/package.json @@ -34,7 +34,7 @@ "ast" ], "dependencies": { - "langium": "2.1.2" + "langium": "3.0.0" }, "devDependencies": { "chevrotain": "^11.0.3" diff --git a/packages/parser/src/language/info/module.ts b/packages/parser/src/language/info/module.ts index 17f1fb4eb..83933aeef 100644 --- a/packages/parser/src/language/info/module.ts +++ b/packages/parser/src/language/info/module.ts @@ -1,11 +1,16 @@ import type { - DefaultSharedModuleContext, - LangiumServices, - LangiumSharedServices, + DefaultSharedCoreModuleContext, + LangiumCoreServices, + LangiumSharedCoreServices, Module, - PartialLangiumServices, + PartialLangiumCoreServices, +} from 'langium'; +import { + EmptyFileSystem, + createDefaultCoreModule, + createDefaultSharedCoreModule, + inject, } from 'langium'; -import { EmptyFileSystem, createDefaultModule, createDefaultSharedModule, inject } from 'langium'; import { CommonValueConverter } from '../common/index.js'; import { InfoGeneratedModule, MermaidGeneratedSharedModule } from '../generated/module.js'; @@ -24,13 +29,13 @@ type InfoAddedServices = { /** * Union of Langium default services and `Info` services. */ -export type InfoServices = LangiumServices & InfoAddedServices; +export type InfoServices = LangiumCoreServices & InfoAddedServices; /** * Dependency injection module that overrides Langium default services and * contributes the declared `Info` services. */ -export const InfoModule: Module = { +export const InfoModule: Module = { parser: { TokenBuilder: () => new InfoTokenBuilder(), ValueConverter: () => new CommonValueConverter(), @@ -51,16 +56,16 @@ export const InfoModule: Module = { +export const PacketModule: Module< + PacketServices, + PartialLangiumCoreServices & PacketAddedServices +> = { parser: { TokenBuilder: () => new PacketTokenBuilder(), ValueConverter: () => new CommonValueConverter(), @@ -50,16 +59,16 @@ export const PacketModule: Module = { +export const PieModule: Module = { parser: { TokenBuilder: () => new PieTokenBuilder(), ValueConverter: () => new PieValueConverter(), @@ -51,15 +56,19 @@ export const PieModule: Module=12'} dev: true - /langium-cli@2.1.0: - resolution: {integrity: sha512-Gbj4CvfAc1gP/6ihxikd2Je95j1FWjXZu8bbji2/t2vQ6kEP+vs9Fx7kSGOM0AbU/hjZfy6E35bJPOdwsiyqTA==} + /langium-cli@3.0.1: + resolution: {integrity: sha512-s1R/4GKkWItfu2o05DxqP71ID5MiGqb1BfXyPeFvIO3+aRSCj6fCj9EXtasvf18lSTUe27H37aO66TNU9VRr+Q==} engines: {node: '>=16.0.0'} hasBin: true dependencies: @@ -11977,20 +11977,20 @@ packages: commander: 11.0.0 fs-extra: 11.1.1 jsonschema: 1.4.1 - langium: 2.1.2 - langium-railroad: 2.1.0 + langium: 3.0.0 + langium-railroad: 3.0.0 lodash: 4.17.21 dev: true - /langium-railroad@2.1.0: - resolution: {integrity: sha512-2IeAIUSTQzbDjNnJA+0ql8tyN/mhCSN4FS50Mo9LOtLj523qUEBwHflDmCiOGZzW9iZdni6NXJgh8nLqjhTlDw==} + /langium-railroad@3.0.0: + resolution: {integrity: sha512-GQOnQBGl5gJqzgK/4bKvJO5QhJGNnprpYH6Fghbl4FviVLHwP6yzyqiouDelLSoCadChCr2JqKaBp5HXv7CgWw==} dependencies: - langium: 2.1.2 + langium: 3.0.0 railroad-diagrams: 1.0.0 dev: true - /langium@2.1.2: - resolution: {integrity: sha512-1NDUmhm111xs6NLh1DzQ9YPrOhL6JqJryY9igPIGrG0AbKKGmGf3fahAiY1MUChwIYSec6Fvoj+igwKzvGXQog==} + /langium@3.0.0: + resolution: {integrity: sha512-+Ez9EoiByeoTu/2BXmEaZ06iPNXM6thWJp02KfBO/raSMyCJ4jw7AkWWa+zBCTm0+Tw1Fj9FOxdqSskyN5nAwg==} engines: {node: '>=16.0.0'} dependencies: chevrotain: 11.0.3