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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-cdk/mixins-preview",
-  "version": "2.241.0-alpha.0",
+  "version": "2.242.0-alpha.0",
   "description": "Preview of CDK Mixins - composable, reusable abstractions that can be applied to any construct (L1, L2 or custom).",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -39,6 +39,7 @@
     "./aws-applicationsignals": "./lib/services/aws-applicationsignals/index.js",
     "./aws-applicationsignals/mixins": "./lib/services/aws-applicationsignals/mixins.js",
     "./aws-appmesh": "./lib/services/aws-appmesh/index.js",
+    "./aws-appmesh/events": "./lib/services/aws-appmesh/events.js",
     "./aws-appmesh/mixins": "./lib/services/aws-appmesh/mixins.js",
     "./aws-apprunner": "./lib/services/aws-apprunner/index.js",
     "./aws-apprunner/mixins": "./lib/services/aws-apprunner/mixins.js",
@@ -65,12 +66,14 @@
     "./aws-autoscalingplans": "./lib/services/aws-autoscalingplans/index.js",
     "./aws-autoscalingplans/mixins": "./lib/services/aws-autoscalingplans/mixins.js",
     "./aws-b2bi": "./lib/services/aws-b2bi/index.js",
+    "./aws-b2bi/events": "./lib/services/aws-b2bi/events.js",
     "./aws-b2bi/mixins": "./lib/services/aws-b2bi/mixins.js",
     "./aws-backup": "./lib/services/aws-backup/index.js",
     "./aws-backup/mixins": "./lib/services/aws-backup/mixins.js",
     "./aws-backupgateway": "./lib/services/aws-backupgateway/index.js",
     "./aws-backupgateway/mixins": "./lib/services/aws-backupgateway/mixins.js",
     "./aws-batch": "./lib/services/aws-batch/index.js",
+    "./aws-batch/events": "./lib/services/aws-batch/events.js",
     "./aws-batch/mixins": "./lib/services/aws-batch/mixins.js",
     "./aws-bcmdataexports": "./lib/services/aws-bcmdataexports/index.js",
     "./aws-bcmdataexports/mixins": "./lib/services/aws-bcmdataexports/mixins.js",
@@ -78,6 +81,8 @@
     "./aws-bedrock/mixins": "./lib/services/aws-bedrock/mixins.js",
     "./aws-bedrockagentcore": "./lib/services/aws-bedrockagentcore/index.js",
     "./aws-bedrockagentcore/mixins": "./lib/services/aws-bedrockagentcore/mixins.js",
+    "./aws-bedrockmantle": "./lib/services/aws-bedrockmantle/index.js",
+    "./aws-bedrockmantle/mixins": "./lib/services/aws-bedrockmantle/mixins.js",
     "./aws-billing": "./lib/services/aws-billing/index.js",
     "./aws-billing/mixins": "./lib/services/aws-billing/mixins.js",
     "./aws-billingconductor": "./lib/services/aws-billingconductor/index.js",
@@ -101,6 +106,7 @@
     "./aws-cloud9": "./lib/services/aws-cloud9/index.js",
     "./aws-cloud9/mixins": "./lib/services/aws-cloud9/mixins.js",
     "./aws-cloudformation": "./lib/services/aws-cloudformation/index.js",
+    "./aws-cloudformation/events": "./lib/services/aws-cloudformation/events.js",
     "./aws-cloudformation/mixins": "./lib/services/aws-cloudformation/mixins.js",
     "./aws-cloudfront": "./lib/services/aws-cloudfront/index.js",
     "./aws-cloudfront/mixins": "./lib/services/aws-cloudfront/mixins.js",
@@ -120,12 +126,15 @@
     "./aws-codeconnections": "./lib/services/aws-codeconnections/index.js",
     "./aws-codeconnections/mixins": "./lib/services/aws-codeconnections/mixins.js",
     "./aws-codedeploy": "./lib/services/aws-codedeploy/index.js",
+    "./aws-codedeploy/events": "./lib/services/aws-codedeploy/events.js",
     "./aws-codedeploy/mixins": "./lib/services/aws-codedeploy/mixins.js",
     "./aws-codeguruprofiler": "./lib/services/aws-codeguruprofiler/index.js",
+    "./aws-codeguruprofiler/events": "./lib/services/aws-codeguruprofiler/events.js",
     "./aws-codeguruprofiler/mixins": "./lib/services/aws-codeguruprofiler/mixins.js",
     "./aws-codegurureviewer": "./lib/services/aws-codegurureviewer/index.js",
     "./aws-codegurureviewer/mixins": "./lib/services/aws-codegurureviewer/mixins.js",
     "./aws-codepipeline": "./lib/services/aws-codepipeline/index.js",
+    "./aws-codepipeline/events": "./lib/services/aws-codepipeline/events.js",
     "./aws-codepipeline/mixins": "./lib/services/aws-codepipeline/mixins.js",
     "./aws-codestar": "./lib/services/aws-codestar/index.js",
     "./aws-codestar/mixins": "./lib/services/aws-codestar/mixins.js",
@@ -159,12 +168,14 @@
     "./aws-datapipeline": "./lib/services/aws-datapipeline/index.js",
     "./aws-datapipeline/mixins": "./lib/services/aws-datapipeline/mixins.js",
     "./aws-datasync": "./lib/services/aws-datasync/index.js",
+    "./aws-datasync/events": "./lib/services/aws-datasync/events.js",
     "./aws-datasync/mixins": "./lib/services/aws-datasync/mixins.js",
     "./aws-datazone": "./lib/services/aws-datazone/index.js",
     "./aws-datazone/mixins": "./lib/services/aws-datazone/mixins.js",
     "./aws-dax": "./lib/services/aws-dax/index.js",
     "./aws-dax/mixins": "./lib/services/aws-dax/mixins.js",
     "./aws-deadline": "./lib/services/aws-deadline/index.js",
+    "./aws-deadline/events": "./lib/services/aws-deadline/events.js",
     "./aws-deadline/mixins": "./lib/services/aws-deadline/mixins.js",
     "./aws-detective": "./lib/services/aws-detective/index.js",
     "./aws-detective/mixins": "./lib/services/aws-detective/mixins.js",
@@ -173,12 +184,14 @@
     "./aws-devopsagent": "./lib/services/aws-devopsagent/index.js",
     "./aws-devopsagent/mixins": "./lib/services/aws-devopsagent/mixins.js",
     "./aws-devopsguru": "./lib/services/aws-devopsguru/index.js",
+    "./aws-devopsguru/events": "./lib/services/aws-devopsguru/events.js",
     "./aws-devopsguru/mixins": "./lib/services/aws-devopsguru/mixins.js",
     "./aws-directconnect": "./lib/services/aws-directconnect/index.js",
     "./aws-directconnect/mixins": "./lib/services/aws-directconnect/mixins.js",
     "./aws-directoryservice": "./lib/services/aws-directoryservice/index.js",
     "./aws-directoryservice/mixins": "./lib/services/aws-directoryservice/mixins.js",
     "./aws-dlm": "./lib/services/aws-dlm/index.js",
+    "./aws-dlm/events": "./lib/services/aws-dlm/events.js",
     "./aws-dlm/mixins": "./lib/services/aws-dlm/mixins.js",
     "./aws-dms": "./lib/services/aws-dms/index.js",
     "./aws-dms/mixins": "./lib/services/aws-dms/mixins.js",
@@ -204,16 +217,19 @@
     "./aws-eks": "./lib/services/aws-eks/index.js",
     "./aws-eks/mixins": "./lib/services/aws-eks/mixins.js",
     "./aws-elasticache": "./lib/services/aws-elasticache/index.js",
+    "./aws-elasticache/events": "./lib/services/aws-elasticache/events.js",
     "./aws-elasticache/mixins": "./lib/services/aws-elasticache/mixins.js",
     "./aws-elasticbeanstalk": "./lib/services/aws-elasticbeanstalk/index.js",
     "./aws-elasticbeanstalk/mixins": "./lib/services/aws-elasticbeanstalk/mixins.js",
     "./aws-elasticloadbalancing": "./lib/services/aws-elasticloadbalancing/index.js",
+    "./aws-elasticloadbalancing/events": "./lib/services/aws-elasticloadbalancing/events.js",
     "./aws-elasticloadbalancing/mixins": "./lib/services/aws-elasticloadbalancing/mixins.js",
     "./aws-elasticloadbalancingv2": "./lib/services/aws-elasticloadbalancingv2/index.js",
     "./aws-elasticloadbalancingv2/mixins": "./lib/services/aws-elasticloadbalancingv2/mixins.js",
     "./aws-elasticsearch": "./lib/services/aws-elasticsearch/index.js",
     "./aws-elasticsearch/mixins": "./lib/services/aws-elasticsearch/mixins.js",
     "./aws-emr": "./lib/services/aws-emr/index.js",
+    "./aws-emr/events": "./lib/services/aws-emr/events.js",
     "./aws-emr/mixins": "./lib/services/aws-emr/mixins.js",
     "./aws-emrcontainers": "./lib/services/aws-emrcontainers/index.js",
     "./aws-emrcontainers/mixins": "./lib/services/aws-emrcontainers/mixins.js",
@@ -222,6 +238,7 @@
     "./aws-entityresolution": "./lib/services/aws-entityresolution/index.js",
     "./aws-entityresolution/mixins": "./lib/services/aws-entityresolution/mixins.js",
     "./aws-events": "./lib/services/aws-events/index.js",
+    "./aws-events/events": "./lib/services/aws-events/events.js",
     "./aws-events/mixins": "./lib/services/aws-events/mixins.js",
     "./aws-eventschemas": "./lib/services/aws-eventschemas/index.js",
     "./aws-eventschemas/mixins": "./lib/services/aws-eventschemas/mixins.js",
@@ -232,6 +249,7 @@
     "./aws-finspace": "./lib/services/aws-finspace/index.js",
     "./aws-finspace/mixins": "./lib/services/aws-finspace/mixins.js",
     "./aws-fis": "./lib/services/aws-fis/index.js",
+    "./aws-fis/events": "./lib/services/aws-fis/events.js",
     "./aws-fis/mixins": "./lib/services/aws-fis/mixins.js",
     "./aws-fms": "./lib/services/aws-fms/index.js",
     "./aws-fms/mixins": "./lib/services/aws-fms/mixins.js",
@@ -242,6 +260,7 @@
     "./aws-fsx": "./lib/services/aws-fsx/index.js",
     "./aws-fsx/mixins": "./lib/services/aws-fsx/mixins.js",
     "./aws-gamelift": "./lib/services/aws-gamelift/index.js",
+    "./aws-gamelift/events": "./lib/services/aws-gamelift/events.js",
     "./aws-gamelift/mixins": "./lib/services/aws-gamelift/mixins.js",
     "./aws-gameliftstreams": "./lib/services/aws-gameliftstreams/index.js",
     "./aws-gameliftstreams/mixins": "./lib/services/aws-gameliftstreams/mixins.js",
@@ -265,12 +284,14 @@
     "./aws-healthimaging/events": "./lib/services/aws-healthimaging/events.js",
     "./aws-healthimaging/mixins": "./lib/services/aws-healthimaging/mixins.js",
     "./aws-healthlake": "./lib/services/aws-healthlake/index.js",
+    "./aws-healthlake/events": "./lib/services/aws-healthlake/events.js",
     "./aws-healthlake/mixins": "./lib/services/aws-healthlake/mixins.js",
     "./aws-iam": "./lib/services/aws-iam/index.js",
     "./aws-iam/mixins": "./lib/services/aws-iam/mixins.js",
     "./aws-identitystore": "./lib/services/aws-identitystore/index.js",
     "./aws-identitystore/mixins": "./lib/services/aws-identitystore/mixins.js",
     "./aws-imagebuilder": "./lib/services/aws-imagebuilder/index.js",
+    "./aws-imagebuilder/events": "./lib/services/aws-imagebuilder/events.js",
     "./aws-imagebuilder/mixins": "./lib/services/aws-imagebuilder/mixins.js",
     "./aws-inspector": "./lib/services/aws-inspector/index.js",
     "./aws-inspector/mixins": "./lib/services/aws-inspector/mixins.js",
@@ -302,6 +323,7 @@
     "./aws-iotwireless": "./lib/services/aws-iotwireless/index.js",
     "./aws-iotwireless/mixins": "./lib/services/aws-iotwireless/mixins.js",
     "./aws-ivs": "./lib/services/aws-ivs/index.js",
+    "./aws-ivs/events": "./lib/services/aws-ivs/events.js",
     "./aws-ivs/mixins": "./lib/services/aws-ivs/mixins.js",
     "./aws-ivschat": "./lib/services/aws-ivschat/index.js",
     "./aws-ivschat/mixins": "./lib/services/aws-ivschat/mixins.js",
@@ -352,6 +374,7 @@
     "./aws-macie": "./lib/services/aws-macie/index.js",
     "./aws-macie/mixins": "./lib/services/aws-macie/mixins.js",
     "./aws-managedblockchain": "./lib/services/aws-managedblockchain/index.js",
+    "./aws-managedblockchain/events": "./lib/services/aws-managedblockchain/events.js",
     "./aws-managedblockchain/mixins": "./lib/services/aws-managedblockchain/mixins.js",
     "./aws-mediaconnect": "./lib/services/aws-mediaconnect/index.js",
     "./aws-mediaconnect/mixins": "./lib/services/aws-mediaconnect/mixins.js",
@@ -440,6 +463,7 @@
     "./aws-qbusiness": "./lib/services/aws-qbusiness/index.js",
     "./aws-qbusiness/mixins": "./lib/services/aws-qbusiness/mixins.js",
     "./aws-qldb": "./lib/services/aws-qldb/index.js",
+    "./aws-qldb/events": "./lib/services/aws-qldb/events.js",
     "./aws-qldb/mixins": "./lib/services/aws-qldb/mixins.js",
     "./aws-quicksight": "./lib/services/aws-quicksight/index.js",
     "./aws-quicksight/mixins": "./lib/services/aws-quicksight/mixins.js",
@@ -448,6 +472,7 @@
     "./aws-rbin": "./lib/services/aws-rbin/index.js",
     "./aws-rbin/mixins": "./lib/services/aws-rbin/mixins.js",
     "./aws-rds": "./lib/services/aws-rds/index.js",
+    "./aws-rds/events": "./lib/services/aws-rds/events.js",
     "./aws-rds/mixins": "./lib/services/aws-rds/mixins.js",
     "./aws-redshift": "./lib/services/aws-redshift/index.js",
     "./aws-redshift/mixins": "./lib/services/aws-redshift/mixins.js",
@@ -508,6 +533,7 @@
     "./aws-secretsmanager": "./lib/services/aws-secretsmanager/index.js",
     "./aws-secretsmanager/mixins": "./lib/services/aws-secretsmanager/mixins.js",
     "./aws-securityhub": "./lib/services/aws-securityhub/index.js",
+    "./aws-securityhub/events": "./lib/services/aws-securityhub/events.js",
     "./aws-securityhub/mixins": "./lib/services/aws-securityhub/mixins.js",
     "./aws-securitylake": "./lib/services/aws-securitylake/index.js",
     "./aws-securitylake/mixins": "./lib/services/aws-securitylake/mixins.js",
@@ -518,6 +544,7 @@
     "./aws-servicediscovery": "./lib/services/aws-servicediscovery/index.js",
     "./aws-servicediscovery/mixins": "./lib/services/aws-servicediscovery/mixins.js",
     "./aws-ses": "./lib/services/aws-ses/index.js",
+    "./aws-ses/events": "./lib/services/aws-ses/events.js",
     "./aws-ses/mixins": "./lib/services/aws-ses/mixins.js",
     "./aws-shield": "./lib/services/aws-shield/index.js",
     "./aws-shield/mixins": "./lib/services/aws-shield/mixins.js",
@@ -532,6 +559,7 @@
     "./aws-sqs": "./lib/services/aws-sqs/index.js",
     "./aws-sqs/mixins": "./lib/services/aws-sqs/mixins.js",
     "./aws-ssm": "./lib/services/aws-ssm/index.js",
+    "./aws-ssm/events": "./lib/services/aws-ssm/events.js",
     "./aws-ssm/mixins": "./lib/services/aws-ssm/mixins.js",
     "./aws-ssmcontacts": "./lib/services/aws-ssmcontacts/index.js",
     "./aws-ssmcontacts/mixins": "./lib/services/aws-ssmcontacts/mixins.js",
@@ -548,6 +576,7 @@
     "./aws-supportapp": "./lib/services/aws-supportapp/index.js",
     "./aws-supportapp/mixins": "./lib/services/aws-supportapp/mixins.js",
     "./aws-synthetics": "./lib/services/aws-synthetics/index.js",
+    "./aws-synthetics/events": "./lib/services/aws-synthetics/events.js",
     "./aws-synthetics/mixins": "./lib/services/aws-synthetics/mixins.js",
     "./aws-systemsmanagersap": "./lib/services/aws-systemsmanagersap/index.js",
     "./aws-systemsmanagersap/mixins": "./lib/services/aws-systemsmanagersap/mixins.js",
@@ -581,6 +610,7 @@
     "./aws-workspacesweb": "./lib/services/aws-workspacesweb/index.js",
     "./aws-workspacesweb/mixins": "./lib/services/aws-workspacesweb/mixins.js",
     "./aws-xray": "./lib/services/aws-xray/index.js",
+    "./aws-xray/events": "./lib/services/aws-xray/events.js",
     "./aws-xray/mixins": "./lib/services/aws-xray/mixins.js",
     "./core": "./lib/core/index.js",
     "./mixins": "./lib/mixins/index.js",
@@ -662,29 +692,29 @@
   "homepage": "https://github.com/aws/aws-cdk",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@aws-cdk/cdk-build-tools": "2.241.0-alpha.0",
-    "@aws-cdk/custom-resource-handlers": "2.241.0-alpha.0",
+    "@aws-cdk/cdk-build-tools": "2.242.0-alpha.0",
+    "@aws-cdk/custom-resource-handlers": "2.242.0-alpha.0",
     "@aws-cdk/integ-runner": "^2.196.1",
-    "@aws-cdk/integ-tests-alpha": "2.241.0-alpha.0",
-    "@aws-cdk/pkglint": "2.241.0-alpha.0",
-    "@aws-cdk/service-spec-types": "^0.0.223",
-    "@aws-cdk/spec2cdk": "2.241.0-alpha.0",
+    "@aws-cdk/integ-tests-alpha": "2.242.0-alpha.0",
+    "@aws-cdk/pkglint": "2.242.0-alpha.0",
+    "@aws-cdk/service-spec-types": "^0.0.226",
+    "@aws-cdk/spec2cdk": "2.242.0-alpha.0",
     "@cdklabs/tskb": "^0.0.4",
     "@cdklabs/typewriter": "^0.0.16",
     "@types/jest": "^29.5.14",
-    "aws-cdk-lib": "2.241.0",
+    "aws-cdk-lib": "2.242.0",
     "constructs": "^10.5.0",
     "jest": "^29.7.0",
     "tsx": "^4.21.0"
   },
   "dependencies": {},
   "peerDependencies": {
-    "aws-cdk-lib": "^2.241.0",
+    "aws-cdk-lib": "^2.242.0",
     "constructs": "^10.5.0"
   },
   "separate-module": false,
   "engines": {
-    "node": ">= 18.0.0"
+    "node": ">= 20.0.0"
   },
   "stability": "experimental",
   "maturity": "experimental",
@@ -692,10 +722,7 @@
     "announce": false
   },
   "cdk-build": {
-    "compressAssembly": true,
-    "pre": [
-      "./scripts/airlift-custom-resource-handlers.sh"
-    ]
+    "compressAssembly": true
   },
   "publishConfig": {
     "tag": "latest"

package/rosetta/default.ts-fixture

@@ -7,11 +7,11 @@ import * as dynamodb from 'aws-cdk-lib/aws-dynamodb';
 import * as cloudfront from 'aws-cdk-lib/aws-cloudfront';
 import * as origins from 'aws-cdk-lib/aws-cloudfront-origins';
 import * as iam from 'aws-cdk-lib/aws-iam';
-import '@aws-cdk/mixins-preview/with';
+import * as kms from 'aws-cdk-lib/aws-kms';
 import { Mixins, Mixin, IConstructSelector } from 'aws-cdk-lib/core';
 import { IMixin } from 'constructs';
-import { PropertyMergeStrategy } from '@aws-cdk/mixins-preview/mixins';
-import { AutoDeleteObjects, BucketVersioning, CfnBucketPropsMixin, BucketPolicyStatementsMixin, BucketBlockPublicAccess } from '@aws-cdk/mixins-preview/aws-s3/mixins';
+import { PropertyMergeStrategy, IMergeStrategy } from '@aws-cdk/mixins-preview/mixins';
+import { CfnBucketPropsMixin } from '@aws-cdk/mixins-preview/aws-s3/mixins';
 
 // for testing purposes, ensure these imports work
 import { mixins as alexa_mixins } from '@aws-cdk/mixins-preview/alexa-ask';

package/scripts/gen.js

@@ -1,45 +1,74 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const node_fs_1 = require("node:fs");
+const fs = require("node:fs/promises");
+const path = require("node:path");
+const module_topology_1 = require("@aws-cdk/spec2cdk/lib/module-topology");
+const submodule_files_1 = require("@aws-cdk/spec2cdk/lib/util/submodule-files");
 const spec2mixins_1 = require("./spec2mixins");
-const spec2logs_1 = require("./spec2logs");
 const spec2eventbridge_1 = require("./spec2eventbridge");
-const path = require("node:path");
-const fs = require("node:fs/promises");
-const node_fs_1 = require("node:fs");
+const spec2logs_1 = require("./spec2logs");
+const GO_PREFIX = 'preview';
 main().catch(e => {
     console.error(e);
     process.exitCode = 1;
 });
 async function main() {
-    // the path to the mixins package
     const pkgPath = path.join(__dirname, '..');
     const outputPath = path.join(pkgPath, 'lib', 'services');
-    const moduleMaps = [
+    const results = [
         await (0, spec2mixins_1.generateAll)({ outputPath }),
         await (0, spec2logs_1.generateAll)({ outputPath }),
         await (0, spec2eventbridge_1.generateAll)({ outputPath }),
     ];
-    const moduleMap = mergeModuleMaps(...moduleMaps);
-    await submodules(moduleMap, outputPath);
+    const moduleMap = (0, module_topology_1.mergeModuleMaps)(...results.map(r => r.moduleMap));
+    const contributions = results.flatMap(r => r.contributions);
+    await setupSubmodules(moduleMap, contributions, outputPath);
     await updateExportsAndEntryPoints(moduleMap, pkgPath);
 }
-function mergeModuleMaps(...maps) {
-    const merged = {};
-    for (const map of maps) {
-        for (const [name, entry] of Object.entries(map)) {
-            if (!merged[name]) {
-                merged[name] = entry;
-            }
-            else {
-                merged[name] = {
-                    ...entry,
-                    files: [...new Set([...merged[name].files, ...entry.files])],
-                    resources: { ...merged[name].resources, ...entry.resources },
-                };
-            }
+async function setupSubmodules(modules, contributions, outPath) {
+    for (const submodule of Object.values(modules)) {
+        await ensureSubmodule(submodule, contributions, outPath);
+    }
+}
+async function ensureSubmodule(submodule, contributions, outPath) {
+    const modulePath = path.join(outPath, submodule.name);
+    if (!submodule.definition) {
+        throw new Error(`Cannot infer path or namespace for submodule named "${submodule.name}". Manually create ${modulePath}/.jsiirc.json files.`);
+    }
+    // Collect which barrel files this submodule needs, based on contributions
+    // that have matching generated files
+    const barrels = new Map();
+    for (const c of contributions) {
+        // Only add contribution if the submodule has a matching generated file
+        const hasFile = c.exportLines.some(line => {
+            const match = line.match(/from\s+'\.\/(.+)'/);
+            return match && submodule.files.some(f => f.includes(match[1]));
+        });
+        if (!hasFile)
+            continue;
+        const existing = barrels.get(c.barrelFile);
+        if (existing) {
+            existing.lines.push(...c.exportLines);
         }
+        else {
+            barrels.set(c.barrelFile, { lines: [...c.exportLines], jsiircNamespace: c.jsiircNamespace });
+        }
+    }
+    // services/<mod>/index.ts — re-exports each barrel as a namespace
+    const subModuleIndex = path.join(modulePath, 'index.ts');
+    const indexLines = [...barrels.keys()].map(barrel => {
+        const ns = path.basename(barrel, '.ts');
+        return `export * as ${ns} from './${ns}';`;
+    });
+    await (0, submodule_files_1.ensureFileContains)(subModuleIndex, indexLines);
+    await (0, submodule_files_1.writeJsiiRc)((0, submodule_files_1.jsiiRcPathFor)(subModuleIndex), submodule.definition, { goPrefix: GO_PREFIX });
+    // Write each barrel file
+    for (const [barrelFile, { lines, jsiircNamespace }] of barrels) {
+        const barrelPath = path.join(modulePath, barrelFile);
+        await (0, submodule_files_1.ensureFileContains)(barrelPath, lines);
+        await (0, submodule_files_1.writeJsiiRc)((0, submodule_files_1.jsiiRcPathFor)(barrelPath), submodule.definition, { goPrefix: GO_PREFIX, namespaceSuffix: jsiircNamespace });
     }
-    return merged;
 }
 async function updateExportsAndEntryPoints(modules, pkgPath) {
     const servicesIndexFilePath = path.join(pkgPath, 'lib', 'services', 'index.ts');
@@ -58,122 +87,20 @@ async function updateExportsAndEntryPoints(modules, pkgPath) {
             name: moduleName,
             submodule: moduleName.replace(/-/g, '_'),
         };
-        // @aws-cdk/mixins-preview/aws_s3 => ./lib/services/aws-s3/index.js
         const indexExportName = `./${moduleConfig.name}`;
         newExports[indexExportName] = `./lib/services/${moduleConfig.name}/index.js`;
-        // @aws-cdk/mixins-preview/aws-s3 => `export * as aws_s3 from './aws-s3';`
         if (!serviceIndexExports.find(e => e.includes(moduleConfig.name))) {
             serviceIndexExports.push(`export * as ${moduleConfig.submodule} from './${moduleConfig.name}';`);
         }
-        // @aws-cdk/mixins-preview/aws_s3/mixins => ./lib/services/aws-s3/mixins.js
         const mixinsExportName = `./${moduleConfig.name}/mixins`;
         newExports[mixinsExportName] = `./lib/services/${moduleConfig.name}/mixins.js`;
-        // @aws-cdk/mixins-preview/aws_s3/events => ./lib/services/aws-s3/events.js
         const eventsFilePath = path.join(pkgPath, 'lib', 'services', moduleConfig.name, 'events.ts');
         if ((0, node_fs_1.existsSync)(eventsFilePath)) {
             const eventsExportName = `./${moduleConfig.name}/events`;
             newExports[eventsExportName] = `./lib/services/${moduleConfig.name}/events.js`;
         }
     }
-    // sort exports
     pkgJson.exports = Object.fromEntries(Object.entries(newExports).sort(([e1], [e2]) => e1.localeCompare(e2)));
-    // package.json
     await fs.writeFile(pkgJsonPath, JSON.stringify(pkgJson, null, 2) + '\n');
-    // lib/services/index.ts
     await fs.writeFile(servicesIndexFilePath, serviceIndexExports.sort((l1, l2) => l1.localeCompare(l2)).join('\n') + '\n');
 }
-async function submodules(modules, outPath) {
-    for (const submodule of Object.values(modules)) {
-        await ensureSubmodule(submodule, outPath);
-    }
-}
-async function ensureSubmodule(submodule, outPath) {
-    const modulePath = path.join(outPath, submodule.name);
-    // Ensure we have a module definition. Should not happen, but need to check.
-    if (!submodule.definition) {
-        throw new Error(`Cannot infer path or namespace for submodule named "${submodule.name}". Manually create ${modulePath}/.jsiirc.json files.`);
-    }
-    // services/<mod>/index.ts
-    // These exports make submodules out of 'mixins.ts', 'events.ts'
-    const subModuleIndex = path.join(modulePath, 'index.ts');
-    const indexLines = [];
-    indexLines.push('export * as mixins from \'./mixins\';');
-    const hasEvents = submodule.files.some(f => f.includes('events.generated.ts'));
-    if (hasEvents) {
-        indexLines.push('export * as events from \'./events\';');
-    }
-    // This file may contain handwritten lines, preserve.
-    await ensureFileContains(subModuleIndex, indexLines);
-    await writeJsiiModuleMetadata(subModuleIndex, submodule.definition);
-    // services/<mod>/mixins.ts
-    // This file exists so people can import it directly in JavaScript with a reasonable name:
-    //
-    // ```
-    // import { X } from '@aws-cdk/mixins-preview/aws-s3/mixins';
-    // ```
-    // All it does is re-export the generated file. It can be manually edited so we don't
-    // fully overwrite it.
-    const mixinsModuleFile = path.join(modulePath, 'mixins.ts');
-    const mixinsIndexLines = [];
-    mixinsIndexLines.push('export * from \'./cfn-props-mixins.generated\';');
-    if ((0, node_fs_1.existsSync)(path.join(modulePath, 'logs-delivery-mixins.generated.ts'))) {
-        mixinsIndexLines.push('export * from \'./logs-delivery-mixins.generated\';');
-    }
-    await ensureFileContains(mixinsModuleFile, mixinsIndexLines);
-    await writeJsiiModuleMetadata(mixinsModuleFile, submodule.definition, 'mixins');
-    if (hasEvents) {
-        // services/<mod>/events.ts
-        // See mixins.ts for the motivation.
-        const eventsModuleFile = path.join(modulePath, 'events.ts');
-        await fs.writeFile(eventsModuleFile, 'export * from \'./events.generated\';\n');
-        await writeJsiiModuleMetadata(eventsModuleFile, submodule.definition, 'events');
-    }
-}
-async function writeJsiiModuleMetadata(moduleFile, moduleDef, namespaceLc = '') {
-    const base = path.basename(moduleFile, '.ts');
-    const rcFile = base === 'index'
-        ? path.join(path.dirname(moduleFile), '.jsiirc.json')
-        : path.join(path.dirname(moduleFile), `.${base}.jsiirc.json`);
-    const namespaceUc = ucfirst(namespaceLc ?? '');
-    const dotnetNamespace = join(moduleDef.dotnetPackage, '.', namespaceUc);
-    const mixinsJsiirc = {
-        targets: {
-            java: {
-                package: join(moduleDef.javaPackage, '.', namespaceLc),
-            },
-            dotnet: {
-                namespace: dotnetNamespace,
-                packageId: dotnetNamespace,
-            },
-            python: {
-                module: join(moduleDef.pythonModuleName, '.', namespaceLc),
-            },
-            go: {
-                packageName: `preview${moduleDef.moduleName}${namespaceLc}`.replace(/[^a-z0-9.]/gi, ''),
-            },
-        },
-    };
-    await fs.writeFile(rcFile, JSON.stringify(mixinsJsiirc, null, 2) + '\n');
-}
-function ucfirst(x) {
-    return x.charAt(0).toUpperCase() + x.slice(1);
-}
-function join(a, sep, b) {
-    return b ? `${a}${sep}${b}` : a;
-}
-async function ensureFileContains(fileName, lines) {
-    let currentLines = new Array();
-    // This index might contain hand-written mixins => ensure they are preserved
-    if ((0, node_fs_1.existsSync)(fileName)) {
-        // load lines from file
-        currentLines.push(...(await fs.readFile(fileName, 'utf-8')).split('\n')
-            .filter(l => !l.includes('.generated')) // remove all generated files, they are added later anyway
-            .filter(Boolean));
-    }
-    for (const line of lines) {
-        if (!currentLines.includes(line)) {
-            currentLines.push(line);
-        }
-    }
-    await fs.writeFile(fileName, currentLines.sort().join('\n') + '\n');
-}

package/scripts/spec2eventbridge/builder.d.ts

@@ -1,4 +1,4 @@
-import type { Resource, Service } from '@aws-cdk/service-spec-types';
+import type { Resource, Service, Event } from '@aws-cdk/service-spec-types';
 import { ExternalModule } from '@cdklabs/typewriter';
 import type { AddServiceProps, LibraryBuilderProps } from '@aws-cdk/spec2cdk/lib/cdk/library-builder';
 import { LibraryBuilder } from '@aws-cdk/spec2cdk/lib/cdk/library-builder';
@@ -14,8 +14,10 @@ export interface EventBridgeBuilderProps extends LibraryBuilderProps {
 export declare class EventBridgeBuilder extends LibraryBuilder<EventBridgeServiceModule> {
     private readonly filePattern;
     constructor(props: EventBridgeBuilderProps);
+    canBindToResource(event: Event, resource: Resource): boolean;
     protected createServiceSubmodule(service: Service, submoduleName: string): EventBridgeServiceModule;
     protected addResourceToSubmodule(submodule: EventBridgeServiceModule, resource: Resource, _props?: AddServiceProps): void;
+    private generateStandaloneEvents;
     private createEventsModule;
     private obtainEventsModule;
 }