Merge branch next into add-pie-langium-parser

packages/parser/src/index.ts

@@ -1,2 +1,11 @@
+import type { AstNode } from 'langium';
+
 export * from './language/index.js';
 export * from './parse.js';
+
+/**
+ * Exclude/omit all `AstNode` attributes recursively.
+ */
+export type RecursiveAstOmit<T> = T extends object
+  ? { [P in keyof T as Exclude<P, keyof AstNode>]: RecursiveAstOmit<T[P]> }
+  : T;

packages/parser/src/language/index.ts

@@ -1,19 +1,25 @@
 export {
   Info,
   MermaidAstType,
+  Packet,
+  PacketBlock,
   Pie,
   PieSection,
   isCommon,
   isInfo,
+  isPacket,
+  isPacketBlock,
   isPie,
   isPieSection,
 } from './generated/ast.js';
 export {
   InfoGeneratedModule,
   MermaidGeneratedSharedModule,
+  PacketGeneratedModule,
   PieGeneratedModule,
 } from './generated/module.js';
 
 export * from './common/index.js';
 export * from './info/index.js';
+export * from './packet/index.js';
 export * from './pie/index.js';

packages/parser/src/language/packet/index.ts

@@ -0,0 +1 @@
+export * from './module.js';

packages/parser/src/language/packet/module.ts

@@ -0,0 +1,68 @@
+import type {
+  DefaultSharedModuleContext,
+  LangiumServices,
+  LangiumSharedServices,
+  Module,
+  PartialLangiumServices,
+} from 'langium';
+import { EmptyFileSystem, createDefaultModule, createDefaultSharedModule, inject } from 'langium';
+import { CommonValueConverter } from '../common/valueConverter.js';
+import { MermaidGeneratedSharedModule, PacketGeneratedModule } from '../generated/module.js';
+import { PacketTokenBuilder } from './tokenBuilder.js';
+
+/**
+ * Declaration of `Packet` services.
+ */
+type PacketAddedServices = {
+  parser: {
+    TokenBuilder: PacketTokenBuilder;
+    ValueConverter: CommonValueConverter;
+  };
+};
+
+/**
+ * Union of Langium default services and `Packet` services.
+ */
+export type PacketServices = LangiumServices & PacketAddedServices;
+
+/**
+ * Dependency injection module that overrides Langium default services and
+ * contributes the declared `Packet` services.
+ */
+export const PacketModule: Module<PacketServices, PartialLangiumServices & PacketAddedServices> = {
+  parser: {
+    TokenBuilder: () => new PacketTokenBuilder(),
+    ValueConverter: () => new CommonValueConverter(),
+  },
+};
+
+/**
+ * Create the full set of services required by Langium.
+ *
+ * First inject the shared services by merging two modules:
+ *  - Langium default shared services
+ *  - Services generated by langium-cli
+ *
+ * Then inject the language-specific services by merging three modules:
+ *  - Langium default language-specific services
+ *  - Services generated by langium-cli
+ *  - Services specified in this file
+ * @param context - Optional module context with the LSP connection
+ * @returns An object wrapping the shared services and the language-specific services
+ */
+export function createPacketServices(context: DefaultSharedModuleContext = EmptyFileSystem): {
+  shared: LangiumSharedServices;
+  Packet: PacketServices;
+} {
+  const shared: LangiumSharedServices = inject(
+    createDefaultSharedModule(context),
+    MermaidGeneratedSharedModule
+  );
+  const Packet: PacketServices = inject(
+    createDefaultModule({ shared }),
+    PacketGeneratedModule,
+    PacketModule
+  );
+  shared.ServiceRegistry.register(Packet);
+  return { shared, Packet };
+}

packages/parser/src/language/packet/packet.langium

@@ -0,0 +1,19 @@
+grammar Packet
+import "../common/common";
+
+entry Packet:
+  NEWLINE*
+  "packet-beta"
+  (
+    NEWLINE* TitleAndAccessibilities blocks+=PacketBlock*
+    | NEWLINE+ blocks+=PacketBlock+
+    | NEWLINE*
+  )
+;
+
+PacketBlock:
+  start=INT('-' end=INT)? ':' label=STRING EOL
+;
+
+terminal INT returns number: /0|[1-9][0-9]*/;
+terminal STRING: /"[^"]*"|'[^']*'/;

packages/parser/src/language/packet/tokenBuilder.ts

@@ -0,0 +1,7 @@
+import { AbstractMermaidTokenBuilder } from '../common/index.js';
+
+export class PacketTokenBuilder extends AbstractMermaidTokenBuilder {
+  public constructor() {
+    super(['packet-beta']);
+  }
+}

packages/parser/src/parse.ts

@@ -1,9 +1,9 @@
 import type { LangiumParser, ParseResult } from 'langium';
 
-import type { Info, Pie } from './index.js';
-import { createInfoServices, createPieServices } from './language/index.js';
+import type { Info, Packet, Pie } from './index.js';
+import { createInfoServices, createPacketServices, createPieServices } from './language/index.js';
 
-export type DiagramAST = Info | Pie;
+export type DiagramAST = Info | Packet | Pie;
 
 const parsers: Record<string, LangiumParser> = {};
 const initializers = {
@@ -12,12 +12,16 @@ const initializers = {
     // const { createInfoServices } = await import('./language/info/index.js');
     parsers['info'] = createInfoServices().Info.parser.LangiumParser;
   },
+  packet: () => {
+    parsers['packet'] = createPacketServices().Packet.parser.LangiumParser;
+  },
   pie: () => {
     parsers['pie'] = createPieServices().Pie.parser.LangiumParser;
   },
 } as const;
 
 export function parse(diagramType: 'info', text: string): Info;
+export function parse(diagramType: 'packet', text: string): Packet;
 export function parse(diagramType: 'pie', text: string): Pie;
 export function parse<T extends DiagramAST>(
   diagramType: keyof typeof initializers,