Skip to content

Commit c4f523b

Browse files
rbaletrbalet
committed
refactor: prettier
1 parent 4b789b0 commit c4f523b

File tree

8 files changed

+73
-66
lines changed

8 files changed

+73
-66
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"karma-jasmine-html-reporter": "~2.1.0",
4545
"karma-mocha-reporter": "^2.2.5",
4646
"ng-packagr": "^20.0.1",
47-
"prettier": "3.6.2",
47+
"prettier": "3.6.2",
4848
"ts-mocks": "^3.0.1",
4949
"typescript": "~5.8.2",
5050
"typescript-eslint": "^8.18.1"

‎projects/ngx-translate/src/lib/translate.directive.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import {
22
AfterViewChecked,
33
ChangeDetectorRef,
44
Directive,
5-
ElementRef, inject,
5+
ElementRef,
6+
inject,
67
Input,
78
OnDestroy,
89
} from "@angular/core";
@@ -32,10 +33,9 @@ interface ExtendedNode extends Text {
3233
standalone: true,
3334
})
3435
export class TranslateDirective implements AfterViewChecked, OnDestroy {
35-
3636
private translateService: TranslateService = inject(TranslateService);
3737
private element: ElementRef = inject(ElementRef);
38-
private _ref:ChangeDetectorRef = inject(ChangeDetectorRef);
38+
private _ref: ChangeDetectorRef = inject(ChangeDetectorRef);
3939

4040
private key!: string;
4141
private lastParams?: InterpolationParameters;
@@ -58,7 +58,6 @@ export class TranslateDirective implements AfterViewChecked, OnDestroy {
5858
}
5959
}
6060

61-
6261
constructor() {
6362
// subscribe to onTranslationChange event, in case the translations of the current lang change
6463
if (!this.onTranslationChangeSub) {

‎projects/ngx-translate/src/lib/translate.pipe.ts‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
import { ChangeDetectorRef, inject, Injectable, OnDestroy, Pipe, PipeTransform } from "@angular/core";
1+
import {
2+
ChangeDetectorRef,
3+
inject,
4+
Injectable,
5+
OnDestroy,
6+
Pipe,
7+
PipeTransform,
8+
} from "@angular/core";
29
import { isObservable, Subscription } from "rxjs";
310
import {
411
InterpolatableTranslationObject,
@@ -17,7 +24,6 @@ import { equals, isDefinedAndNotNull, isDict, isString } from "./util";
1724
pure: false, // required to update the value when the promise is resolved
1825
})
1926
export class TranslatePipe implements PipeTransform, OnDestroy {
20-
2127
private translate: TranslateService = inject(TranslateService);
2228
private _ref: ChangeDetectorRef = inject(ChangeDetectorRef);
2329

@@ -28,7 +34,6 @@ export class TranslatePipe implements PipeTransform, OnDestroy {
2834
onLangChange: Subscription | undefined;
2935
onDefaultLangChange: Subscription | undefined;
3036

31-
3237
updateValue(
3338
key: string,
3439
interpolateParams?: InterpolationParameters,

‎projects/ngx-translate/src/lib/translate.service.ts‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import { TranslateStore } from "./translate.store";
99
import { insertValue, isArray, isDefinedAndNotNull, isDict, isString } from "./util";
1010

1111
export const TRANSLATE_CONFIG = new InjectionToken<{
12-
defaultLanguage?: Language;
13-
extend: boolean;
14-
isolate: boolean;
15-
useDefaultLang: boolean;
12+
defaultLanguage?: Language;
13+
extend: boolean;
14+
isolate: boolean;
15+
useDefaultLang: boolean;
1616
}>("TRANSLATE_CONFIG");
1717

1818
export type InterpolationParameters = Record<string, unknown>;
@@ -134,17 +134,17 @@ export class TranslateService {
134134
public currentLoader: TranslateLoader = inject(TranslateLoader);
135135
public compiler: TranslateCompiler = inject(TranslateCompiler);
136136
private parser: TranslateParser = inject(TranslateParser);
137-
private missingTranslationHandler: MissingTranslationHandler = inject(MissingTranslationHandler);
138-
139-
private config = inject(TRANSLATE_CONFIG, {optional: true}) ?? {
140-
defaultLanguage: undefined,
141-
extend: false,
142-
isolate: false,
143-
useDefaultLang: true,
144-
}
137+
private missingTranslationHandler: MissingTranslationHandler =
138+
inject(MissingTranslationHandler);
139+
140+
private config = inject(TRANSLATE_CONFIG, { optional: true }) ?? {
141+
defaultLanguage: undefined,
142+
extend: false,
143+
isolate: false,
144+
useDefaultLang: true,
145+
};
145146

146-
constructor(
147-
) {
147+
constructor() {
148148
if (this.config.isolate) {
149149
this.store = new TranslateStore();
150150
}
@@ -278,7 +278,11 @@ export class TranslateService {
278278
): void {
279279
const interpolatableTranslations: InterpolatableTranslationObject =
280280
this.compiler.compileTranslations(translations, lang);
281-
this.store.setTranslations(lang, interpolatableTranslations, shouldMerge || this.config.extend);
281+
this.store.setTranslations(
282+
lang,
283+
interpolatableTranslations,
284+
shouldMerge || this.config.extend,
285+
);
282286
}
283287

284288
public getLangs(): readonly Language[] {

‎projects/ngx-translate/src/public-api.ts‎

Lines changed: 29 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11
import {
2-
EnvironmentProviders,
3-
makeEnvironmentProviders,
4-
ModuleWithProviders,
5-
NgModule,
6-
Provider,
7-
Type,
2+
EnvironmentProviders,
3+
makeEnvironmentProviders,
4+
ModuleWithProviders,
5+
NgModule,
6+
Provider,
7+
Type,
88
} from "@angular/core";
99
import {
10-
FakeMissingTranslationHandler,
11-
MissingTranslationHandler,
10+
FakeMissingTranslationHandler,
11+
MissingTranslationHandler,
1212
} from "./lib/missing-translation-handler";
1313
import { TranslateCompiler, TranslateFakeCompiler } from "./lib/translate.compiler";
1414
import { TranslateDirective } from "./lib/translate.directive";
1515
import { TranslateFakeLoader, TranslateLoader } from "./lib/translate.loader";
1616
import { TranslateDefaultParser, TranslateParser } from "./lib/translate.parser";
1717
import { TranslatePipe } from "./lib/translate.pipe";
18-
import {
19-
TRANSLATE_CONFIG,
20-
TranslateService,
21-
} from "./lib/translate.service";
18+
import { TRANSLATE_CONFIG, TranslateService } from "./lib/translate.service";
2219
import { TranslateStore } from "./lib/translate.store";
2320

2421
export * from "./lib/extraction-marker";
@@ -32,8 +29,7 @@ export * from "./lib/translate.service";
3229
export * from "./lib/translate.store";
3330
export * from "./lib/util";
3431

35-
export interface TranslateModuleConfig
36-
{
32+
export interface TranslateModuleConfig {
3733
loader?: Provider;
3834
compiler?: Provider;
3935
parser?: Provider;
@@ -44,54 +40,50 @@ export interface TranslateModuleConfig
4440
extend?: boolean;
4541
useDefaultLang?: boolean;
4642
defaultLanguage?: string;
47-
};
43+
}
4844

49-
export function provideTranslateLoader(loader: Type<TranslateLoader>): Provider
50-
{
45+
export function provideTranslateLoader(loader: Type<TranslateLoader>): Provider {
5146
return { provide: TranslateLoader, useClass: loader };
5247
}
5348

54-
export function provideTranslateCompiler(compiler: Type<TranslateCompiler>): Provider
55-
{
49+
export function provideTranslateCompiler(compiler: Type<TranslateCompiler>): Provider {
5650
return { provide: TranslateCompiler, useClass: compiler };
5751
}
5852

59-
export function provideTranslateParser(parser: Type<TranslateParser>): Provider
60-
{
53+
export function provideTranslateParser(parser: Type<TranslateParser>): Provider {
6154
return { provide: TranslateParser, useClass: parser };
6255
}
6356

6457
export function provideTranslateMissingTranslationHandler(
6558
handler: Type<MissingTranslationHandler>,
66-
): Provider
67-
{
59+
): Provider {
6860
return { provide: MissingTranslationHandler, useClass: handler };
6961
}
7062

71-
export function provideTranslateService(config: TranslateModuleConfig = {}): EnvironmentProviders
72-
{
63+
export function provideTranslateService(config: TranslateModuleConfig = {}): EnvironmentProviders {
7364
return makeEnvironmentProviders(providers(config));
7465
}
7566

76-
77-
function providers(config: TranslateModuleConfig = {}, includeStore = true): Provider[]
78-
{
67+
function providers(config: TranslateModuleConfig = {}, includeStore = true): Provider[] {
7968
const providers: Provider[] = [
8069
config.loader || provideTranslateLoader(TranslateFakeLoader),
8170
config.compiler || provideTranslateCompiler(TranslateFakeCompiler),
8271
config.parser || provideTranslateParser(TranslateDefaultParser),
83-
config.missingTranslationHandler || provideTranslateMissingTranslationHandler(FakeMissingTranslationHandler),
84-
{ provide: TRANSLATE_CONFIG, useValue: {
85-
defaultLanguage: config.defaultLanguage,
86-
extend: config.extend ?? false,
87-
isolate: config.isolate ?? false,
88-
useDefaultLang: config.useDefaultLang ?? true,
89-
} },
72+
config.missingTranslationHandler ||
73+
provideTranslateMissingTranslationHandler(FakeMissingTranslationHandler),
74+
{
75+
provide: TRANSLATE_CONFIG,
76+
useValue: {
77+
defaultLanguage: config.defaultLanguage,
78+
extend: config.extend ?? false,
79+
isolate: config.isolate ?? false,
80+
useDefaultLang: config.useDefaultLang ?? true,
81+
},
82+
},
9083
TranslateService,
9184
];
9285

93-
if(includeStore)
94-
{
86+
if (includeStore) {
9587
providers.push(TranslateStore);
9688
}
9789

‎projects/ngx-translate/src/tests/translate.directive-module.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
Component,
44
ElementRef,
55
Injectable,
6-
ViewChild
6+
ViewChild,
77
} from "@angular/core";
88
import { ComponentFixture, TestBed } from "@angular/core/testing";
99
import { TranslateModule, TranslateService } from "../public-api";

‎projects/ngx-translate/src/tests/translate.pipe.spec.ts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ describe("TranslatePipe (unit)", () => {
1515
let translatePipe: TranslatePipe;
1616

1717
beforeEach(() => {
18-
1918
ref = new Mock<ChangeDetectorRef>({
20-
markForCheck: () => {/*empty*/},
19+
markForCheck: () => {
20+
/*empty*/
21+
},
2122
}).Object;
2223

2324
TestBed.configureTestingModule({
@@ -27,12 +28,12 @@ describe("TranslatePipe (unit)", () => {
2728
}),
2829
{
2930
provide: ChangeDetectorRef,
30-
useValue: ref
31+
useValue: ref,
3132
},
3233
{
3334
provide: TranslatePipe,
3435
useClass: TranslatePipe,
35-
}
36+
},
3637
],
3738
});
3839

‎projects/ngx-translate/src/tests/translate.store.spec.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
import { Location } from "@angular/common";
2-
import { Component, inject as coreInject, ModuleWithProviders, NgModule, Type } from "@angular/core";
2+
import {
3+
Component,
4+
inject as coreInject,
5+
ModuleWithProviders,
6+
NgModule,
7+
Type,
8+
} from "@angular/core";
39
import { ComponentFixture, fakeAsync, TestBed, tick, inject } from "@angular/core/testing";
410
import { provideRouter, Router, RouterModule } from "@angular/router";
511
import { TranslateModule, TranslateService } from "../public-api";

0 commit comments

Comments
 (0)