fyn 1.1.34 → 1.1.35

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);
+      }
+    }
+
   }
 };
 
@@ -3408,6 +3446,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 +3783,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
    */
 
 
@@ -7668,6 +7710,7 @@ class PkgInstaller {
     this._depLinker = new PkgDepLinker({
       fyn: this._fyn
     });
+    this._localLinks = {};
   }
 
   async install() {
@@ -7706,6 +7749,8 @@ class PkgInstaller {
       this.preInstall = undefined;
       this.postInstall = undefined;
       this.toLink = undefined;
+
+      this._fyn.setLocalPkgLinks(this._localLinks);
     });
   }
 
@@ -7720,8 +7765,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);
@@ -11973,12 +12025,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 +12043,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 +12067,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 +12087,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 +12273,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 +12367,8 @@ class FynpoDepGraph {
       if (!depMapByPath[path]) {
         depMapByPath[path] = {
           pkgInfo: byPath[path],
-          localDepsByPath: {},
-          dependentsByPath: {}
+          localDepsByPath: Object.create(null),
+          dependentsByPath: Object.create(null)
         };
       }
     }
@@ -12371,7 +12430,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 +12523,7 @@ class FynpoDepGraph {
   /**
    * Figure out all the packages' indirect dependencies on other local packages
    *
+   * TODO: very inefficient. optimize this.
    */
 
 
@@ -12495,7 +12555,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

package/package.json

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