@aws-cdk/mixins-preview 2.240.0-alpha.0 → 2.242.0-alpha.0

package/lib/services/aws-cloudformation/cfn-props-mixins.generated.js

@@ -5,9 +5,7 @@ const jsiiDeprecationWarnings = require("../../../.warnings.jsii.js");
 const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /* eslint-disable @stylistic/max-len, eol-last */
 const cdk = require("aws-cdk-lib/core");
-const core = require("../../core");
 const mixins = require("../../mixins");
-const helpers = require("../../util/property-mixins");
 const service = require("aws-cdk-lib/aws-cloudformation");
 /**
  * The `AWS::CloudFormation::CustomResource` resource creates a custom resource.
@@ -23,8 +21,8 @@ const service = require("aws-cdk-lib/aws-cloudformation");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-customresource.html
  */
-class CfnCustomResourcePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnCustomResourcePropsMixin", version: "2.240.0-alpha.0" };
+class CfnCustomResourcePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnCustomResourcePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["serviceTimeout", "serviceToken"];
     props;
     strategy;
@@ -47,7 +45,7 @@ class CfnCustomResourcePropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -60,12 +58,7 @@ class CfnCustomResourcePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnCustomResourcePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnCustomResourcePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnCustomResourcePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -84,8 +77,8 @@ exports.CfnCustomResourcePropsMixin = CfnCustomResourcePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-hookdefaultversion.html
  */
-class CfnHookDefaultVersionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnHookDefaultVersionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnHookDefaultVersionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnHookDefaultVersionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["typeName", "typeVersionArn", "versionId"];
     props;
     strategy;
@@ -108,7 +101,7 @@ class CfnHookDefaultVersionPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -121,12 +114,7 @@ class CfnHookDefaultVersionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnHookDefaultVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnHookDefaultVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnHookDefaultVersionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -141,8 +129,8 @@ exports.CfnHookDefaultVersionPropsMixin = CfnHookDefaultVersionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-hooktypeconfig.html
  */
-class CfnHookTypeConfigPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnHookTypeConfigPropsMixin", version: "2.240.0-alpha.0" };
+class CfnHookTypeConfigPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnHookTypeConfigPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["configuration", "configurationAlias", "typeArn", "typeName"];
     props;
     strategy;
@@ -165,7 +153,7 @@ class CfnHookTypeConfigPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -178,12 +166,7 @@ class CfnHookTypeConfigPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnHookTypeConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnHookTypeConfigPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnHookTypeConfigPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -200,8 +183,8 @@ exports.CfnHookTypeConfigPropsMixin = CfnHookTypeConfigPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-hookversion.html
  */
-class CfnHookVersionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnHookVersionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnHookVersionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnHookVersionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["executionRoleArn", "loggingConfig", "schemaHandlerPackage", "typeName"];
     props;
     strategy;
@@ -224,7 +207,7 @@ class CfnHookVersionPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -237,12 +220,7 @@ class CfnHookVersionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnHookVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnHookVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnHookVersionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -257,8 +235,8 @@ exports.CfnHookVersionPropsMixin = CfnHookVersionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-macro.html
  */
-class CfnMacroPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnMacroPropsMixin", version: "2.240.0-alpha.0" };
+class CfnMacroPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnMacroPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["description", "functionName", "logGroupName", "logRoleArn", "name"];
     props;
     strategy;
@@ -281,7 +259,7 @@ class CfnMacroPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -294,12 +272,7 @@ class CfnMacroPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnMacroPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnMacroPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnMacroPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -318,8 +291,8 @@ exports.CfnMacroPropsMixin = CfnMacroPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-moduledefaultversion.html
  */
-class CfnModuleDefaultVersionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnModuleDefaultVersionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnModuleDefaultVersionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnModuleDefaultVersionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["arn", "moduleName", "versionId"];
     props;
     strategy;
@@ -341,8 +314,11 @@ class CfnModuleDefaultVersionPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnModuleDefaultVersionMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -355,16 +331,18 @@ class CfnModuleDefaultVersionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnModuleDefaultVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnModuleDefaultVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnModuleDefaultVersionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnModuleDefaultVersionPropsMixin = CfnModuleDefaultVersionPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnModuleDefaultVersionMixinProps(props) {
+    const ret = {};
+    if ((props.arn !== undefined))
+        ret.arn = cdk.getRefProperty(props.arn?.moduleVersionRef, 'moduleVersionArn') ?? cdk.ensureStringOrUndefined(props.arn, "arn", "cloudformation.IModuleVersionRef | string");
+    return ret;
+}
 /**
  * The `AWS::CloudFormation::ModuleVersion` resource registers the specified version of the module with the CloudFormation registry.
  *
@@ -379,8 +357,8 @@ exports.CfnModuleDefaultVersionPropsMixin = CfnModuleDefaultVersionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-moduleversion.html
  */
-class CfnModuleVersionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnModuleVersionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnModuleVersionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnModuleVersionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["moduleName", "modulePackage"];
     props;
     strategy;
@@ -403,7 +381,7 @@ class CfnModuleVersionPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -416,12 +394,7 @@ class CfnModuleVersionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnModuleVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnModuleVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnModuleVersionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -447,8 +420,8 @@ exports.CfnModuleVersionPropsMixin = CfnModuleVersionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publictypeversion.html
  */
-class CfnPublicTypeVersionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnPublicTypeVersionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnPublicTypeVersionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnPublicTypeVersionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["arn", "logDeliveryBucket", "publicVersionNumber", "type", "typeName"];
     props;
     strategy;
@@ -471,7 +444,7 @@ class CfnPublicTypeVersionPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -484,12 +457,7 @@ class CfnPublicTypeVersionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPublicTypeVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPublicTypeVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPublicTypeVersionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -506,8 +474,8 @@ exports.CfnPublicTypeVersionPropsMixin = CfnPublicTypeVersionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publisher.html
  */
-class CfnPublisherPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnPublisherPropsMixin", version: "2.240.0-alpha.0" };
+class CfnPublisherPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnPublisherPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["acceptTermsAndConditions", "connectionArn"];
     props;
     strategy;
@@ -530,7 +498,7 @@ class CfnPublisherPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -543,12 +511,7 @@ class CfnPublisherPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPublisherPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPublisherPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPublisherPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -565,8 +528,8 @@ exports.CfnPublisherPropsMixin = CfnPublisherPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-resourcedefaultversion.html
  */
-class CfnResourceDefaultVersionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnResourceDefaultVersionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnResourceDefaultVersionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnResourceDefaultVersionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["typeName", "typeVersionArn", "versionId"];
     props;
     strategy;
@@ -588,8 +551,11 @@ class CfnResourceDefaultVersionPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnResourceDefaultVersionMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -602,16 +568,18 @@ class CfnResourceDefaultVersionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnResourceDefaultVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnResourceDefaultVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnResourceDefaultVersionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnResourceDefaultVersionPropsMixin = CfnResourceDefaultVersionPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnResourceDefaultVersionMixinProps(props) {
+    const ret = {};
+    if ((props.typeVersionArn !== undefined))
+        ret.typeVersionArn = cdk.getRefProperty(props.typeVersionArn?.resourceVersionRef, 'resourceVersionArn') ?? cdk.ensureStringOrUndefined(props.typeVersionArn, "typeVersionArn", "cloudformation.IResourceVersionRef | string");
+    return ret;
+}
 /**
  * The `AWS::CloudFormation::ResourceVersion` resource registers a resource version with the CloudFormation registry.
  *
@@ -630,8 +598,8 @@ exports.CfnResourceDefaultVersionPropsMixin = CfnResourceDefaultVersionPropsMixi
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-resourceversion.html
  */
-class CfnResourceVersionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnResourceVersionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnResourceVersionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnResourceVersionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["executionRoleArn", "loggingConfig", "schemaHandlerPackage", "typeName"];
     props;
     strategy;
@@ -654,7 +622,7 @@ class CfnResourceVersionPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -667,12 +635,7 @@ class CfnResourceVersionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnResourceVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnResourceVersionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnResourceVersionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -729,8 +692,8 @@ exports.CfnResourceVersionPropsMixin = CfnResourceVersionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stack.html
  */
-class CfnStackPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnStackPropsMixin", version: "2.240.0-alpha.0" };
+class CfnStackPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnStackPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["notificationArns", "parameters", "tags", "templateUrl", "timeoutInMinutes"];
     props;
     strategy;
@@ -753,7 +716,7 @@ class CfnStackPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -766,12 +729,7 @@ class CfnStackPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnStackPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnStackPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnStackPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -788,8 +746,8 @@ exports.CfnStackPropsMixin = CfnStackPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stackset.html
  */
-class CfnStackSetPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnStackSetPropsMixin", version: "2.240.0-alpha.0" };
+class CfnStackSetPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnStackSetPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["administrationRoleArn", "autoDeployment", "callAs", "capabilities", "description", "executionRoleName", "managedExecution", "operationPreferences", "parameters", "permissionModel", "stackInstancesGroup", "stackSetName", "tags", "templateBody", "templateUrl"];
     props;
     strategy;
@@ -811,8 +769,11 @@ class CfnStackSetPropsMixin extends core.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnStackSetMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -825,16 +786,20 @@ class CfnStackSetPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnStackSetPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnStackSetPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnStackSetPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnStackSetPropsMixin = CfnStackSetPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnStackSetMixinProps(props) {
+    const ret = {};
+    if ((props.administrationRoleArn !== undefined))
+        ret.administrationRoleArn = cdk.getRefProperty(props.administrationRoleArn?.roleRef, 'roleArn') ?? cdk.ensureStringOrUndefined(props.administrationRoleArn, "administrationRoleArn", "iam.IRoleRef | string");
+    if ((props.executionRoleName !== undefined))
+        ret.executionRoleName = cdk.getRefProperty(props.executionRoleName?.roleRef, 'roleName') ?? cdk.ensureStringOrUndefined(props.executionRoleName, "executionRoleName", "iam.IRoleRef | string");
+    return ret;
+}
 /**
  * The `AWS::CloudFormation::TypeActivation` resource activates a public third-party extension, making it available for use in stack templates.
  *
@@ -845,8 +810,8 @@ exports.CfnStackSetPropsMixin = CfnStackSetPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html
  */
-class CfnTypeActivationPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnTypeActivationPropsMixin", version: "2.240.0-alpha.0" };
+class CfnTypeActivationPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnTypeActivationPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["autoUpdate", "executionRoleArn", "loggingConfig", "majorVersion", "publicTypeArn", "publisherId", "type", "typeName", "typeNameAlias", "versionBump"];
     props;
     strategy;
@@ -869,7 +834,7 @@ class CfnTypeActivationPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -882,12 +847,7 @@ class CfnTypeActivationPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnTypeActivationPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnTypeActivationPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnTypeActivationPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -904,8 +864,8 @@ exports.CfnTypeActivationPropsMixin = CfnTypeActivationPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-waitcondition.html
  */
-class CfnWaitConditionPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnWaitConditionPropsMixin", version: "2.240.0-alpha.0" };
+class CfnWaitConditionPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnWaitConditionPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["count", "handle", "timeout"];
     props;
     strategy;
@@ -928,7 +888,7 @@ class CfnWaitConditionPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -941,12 +901,7 @@ class CfnWaitConditionPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnWaitConditionPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnWaitConditionPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnWaitConditionPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -967,8 +922,8 @@ exports.CfnWaitConditionPropsMixin = CfnWaitConditionPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-waitconditionhandle.html
  */
-class CfnWaitConditionHandlePropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnWaitConditionHandlePropsMixin", version: "2.240.0-alpha.0" };
+class CfnWaitConditionHandlePropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnWaitConditionHandlePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = [];
     props;
     strategy;
@@ -991,7 +946,7 @@ class CfnWaitConditionHandlePropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1004,12 +959,7 @@ class CfnWaitConditionHandlePropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnWaitConditionHandlePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnWaitConditionHandlePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnWaitConditionHandlePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1026,8 +976,8 @@ exports.CfnWaitConditionHandlePropsMixin = CfnWaitConditionHandlePropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-guardhook.html
  */
-class CfnGuardHookPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnGuardHookPropsMixin", version: "2.240.0-alpha.0" };
+class CfnGuardHookPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnGuardHookPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["alias", "executionRole", "failureMode", "hookStatus", "logBucket", "options", "ruleLocation", "stackFilters", "targetFilters", "targetOperations"];
     props;
     strategy;
@@ -1050,7 +1000,7 @@ class CfnGuardHookPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1063,12 +1013,7 @@ class CfnGuardHookPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnGuardHookPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnGuardHookPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnGuardHookPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -1085,8 +1030,8 @@ exports.CfnGuardHookPropsMixin = CfnGuardHookPropsMixin;
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-lambdahook.html
  */
-class CfnLambdaHookPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnLambdaHookPropsMixin", version: "2.240.0-alpha.0" };
+class CfnLambdaHookPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_cloudformation.mixins.CfnLambdaHookPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["alias", "executionRole", "failureMode", "hookStatus", "lambdaFunction", "stackFilters", "targetFilters", "targetOperations"];
     props;
     strategy;
@@ -1109,7 +1054,7 @@ class CfnLambdaHookPropsMixin extends core.Mixin {
             throw error;
         }
         this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -1122,12 +1067,7 @@ class CfnLambdaHookPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnLambdaHookPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnLambdaHookPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnLambdaHookPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

package/lib/services/aws-cloudformation/events.d.ts

@@ -0,0 +1 @@
+export * from './events.generated';