jgb-shared - npm Package Compare versions

Comparing version 1.6.1 to 1.7.1

lib/Resolver.d.ts

@@ -30,2 +30,8 @@ import { IAliasValue, IInitOptions } from '../typings/jgb-shared';
     resolveModule(fileName: string, parent: any): Promise<any>;
+    /**
+     * find npm package in node_modules , ensure package amostly is same reference
+     * 1. find package in root node_modules
+     * 2. find package in dir nearly parent node_modules
+     * 3. util find package or go back to 2.
+     */
     findNodeModulePath(filename: string, dir: string): Promise<{
@@ -37,2 +43,3 @@ moduleName: string;
     }>;
+    private findModulePath;
     expandFileGenerator(file: string, extensions: string[], pkg: any, expandAliases?: boolean): IterableIterator<string>;
@@ -39,0 +46,0 @@ expandFile(file: string, extensions: string[], pkg: any, expandAliases?: boolean): any[];

lib/Resolver.js

@@ -164,5 +164,11 @@ "use strict";
     };
+    /**
+     * find npm package in node_modules , ensure package amostly is same reference
+     * 1. find package in root node_modules
+     * 2. find package in dir nearly parent node_modules
+     * 3. util find package or go back to 2.
+     */
     Resolver.prototype.findNodeModulePath = function (filename, dir) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var parts, root, moduleDir, stats, err_2;
+            var parts, root, rootDir, result, result, err_2;
             return tslib_1.__generator(this, function (_a) {
@@ -173,15 +179,48 @@ switch (_a.label) {
                         root = path.parse(dir).root;
-                        _a.label = 1;
+                        rootDir = this.options.rootDir;
+                        if (!rootDir) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.findModulePath(parts, rootDir, filename)];
                     case 1:
-                        if (!(dir !== root)) return [3 /*break*/, 6];
+                        result = _a.sent();
+                        if (result) {
+                            return [2 /*return*/, result];
+                        }
+                        _a.label = 2;
+                    case 2:
+                        if (!(dir !== root)) return [3 /*break*/, 7];
                         // Skip node_modules directories
-                        if (path.basename(dir) === 'node_modules') {
+                        if (path.basename(dir) === 'node_modules' || dir === rootDir) {
                             dir = path.dirname(dir);
                         }
-                        _a.label = 2;
-                    case 2:
-                        _a.trys.push([2, 4, , 5]);
+                        _a.label = 3;
+                    case 3:
+                        _a.trys.push([3, 5, , 6]);
+                        return [4 /*yield*/, this.findModulePath(parts, dir, filename)];
+                    case 4:
+                        result = _a.sent();
+                        if (result) {
+                            return [2 /*return*/, result];
+                        }
+                        return [3 /*break*/, 6];
+                    case 5:
+                        err_2 = _a.sent();
+                        return [3 /*break*/, 6];
+                    case 6:
+                        // Move up a directory
+                        dir = path.dirname(dir);
+                        return [3 /*break*/, 2];
+                    case 7: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    Resolver.prototype.findModulePath = function (parts, dir, filename) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var moduleDir, stats;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
                         moduleDir = path.join(dir, 'node_modules', parts[0]);
                         return [4 /*yield*/, util_1.promisify(fs.stat)(moduleDir)];
-                    case 3:
+                    case 1:
                         stats = _a.sent();
@@ -196,11 +235,3 @@ if (stats.isDirectory()) {
                         }
-                        return [3 /*break*/, 5];
-                    case 4:
-                        err_2 = _a.sent();
-                        return [3 /*break*/, 5];
-                    case 5:
-                        // Move up a directory
-                        dir = path.dirname(dir);
-                        return [3 /*break*/, 1];
-                    case 6: return [2 /*return*/];
+                        return [2 /*return*/];
                 }
@@ -702,2 +733,2 @@ });
 exports.default = Resolver;
-//# 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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"}

package.json

 {
   "name": "jgb-shared",
-  "version": "1.6.1",
+  "version": "1.7.1",
   "main": "lib/index.js",
@@ -46,3 +46,3 @@ "license": "MIT",
     "json5": "^1.0.1",
-    "lodash": "^4.17.10",
+    "lodash": "^4.17.13",
     "os-utils": "^0.0.14",
@@ -53,3 +53,3 @@ "resolve": "^1.8.1",
   },
-  "gitHead": "64b0db1db64ffaf19c32d0d82eb1b3f752804cfa"
+  "gitHead": "0c3d2b9fa76b6fda2093d6bc2ed9bcccebc24712"
 }

No alert changes

Improved metrics

Total package byte prevSize

272735

increased by0.84%

Lines of code

3916

increased by0.98%

Dependency changes

• Updatedlodash@^4.17.13