refactor

Author: mrgrain

.projenrc.ts

@@ -1253,6 +1253,8 @@ toolkitLib.postCompileTask.exec('node build-tools/bundle.mjs');
 // Smoke test built JS files
 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/private/util.js >/dev/null 2>/dev/null </dev/null');
 
 // Do include all .ts files inside init-templates
 toolkitLib.npmignore?.addPatterns(

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

@@ -4,7 +4,9 @@ export * from './bool';
 export * from './bytes';
 export * from './cloudformation';
 export * from './content-hash';
+export * from './directories';
 export * from './format-error';
+export * from './json';
 export * from './objects';
 export * from './parallel';
 export * from './serialize';

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

@@ -27,6 +27,7 @@ await esbuild.build({
   entryPoints: [
     'lib/api/aws-cdk.ts',
     'lib/api/shared-public.ts', 
+    'lib/private/util.ts',
   ],
   target: 'node18',
   platform: 'node',

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

@@ -14,13 +14,6 @@ export { type WorkGraph, WorkGraphBuilder, AssetBuildNode, AssetPublishNode, Sta
 // Context Providers
 export * as contextproviders from '../../../../aws-cdk/lib/context-providers';
 
-// utils
-export { formatTime } from '../../../../aws-cdk/lib/util/string-manipulation';
-export { formatErrorMessage } from '../../../../aws-cdk/lib/util/format-error';
-export { obscureTemplate, serializeStructure } from '../../../../aws-cdk/lib/util/serialize';
-export { validateSnsTopicArn } from '../../../../aws-cdk/lib/util/cloudformation';
-export { splitBySize } from '../../../../aws-cdk/lib/util/objects';
-
 // @todo APIs not clean import
 export { HotswapMode } from '../../../../aws-cdk/lib/api/hotswap/common';
 export { HotswapPropertyOverrides, EcsHotswapProperties } from '../../../../aws-cdk/lib/api/hotswap/common';

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

@@ -4,7 +4,8 @@ import * as cxschema from '@aws-cdk/cloud-assembly-schema';
 import * as cxapi from '@aws-cdk/cx-api';
 import * as fs from 'fs-extra';
 import { lte } from 'semver';
-import { prepareDefaultEnvironment as oldPrepare, prepareContext, spaceAvailableForContext, Settings, loadTree, some, splitBySize, versionNumber } from '../../../api/aws-cdk';
+import { prepareDefaultEnvironment as oldPrepare, prepareContext, spaceAvailableForContext, Settings, loadTree, some, versionNumber } from '../../../api/aws-cdk';
+import { splitBySize } from '../../../private/util';
 import { ToolkitServices } from '../../../toolkit/private';
 import { ActionAwareIoHost, asLogger, CODES, error } from '../../io/private';
 import { ToolkitError } from '../../shared-public';

packages/@aws-cdk/toolkit-lib/lib/api/cloud-assembly/private/prepare-source.ts

@@ -1,7 +1,7 @@
 import { CodeInfo, CODES } from './codes';
 import { info } from './messages';
 import { ActionAwareIoHost } from './types';
-import { formatTime } from '../../aws-cdk';
+import { formatTime } from '../../../private/util';
 
 /**
  * Helper class to measure the time of code.

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

@@ -1,4 +1,3 @@
 /* eslint-disable import/no-restricted-paths */
 
-// APIs
 export * from '../../../tmp-toolkit-helpers/src/api';

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

@@ -0,0 +1,3 @@
+/* eslint-disable import/no-restricted-paths */
+
+export * from '../../../tmp-toolkit-helpers/src/util';

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

@@ -15,12 +15,13 @@ import { type SynthOptions } from '../actions/synth';
 import { WatchOptions } from '../actions/watch';
 import { patternsArrayForWatch } from '../actions/watch/private';
 import { type SdkConfig } from '../api/aws-auth';
-import { DEFAULT_TOOLKIT_STACK_NAME, SdkProvider, SuccessfulDeployStackResult, StackCollection, Deployments, HotswapMode, ResourceMigrator, obscureTemplate, serializeStructure, tagsForStack, CliIoHost, validateSnsTopicArn, Concurrency, WorkGraphBuilder, AssetBuildNode, AssetPublishNode, StackNode, formatErrorMessage, CloudWatchLogEventMonitor, findCloudWatchLogGroups, formatTime, StackDetails } from '../api/aws-cdk';
+import { DEFAULT_TOOLKIT_STACK_NAME, SdkProvider, SuccessfulDeployStackResult, StackCollection, Deployments, HotswapMode, ResourceMigrator, tagsForStack, CliIoHost, Concurrency, WorkGraphBuilder, AssetBuildNode, AssetPublishNode, StackNode, CloudWatchLogEventMonitor, findCloudWatchLogGroups, StackDetails } from '../api/aws-cdk';
 import { ICloudAssemblySource, StackSelectionStrategy } from '../api/cloud-assembly';
 import { ALL_STACKS, CachedCloudAssemblySource, CloudAssemblySourceBuilder, IdentityCloudAssemblySource, StackAssembly } from '../api/cloud-assembly/private';
 import { IIoHost, IoMessageCode, IoMessageLevel } from '../api/io';
 import { asSdkLogger, withAction, Timer, confirm, error, info, success, warn, ActionAwareIoHost, debug, result, withoutEmojis, withoutColor, withTrimmedWhitespace, CODES } from '../api/io/private';
 import { ToolkitError } from '../api/shared-public';
+import { obscureTemplate, serializeStructure, validateSnsTopicArn, formatTime, formatErrorMessage } from '../private/util';
 
 /**
  * The current action being performed by the CLI. 'none' represents the absence of an action.