fyn 1.1.35 → 1.1.38

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,23 @@ 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(depPath => {
+          const unslashedPath = fynTil.unSlashNpmScope(depPath);
+          const pts = unslashedPath.split("/"); // spec can only contain ** between slashes
+
+          assert(!pts.find(x => !(!x.includes("*") || x === "**")), `resolution path '${depPath}' can only contain '**' for wildcard matching`);
+          const finalPath = pts.length === 1 ? `**/${unslashedPath}` : unslashedPath;
+          return {
+            mm: new mm.Minimatch(finalPath),
+            res: resData[depPath]
+          };
+        });
+      }
     }
   }
 
@@ -5868,13 +5888,14 @@ const {
 
 const {
   checkPkgOsCpu,
-  relativePath
+  relativePath,
+  unSlashNpmScope
 } = __webpack_require__("./lib/util/fyntil.js");
 
 const {
   getDepSection,
   makeDepStep
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.15-fynlocal_h/@fynpo/base/dist/index.js");
 
 const xaa = __webpack_require__("./lib/util/xaa.js");
 
@@ -5896,6 +5917,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 +6971,69 @@ ${item.depPath.join(" > ")}`);
       resolved
     };
   }
+  /**
+   * Match a nested dep to user's resolutions data, or nested and direct dep for packages
+   * inside a fynpo monorepo.
+   *
+   * spec: https://github.com/yarnpkg/rfcs/blob/master/implemented/0000-selective-versions-resolutions.md
+   *
+   * @param {*} item
+   * @returns
+   */
+
+
+  _replaceWithResolutionsData(item) {
+    if (!this._fyn._resolutions || item._semver.$$) {
+      return undefined;
+    } //
+    // this item represent a direct dependency
+    //
+
+
+    if (item.depth < 2) {
+      //
+      // if we have a package within a fynpo monorepo, then we replace its direct
+      // dependencies with resolutions data, vs only its nested dependencies
+      // according to yarn's resolutions spec, because if local package A pull in
+      // another local package B, then B's dependencies would end up being
+      // subjected to resolutions data, so for consistency, we check resolutions
+      // for all fynpo's local packages' direct dependencies.
+      //
+      if (!this._fyn.isFynpo) {
+        // not a fynpo, avoid checking resolutions for direct dependencies
+        return undefined;
+      }
+    }
+
+    let nameDepPath;
+
+    if (this._fyn.isFynpo) {
+      nameDepPath = `${this._fyn._pkg.name}/${item.nameDepPath}`;
+    } else {
+      nameDepPath = item.nameDepPath;
+    }
+
+    const unslashed = unSlashNpmScope(nameDepPath);
+
+    const found = this._fyn._resolutionsMatchers.find(r => r.mm.match(unslashed));
+
+    if (found && found.res && found.res !== "--no-change" && found.res !== item.semver) {
+      const {
+        res
+      } = found;
+      const msg = `${nameDepPath} changed to ${res} from ${item.semver} by resolutions data`;
+
+      if (item.depth < 2) {
+        logger.info(`fynpo: ${msg}`);
+      } else {
+        logger.debug(msg);
+      }
+
+      semverUtil.replace(item._semver, res);
+    }
+
+    return undefined;
+  }
 
   _resolveWithLockData(item) {
     //
@@ -7062,19 +7148,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 +7204,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];
@@ -8860,7 +8953,7 @@ const {
 
 const {
   PackageRef
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.15-fynlocal_h/@fynpo/base/dist/index.js");
 
 const WATCH_TIME = 5000; // consider meta cache stale after this much time (30 minutes)
 
@@ -9878,7 +9971,7 @@ const {
 const {
   FynpoConfigManager,
   FynpoDepGraph
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.15-fynlocal_h/@fynpo/base/dist/index.js");
 /* eslint-disable no-magic-numbers, max-statements, no-empty, complexity, no-eval */
 
 
@@ -10183,6 +10276,17 @@ const fyntil = {
   },
   posixify,
 
+  /**
+   * Take a npm dependency path separated by / and replace the / that's meant for a npm scope with '+'
+   *
+   * @param {*} npmDepPath
+   * @param {string} replacer string to replace the slash with
+   * @returns dep path where npm scope's / replaced with '+'
+   */
+  unSlashNpmScope(npmDepPath, replacer = "+") {
+    return npmDepPath.replace(/(\@[^\/]+)\//g, (_a, b) => `${b}${replacer}`);
+  },
+
   getGlobalNodeModules() {
     const nodeDir = Path.dirname(process.execPath);
 
@@ -11114,6 +11218,11 @@ function analyze(semver) {
 
   return sv;
 }
+
+function replace(sv, replaced) {
+  sv.$$ = sv.$;
+  sv.$ = replaced;
+}
 /**
  * semver utilities lib
  */
@@ -11125,6 +11234,7 @@ const semverLib = {
   },
   split,
   analyze,
+  replace,
   localify,
   localifyHard,
   unlocalify,
@@ -11382,7 +11492,7 @@ module.exports = __webpack_require__("./node_modules/.f/_/xaa/1.7.0/xaa/dist/xaa
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/caching.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.15-fynlocal_h/@fynpo/base/dist/caching.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11403,7 +11513,7 @@ const fs_1 = (0, tslib_1.__importDefault)(__webpack_require__("fs"));
 const path_1 = (0, tslib_1.__importDefault)(__webpack_require__("path"));
 const crypto_1 = (0, tslib_1.__importDefault)(__webpack_require__("crypto"));
 
-const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
+const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.15-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
 /**
  * create a sha256 hash for some data
  *
@@ -11671,7 +11781,7 @@ exports.processOutput = processOutput;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/fynpo-config.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.15-fynlocal_h/@fynpo/base/dist/fynpo-config.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11821,7 +11931,7 @@ exports.FynpoConfigManager = FynpoConfigManager;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.15-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11851,9 +11961,9 @@ const minimatch_1 = (0, tslib_1.__importDefault)(__webpack_require__("./node_mod
 const lodash_1 = (0, tslib_1.__importDefault)(__webpack_require__("./node_modules/.f/_/lodash/4.17.21/lodash/lodash.min.js"));
 const semver_1 = (0, tslib_1.__importDefault)(__webpack_require__("./node_modules/.f/_/semver/7.3.5/semver/index.js"));
 
-const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
+const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.15-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
 
-const util_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/util.js");
+const util_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.15-fynlocal_h/@fynpo/base/dist/util.js");
 
 const is_path_inside_1 = (0, tslib_1.__importDefault)(__webpack_require__("./node_modules/.f/_/is-path-inside/3.0.3/is-path-inside/index.js"));
 const DepSectionMap = {
@@ -12582,7 +12692,7 @@ exports.FynpoDepGraph = FynpoDepGraph;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/index.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.15-fynlocal_h/@fynpo/base/dist/index.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -12604,12 +12714,12 @@ const filter_scan_dir_1 = __webpack_require__("./node_modules/.f/_/filter-scan-d
 const minimatch_1 = (0, tslib_1.__importDefault)(__webpack_require__("./node_modules/.f/_/minimatch/3.0.4/minimatch/minimatch.js"));
 const lodash_1 = (0, tslib_1.__importDefault)(__webpack_require__("./node_modules/.f/_/lodash/4.17.21/lodash/lodash.min.js"));
 
-const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
+const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.15-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
 
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js"), exports);
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/fynpo-config.js"), exports);
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/util.js"), exports);
-exports.caching = (0, tslib_1.__importStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/caching.js"));
+(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.15-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js"), exports);
+(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.15-fynlocal_h/@fynpo/base/dist/fynpo-config.js"), exports);
+(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.15-fynlocal_h/@fynpo/base/dist/util.js"), exports);
+exports.caching = (0, tslib_1.__importStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.15-fynlocal_h/@fynpo/base/dist/caching.js"));
 /**
  * Take an array of packages and figure out their dependencies on each other
  *
@@ -12865,7 +12975,7 @@ exports.makePkgDeps = makePkgDeps;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/minimatch-group.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.15-fynlocal_h/@fynpo/base/dist/minimatch-group.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -13004,7 +13114,7 @@ exports.unrollMmMatch = unrollMmMatch;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/util.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.15-fynlocal_h/@fynpo/base/dist/util.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";

package/package.json

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