jgb-shared - npm Package Compare versions

Comparing version 1.9.0-alpha.0 to 1.9.0-alpha.1

lib/Asset.d.ts

@@ -72,3 +72,3 @@ import { IInitOptions } from '../typings/jgb-shared';
      */
-    process(): Promise<void>;
+    process(): Promise<IAssetGenerate[]>;
     loadIfNeeded(): Promise<void>;
@@ -94,2 +94,3 @@ /**
     generateDistPath(sourcePath: string, ext?: string): any;
+    getPrettyDistPath(distPath: string): string;
     /**
@@ -99,7 +100,14 @@ * 生成输出目录distPath
      * @param ext
+     * @returns distPath 文件路径
+     * @returns ignore 是否忽略输出
      */
-    output(code: string, ext: string, map: SourceMap): Promise<{
+    output(code: string, ext: string, map: SourceMap, useCache: boolean): Promise<{
         distPath: string;
         ignore: boolean;
     }>;
+    /**
+     * 写入文件数据
+     * @returns boolean 返回是否成功写入数据
+     */
+    private writeFile;
     generateHash(): Promise<string>;
@@ -106,0 +114,0 @@ /**

lib/Asset.js

@@ -9,4 +9,4 @@ "use strict";
 var config = require("./config");
-var Logger_1 = require("./Logger");
 var Resolver_1 = require("./Resolver");
+var SourceMap_1 = require("./SourceMap");
 var utils_1 = require("./utils");
@@ -162,9 +162,8 @@ var isUrl_1 = require("./utils/isUrl");
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var startTime, _a, generated, generated_1, generated_1_1, _b, code, ext, map, _c, _d, distPath, ignore, endTime, e_1_1;
-            var e_1, _e;
-            return tslib_1.__generator(this, function (_f) {
-                switch (_f.label) {
+            var startTime, _a, generated;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         if (!this.id) {
-                            this.id = this.relativeName;
+                            this.id = this.name;
                         }
@@ -174,55 +173,21 @@ startTime = +new Date();
                     case 1:
-                        _f.sent();
+                        _b.sent();
                         return [4 /*yield*/, this.preProcess()];
                     case 2:
-                        _f.sent();
+                        _b.sent();
                         return [4 /*yield*/, this.pretransform()];
                     case 3:
-                        _f.sent();
+                        _b.sent();
                         return [4 /*yield*/, this.getDependencies()];
                     case 4:
-                        _f.sent();
+                        _b.sent();
                         return [4 /*yield*/, this.transform()];
                     case 5:
-                        _f.sent();
+                        _b.sent();
                         _a = this;
                         return [4 /*yield*/, this.generate()];
                     case 6:
-                        _a.generated = _f.sent();
+                        _a.generated = _b.sent();
                         generated = [].concat(this.generated);
-                        _f.label = 7;
-                    case 7:
-                        _f.trys.push([7, 13, 14, 15]);
-                        generated_1 = tslib_1.__values(generated), generated_1_1 = generated_1.next();
-                        _f.label = 8;
-                    case 8:
-                        if (!!generated_1_1.done) return [3 /*break*/, 12];
-                        _b = generated_1_1.value, code = _b.code, ext = _b.ext, map = _b.map;
-                        _c = this;
-                        return [4 /*yield*/, this.generateHash()];
-                    case 9:
-                        _c.hash = _f.sent();
-                        return [4 /*yield*/, this.output(code, ext, map)];
-                    case 10:
-                        _d = _f.sent(), distPath = _d.distPath, ignore = _d.ignore;
-                        endTime = +new Date();
-                        if (!ignore) {
-                            Logger_1.logger.log("" + distPath, '编译', endTime - startTime);
-                        }
-                        _f.label = 11;
-                    case 11:
-                        generated_1_1 = generated_1.next();
-                        return [3 /*break*/, 8];
-                    case 12: return [3 /*break*/, 15];
-                    case 13:
-                        e_1_1 = _f.sent();
-                        e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 15];
-                    case 14:
-                        try {
-                            if (generated_1_1 && !generated_1_1.done && (_e = generated_1.return)) _e.call(generated_1);
-                        }
-                        finally { if (e_1) throw e_1.error; }
-                        return [7 /*endfinally*/];
-                    case 15: return [2 /*return*/];
+                        return [2 /*return*/, generated];
                 }
@@ -387,2 +352,6 @@ });
         var extName = path.extname(distPath);
+        // index.target.js => index.js
+        if (!this.isSameTarget && distPath.includes("." + this.options.target + ".")) {
+            distPath = distPath.replace(new RegExp("\\." + this.options.target + "\\."), '.');
+        }
         if (!extName) {
@@ -400,9 +369,8 @@ // index => index.js
         distPath = utils_1.pathToUnixType(distPath);
-        // index.target.js => index.js
-        if (!this.isSameTarget && distPath.includes("." + this.options.target + ".")) {
-            distPath = distPath.replace(new RegExp("\\." + this.options.target + "\\."), '.');
-        }
         exports.cache.set(cacheKey, distPath);
         return distPath;
     };
+    Asset.prototype.getPrettyDistPath = function (distPath) {
+        return utils_1.promoteRelativePath(path.relative(this.options.outDir, distPath));
+    };
     /**
@@ -412,7 +380,9 @@ * 生成输出目录distPath
      * @param ext
+     * @returns distPath 文件路径
+     * @returns ignore 是否忽略输出
      */
-    Asset.prototype.output = function (code, ext, map) {
+    Asset.prototype.output = function (code, ext, map, useCache) {
         if (ext === void 0) { ext = ''; }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var ignore, distPath, prettyDistPath, extName, sourceMapString, distMap;
+            var ignore, distPath, prettyDistPath, sourceMapString, distMap;
             return tslib_1.__generator(this, function (_a) {
@@ -422,42 +392,29 @@ switch (_a.label) {
                         ignore = true;
-                        distPath = this.generateDistPath(this.name, ext) ||
-                            path.resolve(this.options.outDir, this.relativeName);
-                        prettyDistPath = distPath;
-                        extName = path.extname(this.basename);
-                        if (!ext && !path.extname(distPath)) {
-                            // index => index.js
-                            distPath += ext;
-                        }
-                        else if (extName !== ext) {
-                            // index.es6 => index.js
-                            distPath = distPath.replace(extName, ext);
-                        }
+                        distPath = this.generateDistPath(this.name, ext);
+                        prettyDistPath = this.getPrettyDistPath(distPath);
                         this.distPath = distPath;
-                        prettyDistPath = utils_1.promoteRelativePath(path.relative(this.options.outDir, distPath));
-                        if (!!prettyDistPath.startsWith('..')) return [3 /*break*/, 2];
-                        ignore = false;
-                        sourceMapString = map
-                            ? map.stringify(path.basename(prettyDistPath), '/')
-                            : '';
-                        return [4 /*yield*/, fs.ensureDir(path.dirname(distPath))];
+                        if (!!prettyDistPath.startsWith('..')) return [3 /*break*/, 6];
+                        if (!(!this.options.minify && typeof map !== 'undefined')) return [3 /*break*/, 4];
+                        return [4 /*yield*/, new SourceMap_1.default().addMap(map)];
                     case 1:
+                        map = _a.sent();
+                        sourceMapString = map.stringify(path.basename(prettyDistPath), '/');
+                        if (!(this.options.inlineSourceMap === true)) return [3 /*break*/, 2];
+                        // inline base64
+                        code += "\r\n//# sourceMappingURL=data:application/json;charset=utf-8;base64," + Buffer.from(sourceMapString, 'utf-8').toString('base64');
+                        return [3 /*break*/, 4];
+                    case 2:
+                        distMap = path.dirname(this.distPath) + "/" + path.basename(this.distPath) + ".map";
+                        // output sourcemap
+                        return [4 /*yield*/, this.writeFile(distMap, sourceMapString)];
+                    case 3:
+                        // output sourcemap
                         _a.sent();
-                        if (!this.options.minify && sourceMapString) {
-                            if (this.options.inlineSourceMap) {
-                                // inline base64
-                                writeFile(distPath, code +
-                                    ("\r\n//# sourceMappingURL=data:application/json;charset=utf-8;base64," + Buffer.from(sourceMapString, 'utf-8').toString('base64')));
-                            }
-                            else {
-                                distMap = path.dirname(this.distPath) + "/" + path.basename(this.distPath) + ".map";
-                                writeFile(distMap, sourceMapString);
-                                writeFile(distPath, code +
-                                    ("\r\n//# sourceMappingURL=./" + path.basename(this.distPath) + ".map"));
-                            }
-                        }
-                        else {
-                            writeFile(distPath, code);
-                        }
-                        _a.label = 2;
-                    case 2: return [2 /*return*/, {
+                        code += "\r\n//# sourceMappingURL=./" + path.basename(this.distPath) + ".map";
+                        _a.label = 4;
+                    case 4: return [4 /*yield*/, this.writeFile(distPath, code, !useCache)];
+                    case 5:
+                        ignore = !(_a.sent());
+                        _a.label = 6;
+                    case 6: return [2 /*return*/, {
                             ignore: ignore,
@@ -470,6 +427,32 @@ distPath: prettyDistPath
     };
+    /**
+     * 写入文件数据
+     * @returns boolean 返回是否成功写入数据
+     */
+    Asset.prototype.writeFile = function (distPath, code, force) {
+        if (force === void 0) { force = false; }
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var isExist;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, fs.pathExists(distPath)];
+                    case 1:
+                        isExist = _a.sent();
+                        if (!(!isExist || force)) return [3 /*break*/, 4];
+                        return [4 /*yield*/, fs.ensureDir(path.dirname(distPath))];
+                    case 2:
+                        _a.sent();
+                        return [4 /*yield*/, writeFile(distPath, code)];
+                    case 3:
+                        _a.sent();
+                        return [2 /*return*/, true];
+                    case 4: return [2 /*return*/, false];
+                }
+            });
+        });
+    };
     Asset.prototype.generateHash = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, objectHash_1.default(this.generated)];
+                return [2 /*return*/, objectHash_1.default(this.contents)];
             });
@@ -573,7 +556,11 @@ });
         return tslib_1.__generator(this, function (_a) {
-            fs.writeFile(filePath, code);
-            return [2 /*return*/];
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, fs.writeFile(filePath, code)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
         });
     });
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Asset.js","sourceRoot":"","sources":["../src/Asset.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Asset.js","sourceRoot":"","sources":["../src/Asset.ts"],"names":[],"mappings":"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"}

lib/Logger.js

@@ -27,6 +27,5 @@ "use strict";
         if (options === void 0) { options = {}; }
-        this.logLevel =
-            isNaN(options.logLevel || process.env.JGB_LOG_LEVEL) === false
-                ? Number(options.logLevel)
-                : 3;
+        var _a;
+        var logLevel = (_a = options.logLevel, (_a !== null && _a !== void 0 ? _a : process.env.JGB_LOG_LEVEL));
+        this.logLevel = isNaN(logLevel) === false ? Number(logLevel) : 3;
     };
@@ -215,2 +214,2 @@ Logger.prototype.countLines = function (message) {
 exports.error = error;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL0xvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsK0JBQXFDO0FBQ3JDLHlCQUE0QjtBQUM1QixzREFBaUQ7QUFFakQsbUNBQXNDO0FBQ3RDLHNDQUF5QztBQUl6QyxJQUFZLE9BS1g7QUFMRCxXQUFZLE9BQU87SUFDakIsMkNBQU8sQ0FBQTtJQUNQLHVDQUFLLENBQUE7SUFDTCxxQ0FBSSxDQUFBO0lBQ0osbUNBQUcsQ0FBQTtBQUNMLENBQUMsRUFMVyxPQUFPLEdBQVAsZUFBTyxLQUFQLGVBQU8sUUFLbEI7QUFFRDtJQU9FLGdCQUFZLE9BQVk7UUFBWix3QkFBQSxFQUFBLFlBQVk7UUFMeEIsVUFBSyxHQUFHLElBQUksR0FBRyxFQUFFLENBQUM7UUFHbEIsVUFBSyxHQUFHLENBQUMsQ0FBQztRQUdSLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxlQUFLLENBQUMsV0FBVyxDQUFDLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFDdEQsSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUMzQixDQUFDO0lBRUQsMkJBQVUsR0FBVixVQUFXLE9BQWlCO1FBQWpCLHdCQUFBLEVBQUEsWUFBaUI7UUFDMUIsSUFBSSxDQUFDLFFBQVE7WUFDWCxLQUFLLENBQUMsT0FBTyxDQUFDLFFBQVEsSUFBSSxPQUFPLENBQUMsR0FBRyxDQUFDLGFBQWEsQ0FBQyxLQUFLLEtBQUs7Z0JBQzVELENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQztnQkFDMUIsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNWLENBQUM7SUFFRCwyQkFBVSxHQUFWLFVBQVcsT0FBTztRQUNoQixPQUFPLFNBQVMsQ0FBQyxPQUFPLENBQUM7YUFDdEIsS0FBSyxDQUFDLElBQUksQ0FBQzthQUNYLE1BQU0sQ0FBQyxVQUFDLENBQUMsRUFBRSxJQUFJ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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL0xvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsK0JBQXFDO0FBQ3JDLHlCQUE0QjtBQUM1QixzREFBaUQ7QUFFakQsbUNBQXNDO0FBQ3RDLHNDQUF5QztBQUl6QyxJQUFZLE9BS1g7QUFMRCxXQUFZLE9BQU87SUFDakIsMkNBQU8sQ0FBQTtJQUNQLHVDQUFLLENBQUE7SUFDTCxxQ0FBSSxDQUFBO0lBQ0osbUNBQUcsQ0FBQTtBQUNMLENBQUMsRUFMVyxPQUFPLEdBQVAsZUFBTyxLQUFQLGVBQU8sUUFLbEI7QUFFRDtJQU9FLGdCQUFZLE9BQVk7UUFBWix3QkFBQSxFQUFBLFlBQVk7UUFMeEIsVUFBSyxHQUFHLElBQUksR0FBRyxFQUFFLENBQUM7UUFHbEIsVUFBSyxHQUFHLENBQUMsQ0FBQztRQUdSLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxlQUFLLENBQUMsV0FBVyxDQUFDLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFDdEQsSUFBSSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUMzQixDQUFDO0lBRUQsMkJBQVUsR0FBVixVQUFXLE9BQWlCO1FBQWpCLHdCQUFBLEVBQUEsWUFBaUI7O1FBQzFCLElBQU0sUUFBUSxTQUFHLE9BQU8sQ0FBQyxRQUFRLHVDQUFJLE9BQU8sQ0FBQyxHQUFHLENBQUMsYUFBYSxFQUFBLENBQUM7UUFDL0QsSUFBSSxDQUFDLFFBQVEsR0FBRyxLQUFLLENBQUMsUUFBUSxDQUFDLEtBQUssS0FBSyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNuRSxDQUFDO0lBRUQsMkJBQVUsR0FBVixVQUFXLE9BQU87UUFDaEIsT0FBTyxTQUFTLENBQUMsT0FBTyxDQUFDO2FBQ3RCLEtBQUssQ0FBQyxJQUFJLENBQUM7YUFDWCxNQUFN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

lib/Resolver.d.ts

@@ -12,3 +12,2 @@ /// <reference types="lodash" />
     resolver: TypedResolver;
-    packageCache: Map<any, any>;
     alias: Dictionary<string>;
@@ -72,2 +71,10 @@ constructor(options: IInitOptions, ext?: string);
 /**
+ * 读取当前目录的 package.json
+ */
+export declare function readPackage(dir: string): Promise<any>;
+/**
+ * 查找并读取package.json
+ */
+export declare function findPackage(dir: string): Promise<any>;
+/**
  * alias  sort
@@ -74,0 +81,0 @@ * 先按照 jgb.config.js 中的 alias 优先

lib/Resolver.js

@@ -14,2 +14,3 @@ "use strict";
 var cachedInputFileSystem = new enhanced_resolve_1.CachedInputFileSystem(new enhanced_resolve_1.NodeJsInputFileSystem(), 4000);
+var packageCache = new Map();
 var NewResolver = /** @class */ (function () {
@@ -20,3 +21,2 @@ function NewResolver(options, ext) {
         this.options = options;
-        this.packageCache = new Map();
         this.alias = {};
@@ -91,3 +91,3 @@ /**
                                         };
-                                        return [4 /*yield*/, this.findPackage(path.dirname(filepath))];
+                                        return [4 /*yield*/, findPackage(path.dirname(filepath))];
                                     case 1:
@@ -393,23 +393,4 @@ _a.apply(void 0, [(_b.pkg = _c.sent(),
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var root, err_3;
             return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        root = path.parse(dir).root;
-                        _a.label = 1;
-                    case 1:
-                        if (!(dir !== root && path.basename(dir) !== 'node_modules')) return [3 /*break*/, 6];
-                        _a.label = 2;
-                    case 2:
-                        _a.trys.push([2, 4, , 5]);
-                        return [4 /*yield*/, this.readPackage(dir)];
-                    case 3: return [2 /*return*/, _a.sent()];
-                    case 4:
-                        err_3 = _a.sent();
-                        return [3 /*break*/, 5];
-                    case 5:
-                        dir = path.dirname(dir);
-                        return [3 /*break*/, 1];
-                    case 6: return [2 /*return*/];
-                }
+                return [2 /*return*/, findPackage(dir)];
             });
@@ -420,3 +401,3 @@ });
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var stat, err_4;
+            var stat, err_3;
             return tslib_1.__generator(this, function (_a) {
@@ -431,3 +412,3 @@ switch (_a.label) {
                     case 2:
-                        err_4 = _a.sent();
+                        err_3 = _a.sent();
                         return [2 /*return*/, false];
@@ -481,28 +462,4 @@ case 3: return [2 /*return*/];
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var file, json, pkg, realpath;
             return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        file = path.join(dir, 'package.json');
-                        if (this.packageCache.has(file)) {
-                            return [2 /*return*/, this.packageCache.get(file)];
-                        }
-                        return [4 /*yield*/, util_1.promisify(fs.readFile)(file, { encoding: 'utf8' })];
-                    case 1:
-                        json = _a.sent();
-                        pkg = JSON.parse(json);
-                        pkg.pkgfile = file;
-                        pkg.pkgdir = dir;
-                        if (!pkg.source) return [3 /*break*/, 3];
-                        return [4 /*yield*/, util_1.promisify(fs.realpath)(file)];
-                    case 2:
-                        realpath = _a.sent();
-                        if (realpath === file) {
-                            delete pkg.source;
-                        }
-                        _a.label = 3;
-                    case 3:
-                        this.packageCache.set(file, pkg);
-                        return [2 /*return*/, pkg];
-                }
+                return [2 /*return*/, readPackage(dir)];
             });
@@ -542,2 +499,66 @@ });
 /**
+ * 读取当前目录的 package.json
+ */
+function readPackage(dir) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var file, pkg, realpath;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    file = path.join(dir, 'package.json');
+                    if (packageCache.has(file)) {
+                        return [2 /*return*/, packageCache.get(file)];
+                    }
+                    return [4 /*yield*/, fsExtra.readJSON(file)];
+                case 1:
+                    pkg = _a.sent();
+                    pkg.pkgfile = file;
+                    pkg.pkgdir = dir;
+                    if (!pkg.source) return [3 /*break*/, 3];
+                    return [4 /*yield*/, util_1.promisify(fs.realpath)(file)];
+                case 2:
+                    realpath = _a.sent();
+                    if (realpath === file) {
+                        delete pkg.source;
+                    }
+                    _a.label = 3;
+                case 3:
+                    packageCache.set(file, pkg);
+                    return [2 /*return*/, pkg];
+            }
+        });
+    });
+}
+exports.readPackage = readPackage;
+/**
+ * 查找并读取package.json
+ */
+function findPackage(dir) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var root, err_4;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    root = path.parse(dir).root;
+                    _a.label = 1;
+                case 1:
+                    if (!(dir !== root && path.basename(dir) !== 'node_modules')) return [3 /*break*/, 6];
+                    _a.label = 2;
+                case 2:
+                    _a.trys.push([2, 4, , 5]);
+                    return [4 /*yield*/, readPackage(dir)];
+                case 3: return [2 /*return*/, _a.sent()];
+                case 4:
+                    err_4 = _a.sent();
+                    return [3 /*break*/, 5];
+                case 5:
+                    dir = path.dirname(dir);
+                    return [3 /*break*/, 1];
+                case 6: return [2 /*return*/];
+            }
+        });
+    });
+}
+exports.findPackage = findPackage;
+/**
  * alias  sort
@@ -559,2 +580,2 @@ * 先按照 jgb.config.js 中的 alias 优先
 exports.sortAliasKeys = sortAliasKeys;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Resolver.js","sourceRoot":"","sources":["../src/Resolver.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Resolver.js","sourceRoot":"","sources":["../src/Resolver.ts"],"names":[],"mappings":"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"}

lib/StaticAsset.d.ts

@@ -12,2 +12,3 @@ import { IInitOptions } from '../typings/jgb-shared';
     }>;
+    generateHash(): Promise<string>;
 }

lib/StaticAsset.js

@@ -7,2 +7,3 @@ "use strict";
 var Asset_1 = require("./Asset");
+var md5 = require("./utils/md5");
 var StaticAsset = /** @class */ (function (_super) {
@@ -30,19 +31,48 @@ tslib_1.__extends(StaticAsset, _super);
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var distPath, prettyDistPath, readable, writable;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
+            var distPath, _a, ignore, prettyDistPath, isExist, _b, error_1, readable, writable;
+            return tslib_1.__generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         distPath = this.distPath || this.generateDistPath(this.name);
                         this.distPath = distPath;
+                        _a = this;
+                        return [4 /*yield*/, this.generateHash()];
+                    case 1:
+                        _a.hash = _c.sent();
+                        ignore = true;
                         prettyDistPath = path.relative(this.options.outDir, distPath);
+                        _c.label = 2;
+                    case 2:
+                        _c.trys.push([2, 6, , 7]);
+                        return [4 /*yield*/, fs.pathExists(distPath)];
+                    case 3:
+                        isExist = _c.sent();
+                        _b = isExist;
+                        if (!_b) return [3 /*break*/, 5];
+                        return [4 /*yield*/, md5.file(distPath)];
+                    case 4:
+                        _b = (_c.sent()) === this.hash;
+                        _c.label = 5;
+                    case 5:
+                        if (!(_b)) {
+                            ignore = false;
+                        }
+                        return [3 /*break*/, 7];
+                    case 6:
+                        error_1 = _c.sent();
+                        ignore = false;
+                        return [3 /*break*/, 7];
+                    case 7:
+                        if (!!ignore) return [3 /*break*/, 9];
                         return [4 /*yield*/, fs.ensureDir(path.dirname(distPath))];
-                    case 1:
-                        _a.sent();
+                    case 8:
+                        _c.sent();
                         readable = fs.createReadStream(this.name);
                         writable = fs.createWriteStream(distPath);
                         readable.pipe(writable);
-                        return [2 /*return*/, {
-                                distPath: prettyDistPath,
-                                ignore: false
-                            }];
+                        _c.label = 9;
+                    case 9: return [2 /*return*/, {
+                            distPath: prettyDistPath,
+                            ignore: ignore
+                        }];
                 }
@@ -52,5 +82,15 @@ });
     };
+    StaticAsset.prototype.generateHash = function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, md5.file(this.name)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
     return StaticAsset;
 }(Asset_1.default));
 exports.default = StaticAsset;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3RhdGljQXNzZXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvU3RhdGljQXNzZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkJBQStCO0FBQy9CLDJCQUE2QjtBQUU3QixpQ0FBNEI7QUFFNUI7SUFBeUMsdUNBQUs7SUFDNUMscUJBQVksSUFBWSxFQUFFLE9BQXFCO2VBQzdDLGtCQUFNLElBQUksRUFBRSxPQUFPLENBQUM7SUFDdEIsQ0FBQztJQUVELG9DQUFvQztJQUM5QixrQ0FBWSxHQUFsQjs7OztLQUF1QjtJQUV2QixvQ0FBb0M7SUFDOUIsMkJBQUssR0FBWDs7OztLQUFnQjtJQUVoQiwyQ0FBcUIsR0FBckI7UUFDRSxPQUFPLEtBQUssQ0FBQztJQUNmLENBQUM7SUFFSyw0QkFBTSxHQUFaOzs7Ozs7d0JBQ1EsUUFBUSxHQUFHLElBQUksQ0FBQyxRQUFRLElBQUksSUFBSSxDQUFDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQzt3QkFFbkUsSUFBSSxDQUFDLFFBQVEsR0FBRyxRQUFRLENBQUM7d0JBRW5CLGNBQWMsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxDQUFDO3dCQUVwRSxxQkFBTSxFQUFFLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUMsRUFBQTs7d0JBQTFDLFNBQTBDLENBQUM7d0JBRXJDLFFBQVEsR0FBRyxFQUFFLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO3dCQUMxQyxRQUFRLEdBQUcsRUFBRSxDQUFDLGlCQUFpQixDQUFDLFFBQVEsQ0FBQyxDQUFDO3dCQUNoRCxRQUFRLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO3dCQUV4QixzQkFBTztnQ0FDTCxRQUFRLEVBQUUsY0FBYztnQ0FDeEIsTUFBTSxFQUFFLEtBQUs7NkJBQ2QsRUFBQzs7OztLQUNIO0lBQ0gsa0JBQUM7QUFBRCxDQUFDLEFBakNELENBQXlDLGVBQUssR0FpQzdDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU3RhdGljQXNzZXQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvU3RhdGljQXNzZXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNkJBQStCO0FBQy9CLDJCQUE2QjtBQUU3QixpQ0FBNEI7QUFDNUIsaUNBQW1DO0FBRW5DO0lBQXlDLHVDQUFLO0lBQzVDLHFCQUFZLElBQVksRUFBRSxPQUFxQjtlQUM3QyxrQkFBTSxJQUFJLEVBQUUsT0FBTyxDQUFDO0lBQ3RCLENBQUM7SUFFRCxvQ0FBb0M7SUFDOUIsa0NBQVksR0FBbEI7Ozs7S0FBdUI7SUFFdkIsb0NBQW9DO0lBQzlCLDJCQUFLLEdBQVg7Ozs7S0FBZ0I7SUFFaEIsMkNBQXFCLEdBQXJCO1FBQ0UsT0FBTyxLQUFLLENBQUM7SUFDZixDQUFDO0lBRUssNEJBQU0sR0FBWjs7Ozs7O3dCQUNRLFFBQVEsR0FBRyxJQUFJLENBQUMsUUFBUSxJQUFJLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7d0JBRW5FLElBQUksQ0FBQyxRQUFRLEdBQUcsUUFBUSxDQUFDO3dCQUN6QixLQUFBLElBQUksQ0FBQTt3QkFBUSxxQkFBTSxJQUFJLENBQUMsWUFBWSxFQUFFLEVBQUE7O3dCQUFyQyxHQUFLLElBQUksR0FBRyxTQUF5QixDQUFDO3dCQUNsQyxNQUFNLEdBQUcsSUFBSSxDQUFDO3dCQUVaLGNBQWMsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxDQUFDOzs7O3dCQUdsRCxxQkFBTSxFQUFFLENBQUMsVUFBVSxDQUFDLFFBQVEsQ0FBQyxFQUFBOzt3QkFBdkMsT0FBTyxHQUFHLFNBQTZCO3dCQUN2QyxLQUFBLE9BQU8sQ0FBQTtpQ0FBUCx3QkFBTzt3QkFBSyxxQkFBTSxHQUFHLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxFQUFBOzt3QkFBekIsS0FBQSxDQUFDLFNBQXdCLENBQUMsS0FBSyxJQUFJLENBQUMsSUFBSSxDQUFBOzs7d0JBQXpELElBQUksQ0FBQyxJQUFxRCxFQUFFOzRCQUMxRCxNQUFNLEdBQUcsS0FBSyxDQUFDO3lCQUNoQjs7Ozt3QkFFRCxNQUFNLEdBQUcsS0FBSyxDQUFDOzs7NkJBR2IsQ0FBQyxNQUFNLEVBQVAsd0JBQU87d0JBQ1QscUJBQU0sRUFBRSxDQUFDLFNBQVMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDLEVBQUE7O3dCQUExQyxTQUEwQyxDQUFDO3dCQUNyQyxRQUFRLEdBQUcsRUFBRSxDQUFDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQzt3QkFDMUMsUUFBUSxHQUFHLEVBQUUsQ0FBQyxpQkFBaUIsQ0FBQyxRQUFRLENBQUMsQ0FBQzt3QkFDaEQsUUFBUSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQzs7NEJBRzFCLHNCQUFPOzRCQUNMLFFBQVEsRUFBRSxjQUFjOzRCQUN4QixNQUFNLFFBQUE7eUJBQ1AsRUFBQzs7OztLQUNIO0lBRUssa0NBQVksR0FBbEI7Ozs7NEJBQ1MscUJBQU0sR0FBRyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEVBQUE7NEJBQWhDLHNCQUFPLFNBQXlCLEVBQUM7Ozs7S0FDbEM7SUFDSCxrQkFBQztBQUFELENBQUMsQUFqREQsQ0FBeUMsZUFBSyxHQWlEN0MifQ==

lib/utils/md5.d.ts

 /// <reference types="node" />
 import * as crypto from 'crypto';
 export default function md5(str: string, encoding?: crypto.HexBase64Latin1Encoding): string;
-export declare function file(filename: string): Promise<unknown>;
+export declare function file(filename: string): Promise<string>;

package.json

 {
   "name": "jgb-shared",
-  "version": "1.9.0-alpha.0",
+  "version": "1.9.0-alpha.1",
   "main": "lib/index.js",
@@ -57,3 +57,3 @@ "license": "MIT",
   },
-  "gitHead": "a00f4f3e87ed76cd1867a1fd0f5142c49b6022d2"
+  "gitHead": "440084269e0ac2850ad15c755029d41d267c368e"
 }

typings/jgb-shared.d.ts

@@ -72,4 +72,3 @@ import { ResolverFactory } from 'enhanced-resolve';
   /** 是否内联sourcemap */
-
-  inlineSourceMap?: string;
+  inlineSourceMap?: boolean;
   /** 是否开启缓存 */
@@ -83,6 +82,8 @@ cache?: boolean;
   hooks?: Array<(...args: any[]) => Promise<void>>;
-  /* 转换适配库默认： miniapp-adapter */
+  /** 转换适配库默认： miniapp-adapter */
   lib?: string;
+  /** jgb-cli version */
+  cliVersion?: string;
 
   resolve?: Parameters<typeof ResolverFactory['createResolver']>[0];
 }

No alert changes

Improved metrics

Total package byte prevSize

279032

increased by0.78%

Lines of code

4090

increased by1.61%

No dependency changes