ut2 1.1.0 → 1.1.2

package/es/conformsTo.js

@@ -1,5 +1,7 @@
+import allKeys from './allKeys.js';
+
 function conformsTo(object, source) {
-    var props = Object.keys(source);
+    var props = allKeys(source);
     var length = props.length;
     if (object == null) {
         return !length;

package/es/internals/getSymbolsIn.js

@@ -5,7 +5,9 @@ function getSymbolsIn(object) {
     var o = Object(object);
     while (o) {
         getSymbols(o).forEach(function (item) {
-            result.push(item);
+            if (result.indexOf(item) === -1) {
+                result.push(item);
+            }
         });
         o = Object.getPrototypeOf(o);
     }

package/es/internals/helpers.js

@@ -8,6 +8,6 @@ var numberIsInteger = Number.isInteger;
 var numberIsSafeInteger = Number.isSafeInteger;
 var objectGetOwnPropertySymbols = Object.getOwnPropertySymbols;
 var arrayAt = Array.prototype.at;
-var VERSION = "1.1.0";
+var VERSION = "1.1.2";
 
 export { FUNC_ERROR_TEXT, VERSION, argType, arrayAt, numberIsFinite, numberIsInteger, numberIsSafeInteger, objectGetOwnPropertySymbols, supportedArgumentsType };

package/es/merge.js

@@ -1,3 +1,4 @@
+import allKeysIn from './allKeysIn.js';
 import isArray from './isArray.js';
 import isObject from './isObject.js';
 import isObjectLike from './isObjectLike.js';
@@ -8,7 +9,8 @@ function baseMerge(object, source, customizer, storage) {
     if (!isObject(source) || obj === source) {
         return obj;
     }
-    for (var key in source) {
+    var keys = allKeysIn(source);
+    keys.forEach(function (key) {
         var srcValue = source[key];
         var newValue = typeof customizer === 'function'
             ? customizer(obj[key], srcValue, key, obj, source)
@@ -33,7 +35,7 @@ function baseMerge(object, source, customizer, storage) {
                 obj[key] = newValue;
             }
         }
-    }
+    });
     return obj;
 }
 function merge(object, source, customizer) {

package/lib/conformsTo.js

@@ -1,7 +1,9 @@
 'use strict';
 
+var allKeys = require('./allKeys.js');
+
 function conformsTo(object, source) {
-    var props = Object.keys(source);
+    var props = allKeys(source);
     var length = props.length;
     if (object == null) {
         return !length;

package/lib/internals/getSymbolsIn.js

@@ -7,7 +7,9 @@ function getSymbolsIn(object) {
     var o = Object(object);
     while (o) {
         getSymbols(o).forEach(function (item) {
-            result.push(item);
+            if (result.indexOf(item) === -1) {
+                result.push(item);
+            }
         });
         o = Object.getPrototypeOf(o);
     }

package/lib/internals/helpers.js

@@ -10,4 +10,4 @@ exports.numberIsInteger = Number.isInteger;
 exports.numberIsSafeInteger = Number.isSafeInteger;
 exports.objectGetOwnPropertySymbols = Object.getOwnPropertySymbols;
 exports.arrayAt = Array.prototype.at;
-exports.VERSION = "1.1.0";
+exports.VERSION = "1.1.2";

package/lib/merge.js

@@ -1,5 +1,6 @@
 'use strict';
 
+var allKeysIn = require('./allKeysIn.js');
 var isArray = require('./isArray.js');
 var isObject = require('./isObject.js');
 var isObjectLike = require('./isObjectLike.js');
@@ -10,7 +11,8 @@ function baseMerge(object, source, customizer, storage) {
     if (!isObject(source) || obj === source) {
         return obj;
     }
-    for (var key in source) {
+    var keys = allKeysIn(source);
+    keys.forEach(function (key) {
         var srcValue = source[key];
         var newValue = typeof customizer === 'function'
             ? customizer(obj[key], srcValue, key, obj, source)
@@ -35,7 +37,7 @@ function baseMerge(object, source, customizer, storage) {
                 obj[key] = newValue;
             }
         }
-    }
+    });
     return obj;
 }
 function merge(object, source, customizer) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ut2",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "author": "caijf",
   "license": "MIT",
   "main": "lib/index.js",

package/types/conformsTo.d.ts

@@ -1,21 +1,3 @@
-/**
- * 通过调用断言 `source` 的属性与 `object` 的相应属性值，检查 `object` 是否符合 `source` 。
- *
- * @static
- * @alias module:Util.conformsTo
- * @since 1.0.0
- * @param {Object} object 要检查的对象。
- * @param {Object} source 要断言属性是否符合的对象。
- * @returns {boolean} 如果 `object` 符合，返回 `true` ，否则返回 `false` 。
- * @example
- *
- * const object = { a: 1, b: 2 }
- *
- * conformsTo(object, { b: value => value > 1 }); // true
- *
- * conformsTo(object, { b: value => value > 2 }); // false
- *
- */
 declare function conformsTo<T extends object, K extends keyof T>(object: T, source: Record<K, (value: T[K]) => any>): boolean;
-declare function conformsTo<T extends object | null | undefined>(object: T, source: Record<string, (value: any) => any>): boolean;
+declare function conformsTo<T extends object | null | undefined>(object: T, source: Record<string | symbol, (value: any) => any>): boolean;
 export default conformsTo;

package/types/merge.d.ts

@@ -1,6 +1,6 @@
 type Customizer = (objValue: any, srcValue: any, key: string, object: any, source: any) => any;
 /**
- * 递归合并 `source` 来源对象自身和继承的可枚举属性到 `object` 目标对象。
+ * 递归合并 `source` 来源对象自身和继承的可枚举属性（包含 `Symbol` 属性）到 `object` 目标对象。
  *
  * 如果目标值存在，被解析为 `undefined` 的 `source` 来源对象属性将被跳过。数组和普通对象会递归合并，其他对象和值会被直接分配覆盖。
  *