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

package/scripts/spec2eventbridge/generate.d.ts

@@ -1,6 +1,6 @@
 import type { GenerateOptions as Spec2CdkOptions } from '@aws-cdk/spec2cdk';
 import { EventBridgeBuilder } from './builder';
-import { type ModuleMap } from '@aws-cdk/spec2cdk/lib/module-topology';
+import type { GeneratorResult } from '@aws-cdk/spec2cdk/lib/module-topology';
 type GenerateOptions = Pick<Spec2CdkOptions<typeof EventBridgeBuilder>, 'outputPath' | 'clearOutput' | 'debug'>;
-export declare function generateAll(options: GenerateOptions): Promise<ModuleMap>;
+export declare function generateAll(options: GenerateOptions): Promise<GeneratorResult>;
 export {};

package/scripts/spec2eventbridge/generate.js

@@ -25,15 +25,22 @@ async function generateAll(options) {
         db,
         astBuilder: builder_1.EventBridgeBuilder,
     });
-    return Object.fromEntries(Object.entries(generated.modules).map(([moduleName, moduleInfo]) => [
-        moduleName,
-        {
-            files: moduleInfo.outputFiles,
-            name: moduleName,
-            resources: moduleInfo.resources,
-            scopes: moduleMap[moduleName]?.scopes ?? [],
-            definition: moduleMap[moduleName]?.definition,
-            targets: moduleMap[moduleName]?.targets,
-        },
-    ]));
+    return {
+        moduleMap: Object.fromEntries(Object.entries(generated.modules).map(([moduleName, moduleInfo]) => [
+            moduleName,
+            {
+                files: moduleInfo.outputFiles,
+                name: moduleName,
+                resources: moduleInfo.resources,
+                scopes: moduleMap[moduleName]?.scopes ?? [],
+                definition: moduleMap[moduleName]?.definition,
+                targets: moduleMap[moduleName]?.targets,
+            },
+        ])),
+        contributions: [{
+                barrelFile: 'events.ts',
+                exportLines: ["export * from './events.generated';"],
+                jsiircNamespace: 'events',
+            }],
+    };
 }

package/scripts/spec2logs/builder.js

@@ -7,7 +7,6 @@ const typewriter_1 = require("@cdklabs/typewriter");
 const helpers_1 = require("./helpers");
 const service_submodule_1 = require("@aws-cdk/spec2cdk/lib/cdk/service-submodule");
 const library_builder_1 = require("@aws-cdk/spec2cdk/lib/cdk/library-builder");
-const helpers_2 = require("../spec2mixins/helpers");
 const reference_props_1 = require("@aws-cdk/spec2cdk/lib/cdk/reference-props");
 class LogsDeliveryBuilderServiceModule extends service_submodule_1.BaseServiceSubmodule {
     constructLibModule;
@@ -55,7 +54,6 @@ class LogsDeliveryBuilder extends library_builder_1.LibraryBuilder {
         cdk_1.CDK_CORE.import(module, 'cdk');
         cdk_1.CDK_INTERFACES.import(module, 'interfaces');
         cdk_1.CONSTRUCTS.import(module, 'constructs');
-        helpers_2.MIXINS_CORE.import(module, 'core', { fromLocation: (0, service_submodule_1.relativeImportPath)(filePath, '../core') });
         helpers_1.MIXINS_LOGS_DELIVERY.import(module, 'logsDelivery', { fromLocation: '../aws-logs/logs-delivery' });
         submodule.constructLibModule.import(module, 'service');
         return { module, filePath };
@@ -103,6 +101,26 @@ class LogsHelper extends typewriter_1.ClassType {
         this.log = log;
     }
     build(mixin) {
+        const logsNamespace = new typewriter_1.ClassType(this.scope, {
+            name: `${this.name}OutputFormat`,
+            export: true,
+            docs: {
+                summary: `Output Format options for each destination of ${this.name}.`,
+            },
+        });
+        let recordFields;
+        if (this.log.optionalFields || this.log.mandatoryFields) {
+            recordFields = new typewriter_1.EnumType(this.scope, {
+                name: `${this.name}RecordFields`,
+                export: true,
+            });
+            if (this.log.optionalFields && this.log.optionalFields.length > 0) {
+                populateRecordFieldsEnum(this.log.optionalFields, recordFields);
+            }
+            if (this.log.mandatoryFields && this.log.mandatoryFields.length > 0) {
+                populateRecordFieldsEnum(this.log.mandatoryFields, recordFields);
+            }
+        }
         for (const dest of this.log.destinations) {
             switch (dest.destinationType) {
                 case 'S3':
@@ -117,13 +135,62 @@ class LogsHelper extends typewriter_1.ClassType {
                         name: 'bucket',
                         type: cdk_1.CDK_INTERFACES.IBucketRef,
                     });
+                    const s3Props = new typewriter_1.InterfaceType(this.scope, {
+                        name: `${this.name}S3Props`,
+                        export: true,
+                        properties: [{
+                                name: 'encryptionKey',
+                                type: cdk_1.CDK_INTERFACES.IKeyRef,
+                                optional: true,
+                                immutable: true,
+                                docs: {
+                                    summary: 'Encrpytion key for your delivery bucket',
+                                },
+                            }],
+                    });
+                    if (dest.outputFormats && dest.outputFormats.length > 0) {
+                        const s3OutputFormat = new typewriter_1.EnumType(logsNamespace, {
+                            name: 'S3',
+                            export: true,
+                        });
+                        for (const format of dest.outputFormats) {
+                            s3OutputFormat.addMember({ name: format.toUpperCase(), value: format });
+                        }
+                        s3Props.addProperty({
+                            name: 'outputFormat',
+                            type: s3OutputFormat.type,
+                            optional: true,
+                            immutable: true,
+                            docs: {
+                                summary: `Format for log output, options are ${dest.outputFormats.join(',')}`,
+                            },
+                        });
+                    }
+                    if (recordFields) {
+                        s3Props.addProperty({
+                            name: 'recordFields',
+                            type: typewriter_1.Type.arrayOf(recordFields.type),
+                            optional: true,
+                            immutable: true,
+                            docs: {
+                                summary: 'Record fields that can be provided to a log delivery',
+                            },
+                        });
+                    }
                     toS3.addParameter({
                         name: 'props',
-                        type: helpers_1.MIXINS_LOGS_DELIVERY.S3LogsDestinationProps,
+                        type: s3Props.type,
                         optional: true,
+                        documentation: 'Additional properties that are optionally used in log delivery for S3 destinations',
                     });
                     const permissions = this.log.permissionsVersion === 'V2' ? helpers_1.MIXINS_LOGS_DELIVERY.S3LogsDeliveryPermissionsVersion.V2 : helpers_1.MIXINS_LOGS_DELIVERY.S3LogsDeliveryPermissionsVersion.V1;
-                    toS3.addBody(typewriter_1.stmt.block(typewriter_1.stmt.ret(mixin.newInstance(typewriter_1.expr.str(this.log.logType), new typewriter_1.NewExpression(helpers_1.MIXINS_LOGS_DELIVERY.S3LogsDelivery, paramS3, typewriter_1.expr.object({ permissionsVersion: permissions, kmsKey: typewriter_1.expr.directCode('(props && props.encryptionKey) ? props.encryptionKey : undefined') }))))));
+                    toS3.addBody(typewriter_1.stmt.block(typewriter_1.stmt.ret(mixin.newInstance(typewriter_1.expr.str(this.log.logType), new typewriter_1.NewExpression(helpers_1.MIXINS_LOGS_DELIVERY.S3LogsDelivery, paramS3, typewriter_1.expr.object({
+                        permissionsVersion: permissions,
+                        kmsKey: typewriter_1.expr.directCode('props?.encryptionKey'),
+                        outputFormat: typewriter_1.expr.directCode('props?.outputFormat'),
+                        providedFields: recordFields ? typewriter_1.expr.directCode('props?.recordFields') : typewriter_1.expr.UNDEFINED,
+                        mandatoryFields: this.log.mandatoryFields ? typewriter_1.expr.directCode(JSON.stringify(this.log.mandatoryFields)) : typewriter_1.expr.UNDEFINED,
+                    }))))));
                     break;
                 case 'CWL':
                     const toCWL = this.addMethod({
@@ -137,7 +204,54 @@ class LogsHelper extends typewriter_1.ClassType {
                         name: 'logGroup',
                         type: cdk_1.CDK_INTERFACES.ILogGroupRef,
                     });
-                    toCWL.addBody(typewriter_1.stmt.block(typewriter_1.stmt.ret(mixin.newInstance(typewriter_1.expr.str(this.log.logType), new typewriter_1.NewExpression(helpers_1.MIXINS_LOGS_DELIVERY.LogGroupLogsDelivery, paramCWL)))));
+                    const hasLogGroupOutputFormats = dest.outputFormats && dest.outputFormats.length > 0;
+                    const hasLogGroupProps = hasLogGroupOutputFormats || recordFields;
+                    if (hasLogGroupProps) {
+                        const logGroupProps = new typewriter_1.InterfaceType(this.scope, {
+                            name: `${this.name}LogGroupProps`,
+                            export: true,
+                        });
+                        if (hasLogGroupOutputFormats) {
+                            const lgOutputFormat = new typewriter_1.EnumType(logsNamespace, {
+                                name: 'LogGroup',
+                                export: true,
+                            });
+                            for (const format of dest.outputFormats) {
+                                lgOutputFormat.addMember({ name: format.toUpperCase(), value: format });
+                            }
+                            logGroupProps.addProperty({
+                                name: 'outputFormat',
+                                type: lgOutputFormat.type,
+                                optional: true,
+                                immutable: true,
+                                docs: {
+                                    summary: `Format for log output, options are ${dest.outputFormats.join(',')}`,
+                                },
+                            });
+                        }
+                        if (recordFields) {
+                            logGroupProps.addProperty({
+                                name: 'recordFields',
+                                type: typewriter_1.Type.arrayOf(recordFields.type),
+                                optional: true,
+                                immutable: true,
+                                docs: {
+                                    summary: 'Record fields that can be provided to a log delivery',
+                                },
+                            });
+                        }
+                        toCWL.addParameter({
+                            name: 'props',
+                            type: logGroupProps.type,
+                            optional: true,
+                            documentation: 'Additional properties that are optionally used in log delivery for Log Group destinations',
+                        });
+                    }
+                    toCWL.addBody(typewriter_1.stmt.block(typewriter_1.stmt.ret(mixin.newInstance(typewriter_1.expr.str(this.log.logType), new typewriter_1.NewExpression(helpers_1.MIXINS_LOGS_DELIVERY.LogGroupLogsDelivery, paramCWL, typewriter_1.expr.object({
+                        outputFormat: typewriter_1.expr.directCode('props?.outputFormat'),
+                        providedFields: recordFields ? typewriter_1.expr.directCode('props?.recordFields') : typewriter_1.expr.UNDEFINED,
+                        mandatoryFields: this.log.mandatoryFields ? typewriter_1.expr.directCode(JSON.stringify(this.log.mandatoryFields)) : typewriter_1.expr.UNDEFINED,
+                    }))))));
                     break;
                 case 'FH':
                     const toFH = this.addMethod({
@@ -151,7 +265,54 @@ class LogsHelper extends typewriter_1.ClassType {
                         name: 'deliveryStream',
                         type: cdk_1.CDK_INTERFACES.IDeliveryStreamRef,
                     });
-                    toFH.addBody(typewriter_1.stmt.block(typewriter_1.stmt.ret(mixin.newInstance(typewriter_1.expr.str(this.log.logType), new typewriter_1.NewExpression(helpers_1.MIXINS_LOGS_DELIVERY.FirehoseLogsDelivery, paramFH)))));
+                    const hasFirehoseOutputFormats = dest.outputFormats && dest.outputFormats.length > 0;
+                    const hasFirehoseProps = hasFirehoseOutputFormats || recordFields;
+                    if (hasFirehoseProps) {
+                        const firehoseProps = new typewriter_1.InterfaceType(this.scope, {
+                            name: `${this.name}FirehoseProps`,
+                            export: true,
+                        });
+                        if (hasFirehoseOutputFormats) {
+                            const fhOutputFormat = new typewriter_1.EnumType(logsNamespace, {
+                                name: 'Firehose',
+                                export: true,
+                            });
+                            for (const format of dest.outputFormats) {
+                                fhOutputFormat.addMember({ name: format.toUpperCase(), value: format });
+                            }
+                            firehoseProps.addProperty({
+                                name: 'outputFormat',
+                                type: fhOutputFormat.type,
+                                optional: true,
+                                immutable: true,
+                                docs: {
+                                    summary: `Format for log output, options are ${dest.outputFormats.join(',')}`,
+                                },
+                            });
+                        }
+                        if (recordFields) {
+                            firehoseProps.addProperty({
+                                name: 'recordFields',
+                                type: typewriter_1.Type.arrayOf(recordFields.type),
+                                optional: true,
+                                immutable: true,
+                                docs: {
+                                    summary: 'Record fields that can be provided to a log delivery',
+                                },
+                            });
+                        }
+                        toFH.addParameter({
+                            name: 'props',
+                            type: firehoseProps.type,
+                            optional: true,
+                            documentation: 'Additional properties that are optionally used in log delivery for Firehose destinations',
+                        });
+                    }
+                    toFH.addBody(typewriter_1.stmt.block(typewriter_1.stmt.ret(mixin.newInstance(typewriter_1.expr.str(this.log.logType), new typewriter_1.NewExpression(helpers_1.MIXINS_LOGS_DELIVERY.FirehoseLogsDelivery, paramFH, typewriter_1.expr.object({
+                        outputFormat: typewriter_1.expr.directCode('props?.outputFormat'),
+                        providedFields: recordFields ? typewriter_1.expr.directCode('props?.recordFields') : typewriter_1.expr.UNDEFINED,
+                        mandatoryFields: this.log.mandatoryFields ? typewriter_1.expr.directCode(JSON.stringify(this.log.mandatoryFields)) : typewriter_1.expr.UNDEFINED,
+                    }))))));
                     break;
                 default:
                     const toXRAY = this.addMethod({
@@ -161,7 +322,31 @@ class LogsHelper extends typewriter_1.ClassType {
                             summary: 'Send traces to X-Ray',
                         },
                     });
-                    toXRAY.addBody(typewriter_1.stmt.block(typewriter_1.stmt.ret(mixin.newInstance(typewriter_1.expr.str(this.log.logType), new typewriter_1.NewExpression(helpers_1.MIXINS_LOGS_DELIVERY.XRayLogsDelivery)))));
+                    if (recordFields) {
+                        const xrayProps = new typewriter_1.InterfaceType(this.scope, {
+                            name: `${this.name}XRayProps`,
+                            export: true,
+                        });
+                        xrayProps.addProperty({
+                            name: 'recordFields',
+                            type: typewriter_1.Type.arrayOf(recordFields.type),
+                            optional: true,
+                            immutable: true,
+                            docs: {
+                                summary: 'Record fields that can be provided to a log delivery',
+                            },
+                        });
+                        toXRAY.addParameter({
+                            name: 'props',
+                            type: xrayProps.type,
+                            optional: true,
+                            documentation: 'Additional properties that are optionally used in log delivery for XRay destinations',
+                        });
+                    }
+                    toXRAY.addBody(typewriter_1.stmt.block(typewriter_1.stmt.ret(mixin.newInstance(typewriter_1.expr.str(this.log.logType), new typewriter_1.NewExpression(helpers_1.MIXINS_LOGS_DELIVERY.XRayLogsDelivery, typewriter_1.expr.object({
+                        providedFields: recordFields ? typewriter_1.expr.directCode('props?.recordFields') : typewriter_1.expr.UNDEFINED,
+                        mandatoryFields: this.log.mandatoryFields ? typewriter_1.expr.directCode(JSON.stringify(this.log.mandatoryFields)) : typewriter_1.expr.UNDEFINED,
+                    }))))));
                     break;
             }
         }
@@ -179,7 +364,31 @@ class LogsHelper extends typewriter_1.ClassType {
             name: 'destination',
             type: cdk_1.CDK_INTERFACES.IDeliveryDestinationRef,
         });
-        toDest.addBody(typewriter_1.stmt.block(typewriter_1.stmt.ret(mixin.newInstance(typewriter_1.expr.str(this.log.logType), new typewriter_1.NewExpression(helpers_1.MIXINS_LOGS_DELIVERY.DestLogsDelivery, paramDest)))));
+        if (recordFields) {
+            const destProps = new typewriter_1.InterfaceType(this.scope, {
+                name: `${this.name}DestProps`,
+                export: true,
+            });
+            destProps.addProperty({
+                name: 'recordFields',
+                type: typewriter_1.Type.arrayOf(recordFields.type),
+                optional: true,
+                immutable: true,
+                docs: {
+                    summary: 'Record fields that can be provided to a log delivery',
+                },
+            });
+            toDest.addParameter({
+                name: 'props',
+                type: destProps.type,
+                optional: true,
+                documentation: 'Additional properties that are optionally used in log delivery for destinations',
+            });
+        }
+        toDest.addBody(typewriter_1.stmt.block(typewriter_1.stmt.ret(mixin.newInstance(typewriter_1.expr.str(this.log.logType), new typewriter_1.NewExpression(helpers_1.MIXINS_LOGS_DELIVERY.DestLogsDelivery, paramDest, typewriter_1.expr.object({
+            providedFields: recordFields ? typewriter_1.expr.directCode('props?.recordFields') : typewriter_1.expr.UNDEFINED,
+            mandatoryFields: this.log.mandatoryFields ? typewriter_1.expr.directCode(JSON.stringify(this.log.mandatoryFields)) : typewriter_1.expr.UNDEFINED,
+        }))))));
         mixin.addProperty({
             name: this.log.logType,
             type: this.type,
@@ -197,8 +406,8 @@ class LogsMixin extends typewriter_1.ClassType {
         super(scope, {
             export: true,
             name: `${spec2cdk_1.naming.classNameFromResource(resource)}LogsMixin`,
-            implements: [helpers_2.MIXINS_CORE.IMixin],
-            extends: helpers_2.MIXINS_CORE.Mixin,
+            implements: [cdk_1.CONSTRUCTS.IMixin],
+            extends: cdk_1.CDK_CORE.Mixin,
             docs: {
                 summary: `Mixin to implement vended logs for ${resource.cloudFormationType}`,
                 ...spec2cdk_1.util.splitDocumentation(resource.documentation),
@@ -288,3 +497,10 @@ class LogsMixin extends typewriter_1.ClassType {
             .then(typewriter_1.stmt.block(typewriter_1.stmt.ret())), typewriter_1.stmt.constVar(sourceArn, arnBuilder), typewriter_1.$this.logDelivery.callMethod('bind', resource, typewriter_1.$this.logType, sourceArn));
     }
 }
+function populateRecordFieldsEnum(fieldArray, recordFields) {
+    for (let field of fieldArray) {
+        // field names must be valid typescript identifiers, which means they cannot have a number as their first character and the only special character they can have are $ or _
+        const fieldName = field.match(/^(\d+)/) ? '_' + field : field;
+        recordFields.addMember({ name: fieldName.split(/[^a-zA-Z0-9$_]+/).join('_').toUpperCase(), value: field });
+    }
+}

package/scripts/spec2logs/generate.d.ts

@@ -1,6 +1,6 @@
 import type { GenerateOptions as Spec2CdkOptions } from '@aws-cdk/spec2cdk';
 import { LogsDeliveryBuilder } from './builder';
-import { type ModuleMap } from '@aws-cdk/spec2cdk/lib/module-topology';
+import type { GeneratorResult } from '@aws-cdk/spec2cdk/lib/module-topology';
 type GenerateOptions = Pick<Spec2CdkOptions<typeof LogsDeliveryBuilder>, 'outputPath' | 'clearOutput' | 'debug'>;
-export declare function generateAll(options: GenerateOptions): Promise<ModuleMap>;
+export declare function generateAll(options: GenerateOptions): Promise<GeneratorResult>;
 export {};

package/scripts/spec2logs/generate.js

@@ -12,7 +12,6 @@ async function generateAll(options) {
         packageBases: config_1.MIXINS_PREVIEW_BASE_NAMES,
     });
     const moduleRequests = {};
-    // request all known services
     for (const service of services) {
         if (moduleMap[service.name]) {
             moduleRequests[service.name] = {
@@ -25,15 +24,22 @@ async function generateAll(options) {
         db,
         astBuilder: builder_1.LogsDeliveryBuilder,
     });
-    return Object.fromEntries(Object.entries(generated.modules).map(([moduleName, moduleInfo]) => [
-        moduleName,
-        {
-            files: moduleInfo.outputFiles,
-            name: moduleName,
-            resources: moduleInfo.resources,
-            scopes: moduleMap[moduleName]?.scopes ?? [],
-            definition: moduleMap[moduleName]?.definition,
-            targets: moduleMap[moduleName]?.targets,
-        },
-    ]));
+    return {
+        moduleMap: Object.fromEntries(Object.entries(generated.modules).map(([moduleName, moduleInfo]) => [
+            moduleName,
+            {
+                files: moduleInfo.outputFiles,
+                name: moduleName,
+                resources: moduleInfo.resources,
+                scopes: moduleMap[moduleName]?.scopes ?? [],
+                definition: moduleMap[moduleName]?.definition,
+                targets: moduleMap[moduleName]?.targets,
+            },
+        ])),
+        contributions: [{
+                barrelFile: 'mixins.ts',
+                exportLines: ["export * from './logs-delivery-mixins.generated';"],
+                jsiircNamespace: 'mixins',
+            }],
+    };
 }

package/scripts/spec2logs/helpers.d.ts

@@ -7,7 +7,6 @@ declare class MixinsLogsDelivery extends ExternalModule {
     readonly DestLogsDelivery: Type;
     readonly ILogsDelivery: Type;
     readonly S3LogsDeliveryPermissionsVersion: import("@cdklabs/typewriter").TypeExpressionProxy<Type>;
-    readonly S3LogsDestinationProps: Type;
 }
 export declare const MIXINS_LOGS_DELIVERY: MixinsLogsDelivery;
 export {};

package/scripts/spec2logs/helpers.js

@@ -10,6 +10,5 @@ class MixinsLogsDelivery extends typewriter_1.ExternalModule {
     DestLogsDelivery = typewriter_1.Type.fromName(this, 'DestinationLogsDelivery');
     ILogsDelivery = typewriter_1.Type.fromName(this, 'ILogsDelivery');
     S3LogsDeliveryPermissionsVersion = (0, typewriter_1.$T)(typewriter_1.Type.fromName(this, 'S3LogsDeliveryPermissionsVersion'));
-    S3LogsDestinationProps = typewriter_1.Type.fromName(this, 'IS3LogsDestinationProps');
 }
 exports.MIXINS_LOGS_DELIVERY = new MixinsLogsDelivery('@aws-cdk/mixins-preview/services/aws-logs');

package/scripts/spec2mixins/index.d.ts

@@ -1,2 +1,6 @@
-export * from './builder';
-export * from './generate';
+import { cfnPropMixins } from '@aws-cdk/spec2cdk';
+import type { GeneratorResult } from '@aws-cdk/spec2cdk/lib/module-topology';
+export { MixinsBuilder } from '@aws-cdk/spec2cdk/lib/cfn-prop-mixins';
+export type { MixinsBuilderProps } from '@aws-cdk/spec2cdk/lib/cfn-prop-mixins';
+type GenerateOptions = Pick<cfnPropMixins.MixinsGenerateOptions, 'outputPath' | 'clearOutput' | 'debug'>;
+export declare function generateAll(options: GenerateOptions): Promise<GeneratorResult>;

package/scripts/spec2mixins/index.js

@@ -1,18 +1,12 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-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 });
-__exportStar(require("./builder"), exports);
-__exportStar(require("./generate"), exports);
+exports.MixinsBuilder = void 0;
+exports.generateAll = generateAll;
+// Thin wrapper — the implementation lives in @aws-cdk/spec2cdk
+const spec2cdk_1 = require("@aws-cdk/spec2cdk");
+const config_1 = require("../config");
+var cfn_prop_mixins_1 = require("@aws-cdk/spec2cdk/lib/cfn-prop-mixins");
+Object.defineProperty(exports, "MixinsBuilder", { enumerable: true, get: function () { return cfn_prop_mixins_1.MixinsBuilder; } });
+async function generateAll(options) {
+    return spec2cdk_1.cfnPropMixins.generateAll({ ...options, packageBases: config_1.MIXINS_PREVIEW_BASE_NAMES });
+}

package/lib/core/applicator.d.ts

@@ -1,63 +0,0 @@
-import type { IConstruct } from 'constructs';
-import type { IMixin } from './mixins';
-import { type IConstructSelector } from './selectors';
-/**
- * Represents a successful mixin application.
- */
-export interface MixinApplication {
-    /**
-     * The construct the mixin was applied to.
-     */
-    readonly construct: IConstruct;
-    /**
-     * The mixin that was applied.
-     */
-    readonly mixin: IMixin;
-}
-/**
- * Applies mixins to constructs.
- */
-export declare class MixinApplicator {
-    private readonly scope;
-    private readonly selector;
-    private readonly applications;
-    private expectAll;
-    private expectAny;
-    /**
-     * The constructs that match the selector in the given scope.
-     */
-    get selectedConstructs(): IConstruct[];
-    /**
-     * Returns the successful mixin applications.
-     */
-    get report(): MixinApplication[];
-    constructor(scope: IConstruct, selector?: IConstructSelector);
-    /**
-     * Applies a mixin to selected constructs.
-     */
-    apply(...mixins: IMixin[]): this;
-    /**
-     * Requires all selected constructs to support the applied mixins.
-     *
-     * Will only check for future call of `apply()`.
-     * Set this before calling `apply()` to take effect.
-     *
-     * @example
-     * Mixins.of(scope)
-     *   .requireAll()
-     *   .apply(new MyMixin());
-     */
-    requireAll(): this;
-    /**
-     * Requires at least one mixin to be successfully applied.
-     *
-     * Will only check for future call of `apply()`.
-     * Set this before calling `apply()` to take effect.
-     *
-     * @example
-     * Mixins.of(scope)
-     *   .requireAny()
-     *   .apply(new MyMixin());
-     */
-    requireAny(): this;
-}