@codady/utils 0.0.11 → 0.0.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +22 -2
- package/dist/utils.cjs.js +231 -213
- package/dist/utils.cjs.min.js +3 -3
- package/dist/utils.esm.js +231 -213
- package/dist/utils.esm.min.js +3 -3
- package/dist/utils.umd.js +235 -215
- package/dist/utils.umd.min.js +3 -3
- package/dist.zip +0 -0
- package/examples/deepMerge.html +1049 -0
- package/modules.js +3 -11
- package/modules.ts +5 -7
- package/package.json +1 -1
- package/src/deepEqual.js +1 -1
- package/src/deepEqual.ts +1 -1
- package/src/deepMerge.js +253 -13
- package/src/deepMerge.ts +306 -18
- package/src/deepMergeHelper.js +1 -3
- package/src/deepMergeHelper.ts +1 -3
- package/src/deepMergeMaps.js +4 -4
- package/src/deepMergeMaps.ts +6 -6
- package/src/deepMergeObjects.js +11 -4
- package/src/deepMergeObjects.ts +10 -4
- package/src/deepMergeSets.js +5 -10
- package/src/deepMergeSets.ts +6 -9
- package/src/mapMutableMethods - /345/211/257/346/234/254.js" +5 -0
- package/src/shallowCopy.js +46 -0
- package/src/shallowCopy.ts +55 -0
package/CHANGELOG.md
CHANGED
|
@@ -2,7 +2,27 @@
|
|
|
2
2
|
|
|
3
3
|
All changes to Utils including new features, updates, and removals are documented here.
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
|
|
6
|
+
## [v0.0.12] - 2025-12-25
|
|
7
|
+
|
|
8
|
+
### Distribution Files
|
|
9
|
+
* **JS**: https://unpkg.com/@codady/utils@0.0.12/dist/js/utils.js
|
|
10
|
+
* **Zip**:https://unpkg.com/@codady/utils@0.0.12/dist.zip
|
|
11
|
+
|
|
12
|
+
### Changes
|
|
13
|
+
|
|
14
|
+
#### Fixed
|
|
15
|
+
* Improved the `deepMerge` function to support deep merging of Arrays, Objects, Sets, and Maps.强化了`deepMerge`函数,支持深度合并Array、Object、Set和Map。
|
|
16
|
+
|
|
17
|
+
#### Added
|
|
18
|
+
* New parameters added to the deepMerge function: `deepClone`, `onBeforeMerge`, and `onAfterMerge`.`deepMerge`函数的参数新增deepClone、onBeforeMerge、onAfterMerge参数。
|
|
19
|
+
* Added the following functions: `shallowCopy`.新增`shallowCopy`函数。
|
|
20
|
+
|
|
21
|
+
#### Removed
|
|
22
|
+
* Removed the following functions: `deepEqual`, `deepMergeArrays`, `deepMergeObjects`, `deepMergeSets`, and `deepMergeMaps`.删除`deepEqual`、`deepMergeArrays`、`deepMergeObjects`、`deepMergeSets`、和`deepMegeMaps`函数。
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
## [v0.0.11] - 2025-12-24
|
|
6
26
|
|
|
7
27
|
### Distribution Files
|
|
8
28
|
* **JS**: https://unpkg.com/@codady/utils@0.0.11/dist/js/utils.js
|
|
@@ -14,7 +34,7 @@ All changes to Utils including new features, updates, and removals are documente
|
|
|
14
34
|
* Null
|
|
15
35
|
|
|
16
36
|
#### Added
|
|
17
|
-
*
|
|
37
|
+
* Added the following functions: `deepEqual`, `deepMerge`, `deepMergeArrays`, `deepMergeObjects`, `deepMergeSets`, and `deepMergeMaps`.新增`deepEqual`、`deepMerge`、`deepMergeArrays`、`deepMergeObjects`、`deepMergeSets`、和`deepMegeMaps`函数。
|
|
18
38
|
|
|
19
39
|
#### Removed
|
|
20
40
|
* Null
|
package/dist/utils.cjs.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
|
|
2
2
|
/*!
|
|
3
|
-
* @since Last modified: 2025-12-
|
|
3
|
+
* @since Last modified: 2025-12-25 12:10:38
|
|
4
4
|
* @name Utils for web front-end.
|
|
5
|
-
* @version 0.0.
|
|
5
|
+
* @version 0.0.12
|
|
6
6
|
* @author AXUI development team <3217728223@qq.com>
|
|
7
7
|
* @description This is a set of general-purpose JavaScript utility functions developed by the AXUI team. All functions are pure and do not involve CSS or other third-party libraries. They are suitable for any web front-end environment.
|
|
8
8
|
* @see {@link https://www.axui.cn|Official website}
|
|
@@ -16,8 +16,6 @@
|
|
|
16
16
|
|
|
17
17
|
'use strict';
|
|
18
18
|
|
|
19
|
-
var assert = require('assert');
|
|
20
|
-
|
|
21
19
|
const getDataType = (obj) => {
|
|
22
20
|
let tmp = Object.prototype.toString.call(obj).slice(8, -1), result;
|
|
23
21
|
if (tmp === 'Function' && /^\s*class\s+/.test(obj.toString())) {
|
|
@@ -424,31 +422,139 @@ const wrapMapMethods = ({ target, onBeforeMutate = () => { }, onAfterMutate = ()
|
|
|
424
422
|
return methods;
|
|
425
423
|
};
|
|
426
424
|
|
|
427
|
-
const
|
|
428
|
-
|
|
429
|
-
//
|
|
430
|
-
if (
|
|
431
|
-
|
|
432
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
425
|
+
const shallowCopy = (data) => {
|
|
426
|
+
const dataType = getDataType(data);
|
|
427
|
+
// Check if data is a Set
|
|
428
|
+
if (dataType === 'Set') {
|
|
429
|
+
// Shallow copy Set
|
|
430
|
+
return new Set([...data]);
|
|
431
|
+
}
|
|
432
|
+
// Check if data is a Map
|
|
433
|
+
if (dataType === 'Map') {
|
|
434
|
+
// Shallow copy Map
|
|
435
|
+
return new Map([...data]);
|
|
436
|
+
}
|
|
437
|
+
// Check if data is an Array
|
|
438
|
+
if (Array.isArray(data)) {
|
|
439
|
+
// Shallow copy Array
|
|
440
|
+
return [...data];
|
|
441
|
+
}
|
|
442
|
+
// Check if data is a Plain Object (including Symbol keys)
|
|
443
|
+
if (dataType === 'object') {
|
|
444
|
+
const obj = data; // Ensure the object type includes string and symbol keys
|
|
445
|
+
const symbolProperties = Object.getOwnPropertySymbols(obj).reduce((acc, sym) => {
|
|
446
|
+
acc[sym] = obj[sym];
|
|
447
|
+
return acc;
|
|
448
|
+
}, {});
|
|
449
|
+
// Shallow copy the object and include the Symbol properties
|
|
450
|
+
return { ...obj, ...symbolProperties };
|
|
451
|
+
}
|
|
452
|
+
// For other types (such as numbers, strings, booleans, etc.), return the original value
|
|
453
|
+
return data;
|
|
454
|
+
};
|
|
455
|
+
|
|
456
|
+
const deepMerge = (target, source, opts = {}) => {
|
|
457
|
+
// Set default options
|
|
458
|
+
// 设置默认选项
|
|
459
|
+
const options = Object.assign({
|
|
460
|
+
// Merging mode for array and set collections:
|
|
461
|
+
// 'clear' means clear first then append; 'concat' means append directly at the end;
|
|
462
|
+
// 'replace' means merge sequentially (deep merging)
|
|
463
|
+
// 对于array和set合集的合并方式:'clear'表示先清空再追加;'concat'表示直接在尾部追加;
|
|
464
|
+
// 'replace'表示按顺序进行合并(深度合并)
|
|
465
|
+
dataMode: 'clear',
|
|
466
|
+
// Whether to directly append properties/items from source that target doesn't have.
|
|
467
|
+
// true: append; false: discard
|
|
468
|
+
// source对象如果有target对象没有的item或prop属性,是否直接新追加。true则追加;false则丢弃
|
|
469
|
+
inheritMissing: true,
|
|
470
|
+
// Whether to clone the target object, generating a brand new object. Default false.
|
|
471
|
+
// 是否克隆target对象,生成全新对象,默认false。
|
|
472
|
+
targetClone: false,
|
|
473
|
+
// How to merge when target or source has enable property and boolean value into {enable:boolean}
|
|
474
|
+
// 当target或source有enable属性(prop)和boolean值时,如何合并为{enable:boolean}
|
|
475
|
+
useEnable: true,
|
|
476
|
+
// Whether to allow merging key=symbol key-value pairs when target is {} type.
|
|
477
|
+
// target是{}类型时,是否允许合并key=symbol的键值对。
|
|
478
|
+
useSymbol: true,
|
|
479
|
+
// Options passed to the deepClone function when targetClone is true
|
|
480
|
+
// 当targetClone为true时传递给deepClone函数的选项
|
|
481
|
+
deepClone: {},
|
|
482
|
+
// Callback function executed before merging each data structure
|
|
483
|
+
// 在每个数据结构合并前执行的回调函数
|
|
484
|
+
onBeforeMerge: undefined,
|
|
485
|
+
// Callback function executed after merging each data structure
|
|
486
|
+
// 在每个数据结构合并后执行的回调函数
|
|
487
|
+
onAfterMerge: undefined,
|
|
488
|
+
}, opts),
|
|
489
|
+
// Main helper function for recursive merging
|
|
490
|
+
// 递归合并的主辅助函数
|
|
491
|
+
deepMergeHelper = (target, source, options) => {
|
|
492
|
+
let targetType = getDataType(target), sourceType = getDataType(source), flag = true, type, result;
|
|
493
|
+
// Determine the type and perform appropriate merging
|
|
494
|
+
// 确定类型并执行相应的合并
|
|
495
|
+
if (targetType === 'Object' && sourceType === 'Object') {
|
|
496
|
+
result = deepMergeObjects(target, source, options);
|
|
497
|
+
type = 'Object';
|
|
498
|
+
}
|
|
499
|
+
else if (targetType === 'Array' && sourceType === 'Array') {
|
|
500
|
+
result = deepMergeArrays(target, source, options);
|
|
501
|
+
type = 'Array';
|
|
502
|
+
}
|
|
503
|
+
else if (targetType === 'Set' && sourceType === 'Set') {
|
|
504
|
+
result = deepMergeSets(target, source, options);
|
|
505
|
+
type = 'Set';
|
|
506
|
+
}
|
|
507
|
+
else if (targetType === 'Map' && sourceType === 'Map') {
|
|
508
|
+
result = deepMergeMaps(target, source, options);
|
|
509
|
+
type = 'Map';
|
|
510
|
+
}
|
|
511
|
+
else {
|
|
512
|
+
flag = false;
|
|
513
|
+
result = target;
|
|
514
|
+
}
|
|
515
|
+
return { result, flag, type };
|
|
516
|
+
},
|
|
517
|
+
// Special handling for objects with enable property
|
|
518
|
+
// 对具有enable属性的对象进行特殊处理
|
|
519
|
+
mergeEnableObject = (target, source) => {
|
|
520
|
+
if (target?.hasOwnProperty('enable') && typeof source === 'boolean') {
|
|
521
|
+
//result={enable:true,a:'',b:''},source[k]=false=>result={enable:false,a:'',b:''}
|
|
522
|
+
//仅设置enable属性
|
|
523
|
+
target.enable = source;
|
|
524
|
+
//返回target原对象
|
|
525
|
+
return target;
|
|
526
|
+
}
|
|
527
|
+
else if (source?.hasOwnProperty('enable') && typeof target === 'boolean') {
|
|
528
|
+
//source={enable:true,a:'',b:''},(result as any)[k]=false=>result={enable:false,a:'',b:''}
|
|
529
|
+
//返回新值,新值包含enable属性
|
|
530
|
+
return Object.assign({ enable: target }, source);
|
|
531
|
+
}
|
|
532
|
+
return source;
|
|
533
|
+
},
|
|
534
|
+
// Deep merge for objects
|
|
535
|
+
// 对象的深度合并
|
|
536
|
+
deepMergeObjects = (target, source, opts = {}) => {
|
|
537
|
+
let targetType = getDataType(target), sourceType = getDataType(source);
|
|
538
|
+
// If target is not an object or source is empty, return target directly
|
|
539
|
+
// 如果target不是对象或者source为空则直接返回
|
|
540
|
+
if (targetType !== 'Object' || sourceType !== 'Object') {
|
|
541
|
+
return target;
|
|
542
|
+
}
|
|
543
|
+
opts?.onBeforeMerge?.(target, source);
|
|
544
|
+
const options = Object.assign({ inheritMissing: true, targetClone: false, useEnable: true }, opts);
|
|
545
|
+
let result = {};
|
|
546
|
+
// If cloning is enabled, clone the target first
|
|
547
|
+
// 如果是复制方法,则先复制target
|
|
548
|
+
result = options.targetClone ? shallowCopy(target) : target;
|
|
549
|
+
for (let k in source) {
|
|
550
|
+
if (source.hasOwnProperty(k) && result.hasOwnProperty(k)) {
|
|
551
|
+
let resp = deepMergeHelper(result[k], source[k], opts);
|
|
552
|
+
//resp={result,flag,type}
|
|
553
|
+
//flag=true表示类型一致并完成了合并,false表示并没有合并需要直接赋值
|
|
554
|
+
if (!resp.flag) {
|
|
555
|
+
//类型不同则直接覆盖
|
|
556
|
+
if (options.useEnable) {
|
|
557
|
+
result[k] = mergeEnableObject(result[k], source[k]);
|
|
452
558
|
}
|
|
453
559
|
else {
|
|
454
560
|
//完全替换
|
|
@@ -456,99 +562,89 @@ const deepMergeObjects = (target, source, opts = {}) => {
|
|
|
456
562
|
}
|
|
457
563
|
}
|
|
458
564
|
else {
|
|
459
|
-
|
|
460
|
-
|
|
565
|
+
//类型相同
|
|
566
|
+
if (resp.type) {
|
|
567
|
+
if (resp.type === 'Object') {
|
|
568
|
+
//如果遇上对象则深度复制
|
|
569
|
+
result[k] = resp.result;
|
|
570
|
+
}
|
|
571
|
+
}
|
|
572
|
+
else {
|
|
573
|
+
//其他类型则直接覆盖
|
|
574
|
+
result[k] = source[k];
|
|
575
|
+
}
|
|
461
576
|
}
|
|
462
577
|
}
|
|
463
|
-
else {
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
result[k] = resp.result;
|
|
467
|
-
}
|
|
578
|
+
else if (source.hasOwnProperty(k) && !result.hasOwnProperty(k) && options.inheritMissing) {
|
|
579
|
+
//如果source有属性,result没有该属性,但是options允许追加属性则直接赋值
|
|
580
|
+
result[k] = source[k];
|
|
468
581
|
}
|
|
469
582
|
}
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
if (options.useSymbol) {
|
|
477
|
-
let symbols = Object.getOwnPropertySymbols(source);
|
|
478
|
-
if (symbols.length > 0) {
|
|
479
|
-
for (let k of symbols) {
|
|
480
|
-
result[k] = source[k];
|
|
583
|
+
//Symbol键直接追加,因为Symbol是唯一,结果同Object.assign
|
|
584
|
+
if (options.useSymbol) {
|
|
585
|
+
let symbols = Object.getOwnPropertySymbols(source);
|
|
586
|
+
if (symbols.length) {
|
|
587
|
+
for (let k of symbols)
|
|
588
|
+
result[k] = source[k];
|
|
481
589
|
}
|
|
482
590
|
}
|
|
483
|
-
|
|
484
|
-
return result;
|
|
485
|
-
};
|
|
486
|
-
|
|
487
|
-
const deepMergeArrays = (target, source, options = { itemMode: 'merge', propAppend: true, targetClone: false, useEnable: true }) => {
|
|
488
|
-
// Ensure both target and source are arrays
|
|
489
|
-
if (!Array.isArray(target) || !Array.isArray(source))
|
|
490
|
-
return target;
|
|
491
|
-
// Merge options, with default values
|
|
492
|
-
const opts = Object.assign({ itemMode: 'merge', propAppend: true, targetClone: false }, options),
|
|
493
|
-
// If cloning is enabled, create a deep copy of the target array
|
|
494
|
-
result = opts.targetClone ? [...target] : target;
|
|
495
|
-
// Handle different merge strategies based on itemMode
|
|
496
|
-
if (opts.itemMode === 'replace') {
|
|
497
|
-
// Replace mode: clear the target array and push all items from the source array
|
|
498
|
-
result.length = 0;
|
|
499
|
-
result.push(...source);
|
|
591
|
+
options?.onAfterMerge?.(result, target, source);
|
|
500
592
|
return result;
|
|
501
|
-
}
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
//
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
//
|
|
513
|
-
|
|
514
|
-
|
|
593
|
+
}, deepMergeArrays = (target, source, options = {}) => {
|
|
594
|
+
// Ensure both target and source are arrays
|
|
595
|
+
if (!Array.isArray(target) || !Array.isArray(source))
|
|
596
|
+
return target;
|
|
597
|
+
options?.onBeforeMerge?.(target, source);
|
|
598
|
+
// Merge options, with default values
|
|
599
|
+
const opts = Object.assign({ dataMode: 'clear', inheritMissing: true, targetClone: false }, options),
|
|
600
|
+
// If cloning is enabled, create a deep copy of the target array
|
|
601
|
+
result = opts.targetClone ? [...target] : target;
|
|
602
|
+
// Handle different merge strategies based on dataMode
|
|
603
|
+
if (opts.dataMode === 'replace') {
|
|
604
|
+
// "replace" mode: recursively merge items in the arrays
|
|
605
|
+
for (let i = 0; i < source.length; i++) {
|
|
606
|
+
// If not allowed to add beyond length
|
|
607
|
+
// 如果不允许添加超过长度
|
|
608
|
+
if (!opts.inheritMissing && i >= result.length)
|
|
609
|
+
break;
|
|
610
|
+
let resp = deepMergeHelper(result[i], source[i], opts);
|
|
611
|
+
//resp={result,flag,type}
|
|
612
|
+
//flag=true表示类型一致并完成了合并,false表示并没有合并需要直接赋值
|
|
613
|
+
if (!resp.flag) {
|
|
614
|
+
result[i] = source[i];
|
|
615
|
+
}
|
|
515
616
|
}
|
|
516
617
|
}
|
|
618
|
+
else if (opts.dataMode === 'concat') {
|
|
619
|
+
// Concatenate mode: append all items from the source array to the target array
|
|
620
|
+
result.push(...source);
|
|
621
|
+
}
|
|
622
|
+
else {
|
|
623
|
+
//Default replace mode: clear the target array and push all items from the source array
|
|
624
|
+
result.length = 0;
|
|
625
|
+
result.push(...source);
|
|
626
|
+
}
|
|
627
|
+
options?.onAfterMerge?.(result, target, source);
|
|
517
628
|
return result;
|
|
518
|
-
}
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
// If cloning is enabled, create a deep copy of the target Map
|
|
528
|
-
result = opts.targetClone ? new Map(target) : target;
|
|
529
|
-
// Handle different merge strategies based on itemMode
|
|
530
|
-
if (opts.itemMode === 'replace') {
|
|
531
|
-
// Replace mode: clear the target Map and add all entries from the source Map
|
|
532
|
-
result.clear();
|
|
533
|
-
source.forEach((value, key) => result.set(key, value));
|
|
534
|
-
return result;
|
|
535
|
-
}
|
|
536
|
-
else if (opts.itemMode === 'concat') {
|
|
537
|
-
// Concatenate mode: add all entries from the source Map to the target Map
|
|
538
|
-
source.forEach((value, key) => result.set(key, value));
|
|
539
|
-
return result;
|
|
540
|
-
}
|
|
541
|
-
else {
|
|
629
|
+
}, deepMergeMaps = (target, source, options = {}) => {
|
|
630
|
+
// Ensure both target and source are Maps
|
|
631
|
+
if (!(target instanceof Map) || !(source instanceof Map))
|
|
632
|
+
return target;
|
|
633
|
+
options?.onBeforeMerge?.(target, source);
|
|
634
|
+
// Merge options, with default values
|
|
635
|
+
const opts = Object.assign({ inheritMissing: true, targetClone: false, useEnable: true }, options),
|
|
636
|
+
// If cloning is enabled, create a deep copy of the target Map
|
|
637
|
+
result = opts.targetClone ? new Map([...target]) : target;
|
|
542
638
|
// Default "merge" mode: recursively merge entries in the Maps
|
|
543
|
-
|
|
639
|
+
for (const [key, value] of source.entries())
|
|
544
640
|
// Check if the key already exists in the target Map
|
|
545
641
|
if (result.has(key)) {
|
|
546
|
-
const
|
|
642
|
+
const _target = result.get(key), _source = value, resp = deepMergeHelper(_target, _source, opts);
|
|
547
643
|
//resp={result,flag,type}
|
|
548
644
|
//flag=true表示类型一致并完成了合并,false表示并没有合并需要直接赋值
|
|
549
645
|
if (!resp.flag) {
|
|
550
646
|
// For simple values, overwrite the target value with the source value
|
|
551
|
-
result.set(key,
|
|
647
|
+
result.set(key, _source);
|
|
552
648
|
}
|
|
553
649
|
else {
|
|
554
650
|
// If both target and source are objects, merge them recursively
|
|
@@ -557,116 +653,42 @@ const deepMergeMaps = (target, source, options = { itemMode: 'merge', propAppend
|
|
|
557
653
|
}
|
|
558
654
|
else {
|
|
559
655
|
// If the key doesn't exist in the target, add the entry from the source Map
|
|
560
|
-
result.set(key, value);
|
|
656
|
+
options.inheritMissing && result.set(key, value);
|
|
561
657
|
}
|
|
562
|
-
|
|
658
|
+
options?.onAfterMerge?.(result, target, source);
|
|
563
659
|
return result;
|
|
564
|
-
}
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
660
|
+
}, deepMergeSets = (target, source, options = {}) => {
|
|
661
|
+
// Ensure both target and source are Sets
|
|
662
|
+
if (!(target instanceof Set) || !(source instanceof Set))
|
|
663
|
+
return target;
|
|
664
|
+
options?.onBeforeMerge?.(target, source);
|
|
665
|
+
// Merge options, with default values
|
|
666
|
+
const opts = Object.assign({ dataMode: 'clear', inheritMissing: true, targetClone: false, useEnable: true }, options),
|
|
667
|
+
// If cloning is enabled, create a deep copy of the target Set
|
|
668
|
+
result = opts.targetClone ? new Set(...target) : target;
|
|
669
|
+
// Handle different merge strategies based on dataMode
|
|
670
|
+
if (opts.dataMode === 'replace') {
|
|
671
|
+
// Replace mode: recursively merge items in the Sets
|
|
672
|
+
const _result = [...result], _source = [...source], resp = deepMergeHelper(_result, _source, opts);
|
|
673
|
+
result.clear();
|
|
674
|
+
for (let item of resp.result)
|
|
675
|
+
result.add(item);
|
|
578
676
|
}
|
|
579
|
-
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
const keysA = Object.keys(a), keysB = Object.keys(b);
|
|
584
|
-
if (keysA.length !== keysB.length)
|
|
585
|
-
return false;
|
|
586
|
-
for (let key of keysA) {
|
|
587
|
-
if (!keysB.includes(key) || !deepEqual(a[key], b[key]))
|
|
588
|
-
return false;
|
|
677
|
+
else if (opts.dataMode === 'concat') {
|
|
678
|
+
// Concatenate mode: add all items from the source Set to the target Set
|
|
679
|
+
for (let item of source)
|
|
680
|
+
result.add(item);
|
|
589
681
|
}
|
|
590
|
-
|
|
591
|
-
|
|
592
|
-
|
|
593
|
-
|
|
594
|
-
|
|
595
|
-
|
|
596
|
-
const deepMergeSets = (target, source, options = { itemMode: 'merge', propAppend: true, targetClone: false, useEnable: true }) => {
|
|
597
|
-
// Ensure both target and source are Sets
|
|
598
|
-
if (!(target instanceof Set) || !(source instanceof Set))
|
|
599
|
-
return target;
|
|
600
|
-
// Merge options, with default values
|
|
601
|
-
const opts = Object.assign({ itemMode: 'merge', propAppend: true, targetClone: false, useEnable: true }, options),
|
|
602
|
-
// If cloning is enabled, create a deep copy of the target Set
|
|
603
|
-
result = opts.targetClone ? new Set(target) : target;
|
|
604
|
-
// Handle different merge strategies based on itemMode
|
|
605
|
-
if (opts.itemMode === 'replace') {
|
|
606
|
-
// Replace mode: clear the target Set and add all items from the source Set
|
|
607
|
-
result.clear();
|
|
608
|
-
for (let item of source)
|
|
609
|
-
result.add(item);
|
|
610
|
-
return result;
|
|
611
|
-
}
|
|
612
|
-
else if (opts.itemMode === 'concat') {
|
|
613
|
-
// Concatenate mode: add all items from the source Set to the target Set
|
|
614
|
-
for (let item of source)
|
|
615
|
-
result.add(item);
|
|
616
|
-
return result;
|
|
617
|
-
}
|
|
618
|
-
else {
|
|
619
|
-
// Default "merge" mode: recursively merge items in the Sets
|
|
620
|
-
for (let item of source) {
|
|
621
|
-
// Check the type of the target and source items
|
|
622
|
-
let _target = [...result].find(val => deepEqual(val, item)), resp = deepMergeHelper(_target, item, opts);
|
|
623
|
-
//resp={result,flag}
|
|
624
|
-
//flag=true表示类型一致并完成了合并,false表示并没有合并需要直接赋值
|
|
625
|
-
!resp.flag && result.add(item);
|
|
682
|
+
else {
|
|
683
|
+
//Default "clear" mode: clear the target Set and add all items from the source Set
|
|
684
|
+
result.clear();
|
|
685
|
+
for (let item of source)
|
|
686
|
+
result.add(item);
|
|
626
687
|
}
|
|
688
|
+
options?.onAfterMerge?.(result, target, source);
|
|
627
689
|
return result;
|
|
628
|
-
}
|
|
629
|
-
};
|
|
630
|
-
|
|
631
|
-
// deepMergeHelper.ts
|
|
632
|
-
|
|
633
|
-
|
|
634
|
-
const deepMergeHelper = (target, source, options) => {
|
|
635
|
-
let targetType = getDataType(target), sourceType = getDataType(source), flag = true, type, result;
|
|
636
|
-
if (targetType === 'Object' && sourceType === 'Object') {
|
|
637
|
-
result = deepMergeObjects(target, source, options);
|
|
638
|
-
type = 'Object';
|
|
639
|
-
}
|
|
640
|
-
else if (targetType === 'Array' && sourceType === 'Array') {
|
|
641
|
-
result = deepMergeArrays(target, source, options);
|
|
642
|
-
type = 'Array';
|
|
643
|
-
}
|
|
644
|
-
else if (targetType === 'Set' && sourceType === 'Set') {
|
|
645
|
-
result = deepMergeSets(target, source, options);
|
|
646
|
-
type = 'Set';
|
|
647
|
-
}
|
|
648
|
-
else if (targetType === 'Map' && sourceType === 'Map') {
|
|
649
|
-
result = deepMergeMaps(target, source, options);
|
|
650
|
-
type = 'Map';
|
|
651
|
-
}
|
|
652
|
-
else {
|
|
653
|
-
flag = false;
|
|
654
|
-
result = target; // Default case, replace primitive values
|
|
655
|
-
}
|
|
656
|
-
return {
|
|
657
|
-
result, flag, type
|
|
658
690
|
};
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
const deepMerge = (target, source, opts = {}) => {
|
|
662
|
-
// Get the data types of the target and source
|
|
663
|
-
let options = Object.assign({
|
|
664
|
-
itemMode: 'merge', // Default merge mode
|
|
665
|
-
propAppend: true, // Default to appending properties from source to target
|
|
666
|
-
targetClone: false, // Do not clone target by default
|
|
667
|
-
useEnable: true // Enable special handling for objects with an `enable` property
|
|
668
|
-
}, opts);
|
|
669
|
-
return deepMergeHelper(target, source, options);
|
|
691
|
+
return deepMergeHelper(target, source, options).result;
|
|
670
692
|
};
|
|
671
693
|
|
|
672
694
|
const utils = {
|
|
@@ -684,12 +706,8 @@ const utils = {
|
|
|
684
706
|
wrapSetMethods,
|
|
685
707
|
wrapMapMethods,
|
|
686
708
|
getUniqueId,
|
|
687
|
-
deepEqual: assert.deepEqual,
|
|
688
709
|
deepMerge,
|
|
689
|
-
|
|
690
|
-
deepMergeMaps,
|
|
691
|
-
deepMergeObjects,
|
|
692
|
-
deepMergeSets,
|
|
710
|
+
shallowCopy,
|
|
693
711
|
};
|
|
694
712
|
|
|
695
713
|
module.exports = utils;
|
package/dist/utils.cjs.min.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/*!
|
|
2
|
-
* @since Last modified: 2025-12-
|
|
2
|
+
* @since Last modified: 2025-12-25 12:10:38
|
|
3
3
|
* @name Utils for web front-end.
|
|
4
|
-
* @version 0.0.
|
|
4
|
+
* @version 0.0.12
|
|
5
5
|
* @author AXUI development team <3217728223@qq.com>
|
|
6
6
|
* @description This is a set of general-purpose JavaScript utility functions developed by the AXUI team. All functions are pure and do not involve CSS or other third-party libraries. They are suitable for any web front-end environment.
|
|
7
7
|
* @see {@link https://www.axui.cn|Official website}
|
|
@@ -12,4 +12,4 @@
|
|
|
12
12
|
* @copyright This software supports the MIT License, allowing free learning and commercial use, but please retain the terms 'ax,' 'axui,' 'AX,' and 'AXUI' within the software.
|
|
13
13
|
* @license MIT license
|
|
14
14
|
*/
|
|
15
|
-
"use strict";
|
|
15
|
+
"use strict";const getDataType=e=>{let t,r=Object.prototype.toString.call(e).slice(8,-1);return t="Function"===r&&/^\s*class\s+/.test(e.toString())?"Class":"Object"===r&&Object.getPrototypeOf(e)!==Object.prototype?"Instance":r,t},deepClone=(e,t={})=>{const r=getDataType(e),o=Object.assign({cloneSet:!0,cloneMap:!0,cloneObject:!0,cloneArray:!0,cloneDate:!0,cloneRegex:!0},t);if(o.interceptor&&"function"==typeof o.interceptor){let t=o.interceptor(e,r);if(t)return o.onAfterClone?.({output:t,input:e,type:r,cloned:t!==e}),t}o.onBeforeClone?.(e,r);let a,n=!0;if("Object"===r&&o.cloneObject){const t={},r=Object.getOwnPropertySymbols(e);for(const r in e)t[r]=deepClone(e[r],o);if(r.length>0)for(const a of r)t[a]=deepClone(e[a],o);a=t}else if("Array"===r&&o.cloneArray)a=e.map(e=>deepClone(e,o));else if("Map"===r&&o.cloneMap){const t=new Map;for(const[r,a]of e)t.set(deepClone(r,o),deepClone(a,o));a=t}else if("Set"===r&&o.cloneSet){const t=new Set;for(const r of e)t.add(deepClone(r,o));a=t}else if("Date"===r&&o.cloneDate)a=new Date(e.getTime());else if("RegExp"===r&&o.cloneRegex){const t=e;a=new RegExp(t.source,t.flags)}else a=e,n=!1;return o.onAfterClone?.({output:a,input:e,type:r,cloned:n}),a},deepCloneToJSON=e=>{const t=getDataType(e);if("Object"===t){const t={};for(const r in e)t[r]=deepCloneToJSON(e[r]);for(const e in t)void 0===t[e]&&Reflect.deleteProperty(t,e);return t}if("Array"===t){return e.map((e,t)=>deepCloneToJSON(e)).filter(e=>void 0!==e)}return["Number","String","Boolean","Null"].includes(t)?e:void 0},arrayMutableMethods=["push","pop","shift","unshift","splice","sort","reverse","copyWithin","fill"],wrapArrayMethods=({target:e,onBeforeMutate:t=()=>{},onAfterMutate:r=()=>{},allowList:o,props:a={}})=>{if(!Array.isArray(e))throw new TypeError("The 'target' parameter must be an array.");o&&!o?.length||(o=arrayMutableMethods);const n={};for(let s of o)n[s]=function(...o){const n={},l=e.length;switch(s){case"push":case"unshift":n.addedItems=[...o];break;case"pop":n.poppedItem=e[l-1];break;case"shift":n.shiftedItem=e[0];break;case"splice":const[t,r]=o,a=t<0?Math.max(l+t,0):Math.min(t,l),s=void 0===r?l-a:r;n.deletedItems=e.slice(a,a+s);break;case"sort":case"reverse":n.oldSnapshot=[...e];break;case"fill":case"copyWithin":const i=o[1]||0,c=void 0===o[2]?l:o[2];n.oldItems=e.slice(i,c),n.start=i,n.end=c}t?.(n);const i=Array.prototype[s].apply(e,o),c={value:i,key:s,args:o,context:n,target:e,...a};return r?.(c),i};return n},requireTypes=(e,t,r)=>{let o=Array.isArray(t)?t:[t],a=getDataType(e),n=a.toLowerCase(),s=o.map(e=>e.toLowerCase()),l=n.includes("html")?"element":n;if(r)try{if(!s.includes(l))throw new TypeError(`Expected data type(s): [${s.join(", ")}], but got: ${l}`)}catch(e){r(e,a)}else if(!s.includes(l))throw new TypeError(`Expected data type(s): [${s.join(", ")}], but got: ${l}`);return a},getUniqueId=(e={})=>{const t=e.prefix,r=e.suffix,o=e.base10,a=e.base36;return`${t?t+"-":""}${Date.now()}${a?"-"+Math.random().toString(36).substring(2,11):""}${o?"-"+Math.floor(1e4*Math.random()).toString().padStart(4,"0"):""}${r?"-"+r:""}`},setMutableMethods=["add","delete","clear"],mapMutableMethods=["set","delete","clear"],wrapSetMethods=({target:e,onBeforeMutate:t=()=>{},onAfterMutate:r=()=>{},allowList:o=setMutableMethods,props:a={}})=>{if(!(e instanceof Set))throw new TypeError("The 'target' parameter must be a Set.");const n={},createWrappedMethod=o=>function(...n){const s={};switch(o){case"add":{const[t]=n;s.addedItem=t,s.existed=e.has(t);break}case"delete":{const[t]=n;s.existed=e.has(t),s.deletedItem=s.existed?t:void 0;break}case"clear":s.clearedItems=Array.from(e),s.previousSize=e.size}t(s);const l=e[o].apply(e,n),i={method:o,result:l,args:n,context:s,target:e,...a};return r(i),l};for(const e of o)setMutableMethods.includes(e)&&(n[e]=createWrappedMethod(e));return Object.defineProperty(n,"target",{get:()=>e,enumerable:!1,configurable:!1}),n},wrapMapMethods=({target:e,onBeforeMutate:t=()=>{},onAfterMutate:r=()=>{},allowList:o=mapMutableMethods,props:a={}})=>{if(!(e instanceof Map))throw new TypeError("The 'target' parameter must be a Map.");const n={},createWrappedMethod=o=>function(...n){const s={};switch(o){case"set":{const[t,r]=n;s.key=t,s.newValue=r,s.existed=e.has(t),s.oldValue=s.existed?e.get(t):void 0;break}case"delete":{const[t]=n;s.key=t,s.existed=e.has(t),s.value=s.existed?e.get(t):void 0;break}case"clear":s.clearedItems=Array.from(e.entries()),s.previousSize=e.size}t(s);const l=e[o].apply(e,n),i={method:o,result:l,args:n,context:s,target:e,...a};return r(i),l};for(const e of o)mapMutableMethods.includes(e)&&(n[e]=createWrappedMethod(e));return Object.defineProperty(n,"target",{get:()=>e,enumerable:!1,configurable:!1}),n},shallowCopy=e=>{const t=getDataType(e);if("Set"===t)return new Set([...e]);if("Map"===t)return new Map([...e]);if(Array.isArray(e))return[...e];if("object"===t){const t=e,r=Object.getOwnPropertySymbols(t).reduce((e,r)=>(e[r]=t[r],e),{});return{...t,...r}}return e},deepMerge=(e,t,r={})=>{const o=Object.assign({dataMode:"clear",inheritMissing:!0,targetClone:!1,useEnable:!0,useSymbol:!0,deepClone:{},onBeforeMerge:void 0,onAfterMerge:void 0},r),deepMergeHelper=(e,t,r)=>{let o,a,n=getDataType(e),s=getDataType(t),l=!0;return"Object"===n&&"Object"===s?(a=deepMergeObjects(e,t,r),o="Object"):"Array"===n&&"Array"===s?(a=deepMergeArrays(e,t,r),o="Array"):"Set"===n&&"Set"===s?(a=deepMergeSets(e,t,r),o="Set"):"Map"===n&&"Map"===s?(a=deepMergeMaps(e,t,r),o="Map"):(l=!1,a=e),{result:a,flag:l,type:o}},mergeEnableObject=(e,t)=>e?.hasOwnProperty("enable")&&"boolean"==typeof t?(e.enable=t,e):t?.hasOwnProperty("enable")&&"boolean"==typeof e?Object.assign({enable:e},t):t,deepMergeObjects=(e,t,r={})=>{let o=getDataType(e),a=getDataType(t);if("Object"!==o||"Object"!==a)return e;r?.onBeforeMerge?.(e,t);const n=Object.assign({inheritMissing:!0,targetClone:!1,useEnable:!0},r);let s={};s=n.targetClone?shallowCopy(e):e;for(let e in t)if(t.hasOwnProperty(e)&&s.hasOwnProperty(e)){let o=deepMergeHelper(s[e],t[e],r);o.flag?o.type?"Object"===o.type&&(s[e]=o.result):s[e]=t[e]:n.useEnable?s[e]=mergeEnableObject(s[e],t[e]):s[e]=t[e]}else t.hasOwnProperty(e)&&!s.hasOwnProperty(e)&&n.inheritMissing&&(s[e]=t[e]);if(n.useSymbol){let e=Object.getOwnPropertySymbols(t);if(e.length)for(let r of e)s[r]=t[r]}return n?.onAfterMerge?.(s,e,t),s},deepMergeArrays=(e,t,r={})=>{if(!Array.isArray(e)||!Array.isArray(t))return e;r?.onBeforeMerge?.(e,t);const o=Object.assign({dataMode:"clear",inheritMissing:!0,targetClone:!1},r),a=o.targetClone?[...e]:e;if("replace"===o.dataMode)for(let e=0;e<t.length&&(o.inheritMissing||!(e>=a.length));e++){deepMergeHelper(a[e],t[e],o).flag||(a[e]=t[e])}else"concat"===o.dataMode||(a.length=0),a.push(...t);return r?.onAfterMerge?.(a,e,t),a},deepMergeMaps=(e,t,r={})=>{if(!(e instanceof Map&&t instanceof Map))return e;r?.onBeforeMerge?.(e,t);const o=Object.assign({inheritMissing:!0,targetClone:!1,useEnable:!0},r),a=o.targetClone?new Map([...e]):e;for(const[e,n]of t.entries())if(a.has(e)){const t=a.get(e),r=n,s=deepMergeHelper(t,r,o);s.flag?"Object"===s.type&&a.set(e,s.result):a.set(e,r)}else r.inheritMissing&&a.set(e,n);return r?.onAfterMerge?.(a,e,t),a},deepMergeSets=(e,t,r={})=>{if(!(e instanceof Set&&t instanceof Set))return e;r?.onBeforeMerge?.(e,t);const o=Object.assign({dataMode:"clear",inheritMissing:!0,targetClone:!1,useEnable:!0},r),a=o.targetClone?new Set(...e):e;if("replace"===o.dataMode){const e=[...a],r=[...t],n=deepMergeHelper(e,r,o);a.clear();for(let e of n.result)a.add(e)}else if("concat"===o.dataMode)for(let e of t)a.add(e);else{a.clear();for(let e of t)a.add(e)}return r?.onAfterMerge?.(a,e,t),a};return deepMergeHelper(e,t,o).result},utils={getDataType:getDataType,requireTypes:requireTypes,deepClone:deepClone,deepCloneToJSON:deepCloneToJSON,wrapArrayMethods:wrapArrayMethods,arrayMutableMethods:arrayMutableMethods,setMutableMethods:setMutableMethods,mapMutableMethods:mapMutableMethods,wrapSetMethods:wrapSetMethods,wrapMapMethods:wrapMapMethods,getUniqueId:getUniqueId,deepMerge:deepMerge,shallowCopy:shallowCopy};module.exports=utils;
|