Update angular material to v19, run inject migration

package.json

@@ -11,18 +11,18 @@
   },
   "private": true,
   "dependencies": {
-    "@angular-devkit/build-angular": "^18.1.1",
+    "@angular-devkit/build-angular": "^19.1.6",
-    "@angular/animations": "^18.1.1",
+    "@angular/animations": "^19.1.5",
-    "@angular/cdk": "^18.1.1",
+    "@angular/cdk": "^19.1.3",
-    "@angular/common": "^18.1.1",
+    "@angular/common": "^19.1.5",
-    "@angular/compiler": "^18.1.1",
+    "@angular/compiler": "^19.1.5",
-    "@angular/core": "^18.1.1",
+    "@angular/core": "^19.1.5",
-    "@angular/forms": "^18.1.1",
+    "@angular/forms": "^19.1.5",
-    "@angular/material": "^18.1.1",
+    "@angular/material": "^19.1.3",
-    "@angular/platform-browser": "^18.1.1",
+    "@angular/platform-browser": "^19.1.5",
-    "@angular/platform-browser-dynamic": "^18.1.1",
+    "@angular/platform-browser-dynamic": "^19.1.5",
-    "@angular/router": "^18.1.1",
+    "@angular/router": "^19.1.5",
-    "@angular/service-worker": "^18.1.1",
+    "@angular/service-worker": "^19.1.5",
     "@tauri-apps/api": "^1.6.0",
     "highlight.js": "^11.10.0",
     "monaco-editor": "^0.50.0",
@@ -30,12 +30,12 @@
     "protobufjs": "^7.3.2",
     "rxjs": "^7.8.1",
     "tslib": "^2.6.3",
-    "zone.js": "^0.14.8"
+    "zone.js": "^0.15.0"
   },
   "devDependencies": {
-    "@angular/build": "^18.1.1",
+    "@angular/build": "^19.1.6",
-    "@angular/cli": "^18.1.1",
+    "@angular/cli": "^19.1.6",
-    "@angular/compiler-cli": "^18.1.1",
+    "@angular/compiler-cli": "^19.1.5",
     "@tauri-apps/cli": "^1.6.0",
     "@types/jasmine": "^5.1.4",
     "@types/protobufjs": "^6.0.0",

src/app/app.component.ts

@@ -1,13 +1,12 @@
 import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
 import { CommonModule } from '@angular/common';
-import { Component, computed, signal } from '@angular/core';
+import { Component, signal, inject } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { MatButtonModule } from '@angular/material/button';
 import { MatIconModule } from '@angular/material/icon';
 import { MatSidenavModule } from '@angular/material/sidenav';
 import { MatToolbarModule } from '@angular/material/toolbar';
 import { MatTreeModule } from '@angular/material/tree';
-import { RouterOutlet } from '@angular/router';
 import { EditorComponent } from './editor/editor.component';
 import {
   FileOrFolder,
@@ -15,11 +14,11 @@ import {
 } from './file-tree/file-tree.component';
 import { ProtoMessage } from './model/proto-message.model';
 import { ProtoDefinitionSelectorComponent } from './proto-definition-selector/proto-definition-selector.component';
+
 const mobileBreakpoints = [Breakpoints.Handset, Breakpoints.TabletPortrait];
 
 @Component({
   selector: 'app-root',
-  standalone: true,
   templateUrl: './app.component.html',
   styleUrl: './app.component.scss',
   imports: [
@@ -32,10 +31,11 @@ const mobileBreakpoints = [Breakpoints.Handset, Breakpoints.TabletPortrait];
     MatToolbarModule,
     MatTreeModule,
     ProtoDefinitionSelectorComponent,
-    RouterOutlet,
   ],
 })
 export class AppComponent {
+  private breakpointObserver = inject(BreakpointObserver);
+
   protected selectedFile = signal<FileOrFolder | undefined>(undefined);
   protected selectedMessage = signal<ProtoMessage | undefined>(undefined);
   protected rightSideOpen = signal(true);
@@ -46,7 +46,9 @@ export class AppComponent {
     this.breakpointObserver.isMatched(mobileBreakpoints)
   );
 
-  constructor(private breakpointObserver: BreakpointObserver) {
+  constructor() {
+    const breakpointObserver = this.breakpointObserver;
+
     breakpointObserver
       .observe(mobileBreakpoints)
       .pipe(takeUntilDestroyed())

src/app/app.config.ts

@@ -1,8 +1,9 @@
 import {
-  APP_INITIALIZER,
   ApplicationConfig,
   isDevMode,
   provideExperimentalZonelessChangeDetection,
+  provideAppInitializer,
+  inject,
 } from '@angular/core';
 import { provideRouter } from '@angular/router';
 
@@ -22,24 +23,18 @@ export const appConfig: ApplicationConfig = {
     provideExperimentalZonelessChangeDetection(),
     provideRouter(routes),
     provideAnimationsAsync(),
-    {
+    provideAppInitializer(() => {
-      provide: APP_INITIALIZER,
+      hljs.registerLanguage('json', json);
-      useValue: () => {
+    }),
-        hljs.registerLanguage('json', json);
+    provideAppInitializer(() => {
-      },
+      const initializerFn = ((iconRegistry: MatIconRegistry) => () => {
-      multi: true,
-    },
-    {
-      provide: APP_INITIALIZER,
-      useFactory: (iconRegistry: MatIconRegistry) => () => {
         iconRegistry.registerFontClassAlias(
           'material-symbols-rounded',
           'material-symbols-rounded'
         );
-      },
+      })(inject(MatIconRegistry));
-      deps: [MatIconRegistry],
+      return initializerFn();
-      multi: true,
+    }),
-    },
     {
       provide: MAT_ICON_DEFAULT_OPTIONS,
       useValue: { fontSet: 'material-symbols-rounded' },

src/app/editor/editor.component.ts

@@ -8,6 +8,7 @@ import {
   input,
   signal,
   viewChild,
+  inject,
 } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatIconModule } from '@angular/material/icon';
@@ -29,7 +30,6 @@ type PreviewType = 'raw' | 'edit' | 'diff';
 
 @Component({
   selector: 'app-editor',
-  standalone: true,
   imports: [
     CommonModule,
     ProtoFieldComponent,
@@ -43,6 +43,8 @@ type PreviewType = 'raw' | 'edit' | 'diff';
   styleUrl: './editor.component.scss',
 })
 export class EditorComponent {
+  private snackBar = inject(MatSnackBar);
+
   selectedFile = input<FileOrFolder>();
   selectedMessage = input.required<ProtoMessage>();
   indentSize = input<number>(2);
@@ -80,7 +82,9 @@ export class EditorComponent {
 
   private code = viewChild<ElementRef<HTMLElement>>('code');
 
-  constructor(sanitizer: DomSanitizer, private snackBar: MatSnackBar) {
+  constructor() {
+    const sanitizer = inject(DomSanitizer);
+
     effect(() => {
       const element = this.code()?.nativeElement;
       if (element) {

src/app/editor/list-field/list-field.component.ts

@@ -14,15 +14,14 @@ import { ListMessage } from '../../model/proto-message.model';
 import { ProtoFieldComponent } from '../proto-field/proto-field.component';
 
 @Component({
-  selector: 'app-list-field',
+    selector: 'app-list-field',
-  standalone: true,
+    imports: [
-  imports: [
+        CommonModule,
-    CommonModule,
+        MatButtonModule,
-    MatButtonModule,
+        MatIconModule,
-    MatIconModule,
+        forwardRef(() => ProtoFieldComponent),
-    forwardRef(() => ProtoFieldComponent),
+    ],
-  ],
+    template: `<h3>{{ label() }}</h3>
-  template: `<h3>{{ label() }}</h3>
     @if(values()) { @for(value of values(); track $index) {
     <div class="row-wrapper">
       <app-proto-field
@@ -38,8 +37,8 @@ import { ProtoFieldComponent } from '../proto-field/proto-field.component';
     <button mat-icon-button class="add-button" (click)="add()">
       <mat-icon>add</mat-icon>
     </button>`,
-  styleUrl: './list-field.component.scss',
+    styleUrl: './list-field.component.scss',
-  changeDetection: ChangeDetectionStrategy.OnPush,
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ListFieldComponent {
   label = input<string>();

src/app/editor/map-field/map-field.component.ts

@@ -16,15 +16,14 @@ import { ProtoFieldComponent } from '../proto-field/proto-field.component';
 const keyIsEmpty = (key: string | number) => key == null || key === '';
 
 @Component({
-  selector: 'app-map-field',
+    selector: 'app-map-field',
-  standalone: true,
+    imports: [
-  imports: [
+        CommonModule,
-    CommonModule,
+        forwardRef(() => ProtoFieldComponent),
-    forwardRef(() => ProtoFieldComponent),
+        MatIconModule,
-    MatIconModule,
+        MatButtonModule,
-    MatButtonModule,
+    ],
-  ],
+    template: `<h3>{{ label() }}</h3>
-  template: `<h3>{{ label() }}</h3>
     @if(valuePairs()) { @for(value of valuePairs(); track $index) {
     <div class="row-wrapper">
       <app-proto-field
@@ -45,8 +44,8 @@ const keyIsEmpty = (key: string | number) => key == null || key === '';
     <button mat-icon-button class="add-button" (click)="add()">
       <mat-icon>add</mat-icon>
     </button>`,
-  styleUrl: './map-field.component.scss',
+    styleUrl: './map-field.component.scss',
-  changeDetection: ChangeDetectionStrategy.OnPush,
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class MapFieldComponent {
   label = input<string>();

src/app/editor/object-field/object-field.component.ts

@@ -11,10 +11,9 @@ import { ObjectMessage } from '../../model/proto-message.model';
 import { ProtoFieldComponent } from '../proto-field/proto-field.component';
 
 @Component({
-  selector: 'app-object-field',
+    selector: 'app-object-field',
-  standalone: true,
+    imports: [CommonModule, forwardRef(() => ProtoFieldComponent)],
-  imports: [CommonModule, forwardRef(() => ProtoFieldComponent)],
+    template: `<h3>
-  template: `<h3>
       {{ label() }} ({{ configuration().messageDefinition.name }})
     </h3>
     <div>
@@ -27,8 +26,8 @@ import { ProtoFieldComponent } from '../proto-field/proto-field.component';
       ></app-proto-field>
       }
     </div>`,
-  styleUrl: './object-field.component.scss',
+    styleUrl: './object-field.component.scss',
-  changeDetection: ChangeDetectionStrategy.OnPush,
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ObjectFieldComponent {
   label = input<string>();

src/app/editor/proto-field/proto-field.component.ts

@@ -27,21 +27,20 @@ import { ObjectFieldComponent } from '../object-field/object-field.component';
 import { StringFieldComponent } from '../string-field/string-field.component';
 
 @Component({
-  selector: 'app-proto-field',
+    selector: 'app-proto-field',
-  standalone: true,
+    imports: [
-  imports: [
+        CommonModule,
-    CommonModule,
+        FormsModule,
-    FormsModule,
+        ListFieldComponent,
-    ListFieldComponent,
+        MapFieldComponent,
-    MapFieldComponent,
+        MatCheckboxModule,
-    MatCheckboxModule,
+        MatFormFieldModule,
-    MatFormFieldModule,
+        MatSelectModule,
-    MatSelectModule,
+        MatInputModule,
-    MatInputModule,
+        ObjectFieldComponent,
-    ObjectFieldComponent,
+        StringFieldComponent,
-    StringFieldComponent,
+    ],
-  ],
+    template: `@switch (configuration().type) { @case (MessageTypeEnum.String) {
-  template: `@switch (configuration().type) { @case (MessageTypeEnum.String) {
     <app-string-field
       [label]="label()"
       [configuration]="stringConfiguration()"
@@ -101,8 +100,8 @@ import { StringFieldComponent } from '../string-field/string-field.component';
       [configuration]="objectConfiguration()"
     ></app-object-field>
     } @case (MessageTypeEnum.Raw) {}}`,
-  styleUrl: './proto-field.component.scss',
+    styleUrl: './proto-field.component.scss',
-  changeDetection: ChangeDetectionStrategy.OnPush,
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ProtoFieldComponent {
   label = input<string>();

src/app/editor/string-field/string-field.component.ts

@@ -12,16 +12,15 @@ import { MatInputModule } from '@angular/material/input';
 import { MonacoEditorModule } from 'ngx-monaco-editor-v2';
 
 @Component({
-  selector: 'app-string-field',
+    selector: 'app-string-field',
-  standalone: true,
+    imports: [
-  imports: [
+        CommonModule,
-    CommonModule,
+        FormsModule,
-    FormsModule,
+        MatFormFieldModule,
-    MatFormFieldModule,
+        MatInputModule,
-    MatInputModule,
+        MonacoEditorModule,
-    MonacoEditorModule,
+    ],
-  ],
+    template: ` @if(configuration().textType === 'text') {
-  template: ` @if(configuration().textType === 'text') {
     <mat-form-field>
       <mat-label>{{ label() }}</mat-label>
       <input
@@ -44,8 +43,8 @@ import { MonacoEditorModule } from 'ngx-monaco-editor-v2';
       [options]="editorOptions"
     ></ngx-monaco-editor>
     }`,
-  styleUrl: './string-field.component.css',
+    styleUrl: './string-field.component.css',
-  changeDetection: ChangeDetectionStrategy.OnPush,
+    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class StringFieldComponent {
   label = input();

src/app/file-tree/file-tree.component.ts

@@ -40,7 +40,6 @@ const collator = new Intl.Collator(undefined, { numeric: true });
 
 @Component({
   selector: 'app-file-tree',
-  standalone: true,
   imports: [CommonModule, MatButtonModule, MatIconModule, MatTreeModule],
   templateUrl: './file-tree.component.html',
   styleUrl: './file-tree.component.scss',

src/app/proto-definition-selector/definition-editor/definition-editor-field/definition-editor-field.component.ts

@@ -21,7 +21,6 @@ import { StringEditorFieldComponent } from '../string-editor-field/string-editor
 
 @Component({
   selector: 'app-definition-editor-field',
-  standalone: true,
   imports: [
     CommonModule,
     FormsModule,

src/app/proto-definition-selector/definition-editor/definition-editor.component.ts

@@ -1,5 +1,5 @@
 import { CommonModule } from '@angular/common';
-import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
 import {
@@ -14,7 +14,6 @@ import { DefinitionEditorFieldComponent } from './definition-editor-field/defini
 
 @Component({
   selector: 'app-definition-editor',
-  standalone: true,
   imports: [
     CommonModule,
     MatButtonModule,
@@ -39,6 +38,8 @@ import { DefinitionEditorFieldComponent } from './definition-editor-field/defini
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class DefinitionEditorComponent {
+  protected protoMessage = inject<ProtoMessage>(MAT_DIALOG_DATA);
+
   protected editableMessages = this.protoMessage.values.filter((message) =>
     this.filterMessageConfiguration(message.configuration)
   );
@@ -61,6 +62,4 @@ export class DefinitionEditorComponent {
     // Note: Map can always be configured, as key needs to be a string or numeric type
     return EDITABLE_MESSAGE_TYPES.includes(configuration.type);
   }
-
-  constructor(@Inject(MAT_DIALOG_DATA) protected protoMessage: ProtoMessage) {}
 }

src/app/proto-definition-selector/definition-editor/list-editor-field/list-editor-field.component.ts

@@ -10,7 +10,6 @@ import { ListMessage } from '../../../model/proto-message.model';
 
 @Component({
   selector: 'app-list-editor-field',
-  standalone: true,
   imports: [CommonModule, forwardRef(() => DefinitionEditorFieldComponent)],
   template: `<app-definition-editor-field
     [fieldConfiguration]="field().subConfiguration"

src/app/proto-definition-selector/definition-editor/map-editor-field/map-editor-field.component.ts

@@ -14,7 +14,6 @@ import {
 
 @Component({
   selector: 'app-map-editor-field',
-  standalone: true,
   imports: [CommonModule, forwardRef(() => DefinitionEditorFieldComponent)],
   template: `
     <h4>Key Configuration</h4>

src/app/proto-definition-selector/definition-editor/object-editor-field/object-editor-field.component.ts

@@ -14,7 +14,6 @@ import { DefinitionEditorFieldComponent } from '../definition-editor-field/defin
 
 @Component({
   selector: 'app-object-editor-field',
-  standalone: true,
   imports: [CommonModule, forwardRef(() => DefinitionEditorFieldComponent)],
   template: `
     @for (field of editableFields(); track $index) {

src/app/proto-definition-selector/definition-editor/string-editor-field/string-editor-field.component.ts

@@ -8,7 +8,6 @@ import { MatInputModule } from '@angular/material/input';
 
 @Component({
   selector: 'app-string-editor-field',
-  standalone: true,
   imports: [
     CommonModule,
     FormsModule,

src/app/proto-definition-selector/proto-definition-selector.component.ts

@@ -1,16 +1,5 @@
 import { CommonModule } from '@angular/common';
-import {
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, HostBinding, HostListener, computed, output, signal, viewChild, inject } from '@angular/core';
-  ChangeDetectionStrategy,
-  ChangeDetectorRef,
-  Component,
-  ElementRef,
-  HostBinding,
-  HostListener,
-  computed,
-  output,
-  signal,
-  viewChild,
-} from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatListModule, MatSelectionList } from '@angular/material/list';
 import { ProtoMessage } from '../model/proto-message.model';
@@ -29,7 +18,6 @@ const collator = new Intl.Collator(undefined, { numeric: true });
 
 @Component({
   selector: 'app-proto-definition-selector',
-  standalone: true,
   imports: [
     CommonModule,
     MatButtonModule,
@@ -102,6 +90,10 @@ const collator = new Intl.Collator(undefined, { numeric: true });
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ProtoDefinitionSelectorComponent {
+  private protoDefinitionService = inject(ProtoDefinitionService);
+  private snackBar = inject(MatSnackBar);
+  private dialog = inject(MatDialog);
+
   messageSelected = output<ProtoMessage>();
 
   protected protoSelector =
@@ -135,12 +127,6 @@ export class ProtoDefinitionSelectorComponent {
     return this.isDragging();
   }
 
-  constructor(
-    private protoDefinitionService: ProtoDefinitionService,
-    private snackBar: MatSnackBar,
-    private dialog: MatDialog
-  ) {}
-
   protected async addDefinitionFiles() {
     const files = this.protoSelector()?.nativeElement.files;
     if (files) {

src/styles.scss

@@ -1,7 +1,8 @@
 @use "@angular/material" as mat;
 @use "./theme.scss";
 
-@include mat.core();
+@include mat.elevation-classes();
+@include mat.app-background();
 
 @mixin custom-colours($theme) {
   .mat-toolbar {
@@ -20,7 +21,8 @@
 }
 
 html {
-  @include mat.core-theme(theme.$rose-theme);
+  @include mat.elevation-classes();
+  @include mat.app-background();
   @include mat.toolbar-theme(theme.$rose-theme);
   @include mat.button-theme(theme.$rose-theme);
   @include mat.tree-theme(theme.$rose-theme);