karin-plugin-mys-core 1.0.19 → 1.0.21

package/lib/apps/MiHoYoLogin.js

@@ -1,7 +1,7 @@
 import {
   ShowBindAccountCmdFunc
-} from "../chunk-I3VGZG6L.js";
-import "../chunk-S3ALDDWH.js";
+} from "../chunk-SEKKAPRU.js";
+import "../chunk-C2ZR7X67.js";
 import {
   UserInfo,
   fetchQRcode,
@@ -9,10 +9,10 @@ import {
   getTokenByGameToken,
   getUserFullInfo,
   queryQRcode
-} from "../chunk-JYQZZKAO.js";
+} from "../chunk-32QZ2PSX.js";
 import "../chunk-5LRGHP36.js";
-import "../chunk-PX6NFB3F.js";
-import "../chunk-F7ZAG53H.js";
+import "../chunk-HI6OZTI2.js";
+import "../chunk-BLE3V6QR.js";
 import "../chunk-ER4WMJJ6.js";
 import {
   common_exports

package/lib/apps/MysDevice.js

@@ -1,10 +1,10 @@
 import {
   DeviceInfo,
   UserInfo
-} from "../chunk-JYQZZKAO.js";
+} from "../chunk-32QZ2PSX.js";
 import "../chunk-5LRGHP36.js";
-import "../chunk-PX6NFB3F.js";
-import "../chunk-F7ZAG53H.js";
+import "../chunk-HI6OZTI2.js";
+import "../chunk-BLE3V6QR.js";
 import "../chunk-ER4WMJJ6.js";
 import "../chunk-RX4VMVAI.js";
 import "../chunk-SHLPPEAY.js";

package/lib/apps/UIDManage.js

@@ -5,12 +5,12 @@ import {
   ShowBindAccountCmdFunc,
   UnbindAccount,
   UnbindUID
-} from "../chunk-I3VGZG6L.js";
-import "../chunk-S3ALDDWH.js";
-import "../chunk-JYQZZKAO.js";
+} from "../chunk-SEKKAPRU.js";
+import "../chunk-C2ZR7X67.js";
+import "../chunk-32QZ2PSX.js";
 import "../chunk-5LRGHP36.js";
-import "../chunk-PX6NFB3F.js";
-import "../chunk-F7ZAG53H.js";
+import "../chunk-HI6OZTI2.js";
+import "../chunk-BLE3V6QR.js";
 import "../chunk-ER4WMJJ6.js";
 import "../chunk-RX4VMVAI.js";
 import "../chunk-SHLPPEAY.js";

package/lib/{chunk-JYQZZKAO.js → chunk-32QZ2PSX.js}

@@ -1,6 +1,6 @@
 import {
   DeviceCfg
-} from "./chunk-PX6NFB3F.js";
+} from "./chunk-HI6OZTI2.js";
 import {
   MysAccountInfoDB,
   MysDeviceInfoDB,

package/lib/{chunk-F7ZAG53H.js → chunk-BLE3V6QR.js}

@@ -134,7 +134,7 @@ var Config = class {
   }
   getDef(path2) {
     const defConfig = JSON.parse(JSON.stringify(this.#DefaultConfig));
-    return lodash2.get(defConfig, path2);
+    return path2 ? lodash2.get(defConfig, path2) : defConfig;
   }
   get(path2, isArray = false, def) {
     const conf = JSON.parse(JSON.stringify(this.#ConfigCache));

package/lib/{chunk-S3ALDDWH.js → chunk-C2ZR7X67.js}

@@ -13,15 +13,15 @@ import { config } from "node-karin";
 import React from "react";
 var DefaultLayoutComponent = ({
   children,
-  bg,
-  width,
+  bgStyle,
   mysPlugin
 }) => {
   const karinVersion = config.pkg().version;
   return /* @__PURE__ */ React.createElement(
     "div",
     {
-      className: `relative flex ${width} flex-col pb-10 font-hywh text-black ${bg}`,
+      className: "relative flex flex-col pb-10 font-hywh text-black",
+      style: bgStyle,
       id: "container"
     },
     children,
@@ -29,21 +29,18 @@ var DefaultLayoutComponent = ({
       "img",
       {
         src: `${mysPlugin.logoPath}`,
-        alt: "Mys Plugin Logo",
         className: "h-6 w-6 rounde"
       }
     ), /* @__PURE__ */ React.createElement("div", { className: "flex flex-col" }, /* @__PURE__ */ React.createElement("span", { className: "text-[5px] font-bold leading-none text-black" }, "KARIN-MYS-PLUGIN"), /* @__PURE__ */ React.createElement("div", { className: "flex items-baseline gap-0.5" }, /* @__PURE__ */ React.createElement("span", { className: "font-semibold" }, mysPlugin.name), /* @__PURE__ */ React.createElement("strong", { className: "text-xs font-bold text-[#f2c06f]" }, "v", mysPlugin.version)))), /* @__PURE__ */ React.createElement("div", { className: "h-8 w-px bg-gray-600" })), /* @__PURE__ */ React.createElement("div", { className: "flex items-center gap-2" }, /* @__PURE__ */ React.createElement(
       "img",
       {
         src: `${dir.pluginDir}/resources/image/mys-core-logo.webp`,
-        alt: "MysCore Logo",
         className: "h-6 w-6 rounded-sm"
       }
     ), /* @__PURE__ */ React.createElement("div", { className: "flex flex-col" }, /* @__PURE__ */ React.createElement("span", { className: "text-[5px] font-bold leading-none text-black" }, "KARIN-PLUGIN"), /* @__PURE__ */ React.createElement("div", { className: "flex items-baseline gap-0.5" }, /* @__PURE__ */ React.createElement("span", { className: "font-semibold" }, "MysCore"), /* @__PURE__ */ React.createElement("strong", { className: "text-xs font-bold text-[#f2c06f]" }, "v", dir.version)))), /* @__PURE__ */ React.createElement("div", { className: "h-8 w-px bg-gray-600" }), /* @__PURE__ */ React.createElement("div", { className: "flex items-center gap-2" }, /* @__PURE__ */ React.createElement(
       "img",
       {
         src: `${dir.pluginDir}/resources/image/frame-logo.webp`,
-        alt: "Karin Logo",
         className: "h-6 w-6 rounded-sm"
       }
     ), /* @__PURE__ */ React.createElement("div", { className: "flex flex-col" }, /* @__PURE__ */ React.createElement("span", { className: "text-[5px] font-bold leading-none text-black" }, "IS DRIVEN BY"), /* @__PURE__ */ React.createElement("div", { className: "flex items-baseline gap-1.5" }, /* @__PURE__ */ React.createElement("span", { className: "font-semibold" }, "Karin"), /* @__PURE__ */ React.createElement("strong", { className: "text-[10px] font-bold text-[#f2c06f]" }, "v", karinVersion)))))
@@ -51,7 +48,7 @@ var DefaultLayoutComponent = ({
 };
 
 // src/exports/render/render.ts
-import karin, { absPath, config as config2, existToMkdirSync, karinPathBase } from "node-karin";
+import karin, { absPath, existToMkdirSync, karinPathBase } from "node-karin";
 import fs from "fs";
 import path from "path";
 import React2 from "react";
@@ -74,11 +71,6 @@ var ReactRender = class {
       }
     };
   }
-  get karin() {
-    return {
-      version: config2.pkg().version
-    };
-  }
   async template(template, component, props, options = {}) {
     const element = React2.createElement(component, props);
     const appHtml = renderToString(element);

package/lib/{chunk-PX6NFB3F.js → chunk-HI6OZTI2.js}

@@ -1,19 +1,19 @@
 import {
   Config
-} from "./chunk-F7ZAG53H.js";
+} from "./chunk-BLE3V6QR.js";
 import {
   dir
 } from "./chunk-SHLPPEAY.js";
 
 // src/core/config/config.ts
-var defaultConfig = {
+var defaultCoreConfig = {
   proxy: {
     github: "https://gh-proxy.org",
     ["hoyolab" /* os */]: ""
   }
 };
 var defaultConfigDefine = {};
-var CoreCfg = new Config(`${dir.name}:config`, dir.ConfigDir, defaultConfig, defaultConfigDefine).watch();
+var CoreCfg = new Config(`${dir.name}:config`, dir.ConfigDir, defaultCoreConfig, defaultConfigDefine).watch();
 
 // src/core/config/device.ts
 var DefaultDevice = {

package/lib/{chunk-I3VGZG6L.js → chunk-SEKKAPRU.js}

@@ -2,11 +2,11 @@ import {
   DefaultLayoutComponent,
   React,
   ReactRender
-} from "./chunk-S3ALDDWH.js";
+} from "./chunk-C2ZR7X67.js";
 import {
   MysGame,
   UserInfo
-} from "./chunk-JYQZZKAO.js";
+} from "./chunk-32QZ2PSX.js";
 import {
   dir
 } from "./chunk-SHLPPEAY.js";
@@ -17,7 +17,7 @@ var ShowBindAccountComponent = ({
   AccountList
 }) => {
   const plugin = Render.plugin;
-  return /* @__PURE__ */ React.createElement(DefaultLayoutComponent, { bg: "bg-[#f6f0e6]", width: "w-[600px]" }, /* @__PURE__ */ React.createElement("div", { className: "w-full px-[18px] pb-9 pt-5" }, /* @__PURE__ */ React.createElement(
+  return /* @__PURE__ */ React.createElement(DefaultLayoutComponent, { bgStyle: { backgroundColor: "#f6f0e6", width: 600 } }, /* @__PURE__ */ React.createElement("div", { className: "w-full px-[18px] pb-9 pt-5" }, /* @__PURE__ */ React.createElement(
     "div",
     {
       className: "absolute -top-2.5 right-0 z-[5] h-[72px] w-[150px] bg-contain bg-center bg-no-repeat opacity-50",

package/lib/core/index.js

@@ -2,8 +2,8 @@ import "../chunk-5LRGHP36.js";
 import {
   CoreCfg,
   DeviceCfg
-} from "../chunk-PX6NFB3F.js";
-import "../chunk-F7ZAG53H.js";
+} from "../chunk-HI6OZTI2.js";
+import "../chunk-BLE3V6QR.js";
 import "../chunk-ER4WMJJ6.js";
 import "../chunk-RX4VMVAI.js";
 import "../chunk-SHLPPEAY.js";

package/lib/exports/config/index.d.ts

@@ -1,6 +1,9 @@
-type PathImpl<T, Key extends keyof T> = Key extends string ? T[Key] extends Record<string, any> ? T[Key] extends ArrayLike<any> ? Key | `${Key}.${PathImpl<T[Key], Exclude<keyof T[Key], keyof any[]>>}` : Key | `${Key}.${PathImpl<T[Key], keyof T[Key]>}` : Key : never;
+type ToString<T> = T extends string | number ? `${T}` : never;
+type PathImpl<T, Key extends keyof T> = Key extends string | number ? T[Key] extends Record<string, any> ? T[Key] extends ArrayLike<any> ? ToString<Key> | `${ToString<Key>}.${PathImpl<T[Key], Exclude<keyof T[Key], keyof any[]>>}` : ToString<Key> | `${ToString<Key>}.${PathImpl<T[Key], keyof T[Key]>}` : ToString<Key> : never;
 type Path<T> = PathImpl<T, keyof T> | keyof T;
-type PathValue<T, P extends Path<T>> = P extends `${infer Key}.${infer Rest}` ? Key extends keyof T ? Rest extends Path<T[Key]> ? PathValue<T[Key], Rest> : never : never : P extends keyof T ? T[P] : never;
+type PathValue<T, P> = P extends keyof T ? T[P] : P extends `${infer K}.${infer Rest}` ? K extends keyof T ? PathValue<T[K], Rest> : {
+    [Key in keyof T]: ToString<Key> extends K ? PathValue<T[Key], Rest> : never;
+}[keyof T] : never;
 declare class Config<C extends {
     [key: string]: any;
 }> {
@@ -15,11 +18,13 @@ declare class Config<C extends {
     mergeWithDefaults(userConfig: C, defaultConfig: C, DefineConfig: Record<string, any>): C;
     /**
      * @description 获取配置路径对应的默认配置
+     * @param path 配置路径,支持任意深度的嵌套路径,传入空字符串''可获取整个配置对象
      */
     getDef(path: ''): C;
+    getDef<P extends Path<C>>(path: P): PathValue<C, P>;
     /**
      * @description 获取配置路径对应的配置
-     * @param path 配置路径,支持任意深度的嵌套路径,返回值类型会根据路径自动推断
+     * @param path 配置路径,支持任意深度的嵌套路径,传入空字符串''可获取整个配置对象
      * @param isArray 是否返回 EnhancedArray 类型
      * @param def 默认值
      */

package/lib/exports/config/index.js

@@ -1,7 +1,7 @@
 import {
   Config,
   EnhancedArray
-} from "../../chunk-F7ZAG53H.js";
+} from "../../chunk-BLE3V6QR.js";
 import "../../chunk-RX4VMVAI.js";
 import "../../chunk-MLKGABMK.js";
 export {

package/lib/exports/mys/index.js

@@ -15,10 +15,10 @@ import {
   getUserFullInfo,
   getUserGameRolesByCookie,
   queryQRcode
-} from "../../chunk-JYQZZKAO.js";
+} from "../../chunk-32QZ2PSX.js";
 import "../../chunk-5LRGHP36.js";
-import "../../chunk-PX6NFB3F.js";
-import "../../chunk-F7ZAG53H.js";
+import "../../chunk-HI6OZTI2.js";
+import "../../chunk-BLE3V6QR.js";
 import "../../chunk-ER4WMJJ6.js";
 import "../../chunk-RX4VMVAI.js";
 import "../../chunk-SHLPPEAY.js";

package/lib/exports/render/index.d.ts

@@ -4,8 +4,10 @@ import { Options } from 'node-karin';
 
 interface DefaultLayoutProps {
     children: React.ReactNode;
-    bg: string;
-    width: string;
+    bgStyle: React.CSSProperties & {
+        backgroundColor: React.CSSProperties['backgroundColor'];
+        width: React.CSSProperties['width'];
+    };
     mysPlugin?: {
         name: string;
         version: string;
@@ -38,9 +40,6 @@ declare class ReactRender<P extends Record<string, any>, K extends string> {
     #private;
     constructor(cfg: RenderCfg, pluginOptions?: Omit<P, 'name' | 'version' | 'resources'>);
     get plugin(): Omit<P, 'name' | 'version' | 'resources'> & DefaultRenderPluginOptionsType;
-    get karin(): {
-        version: string;
-    };
     template<C extends React.ComponentType<any>>(template: K, component: C, props: React.ComponentProps<C>, options?: {
         type?: 'png' | 'jpeg' | 'webp';
         plugin?: Record<string, any>;

package/lib/exports/render/index.js

@@ -2,7 +2,7 @@ import {
   DefaultLayoutComponent,
   React,
   ReactRender
-} from "../../chunk-S3ALDDWH.js";
+} from "../../chunk-C2ZR7X67.js";
 import "../../chunk-RX4VMVAI.js";
 import "../../chunk-SHLPPEAY.js";
 import "../../chunk-MLKGABMK.js";

package/lib/web.config.js

@@ -1,8 +1,8 @@
 import {
   CoreCfg,
   DeviceCfg
-} from "./chunk-PX6NFB3F.js";
-import "./chunk-F7ZAG53H.js";
+} from "./chunk-HI6OZTI2.js";
+import "./chunk-BLE3V6QR.js";
 import "./chunk-ER4WMJJ6.js";
 import "./chunk-RX4VMVAI.js";
 import {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karin-plugin-mys-core",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "author": "babanbang",
   "type": "module",
   "description": "karin-plugin-mys-core",

package/resources/styles/karin-plugin-mys-core.css

@@ -665,10 +665,6 @@ video {
   width: 150px;
 }
 
-.w-\[600px\] {
-  width: 600px;
-}
-
 .w-full {
   width: 100%;
 }
@@ -781,11 +777,6 @@ video {
   border-color: rgb(0 0 0 / 0.06);
 }
 
-.bg-\[\#f6f0e6\] {
-  --tw-bg-opacity: 1;
-  background-color: rgb(246 240 230 / var(--tw-bg-opacity, 1));
-}
-
 .bg-black\/\[0\.06\] {
   background-color: rgb(0 0 0 / 0.06);
 }