From 8c32d9af53826b701129c01e94b53c9d0a69896f Mon Sep 17 00:00:00 2001
From: yassinedorbozgithub <yassine.dorboz.2022@gmail.com>
Date: Mon, 2 Jun 2025 09:16:13 +0100
Subject: [PATCH] fix(api): apply feedback

---
 api/src/channel/types.ts         | 13 +++++--------
 api/src/helper/types.ts          | 10 ++++------
 api/src/plugins/types.ts         |  4 ++--
 api/src/setting/schemas/types.ts |  4 ++--
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/api/src/channel/types.ts b/api/src/channel/types.ts
index 7269a38c..18d8348d 100644
--- a/api/src/channel/types.ts
+++ b/api/src/channel/types.ts
@@ -1,19 +1,16 @@
 /*
- * Copyright © 2024 Hexastack. All rights reserved.
+ * Copyright © 2025 Hexastack. All rights reserved.
  *
  * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms:
  * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission.
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { AnySetting, StrictSetting } from '@/setting/schemas/types';
+import { ExtensionSetting } from '@/setting/schemas/types';
 import { HyphenToUnderscore } from '@/utils/types/extension';
 
 export type ChannelName = `${string}-channel`;
 
-export type ChannelSetting<N extends string = string> = StrictSetting<
-  AnySetting,
-  {
-    group: HyphenToUnderscore<N>;
-  }
->;
+export type ChannelSetting<N extends string = string> = ExtensionSetting<{
+  group: HyphenToUnderscore<N>;
+}>;
diff --git a/api/src/helper/types.ts b/api/src/helper/types.ts
index a6c841e0..658c95c3 100644
--- a/api/src/helper/types.ts
+++ b/api/src/helper/types.ts
@@ -6,7 +6,7 @@
  * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file).
  */
 
-import { AnySetting, StrictSetting } from '@/setting/schemas/types';
+import { ExtensionSetting } from '@/setting/schemas/types';
 import { HyphenToUnderscore } from '@/utils/types/extension';
 
 import BaseHelper from './lib/base-helper';
@@ -116,9 +116,7 @@ export type HelperRegistry<H extends BaseHelper = BaseHelper> = Map<
   Map<string, H>
 >;
 
-export type HelperSetting<N extends HelperName = HelperName> = StrictSetting<
-  AnySetting,
-  {
+export type HelperSetting<N extends HelperName = HelperName> =
+  ExtensionSetting<{
     group: HyphenToUnderscore<N>;
-  }
->;
+  }>;
diff --git a/api/src/plugins/types.ts b/api/src/plugins/types.ts
index 09a3beac..0f4be5ed 100644
--- a/api/src/plugins/types.ts
+++ b/api/src/plugins/types.ts
@@ -10,7 +10,7 @@ import { ChannelEvent } from '@/channel/lib/EventWrapper';
 import { BlockCreateDto } from '@/chat/dto/block.dto';
 import { Block } from '@/chat/schemas/block.schema';
 import { Conversation } from '@/chat/schemas/conversation.schema';
-import { AnySetting, StrictSetting } from '@/setting/schemas/types';
+import { ExtensionSetting } from '@/setting/schemas/types';
 
 export type PluginName = `${string}-plugin`;
 
@@ -23,7 +23,7 @@ export interface CustomBlocks {}
 
 type BlockAttrs = Partial<BlockCreateDto> & { name: string };
 
-export type PluginSetting = StrictSetting<AnySetting>;
+export type PluginSetting = ExtensionSetting;
 
 export type PluginBlockTemplate = Omit<
   BlockAttrs,
diff --git a/api/src/setting/schemas/types.ts b/api/src/setting/schemas/types.ts
index 1e99713d..a0aee11c 100644
--- a/api/src/setting/schemas/types.ts
+++ b/api/src/setting/schemas/types.ts
@@ -131,9 +131,9 @@ export type AnySetting =
 
 export type SettingDict = { [group: string]: Setting[] };
 
-export type StrictSetting<
-  U,
+export type ExtensionSetting<
   E extends object = object,
+  U extends AnySetting = AnySetting,
   K extends keyof BaseSchema = keyof BaseSchema,
 > = U extends any
   ? {