fix: move default voice to base settings (COR-000) (#544)

voiceflow · Sep 24, 2024 · bfbb3db · bfbb3db
1 parent 5262759
commit bfbb3db
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/packages/base-types/src/version/settings.ts b/packages/base-types/src/version/settings.ts
@@ -38,6 +38,7 @@ export interface Settings<Prompt = unknown> {
   session: Session<Prompt>;
   defaultCanvasNodeVisibility: Nullable<Utils.CanvasNodeVisibility>;
   defaultCarouselLayout?: Nullable<CarouselLayout>;
+  defaultVoice?: Nullable<string>;
 
   globalNoReply?: {
     prompt?: Nullable<Prompt> | undefined;
@@ -61,6 +62,7 @@ export const defaultSettings = <Prompt>({
   error = null,
   repeat = RepeatType.ALL,
   session = { type: SessionType.RESTART },
+  defaultVoice = null,
   defaultCanvasNodeVisibility = null,
   defaultCarouselLayout = null,
 
@@ -72,6 +74,7 @@ export const defaultSettings = <Prompt>({
   error,
   repeat,
   session,
+  defaultVoice,
   defaultCanvasNodeVisibility,
   defaultCarouselLayout,
 

diff --git a/packages/voice-types/src/version/index.ts b/packages/voice-types/src/version/index.ts
@@ -7,17 +7,19 @@ import { defaultSettings } from './settings';
 
 export * from './settings';
 
-export interface PlatformData<Voice> extends BaseVersion.PlatformData<Prompt<Voice>> {
+export interface PlatformData<Voice extends string> extends BaseVersion.PlatformData<Prompt<Voice>> {
   intents: Intent<Voice>[];
   settings: Settings<Voice>;
 }
 
-export interface Version<Voice, Prototype extends BaseModels.Version.Prototype = BaseModels.Version.Prototype>
-  extends BaseVersion.Version<Prompt<Voice>, Prototype> {
+export interface Version<
+  Voice extends string,
+  Prototype extends BaseModels.Version.Prototype = BaseModels.Version.Prototype,
+> extends BaseVersion.Version<Prompt<Voice>, Prototype> {
   platformData: PlatformData<Voice>;
 }
 
-export const defaultPlatformData = <Voice>(
+export const defaultPlatformData = <Voice extends string>(
   { intents = [], settings = {}, ...data }: DeepPartialByKey<PlatformData<Voice>, 'settings'>,
   params: DefaultSettingsParams<Voice>
 ): PlatformData<Voice> => ({

diff --git a/packages/voice-types/src/version/settings.ts b/packages/voice-types/src/version/settings.ts
@@ -3,7 +3,7 @@ import { prompt } from '@voice-types/utils';
 import type { Nullable } from '@voiceflow/base-types';
 import { BaseVersion } from '@voiceflow/base-types';
 
-export interface Settings<Voice> extends BaseVersion.Settings<Prompt<Voice>> {
+export interface Settings<Voice extends string> extends BaseVersion.Settings<Prompt<Voice>> {
   session: BaseVersion.Session<Prompt<Voice>>;
   defaultVoice: Nullable<Voice>;
 }
@@ -12,7 +12,7 @@ export interface DefaultSettingsParams<Voice> {
   defaultPromptVoice: Voice;
 }
 
-export const defaultSettings = <Voice>(
+export const defaultSettings = <Voice extends string>(
   { error, defaultVoice = null, ...baseSettings }: Partial<Settings<Voice>>,
   { defaultPromptVoice }: DefaultSettingsParams<Voice>
 ): Settings<Voice> => ({

diff --git a/packages/voiceflow-types/src/version/chat/settings.ts b/packages/voiceflow-types/src/version/chat/settings.ts
@@ -3,9 +3,7 @@ import { ChatVersion } from '@voiceflow/chat-types';
 import type { BaseSettings } from '../base';
 import { defaultBaseSettings } from '../base';
 
-export interface SharedChatSettings extends ChatVersion.Settings {
-  defaultVoice?: string;
-}
+export interface SharedChatSettings extends ChatVersion.Settings {}
 
 export interface ChatSettings extends SharedChatSettings, BaseSettings {}