export type as well as value

Author: Hweinstock

packages/core/src/shared/settings.ts

@@ -620,21 +620,23 @@ export function fromExtensionManifest<T extends TypeDescriptor & Partial<Section
  */
 export const toolkitPrompts = settingsProps['aws.suppressPrompts']
 export const ToolkitPromptSettings = getPromptSettings('aws.suppressPrompts')
+export type ToolkitPromptSettings = InstanceType<typeof ToolkitPromptSettings>
 
 export const amazonQPrompts = settingsProps['amazonQ.suppressPrompts']
 export const AmazonQPromptSettings = getPromptSettings('amazonQ.suppressPrompts')
+export type AmazonQPromptSettings = InstanceType<typeof ToolkitPromptSettings>
 type promptSettingsKey = 'amazonQ.suppressPrompts' | 'aws.suppressPrompts'
 
-function getPromptSettings(promptsKey: promptSettingsKey) {
+function getPromptSettings<P extends promptSettingsKey>(promptsKey: P) {
     const prompts = settingsProps[promptsKey]
-    type promptName = keyof typeof prompts
+    type promptName = keyof typeof prompts & string
     return class AnonymousPromptSettings extends Settings.define(
         promptsKey,
         toRecord(keys(prompts), () => Boolean)
     ) {
-        public isPromptEnabled(promptName: promptName & string) {
+        public isPromptEnabled(promptName: promptName) {
             try {
-                return !this._getOrThrow(promptName, false)
+                return !this._getOrThrow(promptName, false as never)
             } catch (e) {
                 this._log('prompt check for "%s" failed: %s', promptName, (e as Error).message)
                 this.reset().catch((e) =>
@@ -645,9 +647,9 @@ function getPromptSettings(promptsKey: promptSettingsKey) {
             }
         }
 
-        public async disablePrompt(promptName: promptName & string) {
+        public async disablePrompt(promptName: promptName) {
             if (this.isPromptEnabled(promptName)) {
-                await this.update(promptName, true)
+                await this.update(promptName, true as never)
             }
         }
 

packages/core/src/test/shared/settings.test.ts

@@ -498,7 +498,7 @@ describe('PromptSetting', function () {
             it(scenario.desc, async () => {
                 await settings.update(promptSettingKey, scenario.testValue)
                 const before = settings.get(promptSettingKey, Object, {})
-                const result = await sut.isPromptEnabled(promptName)
+                const result = sut.isPromptEnabled(promptName)
 
                 assert.deepStrictEqual(result, scenario.expected)
                 assert.deepStrictEqual(