@dyrl/utils - npm Package Compare versions

Comparing version 1.0.30 to 1.0.31

dist/index.d.ts

@@ -18,3 +18,3 @@ export { default as BigNumber } from './BigNumber';
 export { default as toFormData } from './toFormData';
-export { TreeDataType, toTreeData } from './toTreeData';
+export { TreeData, toTreeData } from './toTreeData';
 export { default as tryFunction } from './tryFunction';
@@ -21,0 +21,0 @@ export * from './withNativeProps';

dist/index.js

@@ -18,3 +18,3 @@ export { default as BigNumber } from "./BigNumber";
 export { default as toFormData } from "./toFormData";
-export { TreeDataType, toTreeData } from "./toTreeData";
+export { TreeData, toTreeData } from "./toTreeData";
 export { default as tryFunction } from "./tryFunction";
@@ -21,0 +21,0 @@ export * from "./withNativeProps";

dist/toTreeData.d.ts

@@ -1,9 +0,12 @@
-export type TreeDataType = {
-    id?: string | number;
+import React from 'react';
+export type TreeData<T = Record<string, any>> = {
+    id: React.Key;
     label: string;
-    value: string | number;
-    _original: any;
-    children?: TreeDataType[];
+    _original: T;
+    key: React.Key;
+    value: React.Key;
+    parentId?: React.Key;
+    children?: TreeData<T>[];
 };
-type fieldNamesType = {
+type FieldNames = {
     id?: string;
@@ -15,3 +18,3 @@ label?: string;
 };
-export declare const toTreeData: (data: any[], fieldNames: fieldNamesType, iteratee?: ((item: TreeDataType) => any) | undefined) => TreeDataType[];
+export declare const toTreeData: <T = any>(data: T[], fieldNames?: FieldNames, iteratee?: ((item: TreeData<T>) => any) | undefined) => TreeData<T>[];
 export {};

dist/toTreeData.js

@@ -1,2 +0,2 @@
-import { defaults, isArray } from 'lodash-es';
+import { defaults } from 'lodash-es';
 export var toTreeData = function toTreeData(data, fieldNames, iteratee) {
@@ -16,26 +16,20 @@ var _defaults = defaults(fieldNames, {
   var treeData = [];
-  var dataMap = new Map();
-  var dataFormat = data.map(function (item) {
-    var id = item[idKey];
-    var tempItem = {
-      id: id,
-      value: item[valueKey],
-      label: item[labelKey],
-      parentId: item[parentIdKey],
-      _original: item
-    };
-    dataMap.set(id, tempItem);
-    return tempItem;
-  });
+  var dataMap = new Map(data.map(function (item) {
+    return [item[idKey], item];
+  }));
   var loop = function loop(data) {
     data.forEach(function (item) {
       var _iteratee;
-      var parentNode = dataMap === null || dataMap === void 0 ? void 0 : dataMap.get(item.parentId);
-      var iterateeItem = (_iteratee = iteratee === null || iteratee === void 0 ? void 0 : iteratee(item)) !== null && _iteratee !== void 0 ? _iteratee : item;
+      var id = item[idKey];
+      var parentId = item[parentIdKey];
+      var parentNode = dataMap.get(parentId);
+      var iterateeItem = (_iteratee = iteratee === null || iteratee === void 0 ? void 0 : iteratee(item)) !== null && _iteratee !== void 0 ? _iteratee : {
+        id: id,
+        parentId: parentId,
+        _original: item,
+        value: item[valueKey],
+        label: item[labelKey]
+      };
       if (parentNode) {
-        if (!isArray(parentNode[childrenKey])) {
-          parentNode[childrenKey] = [iterateeItem];
-        } else {
-          parentNode[childrenKey].push(iterateeItem);
-        }
+        (parentNode[childrenKey] || (parentNode[childrenKey] = [])).push(iterateeItem);
       } else {
@@ -46,4 +40,4 @@ treeData.push(iterateeItem);
   };
-  loop(dataFormat);
+  loop(data);
   return treeData;
 };

package.json

 {
   "name": "@dyrl/utils",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "description": "A react library developed with dumi",
@@ -5,0 +5,0 @@ "license": "MIT",

New alerts

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 1 instance in 1 package

Fixed alerts

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

60074

-0.19%

Lines of code

743

-0.4%

No dependency changes