Skip to content

Commit c42842a

Browse files
michaelwittwermichaelwittwer
committed
refactor(prettier): reformat code with new version of prettier
1 parent bb4aebd commit c42842a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+282
-240
lines changed

‎src/decorator/impl/collection/collection-property.decorator.ts

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,29 @@ import { getMetadataType } from '../../util'
1515
import { initOrUpdateProperty } from '../property/init-or-update-property.function'
1616
import { CollectionPropertyData } from './collection-property-data.model'
1717

18-
19-
export function CollectionProperty<R, T extends StringAttribute | NumberAttribute | BinaryAttribute>(opts: CollectionPropertyData<R, T> = {}): PropertyDecorator {
18+
export function CollectionProperty<R, T extends StringAttribute | NumberAttribute | BinaryAttribute>(
19+
opts: CollectionPropertyData<R, T> = {},
20+
): PropertyDecorator {
2021
return (target: object, propertyKey: string | symbol) => {
2122
if (typeof propertyKey === 'string') {
22-
2323
const type: ModelConstructor<any> = getMetadataType(target, propertyKey)
2424

25-
if(type === undefined){
26-
throw new Error('make sure you have enabled the typescript compiler options which enable us to work with decorators (see doc)')
25+
if (type === undefined) {
26+
throw new Error(
27+
'make sure you have enabled the typescript compiler options which enable us to work with decorators (see doc)',
28+
)
2729
}
2830

2931
if (type !== Set && type !== Array) {
30-
throw new Error(`[${target.constructor.name}::${propertyKey}] The CollectionProperty decorator is meant for properties of type Set or Array`)
32+
throw new Error(
33+
`[${target.constructor.name}::${propertyKey}] The CollectionProperty decorator is meant for properties of type Set or Array`,
34+
)
3135
}
3236

3337
const meta: Partial<PropertyMetadata<any>> & { typeInfo: TypeInfo } = {
3438
name: propertyKey,
35-
nameDb: opts && opts.name || propertyKey,
36-
typeInfo: {type},
39+
nameDb: (opts && opts.name) || propertyKey,
40+
typeInfo: { type },
3741
isSortedCollection: !!opts.sorted,
3842
}
3943

@@ -51,11 +55,12 @@ export function CollectionProperty<R, T extends StringAttribute | NumberAttribut
5155
if (hasItemMapper) {
5256
const itemMapper = <MapperForType<any, any>>opts.itemMapper
5357

54-
const wrappedMapper: MapperForType<any, any> = type === Array
55-
? !!opts.sorted
56-
? wrapMapperForDynamoListJsArray(itemMapper)
57-
: wrapMapperForDynamoSetJsArray(itemMapper)
58-
: !!opts.sorted
58+
const wrappedMapper: MapperForType<any, any> =
59+
type === Array
60+
? !!opts.sorted
61+
? wrapMapperForDynamoListJsArray(itemMapper)
62+
: wrapMapperForDynamoSetJsArray(itemMapper)
63+
: !!opts.sorted
5964
? wrapMapperForDynamoListJsSet(itemMapper)
6065
: wrapMapperForDynamoSetJsSet(itemMapper)
6166

‎src/decorator/impl/date/date-property.decorator.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { DatePropertyData } from './date-property-data.model'
99
export function DateProperty(opts: Partial<DatePropertyData> = {}): PropertyDecorator {
1010
return (target: any, propertyKey: string | symbol) => {
1111
if (typeof propertyKey === 'string') {
12-
1312
const propertyOptions: Partial<PropertyMetadata<any>> = {
1413
name: propertyKey,
1514
nameDb: opts.name || propertyKey,

‎src/decorator/impl/model/model.decorator.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,7 @@ function getGlobalSecondaryIndexes(properties: Array<PropertyMetadata<any>>): Ma
9292
case 'HASH':
9393
if (gsi.partitionKey) {
9494
throw new Error(
95-
`there is already a partition key defined for global secondary index ${indexName} (property name: ${
96-
property.nameDb
97-
})`,
95+
`there is already a partition key defined for global secondary index ${indexName} (property name: ${property.nameDb})`,
9896
)
9997
}
10098

@@ -103,9 +101,7 @@ function getGlobalSecondaryIndexes(properties: Array<PropertyMetadata<any>>): Ma
103101
case 'RANGE':
104102
if (gsi.sortKey) {
105103
throw new Error(
106-
`there is already a sort key defined for global secondary index ${indexName} (property name: ${
107-
property.nameDb
108-
})`,
104+
`there is already a sort key defined for global secondary index ${indexName} (property name: ${property.nameDb})`,
109105
)
110106
}
111107

@@ -137,9 +133,7 @@ function getLocalSecondaryIndexes(
137133
property.sortKeyForLSI.forEach(indexName => {
138134
if (map.has(indexName)) {
139135
throw new Error(
140-
`only one sort key can be defined for the same local secondary index, ${
141-
property.nameDb
142-
} is already defined as sort key for index ${indexName}`,
136+
`only one sort key can be defined for the same local secondary index, ${property.nameDb} is already defined as sort key for index ${indexName}`,
143137
)
144138
}
145139

‎src/decorator/impl/property/init-or-update-property.function.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,13 @@ function createNewProperty(
4444
): PropertyMetadata<any> {
4545
const propertyType: ModelConstructor<any> = getMetadataType(target, propertyKey)
4646

47-
if(propertyType === undefined){
48-
throw new Error('make sure you have enabled the typescript compiler options which enable us to work with decorators (see doc)')
47+
if (propertyType === undefined) {
48+
throw new Error(
49+
'make sure you have enabled the typescript compiler options which enable us to work with decorators (see doc)',
50+
)
4951
}
5052

51-
const typeInfo: TypeInfo = { type: propertyType}
53+
const typeInfo: TypeInfo = { type: propertyType }
5254

5355
propertyOptions = {
5456
name: propertyKey,

‎src/decorator/impl/public-api.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,3 @@ export * from './model/model.decorator'
2323
export * from './property/property.decorator'
2424
// transient
2525
export * from './transient/transient.decorator'
26-
27-
28-

‎src/decorator/metadata/metadata.ts

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,15 @@ export function hasSortKey<T>(metadata: Metadata<T>): metadata is MetadataWithSo
2828
export class Metadata<T> {
2929
readonly modelOptions: ModelMetadata<T>
3030

31-
private static findMetaDataForProperty<M>(modelOpts: ModelMetadata<M>, propertyName: keyof M): PropertyMetadata<M> | undefined {
32-
return modelOpts.properties && modelOpts.properties.find(
33-
property => property.name === propertyName || property.nameDb === propertyName,
34-
) || undefined
31+
private static findMetaDataForProperty<M>(
32+
modelOpts: ModelMetadata<M>,
33+
propertyName: keyof M,
34+
): PropertyMetadata<M> | undefined {
35+
return (
36+
(modelOpts.properties &&
37+
modelOpts.properties.find(property => property.name === propertyName || property.nameDb === propertyName)) ||
38+
undefined
39+
)
3540
}
3641

3742
constructor(modelConstructor: ModelConstructor<T>) {
@@ -54,7 +59,9 @@ export class Metadata<T> {
5459
lastPropMeta = Metadata.findMetaDataForProperty(currentMeta, <any>lastPathPart)
5560
if (lastPropMeta && lastPropMeta.typeInfo) {
5661
currentMeta = new Metadata(lastPropMeta.typeInfo.genericType || lastPropMeta.typeInfo.type).modelOptions
57-
} else { break }
62+
} else {
63+
break
64+
}
5865
}
5966
if (lastPropMeta && (lastPathPart === lastPropMeta.name || lastPathPart === lastPropMeta.nameDb)) {
6067
return lastPropMeta

‎src/decorator/metadata/property-metadata.model.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ export function hasType(
7272
/**
7373
* @hidden
7474
*/
75-
export function alterCollectionPropertyMetadataForSingleItem<T>(propertyMeta?: PropertyMetadata<T> | null): PropertyMetadata<T> | undefined {
75+
export function alterCollectionPropertyMetadataForSingleItem<T>(
76+
propertyMeta?: PropertyMetadata<T> | null,
77+
): PropertyMetadata<T> | undefined {
7678
if (!propertyMeta) {
7779
return
7880
}
@@ -82,9 +84,9 @@ export function alterCollectionPropertyMetadataForSingleItem<T>(propertyMeta?: P
8284
}
8385

8486
if (propertyMeta.typeInfo && (propertyMeta.typeInfo.type === Set || propertyMeta.typeInfo.type === Array)) {
85-
if(hasGenericType(propertyMeta)){
86-
return <PropertyMetadata<T>>{ ...propertyMeta, typeInfo: {type: propertyMeta.typeInfo.genericType } }
87-
}else{
87+
if (hasGenericType(propertyMeta)) {
88+
return <PropertyMetadata<T>>{ ...propertyMeta, typeInfo: { type: propertyMeta.typeInfo.genericType } }
89+
} else {
8890
return
8991
}
9092
}

‎src/dynamo/batchget/batch-get-utils.ts

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,24 @@ export function batchGetItemsFetchAll(
2020
backoffTimer: IterableIterator<number>,
2121
throttleTimeSlot: number,
2222
): Promise<DynamoDB.BatchGetItemOutput> {
23-
return dynamoDBWrapper.batchGetItems(params)
24-
.then(response => {
25-
if (hasUnprocessedKeys(response)) {
26-
// in case of unprocessedKeys do a follow-up requests
27-
return Promise.resolve(response.UnprocessedKeys)
23+
return dynamoDBWrapper.batchGetItems(params).then(response => {
24+
if (hasUnprocessedKeys(response)) {
25+
// in case of unprocessedKeys do a follow-up requests
26+
return (
27+
Promise.resolve(response.UnprocessedKeys)
2828
// delay before doing the follow-up request
29-
.then(promiseDelay(backoffTimer.next().value * throttleTimeSlot))
30-
.then(UnprocessedKeys => {
31-
const nextParams = { ...params, RequestItems: UnprocessedKeys }
32-
// call recursively batchGetItemsFetchAll with the returned UnprocessedItems params
33-
return batchGetItemsFetchAll(dynamoDBWrapper, nextParams, backoffTimer, throttleTimeSlot)
34-
})
35-
.then(combineBatchGetResponses(response))
36-
}
37-
// no follow-up request necessary, return result
38-
return response
39-
},
40-
)
29+
.then(promiseDelay(backoffTimer.next().value * throttleTimeSlot))
30+
.then(UnprocessedKeys => {
31+
const nextParams = { ...params, RequestItems: UnprocessedKeys }
32+
// call recursively batchGetItemsFetchAll with the returned UnprocessedItems params
33+
return batchGetItemsFetchAll(dynamoDBWrapper, nextParams, backoffTimer, throttleTimeSlot)
34+
})
35+
.then(combineBatchGetResponses(response))
36+
)
37+
}
38+
// no follow-up request necessary, return result
39+
return response
40+
})
4141
}
4242

4343
/**

‎src/dynamo/batchget/batch-get.request.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,7 @@ export class BatchGetRequest {
9898
backoffTimer = randomExponentialBackoffTimer,
9999
throttleTimeSlot = BATCH_GET_DEFAULT_TIME_SLOT,
100100
): Promise<BatchGetFullResponse> {
101-
return this.fetch(backoffTimer, throttleTimeSlot)
102-
.then(this.mapResponse)
101+
return this.fetch(backoffTimer, throttleTimeSlot).then(this.mapResponse)
103102
}
104103

105104
/**

‎src/dynamo/batchwrite/batch-write-utils.ts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,24 @@ export function batchWriteItemsWriteAll(
2020
backoffTimer: IterableIterator<number>,
2121
throttleTimeSlot: number,
2222
): Promise<DynamoDB.BatchGetItemOutput> {
23-
return dynamoDBWrapper.batchWriteItem(params)
24-
.then(response => {
25-
if (hasUnprocessedItems(response)) {
26-
// in case of unprocessedItems do a follow-up requests
27-
return Promise.resolve(response.UnprocessedItems)
23+
return dynamoDBWrapper.batchWriteItem(params).then(response => {
24+
if (hasUnprocessedItems(response)) {
25+
// in case of unprocessedItems do a follow-up requests
26+
return (
27+
Promise.resolve(response.UnprocessedItems)
2828
// delay before doing the follow-up request
2929
.then(promiseDelay(backoffTimer.next().value * throttleTimeSlot))
3030
.then(unprocessedKeys => {
3131
const nextParams: DynamoDB.BatchWriteItemInput = { ...params, RequestItems: unprocessedKeys }
3232
// call recursively batchWriteItemsWriteAll with the returned UnprocessedItems params
3333
return batchWriteItemsWriteAll(dynamoDBWrapper, nextParams, backoffTimer, throttleTimeSlot)
3434
})
35-
// no combining of responses necessary, only the last response is returned
36-
}
37-
// no follow-up request necessary, return result
38-
return response
39-
})
35+
)
36+
// no combining of responses necessary, only the last response is returned
37+
}
38+
// no follow-up request necessary, return result
39+
return response
40+
})
4041
}
4142

4243
/**

0 commit comments

Comments
 (0)