toolkit-lib shenannigans

Author: mrgrain

.projenrc.ts

@@ -1270,6 +1270,7 @@ toolkitLib.postCompileTask.exec('node build-tools/bundle.mjs');
 toolkitLib.postCompileTask.exec('node ./lib/index.js >/dev/null 2>/dev/null </dev/null');
 toolkitLib.postCompileTask.exec('node ./lib/api/aws-cdk.js >/dev/null 2>/dev/null </dev/null');
 toolkitLib.postCompileTask.exec('node ./lib/api/shared-public.js >/dev/null 2>/dev/null </dev/null');
+toolkitLib.postCompileTask.exec('node ./lib/api/shared-private.js >/dev/null 2>/dev/null </dev/null');
 toolkitLib.postCompileTask.exec('node ./lib/private/util.js >/dev/null 2>/dev/null </dev/null');
 
 // Do include all .ts files inside init-templates

packages/@aws-cdk/toolkit-lib/.projen/tasks.json

@@ -1,8 +1,9 @@
 import type * as cxapi from '@aws-cdk/cx-api';
 import { environmentsFromDescriptors } from './private';
 import type { Tag } from '../../api/aws-cdk';
-import type { ICloudAssemblySource, IIoHost } from '../../api/cloud-assembly';
+import type { ICloudAssemblySource } from '../../api/cloud-assembly';
 import { ALL_STACKS } from '../../api/cloud-assembly/private';
+import type { IIoHost } from '../../api/io';
 import { asIoHelper } from '../../api/shared-private';
 import { assemblyFromSource } from '../../toolkit/private';
 

packages/@aws-cdk/toolkit-lib/lib/actions/bootstrap/index.ts

@@ -1,4 +1,4 @@
-export * from '../../api/shared-public';
+export { StackSelectionStrategy, StackSelector } from '../../api/shared-public';
 export * from './source-builder';
 export * from './types';
 

packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/index.ts

@@ -2,3 +2,4 @@
 
 export * from '../../../tmp-toolkit-helpers/src/api/io/private';
 export * from '../../../tmp-toolkit-helpers/src/private';
+export * from '../../../tmp-toolkit-helpers/src/api';

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

@@ -1,3 +1,22 @@
 /* eslint-disable import/no-restricted-paths */
 
-export * from '../../../tmp-toolkit-helpers/src/api';
+export {
+  ToolkitError,
+  AuthenticationError,
+  AssemblyError,
+  PermissionChangeType,
+  ExpandStackSelection,
+  StackSelectionStrategy,
+} from '../../../tmp-toolkit-helpers/src/api';
+
+export type {
+  IoMessageLevel,
+  IoMessageCode,
+  IIoHost,
+  IoMessage,
+  IoRequest,
+  ToolkitAction,
+  StackSelector,
+} from '../../../tmp-toolkit-helpers/src/api';
+
+export type * from '../../../tmp-toolkit-helpers/src/api/io/payloads';

packages/@aws-cdk/toolkit-lib/lib/api/shared-public.ts

@@ -1,3 +1,2 @@
 export * from './toolkit';
 export * from './non-interactive-io-host';
-export * from '../api/shared-public';

packages/@aws-cdk/toolkit-lib/lib/toolkit/index.ts

@@ -1,7 +1,7 @@
 import * as chalk from 'chalk';
+import type { IIoHost, IoMessage, IoMessageLevel, IoRequest } from '../api/io';
 import type { IActivityPrinter } from '../api/shared-private';
 import { HistoryActivityPrinter, isMessageRelevantForLevel } from '../api/shared-private';
-import type { IIoHost, IoMessage, IoMessageLevel, IoRequest } from '../api/shared-public';
 import { isCI, isTTY } from '../util/shell-env';
 
 export interface NonInteractiveIoHostProps {

packages/@aws-cdk/toolkit-lib/lib/toolkit/non-interactive-io-host.ts

@@ -30,9 +30,8 @@ import { ALL_STACKS, CloudAssemblySourceBuilder, IdentityCloudAssemblySource } f
 import type { IIoHost, IoMessageLevel } from '../api/io';
 import { IO, SPAN, asSdkLogger, withoutColor, withoutEmojis, withTrimmedWhitespace } from '../api/io/private';
 import type { IoHelper } from '../api/shared-private';
-import { asIoHelper } from '../api/shared-private';
-import type { AssemblyData, StackDetails, ToolkitAction } from '../api/shared-public';
-import { DiffFormatter, RequireApproval, ToolkitError, removeNonImportResources } from '../api/shared-public';
+import { asIoHelper, DiffFormatter, RequireApproval, ToolkitError, removeNonImportResources } from '../api/shared-private';
+import type { ToolkitAction, AssemblyData, StackDetails } from '../api/shared-public';
 import { obscureTemplate, serializeStructure, validateSnsTopicArn, formatTime, formatErrorMessage, deserializeStructure } from '../private/util';
 import { pLimit } from '../util/concurrency';
 import { promiseWithResolvers } from '../util/promises';

packages/@aws-cdk/toolkit-lib/lib/toolkit/toolkit.ts

@@ -1,6 +1,5 @@
 import type { IIoHost, IoMessage, IoMessageLevel, IoRequest } from '../../lib/api/io';
-import { asIoHelper, isMessageRelevantForLevel, type IoHelper } from '../../lib/api/shared-private';
-import { RequireApproval } from '../../lib/toolkit';
+import { asIoHelper, isMessageRelevantForLevel, RequireApproval, type IoHelper } from '../../lib/api/shared-private';
 
 /**
  * A test implementation of IIoHost that does nothing but can be spied on.