Minor refactoring

mikebroberts · mikebroberts · commit 092f7dfba4c3 · 2023-09-13T15:32:47.000-04:00
diff --git a/src/lib/internal/common/deleteCommon.ts b/src/lib/internal/common/deleteCommon.ts
@@ -4,7 +4,7 @@ import {
   expressionAttributeParamsFromOptions,
   keyParamFromSource,
   tableNameParam
-} from '../operationsCommon'
+} from './operationsCommon'
 import { DeleteOptions } from '../../singleEntityOperations'
 
 // Also used for generating transaction delete items
diff --git a/src/lib/internal/common/operationsCommon.ts b/src/lib/internal/common/operationsCommon.ts
@@ -1,12 +1,12 @@
-import { DynamoDBValues } from '../entities'
-import { EntityContext } from './entityContext'
-import { Clock, secondsTimestampInFutureDays } from '../util'
+import { DynamoDBValues } from '../../entities'
+import { EntityContext } from '../entityContext'
+import { Clock, secondsTimestampInFutureDays } from '../../util'
 import { DeleteItemOutput } from '@aws-sdk/client-dynamodb'
 import {
   ReturnConsumedCapacityOption,
   ReturnItemCollectionMetricsOption,
   ReturnValuesOptions
-} from '../singleEntityAdvancedOperations'
+} from '../../singleEntityAdvancedOperations'
 
 export interface WithExpression {
   expressionAttributeValues?: DynamoDBValues
diff --git a/src/lib/internal/common/putCommon.ts b/src/lib/internal/common/putCommon.ts
@@ -5,7 +5,7 @@ import {
   determineTTL,
   expressionAttributeParamsFromOptions,
   tableNameParam
-} from '../operationsCommon'
+} from './operationsCommon'
 import { EntityContext } from '../entityContext'
 import { DynamoDBValues, Entity, MetaAttributeNames } from '../../entities'
 import { Mandatory } from '../../util'
diff --git a/src/lib/internal/common/queryAndScanCommon.ts b/src/lib/internal/common/queryAndScanCommon.ts
@@ -1,4 +1,4 @@
-import { parseItem, returnConsumedCapacityParam } from '../operationsCommon'
+import { parseItem, returnConsumedCapacityParam } from './operationsCommon'
 import { DynamoDBValues } from '../../entities'
 import { EntityStoreLogger, isDebugLoggingEnabled, removeNullOrUndefined } from '../../util'
 import {
diff --git a/src/lib/internal/common/updateCommon.ts b/src/lib/internal/common/updateCommon.ts
@@ -7,7 +7,7 @@ import {
   expressionAttributeParamsFromOptions,
   keyParamFromSource,
   tableNameParam
-} from '../operationsCommon'
+} from './operationsCommon'
 import { UpdateCommandInput } from '@aws-sdk/lib-dynamodb'
 import { UpdateOptions } from '../../singleEntityOperations'
 
diff --git a/src/lib/internal/multipleEntities/multipleEntitiesQueryAndScanCommon.ts b/src/lib/internal/multipleEntities/multipleEntitiesQueryAndScanCommon.ts
@@ -1,6 +1,6 @@
 import { EntityContext } from '../entityContext'
 import { MultipleEntityCollectionResponse } from '../../multipleEntityOperations'
-import { parseItem } from '../operationsCommon'
+import { parseItem } from '../common/operationsCommon'
 import {
   commonCollectionResponseElements,
   executeQueryOrScan,
diff --git a/src/lib/internal/multipleEntities/multipleEntityQueryOperations.ts b/src/lib/internal/multipleEntities/multipleEntityQueryOperations.ts
@@ -1,4 +1,4 @@
-import { expressionAttributeParams } from '../operationsCommon'
+import { expressionAttributeParams } from '../common/operationsCommon'
 import { MultipleEntityCollectionResponse } from '../../multipleEntityOperations'
 import { EntityContext } from '../entityContext'
 import { QueryCommandInput } from '@aws-sdk/lib-dynamodb'
diff --git a/src/lib/internal/singleEntity/batchDeleteItems.ts b/src/lib/internal/singleEntity/batchDeleteItems.ts
@@ -1,5 +1,5 @@
 import { EntityContext } from '../entityContext'
-import { keyParamFromSource } from '../operationsCommon'
+import { keyParamFromSource } from '../common/operationsCommon'
 import { batchWrite, createWriteParamsBatches } from './batchWriteCommon'
 import { BatchWriteCommandInput } from '@aws-sdk/lib-dynamodb'
 import { BatchDeleteOptions } from '../../singleEntityAdvancedOperations'
diff --git a/src/lib/internal/singleEntity/batchGetItems.ts b/src/lib/internal/singleEntity/batchGetItems.ts
@@ -1,7 +1,7 @@
 import { EntityContext } from '../entityContext'
 import { chunk, isDebugLoggingEnabled, removeNullOrUndefined } from '../../util'
 import { DEFAULT_AND_MAX_BATCH_READ_SIZE } from './batchWriteCommon'
-import { createKeyFromSource, parseItem, returnConsumedCapacityParam } from '../operationsCommon'
+import { createKeyFromSource, parseItem, returnConsumedCapacityParam } from '../common/operationsCommon'
 import { BatchGetCommandInput, BatchGetCommandOutput } from '@aws-sdk/lib-dynamodb'
 import { AdvancedBatchGetResponse, BatchGetOptions } from '../../singleEntityAdvancedOperations'
 
diff --git a/src/lib/internal/singleEntity/batchWriteCommon.ts b/src/lib/internal/singleEntity/batchWriteCommon.ts
@@ -2,7 +2,7 @@ import { EntityContext } from '../entityContext'
 import { chunk, isDebugLoggingEnabled, removeNullOrUndefined } from '../../util'
 import { BatchWriteCommandInput, BatchWriteCommandOutput } from '@aws-sdk/lib-dynamodb'
 import { DynamoDBValues } from '../../entities'
-import { returnConsumedCapacityParam, returnItemCollectionMetricsParam } from '../operationsCommon'
+import { returnConsumedCapacityParam, returnItemCollectionMetricsParam } from '../common/operationsCommon'
 import {
   AdvancedBatchWriteResponse,
   BatchDeleteOptions,
diff --git a/src/lib/internal/singleEntity/deleteItem.ts b/src/lib/internal/singleEntity/deleteItem.ts
@@ -4,7 +4,7 @@ import { deleteParams } from '../common/deleteCommon'
 import { isDebugLoggingEnabled } from '../../util'
 import { parseAttributesCapacityAndMetrics } from './singleEntityCommon'
 import { AdvancedDeleteOptions, AdvancedDeleteResponse } from '../../singleEntityAdvancedOperations'
-import { returnParamsForCapacityMetricsAndValues } from '../operationsCommon'
+import { returnParamsForCapacityMetricsAndValues } from '../common/operationsCommon'
 
 export async function deleteItem<
   TItem extends TPKSource & TSKSource,
diff --git a/src/lib/internal/singleEntity/getItem.ts b/src/lib/internal/singleEntity/getItem.ts
@@ -3,7 +3,7 @@ import {
   parseItem,
   returnConsumedCapacityParam,
   tableNameParam
-} from '../operationsCommon'
+} from '../common/operationsCommon'
 import { EntityContext } from '../entityContext'
 import { isDebugLoggingEnabled } from '../../util'
 import { GetCommandInput, GetCommandOutput } from '@aws-sdk/lib-dynamodb'
diff --git a/src/lib/internal/singleEntity/putItem.ts b/src/lib/internal/singleEntity/putItem.ts
@@ -4,7 +4,7 @@ import { isDebugLoggingEnabled } from '../../util'
 import { parseAttributesCapacityAndMetrics } from './singleEntityCommon'
 import { AdvancedPutOptions, AdvancedPutResponse } from '../../singleEntityAdvancedOperations'
 import { putParams } from '../common/putCommon'
-import { returnParamsForCapacityMetricsAndValues } from '../operationsCommon'
+import { returnParamsForCapacityMetricsAndValues } from '../common/operationsCommon'
 
 export async function putItem<TItem extends TPKSource & TSKSource, TPKSource, TSKSource>(
   context: EntityContext<TItem, TPKSource, TSKSource>,
diff --git a/src/lib/internal/singleEntity/queryItems.ts b/src/lib/internal/singleEntity/queryItems.ts
@@ -6,7 +6,7 @@ import {
 } from '../common/queryAndScanCommon'
 import { QueryCommandInput } from '@aws-sdk/lib-dynamodb'
 import { AdvancedCollectionResponse, AdvancedQueryOnePageOptions } from '../../singleEntityAdvancedOperations'
-import { expressionAttributeParams } from '../operationsCommon'
+import { expressionAttributeParams } from '../common/operationsCommon'
 import { GsiDetails } from '../common/gsiQueryCommon'
 import { SkQueryRange } from '../../singleEntityOperations'
 
diff --git a/src/lib/internal/singleEntity/singleEntityCommon.ts b/src/lib/internal/singleEntity/singleEntityCommon.ts
@@ -2,7 +2,7 @@ import { DeleteItemOutput } from '@aws-sdk/client-dynamodb'
 import {
   parseConsumedCapacityAndItemCollectionMetrics,
   parseUnparsedReturnedAttributes
-} from '../operationsCommon'
+} from '../common/operationsCommon'
 
 export function parseAttributesCapacityAndMetrics(
   result: Pick<DeleteItemOutput, 'Attributes' | 'ConsumedCapacity' | 'ItemCollectionMetrics'>
diff --git a/src/lib/internal/singleEntity/tableBackedSingleEntityOperations.ts b/src/lib/internal/singleEntity/tableBackedSingleEntityOperations.ts
@@ -1,4 +1,4 @@
-import { CompleteTableParams, createEntityContext, EntityContext } from '../entityContext'
+import { createEntityContext, EntityContext } from '../entityContext'
 import { Entity } from '../../entities'
 import {
   DeleteOptions,
@@ -18,13 +18,15 @@ import {
   UpdateOptions
 } from '../../singleEntityOperations'
 import { tableBackedSingleEntityAdvancedOperations } from './tableBackedSingleEntityAdvancedOperations'
+import { TableResolver } from '../tableBackedConfigurationResolver'
 
 export function tableBackedSingleEntityOperations<TItem extends TPKSource & TSKSource, TPKSource, TSKSource>(
-  table: CompleteTableParams,
+  tableConfigResolver: TableResolver,
   entity: Entity<TItem, TPKSource, TSKSource>
 ): SingleEntityOperations<TItem, TPKSource, TSKSource> {
-  const entityContext: EntityContext<TItem, TPKSource, TSKSource> = createEntityContext(table, entity)
-  const advancedOperations = tableBackedSingleEntityAdvancedOperations(table, entity, entityContext)
+  const table = tableConfigResolver(entity.type),
+    entityContext: EntityContext<TItem, TPKSource, TSKSource> = createEntityContext(table, entity),
+    advancedOperations = tableBackedSingleEntityAdvancedOperations(table, entity, entityContext)
 
   return {
     advancedOperations,
diff --git a/src/lib/internal/singleEntity/updateItem.ts b/src/lib/internal/singleEntity/updateItem.ts
@@ -4,7 +4,7 @@ import { createUpdateParams } from '../common/updateCommon'
 import { UpdateCommandInput } from '@aws-sdk/lib-dynamodb'
 import { parseAttributesCapacityAndMetrics } from './singleEntityCommon'
 import { AdvancedUpdateOptions, AdvancedUpdateResponse } from '../../singleEntityAdvancedOperations'
-import { returnParamsForCapacityMetricsAndValues } from '../operationsCommon'
+import { returnParamsForCapacityMetricsAndValues } from '../common/operationsCommon'
 
 export async function updateItem<
   TItem extends TPKSource & TSKSource,
diff --git a/src/lib/internal/transactions/conditionCheckOperation.ts b/src/lib/internal/transactions/conditionCheckOperation.ts
@@ -1,4 +1,8 @@
-import { expressionAttributeParamsFromOptions, keyParamFromSource, tableNameParam } from '../operationsCommon'
+import {
+  expressionAttributeParamsFromOptions,
+  keyParamFromSource,
+  tableNameParam
+} from '../common/operationsCommon'
 import { EntityContext } from '../entityContext'
 import { DynamoDBValues } from '../../entities'
 import { TransactionConditionCheckOptions } from '../../transactionOperations'
diff --git a/src/lib/internal/transactions/tableBackedGetTransactionBuilder.ts b/src/lib/internal/transactions/tableBackedGetTransactionBuilder.ts
@@ -5,7 +5,7 @@ import {
   parseItem,
   returnConsumedCapacityParam,
   tableNameParam
-} from '../operationsCommon'
+} from '../common/operationsCommon'
 import { TransactGetCommandInput, TransactGetCommandOutput } from '@aws-sdk/lib-dynamodb'
 import { isDebugLoggingEnabled } from '../../util/logger'
 
diff --git a/src/lib/internal/transactions/tableBackedWriteTransactionBuilder.ts b/src/lib/internal/transactions/tableBackedWriteTransactionBuilder.ts
@@ -9,7 +9,7 @@ import {
 import { isDebugLoggingEnabled } from '../../util/logger'
 import { Mandatory } from '../../util/types'
 import { ConditionCheckParams, createTransactionConditionCheckItem } from './conditionCheckOperation'
-import { returnConsumedCapacityParam, returnItemCollectionMetricsParam } from '../operationsCommon'
+import { returnConsumedCapacityParam, returnItemCollectionMetricsParam } from '../common/operationsCommon'
 import {
   TransactionConditionCheckOptions,
   TransactionDeleteOptions,
diff --git a/src/lib/tableBackedStore.ts b/src/lib/tableBackedStore.ts
@@ -21,7 +21,7 @@ export function createStore(config: TableBackedStoreConfiguration): AllEntitiesS
     for<TItem extends TPKSource & TSKSource, TPKSource, TSKSource>(
       entity: Entity<TItem, TPKSource, TSKSource>
     ): SingleEntityOperations<TItem, TPKSource, TSKSource> {
-      return tableBackedSingleEntityOperations(tableConfigResolver(entity.type), entity)
+      return tableBackedSingleEntityOperations(tableConfigResolver, entity)
     },
     forMultiple(entities: Entity<unknown, unknown, unknown>[]): MultipleEntityOperations {
       return tableBackedMultipleEntityOperations(tableConfigResolver, entities)
diff --git a/test/unit/internal/operationsCommon.test.ts b/test/unit/internal/operationsCommon.test.ts
@@ -1,6 +1,6 @@
 import { expect, test } from 'vitest'
 import { FakeClock } from '../fakes/fakeClock'
-import { determineTTL } from '../../../src/lib/internal/operationsCommon'
+import { determineTTL } from '../../../src/lib/internal/common/operationsCommon'
 
 test('determineTTL', () => {
   const clock = new FakeClock()

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { parseItem, returnConsumedCapacityParam } from '../operationsCommon'`
	`1`	`+import { parseItem, returnConsumedCapacityParam } from './operationsCommon'`
`2`	`2`	`import { DynamoDBValues } from '../../entities'`
`3`	`3`	`import { EntityStoreLogger, isDebugLoggingEnabled, removeNullOrUndefined } from '../../util'`
`4`	`4`	`import {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { expressionAttributeParams } from '../operationsCommon'`
	`1`	`+import { expressionAttributeParams } from '../common/operationsCommon'`
`2`	`2`	`import { MultipleEntityCollectionResponse } from '../../multipleEntityOperations'`
`3`	`3`	`import { EntityContext } from '../entityContext'`
`4`	`4`	`import { QueryCommandInput } from '@aws-sdk/lib-dynamodb'`