Skip to content
This repository was archived by the owner on Jun 18, 2020. It is now read-only.

Commit 912e52d

Browse files
splincodesplincode
committed
feat: add prettier
1 parent 98cc12c commit 912e52d

21 files changed

Lines changed: 336 additions & 386 deletions

‎.prettierignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.idea/**
2+
.cache/**
3+
coverage/**
4+
**/node_modules/**
5+
dist/**

‎.prettierrc‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎README.md‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,11 @@ export class AppComponent implements OnInit {
100100
constructor(private readonly logger: LoggerService) {}
101101

102102
public ngOnInit(): void {
103-
this.logger.group(
104-
'Show trace in opened group',
105-
({ trace }: LoggerService): void => {
106-
for (let i: number = 0; i < 20; i++) {
107-
trace(this.traceIsWork, i);
108-
}
103+
this.logger.group('Show trace in opened group', ({ trace }: LoggerService): void => {
104+
for (let i: number = 0; i < 20; i++) {
105+
trace(this.traceIsWork, i);
109106
}
110-
);
107+
});
111108
}
112109
}
113110
```
@@ -137,23 +134,17 @@ export class AppComponent implements OnInit {
137134
this.logger.error(this.errorIsWork, 5, (2.55).toFixed());
138135
});
139136

140-
this.logger.group(
141-
'Show trace in opened group',
142-
({ trace }: LoggerService): void => {
143-
for (let i: number = 0; i < 20; i++) {
144-
trace(this.traceIsWork, i);
145-
}
137+
this.logger.group('Show trace in opened group', ({ trace }: LoggerService): void => {
138+
for (let i: number = 0; i < 20; i++) {
139+
trace(this.traceIsWork, i);
146140
}
147-
);
148-
149-
this.logger.groupCollapsed(
150-
'Show trace in collapsed group',
151-
({ debug }: LoggerService): void => {
152-
for (let i: number = 0; i < 15; i++) {
153-
debug(this.traceIsWork, i);
154-
}
141+
});
142+
143+
this.logger.groupCollapsed('Show trace in collapsed group', ({ debug }: LoggerService): void => {
144+
for (let i: number = 0; i < 15; i++) {
145+
debug(this.traceIsWork, i);
155146
}
156-
);
147+
});
157148
}
158149
}
159150
```

‎angular.json‎

Lines changed: 95 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,118 +1,103 @@
11
{
2-
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3-
"version": 1,
4-
"newProjectRoot": "projects",
5-
"projects": {
6-
"ngx-logger": {
7-
"root": "",
8-
"sourceRoot": "src",
9-
"projectType": "application",
10-
"prefix": "app",
11-
"schematics": {},
12-
"architect": {
13-
"build": {
14-
"builder": "@angular-devkit/build-angular:browser",
15-
"options": {
16-
"outputPath": "dist/ngx-logger",
17-
"index": "src/index.html",
18-
"main": "src/main.ts",
19-
"polyfills": "src/polyfills.ts",
20-
"tsConfig": "src/tsconfig.app.json",
21-
"assets": [
22-
"src/favicon.ico",
23-
"src/assets"
24-
],
25-
"styles": [
26-
"src/styles.css"
27-
],
28-
"scripts": [],
29-
"es5BrowserSupport": true
30-
},
31-
"configurations": {
32-
"production": {
33-
"fileReplacements": [
34-
{
35-
"replace": "src/environments/environment.ts",
36-
"with": "src/environments/environment.prod.ts"
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"ngx-logger": {
7+
"root": "",
8+
"sourceRoot": "src",
9+
"projectType": "application",
10+
"prefix": "app",
11+
"schematics": {},
12+
"architect": {
13+
"build": {
14+
"builder": "@angular-devkit/build-angular:browser",
15+
"options": {
16+
"outputPath": "dist/ngx-logger",
17+
"index": "src/index.html",
18+
"main": "src/main.ts",
19+
"polyfills": "src/polyfills.ts",
20+
"tsConfig": "src/tsconfig.app.json",
21+
"assets": ["src/favicon.ico", "src/assets"],
22+
"styles": ["src/styles.css"],
23+
"scripts": [],
24+
"es5BrowserSupport": true
25+
},
26+
"configurations": {
27+
"production": {
28+
"fileReplacements": [
29+
{
30+
"replace": "src/environments/environment.ts",
31+
"with": "src/environments/environment.prod.ts"
32+
}
33+
],
34+
"optimization": true,
35+
"outputHashing": "all",
36+
"sourceMap": false,
37+
"extractCss": true,
38+
"namedChunks": false,
39+
"aot": true,
40+
"extractLicenses": true,
41+
"vendorChunk": true,
42+
"buildOptimizer": true,
43+
"budgets": [
44+
{
45+
"type": "initial",
46+
"maximumWarning": "2mb",
47+
"maximumError": "5mb"
48+
}
49+
]
50+
}
51+
}
52+
},
53+
"serve": {
54+
"builder": "@angular-devkit/build-angular:dev-server",
55+
"options": {
56+
"browserTarget": "ngx-logger:build"
57+
},
58+
"configurations": {
59+
"production": {
60+
"browserTarget": "ngx-logger:build:production"
61+
}
62+
}
63+
},
64+
"extract-i18n": {
65+
"builder": "@angular-devkit/build-angular:extract-i18n",
66+
"options": {
67+
"browserTarget": "ngx-logger:build"
68+
}
69+
},
70+
"lint": {
71+
"builder": "@angular-devkit/build-angular:tslint",
72+
"options": {
73+
"tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
74+
"exclude": ["**/node_modules/**"]
75+
}
3776
}
38-
],
39-
"optimization": true,
40-
"outputHashing": "all",
41-
"sourceMap": false,
42-
"extractCss": true,
43-
"namedChunks": false,
44-
"aot": true,
45-
"extractLicenses": true,
46-
"vendorChunk": true,
47-
"buildOptimizer": true,
48-
"budgets": [
49-
{
50-
"type": "initial",
51-
"maximumWarning": "2mb",
52-
"maximumError": "5mb"
53-
}
54-
]
5577
}
56-
}
5778
},
58-
"serve": {
59-
"builder": "@angular-devkit/build-angular:dev-server",
60-
"options": {
61-
"browserTarget": "ngx-logger:build"
62-
},
63-
"configurations": {
64-
"production": {
65-
"browserTarget": "ngx-logger:build:production"
79+
"logger": {
80+
"root": "projects/logger",
81+
"sourceRoot": "projects/logger/src",
82+
"projectType": "library",
83+
"prefix": "lib",
84+
"architect": {
85+
"build": {
86+
"builder": "@angular-devkit/build-ng-packagr:build",
87+
"options": {
88+
"tsConfig": "projects/logger/tsconfig.lib.json",
89+
"project": "projects/logger/ng-package.json"
90+
}
91+
},
92+
"lint": {
93+
"builder": "@angular-devkit/build-angular:tslint",
94+
"options": {
95+
"tsConfig": ["projects/logger/tsconfig.lib.json", "projects/logger/tsconfig.spec.json"],
96+
"exclude": ["**/node_modules/**"]
97+
}
98+
}
6699
}
67-
}
68-
},
69-
"extract-i18n": {
70-
"builder": "@angular-devkit/build-angular:extract-i18n",
71-
"options": {
72-
"browserTarget": "ngx-logger:build"
73-
}
74-
},
75-
"lint": {
76-
"builder": "@angular-devkit/build-angular:tslint",
77-
"options": {
78-
"tsConfig": [
79-
"src/tsconfig.app.json",
80-
"src/tsconfig.spec.json"
81-
],
82-
"exclude": [
83-
"**/node_modules/**"
84-
]
85-
}
86100
}
87-
}
88101
},
89-
"logger": {
90-
"root": "projects/logger",
91-
"sourceRoot": "projects/logger/src",
92-
"projectType": "library",
93-
"prefix": "lib",
94-
"architect": {
95-
"build": {
96-
"builder": "@angular-devkit/build-ng-packagr:build",
97-
"options": {
98-
"tsConfig": "projects/logger/tsconfig.lib.json",
99-
"project": "projects/logger/ng-package.json"
100-
}
101-
},
102-
"lint": {
103-
"builder": "@angular-devkit/build-angular:tslint",
104-
"options": {
105-
"tsConfig": [
106-
"projects/logger/tsconfig.lib.json",
107-
"projects/logger/tsconfig.spec.json"
108-
],
109-
"exclude": [
110-
"**/node_modules/**"
111-
]
112-
}
113-
}
114-
}
115-
}
116-
},
117-
"defaultProject": "ngx-logger"
102+
"defaultProject": "ngx-logger"
118103
}

‎package.json‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"build.meta": "echo 'prebuild'",
1212
"test": "jest --config ./jest.app.config.js --coverage",
1313
"lint": "ng lint",
14-
"format": "prettier --write \"*/**/*.ts\"",
14+
"format": "prettier --write \"**/*.{ts,html,css,scss,md,js,json}\"",
1515
"coverage": "jest --config ./jest.app.config.js --coverage && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage"
1616
},
1717
"husky": {
@@ -20,6 +20,7 @@
2020
}
2121
},
2222
"private": true,
23+
"prettier": "@angular-ru/prettier-config",
2324
"dependencies": {
2425
"@angular/animations": "~8.2.14",
2526
"@angular/common": "~8.2.14",
@@ -37,6 +38,7 @@
3738
"zone.js": "~0.10.3"
3839
},
3940
"devDependencies": {
41+
"@angular-ru/prettier-config": "^12.19.1",
4042
"@angular-ru/tsconfig": "^12.19.1",
4143
"@angular-devkit/build-angular": "^0.803.27",
4244
"@angular-devkit/build-ng-packagr": "~0.803.27",

‎projects/logger/ng-package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
3-
"dest": "../../dist/logger",
4-
"lib": {
5-
"entryFile": "src/public-api.ts"
6-
}
7-
}
2+
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
3+
"dest": "../../dist/logger",
4+
"lib": {
5+
"entryFile": "src/public-api.ts"
6+
}
7+
}

‎projects/logger/package.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"name": "@angular-ru/logger",
3-
"version": "1.11.0",
4-
"license": "MIT",
5-
"homepage": "https://github.com/Angular-RU/angular-logger",
6-
"repository": "https://github.com/Angular-RU/angular-logger",
7-
"peerDependencies": {
8-
"@angular/common": ">=7.0.0",
9-
"@angular/core": ">=7.0.0"
10-
}
2+
"name": "@angular-ru/logger",
3+
"version": "1.11.0",
4+
"license": "MIT",
5+
"homepage": "https://github.com/Angular-RU/angular-logger",
6+
"repository": "https://github.com/Angular-RU/angular-logger",
7+
"peerDependencies": {
8+
"@angular/common": ">=7.0.0",
9+
"@angular/core": ">=7.0.0"
10+
}
1111
}

‎projects/logger/src/lib/decorators/groups/group-collapsed.decorator.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Type } from '@angular/core';
22

33
import { groupDecoratorFactory } from './group.common';
4-
import { Any, Callback, DecoratorMethod, Fn } from "../../interfaces/logger.internal";
4+
import { Any, Callback, DecoratorMethod, Fn } from '../../interfaces/logger.internal';
55
import { GroupLevel, LoggerLevel } from '../../interfaces/logger.external';
66

77
export function GroupCollapsed(title: string | Callback<Any>, level: LoggerLevel = LoggerLevel.INFO): DecoratorMethod {

‎projects/logger/src/lib/decorators/groups/group.decorator.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Type } from '@angular/core';
22

33
import { groupDecoratorFactory } from './group.common';
4-
import { Any, Callback, DecoratorMethod, Fn } from "../../interfaces/logger.internal";
4+
import { Any, Callback, DecoratorMethod, Fn } from '../../interfaces/logger.internal';
55
import { GroupLevel, LoggerLevel } from '../../interfaces/logger.external';
66

77
export function Group(title: string | Callback<Any>, level: LoggerLevel = LoggerLevel.INFO): DecoratorMethod {

‎projects/logger/tests/console-group-api.spec.ts‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,9 @@ describe('[TEST]: Check work in groups', () => {
5454
});
5555

5656
it(`Show classic group`, () => {
57-
logger.group(
58-
'group label',
59-
({ trace }: LoggerService): void => {
60-
trace(traceIsWork, 1, { a: 1 });
61-
}
62-
);
57+
logger.group('group label', ({ trace }: LoggerService): void => {
58+
trace(traceIsWork, 1, { a: 1 });
59+
});
6360

6461
expect(fakeConsole.stack()).toEqual(
6562
fakeConsole.createStack(

0 commit comments

Comments
 (0)