private and improve bundle.mjs

Author: mrgrain

packages/@aws-cdk/tmp-toolkit-helpers/src/api/io/index.ts

@@ -2,4 +2,3 @@ export * from './io-host';
 export * from './io-message';
 export * from './toolkit-action';
 export * from './payloads';
-export * from './messages';

packages/@aws-cdk/tmp-toolkit-helpers/src/api/io/payloads/stack-activity.ts

@@ -1,5 +1,5 @@
-import { type MetadataEntry } from '@aws-cdk/cloud-assembly-schema';
-import { type CloudFormationStackArtifact } from '@aws-cdk/cx-api';
+import type { MetadataEntry } from '@aws-cdk/cloud-assembly-schema';
+import type { CloudFormationStackArtifact } from '@aws-cdk/cx-api';
 import type { StackEvent } from '@aws-sdk/client-cloudformation';
 import type { StackProgress } from './progress';
 

packages/@aws-cdk/tmp-toolkit-helpers/src/api/io/payloads/watch.ts

@@ -1,4 +1,3 @@
-
 /**
  * The computed file watch settings
  */

packages/@aws-cdk/tmp-toolkit-helpers/src/api/io/private/index.ts

@@ -2,4 +2,5 @@ export * from './io-helper';
 export * from './level-priority';
 export * from './marker';
 export * from './message-maker';
+export * from './messages';
 export * from './types';

…p-toolkit-helpers/src/api/io/messages.ts …t-helpers/src/api/io/private/messages.tspackages/@aws-cdk/tmp-toolkit-helpers/src/api/io/messages.ts renamed to packages/@aws-cdk/tmp-toolkit-helpers/src/api/io/private/messages.ts packages/@aws-cdk/tmp-toolkit-helpers/src/api/io/messages.ts renamed to packages/@aws-cdk/tmp-toolkit-helpers/src/api/io/private/messages.ts

@@ -1,17 +1,17 @@
 import type * as cxapi from '@aws-cdk/cx-api';
-import type { BootstrapEnvironmentProgress } from './payloads/bootstrap-environment-progress';
-import type { MissingContext, UpdatedContext } from './payloads/context';
-import type { BuildAsset, DeployConfirmationRequest, PublishAsset, StackDeployProgress, SuccessfulDeployStackResult } from './payloads/deploy';
-import type { StackDestroy, StackDestroyProgress } from './payloads/destroy';
-import type { StackDetailsPayload } from './payloads/list';
-import type { StackRollbackProgress } from './payloads/rollback';
-import type { SdkTrace } from './payloads/sdk-trace';
-import type { StackActivity, StackMonitoringControlEvent } from './payloads/stack-activity';
-import type { StackSelectionDetails } from './payloads/synth';
-import type { AssemblyData, ConfirmationRequest, Duration, ErrorPayload, StackAndAssemblyData } from './payloads/types';
-import type { FileWatchEvent, WatchSettings } from './payloads/watch';
-import type { MarkerDefinition } from './private/marker';
-import * as make from './private/message-maker';
+import type { MarkerDefinition } from './marker';
+import * as make from './message-maker';
+import type { BootstrapEnvironmentProgress } from '../payloads/bootstrap-environment-progress';
+import type { MissingContext, UpdatedContext } from '../payloads/context';
+import type { BuildAsset, DeployConfirmationRequest, PublishAsset, StackDeployProgress, SuccessfulDeployStackResult } from '../payloads/deploy';
+import type { StackDestroy, StackDestroyProgress } from '../payloads/destroy';
+import type { StackDetailsPayload } from '../payloads/list';
+import type { StackRollbackProgress } from '../payloads/rollback';
+import type { SdkTrace } from '../payloads/sdk-trace';
+import type { StackActivity, StackMonitoringControlEvent } from '../payloads/stack-activity';
+import type { StackSelectionDetails } from '../payloads/synth';
+import type { AssemblyData, ConfirmationRequest, Duration, ErrorPayload, StackAndAssemblyData } from '../payloads/types';
+import type { FileWatchEvent, WatchSettings } from '../payloads/watch';
 
 /**
  * We have a rough system by which we assign message codes:

packages/@aws-cdk/toolkit-lib/build-tools/bundle.mjs

@@ -15,6 +15,15 @@ const copyFromCli = (from, to = undefined) => {
 const bundleDeclarations = async (entryPoints) => {
   const results = generateDtsBundle(entryPoints.map(filePath => ({
     filePath,
+    libraries: {
+      importedLibraries: [
+        '@aws-cdk/cx-api',
+        '@aws-cdk/cloud-assembly-schema',
+        '@aws-sdk/client-cloudformation',
+        'aws-cdk-lib',
+        'cdk-assets',
+      ],
+    },
     output: {
       noBanner: true,
       exportReferencedTypes: false,
@@ -30,10 +39,13 @@ const bundleDeclarations = async (entryPoints) => {
   return Promise.all(files);
 }
 
+// for the shared public API we also need to bundle the types
+const declarations = bundleDeclarations(['lib/api/shared-public.ts']);
+
 
 // This is a build script, we are fine
 // eslint-disable-next-line @cdklabs/promiseall-no-unbounded-parallelism
-await Promise.all([
+const resources = Promise.all([
   copyFromCli(['build-info.json']),
   copyFromCli(['/db.json.gz']),
   copyFromCli(['lib', 'index_bg.wasm']),
@@ -44,7 +56,7 @@ await Promise.all([
 ]);
 
 // bundle entrypoints from the library packages
-await esbuild.build({
+const bundle = esbuild.build({
   outdir: 'lib',
   entryPoints: [
     'lib/api/aws-cdk.ts',
@@ -59,5 +71,9 @@ await esbuild.build({
   bundle: true,
 });
 
-// for the shared public API we also need to bundle the types
-await bundleDeclarations(['lib/api/shared-public.ts']);
+// Do all the work in parallel
+await Promise.all([
+  bundle,
+  resources,
+  declarations
+]);

packages/@aws-cdk/toolkit-lib/lib/api/io/private/index.ts

@@ -1,3 +1,4 @@
-export * from '../../shared-public';
+export { IO, MARKER } from '../../shared-private';
 export * from './io-host-wrappers';
 export * from './sdk-logger';
+

packages/@aws-cdk/toolkit-lib/lib/api/io/private/sdk-logger.ts

@@ -3,7 +3,7 @@ import { inspect } from 'util';
 import type { Logger } from '@smithy/types';
 import { replacerBufferWithInfo } from '../../../private/util';
 import type { IoHelper } from '../../shared-private';
-import { IO } from '../../shared-public';
+import { IO } from '../../shared-private';
 
 export function asSdkLogger(ioHost: IoHelper): Logger {
   return new class implements Logger {

packages/@aws-cdk/toolkit-lib/scripts/gen-code-registry.ts

@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import * as util from 'util';
-import { IO } from '../lib/api/shared-public';
+import { IO } from '../lib/api/shared-private';
 
 function codesToMarkdownTable(codes: Record<string, {
   code: string;

packages/aws-cdk/lib/api/aws-auth/sdk-logger.ts

@@ -1,7 +1,6 @@
 import { inspect, format } from 'util';
 import { Logger } from '@smithy/types';
-import { IO } from '../../../../@aws-cdk/tmp-toolkit-helpers/src/api/io/messages';
-import { IoHelper } from '../../../../@aws-cdk/tmp-toolkit-helpers/src/api/io/private';
+import { IoHelper, IO } from '../../../../@aws-cdk/tmp-toolkit-helpers/src/api/io/private';
 import { replacerBufferWithInfo } from '../../util';
 
 export class SdkToCliLogger implements Logger {