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

package/NOTICE

@@ -6,111 +6,3 @@ Copyright 2018-2026 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 The AWS CDK includes the following third-party software/licensing:
 
 ----------------
-
-** minimatch - https://www.npmjs.com/package/minimatch
-
-Blue Oak Model License
-
-Version 1.0.0
-
-Purpose
-
-This license gives everyone as much permission to work with
-this software as possible, while protecting contributors
-from liability.
-
-Acceptance
-
-In order to receive this license, you must agree to its
-rules. The rules of this license are both obligations
-under that agreement and conditions to your license.
-You must not do anything with this software that triggers
-a rule that you cannot or will not follow.
-
-Copyright
-
-Each contributor licenses you to do everything with this
-software that would otherwise infringe that contributor's
-copyright in it.
-
-Notices
-
-You must ensure that everyone who gets a copy of
-any part of this software from you, with or without
-changes, also gets the text of this license or a link to
-https://blueoakcouncil.org/license/1.0.0.
-
-Excuse
-
-If anyone notifies you in writing that you have not
-complied with Notices, you can keep your
-license by taking all practical steps to comply within 30
-days after the notice. If you do not do so, your license
-ends immediately.
-
-Patent
-
-Each contributor licenses you to do everything with this
-software that would otherwise infringe any patent claims
-they can license or become able to license.
-
-Reliability
-
-No contributor can revoke this license.
-
-No Liability
-
-As far as the law allows, this software comes as is,
-without any warranty or condition, and no contributor
-will be liable to anyone for any damages related to this
-software or this license, under any kind of legal claim.
-
-----------------
-
-** brace-expansion - https://www.npmjs.com/package/brace-expansion
-Copyright Julian Gruber <julian@juliangruber.com>
-TypeScript port Copyright Isaac Z. Schlueter <i@izs.me>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-----------------
-
-** balanced-match - https://www.npmjs.com/package/balanced-match
-Original code Copyright Julian Gruber <julian@juliangruber.com>
-Port to TypeScript Copyright Isaac Z. Schlueter <i@izs.me>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-----------------

package/README.md

@@ -15,177 +15,38 @@
 
 <!--END STABILITY BANNER-->
 
-This package provides two main features:
-
-1. **Mixins** - Composable abstractions for adding functionality to constructs
-2. **EventBridge Event Patterns** - Type-safe event patterns for AWS resources
+> **Note**: The core Mixins mechanism (`Mixins`, `Mixin`, `IMixin`, `MixinApplicator`, `ConstructSelector`) is now available in `constructs` and `aws-cdk-lib`.
+> All service Mixins are now available in `aws-cdk-lib`.
+> Please update your imports.
+>
+> This package continues to provide **Logs Delivery Mixins** and **EventBridge Event Facades**.
 
 ---
 
-## CDK Mixins
-
 CDK Mixins provide a new, advanced way to add functionality through composable abstractions.
 Unlike traditional L2 constructs that bundle all features together, Mixins allow you to pick and choose exactly the capabilities you need for constructs.
+Mixins can be applied during or after construct construction.
+Mixins are an _addition_, _not_ a replacement for construct properties.
+By itself, they cannot change optionality of properties or change defaults.
 
-### Key Benefits
-
-* **Universal Compatibility**: Apply the same abstractions to L1 constructs, L2 constructs, or custom constructs
-* **Composable Design**: Mix and match features without being locked into specific implementations  
-* **Cross-Service Abstractions**: Use common patterns like encryption across different AWS services
-* **Escape Hatch Freedom**: Customize resources in a safe, typed way while keeping the abstractions you want
-
-### Basic Usage
-
-Mixins use `Mixins.of()` as the fundamental API for applying abstractions to constructs:
-
-```typescript
-// Base form: apply mixins to any construct
-const bucket = new s3.CfnBucket(scope, "MyBucket");
-Mixins.of(bucket)
-  .apply(new EncryptionAtRest())
-  .apply(new AutoDeleteObjects());
-```
-
-#### Fluent Syntax with `.with()`
-
-For convenience, you can use the `.with()` method for a more fluent syntax:
-
-```typescript
-import '@aws-cdk/mixins-preview/with';
-
-const bucket = new s3.CfnBucket(scope, "MyBucket")
-  .with(new BucketVersioning())
-  .with(new AutoDeleteObjects());
-```
-
-The `.with()` method is available after importing `@aws-cdk/mixins-preview/with`, which augments all constructs with this method. It provides the same functionality as `Mixins.of().apply()` but with a more chainable API.
-
-> **Note**: The `.with()` fluent syntax is only available in JavaScript and TypeScript. Other jsii languages (Python, Java, C#, and Go) should use the `Mixins.of(...).requireAll()` syntax instead. The import requirement is temporary during the preview phase. Once the API is stable, the `.with()` method will be available by default on all constructs and in all languages.
-
-### Creating Custom Mixins
-
-Mixins are simple classes that implement the `IMixin` interface (usually by extending the abstract `Mixin` class:
-
-```typescript
-// Simple mixin that enables versioning
-class CustomVersioningMixin extends Mixin implements IMixin {
-  supports(construct: any): boolean {
-    return construct instanceof s3.CfnBucket;
-  }
-
-  applyTo(bucket: any): void {
-    bucket.versioningConfiguration = {
-      status: "Enabled"
-    };
-  }
-}
-
-// Usage
-const bucket = new s3.CfnBucket(scope, "MyBucket");
-Mixins.of(bucket).apply(new CustomVersioningMixin());
-```
-
-### Construct Selection
-
-Mixins operate on construct trees and can be applied selectively:
-
-```typescript
-// Apply to all constructs in a scope
-Mixins.of(scope).apply(new EncryptionAtRest());
-
-// Apply to specific resource types
-Mixins.of(scope, ConstructSelector.resourcesOfType(s3.CfnBucket.CFN_RESOURCE_TYPE_NAME))
-  .apply(new EncryptionAtRest());
+## Usage and documentation
 
-// Apply to constructs matching a path pattern
-Mixins.of(scope, ConstructSelector.byPath("**/*-prod-*/**"))
-  .apply(new ProductionSecurityMixin());
-```
+See the [documentation for CDK Mixins](https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib-readme.html#mixins) in  `aws-cdk-lib`.
 
 ### Built-in Mixins
 
-#### Cross-Service Mixins
-
-**EncryptionAtRest**: Applies encryption to supported AWS resources
-
-```typescript
-// Works across different resource types
-const bucket = new s3.CfnBucket(scope, "Bucket");
-Mixins.of(bucket).apply(new EncryptionAtRest());
-
-const logGroup = new logs.CfnLogGroup(scope, "LogGroup");
-Mixins.of(logGroup).apply(new EncryptionAtRest());
-```
-
-#### S3-Specific Mixins
-
-**AutoDeleteObjects**: Configures automatic object deletion for S3 buckets
-
-```typescript
-const bucket = new s3.CfnBucket(scope, "Bucket");
-Mixins.of(bucket).apply(new AutoDeleteObjects());
-```
-
-**BucketVersioning**: Enables versioning on S3 buckets
-
-```typescript
-const bucket = new s3.CfnBucket(scope, "Bucket");
-Mixins.of(bucket).apply(new BucketVersioning());
-```
-
-**BucketBlockPublicAccess**: Enables blocking public-access on S3 buckets
-
-```typescript
-const bucket = new s3.CfnBucket(scope, "Bucket");
-Mixins.of(bucket).apply(new BucketBlockPublicAccess());
-```
-
-**BucketPolicyStatementsMixin**: Adds IAM policy statements to a bucket policy
-
-```typescript
-declare const bucket: s3.IBucketRef;
-
-const bucketPolicy = new s3.CfnBucketPolicy(scope, "BucketPolicy", {
-  bucket: bucket,
-  policyDocument: new iam.PolicyDocument(),
-});
-Mixins.of(bucketPolicy).apply(new BucketPolicyStatementsMixin([
-  new iam.PolicyStatement({
-    actions: ["s3:GetObject"],
-    resources: ["*"],
-    principals: [new iam.AnyPrincipal()],
-  }),
-]));
-```
-
-#### ECS-Specific Mixins
-
-**ClusterSettings**: Applies one or more cluster settings to ECS clusters
-
-```typescript
-import * as ecs from 'aws-cdk-lib/aws-ecs';
-import { ClusterSettings } from '@aws-cdk/mixins-preview/aws-ecs/mixins';
-
-const cluster = new ecs.CfnCluster(scope, "Cluster");
-Mixins.of(cluster).apply(new ClusterSettings([{
-  name: "containerInsights",
-  value: "enhanced",
-}]));
-```
-
 ### Logs Delivery
 
 Configures vended logs delivery for supported resources to various destinations:
 
 ```typescript
-import '@aws-cdk/mixins-preview/with';
 import * as cloudfrontMixins from '@aws-cdk/mixins-preview/aws-cloudfront/mixins';
 
 // Create CloudFront distribution
-declare const bucket: s3.Bucket;
+declare const origin: s3.IBucket;
 const distribution = new cloudfront.Distribution(scope, 'Distribution', {
   defaultBehavior: {
-    origin: origins.S3BucketOrigin.withOriginAccessControl(bucket),
+    origin: origins.S3BucketOrigin.withOriginAccessControl(origin),
   },
 });
 
@@ -194,20 +55,27 @@ const logGroup = new logs.LogGroup(scope, 'DeliveryLogGroup');
 
 // Configure log delivery using the mixin
 distribution
-  .with(cloudfrontMixins.CfnDistributionLogsMixin.CONNECTION_LOGS.toLogGroup(logGroup));
+  .with(cloudfrontMixins.CfnDistributionLogsMixin.CONNECTION_LOGS.toLogGroup(logGroup, {
+    outputFormat: cloudfrontMixins.CfnDistributionConnectionLogsOutputFormat.LogGroup.JSON,
+    recordFields: [
+      cloudfrontMixins.CfnDistributionConnectionLogsRecordFields.CONNECTIONSTATUS,
+      cloudfrontMixins.CfnDistributionConnectionLogsRecordFields.CLIENTIP,
+      cloudfrontMixins.CfnDistributionConnectionLogsRecordFields.SERVERIP,
+      cloudfrontMixins.CfnDistributionConnectionLogsRecordFields.TLSPROTOCOL,
+    ],
+  }));
 ```
 
 Configures vended logs delivery for supported resources when a pre-created destination is provided:
 
 ```typescript
-import '@aws-cdk/mixins-preview/with';
 import * as cloudfrontMixins from '@aws-cdk/mixins-preview/aws-cloudfront/mixins';
 
 // Create CloudFront distribution
-declare const bucket: s3.Bucket;
+declare const origin: s3.IBucket;
 const distribution = new cloudfront.Distribution(scope, 'Distribution', {
   defaultBehavior: {
-    origin: origins.S3BucketOrigin.withOriginAccessControl(bucket),
+    origin: origins.S3BucketOrigin.withOriginAccessControl(origin),
   },
 });
 
@@ -229,15 +97,59 @@ distribution
   .with(cloudfrontMixins.CfnDistributionLogsMixin.CONNECTION_LOGS.toDestination(destination));
 ```
 
+Vended Logs Configuration for Cross Account delivery (only supported for S3 and Firehose destinations)
+
+```typescript
+import * as logDestinations from '@aws-cdk/mixins-preview/aws-logs';
+import * as cloudfrontMixins from '@aws-cdk/mixins-preview/aws-cloudfront/mixins';
+
+const destinationAccount = '123456789012';
+const sourceAccount = '234567890123';
+const region = 'us-east-1';
+
+const app = new App();
+
+const destStack = new Stack(app, 'destination-stack', {
+  env: {
+    account: destinationAccount,
+    region,
+  },
+});
+
+// Create destination bucket
+const destBucket = new s3.Bucket(destStack, 'DeliveryBucket');
+new logDestinations.S3DeliveryDestination(destStack, 'Destination', {
+  bucket: destBucket,
+  sourceAccountId: sourceAccount,
+});
+
+const sourceStack = new Stack(app, 'source-stack', {
+  env: {
+    account: sourceAccount,
+    region,
+  },
+});
+
+// Create CloudFront distribution
+declare const origin: s3.IBucket;
+const distribution = new cloudfront.Distribution(sourceStack, 'Distribution', {
+  defaultBehavior: {
+    origin: origins.S3BucketOrigin.withOriginAccessControl(origin),
+  },
+});
+
+const destination = logs.CfnDeliveryDestination.fromDeliveryDestinationArn(sourceStack, 'Destination', `arn of Delivery Destination in destinationAccount`);
+
+distribution
+  .with(cloudfrontMixins.CfnDistributionLogsMixin.CONNECTION_LOGS.toDestination(destination));
+```
+
 ### L1 Property Mixins
 
 For every CloudFormation resource, CDK Mixins automatically generates type-safe property mixins. These allow you to apply L1 properties with full TypeScript support:
 
 ```typescript
-import '@aws-cdk/mixins-preview/with';
-
-
-const bucket = new s3.Bucket(scope, "Bucket")
+new s3.Bucket(scope, "Bucket")
   .with(new CfnBucketPropsMixin({
     versioningConfiguration: { status: "Enabled" },
     publicAccessBlockConfiguration: {
@@ -247,45 +159,65 @@ const bucket = new s3.Bucket(scope, "Bucket")
   }));
 ```
 
-Property mixins support two merge strategies:
+Deeply nested properties support cross-service references, such as passing a KMS key for encryption:
 
 ```typescript
-declare const bucket: s3.CfnBucket;
+const key = new kms.Key(scope, "Key");
 
-// MERGE (default): Deep merges properties with existing values
+new s3.Bucket(scope, "Bucket")
+  .with(new CfnBucketPropsMixin({
+    bucketEncryption: {
+      serverSideEncryptionConfiguration: [{
+        serverSideEncryptionByDefault: {
+          sseAlgorithm: "aws:kms",
+          kmsMasterKeyId: key,
+        },
+      }],
+    },
+  }));
+```
+
+Property mixins support two merge strategies:
+
+```typescript
+// COMBINE (default): Deep merges properties with existing values
 Mixins.of(bucket).apply(new CfnBucketPropsMixin(
   { versioningConfiguration: { status: "Enabled" } },
-  { strategy: PropertyMergeStrategy.MERGE }
+  { strategy: PropertyMergeStrategy.combine() }
 ));
 
 // OVERRIDE: Replaces existing property values
 Mixins.of(bucket).apply(new CfnBucketPropsMixin(
   { versioningConfiguration: { status: "Enabled" } },
-  { strategy: PropertyMergeStrategy.OVERRIDE }
+  { strategy: PropertyMergeStrategy.override() }
 ));
 ```
 
-Property mixins are available for all AWS services:
+You can also implement `IMergeStrategy` to define a custom strategy:
 
 ```typescript
-import { CfnLogGroupPropsMixin } from '@aws-cdk/mixins-preview/aws-logs/mixins';
-import { CfnFunctionPropsMixin } from '@aws-cdk/mixins-preview/aws-lambda/mixins';
-import { CfnTablePropsMixin } from '@aws-cdk/mixins-preview/aws-dynamodb/mixins';
-```
+class MyCustomStrategy implements IMergeStrategy {
+  public apply(target: object, source: object, allowedKeys: string[]) {
+    for (const key of allowedKeys) {
+      if (key in source) {
+        (target as any)[key] = (source as any)[key];
+      }
+    }
+  }
+}
 
-### Error Handling
+Mixins.of(bucket).apply(new CfnBucketPropsMixin(
+  { tags: [{ key: 'Extra', value: 'Tag' }] },
+  { strategy: new MyCustomStrategy() }
+));
+```
 
-Mixins provide comprehensive error handling:
+Property mixins are available for all AWS services:
 
 ```typescript
-// Graceful handling of unsupported constructs
-Mixins.of(scope)
-  .apply(new EncryptionAtRest()); // Skips unsupported constructs
-
-// Strict application that requires all constructs to match
-Mixins.of(scope)
-  .requireAll() // Throws if no constructs support the mixin
-  .apply(new EncryptionAtRest());
+import { CfnLogGroupPropsMixin } from '@aws-cdk/mixins-preview/aws-logs/mixins';
+import { CfnFunctionPropsMixin } from '@aws-cdk/mixins-preview/aws-lambda/mixins';
+import { CfnTablePropsMixin } from '@aws-cdk/mixins-preview/aws-dynamodb/mixins';
 ```
 
 ---
@@ -302,8 +234,8 @@ import * as events from 'aws-cdk-lib/aws-events';
 import * as targets from 'aws-cdk-lib/aws-events-targets';
 
 // Works with L2 constructs
-const bucket = new s3.Bucket(scope, 'Bucket');
-const bucketEvents = BucketEvents.fromBucket(bucket);
+const myBucket = new s3.Bucket(scope, 'Bucket');
+const bucketEvents = BucketEvents.fromBucket(myBucket);
 declare const fn: lambda.Function;
 
 new events.Rule(scope, 'Rule', {
@@ -333,7 +265,6 @@ new events.CfnRule(scope, 'CfnRule', {
 ```typescript
 import { BucketEvents } from '@aws-cdk/mixins-preview/aws-s3/events';
 
-declare const bucket: s3.Bucket;
 const bucketEvents = BucketEvents.fromBucket(bucket);
 
 // Bucket name is automatically injected from the bucket reference
@@ -347,7 +278,6 @@ const pattern = bucketEvents.objectCreatedPattern();
 import { BucketEvents } from '@aws-cdk/mixins-preview/aws-s3/events';
 import * as events from 'aws-cdk-lib/aws-events';
 
-declare const bucket: s3.Bucket;
 const bucketEvents = BucketEvents.fromBucket(bucket);
 
 const pattern = bucketEvents.objectCreatedPattern({

package/lib/index.d.ts

@@ -1,3 +1,2 @@
-export * as core from './core';
 export * as mixins from './mixins';
 export * from './services';

package/lib/index.js

@@ -14,7 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mixins = exports.core = void 0;
-exports.core = require("./core");
+exports.mixins = void 0;
 exports.mixins = require("./mixins");
 __exportStar(require("./services"), exports);

package/lib/mixins/property-mixins.d.ts

@@ -1,16 +1,5 @@
-/**
- * Strategy for handling nested properties in L1 property mixins
- */
-export declare enum PropertyMergeStrategy {
-    /**
-     * Override all properties
-     */
-    OVERRIDE = "override",
-    /**
-     * Deep merge nested objects, override primitives and arrays
-     */
-    MERGE = "merge"
-}
+import type { IMergeStrategy } from 'aws-cdk-lib/core';
+export { type IMergeStrategy, PropertyMergeStrategy } from 'aws-cdk-lib/core';
 /**
  * Options for applying CfnProperty mixins
  */
@@ -18,7 +7,7 @@ export interface CfnPropertyMixinOptions {
     /**
      * Strategy for merging nested properties
      *
-     * @default - PropertyMergeStrategy.MERGE
+     * @default - PropertyMergeStrategy.combine()
      */
-    readonly strategy?: PropertyMergeStrategy;
+    readonly strategy?: IMergeStrategy;
 }

package/lib/mixins/property-mixins.js

@@ -1,17 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PropertyMergeStrategy = void 0;
-/**
- * Strategy for handling nested properties in L1 property mixins
- */
-var PropertyMergeStrategy;
-(function (PropertyMergeStrategy) {
-    /**
-     * Override all properties
-     */
-    PropertyMergeStrategy["OVERRIDE"] = "override";
-    /**
-     * Deep merge nested objects, override primitives and arrays
-     */
-    PropertyMergeStrategy["MERGE"] = "merge";
-})(PropertyMergeStrategy || (exports.PropertyMergeStrategy = PropertyMergeStrategy = {}));
+var core_1 = require("aws-cdk-lib/core");
+Object.defineProperty(exports, "PropertyMergeStrategy", { enumerable: true, get: function () { return core_1.PropertyMergeStrategy; } });

package/lib/services/alexa-ask/.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.alexa.ask"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.Alexa.ASK",
-      "packageId": "Amazon.CDK.Mixins.Preview.Alexa.ASK"
+      "namespace": "Amazon.CDK.Mixins.Preview.Alexa.ASK"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.alexa_ask"

package/lib/services/alexa-ask/.mixins.jsiirc.json

@@ -4,8 +4,7 @@
       "package": "software.amazon.awscdk.mixins.preview.alexa.ask.mixins"
     },
     "dotnet": {
-      "namespace": "Amazon.CDK.Mixins.Preview.Alexa.ASK.Mixins",
-      "packageId": "Amazon.CDK.Mixins.Preview.Alexa.ASK.Mixins"
+      "namespace": "Amazon.CDK.Mixins.Preview.Alexa.ASK.Mixins"
     },
     "python": {
       "module": "aws_cdk.mixins_preview.alexa_ask.mixins"

package/lib/services/alexa-ask/cfn-props-mixins.generated.d.ts

@@ -1,6 +1,5 @@
 import * as cdk from "aws-cdk-lib/core";
 import * as constructs from "constructs";
-import * as core from "../../core";
 import * as mixins from "../../mixins";
 import * as service from "aws-cdk-lib/alexa-ask";
 /**
@@ -13,10 +12,10 @@ import * as service from "aws-cdk-lib/alexa-ask";
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ask-skill.html
  */
-export declare class CfnSkillPropsMixin extends core.Mixin implements core.IMixin {
+export declare class CfnSkillPropsMixin extends cdk.Mixin implements constructs.IMixin {
     protected static readonly CFN_PROPERTY_KEYS: Array<string>;
     protected readonly props: CfnSkillMixinProps;
-    protected readonly strategy: mixins.PropertyMergeStrategy;
+    protected readonly strategy: mixins.IMergeStrategy;
     /**
      * Create a mixin to apply properties to `Alexa::ASK::Skill`.
      *

package/lib/services/alexa-ask/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/alexa-ask");
 /**
  * The `Alexa::ASK::Skill` resource creates an Alexa skill that enables customers to access new abilities.
@@ -19,8 +17,8 @@ const service = require("aws-cdk-lib/alexa-ask");
  * @stability external
  * @see http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ask-skill.html
  */
-class CfnSkillPropsMixin extends core.Mixin {
-    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.alexa_ask.mixins.CfnSkillPropsMixin", version: "2.240.0-alpha.0" };
+class CfnSkillPropsMixin extends cdk.Mixin {
+    static [JSII_RTTI_SYMBOL_1] = { fqn: "@aws-cdk/mixins-preview.alexa_ask.mixins.CfnSkillPropsMixin", version: "2.242.0-alpha.0" };
     static CFN_PROPERTY_KEYS = ["authenticationConfiguration", "skillPackage", "vendorId"];
     props;
     strategy;
@@ -43,7 +41,7 @@ class CfnSkillPropsMixin 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
@@ -56,12 +54,7 @@ class CfnSkillPropsMixin extends core.Mixin {
      */
     applyTo(construct) {
         if (this.supports(construct)) {
-            if ((this.strategy === mixins.PropertyMergeStrategy.MERGE)) {
-                helpers.deepMerge(construct, this.props, CfnSkillPropsMixin.CFN_PROPERTY_KEYS);
-            }
-            else {
-                helpers.shallowAssign(construct, this.props, CfnSkillPropsMixin.CFN_PROPERTY_KEYS);
-            }
+            this.strategy.apply(construct, this.props, CfnSkillPropsMixin.CFN_PROPERTY_KEYS);
         }
     }
 }

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

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