@tmagic/utils 1.4.5 → 1.4.6

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.4.5",
+  "version": "1.4.6",
   "name": "@tmagic/utils",
   "type": "module",
   "main": "dist/tmagic-utils.umd.cjs",
@@ -28,16 +28,21 @@
     "dayjs": "^1.11.11",
     "lodash-es": "^4.17.21"
   },
-  "peerDependencies": {
-    "@tmagic/schema": "1.4.5"
-  },
   "devDependencies": {
     "@types/lodash-es": "^4.17.4",
     "@types/node": "^18.19.0",
     "rimraf": "^3.0.2",
-    "typescript": "^5.4.2",
     "vite": "^5.2.11"
   },
+  "peerDependencies": {
+    "typescript": "*",
+    "@tmagic/schema": "1.4.6"
+  },
+  "peerDependenciesMeta": {
+    "typescript": {
+      "optional": true
+    }
+  },
   "scripts": {
     "build": "rimraf ./dist && npm run build:type && vite build --mode=es && vite build --mode=umd",
     "build:type": "npm run clear:type && tsc --declaration --emitDeclarationOnly --project tsconfig.build.json",

package/src/index.ts

@@ -25,8 +25,6 @@ import { NodeType } from '@tmagic/schema';
 
 export * from './dom';
 
-dayjs.extend(utc);
-
 export const sleep = (ms: number): Promise<void> =>
   new Promise((resolve) => {
     const timer = setTimeout(() => {
@@ -45,6 +43,7 @@ export const datetimeFormatter = (
     if (['x', 'timestamp'].includes(format)) {
       time = dayjs(v).valueOf();
     } else if ((typeof v === 'string' && v.includes('Z')) || v.constructor === Date) {
+      dayjs.extend(utc);
       // UTC字符串时间或Date对象格式化为北京时间
       time = dayjs(v).utcOffset(8).format(format);
     } else {
@@ -165,9 +164,12 @@ export const guid = (digit = 8): string =>
     return v.toString(16);
   });
 
-export const getValueByKeyPath: any = (keys: string | string[] = '', data: Record<string | number, any> = {}) => {
+export const getValueByKeyPath = (
+  keys: number | string | string[] = '',
+  data: Record<string | number, any> = {},
+): any => {
   // 将 array[0] 转成 array.0
-  const keyArray = Array.isArray(keys) ? keys : keys.replaceAll(/\[(\d+)\]/g, '.$1').split('.');
+  const keyArray = Array.isArray(keys) ? keys : `${keys}`.replaceAll(/\[(\d+)\]/g, '.$1').split('.');
   return keyArray.reduce((accumulator, currentValue: any) => {
     if (isObject(accumulator) || Array.isArray(accumulator)) {
       return accumulator[currentValue];
@@ -177,7 +179,7 @@ export const getValueByKeyPath: any = (keys: string | string[] = '', data: Recor
   }, data);
 };
 
-export const setValueByKeyPath: any = (keys: string, value: any, data: Record<string | number, any> = {}) =>
+export const setValueByKeyPath = (keys: string | number, value: any, data: Record<string | number, any> = {}): any =>
   objectSet(data, keys, value);
 
 export const getNodes = (ids: Id[], data: MNode[] = []): MNode[] => {

package/types/index.d.ts

@@ -27,8 +27,8 @@ export declare const isSameDomain: (targetUrl?: string, source?: string) => bool
  * @returns
  */
 export declare const guid: (digit?: number) => string;
-export declare const getValueByKeyPath: any;
-export declare const setValueByKeyPath: any;
+export declare const getValueByKeyPath: (keys?: number | string | string[], data?: Record<string | number, any>) => any;
+export declare const setValueByKeyPath: (keys: string | number, value: any, data?: Record<string | number, any>) => any;
 export declare const getNodes: (ids: Id[], data?: MNode[]) => MNode[];
 export declare const getDepKeys: (dataSourceDeps: DataSourceDeps | undefined, nodeId: Id) => Id[];
 export declare const getDepNodeIds: (dataSourceDeps?: DataSourceDeps) => string[];