@shuvi/utils 1.0.55 → 1.0.56

package/lib/async.d.ts

@@ -1,8 +1,8 @@
-export declare type Results<T = any> = T[] & {
+export type Results<T = any> = T[] & {
     first: T;
     _firstFlag: boolean;
 };
-export declare type SimpleCallback = () => any;
+export type SimpleCallback = () => any;
 export interface AsyncParallelIteratorCallback<T = unknown, E = unknown> {
     (err?: E | null, value?: T): void;
 }
@@ -15,5 +15,5 @@ export interface AsyncIterator<T, E> {
 export interface ErrorCallback<T> {
     (err?: T | null): void;
 }
-export declare type AsyncParallelCallback<T, E> = (finishedNum: number, values: Results<T>, errors: Results<E>, done: SimpleCallback) => any;
+export type AsyncParallelCallback<T, E> = (finishedNum: number, values: Results<T>, errors: Results<E>, done: SimpleCallback) => any;
 export declare function each<T = unknown, E = unknown>(targets: T[], handler: AsyncIterator<T, E>, cb?: ErrorCallback<E>): void;

package/lib/async.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.each = void 0;
+exports.each = each;
 function runParallel(targets, handler, cb) {
     const values = [];
     const errors = [];
@@ -53,4 +53,3 @@ function each(targets, handler, cb) {
         }
     });
 }
-exports.each = each;

package/lib/deepmerge.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deepmerge = void 0;
+exports.deepmerge = deepmerge;
 function mergeTwoObject(origin, target) {
     if (target === null || typeof target === 'undefined') {
         return origin;
@@ -24,4 +24,3 @@ function mergeTwoObject(origin, target) {
 function deepmerge(...args) {
     return args.reduce(mergeTwoObject, {});
 }
-exports.deepmerge = deepmerge;

package/lib/defer.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createDefer = void 0;
+exports.createDefer = createDefer;
 function createDefer() {
     let defer = {
         resolve: null,
@@ -19,4 +19,3 @@ function createDefer() {
     });
     return defer;
 }
-exports.createDefer = createDefer;

package/lib/escapeRegExp.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.escapeRegExp = void 0;
+exports.escapeRegExp = escapeRegExp;
 function escapeRegExp(s) {
     return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
 }
-exports.escapeRegExp = escapeRegExp;

package/lib/events.d.ts

@@ -1,6 +1,6 @@
-declare type AnyHandler = (...args: any) => void;
-export declare type RemoveListenerCallback = () => void | undefined;
-export declare type Event<F extends AnyHandler> = {
+type AnyHandler = (...args: any) => void;
+export type RemoveListenerCallback = () => void | undefined;
+export type Event<F extends AnyHandler> = {
     toArray: () => F[];
     length: number;
     on: (fn: F) => RemoveListenerCallback;
@@ -9,7 +9,7 @@ export declare type Event<F extends AnyHandler> = {
 export interface EventMap {
     [key: string]: AnyHandler;
 }
-export declare type Events<EM extends EventMap = EventMap> = {
+export type Events<EM extends EventMap = EventMap> = {
     on<Name extends keyof EM, Handler = EM[Name]>(type: Name, handler: Handler): RemoveListenerCallback;
     emit<Name extends keyof EM, Handler extends AnyHandler = EM[Name]>(type: string, ...args: Parameters<Handler>): void;
 };

package/lib/events.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createEvents = exports.createEvent = void 0;
+exports.createEvent = createEvent;
+exports.createEvents = createEvents;
 function createEvent() {
     let handlers = [];
     return {
@@ -22,7 +23,6 @@ function createEvent() {
         }
     };
 }
-exports.createEvent = createEvent;
 function createEvents() {
     const all = Object.create(null);
     return {
@@ -43,4 +43,3 @@ function createEvents() {
         }
     };
 }
-exports.createEvents = createEvents;

package/lib/file.js

@@ -32,17 +32,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizePath = exports.isDirectory = exports.resolveFile = exports.findFirstExistedFile = exports.removeExt = exports.withExts = void 0;
+exports.normalizePath = exports.isDirectory = exports.resolveFile = exports.findFirstExistedFile = void 0;
+exports.withExts = withExts;
+exports.removeExt = removeExt;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 function withExts(file, extensions) {
     return extensions.map(ext => `${file}${ext}`);
 }
-exports.withExts = withExts;
 function removeExt(file) {
     return file.replace(/\.\w+$/, '');
 }
-exports.removeExt = removeExt;
 const findFirstExistedFile = (files) => {
     for (let index = 0; index < files.length; index++) {
         const file = files[index];

package/lib/fileWatcher.d.ts

@@ -14,6 +14,6 @@ export interface WatchOptions {
     startTime?: number;
     ignoreFileContentUpdate?: boolean;
 }
-export declare type WatchCallback = (event: WatchEvent) => void;
-export declare type ChangeCallback = (file: string, time: number) => void;
+export type WatchCallback = (event: WatchEvent) => void;
+export type ChangeCallback = (file: string, time: number) => void;
 export declare function watch({ files, directories, missing, aggregateTimeout, startTime, ignoreFileContentUpdate }: WatchOptions, callback: WatchCallback, callbackUndelayed?: ChangeCallback): () => void;

package/lib/fileWatcher.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.watch = exports.Watchpack = void 0;
+exports.Watchpack = void 0;
+exports.watch = watch;
 const watchpack_1 = __importDefault(require("watchpack"));
 exports.Watchpack = watchpack_1.default;
 const watchpackExplanationType = {
@@ -78,4 +79,3 @@ function watch({ files, directories, missing, aggregateTimeout, startTime = Date
         wp.close();
     };
 }
-exports.watch = watch;

package/lib/htmlescape.js

@@ -2,7 +2,8 @@
 // This utility is based on https://github.com/zertosh/htmlescape
 // License: https://github.com/zertosh/htmlescape/blob/0527ca7156a524d256101bb310a9f970f63078ad/LICENSE
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.htmlEscapeContent = exports.htmlEscapeJsonString = void 0;
+exports.htmlEscapeJsonString = htmlEscapeJsonString;
+exports.htmlEscapeContent = htmlEscapeContent;
 const JSON_ESCAPE_LOOKUP = {
     '&': '\\u0026',
     '>': '\\u003e',
@@ -14,7 +15,6 @@ const JSON_ESCAPE_REGEX = /[&><\u2028\u2029]/g;
 function htmlEscapeJsonString(str) {
     return str.replace(JSON_ESCAPE_REGEX, (match) => JSON_ESCAPE_LOOKUP[match]);
 }
-exports.htmlEscapeJsonString = htmlEscapeJsonString;
 const CONTENT_ESCAPE_LOOKUP = {
     '&': '&amp;',
     '"': '&quot;',
@@ -26,4 +26,3 @@ const CONTENT_ESCAPE_REGEX = /[&><\'\"]/g;
 function htmlEscapeContent(str) {
     return str.replace(CONTENT_ESCAPE_REGEX, (match) => CONTENT_ESCAPE_LOOKUP[match]);
 }
-exports.htmlEscapeContent = htmlEscapeContent;

package/lib/index.d.ts

@@ -3,12 +3,12 @@ export * from './defer';
 export declare const EMPTY_OBJ: {};
 export declare const extend: {
     <T extends {}, U>(target: T, source: U): T & U;
-    <T_1 extends {}, U_1, V>(target: T_1, source1: U_1, source2: V): T_1 & U_1 & V;
-    <T_2 extends {}, U_2, V_1, W>(target: T_2, source1: U_2, source2: V_1, source3: W): T_2 & U_2 & V_1 & W;
+    <T extends {}, U, V>(target: T, source1: U, source2: V): T & U & V;
+    <T extends {}, U, V, W>(target: T, source1: U, source2: V, source3: W): T & U & V & W;
     (target: object, ...sources: any[]): any;
 };
 export declare const isArray: (arg: any) => arg is any[];
 export declare const isObject: (val: unknown) => val is Record<any, any>;
 export declare const isFunction: (val: unknown) => val is Function;
-export declare const hasOwn: (val: object, key: string | symbol) => key is never;
+export declare const hasOwn: (val: object, key: string | symbol) => key is keyof typeof val;
 export declare function getType(obj: any): string;

package/lib/index.js

@@ -17,7 +17,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getType = exports.hasOwn = exports.isFunction = exports.isObject = exports.isArray = exports.extend = exports.EMPTY_OBJ = exports.NOOP = void 0;
+exports.hasOwn = exports.isFunction = exports.isObject = exports.isArray = exports.extend = exports.EMPTY_OBJ = exports.NOOP = void 0;
+exports.getType = getType;
 var noopFn_1 = require("./noopFn");
 Object.defineProperty(exports, "NOOP", { enumerable: true, get: function () { return __importDefault(noopFn_1).default; } });
 __exportStar(require("./defer"), exports);
@@ -41,4 +42,3 @@ function getType(obj) {
     // inspect [[Class]] for objects
     return toString.call(obj).replace(objectRegExp, '$1');
 }
-exports.getType = getType;

package/lib/once.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.once = void 0;
+exports.once = once;
 function once(fn) {
     let hasRun = false;
     let result;
@@ -13,4 +13,3 @@ function once(fn) {
     }
     return wrapped;
 }
-exports.once = once;

package/lib/recursiveCopy.js

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.recursiveCopy = void 0;
+exports.recursiveCopy = recursiveCopy;
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
 const util_1 = require("util");
@@ -42,8 +42,8 @@ const fsStat = (0, util_1.promisify)(fs.stat);
 const fsReaddir = (0, util_1.promisify)(fs.readdir);
 const fsCopyFile = (0, util_1.promisify)(fs.copyFile);
 const COPYFILE_EXCL = fs.constants.COPYFILE_EXCL;
-function recursiveCopy(source, dest, { concurrency = 255, filter = () => true } = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
+function recursiveCopy(source_1, dest_1) {
+    return __awaiter(this, arguments, void 0, function* (source, dest, { concurrency = 255, filter = () => true } = {}) {
         const cwdPath = process.cwd();
         const from = path.resolve(cwdPath, source);
         const to = path.resolve(cwdPath, dest);
@@ -79,4 +79,3 @@ function recursiveCopy(source, dest, { concurrency = 255, filter = () => true }
         yield _copy(from);
     });
 }
-exports.recursiveCopy = recursiveCopy;

package/lib/recursiveDelete.js

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.recursiveDelete = void 0;
+exports.recursiveDelete = recursiveDelete;
 const fs = __importStar(require("fs"));
 const path_1 = require("path");
 const util_1 = require("util");
@@ -41,7 +41,7 @@ const fsStat = (0, util_1.promisify)(fs.stat);
 const fsRmdir = (0, util_1.promisify)(fs.rmdir);
 const fsUnlink = (0, util_1.promisify)(fs.unlink);
 const sleep = (0, util_1.promisify)(setTimeout);
-const unlinkFile = (p, t = 1) => __awaiter(void 0, void 0, void 0, function* () {
+const unlinkFile = (p_1, ...args_1) => __awaiter(void 0, [p_1, ...args_1], void 0, function* (p, t = 1) {
     try {
         yield fsUnlink(p);
     }
@@ -68,8 +68,8 @@ const unlinkFile = (p, t = 1) => __awaiter(void 0, void 0, void 0, function* ()
  * @param {RegExp} options.ignore Ignore certain files, only the relative file path is considered, not the full path
  * @param {string} options.rootDir Used to replace the initial path, only the relative path is left, it's faster than path.relative.
  */
-function recursiveDelete(dir, { filter, ignore, rootDir = dir } = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
+function recursiveDelete(dir_1) {
+    return __awaiter(this, arguments, void 0, function* (dir, { filter, ignore, rootDir = dir } = {}) {
         let result;
         try {
             result = yield fsReaddir(dir);
@@ -108,4 +108,3 @@ function recursiveDelete(dir, { filter, ignore, rootDir = dir } = {}) {
         })));
     });
 }
-exports.recursiveDelete = recursiveDelete;

package/lib/recursiveReaddir.d.ts

@@ -1,4 +1,4 @@
-declare type Test = RegExp | ((v: string) => boolean);
+type Test = RegExp | ((v: string) => boolean);
 /**
  * Recursively read directory
  * @param {string} dir Directory to read

package/lib/recursiveReaddir.js

@@ -32,7 +32,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.recursiveReadDirSync = exports.recursiveReadDir = void 0;
+exports.recursiveReadDir = recursiveReadDir;
+exports.recursiveReadDirSync = recursiveReadDirSync;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const util_1 = require("util");
@@ -54,8 +55,8 @@ function runTest(test, v) {
  * @param {string} options.arr This doesn't have to be provided, it's used for the recursion
  * @returns {Promise<string[]>} Promise array holding all relative paths
  */
-function recursiveReadDir(dir, { filter, ignore, rootDir = dir, arr = [] } = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
+function recursiveReadDir(dir_1) {
+    return __awaiter(this, arguments, void 0, function* (dir, { filter, ignore, rootDir = dir, arr = [] } = {}) {
         const result = yield fsReaddir(dir);
         yield Promise.all(result.map((part) => __awaiter(this, void 0, void 0, function* () {
             const absolutePath = path.join(dir, part);
@@ -76,7 +77,6 @@ function recursiveReadDir(dir, { filter, ignore, rootDir = dir, arr = [] } = {})
         return arr.sort();
     });
 }
-exports.recursiveReadDir = recursiveReadDir;
 /**
  * Recursively read directory
  * @param {string} dir Directory to read
@@ -105,4 +105,3 @@ function recursiveReadDirSync(dir, { filter, ignore, rootDir = dir, arr = [] } =
     });
     return arr.sort();
 }
-exports.recursiveReadDirSync = recursiveReadDirSync;

package/lib/resolve.d.ts

@@ -1,3 +1,3 @@
 import * as _resolve from 'resolve';
-export declare type ResolveOptions = _resolve.SyncOpts;
-export declare const resolve: (id: string, opts?: _resolve.SyncOpts | undefined) => string;
+export type ResolveOptions = _resolve.SyncOpts;
+export declare const resolve: (id: string, opts?: _resolve.SyncOpts) => string;

package/lib/string.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.joinPath = void 0;
+exports.joinPath = joinPath;
 function joinPath(lead, ...paths) {
     if (paths.length < 1) {
         return lead;
@@ -9,4 +9,3 @@ function joinPath(lead, ...paths) {
         '/' +
         paths.join('/').replace(/\\/g, '/').replace(/\/+/g, '/').replace(/^\/+/, ''));
 }
-exports.joinPath = joinPath;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/utils",
-  "version": "1.0.55",
+  "version": "1.0.56",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",