fyn 1.1.36 → 1.1.37

package/dist/fyn.js

@@ -2293,6 +2293,7 @@ class DepItem {
 
     this.promoted = undefined;
     this.depth = parent && parent.depth + 1 || options.depth || 0;
+    this.nameDepPath = this.depth > 1 ? parent.nameDepPath + "/" + this.name : this.name;
     this.priority = options.priority;
   }
 
@@ -3097,6 +3098,8 @@ const {
 const {
   parseYarnLock
 } = __webpack_require__("./yarn/index.js");
+
+const mm = __webpack_require__("./node_modules/.f/_/minimatch/3.0.4/minimatch/minimatch.js");
 /* eslint-disable no-magic-numbers, max-statements, no-empty, complexity, no-eval */
 
 
@@ -3358,6 +3361,20 @@ class Fyn {
       }
 
       this._runNpm = _.uniq([].concat(this._options.runNpm, fynpoNpmRun).filter(x => x));
+
+      const resData = _objectSpread(_objectSpread({}, this._pkg.resolutions), _.get(this._fynpo, ["config", "resolutions"]));
+
+      if (!_.isEmpty(resData)) {
+        this._resolutions = resData;
+        this._resolutionsMatchers = Object.keys(resData).map(x => {
+          const pts = x.split("/");
+          const x2 = pts.length === 1 || pts[0][0] === "@" && pts.length === 2 ? `**/${x}` : x;
+          return {
+            mm: new mm.Minimatch(x2),
+            res: resData[x]
+          };
+        });
+      }
     }
   }
 
@@ -5896,6 +5913,8 @@ const {
   PACKAGE_RAW_INFO,
   DEP_ITEM
 } = __webpack_require__("./lib/symbols.js");
+
+const failMetaMsg = name => `Unable to retrieve meta for package ${name} - If you've updated its version recently, try to run fyn with '--refresh-meta' again`;
 /*
  * Package dependencies resolver
  *
@@ -6948,6 +6967,35 @@ ${item.depPath.join(" > ")}`);
       resolved
     };
   }
+  /**
+   * Match a nested dep to user's resolutions data
+   *
+   * spec: https://github.com/yarnpkg/rfcs/blob/master/implemented/0000-selective-versions-resolutions.md
+   *
+   * @param {*} item
+   * @returns
+   */
+
+
+  _replaceWithResolutionsData(item) {
+    if (item.depth < 2 || !this._fyn._resolutions || item._semver.$$) {
+      return undefined;
+    }
+
+    const depPath = item.nameDepPath;
+
+    const found = this._fyn._resolutionsMatchers.find(r => r.mm.match(depPath));
+
+    if (found) {
+      const {
+        res
+      } = found;
+      logger.debug(`${depPath} changed to ${res} from ${item.semver} by resolutions data`);
+      semverUtil.replace(item._semver, res);
+    }
+
+    return undefined;
+  }
 
   _resolveWithLockData(item) {
     //
@@ -7062,19 +7110,21 @@ ${item.depPath.join(" > ")}`);
       });
     };
 
-    const promise = !item.semverPath || this._fyn.preferLock ? tryLock().then(r => r || item.semverPath && tryLocal()) : tryLocal().then(r => r || tryLock());
-
-    const failMetaMsg = name => `Unable to retrieve meta for package ${name} - If you've updated its version recently, try to run fyn with '--refresh-meta' again`;
+    this._replaceWithResolutionsData(item);
 
+    const promise = !item.semverPath || this._fyn.preferLock ? tryLock().then(r => r || item.semverPath && tryLocal()) : tryLocal().then(r => r || tryLock());
     return promise.then(r => {
       if (r && !_.get(r, ["meta", "versions", r.resolved, "_missingJson"])) {
         return r;
       }
 
-      if (this._lockOnly || item.localType) return undefined; // neither local nor lock was able to resolve for item
+      if (this._lockOnly || item.localType) {
+        return undefined;
+      } // neither local nor lock was able to resolve for item
       // so try to fetch from registry for real meta to resolve
       // always fetch the item and let pkg src manager deal with caching
 
+
       return this._pkgSrcMgr.fetchMeta(item).then(meta => {
         if (!meta) {
           throw new Error(failMetaMsg(item.name));
@@ -7116,6 +7166,11 @@ ${item.depPath.join(" > ")}`);
         meta,
         resolved
       } = r;
+
+      if (item._semver.$$ && !Semver.satisfies(resolved, item._semver.$$)) {
+        logger.warn(`${item.nameDepPath}@${resolved} resolved by resolutions data doesn't satisfy original semver ${item._semver.$$}`);
+      }
+
       await this.addPackageResolution(item, meta, resolved);
     }).then(() => {
       const depthData = this._depthResolving[item.depth];
@@ -11114,6 +11169,11 @@ function analyze(semver) {
 
   return sv;
 }
+
+function replace(sv, replaced) {
+  sv.$$ = sv.$;
+  sv.$ = replaced;
+}
 /**
  * semver utilities lib
  */
@@ -11125,6 +11185,7 @@ const semverLib = {
   },
   split,
   analyze,
+  replace,
   localify,
   localifyHard,
   unlocalify,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fyn",
-  "version": "1.1.36",
+  "version": "1.1.37",
   "description": "The package manager for fynpo, a zero setup monorepo manager",
   "main": "./bin/fyn.js",
   "homepage": "https://jchip.github.io/fynpo/",