fyn 1.1.31 → 1.1.34

package/dist/fyn.js

@@ -1073,13 +1073,21 @@ class FynCli {
       }
     }));
 
-    const env = npmLifecycle.initEnv(process.env, this.fyn.production);
+    const env = npmLifecycle.initEnv(process.env, this.fyn.production); // add fynpo top dir node_modules/.bin to PATH
+
+    if (this._config._fynpo.config) {
+      xsh.envPath.addToFront(Path.join(this._config._fynpo.dir, "node_modules/.bin"), env);
+    }
+
     setupNodeGypEnv(env);
     return Promise.each(_scripts, s => _.get(pkg, ["scripts", s]) && this.runScript(pkg, s, Object.assign({}, env)));
   }
 
   async run(argv, script = "") {
-    this._config._fynpo = false;
+    if (!this._config._fynpo) {
+      this._config._fynpo = {};
+    }
+
     script = script || argv.args.script;
 
     if (argv.opts.list || !script) {
@@ -1138,7 +1146,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);
@@ -1192,6 +1224,8 @@ function loadRc(cwd, fynpoDir) {
 
   const npmrc = _.merge.apply(_, [{}, npmConfig.defaults].concat(npmrcData));
 
+  replaceRcEnv(all, process.env);
+  replaceRcEnv(npmrc, process.env);
   return {
     all,
     npmrc,
@@ -1313,7 +1347,8 @@ const pickOptions = async (argv, nixClap, checkFynpo = true) => {
   return {
     opts: argv.opts,
     rcData,
-    _cliSource: argv.source
+    _cliSource: argv.source,
+    _fynpo: fynpo
   };
 };
 
@@ -1600,7 +1635,8 @@ const commands = {
     usage: "$0 $1 <command> [-- <args>...]",
     exec: async (argv, parsed) => {
       try {
-        return await new FynCli(await pickOptions(argv, parsed.nixClap, !argv.opts.list)).run(argv);
+        const options = await pickOptions(argv, parsed.nixClap, !argv.opts.list);
+        return await new FynCli(options).run(argv);
       } catch (err) {
         if (err.errno !== undefined) {
           process.exit(err.errno);
@@ -2496,6 +2532,7 @@ const Crypto = __webpack_require__("crypto");
  *  ]
  * }
  * ```
+ *
  * @param {*} tree - the dir tree
  * @param {*} output - output object
  * @param {*} baseDir - base dir path
@@ -2638,7 +2675,7 @@ class FynCentral {
    *   to know if file changed.
    *
    * @param {*} integrity - shasum integrity for the package
-   * @returns
+   * @returns void
    */
 
 
@@ -2766,9 +2803,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,
@@ -2779,9 +2823,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];
@@ -2868,7 +2910,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);
 
@@ -4038,6 +4080,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 {};
@@ -4076,7 +4122,11 @@ class LifecycleScripts {
     // this._addNpmPackageConfig(this._appPkg.config, env);
     // this._addNpmPackageConfig(this._pkg.config, env);
     const env = Object.assign({}, npmConfigEnv(this._pkg, this._fyn.allrc || {}), override);
-    setupNodeGypEnv(env);
+    setupNodeGypEnv(env); // add fynpo node_modules/.bin to PATH
+
+    if (this._fyn.isFynpo) {
+      xsh.envPath.addToFront(Path.join(this._fyn._fynpo.dir, "node_modules/.bin"), env);
+    }
 
     if (this._appDir) {
       xsh.envPath.addToFront(Path.join(this._appDir, "node_modules/.bin"), env);
@@ -4155,7 +4205,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}`);
+    }
   }
 
 }
@@ -4197,11 +4252,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() {
@@ -4224,11 +4284,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();
@@ -4240,7 +4306,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
     //
@@ -4326,6 +4392,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}`;
@@ -4453,7 +4523,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;
 
@@ -4525,7 +4595,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");
 
@@ -5174,7 +5244,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; }
 
@@ -5722,7 +5792,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");
 
@@ -5762,7 +5832,7 @@ const {
 const {
   getDepSection,
   makeDepStep
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/index.js");
 
 const xaa = __webpack_require__("./lib/util/xaa.js");
 
@@ -6240,7 +6310,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'?
@@ -7578,13 +7648,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 {
@@ -7954,7 +8028,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`);
+      }
     }
   }
 
@@ -8254,7 +8332,7 @@ module.exports = PkgInstaller;
 
 "use strict";
 
-/* eslint-disable max-nested-callbacks */
+/* eslint-disable max-nested-callbacks, no-param-reassign */
 
 const assert = __webpack_require__("assert");
 
@@ -8653,7 +8731,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; }
 
@@ -8730,7 +8808,7 @@ const {
 
 const {
   PackageRef
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/index.js");
 
 const WATCH_TIME = 5000; // consider meta cache stale after this much time (30 minutes)
 
@@ -9499,7 +9577,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");
 
@@ -9748,7 +9826,7 @@ const {
 const {
   FynpoConfigManager,
   FynpoDepGraph
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/index.js");
 /* eslint-disable no-magic-numbers, max-statements, no-empty, complexity, no-eval */
 
 
@@ -10203,11 +10281,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);
 
@@ -10220,9 +10305,7 @@ async function generatePackTree(path, _logger = logger) {
 
     dir.split("/").forEach(d => {
       if (!dmap[d]) {
-        dmap[d] = {
-          [SYM_FILES]: []
-        };
+        dmap[d] = newDirObj();
       }
 
       dmap = dmap[d];
@@ -10501,7 +10584,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");
 
@@ -10613,6 +10696,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");
 
@@ -10841,7 +10925,7 @@ function localSplit(v) {
 
 
 function getAsFilepath(semver) {
-  if (semver.startsWith("file:")) {
+  if (semver.startsWith("file:") || semver.startsWith("link:")) {
     return semver.substr(5);
   }
 
@@ -10961,7 +11045,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;
@@ -11246,7 +11330,7 @@ module.exports = __webpack_require__("./node_modules/.f/_/xaa/1.7.0/xaa/dist/xaa
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/caching.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/caching.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11267,7 +11351,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.13-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
+const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
 /**
  * create a sha256 hash for some data
  *
@@ -11521,12 +11605,13 @@ async function processOutput({
   } //
 
 
+  const now = Date.now();
   return {
     files: allFiles,
     data,
     hash,
-    access: Date.now(),
-    create: Date.now()
+    access: now,
+    create: now
   };
 }
 
@@ -11534,7 +11619,7 @@ exports.processOutput = processOutput;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/fynpo-config.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/fynpo-config.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11684,7 +11769,7 @@ exports.FynpoConfigManager = FynpoConfigManager;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11714,9 +11799,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.13-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
+const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
 
-const util_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/util.js");
+const util_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-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 = {
@@ -12437,7 +12522,7 @@ exports.FynpoDepGraph = FynpoDepGraph;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/index.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/index.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -12459,12 +12544,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.13-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
+const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
 
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js"), exports);
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/fynpo-config.js"), exports);
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/util.js"), exports);
-exports.caching = (0, tslib_1.__importStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/caching.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"));
 /**
  * Take an array of packages and figure out their dependencies on each other
  *
@@ -12720,7 +12805,7 @@ exports.makePkgDeps = makePkgDeps;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/minimatch-group.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/minimatch-group.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -12772,7 +12857,7 @@ exports.groupMM = groupMM;
  * process a minimatch pattern to group them for matching directories
  *
  * - needs to create a new pattern at every non-string part
- * @param pattern
+ * @param m0 minimatch pattern
  */
 
 function deconstructMM(m0) {
@@ -12845,20 +12930,21 @@ function unrollMmMatch(path, mms) {
 
   for (let i = 0; i < parts.length - 1; i++) {
     rp = rp !== undefined ? rp + "/" + parts[i] : parts[i];
+    const m1 = checkMmMatch(`${rp}/`, mms);
 
-    if (checkMmMatch(`${rp}/`, mms)) {
-      return true;
+    if (m1) {
+      return m1;
     }
   }
 
-  return !!checkMmMatch(path, mms);
+  return checkMmMatch(path, mms);
 }
 
 exports.unrollMmMatch = unrollMmMatch;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.13-fynlocal_h/@fynpo/base/dist/util.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.14-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.31",
+  "version": "1.1.34",
   "description": "The package manager for fynpo, a zero setup monorepo manager",
   "main": "./bin/fyn.js",
   "homepage": "https://jchip.github.io/fynpo/",