fyn 1.1.36 → 1.1.39

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 */
 
 
@@ -3118,9 +3121,8 @@ class Fyn {
     _cliSource = {},
     _fynpo = true
   }) {
-    this._cliSource = _cliSource;
+    this._cliSource = _objectSpread({}, _cliSource);
     const options = this._options = fynConfig(opts);
-    this._layout = options.layout;
     this._cwd = options.cwd || process.cwd();
     logger.debug(`fyn options`, JSON.stringify(fynTil.removeAuthInfo(options)));
     this.localPkgWithNestedDep = [];
@@ -3142,11 +3144,49 @@ class Fyn {
     }
   }
 
+  checkLayoutOption() {
+    const {
+      _options,
+      _cliSource
+    } = this;
+
+    if (_options.flattenTop === false && _cliSource.flattenTop !== "default") {
+      //
+      if (_options.layout !== "detail") {
+        if (_cliSource.layout === "default") {
+          logger.info(`flatten-top option turned off by ${_cliSource.flattenTop}, so switching node_modules layout to detail`);
+          _options.layout = "detail";
+          _cliSource.layout = _cliSource.flattenTop;
+        } else {
+          logger.warn(`you try to turn off flatten-top but set node_modules layout to ${_options.layout} and they are not compatible`);
+        }
+      }
+    }
+  }
+
   checkFynLockExist() {
     const fname = Path.join(this._cwd, FYN_LOCK_FILE);
     return Fs.existsSync(fname);
   }
 
+  updateConfigInLockfile(name, newValue) {
+    const valueInLock = this._depLocker.getConfig(name);
+
+    if (valueInLock !== undefined && valueInLock !== newValue) {
+      if (this._cliSource[name] === "cli") {
+        logger.info(`You are changing ${name} in your lockfile from ${valueInLock} to ${newValue}`);
+
+        this._depLocker.setConfig(name, newValue);
+      } else {
+        logger.info(`Setting ${name} to ${valueInLock} from your lockfile`);
+        this._options[name] = valueInLock;
+        this._cliSource[name] = "lock";
+      }
+    } else {
+      this._depLocker.setConfig(name, newValue);
+    }
+  }
+
   async readLockFiles() {
     if (this._depLocker) {
       return null;
@@ -3155,20 +3195,9 @@ class Fyn {
     this._npmLockData = null;
     this._depLocker = new PkgDepLocker(this.lockOnly, this._options.lockfile);
     const foundLock = await this._depLocker.read(Path.join(this._cwd, FYN_LOCK_FILE));
-
-    const layout = this._depLocker.getConfig("layout");
-
-    if (layout && layout !== this._layout) {
-      if (this._cliSource.layout === "cli") {
-        logger.info(`You are changing layout in your lockfile from ${layout} to ${this._layout}`);
-
-        this._depLocker.setConfig("layout", this._layout);
-      } else {
-        logger.info(`Setting layout to ${layout} from your lockfile`);
-      }
-    } else {
-      this._depLocker.setConfig("layout", this._layout);
-    }
+    this.updateConfigInLockfile("layout", this._options.layout);
+    this.updateConfigInLockfile("flattenTop", this._options.flattenTop);
+    this.checkLayoutOption();
 
     if (this._options.npmLock === true) {// force load npm lock data
     } else if (foundLock || this._options.npmLock === false) {
@@ -3203,7 +3232,7 @@ class Fyn {
   }
 
   get isNormalLayout() {
-    return this._layout === "normal";
+    return this._options.layout === "normal";
   }
 
   async _initCentralStore() {
@@ -3297,10 +3326,10 @@ class Fyn {
       this._fynpo = await fynTil.loadFynpo(this._cwd); // TODO: options from CLI should not be override by fynpo config options
 
       _.merge(this._options, _.get(this, "_fynpo.fyn.options"));
-
-      this._layout = this._options.layout;
     }
 
+    this.checkLayoutOption();
+
     if (!this._pkg) {
       const options = this._options;
       await this.loadPkg(options);
@@ -3358,6 +3387,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,7 +5914,8 @@ const {
 
 const {
   checkPkgOsCpu,
-  relativePath
+  relativePath,
+  unSlashNpmScope
 } = __webpack_require__("./lib/util/fyntil.js");
 
 const {
@@ -5896,6 +5943,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 +6997,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 +7174,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 +7230,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];
@@ -10183,6 +10302,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 +11244,11 @@ function analyze(semver) {
 
   return sv;
 }
+
+function replace(sv, replaced) {
+  sv.$$ = sv.$;
+  sv.$ = replaced;
+}
 /**
  * semver utilities lib
  */
@@ -11125,6 +11260,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.39",
   "description": "The package manager for fynpo, a zero setup monorepo manager",
   "main": "./bin/fyn.js",
   "homepage": "https://jchip.github.io/fynpo/",