fyn 1.1.33 → 1.1.36

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);
+      }
+    }
+
   }
 };
 
@@ -2532,6 +2570,7 @@ const Crypto = __webpack_require__("crypto");
  *  ]
  * }
  * ```
+ *
  * @param {*} tree - the dir tree
  * @param {*} output - output object
  * @param {*} baseDir - base dir path
@@ -2674,7 +2713,7 @@ class FynCentral {
    *   to know if file changed.
    *
    * @param {*} integrity - shasum integrity for the package
-   * @returns
+   * @returns void
    */
 
 
@@ -2802,9 +2841,16 @@ class FynCentral {
   }
 
   _untarStream(tarStream, targetDir) {
-    const dirTree = {
-      "/": {}
+    // since we are using objects to store directory tree we have to
+    // create objects without the normal prototypes to avoid name conflict
+    // with file names
+    const newDirObj = () => {
+      const n = Object.create(null);
+      n["/"] = Object.create(null);
+      return n;
     };
+
+    const dirTree = newDirObj();
     const strip = 1;
     const untarStream = Tar.x({
       strip,
@@ -2815,9 +2861,7 @@ class FynCentral {
         const isDir = entry.type === "Directory";
         const dirs = parts.slice(strip, isDir ? parts.length : parts.length - 1);
         const wtree = dirs.reduce((wt, dir) => {
-          return wt[dir] || (wt[dir] = {
-            "/": {}
-          });
+          return wt[dir] || (wt[dir] = newDirObj());
         }, dirTree);
         if (isDir) return;
         const fname = parts[parts.length - 1];
@@ -2904,7 +2948,7 @@ class FynCentral {
         } else {
           logger.debug("storing tar to central store", pkgId, integrity);
           await this._storeTarStream(info, stream);
-          stream = undefined;
+          stream = undefined; // eslint-disable-line
 
           this._map.set(integrity, info);
 
@@ -3402,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
 
 
@@ -3735,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
    */
 
 
@@ -4387,7 +4435,7 @@ class LocalPkgBuilder {
 
   async processItem(item) {
     if (!_.isEmpty(this._failedItems)) {
-      return;
+      return {};
     }
 
     const dispPath = Path.relative(this._options.fyn._cwd, item.fullPath);
@@ -4517,7 +4565,7 @@ module.exports = new CliLogger();
 
 "use strict";
 
-/* eslint-disable no-magic-numbers, max-statements */
+/* eslint-disable no-magic-numbers, max-statements, no-param-reassign */
 
 const MAX_PENDING_SHOW = 10;
 
@@ -4589,7 +4637,7 @@ module.exports = {
 
 "use strict";
 
-/* eslint-disable global-require, max-statements */
+/* eslint-disable global-require, max-statements, no-param-reassign */
 
 const Fs = __webpack_require__("./lib/util/file-ops.js");
 
@@ -5238,7 +5286,7 @@ module.exports = PkgDepLinker;
 
 "use strict";
 
-/* eslint-disable no-magic-numbers */
+/* eslint-disable no-magic-numbers, no-param-reassign */
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
@@ -5786,7 +5834,7 @@ module.exports = PkgDepLocker;
 
 "use strict";
 
-/* eslint-disable no-magic-numbers, max-params, max-statements, complexity */
+/* eslint-disable no-magic-numbers, max-params, max-statements, complexity, no-param-reassign */
 
 const _ = __webpack_require__("./node_modules/.f/_/lodash/4.17.21/lodash/lodash.min.js");
 
@@ -5826,7 +5874,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");
 
@@ -7652,7 +7700,7 @@ const {
   LOCK_RSEMVERS,
   SEMVER
 } = __webpack_require__("./lib/symbols.js");
-/* eslint-disable max-statements,no-magic-numbers,no-empty,complexity,prefer-template,max-len, max-depth */
+/* eslint-disable max-statements,no-magic-numbers,no-empty,complexity,prefer-template,max-len, max-depth, no-param-reassign */
 
 
 class PkgInstaller {
@@ -7662,6 +7710,7 @@ class PkgInstaller {
     this._depLinker = new PkgDepLinker({
       fyn: this._fyn
     });
+    this._localLinks = {};
   }
 
   async install() {
@@ -7700,6 +7749,8 @@ class PkgInstaller {
       this.preInstall = undefined;
       this.postInstall = undefined;
       this.toLink = undefined;
+
+      this._fyn.setLocalPkgLinks(this._localLinks);
     });
   }
 
@@ -7714,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);
@@ -8326,7 +8384,7 @@ module.exports = PkgInstaller;
 
 "use strict";
 
-/* eslint-disable max-nested-callbacks */
+/* eslint-disable max-nested-callbacks, no-param-reassign */
 
 const assert = __webpack_require__("assert");
 
@@ -8725,7 +8783,7 @@ module.exports = PkgOptResolver;
 // - npm registry
 //
 
-/* eslint-disable no-magic-numbers, prefer-template, max-statements */
+/* eslint-disable no-magic-numbers, prefer-template, max-statements, no-param-reassign */
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
@@ -8802,7 +8860,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)
 
@@ -9571,7 +9629,7 @@ module.exports = {
 
 "use strict";
 
-/* eslint-disable max-params */
+/* eslint-disable max-params, no-param-reassign */
 
 const _ = __webpack_require__("./node_modules/.f/_/lodash/4.17.21/lodash/lodash.min.js");
 
@@ -9820,7 +9878,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 */
 
 
@@ -10275,11 +10333,18 @@ async function generatePackTree(path, _logger = logger) {
   if (files.length > 1000) {
     _logger.warn(`Local linking package at ${path} has more than ${files.length} files.
   >>> This is unusual, please check package .npmignore or 'files' in package.json <<<`);
-  }
+  } // since we are using objects to store directory tree we have to
+  // create objects without the normal prototypes to avoid name conflict
+  // with file names
+
 
-  const fmap = {
-    [SYM_FILES]: []
+  const newDirObj = () => {
+    const n = Object.create(null);
+    n[SYM_FILES] = [];
+    return n;
   };
+
+  const fmap = newDirObj();
   files.sort().forEach(filePath => {
     const dir = Path.dirname(filePath);
 
@@ -10292,9 +10357,7 @@ async function generatePackTree(path, _logger = logger) {
 
     dir.split("/").forEach(d => {
       if (!dmap[d]) {
-        dmap[d] = {
-          [SYM_FILES]: []
-        };
+        dmap[d] = newDirObj();
       }
 
       dmap = dmap[d];
@@ -10573,7 +10636,7 @@ module.exports = __webpack_require__("./node_modules/.f/_/item-queue/1.1.2/item-
 
 "use strict";
 
-/* eslint-disable no-magic-numbers */
+/* eslint-disable no-magic-numbers, no-param-reassign */
 
 const chalk = __webpack_require__("./node_modules/.f/_/chalk/4.1.2/chalk/source/index.js");
 
@@ -10685,6 +10748,7 @@ module.exports = ItemQueue;
 
 "use strict";
 
+/* eslint-disable no-param-reassign */
 
 const Promise = __webpack_require__("./node_modules/.f/_/bluebird/3.7.2/bluebird/js/release/bluebird.js");
 
@@ -11318,7 +11382,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";
@@ -11339,7 +11403,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
  *
@@ -11607,7 +11671,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";
@@ -11757,7 +11821,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";
@@ -11787,9 +11851,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 = {
@@ -11961,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)
     };
   }
   /**
@@ -11979,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
    */
 
@@ -12000,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];
@@ -12018,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];
@@ -12202,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];
@@ -12296,8 +12367,8 @@ class FynpoDepGraph {
       if (!depMapByPath[path]) {
         depMapByPath[path] = {
           pkgInfo: byPath[path],
-          localDepsByPath: {},
-          dependentsByPath: {}
+          localDepsByPath: Object.create(null),
+          dependentsByPath: Object.create(null)
         };
       }
     }
@@ -12359,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 = [];
@@ -12452,6 +12523,7 @@ class FynpoDepGraph {
   /**
    * Figure out all the packages' indirect dependencies on other local packages
    *
+   * TODO: very inefficient. optimize this.
    */
 
 
@@ -12483,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
@@ -12510,7 +12582,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";
@@ -12532,12 +12604,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
  *
@@ -12793,7 +12865,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";
@@ -12932,7 +13004,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.33",
+  "version": "1.1.36",
   "description": "The package manager for fynpo, a zero setup monorepo manager",
   "main": "./bin/fyn.js",
   "homepage": "https://jchip.github.io/fynpo/",