Simplify inject() typing #10706

client/app/admin/users/services/user.service.ts

@@ -1,5 +1,5 @@
 import {gql} from 'apollo-angular';
-import {Injectable, OnDestroy, inject} from '@angular/core';
+import {inject, Injectable, OnDestroy} from '@angular/core';
 import {FormControl, ValidationErrors, Validators} from '@angular/forms';
 import {Router} from '@angular/router';
 import {
@@ -12,7 +12,6 @@ import {
     LOCAL_STORAGE,
     NaturalAbstractModelService,
     NaturalQueryVariablesManager,
-    NaturalStorage,
     unique,
 } from '@ecodev/natural';
 import {fromEvent, Observable, of, Subject} from 'rxjs';
@@ -109,7 +108,7 @@ export class UserService
     protected readonly bookingService = inject(BookingService);
     private readonly permissionsService = inject(PermissionsService);
     protected readonly pricedBookingService = inject(PricedBookingService);
-    private readonly storage = inject<NaturalStorage>(LOCAL_STORAGE);
+    private readonly storage = inject(LOCAL_STORAGE);
 
     /**
      * Should be used only by getViewer and cacheViewer

client/app/home/home.component.ts

@@ -6,7 +6,6 @@ import {
     NaturalIconDirective,
     NaturalSidenavContainerComponent,
     NaturalSidenavStackService,
-    NaturalStorage,
 } from '@ecodev/natural';
 import {filter, switchMap} from 'rxjs/operators';
 import {ActivatedRoute, Router, RouterLink, RouterOutlet} from '@angular/router';
@@ -36,7 +35,7 @@ import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
 export class HomeComponent implements OnInit {
     private readonly userService = inject(UserService);
     private readonly router = inject(Router);
-    private readonly storage = inject<NaturalStorage>(LOCAL_STORAGE);
+    private readonly storage = inject(LOCAL_STORAGE);
     public readonly route = inject(ActivatedRoute);
     private readonly configurationService = inject(ConfigurationService);
     private readonly naturalSidenavStackService = inject(NaturalSidenavStackService);

client/app/profile/components/bvr/bvr.component.ts

@@ -45,7 +45,7 @@ const queryForExport = gql`
 })
 export class BvrComponent {
     private readonly apollo = inject(Apollo);
-    private readonly document = inject<Document>(DOCUMENT);
+    private readonly document = inject(DOCUMENT);
 
     @Input() public set bankingData(data: BankingInfosVariables) {
         this.variables = data;

client/app/shared/components/copy-contact-data/copy-contact-data-button.service.ts

@@ -20,7 +20,7 @@ export type ContactType = 'bookingsWithOwnerContact' | 'emailAndPhoneUsers';
 })
 export class CopyContactDataButtonService<V extends EmailAndPhoneUsersVariables | BookingsWithOwnerContactVariables> {
     private readonly apollo = inject(Apollo);
-    private readonly document = inject<Document>(DOCUMENT);
+    private readonly document = inject(DOCUMENT);
 
     private type!: ContactType;
     private variablesManager!: NaturalQueryVariablesManager<V>;

client/app/shared/services/datatrans.service.ts

@@ -40,7 +40,7 @@ function stringifyReplacer(key: string, value: unknown): unknown {
     providedIn: 'root',
 })
 export class DatatransService {
-    private readonly document = inject<Document>(DOCUMENT);
+    private readonly document = inject(DOCUMENT);
 
     private preservedStyles: {html: string; body: string} = {html: '', body: ''};
     private paymentFrame: HTMLDivElement | null = null;