fix exporting and importing prop-injectable

Author: moelasmar

packages/aws-cdk-lib/aws-apigateway/lib/method.ts

@@ -13,9 +13,10 @@ import { IStage } from './stage';
 import { validateHttpMethod } from './util';
 import * as cloudwatch from '../../aws-cloudwatch';
 import * as iam from '../../aws-iam';
-import { propertyInjectable, Annotations, ArnFormat, FeatureFlags, Lazy, Names, Resource, Stack } from '../../core';
+import { Annotations, ArnFormat, FeatureFlags, Lazy, Names, Resource, Stack } from '../../core';
 import { ValidationError } from '../../core/lib/errors';
 import { addConstructMetadata, MethodMetadata } from '../../core/lib/metadata-resource';
+import { propertyInjectable } from '../../core/lib/prop-injectable';
 import { APIGATEWAY_REQUEST_VALIDATOR_UNIQUE_ID } from '../../cx-api';
 export interface MethodOptions {
   /**

packages/aws-cdk-lib/aws-sns/lib/policy.ts

@@ -2,8 +2,9 @@ import { Construct } from 'constructs';
 import { CfnTopicPolicy } from './sns.generated';
 import { ITopic } from './topic-base';
 import { Effect, PolicyDocument, PolicyStatement, StarPrincipal } from '../../aws-iam';
-import { propertyInjectable, Resource } from '../../core';
+import { Resource } from '../../core';
 import { addConstructMetadata } from '../../core/lib/metadata-resource';
+import { propertyInjectable } from '../../core/lib/prop-injectable';
 
 /**
  * Properties to associate SNS topics with a policy

packages/aws-cdk-lib/aws-sns/lib/subscription.ts

@@ -5,9 +5,10 @@ import { SubscriptionFilter } from './subscription-filter';
 import { ITopic } from './topic-base';
 import { PolicyStatement, ServicePrincipal } from '../../aws-iam';
 import { IQueue } from '../../aws-sqs';
-import { propertyInjectable, Resource } from '../../core';
+import { Resource } from '../../core';
 import { ValidationError } from '../../core/lib/errors';
 import { addConstructMetadata } from '../../core/lib/metadata-resource';
+import { propertyInjectable } from '../../core/lib/prop-injectable';
 
 /**
  * Options for creating a new subscription

packages/aws-cdk-lib/aws-sns/lib/topic.ts

@@ -3,9 +3,10 @@ import { CfnTopic } from './sns.generated';
 import { ITopic, TopicBase } from './topic-base';
 import { IRole } from '../../aws-iam';
 import { IKey, Key } from '../../aws-kms';
-import { ArnFormat, Lazy, Names, propertyInjectable, Stack, Token } from '../../core';
+import { ArnFormat, Lazy, Names, Stack, Token } from '../../core';
 import { ValidationError } from '../../core/lib/errors';
 import { addConstructMetadata, MethodMetadata } from '../../core/lib/metadata-resource';
+import { propertyInjectable } from '../../core/lib/prop-injectable';
 
 /**
  * Properties for a new SNS topic

packages/aws-cdk-lib/core/lib/index.ts

@@ -6,7 +6,6 @@ export * from './resolvable';
 export * from './type-hints';
 export * from './lazy';
 export * from './prop-injectors';
-export * from './prop-injectable';
 export * from './tag-manager';
 export * from './string-fragments';
 export * from './stack-synthesizers';

packages/aws-cdk-lib/core/lib/prop-injectable.ts

@@ -1,7 +1,7 @@
 import { Construct, IConstruct } from 'constructs';
 import { applyInjectors } from './prop-injectors-helpers';
 
-interface PropertyInjectableConstructConstructor {
+export interface PropertyInjectableConstructConstructor {
   readonly PROPERTY_INJECTION_ID: string;
 
   new (scope: Construct, id: string, props: any, ...args: any[]): IConstruct;

packages/aws-cdk-lib/package.json

@@ -505,6 +505,7 @@
     "./core": "./core/index.js",
     "./core/lib/helpers-internal": "./core/lib/helpers-internal/index.js",
     "./core/lib/metadata-resource": "./core/lib/metadata-resource.js",
+    "./core/lib/prop-injectable": "./core/lib/prop-injectable.js",
     "./custom-resources": "./custom-resources/index.js",
     "./custom-resources/lib/helpers-internal": "./custom-resources/lib/helpers-internal/index.js",
     "./cx-api": "./cx-api/index.js",