ut2 1.10.0 → 1.11.0

package/es/index.js

@@ -49,6 +49,7 @@ export { default as isElement } from './isElement.js';
 export { default as isEmpty } from './isEmpty.js';
 export { default as isEqual } from './isEqual.js';
 export { default as isError } from './isError.js';
+export { default as isFile } from './isFile.js';
 export { default as isFinite } from './isFinite.js';
 export { default as isFunction } from './isFunction.js';
 export { default as isInteger } from './isInteger.js';

package/es/internals/helpers.js

@@ -2,7 +2,7 @@ import isObjectLike from '../isObjectLike.js';
 import getTag from './getTag.js';
 import { argumentsTag, stringUndefined, functionProtoToString } from './native.js';
 
-var VERSION = "1.10.0";
+var VERSION = "1.11.0";
 var isBrowser = typeof window !== stringUndefined && isObjectLike(window) && typeof document !== stringUndefined && isObjectLike(document) && window.document === document;
 var supportedArgumentsType = getTag((function () { return arguments; })()) === argumentsTag;
 var FUNC_ERROR_TEXT = 'Expected a function';

package/es/internals/native.js

@@ -43,6 +43,7 @@ var arrayTag = '[object Array]';
 var functionTags = ['Function', 'AsyncFunction', 'GeneratorFunction', 'Proxy'].map(function (item) { return '[object ' + item + ']'; });
 var weakSetTag = '[object WeakSet]';
 var blobTag = '[object Blob]';
+var fileTag = '[object File]';
 var domExceptionTag = '[object DOMException]';
 var objectTag = '[object Object]';
 var dataViewTag = '[object DataView]';
@@ -52,4 +53,4 @@ var setTag = '[object Set]';
 var weakMapTag = '[object WeakMap]';
 var windowTag = '[object Window]';
 
-export { MAX_ARRAY_LENGTH, MAX_SAFE_INTEGER, MIN_SAFE_INTEGER, argumentsTag, arrayBufferTag, arrayProto, arrayProtoSlice, arrayTag, bigIntTag, blobTag, booleanTag, dataViewTag, dateTag, domExceptionTag, errorTag, functionProto, functionProtoToString, functionTags, globalExisted, globalThisExisted, mapTag, mathAbs, mathCeil, mathFloor, mathMax, mathMin, mathRandom, nativeUndefined, numberIsFinite, numberIsInteger, numberIsSafeInteger, numberTag, objectGetOwnPropertySymbols, objectGetPrototypeOf, objectKeys, objectProto, objectProtoHasOwnProperty, objectProtoPropertyIsEnumerable, objectProtoToString, objectTag, promiseTag, regExpTag, selfExisted, setTag, stringObject, stringTag, stringUndefined, symbolProto, symbolTag, weakMapTag, weakSetTag, windowTag };
+export { MAX_ARRAY_LENGTH, MAX_SAFE_INTEGER, MIN_SAFE_INTEGER, argumentsTag, arrayBufferTag, arrayProto, arrayProtoSlice, arrayTag, bigIntTag, blobTag, booleanTag, dataViewTag, dateTag, domExceptionTag, errorTag, fileTag, functionProto, functionProtoToString, functionTags, globalExisted, globalThisExisted, mapTag, mathAbs, mathCeil, mathFloor, mathMax, mathMin, mathRandom, nativeUndefined, numberIsFinite, numberIsInteger, numberIsSafeInteger, numberTag, objectGetOwnPropertySymbols, objectGetPrototypeOf, objectKeys, objectProto, objectProtoHasOwnProperty, objectProtoPropertyIsEnumerable, objectProtoToString, objectTag, promiseTag, regExpTag, selfExisted, setTag, stringObject, stringTag, stringUndefined, symbolProto, symbolTag, weakMapTag, weakSetTag, windowTag };

package/es/isFile.js

@@ -0,0 +1,12 @@
+import getTag from './internals/getTag.js';
+import { fileTag, stringUndefined } from './internals/native.js';
+
+var fileExisted = typeof File !== stringUndefined;
+function isFile(value) {
+    if (fileExisted && value instanceof File) {
+        return true;
+    }
+    return getTag(value) === fileTag;
+}
+
+export { isFile as default };

package/es/merge.js

@@ -51,5 +51,6 @@ function merge(object, source, customizer, getKeys) {
     if (getKeys === void 0) { getKeys = allKeys; }
     return baseMerge(object, source, getKeys, customizer);
 }
+merge.NOT_MERGE_ARRAYS = function (objValue, srcValue) { return (isArray(srcValue) ? srcValue : undefined); };
 
 export { merge as default };

package/lib/index.js

@@ -51,6 +51,7 @@ var isElement = require('./isElement.js');
 var isEmpty = require('./isEmpty.js');
 var isEqual = require('./isEqual.js');
 var isError = require('./isError.js');
+var isFile = require('./isFile.js');
 var isFinite = require('./isFinite.js');
 var isFunction = require('./isFunction.js');
 var isInteger = require('./isInteger.js');
@@ -187,6 +188,7 @@ exports.isElement = isElement;
 exports.isEmpty = isEmpty;
 exports.isEqual = isEqual;
 exports.isError = isError;
+exports.isFile = isFile;
 exports.isFinite = isFinite;
 exports.isFunction = isFunction;
 exports.isInteger = isInteger;

package/lib/internals/helpers.js

@@ -4,7 +4,7 @@ var isObjectLike = require('../isObjectLike.js');
 var getTag = require('./getTag.js');
 var native = require('./native.js');
 
-var VERSION = "1.10.0";
+var VERSION = "1.11.0";
 var isBrowser = typeof window !== native.stringUndefined && isObjectLike(window) && typeof document !== native.stringUndefined && isObjectLike(document) && window.document === document;
 var supportedArgumentsType = getTag((function () { return arguments; })()) === native.argumentsTag;
 var FUNC_ERROR_TEXT = 'Expected a function';

package/lib/internals/native.js

@@ -45,6 +45,7 @@ var arrayTag = '[object Array]';
 var functionTags = ['Function', 'AsyncFunction', 'GeneratorFunction', 'Proxy'].map(function (item) { return '[object ' + item + ']'; });
 var weakSetTag = '[object WeakSet]';
 var blobTag = '[object Blob]';
+var fileTag = '[object File]';
 var domExceptionTag = '[object DOMException]';
 var objectTag = '[object Object]';
 var dataViewTag = '[object DataView]';
@@ -69,6 +70,7 @@ exports.dataViewTag = dataViewTag;
 exports.dateTag = dateTag;
 exports.domExceptionTag = domExceptionTag;
 exports.errorTag = errorTag;
+exports.fileTag = fileTag;
 exports.functionProto = functionProto;
 exports.functionProtoToString = functionProtoToString;
 exports.functionTags = functionTags;

package/lib/isFile.js

@@ -0,0 +1,14 @@
+'use strict';
+
+var getTag = require('./internals/getTag.js');
+var native = require('./internals/native.js');
+
+var fileExisted = typeof File !== native.stringUndefined;
+function isFile(value) {
+    if (fileExisted && value instanceof File) {
+        return true;
+    }
+    return getTag(value) === native.fileTag;
+}
+
+module.exports = isFile;

package/lib/merge.js

@@ -53,5 +53,6 @@ function merge(object, source, customizer, getKeys) {
     if (getKeys === void 0) { getKeys = allKeys; }
     return baseMerge(object, source, getKeys, customizer);
 }
+merge.NOT_MERGE_ARRAYS = function (objValue, srcValue) { return (isArray(srcValue) ? srcValue : undefined); };
 
 module.exports = merge;

package/package.json

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

package/types/index.d.ts

@@ -73,6 +73,7 @@ export { default as isElement } from './isElement';
 export { default as isEmpty } from './isEmpty';
 export { default as isEqual } from './isEqual';
 export { default as isError } from './isError';
+export { default as isFile } from './isFile';
 export { default as isFinite } from './isFinite';
 export { default as isFunction } from './isFunction';
 export { default as isInteger } from './isInteger';

package/types/internals/native.d.ts

@@ -66,6 +66,7 @@ export declare const arrayTag = "[object Array]";
 export declare const functionTags: string[];
 export declare const weakSetTag = "[object WeakSet]";
 export declare const blobTag = "[object Blob]";
+export declare const fileTag = "[object File]";
 export declare const domExceptionTag = "[object DOMException]";
 export declare const objectTag = "[object Object]";
 export declare const dataViewTag = "[object DataView]";

package/types/isBlob.d.ts

@@ -14,6 +14,8 @@
  *
  * isBlob(new Blob(['a'])); // true
  *
+ * isBlob(new File([], 'test.txt')); // true
+ *
  * isBlob({}); // false
  *
  * isBlob('2012'); // false

package/types/isFile.d.ts

@@ -0,0 +1,24 @@
+/**
+ * 检查值是否为 `File` 对象。
+ *
+ * 浏览器环境的 `File` 对象，或其他继承自 `File` 的实例，都将返回 `true`。
+ *
+ * @static
+ * @alias module:Language.isFile
+ * @since 1.11.0
+ * @see {@link https://developer.mozilla.org/zh-CN/docs/Web/API/File File}
+ * @param {*} value 要检查的值。
+ * @returns {boolean} 如果值为 `File` 对象，返回 `true`，否则返回 `false`。
+ * @example
+ *
+ * isFile(new File([], 'test.txt')); // true
+ *
+ * isBlob(new Blob(['a'])); // false
+ *
+ * isFile({}); // false
+ *
+ * isFile('2012'); // false
+ *
+ */
+declare function isFile(value: any): value is File;
+export default isFile;

package/types/isPromiseLike.d.ts

@@ -1,8 +1,3 @@
-import { FunctionAny } from './internals/types';
-type PromiseLikeObject = {
-    then: FunctionAny;
-    [x: string]: any;
-};
 /**
  * 检测值是否类似 `Promise` 对象。
  *
@@ -22,5 +17,5 @@ type PromiseLikeObject = {
  * isPromiseLike([]); // false
  *
  */
-declare function isPromiseLike(value: any): value is Promise<any> | PromiseLikeObject;
+declare function isPromiseLike(value: any): value is Promise<any> | PromiseLike<any>;
 export default isPromiseLike;

package/types/merge.d.ts

@@ -5,7 +5,9 @@ type Customizer = (objValue: any, srcValue: any, key: string | symbol, object: a
  *
  * 如果目标值存在，被解析为 `undefined` 的 `source` 来源对象属性将被跳过。数组和普通对象会递归合并，其他对象和值会被直接分配覆盖。
  *
- * 如果你需要合并继承的属性，第四个参数传入 {@link https://caijf.github.io/ut2/module-Object.html#.allKeysIn allKeysIn} 方法， `merge(object, source, undefined, allKeysIn)`。
+ * 如果不需要合并数组，第三个参数传入 `merge.NOT_MERGE_ARRAYS` 。
+ *
+ * 如果需要合并继承的属性，第四个参数传入 {@link https://caijf.github.io/ut2/module-Object.html#.allKeysIn allKeysIn} 方法， `merge(object, source, undefined, allKeysIn)`。
  *
  * @static
  * @alias module:Object.merge
@@ -17,18 +19,27 @@ type Customizer = (objValue: any, srcValue: any, key: string | symbol, object: a
  * @returns {Object} 目标对象。
  * @example
  *
+ * merge({c: 3}, {e: 5}); // { c: 3, e: 5 }
+ * merge({ a: 1 }, { a: undefined, b: undefined }); // { a: 1, b: undefined }
+ *
  * const object = {
  *   a: [{b: 2}, {d: 4}]
  * }
- *
  * const other = {
  *   a: [{c: 3},{e: 5}]
  * }
  *
  * merge(object, other); // { a: [{b: 2, c: 3}, {d: 4, e: 5}] }
  *
- * // 自定义，数组不合并
+ * // 数组不合并
+ * merge(object, other, merge.NOT_MERGE_ARRAYS); // { a: [{c: 3},{e: 5}] }
+ *
+ * // 或自定义数组不合并方法
  * merge(object, other, (objValue, srcValue) => isArray(srcValue) ? srcValue : undefined); // { a: [{c: 3},{e: 5}] }
+ *
  */
 declare function merge<TObject, TSource>(object: TObject, source: TSource, customizer?: Customizer, getKeys?: GetKeysMethod): TObject & TSource;
+declare namespace merge {
+    var NOT_MERGE_ARRAYS: (objValue: any, srcValue: any) => any[] | undefined;
+}
 export default merge;