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

package/scripts/spec2eventbridge/builder.js

@@ -9,16 +9,11 @@ const library_builder_1 = require("@aws-cdk/spec2cdk/lib/cdk/library-builder");
 const service_submodule_1 = require("@aws-cdk/spec2cdk/lib/cdk/service-submodule");
 const naming_1 = require("@aws-cdk/spec2cdk/lib/naming");
 const reference_props_1 = require("@aws-cdk/spec2cdk/lib/cdk/reference-props");
-const util_1 = require("@aws-cdk/spec2cdk/lib/util");
-/**
- * Error thrown to skip generation of an event and discard all generated code for it
- */
-class SkipEventError extends Error {
-    constructor(message) {
-        super(message);
-        this.name = 'SkipEventError';
-    }
-}
+const EXCLUDED_SERVICE = new Set([
+    'aws-macie', // Excluded because the Macie EventBridge schema includes property names
+    // such as IP addresses and ISO timestamps (e.g. "2017-04-03T16:12:53+00:00"),
+    // which do not represent meaningful or usable fields for EventBridge events.
+]);
 class EventBridgeServiceModule extends service_submodule_1.BaseServiceSubmodule {
     constructLibModule;
     constructor(props) {
@@ -32,103 +27,179 @@ class EventBridgeBuilder extends library_builder_1.LibraryBuilder {
         super(props);
         this.filePattern = props.filePattern ?? '%moduleName%/events.generated.ts';
     }
+    canBindToResource(event, resource) {
+        const rootProperty = this.db.get('eventTypeDefinition', event.resourcesField[0].type);
+        const referenceProps = new reference_props_1.ResourceReference(resource).referenceProps;
+        let nonUndefinedResolvers = 0;
+        const sanitize = (name) => name.replace(/[^a-zA-Z0-9]/g, '').toLowerCase();
+        for (const [propName] of Object.entries(rootProperty.properties)) {
+            const rscField = event.resourcesField.find(r => r.type.$ref === rootProperty.$id);
+            if (!rscField)
+                continue;
+            let targetProp;
+            if (!rscField.fieldName) {
+                const possibleNames = [propName, `${resource.name}${propName}`].map(sanitize);
+                targetProp = referenceProps.find(r => possibleNames.includes(r.declaration.name.toLowerCase()));
+            }
+            else if (rscField.fieldName === propName) {
+                targetProp = referenceProps.find(r => r.declaration.name.toLowerCase() === sanitize(propName));
+                // fieldName explicitly names this property but it's not in the ref
+                if (!targetProp)
+                    return false;
+            }
+            if (targetProp)
+                nonUndefinedResolvers++;
+        }
+        if (event.resourcesField.some(r => r.type.$ref === rootProperty.$id) && nonUndefinedResolvers !== 1) {
+            return false;
+        }
+        return true;
+    }
     createServiceSubmodule(service, submoduleName) {
-        return new EventBridgeServiceModule({
+        const hasEvents = this.db.follow('serviceHasEvent', service);
+        const submodule = new EventBridgeServiceModule({
             submoduleName,
             service,
         });
+        if (EXCLUDED_SERVICE.has(service.name)) {
+            return submodule;
+        }
+        if (hasEvents.length != 0) {
+            const allServiceEvents = hasEvents.map((e) => e.entity);
+            const hasBindableEvents = allServiceEvents.some(event => {
+                if (event.resourcesField.length === 0)
+                    return false;
+                const resource = this.db.get('resource', event.resourcesField[0].resource.$ref);
+                return this.canBindToResource(event, resource);
+            });
+            const eventsModule = this.createEventsModule(submodule, service, hasBindableEvents);
+            this.rememberModule(eventsModule);
+            this.generateStandaloneEvents(submodule, service);
+        }
+        return submodule;
     }
     addResourceToSubmodule(submodule, resource, _props) {
-        const events = this.db.follow('resourceHasEvent', resource).map((e) => e.entity);
-        if (events.length === 0) {
+        const allEvents = this.db.follow('resourceHasEvent', resource).map((e) => e.entity);
+        const bindableEvents = allEvents.filter(e => e.resourcesField.length === 0 || this.canBindToResource(e, resource));
+        if (bindableEvents.length === 0) {
             return;
         }
         const service = this.db.incoming('hasResource', resource).only().entity;
-        // Create a temporary module to test if events can be generated
-        const tempModuleName = `@aws-cdk/mixins-preview/${submodule.submoduleName}/events-temp`;
-        const tempModule = new typewriter_1.Module(tempModuleName);
-        cdk_1.CDK_CORE.import(tempModule, 'cdk');
-        submodule.constructLibModule.import(tempModule, 'service');
-        const awsEvents = new typewriter_1.ExternalModule('aws-cdk-lib/aws-events');
-        awsEvents.import(tempModule, 'events');
-        const eventsClass = new EventBridgeEventsClass(tempModule, this.db, resource, events, submodule.constructLibModule);
+        const eventsModule = this.obtainEventsModule(submodule, service);
+        const eventsClass = new EventBridgeEventsClass(eventsModule.module, this.db, resource, bindableEvents, submodule.constructLibModule);
         eventsClass.build();
-        // Only create the real module and register if we successfully generated at least one event
-        if (eventsClass.hasSuccessfulEvents()) {
-            const eventsModule = this.obtainEventsModule(submodule, service);
-            // Recreate the class in the real module
-            const realEventsClass = new EventBridgeEventsClass(eventsModule.module, this.db, resource, events, submodule.constructLibModule);
-            realEventsClass.build();
-            submodule.registerResource(resource.cloudFormationType, realEventsClass);
+        if (eventsClass.resourceClass != undefined) {
+            submodule.registerResource(resource.cloudFormationType, eventsClass.resourceClass);
         }
     }
-    createEventsModule(submodule, service) {
+    // Generate standalone events (events without matching resources) at service level
+    generateStandaloneEvents(submodule, service) {
+        const allServiceEvents = this.db.follow('serviceHasEvent', service).map((e) => e.entity);
+        const standaloneEvents = allServiceEvents.filter(event => {
+            if (event.resourcesField.length === 0)
+                return true;
+            const resources = [this.db.get('resource', event.resourcesField[0].resource.$ref)];
+            // If the event can bind to ANY of its linked resources, it's not standalone
+            return !resources.some(r => this.canBindToResource(event, r));
+        });
+        if (allServiceEvents.length === 0) {
+            return;
+        }
+        const eventsModule = this.obtainEventsModule(submodule, service);
+        const eventsClass = new EventBridgeEventsClass(eventsModule.module, this.db, undefined, standaloneEvents, submodule.constructLibModule);
+        eventsClass.build();
+    }
+    createEventsModule(submodule, service, includeServiceImport) {
         const module = new typewriter_1.Module(`@aws-cdk/mixins-preview/${submodule.submoduleName}/events`);
         const filePath = this.pathFor(this.filePattern, submodule.submoduleName, service);
         submodule.registerModule({ module, filePath });
         cdk_1.CDK_CORE.import(module, 'cdk');
-        submodule.constructLibModule.import(module, 'service');
+        if (includeServiceImport) {
+            submodule.constructLibModule.import(module, 'service');
+        }
         const awsEvents = new typewriter_1.ExternalModule('aws-cdk-lib/aws-events');
         awsEvents.import(module, 'events');
         return { module, filePath };
     }
     obtainEventsModule(submodule, service) {
-        const mod = this.createEventsModule(submodule, service);
-        if (this.modules.has(mod.filePath)) {
-            return {
-                module: this.modules.get(mod.filePath),
-                filePath: mod.filePath,
-            };
+        const filePath = this.pathFor(this.filePattern, submodule.submoduleName, service);
+        if (!this.modules.has(filePath)) {
+            throw new Error(`Events module for ${service.name} was not created in createServiceSubmodule`);
         }
-        return this.rememberModule(mod);
+        return {
+            module: this.modules.get(filePath),
+            filePath,
+        };
     }
 }
 exports.EventBridgeBuilder = EventBridgeBuilder;
-class EventBridgeEventsClass extends typewriter_1.ClassType {
-    db;
-    resource;
-    events;
-    refInterface;
-    /** The property name on the reference interface that holds the reference object (e.g. "roleRef") */
-    referenceName;
-    /** The property of the reference interface (e.g roleName, roleArn) */
-    referenceProps;
-    /** Count of successfully generated events */
-    successfulEventCount = 0;
-    constructor(scope, db, resource, events, constructLibModule) {
-        super(scope, {
-            name: `${resource.name}Events`,
-            export: true,
-            docs: {
-                summary: `EventBridge event patterns for ${resource.name}`,
-            },
-        });
-        this.db = db;
-        this.resource = resource;
-        this.events = events;
-        this.refInterface = typewriter_1.Type.fromName(constructLibModule, spec2cdk_1.naming.referenceInterfaceName(resource.name));
-        this.referenceName = spec2cdk_1.naming.referenceInterfaceAttributeName(resource.name);
-        this.referenceProps = new reference_props_1.ResourceReference(resource).referenceProps;
-    }
-    build() {
-        this.generateEvents();
-        // Only add class infrastructure if we successfully generated at least one event
-        if (this.successfulEventCount > 0) {
-            this.addReferenceProperty();
-            this.addConstructor();
-            this.addFactoryMethod();
-        }
+/**
+ * Generates converter functions and type definitions for events
+ */
+class SharedConverterGenerator {
+    scope;
+    context;
+    constructor(scope, context) {
+        this.scope = scope;
+        this.context = context;
     }
     /**
-     * Returns true if at least one event was successfully generated
+     * Creates a TypeConverter with deduplication for nested type definitions
      */
-    hasSuccessfulEvents() {
-        return this.successfulEventCount > 0;
+    createTypeConverterForNamespace(namespaceScope, event, eventsName, hasResource, rootPropertyId) {
+        const createdTypes = new Map();
+        // TypeConverter is needed to convert spec Property types into typewriter Types (e.g., string -> Array<string>,
+        // $ref -> StructType) and to resolve nested TypeDefinitions via the typeDefinitionConverter callback.
+        // It requires a Resource, but standalone events have no associated resource.
+        const dummyResource = {
+            $id: 'bugbug/DummyResource',
+            name: 'Service',
+            cloudFormationType: 'AWS::Service::Dummy',
+            documentation: '',
+            attributes: {},
+            properties: {},
+        };
+        return new type_converter_1.TypeConverter({
+            db: this.context.db,
+            resource: this.context.resource ?? dummyResource,
+            resourceClass: namespaceScope,
+            isEventBridgeType: true,
+            typeDefinitionConverter: (typeDef, converter) => {
+                const sanitizedName = spec2cdk_1.naming.sanitizeTypeName(typeDef.name);
+                if (createdTypes.has(sanitizedName)) {
+                    throw Error('Type with the same name are being generated multiple times in the same namespace');
+                }
+                const structType = new typewriter_1.StructType(namespaceScope, {
+                    export: true,
+                    name: sanitizedName,
+                    docs: {
+                        summary: typeDef.documentation || `Type definition for ${typeDef.name}`,
+                    },
+                });
+                createdTypes.set(sanitizedName, structType);
+                const build = () => {
+                    // Skip creating converter for root property as it's handled separately with "Detail" in the name
+                    if (rootPropertyId && typeDef.$id === rootPropertyId) {
+                        return;
+                    }
+                    if (Object.keys(typeDef.properties).length > 0) {
+                        this.addPropertiesAndCreateConverter({
+                            target: structType,
+                            properties: typeDef.properties,
+                            typeConverter: converter,
+                            converterNamePrefix: `convert${eventsName}${sanitizedName}ToEventPattern`,
+                            eventsName: eventsName,
+                            event,
+                            typeDef,
+                            addMetadata: false,
+                            hasResource,
+                        });
+                    }
+                };
+                return { structType, build };
+            },
+        });
     }
-    /**
-     * Validates that an event can be generated by checking for resource field issues
-     * Throws SkipEventError if validation fails
-     */
     /**
      * Shared method to add properties to a target (interface or struct) and create a converter function.
      * This method processes a set of properties, adds them to the target type with proper naming
@@ -138,30 +209,23 @@ class EventBridgeEventsClass extends typewriter_1.ClassType {
      * The converter function automatically handles nested struct properties by recursively calling
      * their respective converter functions.
      */
-    addPropertiesAndCreateConverter({ target, properties, typeConverter, converterNamePrefix, eventNsName, event, typeDef, addMetadata, }) {
+    addPropertiesAndCreateConverter({ target, properties, typeConverter, converterNamePrefix, eventsName, event, typeDef, addMetadata, hasResource, }) {
         const propertyMappings = new Map();
-        const module = typewriter_1.Module.of(this);
         let nonUndefinedResolvers = 0;
         for (const [propName, propSpec] of Object.entries(properties)) {
-            // Check if this property is a resource field and get its resolver
-            const resolver = this.getResolver(event, typeDef, propName, propSpec);
+            const resolver = hasResource ? this.getResolver(event, typeDef, propName, propSpec) : undefined;
             if (resolver)
                 nonUndefinedResolvers++;
             // Replace colons with dashes before camelCasing (aws:s3:arn -> aws-s3-arn -> awsS3Arn)
-            const camelCaseName = spec2cdk_1.naming.propertyNameFromCloudFormation(propName.replace(/:/g, '-'));
+            const camelCaseName = spec2cdk_1.naming.santitizeFieldName(spec2cdk_1.naming.propertyNameFromCloudFormation(propName.replace(/:/g, '-')));
             let propType = typeConverter.typeFromProperty(propSpec);
             propertyMappings.set(camelCaseName, { original: propName, type: propType, resolver });
             if (propType.primitive) {
                 propType = typewriter_1.Type.arrayOf(typewriter_1.Type.STRING);
             }
             const defaultDoc = resolver ?
-                `Filter with the ${this.resource.name} reference` :
+                `Filter with the ${this.context.resource?.name ?? 'resource'} reference` :
                 'Do not filter on this field';
-            // Suppress JSII5019 when property name conflicts with the declaring type name
-            const docTags = camelCaseName.toLowerCase() === target.name.toLowerCase()
-                ? { jsii: 'suppress JSII5019 Generated code' }
-                : undefined;
-            // Always add property to interface (even if it has a resolver)
             target.addProperty({
                 name: camelCaseName,
                 type: propType,
@@ -171,7 +235,6 @@ class EventBridgeEventsClass extends typewriter_1.ClassType {
                     summary: propSpec.documentation || `${propName} property`,
                     remarks: `Specify an array of string values to match this event if the actual value of ${propName} is one of the values in the array. Use one of the constructors on the \`aws_events.Match\`  for more advanced matching options.`,
                     default: defaultDoc,
-                    docTags,
                 },
             });
         }
@@ -188,7 +251,7 @@ class EventBridgeEventsClass extends typewriter_1.ClassType {
             });
         }
         // Generate converter function
-        const converterFunction = new typewriter_1.FreeFunction(module, {
+        const converterFunction = new typewriter_1.FreeFunction(this.scope, {
             name: converterNamePrefix,
             returnType: typewriter_1.Type.ANY,
         });
@@ -198,24 +261,29 @@ class EventBridgeEventsClass extends typewriter_1.ClassType {
             type: target.type,
             optional: true,
         });
-        // Add iRef parameter for accessing reference properties
-        converterFunction.addParameter({
-            name: 'iRef',
-            type: this.refInterface,
-        });
+        if (hasResource && this.context.refInterface) {
+            converterFunction.addParameter({
+                name: 'iRef',
+                type: this.context.refInterface,
+                optional: true,
+            });
+        }
         // Build object mapping with recursive conversion for nested structs
         const mappings = Array.from(propertyMappings.entries()).map(([camelCase, { original, type, resolver }]) => {
-            // Use optional chaining for safe property access since obj can be undefined
             const propAccess = typewriter_1.expr.directCode(`${paramName}?.${camelCase}`);
             let valueExpr = propAccess;
-            // If property is a struct, call its converter recursively (passing iRef)
-            // Always call converter even if property is undefined, so resolvers can inject values
+            // If property is a struct, call its converter recursively
             if (type.symbol) {
                 const propStruct = type.symbol.findDeclaration();
                 if (propStruct && propStruct.kind === 'struct') {
                     const propStructName = spec2cdk_1.naming.sanitizeTypeName(propStruct.name);
-                    const propConverterName = `convert${eventNsName}${propStructName}ToEventPattern`;
-                    valueExpr = typewriter_1.expr.ident(propConverterName).call(propAccess, typewriter_1.expr.ident('iRef'));
+                    const propConverterName = `convert${eventsName}${propStructName}ToEventPattern`;
+                    if (hasResource && this.context.refInterface) {
+                        valueExpr = typewriter_1.expr.ident(propConverterName).call(propAccess, typewriter_1.expr.ident('iRef'));
+                    }
+                    else {
+                        valueExpr = typewriter_1.expr.ident(propConverterName).call(propAccess);
+                    }
                 }
             }
             // If property has a resolver, use it as fallback: property ?? resolver
@@ -224,195 +292,248 @@ class EventBridgeEventsClass extends typewriter_1.ClassType {
             }
             return [original, valueExpr];
         });
-        if (event.resourcesField.some(r => r.type.$ref === typeDef.$id) && nonUndefinedResolvers !== 1) {
-            throw new SkipEventError(`Event ${event.name} has ${nonUndefinedResolvers} non-undefined resolvers for ${typeDef.name}`);
-        }
-        // TODO: do better
         converterFunction.addBody(typewriter_1.stmt.constVar(typewriter_1.expr.ident('ret'), typewriter_1.expr.binOp(typewriter_1.expr.object(mappings), 'as', typewriter_1.expr.ident('any'))), typewriter_1.stmt.forConst(typewriter_1.expr.destructuringArray(typewriter_1.expr.ident('key'), typewriter_1.expr.ident('value')), typewriter_1.expr.ident('Object.entries(ret)'), typewriter_1.stmt.block(typewriter_1.stmt.if_(typewriter_1.expr.eq(typewriter_1.expr.ident('value'), typewriter_1.expr.UNDEFINED)).then(typewriter_1.stmt.directCode('delete ret[key]')))), typewriter_1.stmt.directCode('if (Object.keys(ret).length === 0) return undefined;'), typewriter_1.stmt.ret(typewriter_1.expr.ident('ret')));
         return converterFunction;
     }
-    /**
-     * Creates a TypeConverter with deduplication for nested type definitions
-     */
-    createTypeConverterForNamespace(namespaceScope, event, eventNsName) {
-        const createdTypes = new Map();
-        return new type_converter_1.TypeConverter({
-            db: this.db,
-            resource: this.resource,
-            resourceClass: namespaceScope,
-            isEventBridgeType: true,
-            typeDefinitionConverter: (typeDef, converter) => {
-                const sanitizedName = spec2cdk_1.naming.sanitizeTypeName(typeDef.name);
-                if (createdTypes.has(sanitizedName)) {
-                    throw Error('Type with the same name are being generated multiple times in the same namespace');
-                }
-                const structType = new typewriter_1.StructType(namespaceScope, {
-                    export: true,
-                    name: sanitizedName,
-                    docs: {
-                        summary: typeDef.documentation || `Type definition for ${typeDef.name}`,
-                    },
-                });
-                createdTypes.set(sanitizedName, structType);
-                const build = () => {
-                    if (Object.keys(typeDef.properties).length > 0) {
-                        this.addPropertiesAndCreateConverter({
-                            target: structType,
-                            properties: typeDef.properties,
-                            typeConverter: converter,
-                            converterNamePrefix: `convert${eventNsName}${sanitizedName}ToEventPattern`,
-                            eventNsName,
-                            event,
-                            typeDef,
-                            addMetadata: false,
-                        });
-                    }
-                };
-                return { structType, build };
+    getResolver(event, typeDef, propName, prop) {
+        const rscField = event.resourcesField.find(r => r.type.$ref === typeDef.$id);
+        if (!rscField) {
+            return undefined;
+        }
+        if (!this.context.resource || !this.context.referenceProps || !this.context.referenceName) {
+            return undefined;
+        }
+        let targetProp;
+        const sanitizePropName = (name) => name.replace(/[^a-zA-Z0-9]/g, '').toLowerCase();
+        if (!rscField.fieldName) {
+            const possibleNames = [propName, `${this.context.resource.name}${propName}`].map(n => sanitizePropName(n));
+            targetProp = this.context.referenceProps.find(r => possibleNames.includes(r.declaration.name.toLowerCase()));
+            if (!targetProp) {
+                return undefined;
+            }
+        }
+        else if (rscField.fieldName === propName) {
+            targetProp = this.context.referenceProps.find(r => r.declaration.name.toLowerCase() === sanitizePropName(propName));
+            if (!targetProp) {
+                throw new Error(`Could not find property ${event.name}.${propName} in the ref interface. Available properties: ${this.context.referenceProps.map(r => r.declaration.name).join(', ')}`);
+            }
+        }
+        else {
+            return undefined;
+        }
+        if (prop.type.type !== 'string') {
+            throw Error(`${event.name} ${propName} is not a string, but ${prop.type.type}`);
+        }
+        return typewriter_1.expr.list([typewriter_1.expr.directCode(`iRef?.${this.context.referenceName}.${targetProp.declaration.name}`)]);
+    }
+}
+/**
+ * Adds the EventBridge event pattern return body to a method.
+ * Shared between standalone static methods and resource-bound instance methods.
+ */
+function addEventPatternBody({ method, event, detailExpr }) {
+    method.addBody(typewriter_1.stmt.ret(typewriter_1.expr.object({
+        source: typewriter_1.expr.list([typewriter_1.expr.lit(event.source)]),
+        detailType: typewriter_1.expr.list([typewriter_1.expr.lit(event.detailType)]),
+        detail: detailExpr,
+        version: typewriter_1.expr.directCode('options?.eventMetadata?.version'),
+        resources: typewriter_1.expr.directCode('options?.eventMetadata?.resources'),
+        region: typewriter_1.expr.directCode('options?.eventMetadata?.region'),
+    })));
+}
+/**
+ * Generates standalone event namespace classes (e.g., ObjectCreated)
+ */
+class StandaloneEventGenerator {
+    scope;
+    context;
+    converterGenerator;
+    constructor(scope, context, converterGenerator) {
+        this.scope = scope;
+        this.context = context;
+        this.converterGenerator = converterGenerator;
+    }
+    generateEventClass(event) {
+        const eventsEventPattern = typewriter_1.Type.fromName(new typewriter_1.ExternalModule('aws-cdk-lib/aws-events'), 'EventPattern');
+        const namespaceName = (0, naming_1.eventNamespaceName)(event.name);
+        const rootProperty = this.context.db.get('eventTypeDefinition', event.rootProperty);
+        // When generating standalone (resource is undefined), treat as no-resource even if resourcesField exists
+        const hasResource = event.resourcesField.length > 0 && this.context.resource !== undefined;
+        const eventNamespace = new typewriter_1.ClassType(this.scope, {
+            name: namespaceName,
+            export: true,
+            docs: {
+                summary: `EventBridge event pattern for ${event.name}`,
+            },
+        });
+        const typeConverter = this.converterGenerator.createTypeConverterForNamespace(eventNamespace, event, namespaceName, hasResource, rootProperty.$id);
+        const detailInterface = new typewriter_1.InterfaceType(eventNamespace, {
+            name: `${namespaceName}Props`,
+            export: true,
+            docs: {
+                summary: `Props type for ${event.name} event`,
             },
         });
+        const converterFunction = this.converterGenerator.addPropertiesAndCreateConverter({
+            target: detailInterface,
+            properties: rootProperty.properties,
+            typeConverter,
+            converterNamePrefix: `convert${namespaceName}DetailToEventPattern`,
+            eventsName: namespaceName,
+            event,
+            typeDef: rootProperty,
+            addMetadata: true,
+            hasResource,
+        });
+        const methodName = spec2cdk_1.naming.eventPatternMethodName(namespaceName);
+        const eventPatternMethod = eventNamespace.addMethod({
+            name: methodName,
+            static: true,
+            returnType: eventsEventPattern,
+            docs: {
+                summary: `EventBridge event pattern for ${event.detailType}`,
+            },
+        });
+        eventPatternMethod.addParameter({
+            name: 'options',
+            type: detailInterface.type,
+            optional: true,
+        });
+        addEventPatternBody({
+            method: eventPatternMethod,
+            event,
+            detailExpr: typewriter_1.expr.ident(converterFunction.name).call(typewriter_1.expr.ident('options')),
+        });
+        return { detailInterface, converterFunction };
     }
-    /**
-     * Generates event namespaces, interfaces, and pattern methods for each event
-     * Creates: namespace class, detail interface, pattern props, and event pattern method
-     */
-    generateEvents() {
+}
+/**
+ * Generates resource-bound event methods (e.g., BucketEvents class methods)
+ */
+class ResourceBoundEventsGenerator {
+    resourceClass;
+    context;
+    constructor(resourceClass, context) {
+        this.resourceClass = resourceClass;
+        this.context = context;
+    }
+    addEventMethod(event, detailInterface, converterFunction) {
+        if (!this.context.resource || !this.context.referenceName) {
+            throw new Error('Resource is required for resource-bound events');
+        }
         const eventsEventPattern = typewriter_1.Type.fromName(new typewriter_1.ExternalModule('aws-cdk-lib/aws-events'), 'EventPattern');
+        const namespaceName = (0, naming_1.eventNamespaceName)(event.name);
+        const methodName = spec2cdk_1.naming.eventPatternMethodName(namespaceName);
+        const eventPatternMethod = this.resourceClass.addMethod({
+            name: methodName,
+            returnType: eventsEventPattern,
+            docs: {
+                summary: `EventBridge event pattern for ${this.context.resource.name} ${event.detailType}`,
+            },
+        });
+        eventPatternMethod.addParameter({
+            name: 'options',
+            type: detailInterface.type,
+            optional: true,
+        });
+        addEventPatternBody({
+            method: eventPatternMethod,
+            event,
+            detailExpr: typewriter_1.expr.ident(converterFunction.name).call(typewriter_1.expr.ident('options'), typewriter_1.expr.this_().prop(this.context.referenceName)),
+        });
+    }
+}
+/**
+ * Main class that orchestrates event generation for a resource
+ */
+class EventBridgeEventsClass {
+    scope;
+    events;
+    context;
+    successfulEventCount = 0;
+    resourceClass;
+    constructor(scope, db, resource, events, constructLibModule) {
+        this.scope = scope;
+        this.events = events;
+        this.context = {
+            db,
+            resource,
+            refInterface: resource ? typewriter_1.Type.fromName(constructLibModule, spec2cdk_1.naming.referenceInterfaceName(resource.name)) : undefined,
+            referenceName: resource ? spec2cdk_1.naming.referenceInterfaceAttributeName(resource.name) : undefined,
+            referenceProps: resource ? new reference_props_1.ResourceReference(resource).referenceProps : undefined,
+        };
+    }
+    build() {
+        this.generateEvents();
+        if (this.resourceClass) {
+            this.addReferenceProperty();
+            this.addConstructor();
+            this.addFactoryMethod();
+        }
+    }
+    hasSuccessfulEvents() {
+        return this.successfulEventCount > 0;
+    }
+    generateEvents() {
+        const converterGenerator = new SharedConverterGenerator(this.scope, this.context);
+        const standaloneGenerator = new StandaloneEventGenerator(this.scope, this.context, converterGenerator);
         for (const event of this.events) {
-            try {
-                // console.log(event.name);
-                const namespaceName = (0, naming_1.eventNamespaceName)(event.name);
-                const rootProperty = this.db.get('eventTypeDefinition', event.rootProperty);
-                // Create namespace class to hold event types
-                const eventNamespace = new typewriter_1.ClassType(this, {
-                    name: namespaceName,
-                    export: true,
-                    docs: {
-                        summary: `${event.name} event types for ${this.resource.name}`,
-                    },
-                });
-                const typeConverter = this.createTypeConverterForNamespace(eventNamespace, event, namespaceName);
-                // Create detail interface with event properties
-                const detailInterface = new typewriter_1.InterfaceType(eventNamespace, {
-                    name: `${namespaceName}Props`,
-                    export: true,
-                    docs: {
-                        summary: `Props type for ${this.resource.name} ${event.name} event`,
-                    },
-                });
-                // Add properties and create converter function
-                const converterFunction = this.addPropertiesAndCreateConverter({
-                    target: detailInterface,
-                    properties: rootProperty.properties,
-                    typeConverter,
-                    converterNamePrefix: `convert${namespaceName}DetailToEventPattern`,
-                    eventNsName: namespaceName,
-                    event,
-                    typeDef: rootProperty,
-                    addMetadata: true,
-                });
-                // Create event pattern method that returns events.EventPattern
-                const methodName = spec2cdk_1.naming.eventPatternMethodName(namespaceName);
-                const eventPatternMethod = this.addMethod({
-                    name: methodName,
-                    returnType: eventsEventPattern,
-                    docs: {
-                        summary: `EventBridge event pattern for ${this.resource.name} ${event.detailType}`,
-                    },
-                });
-                eventPatternMethod.addParameter({
-                    name: 'options',
-                    type: detailInterface.type,
-                    optional: true,
-                });
-                eventPatternMethod.addBody(typewriter_1.stmt.ret(typewriter_1.expr.object({
-                    source: typewriter_1.expr.list([typewriter_1.expr.lit(event.source)]),
-                    detailType: typewriter_1.expr.list([typewriter_1.expr.lit(event.detailType)]),
-                    detail: typewriter_1.expr.ident(converterFunction.name).call(typewriter_1.expr.ident('options'), typewriter_1.expr.this_().prop(this.referenceName)),
-                    version: typewriter_1.expr.directCode('options?.eventMetadata?.version'),
-                    resources: typewriter_1.expr.directCode('options?.eventMetadata?.resources'),
-                    region: typewriter_1.expr.directCode('options?.eventMetadata?.region'),
-                })));
-                // Event generated successfully
-                this.successfulEventCount++;
-            }
-            catch (error) {
-                if (error instanceof SkipEventError) {
-                    util_1.log.debug(`Skipping event ${event.name} for ${this.resource.name}: ${error.message}`);
-                    // Event generation is skipped, all generated code for this event is discarded
-                    continue;
+            const hasResource = event.resourcesField.length > 0;
+            const { detailInterface, converterFunction } = standaloneGenerator.generateEventClass(event);
+            if (hasResource && this.context.resource) {
+                if (!this.resourceClass) {
+                    this.resourceClass = new typewriter_1.ClassType(this.scope, {
+                        name: `${this.context.resource.name}Events`,
+                        export: true,
+                        docs: {
+                            summary: `EventBridge event patterns for ${this.context.resource.name}`,
+                        },
+                    });
                 }
-                throw error;
+                const resourceBoundGenerator = new ResourceBoundEventsGenerator(this.resourceClass, this.context);
+                resourceBoundGenerator.addEventMethod(event, detailInterface, converterFunction);
             }
+            this.successfulEventCount++;
         }
     }
     addReferenceProperty() {
-        const refPropertyName = spec2cdk_1.naming.referenceInterfaceAttributeName(this.resource.name);
-        this.addProperty({
-            name: refPropertyName,
-            type: this.refInterface,
+        if (!this.resourceClass || !this.context.resource || !this.context.refInterface || !this.context.referenceName)
+            return;
+        this.resourceClass.addProperty({
+            name: this.context.referenceName,
+            type: this.context.refInterface,
             immutable: true,
             visibility: typewriter_1.MemberVisibility.Private,
             docs: {
-                summary: `Reference to the ${this.resource.name} construct`,
+                summary: `Reference to the ${this.context.resource.name} construct`,
             },
         });
     }
     addConstructor() {
-        const refPropertyName = spec2cdk_1.naming.referenceInterfaceAttributeName(this.resource.name);
-        const ctor = this.addInitializer({ visibility: typewriter_1.MemberVisibility.Private });
+        if (!this.resourceClass || !this.context.resource || !this.context.refInterface || !this.context.referenceName)
+            return;
+        const ctor = this.resourceClass.addInitializer({ visibility: typewriter_1.MemberVisibility.Private });
         ctor.addParameter({
-            name: refPropertyName,
-            type: this.refInterface,
+            name: this.context.referenceName,
+            type: this.context.refInterface,
         });
-        ctor.addBody(typewriter_1.stmt.assign(typewriter_1.expr.this_().prop(refPropertyName), typewriter_1.expr.ident(refPropertyName)));
+        ctor.addBody(typewriter_1.stmt.assign(typewriter_1.expr.this_().prop(this.context.referenceName), typewriter_1.expr.ident(this.context.referenceName)));
     }
     addFactoryMethod() {
-        const refPropertyName = spec2cdk_1.naming.referenceInterfaceAttributeName(this.resource.name);
-        const factory = this.addMethod({
-            name: `from${this.resource.name}`,
+        if (!this.resourceClass || !this.context.resource || !this.context.refInterface || !this.context.referenceName)
+            return;
+        const factory = this.resourceClass.addMethod({
+            name: `from${this.context.resource.name}`,
             static: true,
-            returnType: this.type,
+            returnType: this.resourceClass.type,
             docs: {
-                summary: `Create ${this.resource.name}Events from a ${this.resource.name} reference`,
+                summary: `Create ${this.context.resource.name}Events from a ${this.context.resource.name} reference`,
             },
         });
         factory.addParameter({
-            name: refPropertyName,
-            type: this.refInterface,
+            name: this.context.referenceName,
+            type: this.context.refInterface,
         });
-        factory.addBody(typewriter_1.stmt.ret(this.newInstance(typewriter_1.expr.ident(refPropertyName))));
-    }
-    getResolver(event, typeDef, propName, prop) {
-        const rscField = event.resourcesField.find(r => r.type.$ref === typeDef.$id);
-        if (!rscField) {
-            return undefined;
-        }
-        // Get the target property
-        let targetProp;
-        const sanitizePropName = (name) => name.replace(/[^a-zA-Z0-9]/g, '').toLowerCase();
-        if (!rscField.fieldName) {
-            const possibleNames = [propName, `${this.resource.name}${propName}`].map(n => sanitizePropName(n));
-            targetProp = this.referenceProps.find(r => possibleNames.includes(r.declaration.name.toLowerCase()));
-            if (!targetProp) {
-                // Cannot throw because we don't know if the property we are looking at should be the one in the ref
-                return undefined;
-            }
-        }
-        else if (rscField.fieldName === propName) {
-            targetProp = this.referenceProps.find(r => r.declaration.name.toLowerCase() === sanitizePropName(propName));
-            if (!targetProp) {
-                // We know that we should have found something
-                throw new SkipEventError(`Could not find property ${event.name}.${propName} in the ref interface. Available properties: ${this.referenceProps.map(r => r.declaration.name).join(', ')}`);
-            }
-        }
-        else {
-            return undefined;
-        }
-        // Return accessor
-        if (prop.type.type !== 'string') {
-            throw Error(`${event.name} ${propName} is not a string, but ${prop.type.type}`);
-        }
-        return typewriter_1.expr.list([typewriter_1.expr.ident('iRef').prop(this.referenceName).prop(targetProp.declaration.name)]);
+        factory.addBody(typewriter_1.stmt.ret(this.resourceClass.newInstance(typewriter_1.expr.ident(this.context.referenceName))));
     }
 }