feat(aws-sdk-v3): [WIP] first compiling version

Michael Wittwer · Michael Wittwer · commit 1a0507acc783 · 2023-02-21T13:44:44.000+01:00
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,10 +17,10 @@ jobs:
   test:
     strategy:
       matrix:
-        # Test with Node.js  v16(maintenance), v18 (LTS) and v19 current
+        # Test with Node.js v18 (LTS) and v19 current
         node:
-          - 16
           - 18
+          - 19
     name: Node.js v${{ matrix.node }}
     runs-on: ubuntu-latest
     steps:
@@ -49,7 +49,6 @@ jobs:
       - run: HUSKY=0 npm ci
       # Run tests
       - run: npm run test:ci
-
   build:
     runs-on: ubuntu-latest
     steps:
diff --git a/src/aws-sdk-v2.types.ts b/src/aws-sdk-v2.types.ts
@@ -0,0 +1,13 @@
+// tslint:disable:interface-over-type-literal
+/*
+ * holds different types which are no longer available in aws-sdk v3, might be inlined at some point. Open to discuss.
+ * TODO v3: discuss how to proceed
+ */
+import { AttributeValue, KeysAndAttributes, WriteRequest } from '@aws-sdk/client-dynamodb'
+export type BatchGetRequestMap = { [key: string]: KeysAndAttributes }
+export type BatchWriteItemRequestMap = { [key: string]: WriteRequest[] }
+
+export type ExpressionAttributeNameMap = { [key: string]: string /* was: AttributeName */ }
+export type ExpressionAttributeValueMap = { [key: string]: AttributeValue /* was: AttributeValue */ }
+
+export type Key = { [key: string]: AttributeValue }
diff --git a/src/config/config.type.ts b/src/config/config.type.ts
@@ -24,6 +24,7 @@ export interface Config {
   tableNameResolver: TableNameResolver
   /**
    * function called before calling dynamoDB api
+   * @deprecated v3: should be replaced by using the default middleware stack provided by aws-sdk v3
    */
   sessionValidityEnsurer: SessionValidityEnsurer
 }
diff --git a/src/decorator/impl/index/gsi-partition-key.decorator.ts b/src/decorator/impl/index/gsi-partition-key.decorator.ts
@@ -1,6 +1,7 @@
 /**
  * @module decorators
  */
+import { KeyType } from '@aws-sdk/client-dynamodb'
 import { IndexType } from './index-type.enum'
 import { initOrUpdateIndex } from './util'
 
@@ -10,7 +11,7 @@ import { initOrUpdateIndex } from './util'
 export function GSIPartitionKey(indexName: string): PropertyDecorator {
   return (target: any, propertyKey: string | symbol) => {
     if (typeof propertyKey === 'string') {
-      initOrUpdateIndex(IndexType.GSI, { name: indexName, keyType: 'HASH' }, target, propertyKey)
+      initOrUpdateIndex(IndexType.GSI, { name: indexName, keyType: KeyType.HASH }, target, propertyKey)
     }
   }
 }
diff --git a/src/decorator/impl/index/gsi-sort-key.decorator.ts b/src/decorator/impl/index/gsi-sort-key.decorator.ts
@@ -1,6 +1,7 @@
 /**
  * @module decorators
  */
+import { KeyType } from '@aws-sdk/client-dynamodb'
 import { IndexType } from './index-type.enum'
 import { initOrUpdateIndex } from './util'
 
@@ -10,7 +11,7 @@ import { initOrUpdateIndex } from './util'
 export function GSISortKey(indexName: string): PropertyDecorator {
   return (target: any, propertyKey: string | symbol) => {
     if (typeof propertyKey === 'string') {
-      initOrUpdateIndex(IndexType.GSI, { name: indexName, keyType: 'RANGE' }, target, propertyKey)
+      initOrUpdateIndex(IndexType.GSI, { name: indexName, keyType: KeyType.RANGE }, target, propertyKey)
     }
   }
 }
diff --git a/src/decorator/impl/index/lsi-sort-key.decorator.ts b/src/decorator/impl/index/lsi-sort-key.decorator.ts
@@ -1,6 +1,7 @@
 /**
  * @module decorators
  */
+import { KeyType } from '@aws-sdk/client-dynamodb'
 import { IndexType } from './index-type.enum'
 import { initOrUpdateIndex } from './util'
 
@@ -10,7 +11,7 @@ import { initOrUpdateIndex } from './util'
 export function LSISortKey(indexName: string): PropertyDecorator {
   return (target: any, propertyKey: string | symbol) => {
     if (typeof propertyKey === 'string') {
-      initOrUpdateIndex(IndexType.LSI, { name: indexName, keyType: 'RANGE' }, target, propertyKey)
+      initOrUpdateIndex(IndexType.LSI, { name: indexName, keyType: KeyType.RANGE }, target, propertyKey)
     }
   }
 }
diff --git a/src/decorator/impl/key/partition-key.decorator.ts b/src/decorator/impl/key/partition-key.decorator.ts
@@ -1,6 +1,7 @@
 /**
  * @module decorators
  */
+import { KeyType } from '@aws-sdk/client-dynamodb'
 import { createOptModelLogger } from '../../../logger/logger'
 import { PropertyMetadata } from '../../metadata/property-metadata.model'
 import { initOrUpdateProperty } from '../property/init-or-update-property.function'
@@ -31,7 +32,7 @@ export function PartitionKey(): PropertyDecorator {
         }
       }
 
-      initOrUpdateProperty({ key: { type: 'HASH' } }, target, propertyKey)
+      initOrUpdateProperty({ key: { type: KeyType.HASH } }, target, propertyKey)
     }
   }
 }
diff --git a/src/decorator/impl/key/sort-key.decorator.ts b/src/decorator/impl/key/sort-key.decorator.ts
@@ -1,12 +1,13 @@
 /**
  * @module decorators
  */
+import { KeyType } from '@aws-sdk/client-dynamodb'
 import { initOrUpdateProperty } from '../property/init-or-update-property.function'
 
 export function SortKey(): PropertyDecorator {
   return (target: any, propertyKey: string | symbol) => {
     if (typeof propertyKey === 'string') {
-      initOrUpdateProperty({ key: { type: 'RANGE' } }, target, propertyKey)
+      initOrUpdateProperty({ key: { type: KeyType.RANGE } }, target, propertyKey)
     }
   }
 }
diff --git a/src/dynamo/batchget/batch-get-full.response.ts b/src/dynamo/batchget/batch-get-full.response.ts
@@ -1,9 +1,8 @@
 /**
  * @module multi-model-requests/batch-get
  */
-
-// tslint:disable-next-line:interface-over-type-literal
 import * as DynamoDB from '@aws-sdk/client-dynamodb'
+import * as DynamoDBv2 from '../../aws-sdk-v2.types'
 import { BatchGetResponse } from './batch-get.response'
 
 /**
@@ -17,9 +16,9 @@ export interface BatchGetFullResponse {
   /**
    * A map of tables and their respective keys that were not processed with the current response. The UnprocessedKeys value is in the same form as RequestItems, so the value can be provided directly to a subsequent BatchGetItem operation. For more information, see RequestItems in the Request Parameters section. Each element consists of:    Keys - An array of primary key attribute values that define specific items in the table.    ProjectionExpression - One or more attributes to be retrieved from the table or index. By default, all attributes are returned. If a requested attribute is not found, it does not appear in the result.    ConsistentRead - The consistency of a read operation. If set to true, then a strongly consistent read is used; otherwise, an eventually consistent read is used.   If there are no unprocessed keys remaining, the response contains an empty UnprocessedKeys map.
    */
-  UnprocessedKeys?: DynamoDB.BatchGetRequestMap
+  UnprocessedKeys?: DynamoDBv2.BatchGetRequestMap
   /**
    * The read capacity units consumed by the entire BatchGetItem operation. Each element consists of:    TableName - The table that consumed the provisioned throughput.    CapacityUnits - The total number of capacity units consumed.
    */
-  ConsumedCapacity?: DynamoDB.ConsumedCapacityMultiple
+  ConsumedCapacity?: DynamoDB.ConsumedCapacity[]
 }
diff --git a/src/dynamo/batchget/batch-get-utils.ts b/src/dynamo/batchget/batch-get-utils.ts
@@ -2,6 +2,7 @@
  * @module multi-model-requests/batch-get
  */
 import * as DynamoDB from '@aws-sdk/client-dynamodb'
+import * as DynamoDBv2 from '../../aws-sdk-v2.types'
 import { promiseDelay } from '../../helper/promise-delay.function'
 import { DynamoDbWrapper } from '../dynamo-db-wrapper'
 
@@ -44,7 +45,7 @@ export function batchGetItemsFetchAll(
  * @hidden
  */
 export type BatchGetItemOutputWithUnprocessedKeys = DynamoDB.BatchGetItemOutput & {
-  UnprocessedKeys: DynamoDB.BatchGetRequestMap
+  UnprocessedKeys: DynamoDBv2.BatchGetRequestMap
 }
 
 /**
diff --git a/src/dynamo/batchget/batch-get.request.ts b/src/dynamo/batchget/batch-get.request.ts
@@ -22,12 +22,14 @@ export class BatchGetRequest {
     return this.dynamoDBWrapper.dynamoDB
   }
 
-  readonly params: DynamoDB.BatchGetItemInput
+  readonly params: DynamoDB.BatchGetItemInput & {
+    RequestItems: NonNullable<DynamoDB.BatchGetItemInput['RequestItems']>
+  }
   private readonly dynamoDBWrapper: DynamoDbWrapper
   private readonly tables: Map<string, ModelConstructor<any>> = new Map()
   private itemCounter = 0
 
-  constructor(dynamoDB?: DynamoDB.DynamoDB) {
+  constructor(dynamoDB: DynamoDB.DynamoDB) {
     this.dynamoDBWrapper = new DynamoDbWrapper(dynamoDB)
     this.params = {
       RequestItems: {},
diff --git a/src/dynamo/batchwrite/batch-write-utils.ts b/src/dynamo/batchwrite/batch-write-utils.ts
@@ -2,6 +2,7 @@
  * @module multi-model-requests/batch-write
  */
 import * as DynamoDB from '@aws-sdk/client-dynamodb'
+import * as DynamoDBv2 from '../../aws-sdk-v2.types'
 import { promiseDelay } from '../../helper/promise-delay.function'
 import { DynamoDbWrapper } from '../dynamo-db-wrapper'
 
@@ -44,7 +45,7 @@ export function batchWriteItemsWriteAll(
  * @hidden
  */
 export type BatchWriteItemOutputWithUnprocessedItems = DynamoDB.BatchWriteItemOutput & {
-  UnprocessedItems: DynamoDB.BatchWriteItemRequestMap
+  UnprocessedItems: DynamoDBv2.BatchWriteItemRequestMap
 }
 
 /**
diff --git a/src/dynamo/batchwrite/batch-write.request.ts b/src/dynamo/batchwrite/batch-write.request.ts
@@ -18,11 +18,11 @@ export class BatchWriteRequest {
     return this.dynamoDBWrapper.dynamoDB
   }
 
-  readonly params: DynamoDB.BatchWriteItemInput
+  readonly params: DynamoDB.BatchWriteItemInput & { RequestItems: Record<string, DynamoDB.WriteRequest[]> }
   private readonly dynamoDBWrapper: DynamoDbWrapper
   private itemCount = 0
 
-  constructor(dynamoDB?: DynamoDB.DynamoDB) {
+  constructor(dynamoDB: DynamoDB.DynamoDB) {
     this.dynamoDBWrapper = new DynamoDbWrapper(dynamoDB)
     this.params = {
       RequestItems: {},
@@ -88,7 +88,7 @@ export class BatchWriteRequest {
     return this.write(backoffTimer, throttleTimeSlot)
   }
 
-  private requestItems(modelClazz: ModelConstructor<any>, items: DynamoDB.WriteRequests) {
+  private requestItems(modelClazz: ModelConstructor<any>, items: DynamoDB.WriteRequest[]) {
     if (this.itemCount + items.length > BATCH_WRITE_MAX_REQUEST_ITEM_COUNT) {
       throw new Error(`batch write takes at max ${BATCH_WRITE_MAX_REQUEST_ITEM_COUNT} items`)
     }
diff --git a/src/dynamo/dynamo-db-wrapper.ts b/src/dynamo/dynamo-db-wrapper.ts
@@ -10,13 +10,7 @@ import { dynamoEasyConfig } from '../config/dynamo-easy-config'
  * @hidden
  */
 export class DynamoDbWrapper {
-  readonly dynamoDB: DynamoDB.DynamoDB
-
-  constructor(dynamoDB?: DynamoDB.DynamoDB) {
-    // create the actual dynamoDB client
-    // TODO v3: check if any default configuration should be provided, possibly from dynamoEasyConfig
-    this.dynamoDB = dynamoDB || new DynamoDB.DynamoDB({})
-  }
+  constructor(readonly dynamoDB: DynamoDB.DynamoDB) {}
 
   /*
    * make all the dynamo requests return an promise
diff --git a/src/dynamo/dynamo-store.ts b/src/dynamo/dynamo-store.ts
@@ -28,7 +28,7 @@ export class DynamoStore<T> {
   private readonly logger: Logger
   private readonly dynamoDBWrapper: DynamoDbWrapper
 
-  constructor(private modelClazz: ModelConstructor<T>, dynamoDB?: DynamoDB.DynamoDB) {
+  constructor(private modelClazz: ModelConstructor<T>, dynamoDB: DynamoDB.DynamoDB) {
     this.logger = createLogger('dynamo.DynamoStore', modelClazz)
     this.dynamoDBWrapper = new DynamoDbWrapper(dynamoDB)
     this.tableName = getTableName(modelClazz)
diff --git a/src/dynamo/expression/param-util.ts b/src/dynamo/expression/param-util.ts
@@ -1,7 +1,8 @@
 /**
  * @module expression
  */
-import DynamoDB from '@aws-sdk/client-dynamodb'
+import * as DynamoDB from '@aws-sdk/client-dynamodb'
+import * as DynamoDBv2 from '../../aws-sdk-v2.types'
 import { isEmpty } from '../../helper/is-empty.function'
 import { isString } from '../../helper/is-string.function'
 import { ConditionalParams } from '../operation-params.type'
@@ -26,12 +27,12 @@ export function addExpression(
 ) {
   const nameSafeCondition = resolveAttributeValueNameConflicts(condition, params)
 
-  const expressionAttributeNames = <DynamoDB.ExpressionAttributeNameMap>{
+  const expressionAttributeNames = <DynamoDBv2.ExpressionAttributeNameMap>{
     ...params.ExpressionAttributeNames,
     ...nameSafeCondition.attributeNames,
   }
 
-  const expressionAttributeValues = <DynamoDB.ExpressionAttributeValueMap>{
+  const expressionAttributeValues = <DynamoDBv2.ExpressionAttributeValueMap>{
     ...params.ExpressionAttributeValues,
     ...nameSafeCondition.attributeValues,
   }
diff --git a/src/dynamo/expression/prepare-and-add-update-expressions.function.ts b/src/dynamo/expression/prepare-and-add-update-expressions.function.ts
@@ -21,6 +21,7 @@ export function prepareAndAddUpdateExpressions(
   if (updateDefFns && updateDefFns.length) {
     const sortedByActionKeyWord: Map<UpdateActionKeyword, UpdateExpression[]> = updateDefFns
       .map((updateDefFn) => {
+        // TODO v3: investigate on how to remove any
         return updateDefFn(params.ExpressionAttributeNames, metadata)
       })
       .reduce((result, expr) => {
diff --git a/src/dynamo/operation-params.type.ts b/src/dynamo/operation-params.type.ts
@@ -2,6 +2,7 @@
  * @module dynamo-easy
  */
 import * as DynamoDB from '@aws-sdk/client-dynamodb'
+import * as DynamoDBv2 from '../aws-sdk-v2.types'
 
 /**
  * @hidden
@@ -14,8 +15,8 @@ export interface ConditionalParamsHost {
  * @hidden
  */
 export interface ConditionalParams {
-  expressionAttributeNames?: DynamoDB.ExpressionAttributeNameMap
-  expressionAttributeValues?: DynamoDB.ExpressionAttributeValueMap
+  expressionAttributeNames?: DynamoDBv2.ExpressionAttributeNameMap
+  expressionAttributeValues?: DynamoDBv2.ExpressionAttributeValueMap
   [key: string]: any
 }
 
diff --git a/src/dynamo/request/batchgetsingletable/batch-get-single-table.request.ts b/src/dynamo/request/batchgetsingletable/batch-get-single-table.request.ts
@@ -21,7 +21,7 @@ import { BatchGetSingleTableResponse } from './batch-get-single-table.response'
 export class BatchGetSingleTableRequest<T, T2 extends Partial<T> = T> extends BaseRequest<
   T,
   T2,
-  DynamoDB.BatchGetItemInput,
+  DynamoDB.BatchGetItemInput & { RequestItems: NonNullable<DynamoDB.BatchGetItemInput['RequestItems']> },
   BatchGetSingleTableRequest<T, T2>
 > {
   private readonly logger: Logger
diff --git a/src/dynamo/request/batchgetsingletable/batch-get-single-table.response.ts b/src/dynamo/request/batchgetsingletable/batch-get-single-table.response.ts
@@ -2,6 +2,7 @@
  * @module store-requests
  */
 import * as DynamoDB from '@aws-sdk/client-dynamodb'
+import * as DynamoDBv2 from '../../../aws-sdk-v2.types'
 
 /**
  * Response from {@link BatchGetSingleTableRequest}::exec
@@ -14,9 +15,9 @@ export interface BatchGetSingleTableResponse<T> {
   /**
    * A map of tables and their respective keys that were not processed with the current response. The UnprocessedKeys value is in the same form as RequestItems, so the value can be provided directly to a subsequent BatchGetItem operation. For more information, see RequestItems in the Request Parameters section. Each element consists of:    Keys - An array of primary key attribute values that define specific items in the table.    ProjectionExpression - One or more attributes to be retrieved from the table or index. By default, all attributes are returned. If a requested attribute is not found, it does not appear in the result.    ConsistentRead - The consistency of a read operation. If set to true, then a strongly consistent read is used; otherwise, an eventually consistent read is used.   If there are no unprocessed keys remaining, the response contains an empty UnprocessedKeys map.
    */
-  UnprocessedKeys?: DynamoDB.BatchGetRequestMap
+  UnprocessedKeys?: DynamoDBv2.BatchGetRequestMap
   /**
    * The read capacity units consumed by the entire BatchGetItem operation. Each element consists of:    TableName - The table that consumed the provisioned throughput.    CapacityUnits - The total number of capacity units consumed.
    */
-  ConsumedCapacity?: DynamoDB.ConsumedCapacityMultiple
+  ConsumedCapacity?: DynamoDB.ConsumedCapacity[]
 }
diff --git a/src/dynamo/request/batchwritesingletable/batch-write-single-table.request.ts b/src/dynamo/request/batchwritesingletable/batch-write-single-table.request.ts
@@ -17,7 +17,7 @@ import { BaseRequest } from '../base.request'
 export class BatchWriteSingleTableRequest<T, T2 = T> extends BaseRequest<
   T,
   T2,
-  DynamoDB.BatchWriteItemInput,
+  DynamoDB.BatchWriteItemInput & { RequestItems: NonNullable<DynamoDB.BatchWriteItemInput['RequestItems']> },
   BatchWriteSingleTableRequest<T, T2>
 > {
   private readonly logger: Logger
diff --git a/src/dynamo/request/get/get.request.ts b/src/dynamo/request/get/get.request.ts
@@ -52,6 +52,7 @@ export class GetRequest<T, T2 extends Partial<T> = T> extends StandardRequest<
       .getItem(this.params)
       .then(promiseTap((response) => this.logger.debug('response', response)))
       .then((getItemResponse) => {
+        // TODO v3: investigate on how to remove any
         const response: GetResponse<T2> = { ...getItemResponse }
 
         if (getItemResponse.Item) {
diff --git a/src/dynamo/request/query/query.response.ts b/src/dynamo/request/query/query.response.ts
@@ -2,6 +2,7 @@
  * @module store-requests
  */
 import * as DynamoDB from '@aws-sdk/client-dynamodb'
+import * as DynamoDBv2 from '../../../aws-sdk-v2.types'
 
 /**
  * copied from aws-sdk/clients/dynamoDb QueryOutput but added generics, because we process the items and map them
@@ -15,15 +16,15 @@ export interface QueryResponse<T> {
   /**
    * The number of items in the response. If you used a QueryFilter in the request, then Count is the number of items returned after the filter was applied, and ScannedCount is the number of matching items before the filter was applied. If you did not use a filter in the request, then Count and ScannedCount are the same.
    */
-  Count: DynamoDB.Integer
+  Count: number
   /**
    * The number of items evaluated, before any QueryFilter is applied. A high ScannedCount value with few, or no, Count results indicates an inefficient Query operation. For more information, see Count and ScannedCount in the Amazon DynamoDB Developer Guide. If you did not use a filter in the request, then ScannedCount is the same as Count.
    */
-  ScannedCount?: DynamoDB.Integer
+  ScannedCount?: number
   /**
    * The primary key of the item where the operation stopped, inclusive of the previous result set. Use this value to start a new operation, excluding this value in the new request. If LastEvaluatedKey is empty, then the "last page" of results has been processed and there is no more data to be retrieved. If LastEvaluatedKey is not empty, it does not necessarily mean that there is more data in the result set. The only way to know when you have reached the end of the result set is when LastEvaluatedKey is empty.
    */
-  LastEvaluatedKey?: DynamoDB.Key
+  LastEvaluatedKey?: DynamoDBv2.Key
   /**
    * The capacity units consumed by the Query operation. The data returned includes the total provisioned throughput consumed, along with statistics for the table and any indexes involved in the operation. ConsumedCapacity is only returned if the ReturnConsumedCapacity parameter was specified For more information, see Provisioned Throughput in the Amazon DynamoDB Developer Guide.
    */
diff --git a/src/dynamo/request/read-many.request.ts b/src/dynamo/request/read-many.request.ts
@@ -2,6 +2,7 @@
  * @module store-requests
  */
 import * as DynamoDB from '@aws-sdk/client-dynamodb'
+import * as DynamoDBv2 from '../../aws-sdk-v2.types'
 import { SecondaryIndex } from '../../decorator/impl/index/secondary-index'
 import { fetchAll } from '../../helper/fetch-all.function'
 import { promiseTap } from '../../helper/promise-tap.function'
@@ -58,7 +59,7 @@ export abstract class ReadManyRequest<
    * @param key A map representing the start id which is included in next call, if null is delivered
    * startKey will be removed from params
    */
-  exclusiveStartKey(key: DynamoDB.Key | null): this {
+  exclusiveStartKey(key: DynamoDBv2.Key | null): this {
     // TODO ENHANCEMENT exclusiveStartKey(item: Partial<T>)
     if (key) {
       this.params.ExclusiveStartKey = key
diff --git a/src/dynamo/request/scan/scan.response.ts b/src/dynamo/request/scan/scan.response.ts
diff --git a/src/dynamo/transactget/transact-get-full.response.ts b/src/dynamo/transactget/transact-get-full.response.ts
diff --git a/src/dynamo/transactget/transact-get.request.ts b/src/dynamo/transactget/transact-get.request.ts
diff --git a/src/dynamo/transactwrite/transact-write.request.ts b/src/dynamo/transactwrite/transact-write.request.ts
diff --git a/src/helper/fetch-all.function.ts b/src/helper/fetch-all.function.ts
diff --git a/src/mapper/for-type/base.mapper.ts b/src/mapper/for-type/base.mapper.ts
diff --git a/src/mapper/for-type/collection.mapper.ts b/src/mapper/for-type/collection.mapper.ts
diff --git a/src/mapper/type/attribute-value-type.type.ts b/src/mapper/type/attribute-value-type.type.ts
diff --git a/src/mapper/type/attribute.type.ts b/src/mapper/type/attribute.type.ts
diff --git a/v2-v3-migration.md b/v2-v3-migration.md

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ export interface Config {`
`24`	`24`	`tableNameResolver: TableNameResolver`
`25`	`25`	`/**`
`26`	`26`	`* function called before calling dynamoDB api`
	`27`	`+ * @deprecated v3: should be replaced by using the default middleware stack provided by aws-sdk v3`
`27`	`28`	`*/`
`28`	`29`	`sessionValidityEnsurer: SessionValidityEnsurer`
`29`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`/**`
`2`	`2`	`* @module decorators`
`3`	`3`	`*/`
	`4`	`+import { KeyType } from '@aws-sdk/client-dynamodb'`
`4`	`5`	`import { IndexType } from './index-type.enum'`
`5`	`6`	`import { initOrUpdateIndex } from './util'`
`6`	`7`
`@@ -10,7 +11,7 @@ import { initOrUpdateIndex } from './util'`
`10`	`11`	`export function GSIPartitionKey(indexName: string): PropertyDecorator {`
`11`	`12`	`return (target: any, propertyKey: string \| symbol) => {`
`12`	`13`	`if (typeof propertyKey === 'string') {`
`13`		`- initOrUpdateIndex(IndexType.GSI, { name: indexName, keyType: 'HASH' }, target, propertyKey)`
	`14`	`+ initOrUpdateIndex(IndexType.GSI, { name: indexName, keyType: KeyType.HASH }, target, propertyKey)`
`14`	`15`	`}`
`15`	`16`	`}`
`16`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,13 @@`
`1`	`1`	`/**`
`2`	`2`	`* @module decorators`
`3`	`3`	`*/`
	`4`	`+import { KeyType } from '@aws-sdk/client-dynamodb'`
`4`	`5`	`import { initOrUpdateProperty } from '../property/init-or-update-property.function'`
`5`	`6`
`6`	`7`	`export function SortKey(): PropertyDecorator {`
`7`	`8`	`return (target: any, propertyKey: string \| symbol) => {`
`8`	`9`	`if (typeof propertyKey === 'string') {`
`9`		`- initOrUpdateProperty({ key: { type: 'RANGE' } }, target, propertyKey)`
	`10`	`+ initOrUpdateProperty({ key: { type: KeyType.RANGE } }, target, propertyKey)`
`10`	`11`	`}`
`11`	`12`	`}`
`12`	`13`	`}`