fyn 1.1.32 → 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
@@ -1146,7 +1169,31 @@ const defaultRc = __webpack_require__("./cli/default-rc.js");
 
 const npmConfig = __webpack_require__("./cli/config/npm-config.js");
 
-const fynTil = __webpack_require__("./lib/util/fyntil.js");
+const fynTil = __webpack_require__("./lib/util/fyntil.js"); // replace any ${ENV} values with the appropriate environ.
+// copied from https://github.com/npm/config/blob/1f47a6c6ae7864b412d45c6a4a74930cf3365395/lib/env-replace.js
+
+
+const envExpr = /(?<!\\)(\\*)\$\{([^${}]+)\}/g;
+
+function replaceEnv(f, env) {
+  return f.replace(envExpr, (orig, esc, name) => {
+    const val = env[name] !== undefined ? env[name] : `$\{${name}}`; // consume the escape chars that are relevant.
+
+    if (esc.length % 2) {
+      return orig.slice((esc.length + 1) / 2);
+    }
+
+    return esc.slice(esc.length / 2) + val;
+  });
+}
+
+function replaceRcEnv(rc, env) {
+  for (const k in rc) {
+    if (rc[k] && rc[k].replace) {
+      rc[k] = replaceEnv(rc[k], env);
+    }
+  }
+}
 
 function readRc(fname) {
   const rcFname = Path.basename(fname);
@@ -1200,6 +1247,8 @@ function loadRc(cwd, fynpoDir) {
 
   const npmrc = _.merge.apply(_, [{}, npmConfig.defaults].concat(npmrcData));
 
+  replaceRcEnv(all, process.env);
+  replaceRcEnv(npmrc, process.env);
   return {
     all,
     npmrc,
@@ -1645,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);
+      }
+    }
+
   }
 };
 
@@ -2506,6 +2570,7 @@ const Crypto = __webpack_require__("crypto");
  *  ]
  * }
  * ```
+ *
  * @param {*} tree - the dir tree
  * @param {*} output - output object
  * @param {*} baseDir - base dir path
@@ -2648,7 +2713,7 @@ class FynCentral {
    *   to know if file changed.
    *
    * @param {*} integrity - shasum integrity for the package
-   * @returns
+   * @returns void
    */
 
 
@@ -2776,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,
@@ -2789,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];
@@ -2878,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);
 
@@ -3376,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
 
 
@@ -3709,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
    */
 
 
@@ -4048,6 +4122,10 @@ const {
 
 const npmConfigEnv = __webpack_require__("./lib/util/npm-config-env.js");
 
+const {
+  AggregateError
+} = __webpack_require__("./node_modules/.f/_/@jchip/error/1.0.3/@jchip/error/dist/index.js");
+
 const readPkgJson = dir => {
   return fyntil.readPkgJson(dir).catch(() => {
     return {};
@@ -4169,7 +4247,12 @@ class LifecycleScripts {
       logLabel: `${pkgName} npm script ${scriptName}`,
       outputLabel: `${dimPkgName} npm script ${scriptName}`
     });
-    return ve.show(child);
+
+    try {
+      return await ve.show(child);
+    } catch (err) {
+      throw new AggregateError([err], `Failed running npm script '${name}' for package ${pkgName} at ${pkgDir}`);
+    }
   }
 
 }
@@ -4211,11 +4294,16 @@ const {
   runNpmScript
 } = __webpack_require__("./lib/util/run-npm-script.js");
 
+const {
+  AggregateError
+} = __webpack_require__("./node_modules/.f/_/@jchip/error/1.0.3/@jchip/error/dist/index.js");
+
 class LocalPkgBuilder {
   constructor(options) {
     this._options = options;
     this._fyn = options.fyn;
     this._waitItems = {};
+    this._failedItems = {};
   }
 
   async start() {
@@ -4238,11 +4326,17 @@ class LocalPkgBuilder {
     } = this._options;
 
     this._promiseQ.on("doneItem", data => {
-      this._waitItems[data.item.fullPath].resolve();
+      this._waitItems[data.item.fullPath].resolve({});
     });
 
     this._promiseQ.on("failItem", data => {
-      this._waitItems[data.item.fullPath].reject(data.error);
+      const itemRes = {
+        error: new AggregateError([data.error], `failed build local package at ${data.item.fullPath}`)
+      };
+
+      this._waitItems[data.item.fullPath].resolve(itemRes);
+
+      this._failedItems[data.item.fullPath] = itemRes;
     });
 
     this._defer = xaa.makeDefer();
@@ -4254,7 +4348,7 @@ class LocalPkgBuilder {
     });
 
     this._promiseQ.on("fail", data => {
-      this._defer.reject(data.error);
+      this._defer.reject(new AggregateError([data.error], `failed to build local packages`));
     }); //
     // localsByDepth is array of array: level 1 depths, level 2 packages
     //
@@ -4340,6 +4434,10 @@ class LocalPkgBuilder {
   }
 
   async processItem(item) {
+    if (!_.isEmpty(this._failedItems)) {
+      return {};
+    }
+
     const dispPath = Path.relative(this._options.fyn._cwd, item.fullPath);
     const command = [process.argv[0], this._fynJs, this._fyn._options.registry && `--reg=${this._fyn._options.registry}`, "-q=d --pg=simple --no-build-local", !this._fyn._options.sourceMaps && "--no-source-maps"].filter(x => x).join(" ");
     const displayTitle = `building local pkg at ${dispPath}`;
@@ -4467,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;
 
@@ -4539,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");
 
@@ -5188,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; }
 
@@ -5736,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");
 
@@ -6254,7 +6352,7 @@ class PkgDepResolver {
         }
 
         for (const name in deps) {
-          if (this._fyn.checkNoFynLocal(name) || !fynpo.graph.getPackageByName(name)) {
+          if (this._fyn.checkNoFynLocal(name) || !fynpo.graph.getPackageByName(name) || semverUtil.checkUrl(deps[name])) {
             continue;
           } //
           // Check if there is a fynpo package that match 'name@semver'?
@@ -7592,13 +7690,17 @@ const {
 
 const xaa = __webpack_require__("./lib/util/xaa.js");
 
+const {
+  AggregateError
+} = __webpack_require__("./node_modules/.f/_/@jchip/error/1.0.3/@jchip/error/dist/index.js");
+
 const {
   RESOLVE_ORDER,
   RSEMVERS,
   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 {
@@ -7608,6 +7710,7 @@ class PkgInstaller {
     this._depLinker = new PkgDepLinker({
       fyn: this._fyn
     });
+    this._localLinks = {};
   }
 
   async install() {
@@ -7646,6 +7749,8 @@ class PkgInstaller {
       this.preInstall = undefined;
       this.postInstall = undefined;
       this.toLink = undefined;
+
+      this._fyn.setLocalPkgLinks(this._localLinks);
     });
   }
 
@@ -7660,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);
@@ -7968,7 +8080,11 @@ class PkgInstaller {
 
   async _buildLocalPkg(depInfo) {
     if (this._fyn._options.buildLocal && this._fyn._localPkgBuilder) {
-      await this._fyn._localPkgBuilder.waitForItem(depInfo.dir);
+      const itemRes = await this._fyn._localPkgBuilder.waitForItem(depInfo.dir);
+
+      if (itemRes && itemRes.error) {
+        throw new AggregateError([itemRes.error], `install fail because local package build failed`);
+      }
     }
   }
 
@@ -8268,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");
 
@@ -8667,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; }
 
@@ -9513,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");
 
@@ -10217,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);
 
@@ -10234,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];
@@ -10515,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");
 
@@ -10627,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");
 
@@ -10855,7 +10977,7 @@ function localSplit(v) {
 
 
 function getAsFilepath(semver) {
-  if (semver.startsWith("file:")) {
+  if (semver.startsWith("file:") || semver.startsWith("link:")) {
     return semver.substr(5);
   }
 
@@ -10975,7 +11097,7 @@ function analyze(semver) {
     } else if (urlType === "sym1") {
       sv.path = semver.substr(5);
       sv.localType = "sym1";
-    } else if (urlType === "file") {
+    } else if (urlType === "file" || urlType === "link") {
       setHardLocal(semver.substr(5));
     } else {
       sv.urlType = urlType;
@@ -11903,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)
     };
   }
   /**
@@ -11921,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
    */
 
@@ -11942,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];
@@ -11960,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];
@@ -12144,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];
@@ -12238,8 +12367,8 @@ class FynpoDepGraph {
       if (!depMapByPath[path]) {
         depMapByPath[path] = {
           pkgInfo: byPath[path],
-          localDepsByPath: {},
-          dependentsByPath: {}
+          localDepsByPath: Object.create(null),
+          dependentsByPath: Object.create(null)
         };
       }
     }
@@ -12301,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 = [];
@@ -12394,6 +12523,7 @@ class FynpoDepGraph {
   /**
    * Figure out all the packages' indirect dependencies on other local packages
    *
+   * TODO: very inefficient. optimize this.
    */
 
 
@@ -12425,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.32",
+  "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/",