@shuvi/utils 1.0.0-rc.9 → 1.0.0

package/lib/file.d.ts

@@ -1,4 +1,5 @@
 export declare function withExts(file: string, extensions: string[]): string[];
+export declare function removeExt(file: string): string;
 export declare const findFirstExistedFile: (files: string[]) => string | null;
 export declare const resolveFile: (fileName: string) => string;
 export declare const isDirectory: (dirname: string) => Promise<boolean>;

package/lib/file.js

@@ -32,13 +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.withExts = void 0;
+exports.normalizePath = exports.isDirectory = exports.resolveFile = exports.findFirstExistedFile = exports.removeExt = exports.withExts = void 0;
 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

@@ -1,9 +1,10 @@
-import { TimeInfo } from 'watchpack';
-export { TimeInfo };
+import Watchpack, { TimeInfo } from 'watchpack';
+export { Watchpack, TimeInfo };
 export interface WatchEvent {
     changes: string[];
     removals: string[];
     getAllFiles: () => string[];
+    knownFiles: Map<string, TimeInfo>;
 }
 export interface WatchOptions {
     files?: string[];
@@ -11,7 +12,8 @@ export interface WatchOptions {
     missing?: string[];
     aggregateTimeout?: number;
     startTime?: number;
+    ignoreFileContentUpdate?: boolean;
 }
 export declare type WatchCallback = (event: WatchEvent) => void;
 export declare type ChangeCallback = (file: string, time: number) => void;
-export declare function watch({ files, directories, missing, aggregateTimeout, startTime }: WatchOptions, callback: WatchCallback, callbackUndelayed?: ChangeCallback): () => void;
+export declare function watch({ files, directories, missing, aggregateTimeout, startTime, ignoreFileContentUpdate }: WatchOptions, callback: WatchCallback, callbackUndelayed?: ChangeCallback): () => void;

package/lib/fileWatcher.js

@@ -3,8 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.watch = void 0;
+exports.watch = exports.Watchpack = void 0;
 const watchpack_1 = __importDefault(require("watchpack"));
+exports.Watchpack = watchpack_1.default;
+const watchpackExplanationType = {
+    change: 'change',
+    rename: 'rename'
+};
 const options = {
     // options:
     aggregateTimeout: 300,
@@ -16,34 +21,60 @@ const options = {
     // ignored: /regexp/ - a regular expression for files or folders that should not be watched
     // All subdirectories are ignored too
 };
-function watch({ files, directories, missing, aggregateTimeout, startTime = Date.now() }, callback, callbackUndelayed) {
+function watch({ files, directories, missing, aggregateTimeout, startTime = Date.now(), ignoreFileContentUpdate }, callback, callbackUndelayed) {
     const watchPackOptions = Object.assign({}, options);
     if (aggregateTimeout !== undefined) {
         watchPackOptions.aggregateTimeout = aggregateTimeout;
     }
     const wp = new watchpack_1.default(watchPackOptions);
-    wp.on('aggregated', (changes, removals) => {
+    let aggregatedChanges = new Set();
+    let aggregatedRemovals = new Set();
+    wp.on('aggregated', () => {
+        if (!aggregatedChanges.size && !aggregatedRemovals.size) {
+            return;
+        }
         const knownFiles = wp.getTimeInfoEntries();
+        const changes = Array.from(aggregatedChanges);
+        const removals = Array.from(aggregatedRemovals);
+        aggregatedChanges = new Set();
+        aggregatedRemovals = new Set();
         callback({
-            changes: Array.from(changes),
-            removals: Array.from(removals),
+            changes,
+            removals,
             getAllFiles() {
                 const res = [];
-                for (const [file, timeinfo] of knownFiles.entries()) {
-                    if (timeinfo && timeinfo.accuracy !== undefined) {
+                for (const [file, timeInfo] of knownFiles.entries()) {
+                    if (timeInfo && timeInfo.accuracy !== undefined) {
                         res.push(file);
                     }
                 }
                 return res;
-            }
+            },
+            knownFiles
         });
     });
-    if (callbackUndelayed) {
-        wp.on('change', callbackUndelayed);
-        wp.on('remove', callbackUndelayed);
-    }
+    wp.on('change', (file, time, explanation) => {
+        if (ignoreFileContentUpdate &&
+            explanation === watchpackExplanationType.change) {
+            return;
+        }
+        aggregatedRemovals.delete(file);
+        aggregatedChanges.add(file);
+        callbackUndelayed === null || callbackUndelayed === void 0 ? void 0 : callbackUndelayed(file, time);
+    });
+    wp.on('remove', (file, time, explanation) => {
+        if (ignoreFileContentUpdate &&
+            explanation === watchpackExplanationType.change) {
+            return;
+        }
+        aggregatedChanges.delete(file);
+        aggregatedRemovals.add(file);
+        callbackUndelayed === null || callbackUndelayed === void 0 ? void 0 : callbackUndelayed(file, time);
+    });
     wp.watch({ files, directories, missing, startTime });
     return () => {
+        aggregatedChanges.clear();
+        aggregatedRemovals.clear();
         wp.close();
     };
 }

package/lib/logger.d.ts

@@ -4,4 +4,17 @@ export interface Logger {
     warn(...args: any[]): void;
     error(...args: any[]): void;
 }
-export default function logger(namespace: string): Logger;
+export declare const colorize: {
+    error: (...message: any[]) => string;
+    warn: (...message: any[]) => string;
+};
+declare class LoggerImpl implements Logger {
+    private _debug;
+    constructor(namespace: string);
+    debug(formatter: any, ...args: any[]): void;
+    info(...args: any[]): void;
+    warn(...args: any[]): void;
+    error(...args: any[]): void;
+}
+declare const _default: LoggerImpl;
+export default _default;

package/lib/logger.js

@@ -3,7 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.colorize = void 0;
 const debug_1 = __importDefault(require("debug"));
+const chalk_1 = __importDefault(require("chalk"));
+exports.colorize = {
+    error: (...message) => chalk_1.default.red(...message),
+    warn: (...message) => chalk_1.default.yellow(...message)
+};
 class LoggerImpl {
     constructor(namespace) {
         this._debug = (0, debug_1.default)(namespace);
@@ -12,16 +18,13 @@ class LoggerImpl {
         this._debug(formatter, ...args);
     }
     info(...args) {
-        console.log("INFO:", ...args);
+        console.log(...args);
     }
     warn(...args) {
-        console.warn("WARN:", ...args);
+        console.warn(exports.colorize.warn(...args));
     }
     error(...args) {
-        console.error("ERROR:", ...args);
+        console.error(exports.colorize.error(...args));
     }
 }
-function logger(namespace) {
-    return new LoggerImpl(namespace);
-}
-exports.default = logger;
+exports.default = new LoggerImpl('shuvi');

package/package.json

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