Skip to content

Commit

Permalink
refactor: migrate platform-* to prettier formatting (#55423)
Browse files Browse the repository at this point in the history
Migrate formatting to prettier for platform-* from clang-format

PR Close #55423
  • Loading branch information
josephperrott authored and alxhub committed Apr 19, 2024
1 parent 488c711 commit b1dffa4
Show file tree
Hide file tree
Showing 66 changed files with 6,732 additions and 5,883 deletions.
6 changes: 6 additions & 0 deletions .ng-dev/format.mts
Expand Up @@ -25,6 +25,9 @@ export const format: FormatConfig = {
'packages/forms/**/*.{js,ts}',
'packages/language-service/**/*.{js,ts}',
'packages/localize/**/*.{js,ts}',
'packages/platform-browser/**/*.{js,ts}',
'packages/platform-browser-dynamic/**/*.{js,ts}',
'packages/platform-server/**/*.{js,ts}',
'packages/misc/**/*.{js,ts}',
'packages/private/**/*.{js,ts}',
'packages/router/**/*.{js,ts}',
Expand Down Expand Up @@ -81,6 +84,9 @@ export const format: FormatConfig = {
'!packages/forms/**/*.{js,ts}',
'!packages/language-service/**/*.{js,ts}',
'!packages/localize/**/*.{js,ts}',
'!packages/platform-browser/**/*.{js,ts}',
'!packages/platform-browser-dynamic/**/*.{js,ts}',
'!packages/platform-server/**/*.{js,ts}',
'!packages/misc/**/*.{js,ts}',
'!packages/private/**/*.{js,ts}',
'!packages/router/**/*.{js,ts}',
Expand Down
31 changes: 20 additions & 11 deletions packages/platform-browser-dynamic/src/compiler_factory.ts
Expand Up @@ -7,10 +7,18 @@
*/

import {CompilerConfig} from '@angular/compiler';
import {Compiler, CompilerFactory, CompilerOptions, Injector, StaticProvider, ViewEncapsulation} from '@angular/core';
import {
Compiler,
CompilerFactory,
CompilerOptions,
Injector,
StaticProvider,
ViewEncapsulation,
} from '@angular/core';

export const COMPILER_PROVIDERS =
<StaticProvider[]>[{provide: Compiler, useFactory: () => new Compiler()}];
export const COMPILER_PROVIDERS = <StaticProvider[]>[
{provide: Compiler, useFactory: () => new Compiler()},
];
/**
* @publicApi
*
Expand All @@ -33,32 +41,33 @@ export class JitCompilerFactory implements CompilerFactory {
const opts = _mergeOptions(this._defaultOptions.concat(options));
const injector = Injector.create({
providers: [
COMPILER_PROVIDERS, {
COMPILER_PROVIDERS,
{
provide: CompilerConfig,
useFactory: () => {
return new CompilerConfig({
defaultEncapsulation: opts.defaultEncapsulation,
preserveWhitespaces: opts.preserveWhitespaces,
});
},
deps: []
deps: [],
},
opts.providers!
]
opts.providers!,
],
});
return injector.get(Compiler);
}
}

function _mergeOptions(optionsArr: CompilerOptions[]): CompilerOptions {
return {
defaultEncapsulation: _lastDefined(optionsArr.map(options => options.defaultEncapsulation)),
providers: _mergeArrays(optionsArr.map(options => options.providers!)),
preserveWhitespaces: _lastDefined(optionsArr.map(options => options.preserveWhitespaces)),
defaultEncapsulation: _lastDefined(optionsArr.map((options) => options.defaultEncapsulation)),
providers: _mergeArrays(optionsArr.map((options) => options.providers!)),
preserveWhitespaces: _lastDefined(optionsArr.map((options) => options.preserveWhitespaces)),
};
}

function _lastDefined<T>(args: T[]): T|undefined {
function _lastDefined<T>(args: T[]): T | undefined {
for (let i = args.length - 1; i >= 0; i--) {
if (args[i] !== undefined) {
return args[i];
Expand Down
Expand Up @@ -19,4 +19,7 @@ export {JitCompilerFactory} from './compiler_factory';
* @publicApi
*/
export const platformBrowserDynamic = createPlatformFactory(
platformCoreDynamic, 'browserDynamic', INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS);
platformCoreDynamic,
'browserDynamic',
INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
);
Expand Up @@ -6,7 +6,12 @@
* found in the LICENSE file at https://angular.io/license
*/

import {COMPILER_OPTIONS, CompilerFactory, createPlatformFactory, platformCore} from '@angular/core';
import {
COMPILER_OPTIONS,
CompilerFactory,
createPlatformFactory,
platformCore,
} from '@angular/core';

import {JitCompilerFactory} from './compiler_factory';

Expand Down
3 changes: 1 addition & 2 deletions packages/platform-browser-dynamic/src/platform_providers.ts
Expand Up @@ -9,7 +9,6 @@
import {ɵPLATFORM_BROWSER_ID as PLATFORM_BROWSER_ID} from '@angular/common';
import {ResourceLoader} from '@angular/compiler';
import {COMPILER_OPTIONS, PLATFORM_ID, StaticProvider} from '@angular/core';

import {ɵINTERNAL_BROWSER_PLATFORM_PROVIDERS as INTERNAL_BROWSER_PLATFORM_PROVIDERS} from '@angular/platform-browser';

import {ResourceLoaderImpl} from './resource_loader/resource_loader_impl';
Expand All @@ -22,7 +21,7 @@ export const INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS: StaticProvider[] = [
{
provide: COMPILER_OPTIONS,
useValue: {providers: [{provide: ResourceLoader, useClass: ResourceLoaderImpl, deps: []}]},
multi: true
multi: true,
},
{provide: PLATFORM_ID, useValue: PLATFORM_BROWSER_ID},
];
Expand Up @@ -8,7 +8,6 @@
import {ResourceLoader} from '@angular/compiler';
import {Injectable} from '@angular/core';


@Injectable()
export class ResourceLoaderImpl extends ResourceLoader {
override get(url: string): Promise<string> {
Expand All @@ -22,7 +21,7 @@ export class ResourceLoaderImpl extends ResourceLoader {
xhr.open('GET', url, true);
xhr.responseType = 'text';

xhr.onload = function() {
xhr.onload = function () {
const response = xhr.response;

let status = xhr.status;
Expand All @@ -41,7 +40,7 @@ export class ResourceLoaderImpl extends ResourceLoader {
}
};

xhr.onerror = function() {
xhr.onerror = function () {
reject(`Failed to load ${url}`);
};

Expand Down
118 changes: 72 additions & 46 deletions packages/platform-browser-dynamic/test/metadata_overrider_spec.ts
Expand Up @@ -29,7 +29,7 @@ class SomeMetadata implements SomeMetadataType {
this._getterProp = options.getterProp!;
this.arrayProp = options.arrayProp!;
Object.defineProperty(this, 'getterProp', {
enumerable: true, // getters are non-enumerable by default in es2015
enumerable: true, // getters are non-enumerable by default in es2015
get: () => this._getterProp,
});
}
Expand All @@ -42,7 +42,7 @@ class OtherMetadata extends SomeMetadata implements OtherMetadataType {
super({
plainProp: options.plainProp,
getterProp: options.getterProp,
arrayProp: options.arrayProp
arrayProp: options.arrayProp,
});

this.otherPlainProp = options.otherPlainProp!;
Expand All @@ -65,58 +65,79 @@ describe('metadata overrider', () => {
});

it('should set individual properties and keep others', () => {
const oldInstance =
new SomeMetadata({plainProp: 'somePlainProp', getterProp: 'someGetterProp'});
const newInstance =
overrider.overrideMetadata(SomeMetadata, oldInstance, {set: {plainProp: 'newPlainProp'}});
expect(newInstance)
.toEqual(new SomeMetadata({plainProp: 'newPlainProp', getterProp: 'someGetterProp'}));
const oldInstance = new SomeMetadata({
plainProp: 'somePlainProp',
getterProp: 'someGetterProp',
});
const newInstance = overrider.overrideMetadata(SomeMetadata, oldInstance, {
set: {plainProp: 'newPlainProp'},
});
expect(newInstance).toEqual(
new SomeMetadata({plainProp: 'newPlainProp', getterProp: 'someGetterProp'}),
);
});

describe('add properties', () => {
it('should replace non array values', () => {
const oldInstance =
new SomeMetadata({plainProp: 'somePlainProp', getterProp: 'someGetterProp'});
const newInstance =
overrider.overrideMetadata(SomeMetadata, oldInstance, {add: {plainProp: 'newPlainProp'}});
expect(newInstance)
.toEqual(new SomeMetadata({plainProp: 'newPlainProp', getterProp: 'someGetterProp'}));
const oldInstance = new SomeMetadata({
plainProp: 'somePlainProp',
getterProp: 'someGetterProp',
});
const newInstance = overrider.overrideMetadata(SomeMetadata, oldInstance, {
add: {plainProp: 'newPlainProp'},
});
expect(newInstance).toEqual(
new SomeMetadata({plainProp: 'newPlainProp', getterProp: 'someGetterProp'}),
);
});

it('should add to array values', () => {
const oldInstance = new SomeMetadata({arrayProp: ['a']});
const newInstance =
overrider.overrideMetadata(SomeMetadata, oldInstance, {add: {arrayProp: ['b']}});
const newInstance = overrider.overrideMetadata(SomeMetadata, oldInstance, {
add: {arrayProp: ['b']},
});
expect(newInstance).toEqual(new SomeMetadata({arrayProp: ['a', 'b']}));
});
});

describe('remove', () => {
it('should set values to undefined if their value matches', () => {
const oldInstance =
new SomeMetadata({plainProp: 'somePlainProp', getterProp: 'someGetterProp'});
const newInstance = overrider.overrideMetadata(
SomeMetadata, oldInstance, {remove: {plainProp: 'somePlainProp'}});
expect(newInstance)
.toEqual(new SomeMetadata({plainProp: undefined, getterProp: 'someGetterProp'}));
const oldInstance = new SomeMetadata({
plainProp: 'somePlainProp',
getterProp: 'someGetterProp',
});
const newInstance = overrider.overrideMetadata(SomeMetadata, oldInstance, {
remove: {plainProp: 'somePlainProp'},
});
expect(newInstance).toEqual(
new SomeMetadata({plainProp: undefined, getterProp: 'someGetterProp'}),
);
});

it('should leave values if their value does not match', () => {
const oldInstance =
new SomeMetadata({plainProp: 'somePlainProp', getterProp: 'someGetterProp'});
const newInstance = overrider.overrideMetadata(
SomeMetadata, oldInstance, {remove: {plainProp: 'newPlainProp'}});
expect(newInstance)
.toEqual(new SomeMetadata({plainProp: 'somePlainProp', getterProp: 'someGetterProp'}));
const oldInstance = new SomeMetadata({
plainProp: 'somePlainProp',
getterProp: 'someGetterProp',
});
const newInstance = overrider.overrideMetadata(SomeMetadata, oldInstance, {
remove: {plainProp: 'newPlainProp'},
});
expect(newInstance).toEqual(
new SomeMetadata({plainProp: 'somePlainProp', getterProp: 'someGetterProp'}),
);
});

it('should remove a value from an array', () => {
const oldInstance =
new SomeMetadata({arrayProp: ['a', 'b', 'c'], getterProp: 'someGetterProp'});
const newInstance =
overrider.overrideMetadata(SomeMetadata, oldInstance, {remove: {arrayProp: ['a', 'c']}});
expect(newInstance)
.toEqual(new SomeMetadata({arrayProp: ['b'], getterProp: 'someGetterProp'}));
const oldInstance = new SomeMetadata({
arrayProp: ['a', 'b', 'c'],
getterProp: 'someGetterProp',
});
const newInstance = overrider.overrideMetadata(SomeMetadata, oldInstance, {
remove: {arrayProp: ['a', 'c']},
});
expect(newInstance).toEqual(
new SomeMetadata({arrayProp: ['b'], getterProp: 'someGetterProp'}),
);
});

it('should support types as values', () => {
Expand All @@ -125,11 +146,13 @@ describe('metadata overrider', () => {
class Class3 {}

const instance1 = new SomeMetadata({arrayProp: [Class1, Class2, Class3]});
const instance2 =
overrider.overrideMetadata(SomeMetadata, instance1, {remove: {arrayProp: [Class1]}});
const instance2 = overrider.overrideMetadata(SomeMetadata, instance1, {
remove: {arrayProp: [Class1]},
});
expect(instance2).toEqual(new SomeMetadata({arrayProp: [Class2, Class3]}));
const instance3 =
overrider.overrideMetadata(SomeMetadata, instance2, {remove: {arrayProp: [Class3]}});
const instance3 = overrider.overrideMetadata(SomeMetadata, instance2, {
remove: {arrayProp: [Class3]},
});
expect(instance3).toEqual(new SomeMetadata({arrayProp: [Class2]}));
});
});
Expand All @@ -139,15 +162,18 @@ describe('metadata overrider', () => {
const oldInstance = new OtherMetadata({
plainProp: 'somePlainProp',
getterProp: 'someGetterProp',
otherPlainProp: 'newOtherProp'
otherPlainProp: 'newOtherProp',
});
const newInstance = overrider.overrideMetadata(
OtherMetadata, oldInstance, {set: {plainProp: 'newPlainProp'}});
expect(newInstance).toEqual(new OtherMetadata({
plainProp: 'newPlainProp',
getterProp: 'someGetterProp',
otherPlainProp: 'newOtherProp'
}));
const newInstance = overrider.overrideMetadata(OtherMetadata, oldInstance, {
set: {plainProp: 'newPlainProp'},
});
expect(newInstance).toEqual(
new OtherMetadata({
plainProp: 'newPlainProp',
getterProp: 'someGetterProp',
otherPlainProp: 'newOtherProp',
}),
);
});
});
});
Expand Up @@ -19,14 +19,14 @@ if (isBrowser) {
resourceLoader = new ResourceLoaderImpl();
});

it('should resolve the Promise with the file content on success', done => {
it('should resolve the Promise with the file content on success', (done) => {
resourceLoader.get(url200).then((text) => {
expect(text.trim()).toEqual('<p>hey</p>');
done();
});
}, 10000);

it('should reject the Promise on failure', done => {
it('should reject the Promise on failure', (done) => {
resourceLoader.get(url404).catch((e) => {
expect(e).toEqual(`Failed to load ${url404}`);
done();
Expand Down

0 comments on commit b1dffa4

Please sign in to comment.