builder-settings-types 0.0.233 → 0.0.235

package/dist/base/settings-group/settingsGroup.d.ts

@@ -1,6 +1,6 @@
 import { IChangable, IDrawable } from '../drawable';
 import { SettingsMap, SettingChild, ExtractSettingValues, ExtractSettingValuesOptional, SettingChangeCallback, SettingBlurCallback, MobileSettingValues, SettingIteratorCallback } from '../../types/index';
-export type AddItemConfig<TSettings extends SettingsMap> = {
+export type AddItemConfig = {
     buttonLabel?: string;
     keyPrefix: string;
     createItem: (index: number) => SettingChild;
@@ -18,7 +18,7 @@ export type SettingGroupProps<TSettings extends SettingsMap> = {
     main?: boolean;
     custom?: boolean;
     includeGetJson?: boolean;
-    addItem?: AddItemConfig<TSettings>;
+    addItem?: AddItemConfig;
     deleteItem?: DeleteItemConfig;
 };
 export declare function iterateSettings<TSettings extends SettingsMap>(settings: TSettings, callback: SettingIteratorCallback<TSettings>): void;

package/dist/types/index.d.ts

@@ -19,29 +19,36 @@ export type SettingInstance<T extends AnySettingValue = AnySettingValue> = Setti
 export type SettingChild<T extends AnySettingValue = AnySettingValue> = SettingInstance<T> | SettingGroup<any>;
 export type SettingsMap = Record<string, Setting<any, any> | SettingGroup<any>>;
 export type SettingGroupInstance<TSettings extends SettingsMap = SettingsMap> = SettingGroup<TSettings>;
-export type ExtractSettingValue<T> = T extends Setting<infer V, any> ? V : T extends NumberSetting ? number : T extends StringSetting ? string : T extends ColorWithOpacitySetting ? string : T extends Toggle ? string : T extends UploadSetting ? string : T extends MarginTopSetting ? number : T extends SelectApiSettings<infer U> ? U : T extends SelectSetting<infer U> ? U : T extends MultiLanguageSetting ? MultiLanguageValue : T extends AlignSetting ? AlignValue : T extends BorderSettingSet ? {
+type HasAlignSetting<T> = T extends SettingGroup<infer S> ? "align" extends keyof S ? true : false : false;
+type HeaderTypographyValues<T> = T extends SettingGroup<infer S> ? {
     readonly color: string;
-    readonly radius: number;
-    readonly size: number;
-} : T extends HeaderTypographySettingSet ? {
+    readonly fontFamily: string;
+    readonly fontWeight: string;
+    readonly fontSize: number;
+} & (HasAlignSetting<T> extends true ? {
+    readonly align: AlignValue;
+} : {}) : T extends {
+    getValues(): infer R;
+} ? R : {
     readonly color: string;
     readonly fontFamily: string;
     readonly fontWeight: string;
     readonly fontSize: number;
-    readonly align?: string;
-} : never;
+    readonly align?: AlignValue;
+};
+export type ExtractSettingValue<T> = T extends Setting<infer V, any> ? V : T extends NumberSetting ? number : T extends StringSetting ? string : T extends ColorWithOpacitySetting ? string : T extends Toggle ? string : T extends UploadSetting ? string : T extends MarginTopSetting ? number : T extends SelectApiSettings<infer U> ? U : T extends SelectSetting<infer U> ? U : T extends MultiLanguageSetting ? MultiLanguageValue : T extends AlignSetting ? AlignValue : T extends BorderSettingSet ? {
+    readonly color: string;
+    readonly radius: number;
+    readonly size: number;
+} : T extends {
+    getValues(): infer R;
+} ? R : never;
 export type ExtractSettingValues<TSettings extends SettingsMap> = {
     readonly [K in keyof TSettings]: TSettings[K] extends Setting<infer V, any> ? V : TSettings[K] extends NumberSetting ? number : TSettings[K] extends StringSetting ? string : TSettings[K] extends ColorWithOpacitySetting ? string : TSettings[K] extends Toggle ? string : TSettings[K] extends UploadSetting ? string : TSettings[K] extends MarginTopSetting ? number : TSettings[K] extends SelectApiSettings<infer U> ? U : TSettings[K] extends SelectSetting<infer U> ? U : TSettings[K] extends MultiLanguageSetting ? MultiLanguageValue : TSettings[K] extends AlignSetting ? AlignValue : TSettings[K] extends BorderSettingSet ? {
         readonly color: string;
         readonly radius: number;
         readonly size: number;
-    } : TSettings[K] extends HeaderTypographySettingSet ? {
-        readonly color: string;
-        readonly fontFamily: string;
-        readonly fontWeight: string;
-        readonly fontSize: number;
-        readonly align?: string;
-    } : TSettings[K] extends SettingGroup<infer S> ? ExtractSettingValues<S> : TSettings[K] extends {
+    } : TSettings[K] extends HeaderTypographySettingSet ? HeaderTypographyValues<TSettings[K]> : TSettings[K] extends SettingGroup<infer S> ? ExtractSettingValues<S> : TSettings[K] extends {
         value: infer U;
     } ? U : TSettings[K] extends {
         getValues(): infer R;
@@ -65,6 +72,8 @@ export declare function isSettingGroup(value: unknown): value is SettingGroupIns
 export declare function isSettingChild(value: unknown): value is SettingChild;
 export type SettingIteratorCallback<TSettings extends SettingsMap> = (key: keyof TSettings, setting: TSettings[typeof key]) => void;
 export type SettingsToProps<T> = T extends SettingGroup<infer S> ? ExtractSettingValues<S> : T extends {
+    settings: infer S;
+} ? S extends SettingsMap ? ExtractSettingValues<S> : never : T extends {
     getValues(): infer R;
-} ? R : T extends SettingsMap ? ExtractSettingValues<T> : never;
+} ? R : T extends SettingsMap ? ExtractSettingValues<T> : T extends Setting<infer V, any> ? V : unknown;
 export type { Setting, SettingGroup };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "builder-settings-types",
   "description": "builder settings",
-  "version": "0.0.233",
+  "version": "0.0.235",
   "type": "module",
   "main": "dist/builder-settings-types.cjs.js",
   "module": "dist/builder-settings-types.es.js",