@das-fed/upf-utils 6.4.0-dev.245 → 6.4.0-dev.247

package/esm-map.json

@@ -239,5 +239,7 @@
   "DAS_UI_THEME_BRIDGE_ITEMS": "/theme/index",
   "UPF_COMPONENT_THEME_BRIDGE_ITEMS": "/theme/index",
   "getHostThemeSnapshotFromWindowName": "/theme/index",
-  "clonePresetTheme": "/theme/presets/index"
+  "clonePresetTheme": "/theme/presets/index",
+  "normalizeHexColor": "/theme/index",
+  "resolvePrimaryBgColor": "/theme/index"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@das-fed/upf-utils",
-  "version": "6.4.0-dev.245",
+  "version": "6.4.0-dev.247",
   "description": "",
   "type": "module",
   "main": "./index.js",
@@ -22,8 +22,8 @@
   },
   "devDependencies": {
     "@babel/preset-env": "7.26.0",
-    "@das-fed/upf-cli": "6.4.0-dev.245",
-    "@das-fed/upf-web": "6.4.0-dev.245",
+    "@das-fed/upf-cli": "6.4.0-dev.247",
+    "@das-fed/upf-web": "6.4.0-dev.247",
     "@rollup/plugin-babel": "6.0.4",
     "@types/js-cookie": "^3.0.6",
     "@types/lodash-es": "^4.17.12",

package/theme/color.d.ts

@@ -0,0 +1,7 @@
+declare const WHITE_COLOR = "#ffffff";
+declare const BLACK_COLOR = "#000000";
+export declare const normalizeHexColor: (color: string) => any;
+export declare const mixHexColor: (foreground: string, background: string, foregroundWeight: number, fallback: string) => string;
+export declare const toRgbaColor: (color: string, alpha: number, fallback: string) => string;
+export declare const resolvePrimaryBgColor: (primaryColor: string, backgroundColor?: string) => string;
+export { BLACK_COLOR, WHITE_COLOR };

package/theme/es5.d.ts

@@ -1,7 +1,13 @@
 import { BUILTIN_PRESET_THEME_NAMES, PRESET_THEMES, BuiltinPresetThemeConfig, BuiltinPresetThemeName } from './presets';
+import { mixHexColor, toRgbaColor } from './color';
 
+export { mixHexColor, normalizeHexColor, resolvePrimaryBgColor, toRgbaColor } from './color';
 export type ThemeVariables = Record<string, string>;
 type ThemeVariableSource = Record<string, string | undefined>;
+export interface ThemeBridgeVariableResolveOptions {
+    themeName?: string;
+    basePresetName?: string;
+}
 export interface ThemeConfig {
     name?: string;
     basePresetName?: string;
@@ -34,9 +40,11 @@ export interface DefaultThemeStyleOptions extends ApplyThemeVariablesOptions {
 export interface ThemeBridgeResolveContext<TVariables extends object = ThemeVariables> {
     variables: TVariables;
     result: Record<string, string>;
+    themeName?: string;
+    basePresetName?: string;
 }
 export interface ThemeBridgeVariableItem<TVariables extends object = ThemeVariables> {
-    target: string;
+    target: string | readonly string[];
     from?: keyof TVariables | string;
     value?: string;
     resolve?: (context: ThemeBridgeResolveContext<TVariables> & {
@@ -53,6 +61,8 @@ export interface ApplyThemeVariablesOptions {
     includeElementAndDasUiBridges?: boolean;
     /** 写入 data-theme 的主题名。 */
     themeName?: string;
+    /** 当前主题基础预设名，用于自定义主题继承预设差异化 token。 */
+    basePresetName?: string;
     /** 写入 data-skin 的皮肤名；传 null 时移除。 */
     skinName?: string | null;
 }
@@ -72,18 +82,20 @@ export type HostThemeRootSyncOptions = SubAppThemeSyncOptions;
 export interface RuntimeThemeVariableBuildOptions {
     /** 是否写入 Element Plus 与 das-ui/das 历史兼容变量；默认 true。 */
     includeElementAndDasUiBridges?: boolean;
+    /** 当前主题名，用于按预设差异化桥接局部组件 token。 */
+    themeName?: string;
+    /** 当前主题基础预设名，自定义主题可通过该字段继承预设差异。 */
+    basePresetName?: string;
 }
-export declare const mixHexColor: (foreground: string, background: string, foregroundWeight: number, fallback: string) => string;
-export declare const toRgbaColor: (color: string, alpha: number, fallback: string) => string;
-export declare const resolveThemeBridgeVariables: <TVariables extends object = ThemeVariables>(variables: TVariables, items: readonly ThemeBridgeVariableItem<TVariables>[]) => any;
+export declare const resolveThemeBridgeVariables: <TVariables extends object = ThemeVariables>(variables: TVariables, items: readonly ThemeBridgeVariableItem<TVariables>[], options?: ThemeBridgeVariableResolveOptions) => any;
 export declare const LEGACY_THEME_BRIDGE_ITEMS: ThemeBridgeVariableItem[];
 export declare const ELEMENT_THEME_BRIDGE_ITEMS: ThemeBridgeVariableItem[];
 export declare const DAS_UI_THEME_BRIDGE_ITEMS: ThemeBridgeVariableItem[];
 export declare const UPF_COMPONENT_THEME_BRIDGE_ITEMS: ThemeBridgeVariableItem[];
-export declare const toLegacyThemeVariables: (variables: object) => any;
-export declare const toElementThemeVariables: (variables: object) => any;
-export declare const toDasUiColorOverrides: (variables: object) => any;
-export declare const toUpfComponentThemeVariables: (variables: object) => any;
+export declare const toLegacyThemeVariables: (variables: object, options?: ThemeBridgeVariableResolveOptions) => any;
+export declare const toElementThemeVariables: (variables: object, options?: ThemeBridgeVariableResolveOptions) => any;
+export declare const toDasUiColorOverrides: (variables: object, options?: ThemeBridgeVariableResolveOptions) => any;
+export declare const toUpfComponentThemeVariables: (variables: object, options?: ThemeBridgeVariableResolveOptions) => any;
 export declare const buildRuntimeThemeVariables: (variables: object, options?: RuntimeThemeVariableBuildOptions) => Record<string, string>;
 export { BUILTIN_PRESET_THEME_NAMES, PRESET_THEMES };
 export declare const getPresetTheme: (themeName: string) => any;