chore(arch): merge with develop

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

@@ -19,12 +19,12 @@ import { ArchitectureValueConverter } from './valueConverter.js';
 /**
  * Declaration of `Architecture` services.
  */
-type ArchitectureAddedServices = {
+interface ArchitectureAddedServices {
   parser: {
     TokenBuilder: ArchitectureTokenBuilder;
     ValueConverter: ArchitectureValueConverter;
   };
-};
+}
 
 /**
  * Union of Langium default services and `Architecture` services.

packages/parser/src/language/architecture/valueConverter.ts

@@ -6,13 +6,12 @@ export class ArchitectureValueConverter extends AbstractMermaidValueConverter {
   protected runCustomConverter(
     rule: GrammarAST.AbstractRule,
     input: string,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     _cstNode: CstNode
   ): ValueType | undefined {
     if (rule.name === 'ARCH_ICON') {
       return input.replace(/[()]/g, '').trim();
     } else if (rule.name === 'ARCH_TEXT_ICON') {
-      return input.replace(/[()"]/g, '');
+      return input.replace(/["()]/g, '');
     } else if (rule.name === 'ARCH_TITLE') {
       return input.replace(/[[\]]/g, '').trim();
     }

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

@@ -20,6 +20,7 @@ export abstract class AbstractMermaidTokenBuilder extends DefaultTokenBuilder {
     // to restrict users, they mustn't have any non-whitespace characters after the keyword.
     tokenTypes.forEach((tokenType: TokenType): void => {
       if (this.keywords.has(tokenType.name) && tokenType.PATTERN !== undefined) {
+        // eslint-disable-next-line @typescript-eslint/no-base-to-string
         tokenType.PATTERN = new RegExp(tokenType.PATTERN.toString() + '(?:(?=%%)|(?!\\S))');
       }
     });

packages/parser/src/language/common/valueConverter.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
 import type { CstNode, GrammarAST, ValueType } from 'langium';
 import { DefaultValueConverter } from 'langium';
 

packages/parser/src/language/pie/valueConverter.ts

@@ -6,7 +6,6 @@ export class PieValueConverter extends AbstractMermaidValueConverter {
   protected runCustomConverter(
     rule: GrammarAST.AbstractRule,
     input: string,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     _cstNode: CstNode
   ): ValueType | undefined {
     if (rule.name !== 'PIE_SECTION_LABEL') {