feat(mixins-preview): L1 property mixins have typed relationships

Author: mrgrain

packages/@aws-cdk/mixins-preview/scripts/spec2mixins/builder.ts

@@ -126,7 +126,7 @@ class L1PropsMixin extends ClassType {
       },
     });
 
-    this.relationshipDecider = new RelationshipDecider(this.resource, db, false);
+    this.relationshipDecider = new RelationshipDecider(this.resource, db, true, true);
     this.converter = TypeConverter.forMixin({
       db: db,
       resource: this.resource,

tools/@aws-cdk/spec2cdk/lib/cdk/relationship-decider.ts

@@ -5,20 +5,6 @@ import { ResourceReference } from './reference-props';
 import { log } from '../util';
 import { SelectiveImport } from './service-submodule';
 
-/**
- * We currently disable the relationship on the properties of types because they would create a backwards incompatible change
- * by broadening the output type as types are used both in input and output. This represents:
- * Relationship counts:
- *   Resource-level (non-nested): 598
- *   Type-level (nested):         483 <- these are disabled by this flag
- *   Total:                       1081
- * Properties with relationships:
- *   Resource-level (non-nested): 493
- *   Type-level (nested):         358
- *   Total:                       851
- */
-export const GENERATE_RELATIONSHIPS_ON_TYPES = false;
-
 /**
  * Represents a cross-service property relationship that enables references
  * between resources from different AWS services.
@@ -41,7 +27,24 @@ export class RelationshipDecider {
   private readonly namespace: string;
   public readonly imports = new Array<SelectiveImport>();
 
-  constructor(readonly resource: Resource, private readonly db: SpecDatabase, private readonly enableRelationships = true) {
+  constructor(
+    readonly resource: Resource,
+    private readonly db: SpecDatabase,
+    public readonly enableRelationships = true,
+    /**
+     * We currently disable the relationship on the properties of types because they would create a backwards incompatible change
+     * by broadening the output type as types are used both in input and output. This represents:
+     * Relationship counts:
+     *   Resource-level (non-nested): 598
+     *   Type-level (nested):         483 <- these are disabled by this flag
+     *   Total:                       1081
+     * Properties with relationships:
+     *   Resource-level (non-nested): 493
+     *   Type-level (nested):         358
+     *   Total:                       851
+     */
+    public readonly enableNestedRelationships = false,
+  ) {
     this.namespace = namespaceFromResource(resource);
   }
 
@@ -146,7 +149,7 @@ export class RelationshipDecider {
    * Checks if a given property needs a flattening function or not
    */
   public needsFlatteningFunction(propName: string, prop: Property, visited = new Set<string>()): boolean {
-    if (!GENERATE_RELATIONSHIPS_ON_TYPES) {
+    if (!this.enableNestedRelationships) {
       return false;
     }
     if (this.hasValidRelationships(propName, prop.relationshipRefs)) {

tools/@aws-cdk/spec2cdk/lib/cdk/resolver-builder.ts

@@ -1,7 +1,7 @@
 import { DefinitionReference, Property } from '@aws-cdk/service-spec-types';
 import { expr, Expression, Module, Type } from '@cdklabs/typewriter';
 import { CDK_CORE } from './cdk';
-import { RelationshipDecider, Relationship, GENERATE_RELATIONSHIPS_ON_TYPES } from './relationship-decider';
+import { RelationshipDecider, Relationship } from './relationship-decider';
 import { NON_RESOLVABLE_PROPERTY_NAMES } from './tagging';
 import { TypeConverter } from './type-converter';
 import { flattenFunctionNameFromType, propertyNameFromCloudFormation } from '../naming';
@@ -29,7 +29,7 @@ export class ResolverBuilder {
   ) {}
 
   public buildResolver(prop: Property, cfnName: string, isTypeProp = false): ResolverResult {
-    const shouldGenerateRelationships = isTypeProp ? GENERATE_RELATIONSHIPS_ON_TYPES : true;
+    const shouldGenerateRelationships = isTypeProp ? this.relationshipDecider.enableNestedRelationships : true;
     const name = propertyNameFromCloudFormation(cfnName);
     const baseType = this.converter.typeFromProperty(prop);