jgb-plugin-json - npm Package Compare versions

Comparing version 1.5.4 to 1.6.0

lib/JsonAsset.js

@@ -70,5 +70,5 @@ "use strict";
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e_1, _a, dependences, dependences_1, dependences_1_1, name_1;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
+            var e_1, _a, dependences, dependences_1, dependences_1_1, name_1, _b, realName, distPath, e_1_1;
+            return tslib_1.__generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
@@ -82,17 +82,31 @@ dependences = new Set();
                     case 1:
-                        _b.sent();
+                        _c.sent();
+                        _c.label = 2;
+                    case 2:
+                        _c.trys.push([2, 7, 8, 9]);
+                        dependences_1 = tslib_1.__values(dependences), dependences_1_1 = dependences_1.next();
+                        _c.label = 3;
+                    case 3:
+                        if (!!dependences_1_1.done) return [3 /*break*/, 6];
+                        name_1 = dependences_1_1.value;
+                        return [4 /*yield*/, this.resolveAliasName(name_1)];
+                    case 4:
+                        _b = _c.sent(), realName = _b.realName, distPath = _b.distPath;
+                        this.addDependency(realName, { distPath: distPath });
+                        _c.label = 5;
+                    case 5:
+                        dependences_1_1 = dependences_1.next();
+                        return [3 /*break*/, 3];
+                    case 6: return [3 /*break*/, 9];
+                    case 7:
+                        e_1_1 = _c.sent();
+                        e_1 = { error: e_1_1 };
+                        return [3 /*break*/, 9];
+                    case 8:
                         try {
-                            for (dependences_1 = tslib_1.__values(dependences), dependences_1_1 = dependences_1.next(); !dependences_1_1.done; dependences_1_1 = dependences_1.next()) {
-                                name_1 = dependences_1_1.value;
-                                this.addDependency(name_1);
-                            }
+                            if (dependences_1_1 && !dependences_1_1.done && (_a = dependences_1.return)) _a.call(dependences_1);
                         }
-                        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                        finally {
-                            try {
-                                if (dependences_1_1 && !dependences_1_1.done && (_a = dependences_1.return)) _a.call(dependences_1);
-                            }
-                            finally { if (e_1) throw e_1.error; }
-                        }
-                        return [2 /*return*/];
+                        finally { if (e_1) throw e_1.error; }
+                        return [7 /*endfinally*/];
+                    case 9: return [2 /*return*/];
                 }
@@ -108,5 +122,5 @@ });
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var e_2, _a, dependences, _b, _c, name_2;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
+            var e_2, _a, dependences, _b, _c, name_2, _d, realName, distPath, e_2_1;
+            return tslib_1.__generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
@@ -120,17 +134,31 @@ dependences = new Set();
                     case 1:
-                        _d.sent();
+                        _e.sent();
+                        _e.label = 2;
+                    case 2:
+                        _e.trys.push([2, 7, 8, 9]);
+                        _b = tslib_1.__values(tslib_1.__spread(dependences)), _c = _b.next();
+                        _e.label = 3;
+                    case 3:
+                        if (!!_c.done) return [3 /*break*/, 6];
+                        name_2 = _c.value;
+                        return [4 /*yield*/, this.resolveAliasName(name_2)];
+                    case 4:
+                        _d = _e.sent(), realName = _d.realName, distPath = _d.distPath;
+                        this.addDependency(realName, { distPath: distPath });
+                        _e.label = 5;
+                    case 5:
+                        _c = _b.next();
+                        return [3 /*break*/, 3];
+                    case 6: return [3 /*break*/, 9];
+                    case 7:
+                        e_2_1 = _e.sent();
+                        e_2 = { error: e_2_1 };
+                        return [3 /*break*/, 9];
+                    case 8:
                         try {
-                            for (_b = tslib_1.__values(tslib_1.__spread(dependences)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                                name_2 = _c.value;
-                                this.addDependency(name_2);
-                            }
+                            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                         }
-                        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                        finally {
-                            try {
-                                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                            }
-                            finally { if (e_2) throw e_2.error; }
-                        }
-                        return [2 /*return*/];
+                        finally { if (e_2) throw e_2.error; }
+                        return [7 /*endfinally*/];
+                    case 9: return [2 /*return*/];
                 }
@@ -218,2 +246,2 @@ });
 exports.default = JsonAsset;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSnNvbkFzc2V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL0pzb25Bc3NldC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxzQ0FBcUQ7QUFDckQsNkJBQStCO0FBQy9CLDJCQUE2QjtBQUU3QjtJQUF1QyxxQ0FBSztJQUMxQyxtQkFBWSxRQUFnQixFQUFFLE9BQXFCO2VBQ2pELGtCQUFNLFFBQVEsRUFBRSxPQUFPLENBQUM7SUFDMUIsQ0FBQztJQUlLLHlCQUFLLEdBQVgsVUFBWSxJQUFZOzs7Z0JBQ3RCLHNCQUFPLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFDOzs7S0FDdEM7SUFFSyxnQ0FBWSxHQUFsQjs7O2dCQUNFLElBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRTtvQkFDWCx1QkFBdUI7aUJBQ3hCOzs7O0tBQ0Y7SUFFSyx1Q0FBbUIsR0FBekI7Ozs7Ozt3QkFDUSxRQUFRLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7NkJBQ3RDLENBQUEsUUFBUSxLQUFLLFVBQVUsQ0FBQSxFQUF2Qix3QkFBdUI7d0JBQ3pCLHFCQUFNLElBQUksQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFBOzt3QkFBbkMsU0FBbUMsQ0FBQzs7NEJBRXBDLHFCQUFNLElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFBOzt3QkFBcEMsU0FBb0MsQ0FBQzs7Ozs7O0tBRXhDO0lBRUssNEJBQVEsR0FBZDs7OztnQkFDTSxJQUFJLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQztnQkFDekIsSUFBSSxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRTtvQkFDdkIsSUFBSSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBSSxFQUFFLENBQUMs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSnNvbkFzc2V0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL0pzb25Bc3NldC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxzQ0FBcUQ7QUFDckQsNkJBQStCO0FBQy9CLDJCQUE2QjtBQUU3QjtJQUF1QyxxQ0FBSztJQUMxQyxtQkFBWSxRQUFnQixFQUFFLE9BQXFCO2VBQ2pELGtCQUFNLFFBQVEsRUFBRSxPQUFPLENBQUM7SUFDMUIsQ0FBQztJQUlLLHlCQUFLLEdBQVgsVUFBWSxJQUFZOzs7Z0JBQ3RCLHNCQUFPLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFDOzs7S0FDdEM7SUFFSyxnQ0FBWSxHQUFsQjs7O2dCQUNFLElBQUksSUFBSSxDQUFDLEdBQUcsRUFBRTtvQkFDWix1QkFBdUI7aUJBQ3hCOzs7O0tBQ0Y7SUFFSyx1Q0FBbUIsR0FBekI7Ozs7Ozt3QkFDUSxRQUFRLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7NkJBQ3RDLENBQUEsUUFBUSxLQUFLLFVBQVUsQ0FBQSxFQUF2Qix3QkFBdUI7d0JBQ3pCLHFCQUFNLElBQUksQ0FBQyxjQUFjLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFBOzt3QkFBbkMsU0FBbUMsQ0FBQzs7NEJBRXBDLHFCQUFNLElBQUksQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFBOzt3QkFBcEMsU0FBb0MsQ0FBQzs7Ozs7O0tBRXhDO0lBRUssNEJBQVEsR0FBZDs7OztnQkFDTSxJQUFJLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQztnQkFDekIsSUFBSSxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRTtvQkFDdkIsSUFBSSxHQUFHLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLEdBQUcsSUFBSSxFQUFFLENBQUMs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

package.json

 {
   "name": "jgb-plugin-json",
-  "version": "1.5.4",
+  "version": "1.6.0",
   "main": "lib/index.js",
@@ -22,3 +22,3 @@ "typings": "lib/index.d.ts",
     "debug": "^3.1.0",
-    "jgb-shared": "^1.5.4",
+    "jgb-shared": "^1.6.0",
     "json5": "^2.1.0",
@@ -38,3 +38,3 @@ "tslib": "^1.9.3"
   },
-  "gitHead": "86dfd0f2c400f622cc408c4ab2fd2154f401e754"
+  "gitHead": "f7cfa1cb2e693354f19dd8fe0124848ae85aafbb"
 }

src/JsonAsset.ts

@@ -17,3 +17,3 @@ import { Asset, IInitOptions } from 'jgb-shared/lib';
   async pretransform() {
-    if(this.ast) {
+    if (this.ast) {
       // TODO: transform json
@@ -56,3 +56,4 @@ }
     for (const name of dependences) {
-      this.addDependency(name);
+      const { realName, distPath } = await this.resolveAliasName(name);
+      this.addDependency(realName, { distPath });
     }
@@ -75,3 +76,4 @@ }
     for (const name of [...dependences]) {
-      this.addDependency(name);
+      const { realName, distPath } = await this.resolveAliasName(name);
+      this.addDependency(realName, { distPath });
     }
@@ -78,0 +80,0 @@ }

No alert changes

Improved metrics

Total package byte prevSize

177134

increased by1.08%

Lines of code

410

increased by7.89%

Dependency changes

• Updatedjgb-shared@^1.6.0