Merge pull request #648 from jeremydaly/use-generators-for-cloning-st…

…ep-as-well

use generators for cloning step as well

src/v1/operations/expression/condition/parser/appendAttributeValue.ts

@@ -1,6 +1,5 @@
 import type { Attribute, AttributeValue } from 'v1/schema'
 import { parseAttributeClonedInput } from 'v1/validation/parseClonedInput'
-import { cloneAttributeInputAndAddDefaults } from 'v1/validation/cloneInputAndAddDefaults'
 
 import type { ConditionParser } from './parser'
 
@@ -14,12 +13,13 @@ export const appendAttributeValue = (
 ): void => {
   const { transform = false } = options
 
-  const clonedInput = cloneAttributeInputAndAddDefaults(
+  const inputParser = parseAttributeClonedInput(
     attribute,
-    expressionAttributeValue as AttributeValue
+    expressionAttributeValue as AttributeValue,
+    { transform }
   )
-  const inputParser = parseAttributeClonedInput(attribute, clonedInput, { transform })
-  inputParser.next()
+  inputParser.next() // cloned
+  inputParser.next() // parsed
   const collapsedInput = inputParser.next().value
 
   const expressionAttributeValueIndex = conditionParser.expressionAttributeValues.push(

src/v1/operations/expression/expressionParser.ts

@@ -107,7 +107,8 @@ export const appendAttributePath = (
       case 'record': {
         const keyAttribute = parentAttribute.keys
         const keyParser = parseAttributeClonedInput(keyAttribute, childAttributeAccessor)
-        keyParser.next()
+        keyParser.next() // cloned
+        keyParser.next() // parsed
         const collapsedKey = keyParser.next().value as string
 
         const expressionAttributeNameIndex = parser.expressionAttributeNames.push(collapsedKey)

src/v1/operations/putItem/putItemParams/parsePutCommandInput.ts

@@ -1,16 +1,18 @@
 import type { EntityV2 } from 'v1/entity'
 import type { Item, RequiredOption } from 'v1/schema'
-import { cloneSchemaInputAndAddDefaults } from 'v1/validation/cloneInputAndAddDefaults'
 import { parseSchemaClonedInput } from 'v1/validation/parseClonedInput'
 
 type EntityPutCommandInputParser = (entity: EntityV2, input: Item) => Generator<Item, Item>
 
 const requiringOptions = new Set<RequiredOption>(['always', 'atLeastOnce'])
 
 export const parseEntityPutCommandInput: EntityPutCommandInputParser = (entity, input) => {
-  const clonedInputWithDefaults = cloneSchemaInputAndAddDefaults(entity.schema, input, {
+  const parser = parseSchemaClonedInput(entity.schema, input, {
+    requiringOptions,
     operationName: 'put'
   })
 
-  return parseSchemaClonedInput(entity.schema, clonedInputWithDefaults, { requiringOptions })
+  parser.next() // cloned
+
+  return parser
 }

src/v1/operations/updateItem/updateItemParams/extension/parseExtension/attribute.ts

@@ -19,18 +19,24 @@ export const parseUpdateExtension: ExtensionParser<UpdateItemInputExtension> = (
   options
 ) => {
   if (input === $REMOVE) {
-    if (attribute.required !== 'never') {
-      throw new DynamoDBToolboxError('parsing.attributeRequired', {
-        message: `Attribute ${attribute.path} is required and cannot be removed`,
-        path: attribute.path
-      })
-    }
-
     return {
       isExtension: true,
       *extensionParser() {
-        yield $REMOVE
-        return $REMOVE
+        const clonedValue: typeof $REMOVE = input
+        yield clonedValue
+
+        if (attribute.required !== 'never') {
+          throw new DynamoDBToolboxError('parsing.attributeRequired', {
+            message: `Attribute ${attribute.path} is required and cannot be removed`,
+            path: attribute.path
+          })
+        }
+
+        const parsedValue: typeof $REMOVE = clonedValue
+        yield parsedValue
+
+        const collapsedValue: typeof $REMOVE = parsedValue
+        return collapsedValue
       }
     }
   }
@@ -39,12 +45,9 @@ export const parseUpdateExtension: ExtensionParser<UpdateItemInputExtension> = (
    * @debt refactor "Maybe we can simply parse a super-extension here, and continue if is(Super)Extension is false. Would be neat."
    */
   if (hasGetOperation(input)) {
-    // Omit parseExtension & requiringOptions for non-extended values
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { parseExtension: _, requiringOptions: __, ...restOptions } = options
-
     return parseReferenceExtension(attribute, input, {
-      ...restOptions,
+      ...options,
+      // Can be a reference
       parseExtension: parseReferenceExtension
     })
   }