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

package/lib/services/aws-iotsitewise/.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.services.iotsitewise"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.AWS.IoTSiteWise",
-      "packageId": "Amazon.CDK.Mixins.Preview.AWS.IoTSiteWise"
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.IoTSiteWise"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.aws_iotsitewise"

package/lib/services/aws-iotsitewise/.mixins.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.services.iotsitewise.mixins"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.AWS.IoTSiteWise.Mixins",
-      "packageId": "Amazon.CDK.Mixins.Preview.AWS.IoTSiteWise.Mixins"
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.IoTSiteWise.Mixins"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.aws_iotsitewise.mixins"

package/lib/services/aws-iotsitewise/cfn-props-mixins.generated.d.ts

@@ -2,6 +2,7 @@ import * as cdk from "aws-cdk-lib/core";
 import * as constructs from "constructs";
 import * as mixins from "../../mixins";
 import * as service from "aws-cdk-lib/aws-iotsitewise";
+import { aws_iotsitewise as ioTSiteWiseRefs } from "aws-cdk-lib/interfaces";
 /**
  * > The AWS IoT SiteWise Monitor feature will no longer be open to new customers starting November 7, 2025 .
  *
@@ -19,7 +20,7 @@ import * as service from "aws-cdk-lib/aws-iotsitewise";
 export declare class CfnAccessPolicyPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAccessPolicyMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoTSiteWise::AccessPolicy`.
      *
@@ -215,7 +216,7 @@ export interface CfnAccessPolicyMixinProps {
 export declare class CfnAssetPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAssetMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoTSiteWise::Asset`.
      *
@@ -365,7 +366,7 @@ export interface CfnAssetMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-asset.html#cfn-iotsitewise-asset-assetmodelid
      */
-    readonly assetModelId?: string;
+    readonly assetModelId?: ioTSiteWiseRefs.IAssetModelRef | string;
     /**
      * A friendly name for the asset.
      *
@@ -408,7 +409,7 @@ export interface CfnAssetMixinProps {
 export declare class CfnAssetModelPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnAssetModelMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoTSiteWise::AssetModel`.
      *
@@ -1072,7 +1073,7 @@ export interface CfnAssetModelMixinProps {
 export declare class CfnDashboardPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDashboardMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoTSiteWise::Dashboard`.
      *
@@ -1148,7 +1149,7 @@ export interface CfnDashboardMixinProps {
 export declare class CfnGatewayPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnGatewayMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoTSiteWise::Gateway`.
      *
@@ -1336,7 +1337,7 @@ export interface CfnGatewayMixinProps {
 export declare class CfnPortalPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnPortalMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoTSiteWise::Portal`.
      *
@@ -1496,7 +1497,7 @@ export interface CfnPortalMixinProps {
 export declare class CfnProjectPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnProjectMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoTSiteWise::Project`.
      *
@@ -1565,7 +1566,7 @@ export interface CfnProjectMixinProps {
 export declare class CfnComputationModelPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnComputationModelMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoTSiteWise::ComputationModel`.
      *
@@ -1749,7 +1750,7 @@ export interface CfnComputationModelMixinProps {
 export declare class CfnDatasetPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnDatasetMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoTSiteWise::Dataset`.
      *

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

@@ -6,7 +6,6 @@ const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /* eslint-disable @stylistic/max-len, eol-last */
 const cdk = require("aws-cdk-lib/core");
 const mixins = require("../../mixins");
-const helpers = require("../../util/property-mixins");
 const service = require("aws-cdk-lib/aws-iotsitewise");
 /**
  * > The AWS IoT SiteWise Monitor feature will no longer be open to new customers starting November 7, 2025 .
@@ -23,7 +22,7 @@ const service = require("aws-cdk-lib/aws-iotsitewise");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-accesspolicy.html
  */
 class CfnAccessPolicyPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iotsitewise.mixins.CfnAccessPolicyPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iotsitewise.mixins.CfnAccessPolicyPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["accessPolicyIdentity", "accessPolicyPermission", "accessPolicyResource"];
     props;
     strategy;
@@ -46,7 +45,7 @@ class CfnAccessPolicyPropsMixin extends cdk.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
@@ -59,12 +58,7 @@ class CfnAccessPolicyPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAccessPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAccessPolicyPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAccessPolicyPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -80,7 +74,7 @@ exports.CfnAccessPolicyPropsMixin = CfnAccessPolicyPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-asset.html
  */
 class CfnAssetPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iotsitewise.mixins.CfnAssetPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iotsitewise.mixins.CfnAssetPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["assetDescription", "assetExternalId", "assetHierarchies", "assetModelId", "assetName", "assetProperties", "tags"];
     props;
     strategy;
@@ -102,8 +96,11 @@ class CfnAssetPropsMixin extends cdk.Mixin {
             }
             throw error;
         }
-        this.props = props;
-        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.MERGE);
+        this.props = {
+            ...props,
+            ...flattenCfnAssetMixinProps(props)
+        };
+        this.strategy = (options.strategy ?? mixins.PropertyMergeStrategy.combine());
     }
     /**
      * Check if this mixin supports the given construct
@@ -116,16 +113,18 @@ class CfnAssetPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAssetPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAssetPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAssetPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
 exports.CfnAssetPropsMixin = CfnAssetPropsMixin;
+// @ts-ignore TS6133
+function flattenCfnAssetMixinProps(props) {
+    const ret = {};
+    if ((props.assetModelId !== undefined))
+        ret.assetModelId = cdk.getRefProperty(props.assetModelId?.assetModelRef, 'assetModelId') ?? cdk.ensureStringOrUndefined(props.assetModelId, "assetModelId", "iotsitewise.IAssetModelRef | string");
+    return ret;
+}
 /**
  * Creates an asset model from specified property and hierarchy definitions.
  *
@@ -143,7 +142,7 @@ exports.CfnAssetPropsMixin = CfnAssetPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-assetmodel.html
  */
 class CfnAssetModelPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iotsitewise.mixins.CfnAssetModelPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iotsitewise.mixins.CfnAssetModelPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["assetModelCompositeModels", "assetModelDescription", "assetModelExternalId", "assetModelHierarchies", "assetModelName", "assetModelProperties", "assetModelType", "enforcedAssetModelInterfaceRelationships", "tags"];
     props;
     strategy;
@@ -166,7 +165,7 @@ class CfnAssetModelPropsMixin extends cdk.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
@@ -179,12 +178,7 @@ class CfnAssetModelPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnAssetModelPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnAssetModelPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnAssetModelPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -202,7 +196,7 @@ exports.CfnAssetModelPropsMixin = CfnAssetModelPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-dashboard.html
  */
 class CfnDashboardPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iotsitewise.mixins.CfnDashboardPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iotsitewise.mixins.CfnDashboardPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["dashboardDefinition", "dashboardDescription", "dashboardName", "projectId", "tags"];
     props;
     strategy;
@@ -225,7 +219,7 @@ class CfnDashboardPropsMixin extends cdk.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
@@ -238,12 +232,7 @@ class CfnDashboardPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDashboardPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDashboardPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDashboardPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -259,7 +248,7 @@ exports.CfnDashboardPropsMixin = CfnDashboardPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-gateway.html
  */
 class CfnGatewayPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iotsitewise.mixins.CfnGatewayPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iotsitewise.mixins.CfnGatewayPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["gatewayCapabilitySummaries", "gatewayName", "gatewayPlatform", "gatewayVersion", "tags"];
     props;
     strategy;
@@ -282,7 +271,7 @@ class CfnGatewayPropsMixin extends cdk.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
@@ -295,12 +284,7 @@ class CfnGatewayPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnGatewayPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnGatewayPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -320,7 +304,7 @@ exports.CfnGatewayPropsMixin = CfnGatewayPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-portal.html
  */
 class CfnPortalPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iotsitewise.mixins.CfnPortalPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iotsitewise.mixins.CfnPortalPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["alarms", "notificationSenderEmail", "portalAuthMode", "portalContactEmail", "portalDescription", "portalName", "portalType", "portalTypeConfiguration", "roleArn", "tags"];
     props;
     strategy;
@@ -343,7 +327,7 @@ class CfnPortalPropsMixin extends cdk.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
@@ -356,12 +340,7 @@ class CfnPortalPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnPortalPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnPortalPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnPortalPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -381,7 +360,7 @@ exports.CfnPortalPropsMixin = CfnPortalPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-project.html
  */
 class CfnProjectPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iotsitewise.mixins.CfnProjectPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iotsitewise.mixins.CfnProjectPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["assetIds", "portalId", "projectDescription", "projectName", "tags"];
     props;
     strategy;
@@ -404,7 +383,7 @@ class CfnProjectPropsMixin extends cdk.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
@@ -417,12 +396,7 @@ class CfnProjectPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnProjectPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnProjectPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnProjectPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -436,7 +410,7 @@ exports.CfnProjectPropsMixin = CfnProjectPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-computationmodel.html
  */
 class CfnComputationModelPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iotsitewise.mixins.CfnComputationModelPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iotsitewise.mixins.CfnComputationModelPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["computationModelConfiguration", "computationModelDataBinding", "computationModelDescription", "computationModelName", "tags"];
     props;
     strategy;
@@ -459,7 +433,7 @@ class CfnComputationModelPropsMixin extends cdk.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
@@ -472,12 +446,7 @@ class CfnComputationModelPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnComputationModelPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnComputationModelPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnComputationModelPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }
@@ -491,7 +460,7 @@ exports.CfnComputationModelPropsMixin = CfnComputationModelPropsMixin;
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-dataset.html
  */
 class CfnDatasetPropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iotsitewise.mixins.CfnDatasetPropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iotsitewise.mixins.CfnDatasetPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["datasetDescription", "datasetName", "datasetSource", "tags"];
     props;
     strategy;
@@ -514,7 +483,7 @@ class CfnDatasetPropsMixin extends cdk.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
@@ -527,12 +496,7 @@ class CfnDatasetPropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnDatasetPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnDatasetPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnDatasetPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

package/lib/services/aws-iotthingsgraph/.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.services.iotthingsgraph"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.AWS.IoTThingsGraph",
-      "packageId": "Amazon.CDK.Mixins.Preview.AWS.IoTThingsGraph"
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.IoTThingsGraph"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.aws_iotthingsgraph"

package/lib/services/aws-iotthingsgraph/.mixins.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.services.iotthingsgraph.mixins"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.AWS.IoTThingsGraph.Mixins",
-      "packageId": "Amazon.CDK.Mixins.Preview.AWS.IoTThingsGraph.Mixins"
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.IoTThingsGraph.Mixins"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.aws_iotthingsgraph.mixins"

package/lib/services/aws-iotthingsgraph/cfn-props-mixins.generated.d.ts

@@ -13,7 +13,7 @@ import * as service from "aws-cdk-lib/aws-iotthingsgraph";
 export declare class CfnFlowTemplatePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnFlowTemplateMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoTThingsGraph::FlowTemplate`.
      *

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

@@ -6,7 +6,6 @@ const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 /* eslint-disable @stylistic/max-len, eol-last */
 const cdk = require("aws-cdk-lib/core");
 const mixins = require("../../mixins");
-const helpers = require("../../util/property-mixins");
 const service = require("aws-cdk-lib/aws-iotthingsgraph");
 /**
  * http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotthingsgraph-flowtemplate.html.
@@ -17,7 +16,7 @@ const service = require("aws-cdk-lib/aws-iotthingsgraph");
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotthingsgraph-flowtemplate.html
  */
 class CfnFlowTemplatePropsMixin extends cdk.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iotthingsgraph.mixins.CfnFlowTemplatePropsMixin", version: "2.241.0-alpha.0" };
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.aws_iotthingsgraph.mixins.CfnFlowTemplatePropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["compatibleNamespaceVersion", "definition"];
     props;
     strategy;
@@ -40,7 +39,7 @@ class CfnFlowTemplatePropsMixin extends cdk.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
@@ -53,12 +52,7 @@ class CfnFlowTemplatePropsMixin extends cdk.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnFlowTemplatePropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnFlowTemplatePropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnFlowTemplatePropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

package/lib/services/aws-iottwinmaker/.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.services.iottwinmaker"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.AWS.IoTTwinMaker",
-      "packageId": "Amazon.CDK.Mixins.Preview.AWS.IoTTwinMaker"
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.IoTTwinMaker"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.aws_iottwinmaker"

package/lib/services/aws-iottwinmaker/.mixins.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.services.iottwinmaker.mixins"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.AWS.IoTTwinMaker.Mixins",
-      "packageId": "Amazon.CDK.Mixins.Preview.AWS.IoTTwinMaker.Mixins"
+      "namespace": "Amazon.CDK.Mixins.Preview.AWS.IoTTwinMaker.Mixins"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.aws_iottwinmaker.mixins"

package/lib/services/aws-iottwinmaker/cfn-props-mixins.generated.d.ts

@@ -2,6 +2,7 @@ import * as cdk from "aws-cdk-lib/core";
 import * as constructs from "constructs";
 import * as mixins from "../../mixins";
 import * as service from "aws-cdk-lib/aws-iottwinmaker";
+import { aws_iam as iamRefs, aws_s3 as s3Refs } from "aws-cdk-lib/interfaces";
 /**
  * Use the `AWS::IoTTwinMaker::ComponentType` resource to declare a component type.
  *
@@ -13,7 +14,7 @@ import * as service from "aws-cdk-lib/aws-iottwinmaker";
 export declare class CfnComponentTypePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnComponentTypeMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoTTwinMaker::ComponentType`.
      *
@@ -441,7 +442,7 @@ export interface CfnComponentTypeMixinProps {
 export declare class CfnEntityPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnEntityMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoTTwinMaker::Entity`.
      *
@@ -791,7 +792,7 @@ export interface CfnEntityMixinProps {
 export declare class CfnScenePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnSceneMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoTTwinMaker::Scene`.
      *
@@ -870,7 +871,7 @@ export interface CfnSceneMixinProps {
 export declare class CfnSyncJobPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnSyncJobMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoTTwinMaker::SyncJob`.
      *
@@ -935,7 +936,7 @@ export interface CfnSyncJobMixinProps {
 export declare class CfnWorkspacePropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnWorkspaceMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `AWS::IoTTwinMaker::Workspace`.
      *
@@ -971,13 +972,13 @@ export interface CfnWorkspaceMixinProps {
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iottwinmaker-workspace.html#cfn-iottwinmaker-workspace-role
      */
-    readonly role?: string;
+    readonly role?: iamRefs.IRoleRef | string;
     /**
      * The ARN of the S3 bucket where resources associated with the workspace are stored.
      *
      * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iottwinmaker-workspace.html#cfn-iottwinmaker-workspace-s3location
      */
-    readonly s3Location?: string;
+    readonly s3Location?: s3Refs.IBucketRef | string;
     /**
      * Metadata that you can use to manage the workspace.
      *