Skip to content

Commit 936e654

Browse files
magneticflux-magneticflux-
committed
Update tslint.json with import spacing rules and apply new rules
1 parent 6fca419 commit 936e654

39 files changed

+189
-195
lines changed

‎projects/angular2-jsonapi/src/converters/date/date.converter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {parseISO} from 'date-fns';
2-
import {PropertyConverter} from '../../interfaces/property-converter.interface';
1+
import { parseISO } from 'date-fns';
2+
import { PropertyConverter } from '../../interfaces/property-converter.interface';
33

44
export class DateConverter implements PropertyConverter {
55
mask(value: any) {

‎projects/angular2-jsonapi/src/converters/json-model/json-model.converter.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {JsonModelConverter} from './json-model.converter';
2-
import {School} from '../../../test/models/school.model';
1+
import { JsonModelConverter } from './json-model.converter';
2+
import { School } from '../../../test/models/school.model';
33

44
describe('JsonModel converter', () => {
55
let converter: JsonModelConverter<any>;

‎projects/angular2-jsonapi/src/converters/json-model/json-model.converter.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {JsonModelConverterConfig} from '../../interfaces/json-model-converter-config.interface';
2-
import {PropertyConverter} from '../../interfaces/property-converter.interface';
3-
import {JsonApiNestedModel} from '../../models/json-nested.model';
1+
import { JsonModelConverterConfig } from '../../interfaces/json-model-converter-config.interface';
2+
import { PropertyConverter } from '../../interfaces/property-converter.interface';
3+
import { JsonApiNestedModel } from '../../models/json-nested.model';
44

55
export const DEFAULT_OPTIONS: JsonModelConverterConfig = {
66
nullValue: false,
@@ -13,7 +13,7 @@ export class JsonModelConverter<T> implements PropertyConverter {
1313

1414
constructor(model: T, options: JsonModelConverterConfig = {}) {
1515
this.modelType = model; // <ModelType<T>>model
16-
this.options = { ...DEFAULT_OPTIONS, ...options };
16+
this.options = {...DEFAULT_OPTIONS, ...options};
1717
}
1818

1919
mask(value: any): T | Array<T> {

‎projects/angular2-jsonapi/src/decorators/attribute.decorator.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {AttributeMetadata} from '../constants/symbols';
2-
import {AttributeDecoratorOptions} from '../interfaces/attribute-decorator-options.interface';
3-
import {DateConverter} from '../converters/date/date.converter';
1+
import { AttributeMetadata } from '../constants/symbols';
2+
import { AttributeDecoratorOptions } from '../interfaces/attribute-decorator-options.interface';
3+
import { DateConverter } from '../converters/date/date.converter';
44
import * as _ from 'lodash';
55

66
export function Attribute(options: AttributeDecoratorOptions = {}): PropertyDecorator {

‎projects/angular2-jsonapi/src/decorators/json-api-model-config.decorator.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {JsonApiMetaModel} from '../models/json-api-meta.model';
2-
import {ModelConfig} from '../interfaces/model-config.interface';
1+
import { JsonApiMetaModel } from '../models/json-api-meta.model';
2+
import { ModelConfig } from '../interfaces/model-config.interface';
33

44
export function JsonApiModelConfig(config: ModelConfig) {
55
return (target: any) => {

‎projects/angular2-jsonapi/src/decorators/json-attribute.decorator.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {AttributeDecoratorOptions} from '../interfaces/attribute-decorator-options.interface';
2-
import {DateConverter} from '../converters/date/date.converter';
1+
import { AttributeDecoratorOptions } from '../interfaces/attribute-decorator-options.interface';
2+
import { DateConverter } from '../converters/date/date.converter';
33

44
export function JsonAttribute(options: AttributeDecoratorOptions = {}): PropertyDecorator {
55
return (target: any, propertyName: string) => {

‎projects/angular2-jsonapi/src/decorators/nested-attribute.decorator.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {AttributeMetadata} from '../constants/symbols';
2-
import {AttributeDecoratorOptions} from '../interfaces/attribute-decorator-options.interface';
1+
import { AttributeMetadata } from '../constants/symbols';
2+
import { AttributeDecoratorOptions } from '../interfaces/attribute-decorator-options.interface';
33
import * as _ from 'lodash';
44

55
export function NestedAttribute(options: AttributeDecoratorOptions = {}): PropertyDecorator {

‎projects/angular2-jsonapi/src/interfaces/attribute-decorator-options.interface.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {PropertyConverter} from './property-converter.interface';
1+
import { PropertyConverter } from './property-converter.interface';
22

33
export interface AttributeDecoratorOptions {
44
serializedName?: string;

‎projects/angular2-jsonapi/src/interfaces/datastore-config.interface.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Overrides} from './overrides.interface';
1+
import { Overrides } from './overrides.interface';
22

33
export interface DatastoreConfig {
44
apiVersion?: string;

‎projects/angular2-jsonapi/src/interfaces/model-config.interface.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {MetaModelType} from '../models/json-api-meta.model';
1+
import { MetaModelType } from '../models/json-api-meta.model';
22

33
export interface ModelConfig<T = any> {
44
type: string;

‎projects/angular2-jsonapi/src/interfaces/property-converter.interface.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
export interface PropertyConverter {
22
mask(value: any): any;
3+
34
unmask(value: any): any;
45
}

‎projects/angular2-jsonapi/src/models/error-response.model.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
export interface JsonApiError {
22
id?: string;
3-
links ?: Array<any>;
4-
status ?: string;
5-
code ?: string;
6-
title ?: string;
7-
detail ?: string;
8-
source ?: {
9-
pointer ?: string;
10-
parameter ?: string
3+
links?: Array<any>;
4+
status?: string;
5+
code?: string;
6+
title?: string;
7+
detail?: string;
8+
source?: {
9+
pointer?: string;
10+
parameter?: string
1111
};
12-
meta ?: any;
12+
meta?: any;
1313
}
1414

1515
export class ErrorResponse {

‎projects/angular2-jsonapi/src/models/json-api-query-data.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
export class JsonApiQueryData<T> {
2-
constructor(protected jsonApiModels: Array<T>, protected metaData?: any) {}
2+
constructor(protected jsonApiModels: Array<T>, protected metaData?: any) {
3+
}
34

45
public getModels(): T[] {
56
return this.jsonApiModels;

‎projects/angular2-jsonapi/src/models/json-api.model.spec.ts

+9-16
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
1-
import {TestBed} from '@angular/core/testing';
2-
import {parseISO} from 'date-fns';
3-
import {Author} from '../../test/models/author.model';
4-
import {
5-
AUTHOR_ID,
6-
BOOK_PUBLISHED,
7-
BOOK_TITLE,
8-
CHAPTER_TITLE,
9-
getAuthorData,
10-
getIncludedBooks
11-
} from '../../test/fixtures/author.fixture';
12-
import {Book} from '../../test/models/book.model';
13-
import {HttpClientTestingModule} from '@angular/common/http/testing';
14-
import {Datastore} from '../../test/datastore.service';
15-
import {Chapter} from '../../test/models/chapter.model';
1+
import { TestBed } from '@angular/core/testing';
2+
import { parseISO } from 'date-fns';
3+
import { Author } from '../../test/models/author.model';
4+
import { AUTHOR_ID, BOOK_PUBLISHED, BOOK_TITLE, CHAPTER_TITLE, getAuthorData, getIncludedBooks } from '../../test/fixtures/author.fixture';
5+
import { Book } from '../../test/models/book.model';
6+
import { HttpClientTestingModule } from '@angular/common/http/testing';
7+
import { Datastore } from '../../test/datastore.service';
8+
import { Chapter } from '../../test/models/chapter.model';
169

1710
let datastore: Datastore;
1811

@@ -41,7 +34,7 @@ describe('JsonApiModel', () => {
4134
name: 'Daniele',
4235
surname: 'Ghidoli',
4336
date_of_birth: '1987-05-25',
44-
school: { name: 'Massachusetts Institute of Technology', students: 11319, foundation: '1861-10-04' }
37+
school: {name: 'Massachusetts Institute of Technology', students: 11319, foundation: '1861-10-04'}
4538
}
4639
};
4740
const author: Author = new Author(datastore, DATA);

‎projects/angular2-jsonapi/src/models/json-api.model.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import find from 'lodash-es/find';
22
import includes from 'lodash-es/includes';
3-
import {Observable} from 'rxjs';
4-
import {JsonApiDatastore, ModelType} from '../services/json-api-datastore.service';
5-
import {ModelConfig} from '../interfaces/model-config.interface';
3+
import { Observable } from 'rxjs';
4+
import { JsonApiDatastore, ModelType } from '../services/json-api-datastore.service';
5+
import { ModelConfig } from '../interfaces/model-config.interface';
66
import * as _ from 'lodash';
7-
import {AttributeMetadata} from '../constants/symbols';
8-
import {HttpHeaders} from '@angular/common/http';
7+
import { AttributeMetadata } from '../constants/symbols';
8+
import { HttpHeaders } from '@angular/common/http';
99

1010
/**
1111
* HACK/FIXME:
@@ -145,7 +145,7 @@ export class JsonApiModel {
145145
allModels = allModels.concat(relationshipModels);
146146
}
147147
} else {
148-
throw { message: `parseHasMany - Model type for relationship ${typeName} not found.` };
148+
throw {message: `parseHasMany - Model type for relationship ${typeName} not found.`};
149149
}
150150
}
151151
}
@@ -182,7 +182,7 @@ export class JsonApiModel {
182182
this[metadata.propertyName] = relationshipModel;
183183
}
184184
} else {
185-
throw { message: `parseBelongsTo - Model type for relationship ${typeName} not found.` };
185+
throw {message: `parseBelongsTo - Model type for relationship ${typeName} not found.`};
186186
}
187187
}
188188
}
@@ -200,7 +200,7 @@ export class JsonApiModel {
200200
const relationshipList: Array<T> = [];
201201

202202
data.forEach((item: any) => {
203-
const relationshipData: any = find(included, { id: item.id, type: typeName } as any);
203+
const relationshipData: any = find(included, {id: item.id, type: typeName} as any);
204204

205205
if (relationshipData) {
206206
const newObject: T = this.createOrPeek(modelType, relationshipData);
@@ -229,7 +229,7 @@ export class JsonApiModel {
229229
): T | null {
230230
const id: string = data.id;
231231

232-
const relationshipData: any = find(included, { id, type: typeName } as any);
232+
const relationshipData: any = find(included, {id, type: typeName} as any);
233233

234234
if (relationshipData) {
235235
const newObject: T = this.createOrPeek(modelType, relationshipData);

‎projects/angular2-jsonapi/src/models/json-nested.model.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {ModelConfig} from '../interfaces/model-config.interface';
2-
import {JsonApiModel} from './json-api.model';
1+
import { ModelConfig } from '../interfaces/model-config.interface';
2+
import { JsonApiModel } from './json-api.model';
33

44
export class JsonApiNestedModel {
55
[key: string]: any;

‎projects/angular2-jsonapi/src/module.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {NgModule} from '@angular/core';
2-
import {HttpClientModule} from '@angular/common/http';
3-
import {PROVIDERS} from './providers';
1+
import { NgModule } from '@angular/core';
2+
import { HttpClientModule } from '@angular/common/http';
3+
import { PROVIDERS } from './providers';
44

55
@NgModule({
66
providers: [PROVIDERS],

‎projects/angular2-jsonapi/src/providers.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {JsonApiDatastore} from './services/json-api-datastore.service';
1+
import { JsonApiDatastore } from './services/json-api-datastore.service';
22

33
export * from './services/json-api-datastore.service';
44

‎projects/angular2-jsonapi/src/services/json-api-datastore.service.spec.ts

+18-22
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,21 @@
1-
import {TestBed} from '@angular/core/testing';
2-
import {parseISO} from 'date-fns';
3-
import {Author} from '../../test/models/author.model';
4-
import {Chapter} from '../../test/models/chapter.model';
5-
import {AUTHOR_API_VERSION, AUTHOR_MODEL_ENDPOINT_URL, CustomAuthor} from '../../test/models/custom-author.model';
6-
import {AUTHOR_BIRTH, AUTHOR_ID, AUTHOR_NAME, BOOK_TITLE, getAuthorData} from '../../test/fixtures/author.fixture';
7-
import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing';
8-
import {API_VERSION, BASE_URL, Datastore} from '../../test/datastore.service';
9-
import {ErrorResponse} from '../models/error-response.model';
10-
import {getSampleBook} from '../../test/fixtures/book.fixture';
11-
import {Book} from '../../test/models/book.model';
12-
import {CrimeBook} from '../../test/models/crime-book.model';
13-
import {
14-
API_VERSION_FROM_CONFIG,
15-
BASE_URL_FROM_CONFIG,
16-
DatastoreWithConfig
17-
} from '../../test/datastore-with-config.service';
18-
import {HttpHeaders} from '@angular/common/http';
19-
import {Thing} from '../../test/models/thing';
20-
import {getSampleThing} from '../../test/fixtures/thing.fixture';
21-
import {ModelConfig} from '../interfaces/model-config.interface';
22-
import {JsonApiQueryData} from '../models/json-api-query-data';
1+
import { TestBed } from '@angular/core/testing';
2+
import { parseISO } from 'date-fns';
3+
import { Author } from '../../test/models/author.model';
4+
import { Chapter } from '../../test/models/chapter.model';
5+
import { AUTHOR_API_VERSION, AUTHOR_MODEL_ENDPOINT_URL, CustomAuthor } from '../../test/models/custom-author.model';
6+
import { AUTHOR_BIRTH, AUTHOR_ID, AUTHOR_NAME, BOOK_TITLE, getAuthorData } from '../../test/fixtures/author.fixture';
7+
import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
8+
import { API_VERSION, BASE_URL, Datastore } from '../../test/datastore.service';
9+
import { ErrorResponse } from '../models/error-response.model';
10+
import { getSampleBook } from '../../test/fixtures/book.fixture';
11+
import { Book } from '../../test/models/book.model';
12+
import { CrimeBook } from '../../test/models/crime-book.model';
13+
import { API_VERSION_FROM_CONFIG, BASE_URL_FROM_CONFIG, DatastoreWithConfig } from '../../test/datastore-with-config.service';
14+
import { HttpHeaders } from '@angular/common/http';
15+
import { Thing } from '../../test/models/thing';
16+
import { getSampleThing } from '../../test/fixtures/thing.fixture';
17+
import { ModelConfig } from '../interfaces/model-config.interface';
18+
import { JsonApiQueryData } from '../models/json-api-query-data';
2319

2420
let datastore: Datastore;
2521
let datastoreWithConfig: DatastoreWithConfig;

‎projects/angular2-jsonapi/src/services/json-api-datastore.service.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import {Injectable} from '@angular/core';
2-
import {HttpClient, HttpErrorResponse, HttpHeaders, HttpResponse} from '@angular/common/http';
1+
import { Injectable } from '@angular/core';
2+
import { HttpClient, HttpErrorResponse, HttpHeaders, HttpResponse } from '@angular/common/http';
33
import find from 'lodash-es/find';
4-
import {catchError, map} from 'rxjs/operators';
5-
import {Observable, of, throwError} from 'rxjs';
6-
import {JsonApiModel} from '../models/json-api.model';
7-
import {ErrorResponse} from '../models/error-response.model';
8-
import {JsonApiQueryData} from '../models/json-api-query-data';
4+
import { catchError, map } from 'rxjs/operators';
5+
import { Observable, of, throwError } from 'rxjs';
6+
import { JsonApiModel } from '../models/json-api.model';
7+
import { ErrorResponse } from '../models/error-response.model';
8+
import { JsonApiQueryData } from '../models/json-api-query-data';
99
import * as qs from 'qs';
10-
import {DatastoreConfig} from '../interfaces/datastore-config.interface';
11-
import {ModelConfig} from '../interfaces/model-config.interface';
12-
import {AttributeMetadata} from '../constants/symbols';
10+
import { DatastoreConfig } from '../interfaces/datastore-config.interface';
11+
import { ModelConfig } from '../interfaces/model-config.interface';
12+
import { AttributeMetadata } from '../constants/symbols';
1313
import 'reflect-metadata';
1414

1515
export type ModelType<T extends JsonApiModel> = new(datastore: JsonApiDatastore, data: any) => T;

‎projects/angular2-jsonapi/src/test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import 'zone.js/dist/zone';
44
import 'zone.js/dist/zone-testing';
5-
import {getTestBed} from '@angular/core/testing';
6-
import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing';
5+
import { getTestBed } from '@angular/core/testing';
6+
import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
77

88
declare const require: any;
99

‎projects/angular2-jsonapi/test/datastore-with-config.service.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import {HttpClient} from '@angular/common/http';
2-
import {Author} from './models/author.model';
3-
import {Book} from './models/book.model';
4-
import {Chapter} from './models/chapter.model';
5-
import {Section} from './models/section.model';
6-
import {Paragraph} from './models/paragraph.model';
7-
import {Sentence} from './models/sentence.model';
8-
import {JsonApiDatastoreConfig} from '../src/decorators/json-api-datastore-config.decorator';
9-
import {JsonApiDatastore} from '../src/services/json-api-datastore.service';
10-
import {DatastoreConfig} from '../src/interfaces/datastore-config.interface';
1+
import { HttpClient } from '@angular/common/http';
2+
import { Author } from './models/author.model';
3+
import { Book } from './models/book.model';
4+
import { Chapter } from './models/chapter.model';
5+
import { Section } from './models/section.model';
6+
import { Paragraph } from './models/paragraph.model';
7+
import { Sentence } from './models/sentence.model';
8+
import { JsonApiDatastoreConfig } from '../src/decorators/json-api-datastore-config.decorator';
9+
import { JsonApiDatastore } from '../src/services/json-api-datastore.service';
10+
import { DatastoreConfig } from '../src/interfaces/datastore-config.interface';
1111

1212
const BASE_URL = 'http://localhost:8080';
1313
const API_VERSION = 'v1';

‎projects/angular2-jsonapi/test/datastore.service.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import {HttpClient} from '@angular/common/http';
2-
import {Author} from './models/author.model';
3-
import {Book} from './models/book.model';
4-
import {Chapter} from './models/chapter.model';
5-
import {Section} from './models/section.model';
6-
import {Paragraph} from './models/paragraph.model';
7-
import {Sentence} from './models/sentence.model';
8-
import {Category} from './models/category.model';
9-
import {Thing} from './models/thing';
10-
import {ThingCategory} from './models/thingCategory';
11-
import {JsonApiDatastoreConfig} from '../src/decorators/json-api-datastore-config.decorator';
12-
import {JsonApiDatastore} from '../src/services/json-api-datastore.service';
1+
import { HttpClient } from '@angular/common/http';
2+
import { Author } from './models/author.model';
3+
import { Book } from './models/book.model';
4+
import { Chapter } from './models/chapter.model';
5+
import { Section } from './models/section.model';
6+
import { Paragraph } from './models/paragraph.model';
7+
import { Sentence } from './models/sentence.model';
8+
import { Category } from './models/category.model';
9+
import { Thing } from './models/thing';
10+
import { ThingCategory } from './models/thingCategory';
11+
import { JsonApiDatastoreConfig } from '../src/decorators/json-api-datastore-config.decorator';
12+
import { JsonApiDatastore } from '../src/services/json-api-datastore.service';
1313

1414
export const BASE_URL = 'http://localhost:8080';
1515
export const API_VERSION = 'v1';

‎projects/angular2-jsonapi/test/fixtures/author.fixture.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import {getSampleBook} from './book.fixture';
2-
import {getSampleChapter} from './chapter.fixture';
3-
import {getSampleSection} from './section.fixture';
4-
import {getSampleParagraph} from './paragraph.fixture';
5-
import {getSampleSentence} from './sentence.fixture';
6-
import {getSampleCategory} from './category.fixture';
1+
import { getSampleBook } from './book.fixture';
2+
import { getSampleChapter } from './chapter.fixture';
3+
import { getSampleSection } from './section.fixture';
4+
import { getSampleParagraph } from './paragraph.fixture';
5+
import { getSampleSentence } from './sentence.fixture';
6+
import { getSampleCategory } from './category.fixture';
77

88
export const AUTHOR_ID = '1';
99
export const AUTHOR_NAME = 'J. R. R. Tolkien';
@@ -87,7 +87,7 @@ export function getIncludedBooks(totalBooks: number, relationship?: string, tota
8787

8888
if (!categoryInclude) {
8989
categoryInclude = getSampleCategory(CATEGORY_ID);
90-
categoryInclude.relationships.books = { data: [] };
90+
categoryInclude.relationships.books = {data: []};
9191
responseArray.push(categoryInclude);
9292
}
9393

0 commit comments

Comments
 (0)