refactor(decorators): remove deprecated decorators

mumenthalers · mumenthalers · commit 6a2f03b8b3fc · 2019-02-04T09:23:43.000+01:00
BREAKING CHANGE
- use `@CollectionProperty(opts)`  instead of `@SortedSet`, `@TypedSet`, `@TypedArray`
- use `@Property({mapper: MapperForType})` instead of @CustomMapper(mapper)
diff --git a/src/decorator/impl/collection/collection-property-data.model.ts b/src/decorator/impl/collection/collection-property-data.model.ts
@@ -1,7 +1,7 @@
 import { BinaryAttribute, MapperForType, NumberAttribute, StringAttribute } from '../../../mapper'
 import { ModelConstructor } from '../../../model'
 
-export interface CollectionPropertyDataBase<R, T extends StringAttribute | NumberAttribute | BinaryAttribute> {
+export interface CollectionPropertyData<R, T extends StringAttribute | NumberAttribute | BinaryAttribute> {
   /**
    * the name of property how it is named in dynamoDB
    */
diff --git a/src/decorator/impl/collection/collection-property.decorator.spec.ts b/src/decorator/impl/collection/collection-property.decorator.spec.ts
@@ -1,8 +1,8 @@
 // tslint:disable:max-classes-per-file
 // tslint:disable:no-non-null-assertion
-import { Model } from '..'
 import { FormId, formIdMapper } from '../../../../test/models/real-world'
 import { metadataForClass, metadataForProperty } from '../../metadata'
+import { Model } from '../model/model.decorator'
 import { CollectionProperty } from './collection-property.decorator'
 
 describe('@CollectionProperty', () => {
diff --git a/src/decorator/impl/collection/collection-property.decorator.ts b/src/decorator/impl/collection/collection-property.decorator.ts
@@ -9,11 +9,10 @@ import { ModelConstructor } from '../../../model'
 import { PropertyMetadata, TypeInfo } from '../../metadata'
 import { getMetadataType } from '../../util'
 import { initOrUpdateProperty } from '../property/init-or-update-property.function'
-import { CollectionPropertyDataBase } from './collection-property-data.model'
+import { CollectionPropertyData } from './collection-property-data.model'
 
-type DecoratorFn = (target: object, propertyKey: string | symbol) => void
 
-export function CollectionProperty<R, T extends StringAttribute | NumberAttribute | BinaryAttribute>(opts: CollectionPropertyDataBase<R, T> = {}): DecoratorFn {
+export function CollectionProperty<R, T extends StringAttribute | NumberAttribute | BinaryAttribute>(opts: CollectionPropertyData<R, T> = {}): PropertyDecorator {
   return (target: object, propertyKey: string | symbol) => {
     if (typeof propertyKey === 'string') {
 
diff --git a/src/decorator/impl/collection/sorted-set.decorator.ts b/src/decorator/impl/collection/sorted-set.decorator.ts
diff --git a/src/decorator/impl/collection/typed-array.decorator.ts b/src/decorator/impl/collection/typed-array.decorator.ts
diff --git a/src/decorator/impl/collection/typed-set.decorator.ts b/src/decorator/impl/collection/typed-set.decorator.ts
diff --git a/src/decorator/impl/custom-mapper/custom-mapper.decorator.ts b/src/decorator/impl/custom-mapper/custom-mapper.decorator.ts
diff --git a/src/decorator/impl/date/date-property.decorator.spec.ts b/src/decorator/impl/date/date-property.decorator.spec.ts
@@ -4,7 +4,7 @@ import { getMetaDataProperty } from '../../../../test/helper'
 import { resetDynamoEasyConfig } from '../../../../test/helper/resetDynamoEasyConfig.function'
 import { updateDynamoEasyConfig } from '../../../config'
 import { dateToNumberMapper } from '../../../mapper/custom'
-import { DateProperty } from './date.decorator'
+import { DateProperty } from './date-property.decorator'
 
 @Model()
 class ModelWithDate {
diff --git a/src/decorator/impl/date/date-property.decorator.ts b/src/decorator/impl/date/date-property.decorator.ts
diff --git a/src/decorator/impl/index.ts b/src/decorator/impl/index.ts
@@ -1,9 +1,8 @@
 // collection
-export * from './collection/sorted-set.decorator'
-export * from './collection/typed-set.decorator'
-export * from './collection/typed-array.decorator'
+export * from './collection/collection-property.decorator'
+
 // date
-export * from './date/date.decorator'
+export * from './date/date-property.decorator'
 // index
 export * from './index/secondary-index'
 export * from './index/gsi-partition-key.decorator'
@@ -14,11 +13,13 @@ export * from './index/index-type.enum'
 export * from './key/partition-key.decorator'
 export * from './key/partition-key-uuid.decorator'
 export * from './key/sort-key.decorator'
-// mapper
-export * from './custom-mapper/custom-mapper.decorator'
+
 // model
 export * from './model/model.decorator'
 // property
 export * from './property/property.decorator'
 // transient
 export * from './transient/transient.decorator'
+
+
+
diff --git a/src/decorator/metadata/metadata.ts b/src/decorator/metadata/metadata.ts
@@ -1,7 +1,7 @@
 import {
   NESTED_ATTR_PATH_CAPTURED_REGEX,
   NESTED_ATTR_PATH_REGEX,
-} from '../../dynamo/expression/functions/attribute-names.function'
+} from '../../dynamo/expression/functions/attribute-names.const'
 import { ModelConstructor } from '../../model/model-constructor'
 import { Omit } from '../../model/omit.type'
 import { SecondaryIndex } from '../impl/index/secondary-index'
diff --git a/src/dynamo/expression/condition-expression-builder.spec.ts b/src/dynamo/expression/condition-expression-builder.spec.ts
@@ -2,8 +2,7 @@
 import { has } from 'lodash'
 import { ComplexModel } from '../../../test/models'
 import { Form, FormId, formIdMapper, FormType } from '../../../test/models/real-world'
-import { Model, PartitionKey, Property } from '../../decorator/impl'
-import { CollectionProperty } from '../../decorator/impl/collection/collection-property.decorator'
+import { CollectionProperty, Model, PartitionKey, Property } from '../../decorator/impl'
 import { metadataForClass } from '../../decorator/metadata'
 import { typeOf } from '../../mapper'
 import {
diff --git a/src/dynamo/expression/functions/attribute-names.const.ts b/src/dynamo/expression/functions/attribute-names.const.ts
@@ -0,0 +1,2 @@
+export const NESTED_ATTR_PATH_CAPTURED_REGEX = /([a-z0-9A-Z_]+)(?:\[(\d+)])?\.?/g
+export const NESTED_ATTR_PATH_REGEX = /^.+((\[(\d+)])|(\.)).*$/
diff --git a/src/dynamo/expression/functions/attribute-names.function.ts b/src/dynamo/expression/functions/attribute-names.function.ts
@@ -1,7 +1,7 @@
-import { Metadata } from '../../../decorator/metadata'
+import { Metadata } from '../../../decorator/metadata/metadata'
+import { NESTED_ATTR_PATH_CAPTURED_REGEX, NESTED_ATTR_PATH_REGEX } from './attribute-names.const'
+
 
-export const NESTED_ATTR_PATH_CAPTURED_REGEX = /([a-z0-9A-Z_]+)(?:\[(\d+)])?\.?/g
-export const NESTED_ATTR_PATH_REGEX = /^.+((\[(\d+)])|(\.)).*$/
 
 // problem: we only get the metadata from the last property -> but we need it for all properties in the chain (prop1.prop2.prop3)
 export function resolveAttributeNames(
diff --git a/src/dynamo/request/read-many.request.ts b/src/dynamo/request/read-many.request.ts
@@ -1,6 +1,7 @@
 import * as DynamoDB from 'aws-sdk/clients/dynamodb'
 import { SecondaryIndex } from '../../decorator/impl'
-import { fetchAll, promiseTap } from '../../helper'
+import { fetchAll } from '../../helper/fetch-all.function'
+import { promiseTap } from '../../helper/promise-tap.function'
 import { Logger } from '../../logger/logger'
 import { Attributes, fromDb } from '../../mapper'
 import { ModelConstructor } from '../../model'
diff --git a/src/helper/fetch-all.function.ts b/src/helper/fetch-all.function.ts
@@ -1,5 +1,7 @@
 import * as DynamoDB from 'aws-sdk/clients/dynamodb'
-import { QueryRequest, ReadManyRequest, ScanRequest } from '../dynamo/request'
+import { QueryRequest } from '../dynamo/request/query/query.request'
+import { ReadManyRequest } from '../dynamo/request/read-many.request'
+import { ScanRequest } from '../dynamo/request/scan/scan.request'
 
 /**
  * When we cant load all the items of a table with one request, we will fetch as long as there is more data
diff --git a/test/models/brutalist.model.ts b/test/models/brutalist.model.ts
@@ -1,6 +1,5 @@
 // tslint:disable:max-classes-per-file
-import { DateProperty, Model, PartitionKey, Property } from '../../src/decorator/impl'
-import { CollectionProperty } from '../../src/decorator/impl/collection/collection-property.decorator'
+import { CollectionProperty, DateProperty, Model, PartitionKey, Property } from '../../src/dynamo-easy'
 import { FormId, formIdMapper } from './real-world'
 
 @Model()
diff --git a/test/models/complex.model.ts b/test/models/complex.model.ts
@@ -1,5 +1,12 @@
-import { CollectionProperty } from '../../src/decorator/impl/collection/collection-property.decorator'
-import { DateProperty, Model, PartitionKey, Property, SortKey, Transient } from '../../src/dynamo-easy'
+import {
+  CollectionProperty,
+  DateProperty,
+  Model,
+  PartitionKey,
+  Property,
+  SortKey,
+  Transient,
+} from '../../src/dynamo-easy'
 import { NestedObject } from './nested-object.model'
 
 @Model({ tableName: 'complex_model' })
diff --git a/test/models/employee.model.ts b/test/models/employee.model.ts
@@ -1,5 +1,4 @@
-import { CollectionProperty } from '../../src/decorator/impl/collection/collection-property.decorator'
-import { DateProperty, Model } from '../../src/dynamo-easy'
+import { CollectionProperty, DateProperty, Model } from '../../src/dynamo-easy'
 
 @Model()
 export class Employee {
diff --git a/test/models/fail-model.model.ts b/test/models/fail-model.model.ts
@@ -1,8 +1,5 @@
-import { Model } from '../../src/decorator/impl'
-
 // tslint:disable:max-classes-per-file
-import { CollectionProperty } from '../../src/decorator/impl/collection/collection-property.decorator'
-import { MapAttribute, MapperForType, StringAttribute } from '../../src/mapper'
+import { CollectionProperty, MapAttribute, MapperForType, Model, StringAttribute } from '../../src/dynamo-easy'
 
 const strangeMapper: MapperForType<FailModelNestedFail, MapAttribute> = {
   toDb: propertyValue => ({ M: { id: { S: `${propertyValue}` } } }),
diff --git a/test/models/model-with-collections.model.ts b/test/models/model-with-collections.model.ts
@@ -1,5 +1,4 @@
-import { Model } from '../../src/decorator/impl'
-import { CollectionProperty } from '../../src/decorator/impl/collection/collection-property.decorator'
+import { CollectionProperty, Model } from '../../src/dynamo-easy'
 import { NestedModelWithDate } from './nested-model-with-date.model'
 import { NestedObject } from './nested-object.model'
 import { FormId, formIdMapper } from './real-world'
diff --git a/test/models/nested-complex.model.ts b/test/models/nested-complex.model.ts
@@ -1,5 +1,4 @@
-import { CollectionProperty } from '../../src/decorator/impl/collection/collection-property.decorator'
-import { Model } from '../../src/dynamo-easy'
+import { CollectionProperty, Model } from '../../src/dynamo-easy'
 
 @Model()
 export class NestedComplexModel {
diff --git a/test/models/organization.model.ts b/test/models/organization.model.ts
@@ -1,5 +1,12 @@
-import { CollectionProperty } from '../../src/decorator/impl/collection/collection-property.decorator'
-import { DateProperty, Model, PartitionKey, Property, SortKey, Transient } from '../../src/dynamo-easy'
+import {
+  CollectionProperty,
+  DateProperty,
+  Model,
+  PartitionKey,
+  Property,
+  SortKey,
+  Transient,
+} from '../../src/dynamo-easy'
 import { Employee } from './employee.model'
 
 // tslint:disable:max-classes-per-file
diff --git a/test/models/product.model.ts b/test/models/product.model.ts
@@ -1,6 +1,5 @@
-import { CollectionProperty } from '../../src/decorator/impl/collection/collection-property.decorator'
 // tslint:disable:max-classes-per-file
-import { Model, Property } from '../../src/dynamo-easy'
+import { CollectionProperty, Model, Property } from '../../src/dynamo-easy'
 import { NestedComplexModel } from './nested-complex.model'
 
 @Model()
diff --git a/test/models/real-world/form.model.ts b/test/models/real-world/form.model.ts
@@ -1,5 +1,4 @@
-import { CollectionProperty } from '../../../src/decorator/impl/collection/collection-property.decorator'
-import { Model } from '../../../src/dynamo-easy'
+import { CollectionProperty, Model } from '../../../src/dynamo-easy'
 import { BaseForm } from './base-form.model'
 
 @Model({ tableName: 'forms' })
diff --git a/test/models/real-world/order.model.ts b/test/models/real-world/order.model.ts
@@ -1,7 +1,7 @@
 // tslint:disable:max-classes-per-file
 
-import { CollectionProperty } from '../../../src/decorator/impl/collection/collection-property.decorator'
 import {
+  CollectionProperty,
   DateProperty,
   GSIPartitionKey,
   GSISortKey,
diff --git a/test/models/update.model.ts b/test/models/update.model.ts
@@ -1,5 +1,4 @@
-import { CollectionProperty } from '../../src/decorator/impl/collection/collection-property.decorator'
-import { DateProperty, Model, PartitionKey, Property } from '../../src/dynamo-easy'
+import { CollectionProperty, DateProperty, Model, PartitionKey, Property } from '../../src/dynamo-easy'
 
 // tslint:disable-next-line:max-classes-per-file
 @Model()
