fyn 1.1.34 → 1.1.37

package/dist/fyn.js

@@ -542,6 +542,8 @@ const {
   setupNodeGypEnv
 } = __webpack_require__("./lib/util/setup-node-gyp.js");
 
+const hardLinkDir = __webpack_require__("./lib/util/hard-link-dir.js");
+
 const xsh = __webpack_require__("./node_modules/.f/_/xsh/0.4.5/xsh/lib/index.js");
 
 function checkNewVersion(npmConfig) {
@@ -864,6 +866,27 @@ class FynCli {
     logger.error("No package was removed");
     return false;
   }
+
+  async syncLocalLinks() {
+    await this.fyn._initializePkg();
+    const {
+      localPkgLinks
+    } = this.fyn._installConfig;
+
+    if (!_.isEmpty(localPkgLinks)) {
+      for (const vdir in localPkgLinks) {
+        const tgtDir = Path.join(this.fyn._cwd, vdir);
+        const srcDir = Path.join(this.fyn._cwd, localPkgLinks[vdir].srcDir);
+        await hardLinkDir.link(srcDir, tgtDir, {
+          sourceMaps: localPkgLinks[vdir].sourceMaps
+        });
+      }
+
+      logger.info(`refreshed linked files for local packages`);
+    } else {
+      logger.info(`There are no local packages`);
+    }
+  }
   /*
    * npm scripts execution order on install
    * 1. preinstall
@@ -1671,6 +1694,21 @@ const commands = {
         type: "boolean"
       }
     }
+  },
+  "sync-local": {
+    desc: "Refresh locally linked package files",
+    alias: "sl",
+
+    async exec(argv, parsed) {
+      try {
+        const opts = await pickOptions(argv, parsed.nixClap, true);
+        const cli = new FynCli(opts);
+        return cli.syncLocalLinks();
+      } catch (err) {
+        process.exit(1);
+      }
+    }
+
   }
 };
 
@@ -2255,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;
   }
 
@@ -3059,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 */
 
 
@@ -3320,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]
+          };
+        });
+      }
     }
   }
 
@@ -3408,6 +3463,10 @@ class Fyn {
 
   getInstallConfigFile() {
     return Path.join(this.getFvDir(FYN_INSTALL_CONFIG_FILE));
+  }
+
+  setLocalPkgLinks(localLinks) {
+    this._installConfig.localPkgLinks = localLinks;
   } // save the config to outputDir
 
 
@@ -3741,7 +3800,7 @@ class Fyn {
    * - Rare but could occur if fyn is used for monorepo and user has script
    *   that run concurrent installs
    *
-   * @returns {boolean} if lock was acquired
+   * @returns {Promise<boolean>} if lock was acquired
    */
 
 
@@ -5832,7 +5891,7 @@ const {
 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");
 
@@ -5854,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
  *
@@ -6906,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) {
     //
@@ -7020,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));
@@ -7074,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];
@@ -7668,6 +7765,7 @@ class PkgInstaller {
     this._depLinker = new PkgDepLinker({
       fyn: this._fyn
     });
+    this._localLinks = {};
   }
 
   async install() {
@@ -7706,6 +7804,8 @@ class PkgInstaller {
       this.preInstall = undefined;
       this.postInstall = undefined;
       this.toLink = undefined;
+
+      this._fyn.setLocalPkgLinks(this._localLinks);
     });
   }
 
@@ -7720,8 +7820,15 @@ class PkgInstaller {
     const vdir = this._fyn.getInstalledPkgDir(depInfo.name, depInfo.version, depInfo);
 
     if (depInfo.local === "hard") {
+      const {
+        sourceMaps
+      } = this._fyn._options;
+      this._localLinks[Path.relative(this._fyn._cwd, vdir)] = {
+        srcDir: Path.relative(this._fyn._cwd, depInfo.dir),
+        sourceMaps
+      };
       await hardLinkDir.link(depInfo.dir, vdir, {
-        sourceMaps: this._fyn._options.sourceMaps
+        sourceMaps
       });
     } else {
       // await this._depLinker.symlinkLocalPackage(vdir, depInfo.dir);
@@ -8808,7 +8915,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)
 
@@ -9826,7 +9933,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 */
 
 
@@ -11062,6 +11169,11 @@ function analyze(semver) {
 
   return sv;
 }
+
+function replace(sv, replaced) {
+  sv.$$ = sv.$;
+  sv.$ = replaced;
+}
 /**
  * semver utilities lib
  */
@@ -11073,6 +11185,7 @@ const semverLib = {
   },
   split,
   analyze,
+  replace,
   localify,
   localifyHard,
   unlocalify,
@@ -11330,7 +11443,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";
@@ -11351,7 +11464,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
  *
@@ -11619,7 +11732,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";
@@ -11769,7 +11882,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";
@@ -11799,9 +11912,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 = {
@@ -11973,12 +12086,12 @@ class FynpoDepGraph {
     this._options = _objectSpread({
       cwd: process.cwd()
     }, options);
-    this.depMapByPath = {};
-    this.resolvedCache = {};
+    this.depMapByPath = Object.create(null);
+    this.resolvedCache = Object.create(null);
     this.packages = {
-      byId: {},
-      byName: {},
-      byPath: {}
+      byId: Object.create(null),
+      byName: Object.create(null),
+      byPath: Object.create(null)
     };
   }
   /**
@@ -11991,10 +12104,13 @@ class FynpoDepGraph {
       await this.readPackages();
     }
 
-    this.updateDepMap();
+    this.resolveDirectDeps(); // we don't need indirect deps
+    // topo sort works with only direct deps
+    // this.resolveIndirectDeps();
   }
   /**
    * update package depdencies map
+   *
    * - re-entrant safe
    */
 
@@ -12012,7 +12128,9 @@ class FynpoDepGraph {
 
   getTopoSortPackagePaths() {
     const depRecords = {};
-    const changed = [];
+    const changed = []; //
+    // first start with packages that has zero local dependencies
+    //
 
     for (const path in this.depMapByPath) {
       const depData = this.depMapByPath[path];
@@ -12030,12 +12148,14 @@ class FynpoDepGraph {
     const sorted = [];
 
     while (changed.length > 0) {
+      // remove the zero local dependencies packages from queue
       const record = depRecords[changed.pop()];
       /* istanbul ignore else */
 
       if (record.count === 0) {
+        // add package to result
         record.count = -1;
-        sorted.push(record.depData.pkgInfo.path);
+        sorted.push(record.depData.pkgInfo.path); // subtract depdendencies count for all packages depending on the removed package
 
         for (const path in record.depData.dependentsByPath) {
           const record2 = depRecords[path];
@@ -12214,7 +12334,7 @@ class FynpoDepGraph {
       byName
     } = this.packages;
 
-    if (byName.hasOwnProperty(pkgJson.name)) {
+    if (byName[pkgJson.name]) {
       byName[pkgJson.name].push(pkgInfo);
     } else {
       byName[pkgJson.name] = [pkgInfo];
@@ -12308,8 +12428,8 @@ class FynpoDepGraph {
       if (!depMapByPath[path]) {
         depMapByPath[path] = {
           pkgInfo: byPath[path],
-          localDepsByPath: {},
-          dependentsByPath: {}
+          localDepsByPath: Object.create(null),
+          dependentsByPath: Object.create(null)
         };
       }
     }
@@ -12371,7 +12491,7 @@ class FynpoDepGraph {
     const dataPkg = this.depMapByPath[pkgInfo.path];
     const dataDep = this.depMapByPath[depPkg.path]; // check circular
 
-    if (dataDep.localDepsByPath.hasOwnProperty(pkgInfo.path)) {
+    if (dataDep.localDepsByPath[pkgInfo.path]) {
       // remember circular package's path
       if (!dataPkg.pathOfCirculars) {
         dataPkg.pathOfCirculars = [];
@@ -12464,6 +12584,7 @@ class FynpoDepGraph {
   /**
    * Figure out all the packages' indirect dependencies on other local packages
    *
+   * TODO: very inefficient. optimize this.
    */
 
 
@@ -12495,7 +12616,7 @@ class FynpoDepGraph {
         } // check if pkg is already part of localDeps
 
 
-        if (!dataPkg.localDepsByPath.hasOwnProperty(depInfo.path)) {
+        if (!dataPkg.localDepsByPath[depInfo.path]) {
           change++;
           this.addDep(pkgInfo, depInfo, sec, stepsCopy);
         } // resolve further with deps of depPkg
@@ -12522,7 +12643,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";
@@ -12544,12 +12665,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
  *
@@ -12805,7 +12926,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";
@@ -12944,7 +13065,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.34",
+  "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/",