fyn 1.1.14 → 1.1.18

package/README.md

@@ -14,7 +14,7 @@ Additionally, it has more unique features to improve productivity and efficiency
 - efficient disk space usage with [central storage](#central-storage)
 - smaller `node_modules` with [guaranteed single copy of a package](#smaller-node_modules)
 - flexible dependencies lock by using a [lock time stamp](#locking-dependencies-by-time)
-- built-in support for a mono-repo workspace
+- built-in support for a monorepo workspace
 - and [more](#features)
 
 ![fyn demo][fyn-demo-gif]
@@ -101,7 +101,7 @@ Want to find out more? Please read on below:
 - Compatible with [npm] by internally using the same modules as [npm].
 - Maintains as much of [npm]'s behaviors as possible.
 - Able to use [npm]'s `npm-shrinkwrap.json` or `package-lock.json`.
-- built-in support for maintaining a mono-repo workspace.
+- built-in support for maintaining a monorepo workspace.
 
 ## Overview
 
@@ -121,11 +121,11 @@ So why would you want to use this?
 
 It also has a special `fynlocal` mode that's a better [npm link] for handling local packages.
 
-It's workspace aware and fits perfectly with the mono-repo concept.
+It's workspace aware and fits perfectly with the monorepo concept.
 
 ## Enhanced `npm link`
 
-`fyn` has a `fynlocal` mode that's designed specifically to be a much better [npm link]. It effectively makes your disk a npm registry by treating packages on your local disk like they've been published. You can install and use them directly, and quickly test changes iteratively. It fits perfectly with the mono-repo workspace concept. It would be very useful if you've ever done any of these:
+`fyn` has a `fynlocal` mode that's designed specifically to be a much better [npm link]. It effectively makes your disk a npm registry by treating packages on your local disk like they've been published. You can install and use them directly, and quickly test changes iteratively. It fits perfectly with the monorepo workspace concept. It would be very useful if you've ever done any of these:
 
 - Debug your application by inspecting code inside `node_modules`.
 - Live edit your package that's installed to `node_modules`, and then have to copy the changes out to commit.

package/dist/fyn.js

@@ -973,7 +973,9 @@ class FynCli {
       } // run npm scripts from fynpo, with lifecycle scripts added
 
 
-      const fynpoNpmScripts = addNpmLifecycle(_.without(this.fyn._runNpm, ...npmInstallScripts), pkgScripts);
+      const _runNpm = this.fyn._runNpm.map(s => Array.isArray(s) ? s.find(s1 => pkgScripts[s1] !== undefined) : s);
+
+      const fynpoNpmScripts = addNpmLifecycle(_.without(_runNpm, ...npmInstallScripts), pkgScripts);
 
       if (fynpoNpmScripts.length > 0) {
         await runNpmScript({
@@ -3187,6 +3189,11 @@ class Fyn {
 
       if (this._fynpo.config) {
         if (this._fynpo.graph.getPackageAtDir(this._cwd)) {
+          // the command.bootstrap.npmRunScripts can be
+          // - a string
+          // - an array of strings
+          // - an array of strings and/or array of strings - each sub array indicates a list of
+          //   script names and fyn will run only the first one that exist
           fynpoNpmRun = _.get(this, "_fynpo.config.command.bootstrap.npmRunScripts", undefined);
 
           if (_.isArray(fynpoNpmRun) && !_.isEmpty(fynpoNpmRun)) {
@@ -3789,14 +3796,23 @@ class Fyn {
     }
   }
 
-  async moveToBackup(dir, reason) {
-    // TODO: create backup dir and move
-    logger.warn("Removing", dir, "due to", reason);
-    return await Fs.$.rimraf(dir);
+  async moveToFv(dir, pkg, pkgJson) {
+    const toDir = this.getInstalledPkgDir(pkgJson.name, pkgJson.version, {});
+
+    try {
+      await Fs.access(toDir); // a copy already exist in FV dir, so remove it
+
+      logger.warn(`Removing ${dir} because its version ${pkgJson.version} is different from ${pkg.version}`);
+      await Fs.$.rimraf(dir);
+    } catch (err) {
+      logger.debug(`Moving ${dir} to ${toDir} to replace with version ${pkg.version}`);
+      await Fs.$.mkdirp(Path.dirname(toDir));
+      await Fs.rename(dir, toDir);
+    }
   }
 
-  async unlinkLocalPackage(pkg, dir) {
-    logger.warn("Removing symlink", dir);
+  async unlinkLocalPackage(dir, reason) {
+    logger.warn(`Removing ${dir} because it's ${reason}`);
     return await Fs.$.rimraf(dir);
   } //
   // A pkg that's to be extracted must:
@@ -3822,21 +3838,21 @@ class Fyn {
     }
 
     if (ostat.isSymbolicLink()) {
-      await this.unlinkLocalPackage(pkg, fullOutDir);
+      await this.unlinkLocalPackage(fullOutDir, "a symlink");
     } else if (!ostat.isDirectory()) {
-      await this.moveToBackup(fullOutDir, "not a directory");
+      await this.unlinkLocalPackage(fullOutDir, "not a directory");
     } else {
       try {
         const pkgJson = await this.loadJsonForPkg(pkg, fullOutDir);
 
         if (!pkgJson._invalid) {
           return pkgJson;
-        } // no valid package.json found
-
+        }
 
-        const id = pkgJson._id ? ` (id ${pkgJson._id})` : "";
-        await this.moveToBackup(fullOutDir, `invalid existing package${id}`);
-      } catch (err) {}
+        await this.moveToFv(fullOutDir, pkg, pkgJson);
+      } catch (err) {
+        logger.warn(`ensureProperPkgdir:`, err);
+      }
     }
 
     return null;
@@ -3940,7 +3956,7 @@ const logger = __webpack_require__("./lib/logger.js");
 
 const logFormat = __webpack_require__("./lib/util/log-format.js");
 
-const VisualExec = __webpack_require__("./node_modules/.f/_/visual-exec/0.1.13/visual-exec/lib/visual-exec.js");
+const VisualExec = __webpack_require__("./node_modules/.f/_/visual-exec/0.1.14/visual-exec/lib/visual-exec.js");
 
 const fyntil = __webpack_require__("./lib/util/fyntil.js");
 
@@ -4133,7 +4149,7 @@ class LifecycleScripts {
       silent,
       cwd: this._pkgDir,
       env,
-      maxBuffer: ONE_MB
+      maxBuffer: 20 * ONE_MB
     }, this._pkg.scripts[name]); // exec not silent so it's dumping to stdout
     // and it's not a good idea to try to show visual progress of the execution
 
@@ -4179,7 +4195,7 @@ const logger = __webpack_require__("./lib/logger.js");
 
 const PromiseQueue = __webpack_require__("./lib/util/promise-queue.js");
 
-const VisualExec = __webpack_require__("./node_modules/.f/_/visual-exec/0.1.13/visual-exec/lib/visual-exec.js");
+const VisualExec = __webpack_require__("./node_modules/.f/_/visual-exec/0.1.14/visual-exec/lib/visual-exec.js");
 
 const xaa = __webpack_require__("./node_modules/.f/_/xaa/1.7.0/xaa/dist/xaa.js");
 
@@ -4187,6 +4203,10 @@ const Fs = __webpack_require__("./lib/util/file-ops.js");
 
 const _ = __webpack_require__("./node_modules/.f/_/lodash/4.17.21/lodash/lodash.min.js");
 
+const {
+  runNpmScript
+} = __webpack_require__("./lib/util/run-npm-script.js");
+
 class LocalPkgBuilder {
   constructor(options) {
     this._options = options;
@@ -4237,22 +4257,22 @@ class LocalPkgBuilder {
 
 
     const flatLocals = [].concat(...localsByDepth);
-    const allNames = flatLocals.map(x => x.name); //
-    // convert items into array of names and then use _.uniq to only keep
-    // the first occurrence of duplicate names, and reverse them so the
+    const allPaths = flatLocals.map(x => x.fullPath); //
+    // convert items into array of paths and then use _.uniq to only keep
+    // the first occurrence of duplicate paths, and reverse them so the
     // ones that has no dependence on the ones before them are build first.
     //
 
-    const uniqNames = _.uniq(allNames).reverse();
+    const uniqPaths = _.uniq(allPaths).reverse();
 
-    const byName = flatLocals.reduce((a, x) => {
-      a[x.name] = x;
+    const byPathLookup = flatLocals.reduce((a, x) => {
+      a[x.fullPath] = x;
       return a;
     }, {});
-    logger.debug("local pkgs for build all names", allNames, "uniq names", uniqNames);
+    logger.debug("local pkgs for build all paths", allPaths, "uniq paths", uniqPaths);
 
-    for (const name of uniqNames) {
-      await this.addItem(byName[name]);
+    for (const path of uniqPaths) {
+      await this.addItem(byPathLookup[path]);
     }
 
     logger.debug("resolving build local _started promise");
@@ -4301,18 +4321,21 @@ class LocalPkgBuilder {
 
     if (x && x.promise) {
       logger.debug("waiting for build local item", fullPath, x);
-      await x.promise;
+      const localBuildResult = await x.promise;
       logger.debug("build local item awaited", fullPath);
+      return localBuildResult;
     } else {
       logger.debug("status is false => no build local job for pkg at", fullPath, x);
     }
+
+    return {};
   }
 
   waitForDone() {
     return this._defer && this._defer.promise;
   }
 
-  processItem(item) {
+  async processItem(item) {
     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}`;
@@ -4324,7 +4347,66 @@ class LocalPkgBuilder {
       visualLogger: logger
     });
     ve.logFinalOutput = _.noop;
-    return ve.execute();
+    await ve.execute();
+    const pkgJsonFile = Path.join(item.fullPath, "package.json");
+    let pkgJson;
+    const prePkgJson = pkgJson = JSON.parse(await Fs.readFile(pkgJsonFile));
+
+    if (_.get(prePkgJson, "scripts.prepublish") !== undefined) {
+      if (_.get(prePkgJson, "scripts.prepare") !== undefined) {
+        logger.warn(`
+  Local package has 'prepare' and 'prepublish', skipping 'prepublish'.  dir at ${dispPath} 
+        `);
+      } else {
+        logger.warn(`
+  Build local dep package - running npm script 'prepublish' at ${dispPath}
+
+  ==NOTE== While fyn will run 'prepublish' as part of installing this local package as a dependency,
+  ==NOTE== Please note that npm deprecated this script and recommend other npm lifecycle script
+  ==NOTE== such as 'prepare'.  See docs here https://docs.npmjs.com/cli/v7/using-npm/scripts#prepare-and-prepublish
+  ==NOTE== If you want to use 'prepublishOnly', please note that fyn won't execute it as part of
+  ==NOTE== installing local packages.
+`);
+        await runNpmScript({
+          scripts: ["prepublish"],
+          appDir: item.fullPath,
+          dir: item.fullPath,
+          fyn: this._fyn,
+          depInfo: item,
+          pkgJson: prePkgJson
+        });
+        pkgJson = JSON.parse(await Fs.readFile(pkgJsonFile));
+      }
+    }
+
+    if (_.get(prePkgJson, "scripts.prepack") !== undefined) {
+      logger.debug(`Build local dep package - running npm script 'prepack' at ${dispPath}`);
+      await runNpmScript({
+        scripts: ["prepack"],
+        appDir: item.fullPath,
+        dir: item.fullPath,
+        fyn: this._fyn,
+        depInfo: item,
+        pkgJson: prePkgJson
+      });
+      pkgJson = JSON.parse(await Fs.readFile(pkgJsonFile));
+    }
+
+    if (_.get(pkgJson, "scripts.postpack") !== undefined) {
+      logger.debug(`Build local dep package - running npm script 'postpack' at ${dispPath}`);
+      await runNpmScript({
+        scripts: ["postpack"],
+        appDir: item.fullPath,
+        dir: item.fullPath,
+        fyn: this._fyn,
+        depInfo: item,
+        pkgJson
+      });
+    }
+
+    return {
+      pkgJson
+    };
   }
 
 }
@@ -5690,7 +5772,7 @@ const {
 const {
   getDepSection,
   makeDepStep
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/index.js");
 
 const xaa = __webpack_require__("./lib/util/xaa.js");
 
@@ -6042,6 +6124,32 @@ class PkgDepResolver {
       this._promiseQ.addItem(PromiseQueue.pauseItem, true);
     }
   }
+
+  getAutoSemver(semver) {
+    const autoSemver = _.get(this._fyn._fynpo, "config.localDepAutoSemver");
+
+    if (autoSemver) {
+      const parsedSv = Semver.coerce(semver);
+
+      if (parsedSv && parsedSv.raw) {
+        switch (autoSemver) {
+          case "patch":
+            semver = `~${parsedSv.raw}`;
+            break;
+
+          case "minor":
+            semver = `^${parsedSv.raw}`;
+            break;
+
+          case "major":
+            semver = "*";
+            break;
+        }
+      }
+    }
+
+    return semver;
+  }
   /**
    * create the dep relation items for a package
    *
@@ -6130,31 +6238,36 @@ class PkgDepResolver {
 
       const fynDeps = _.get(pkg, ["fyn", depSec], {});
 
-      let fromDir = pkg[PACKAGE_RAW_INFO] && pkg[PACKAGE_RAW_INFO].dir; // if in fynpo mode, gather deps that are actually local packages in the mono-repo
+      let fromDir = pkg[PACKAGE_RAW_INFO] && pkg[PACKAGE_RAW_INFO].dir; // if in fynpo mode, gather deps that are actually local packages in the monorepo
 
       if (this._fyn.isFynpo) {
         const locals = [];
         const fynpo = this._fyn._fynpo;
 
         if (!fromDir) {
-          // this case means an downstream pkg has a dep on a mono-repo package
-          // TODO: should make sure mono-repo local copy's version satisfies
-          // downstream pkg's semver
+          // this case means a downstream pkg has a dep on a monorepo package
           fromDir = this._fyn.cwd;
         }
 
         for (const name in deps) {
-          if (this._fyn.checkNoFynLocal(name)) {
+          if (this._fyn.checkNoFynLocal(name) || !fynpo.graph.getPackageByName(name)) {
             continue;
-          } // is pkg 'name@semver' a fynpo package?
+          } //
+          // Check if there is a fynpo package that match 'name@semver'?
+          //
 
 
-          const fynpoPkg = fynpo.graph.resolvePackage(name, deps[name]);
+          const semver = this.getAutoSemver(deps[name]);
+          const fynpoPkg = fynpo.graph.resolvePackage(name, semver, false);
 
           if (fynpoPkg) {
             locals.push(fynpoPkg);
             const fullPkgDir = Path.join(fynpo.dir, fynpoPkg.path);
             fynDeps[name] = relativePath(fromDir, fullPkgDir, true);
+          } else {
+            const dispName = logFormat.pkgId(name);
+            const versions = fynpo.graph.packages.byName[name].map(x => x.version).join(", ");
+            logger.info(`No version of package in fynpo match semver: ${semver} name: ${dispName} versions: ${versions}`);
           }
         }
 
@@ -6179,7 +6292,7 @@ class PkgDepResolver {
           }
 
           const names = locals.map(x => x.name).join(", ");
-          logger.info(`These packages in ${pkg.name}'s ${depSec} using local copies from your mono-repo: ${names}`);
+          logger.info(`These packages in ${pkg.name}'s ${depSec} using local copies from your monorepo: ${names}`);
         }
       }
 
@@ -6745,7 +6858,7 @@ ${item.depPath.join(" > ")}`);
       return false;
     }
 
-    const force = this._lockOnly && isOpt; // check if an already resolved local package satisfies item
+    const force = this._lockOnly && !isOpt; // check if an already resolved local package satisfies item
     // before trying to resolve with lock data
 
     if (!this._fyn.preferLock) {
@@ -7966,13 +8079,17 @@ class PkgInstaller {
 
     if (scope) await xaa.try(() => Fs.rmdir(Path.join(outDir, scope))); // get rid of potentially empty FV_DIR dir
 
-    await xaa.try(() => Fs.rmdir(this._fyn.getFvDir()));
+    await xaa.try(() => Fs.rmdir(this._fyn.getFvDir("_")));
   }
   /**
    * Process detail layout for node_modules.
    *
-   * Make links under node_modules for packages that exist app's package.json and
-   * flattened packages under node_modules/${FV_DIR}/node_modules
+   * Real copies of packages are store under FV_DIR.
+   *
+   * 1. For top level packages that exist in app's package.json, make symlinks under node_modules.
+   * 2. For packages that could be promoted to the top level:
+   * - If flattenTop enabled, make symlinks under node_modules
+   * - flattenTop disabled, make symlinks under FV_Dir/node_modules
    *
    * @returns {*} none
    */
@@ -8602,7 +8719,7 @@ const {
 
 const PkgPreper = __webpack_require__("./node_modules/.f/_/pkg-preper/0.1.0/pkg-preper/lib/pkg-preper.js");
 
-const VisualExec = __webpack_require__("./node_modules/.f/_/visual-exec/0.1.13/visual-exec/lib/visual-exec.js");
+const VisualExec = __webpack_require__("./node_modules/.f/_/visual-exec/0.1.14/visual-exec/lib/visual-exec.js");
 
 const {
   readPkgJson,
@@ -8621,11 +8738,11 @@ const {
 
 const {
   prePackObj
-} = __webpack_require__("./node_modules/.f/_/publish-util/1.3.2/publish-util/lib/index.js");
+} = __webpack_require__("./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/index.js");
 
 const {
   PackageRef
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/index.js");
 
 const WATCH_TIME = 5000; // consider meta cache stale after this much time (30 minutes)
 
@@ -8812,7 +8929,7 @@ class PkgSrcManager {
       const publishUtilConfig = this.getPublishUtil(json, fullPath);
 
       if (publishUtilConfig) {
-        logger.info(`processing local package.json at ${fullPath} with https://www.npmjs.com/package/publish-util prePackObj`);
+        logger.debug(`processing local package.json at ${fullPath} with https://www.npmjs.com/package/publish-util prePackObj`);
         prePackObj(json, _objectSpread(_objectSpread({}, publishUtilConfig), {}, {
           silent: true
         }));
@@ -9641,7 +9758,7 @@ const {
 const {
   FynpoConfigManager,
   FynpoDepGraph
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/index.js");
 /* eslint-disable no-magic-numbers, max-statements, no-empty, complexity, no-eval */
 
 
@@ -10422,6 +10539,8 @@ const logFormat = __webpack_require__("./lib/util/log-format.js");
 
 const logger = __webpack_require__("./lib/logger.js");
 
+const _ = __webpack_require__("./node_modules/.f/_/lodash/4.17.21/lodash/lodash.min.js");
+
 const {
   INSTALL_PACKAGE
 } = __webpack_require__("./lib/log-items.js");
@@ -10471,23 +10590,28 @@ const runNpmScript = ({
   appDir,
   fyn,
   scripts,
+  dir,
+  pkgJson,
   depInfo,
   ignoreFailure,
   withLifecycle = false
 }) => {
   const pkgId = logFormat.pkgId(depInfo);
+  const options = Object.assign({
+    appDir,
+    _fyn: fyn,
+    dir,
+    json: pkgJson
+  }, depInfo);
 
-  if (withLifecycle) {
-    scripts = addNpmLifecycle(scripts, fyn._pkg.scripts || {});
+  if (withLifecycle && options.json) {
+    scripts = addNpmLifecycle(scripts, _.get(options.json, "scripts", {}));
   }
 
   return Promise.each(scripts, script => {
     running.push(pkgId);
     updateRunning(script);
-    const ls = new LifecycleScripts(Object.assign({
-      appDir,
-      _fyn: fyn
-    }, depInfo));
+    const ls = new LifecycleScripts(options);
     return ls.execute(script, true).then(() => undefined).catch(e => {
       if (!ignoreFailure) throw e;
       logger.warn(chalk.yellow(`ignoring failure of npm script ${script} of ${pkgId}`, chalk.red(e.message)));
@@ -10891,7 +11015,7 @@ module.exports = __webpack_require__("./node_modules/.f/_/xaa/1.7.0/xaa/dist/xaa
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/fynpo-config.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/fynpo-config.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11041,7 +11165,7 @@ exports.FynpoConfigManager = FynpoConfigManager;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11070,9 +11194,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.5-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
+const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
 
-const util_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/util.js");
+const util_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-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 = {
@@ -11209,8 +11333,18 @@ exports.pkgId = pkgId;
  * @returns package info
  */
 
-function resolvePackage(semver, packages) {
-  return packages.length > 1 && packages.find(pkg => semver_1.default.satisfies(pkg.version, semver)) || packages[0];
+function resolvePackage(semver, packages, fallbackToFirst = true) {
+  const found = packages.find(pkg => semver_1.default.satisfies(pkg.version, semver));
+
+  if (found) {
+    return found;
+  }
+
+  if (fallbackToFirst) {
+    return packages[0];
+  }
+
+  return undefined;
 }
 /**
  * Make a package ID from basic info by joining name and version into a single string.
@@ -11514,13 +11648,14 @@ class FynpoDepGraph {
    *
    * @param name - package name
    * @param semver - semver
+   * @param fallbackToFirst - should use the first entry if semver didn't match any version
    * @returns fynpo package info
    */
 
 
-  resolvePackage(name, semver) {
+  resolvePackage(name, semver, fallbackToFirst = true) {
     if (this.packages.byName[name]) {
-      return resolvePackage(semver, this.packages.byName[name]);
+      return resolvePackage(semver, this.packages.byName[name], fallbackToFirst);
     }
 
     return undefined;
@@ -11781,7 +11916,7 @@ exports.FynpoDepGraph = FynpoDepGraph;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/index.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/index.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11802,11 +11937,11 @@ const filter_scan_dir_1 = (0, tslib_1.__importDefault)(__webpack_require__("./no
 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.5-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
+const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
 
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js"), exports);
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/fynpo-config.js"), exports);
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/util.js"), exports);
+(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js"), exports);
+(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/fynpo-config.js"), exports);
+(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/util.js"), exports);
 /**
  * Take an array of packages and figure out their dependencies on each other
  *
@@ -12061,7 +12196,7 @@ exports.makePkgDeps = makePkgDeps;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/minimatch-group.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/minimatch-group.js":
 /***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
@@ -12107,7 +12242,7 @@ exports.groupMM = groupMM;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.5-fynlocal_h/@fynpo/base/dist/util.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/util.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -60621,23 +60756,23 @@ function set(data, k, v) {
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/publish-util/1.3.2/publish-util/lib/index.js":
+/***/ "./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/index.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 const {
   prePackObj,
   prePack
-} = __webpack_require__("./node_modules/.f/_/publish-util/1.3.2/publish-util/lib/prepack.js");
+} = __webpack_require__("./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/prepack.js");
 
 const {
   postPack
-} = __webpack_require__("./node_modules/.f/_/publish-util/1.3.2/publish-util/lib/postpack.js");
+} = __webpack_require__("./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/postpack.js");
 
 const {
   npmPublish
-} = __webpack_require__("./node_modules/.f/_/publish-util/1.3.2/publish-util/lib/npm-publish.js");
+} = __webpack_require__("./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/npm-publish.js");
 
-const utils = __webpack_require__("./node_modules/.f/_/publish-util/1.3.2/publish-util/lib/utils.js");
+const utils = __webpack_require__("./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/utils.js");
 
 exports.npmPublish = npmPublish;
 exports.prePackObj = prePackObj;
@@ -60647,7 +60782,7 @@ exports.utils = utils;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/publish-util/1.3.2/publish-util/lib/npm-publish.js":
+/***/ "./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/npm-publish.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -60657,7 +60792,7 @@ const execa = __webpack_require__("./node_modules/.f/_/execa/5.1.1/execa/index.j
 
 const {
   getInfo
-} = __webpack_require__("./node_modules/.f/_/publish-util/1.3.2/publish-util/lib/utils.js");
+} = __webpack_require__("./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/utils.js");
 
 const assert = __webpack_require__("assert");
 
@@ -60665,19 +60800,32 @@ const Fs = __webpack_require__("fs").promises;
 
 const Path = __webpack_require__("path");
 
-function getArg(opt, msg, valids = []) {
-  const tagIx = process.argv.indexOf(opt);
+function getArg({
+  opt,
+  msg,
+  argv,
+  value = true,
+  valids = []
+}) {
+  const tagIx = argv.indexOf(opt);
+
+  if (tagIx >= 0) {
+    if (value) {
+      const val = argv[tagIx + 1];
 
-  if (tagIx > 0) {
-    const val = process.argv[tagIx + 1];
+      if (valids.length > 0) {
+        assert(valids.includes(val), `${opt} has a value ${val} but it must be one of: ${valids.join(", ")}`);
+      } else {
+        assert(val, `${opt} must specify a ${msg}`);
+      }
 
-    if (valids.length > 0) {
-      assert(valids.includes(val), `${opt} must specify a valid ${msg}: ${valids.join(",")}`);
+      argv.splice(tagIx, 2);
+      return [opt, val];
     } else {
-      assert(val, `${opt} must specify a ${msg}`);
+      argv.splice(tagIx, 1);
     }
 
-    return [opt, val];
+    return [opt];
   }
 
   return [];
@@ -60691,18 +60839,36 @@ async function removeFile(name) {
   } catch (_unused) {}
 }
 
-process.on("SIGINT", () => {});
+exports.npmPublish = async function npmPublish({
+  exit = true,
+  silent = false
+} = {}) {
+  const noop = () => {};
 
-exports.npmPublish = async function npmPublish() {
+  process.on("SIGINT", noop);
+  const argv = [].concat(process.argv.slice(2));
   const {
     pkgDir,
     pkgFile,
     pkg,
     pkgData
   } = await getInfo();
-  const dryRun = process.argv.indexOf("--dry-run") > 0;
-  const tag = getArg("--tag", "tag");
-  const access = getArg("--access", "access", ["public", "restricted"]);
+  const dryRun = getArg({
+    opt: "--dry-run",
+    value: false,
+    argv
+  }).length > 0;
+  const tag = getArg({
+    opt: "--tag",
+    msg: "tag",
+    argv
+  });
+  const access = getArg({
+    opt: "--access",
+    msg: "access",
+    argv,
+    valids: ["public", "restricted"]
+  });
   let changedPkg = false;
   let exitCode = 0;
   const tgzName = pkg.name.replace(/@/g, "").replace(/\//g, "-");
@@ -60713,7 +60879,10 @@ exports.npmPublish = async function npmPublish() {
   const restore = async () => {
     try {
       if (changedPkg) {
-        console.log("Restoring", pkgFile);
+        if (!silent) {
+          console.log("Restoring", pkgFile);
+        }
+
         await Fs.writeFile(pkgFile, pkgData);
       }
     } catch (_unused2) {}
@@ -60721,6 +60890,8 @@ exports.npmPublish = async function npmPublish() {
     try {
       process.chdir(saveDir);
     } catch (_unused3) {}
+
+    process.removeListener("SIGINT", noop);
   };
 
   try {
@@ -60760,11 +60931,15 @@ exports.npmPublish = async function npmPublish() {
     }
 
     if (!dryRun) {
-      const publishArgs = [`publish`].concat(tag, access, fullTgzFile);
-      console.log("publishing args:", publishArgs.join(" "));
+      const publishArgs = [`publish`].concat(tag, access, fullTgzFile, argv);
+
+      if (!silent) {
+        console.log("publishing args:", publishArgs.join(" "));
+      }
+
       await execa(`npm`, publishArgs, execaOpts);
     } else {
-      console.log(tgzFile);
+      console.log("dry-run", tgzFile, "args:", [].concat(tag, access, argv));
     }
   } catch (err) {
     if (err.message.includes("SIGINT")) {
@@ -60777,13 +60952,18 @@ exports.npmPublish = async function npmPublish() {
   } finally {
     await restore();
     await removeFile(fullTgzFile);
-    process.exit(exitCode);
+
+    if (exit) {
+      process.exit(exitCode);
+    }
   }
+
+  return exitCode;
 };
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/publish-util/1.3.2/publish-util/lib/postpack.js":
+/***/ "./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/postpack.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -60795,7 +60975,7 @@ const Fs = __webpack_require__("fs").promises;
 
 const {
   getInfo
-} = __webpack_require__("./node_modules/.f/_/publish-util/1.3.2/publish-util/lib/utils.js");
+} = __webpack_require__("./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/utils.js");
 
 exports.postPack = async function postPack() {
   const {
@@ -60817,7 +60997,7 @@ exports.postPack = async function postPack() {
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/publish-util/1.3.2/publish-util/lib/prepack.js":
+/***/ "./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/prepack.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -60833,7 +61013,7 @@ const {
   removeFromObj,
   keepStandardFields,
   renameFromObj
-} = __webpack_require__("./node_modules/.f/_/publish-util/1.3.2/publish-util/lib/utils.js");
+} = __webpack_require__("./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/utils.js");
 
 const _ = __webpack_require__("./node_modules/.f/_/lodash/4.17.21/lodash/lodash.min.js");
 
@@ -60867,8 +61047,8 @@ function prePackObj(pkg, config = {}) {
     _.set(pkg, "scripts.postpack", "publish-util-postpack");
   }
 
-  if (pkg.scripts.prepublishOnly === "publish-util-prepublishonly" || pkg.scripts.prepublishOnly === "publish-util-prepack") {
-    delete pkg.scripts.prepublishOnly;
+  if (pkg.scripts.prepack === "publish-util-prepack") {
+    delete pkg.scripts.prepack;
   }
 
   if (keepObj) {
@@ -60905,7 +61085,7 @@ exports.prePack = async function prePack() {
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/publish-util/1.3.2/publish-util/lib/utils.js":
+/***/ "./node_modules/.f/_/publish-util/2.0.0/publish-util/lib/utils.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -90701,7 +90881,7 @@ var done = function (warnings, errors) {
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/visual-exec/0.1.13/visual-exec/lib/get-default-logger.js":
+/***/ "./node_modules/.f/_/visual-exec/0.1.14/visual-exec/lib/get-default-logger.js":
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
 "use strict";
@@ -90732,7 +90912,7 @@ module.exports = getLogger;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/visual-exec/0.1.13/visual-exec/lib/visual-exec.js":
+/***/ "./node_modules/.f/_/visual-exec/0.1.14/visual-exec/lib/visual-exec.js":
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
 "use strict";
@@ -90743,7 +90923,7 @@ const xsh = __webpack_require__("./node_modules/.f/_/xsh/0.4.5/xsh/lib/index.js"
 
 const chalk = __webpack_require__("./node_modules/.f/_/chalk/4.1.2/chalk/source/index.js");
 
-const getDefaultLogger = __webpack_require__("./node_modules/.f/_/visual-exec/0.1.13/visual-exec/lib/get-default-logger.js");
+const getDefaultLogger = __webpack_require__("./node_modules/.f/_/visual-exec/0.1.14/visual-exec/lib/get-default-logger.js");
 
 const VisualLogger = __webpack_require__("./node_modules/.f/_/visual-logger/1.1.3/visual-logger/lib/visual-logger.js");
 
@@ -90780,6 +90960,7 @@ class VisualExec {
     this._maxBuffer = maxBuffer;
     this._forceStderr = forceStderr;
     this._checkStdoutError = checkStdoutError === true ? /error|warn|fatal|unhandled|reject|exception|failure|fail|failed/i : checkStdoutError;
+    this._startTime = Date.now();
   }
 
   _makeTitle(command) {
@@ -90897,7 +91078,10 @@ class VisualExec {
 
       output = err.output;
     } else {
-      this._logger.info(`Done ${this._logLabel} ${chalk.green("exit code 0")}`);
+      const time = ((Date.now() - this._startTime) / 1000).toFixed(2);
+      const dispTime = `${chalk.magenta(time)}secs`;
+
+      this._logger.info(`Done ${this._logLabel} ${dispTime} ${chalk.green("exit code 0")}`);
     }
 
     this.logFinalOutput(err, output);
@@ -90934,6 +91118,7 @@ class VisualExec {
   }
 
   execute(command) {
+    this._startTime = Date.now();
     const child = xsh.exec({
       silent: true,
       cwd: this._cwd,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fyn",
-  "version": "1.1.14",
+  "version": "1.1.18",
   "description": "A node package manager, fast, workspace, and better productivity and efficiency",
   "main": "./bin/fyn.js",
   "homepage": "https://www.electrode.io/fynpo/",
@@ -13,7 +13,7 @@
     "coverage": "xrun xarc/check",
     "ci:check": "xrun xarc/check",
     "coveralls": "cat coverage/lcov.info | coveralls",
-    "prepublishOnly": "xrun xarc/check compile-yarn bundle && publish-util-prepublishonly",
+    "prepublishOnly": "xrun build",
     "postpack": "publish-util-postpack"
   },
   "bin": {