@funhub/platform 0.2.8 → 0.2.9

package/dist/components/biz/business/advertisement/ad-match.mjs

@@ -1,2 +1,2 @@
 
-import{isClient as e}from"../../../../utils/common.mjs";import{getOrCreateDeviceId as t}from"../../../../utils/device-id.mjs";import{useUserStore as n}from"../../../../store/modules/user-store.mjs";const r=process.env.NEXT_PUBLIC_APP_CODE||`APP001`;function i(){if(!e())return``;let t=n.getState();return String(t.userId||t.userInfo?.userId||``).trim()}async function a(e){let n=e.userId??i(),r=e.deviceId??t();return{...e,userId:n||void 0,deviceId:r||void 0}}function o(e){return e?.trim()||r}function s(e){let t=e?.adExtData;if(!t)return{};try{let e=JSON.parse(t);return typeof e==`object`&&e?e:{}}catch{return{}}}function c(e){return[...e??[]].sort((e,t)=>Number(e?.sort??0)-Number(t?.sort??0))}function l(e){return!!(e?.hit&&Array.isArray(e.materials)&&e.materials.length>0)}function u(e){return c(e?.materials).filter(e=>e.advertiseIcon&&e.advertiseUrl).map(e=>({materialUrl:e.advertiseIcon||``,jumpUrl:e.advertiseUrl||``,name:e.advertiseName||``}))}function d(e){let t=c(e?.materials).filter(e=>e.advertiseIcon&&e.advertiseUrl).map(e=>({title:s(e).title||e.advertiseName||``,icon:e.advertiseIcon||``,jumpUrl:e.advertiseUrl||``,badgeText:`广告`})).filter(e=>e.title&&e.icon&&e.jumpUrl);return{displayCount:h(e?.config,t.length),items:t}}function f(e){let t=c(e?.materials).map(e=>({text:e.advertiseName||e.advertiseDesc||``,jumpUrl:e.advertiseUrl||``})).filter(e=>e.text);return{displayCount:h(e?.config,t.length),items:t}}function p(e){let t=c(e?.materials).filter(e=>e.advertiseIcon&&e.advertiseUrl),n=t.map(e=>{let t=s(e);return{coverUrl:e.advertiseIcon||``,jumpUrl:e.advertiseUrl||``,title:t.title||e.advertiseName||``}}).filter(e=>e.coverUrl&&e.jumpUrl);return{displayCount:h(e?.config,n.length),switchInterval:g(e?.config,t),styleSize:_(e?.config,t),items:n}}function m(e){return c(e?.materials).map(e=>{let t=s(e);return{id:e.advertiseCode||``,title:t.title||e.advertiseName||``,jumpUrl:e.advertiseUrl||``,materialUrl:e.advertiseIcon||``,desc:e.advertiseDesc||``}}).filter(e=>e.id&&e.materialUrl&&e.jumpUrl)}function h(e,t=0){let n=Number(e?.displayCount??t);return!Number.isFinite(n)||n<=0?t:Math.min(Math.floor(n),t)}function g(e,t){let n=s(t?.[0]),r=Number(e?.switchInterval??n.switchInterval??3e3);return!Number.isFinite(r)||r<=0?3e3:r}function _(e,t){let n=s(t?.[0]),r=String(e?.styleSize??n.styleSize??`large`);return r===`700x400`||r===`700x200`||r===`720x150`||r===`720x300`?r:r===`small`?`720x150`:r===`medium`?`700x200`:`700x400`}export{p as adaptBannerAdProps,u as adaptFloatingAdItems,d as adaptIconAdProps,m as adaptPopupAdMaterials,f as adaptTextAdProps,a as buildAdsMatchRequest,l as hasMatchedAds,s as parseAdsMatchExtData,o as resolveAdsAppCode,c as sortAdsMatchMaterials};
+import{isClient as e}from"../../../../utils/common.mjs";import{getOrCreateDeviceId as t}from"../../../../utils/device-id.mjs";import{useUserStore as n}from"../../../../store/modules/user-store.mjs";const r=process.env.NEXT_PUBLIC_APP_CODE||`APP001`;function i(){if(!e())return``;let t=n.getState();return String(t.userId||t.userInfo?.userId||``).trim()}async function a(e){let n=e.userId??i(),r=e.deviceId??await t();return{...e,userId:n||void 0,deviceId:r||void 0}}function o(e){return e?.trim()||r}function s(e){let t=e?.adExtData;if(!t)return{};try{let e=JSON.parse(t);return typeof e==`object`&&e?e:{}}catch{return{}}}function c(e){return[...e??[]].sort((e,t)=>Number(e?.sort??0)-Number(t?.sort??0))}function l(e){return!!(e?.hit&&Array.isArray(e.materials)&&e.materials.length>0)}function u(e){return c(e?.materials).filter(e=>e.advertiseIcon&&e.advertiseUrl).map(e=>({materialUrl:e.advertiseIcon||``,jumpUrl:e.advertiseUrl||``,name:e.advertiseName||``}))}function d(e){let t=c(e?.materials).filter(e=>e.advertiseIcon&&e.advertiseUrl).map(e=>({title:s(e).title||e.advertiseName||``,icon:e.advertiseIcon||``,jumpUrl:e.advertiseUrl||``,badgeText:`广告`})).filter(e=>e.title&&e.icon&&e.jumpUrl);return{displayCount:h(e?.config,t.length),items:t}}function f(e){let t=c(e?.materials).map(e=>({text:e.advertiseName||e.advertiseDesc||``,jumpUrl:e.advertiseUrl||``})).filter(e=>e.text);return{displayCount:h(e?.config,t.length),items:t}}function p(e){let t=c(e?.materials).filter(e=>e.advertiseIcon&&e.advertiseUrl),n=t.map(e=>{let t=s(e);return{coverUrl:e.advertiseIcon||``,jumpUrl:e.advertiseUrl||``,title:t.title||e.advertiseName||``}}).filter(e=>e.coverUrl&&e.jumpUrl);return{displayCount:h(e?.config,n.length),switchInterval:g(e?.config,t),styleSize:_(e?.config,t),items:n}}function m(e){return c(e?.materials).map(e=>{let t=s(e);return{id:e.advertiseCode||``,title:t.title||e.advertiseName||``,jumpUrl:e.advertiseUrl||``,materialUrl:e.advertiseIcon||``,desc:e.advertiseDesc||``}}).filter(e=>e.id&&e.materialUrl&&e.jumpUrl)}function h(e,t=0){let n=Number(e?.displayCount??t);return!Number.isFinite(n)||n<=0?t:Math.min(Math.floor(n),t)}function g(e,t){let n=s(t?.[0]),r=Number(e?.switchInterval??n.switchInterval??3e3);return!Number.isFinite(r)||r<=0?3e3:r}function _(e,t){let n=s(t?.[0]),r=String(e?.styleSize??n.styleSize??`large`);return r===`700x400`||r===`700x200`||r===`720x150`||r===`720x300`?r:r===`small`?`720x150`:r===`medium`?`700x200`:`700x400`}export{p as adaptBannerAdProps,u as adaptFloatingAdItems,d as adaptIconAdProps,m as adaptPopupAdMaterials,f as adaptTextAdProps,a as buildAdsMatchRequest,l as hasMatchedAds,s as parseAdsMatchExtData,o as resolveAdsAppCode,c as sortAdsMatchMaterials};

package/dist/components/ui/badge.d.mts

@@ -6,7 +6,7 @@ import * as class_variance_authority_types0 from "class-variance-authority/types
 //#region components/ui/badge.d.ts
 /** badgeVariants 工具定义。 */
 declare const badgeVariants: (props?: ({
-  variant?: "link" | "default" | "secondary" | "destructive" | "outline" | "ghost" | null | undefined;
+  variant?: "link" | "default" | "destructive" | "secondary" | "outline" | "ghost" | null | undefined;
 } & class_variance_authority_types0.ClassProp) | undefined) => string;
 /** Badge 组件。 */
 declare function Badge({

package/dist/components/ui/button.d.mts

@@ -7,7 +7,7 @@ import * as class_variance_authority_types0 from "class-variance-authority/types
 //#region components/ui/button.d.ts
 /** buttonVariants 工具定义。 */
 declare const buttonVariants: (props?: ({
-  variant?: "link" | "default" | "secondary" | "destructive" | "outline" | "ghost" | null | undefined;
+  variant?: "link" | "default" | "destructive" | "secondary" | "outline" | "ghost" | null | undefined;
   size?: "icon" | "default" | "xs" | "sm" | "lg" | "icon-xs" | "icon-sm" | "icon-lg" | null | undefined;
 } & class_variance_authority_types0.ClassProp) | undefined) => string;
 /** Button 组件属性。 */

package/dist/service/advertisement.d.mts

@@ -171,6 +171,6 @@ declare function pContentAdsMatch(data: AdsMatchRequest, config?: ExtraRequestCo
 /**
  * 广告匹配接口缓存 key。
  */
-declare function pContentAdsMatchKey(data: Pick<AdsMatchRequest, 'adType' | 'appCode' | 'componentId' | 'sceneContext'>): (string | AdsMatchSceneContext)[];
+declare function pContentAdsMatchKey(data: Pick<AdsMatchRequest, 'adType' | 'appCode' | 'componentId' | 'sceneContext' | 'userId'>): (string | AdsMatchSceneContext)[];
 //#endregion
 export { AdsMatchAdType, AdsMatchConfig, AdsMatchMaterial, AdsMatchRequest, AdsMatchResponseData, AdsMatchSceneContext, pContentAdsMatch, pContentAdsMatchKey };

package/dist/service/advertisement.mjs

@@ -1,2 +1,2 @@
 
-import e from"../utils/http.mjs";async function t(t,n){let a=await e.request({...n??{},url:`/api/content/matchAds`,method:`POST`,data:i(t)});return{...a,data:r(a.data)??{}}}function n(e){return[`content-ads-match`,e.adType,e.appCode,e.componentId??``,e.sceneContext??{}]}function r(e){if(e)return{hit:e.hit,adType:e.adType??e.ad_type,advertiseLocationCode:e.advertiseLocationCode??e.advertise_location_code,config:o(e.config),materials:e.materials?.map(s)??[]}}function i(e){return{ad_type:e.adType,user_id:e.userId??`69b268b9ba530cd3d98c8b7e`,device_id:e.deviceId,component_id:e.componentId??`111111`,app_code:e.appCode,scene_context:a(e.sceneContext)??{}}}function a(e){if(e)return{startup_type:e.startupType,is_startup_hot:e.isStartupHot,background_durationMin:e.backgroundDurationMin,video_played_seconds:e.videoPlayedSeconds}}function o(e){if(e)return{skipSeconds:e.skipSeconds??e.skip_seconds,popupCount:e.popupCount??e.popup_count,dailyMaxShow:e.dailyMaxShow??e.daily_max_show,triggerVideoProgressMin:e.triggerVideoProgressMin??e.trigger_video_progress_min,switchInterval:e.switchInterval??e.switch_interval,displayCount:e.displayCount??e.display_count,styleSize:e.styleSize??e.style_size}}function s(e){return{advertiseCode:e.advertiseCode??e.advertise_code,advertiseName:e.advertiseName??e.advertise_name,advertiseUrl:e.advertiseUrl??e.advertise_url,advertiseIcon:e.advertiseIcon??e.advertise_icon,adPcAdvertiseIcon:e.adPcAdvertiseIcon??e.pc_advertise_icon,advertiseType:e.advertiseType??e.advertise_type,advertiseDesc:e.advertiseDesc??e.advertise_desc,sort:e.sort,startTimeStamp:e.startTimeStamp??e.start_timestamp,endTimeStamp:e.endTimeStamp??e.end_timestamp,adExtData:e.adExtData??e.ad_ext_data}}export{t as pContentAdsMatch,n as pContentAdsMatchKey};
+import e from"../utils/http.mjs";async function t(t,n){let a=await e.request({...n??{},url:`/api/content/matchAds`,method:`POST`,data:i(t)});return{...a,data:r(a.data)??{}}}function n(e){return[`content-ads-match`,e.adType,e.appCode,e.componentId??``,e.userId??``,e.sceneContext??{}]}function r(e){if(e)return{hit:e.hit,adType:e.adType??e.ad_type,advertiseLocationCode:e.advertiseLocationCode??e.advertise_location_code,config:o(e.config),materials:e.materials?.map(s)??[]}}function i(e){let t=typeof e.deviceId==`string`&&e.deviceId.trim()?e.deviceId.trim():void 0,n=a(e.sceneContext);return{ad_type:e.adType,user_id:e.userId??`69b268b9ba530cd3d98c8b7e`,component_id:e.componentId??`111111`,app_code:e.appCode,...t?{device_id:t}:{},...n?{scene_context:n}:{}}}function a(e){if(e)return{startup_type:e.startupType,is_startup_hot:e.isStartupHot,background_durationMin:e.backgroundDurationMin,video_played_seconds:e.videoPlayedSeconds}}function o(e){if(e)return{skipSeconds:e.skipSeconds??e.skip_seconds,popupCount:e.popupCount??e.popup_count,dailyMaxShow:e.dailyMaxShow??e.daily_max_show,triggerVideoProgressMin:e.triggerVideoProgressMin??e.trigger_video_progress_min,switchInterval:e.switchInterval??e.switch_interval,displayCount:e.displayCount??e.display_count,styleSize:e.styleSize??e.style_size}}function s(e){return{advertiseCode:e.advertiseCode??e.advertise_code,advertiseName:e.advertiseName??e.advertise_name,advertiseUrl:e.advertiseUrl??e.advertise_url,advertiseIcon:e.advertiseIcon??e.advertise_icon,adPcAdvertiseIcon:e.adPcAdvertiseIcon??e.pc_advertise_icon,advertiseType:e.advertiseType??e.advertise_type,advertiseDesc:e.advertiseDesc??e.advertise_desc,sort:e.sort,startTimeStamp:e.startTimeStamp??e.start_timestamp,endTimeStamp:e.endTimeStamp??e.end_timestamp,adExtData:e.adExtData??e.ad_ext_data}}export{t as pContentAdsMatch,n as pContentAdsMatchKey};

package/dist/utils/schema/inspector.d.mts

@@ -6,10 +6,10 @@ type InspectorFieldOption<T> = Omit<T, 'type'>;
 declare const stringInspectorFieldSchema: z.ZodObject<{
   type: z.ZodLiteral<"string">;
   fieldType: z.ZodOptional<z.ZodEnum<{
+    select: "select";
     input: "input";
     textarea: "textarea";
     color: "color";
-    select: "select";
   }>>;
   defaultValue: z.ZodOptional<z.ZodString>;
   label: z.ZodOptional<z.ZodString>;
@@ -68,10 +68,10 @@ type ObjectInspectorFieldOption = InspectorFieldOption<z.infer<typeof objectInsp
 declare const componentInspectorFieldMetaSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
   type: z.ZodLiteral<"string">;
   fieldType: z.ZodOptional<z.ZodEnum<{
+    select: "select";
     input: "input";
     textarea: "textarea";
     color: "color";
-    select: "select";
   }>>;
   defaultValue: z.ZodOptional<z.ZodString>;
   label: z.ZodOptional<z.ZodString>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@funhub/platform",
   "type": "module",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "private": false,
   "sideEffects": [
     "**/*.css"