fyn 1.1.30 → 1.1.33

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);
@@ -4038,6 +4074,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 +4116,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 +4199,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 +4246,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 +4278,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 +4300,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 +4386,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}`;
@@ -5762,7 +5826,7 @@ const {
 const {
   getDepSection,
   makeDepStep
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.12-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 +6304,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,6 +7642,10 @@ 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,
@@ -7953,10 +8021,12 @@ class PkgInstaller {
   }
 
   async _buildLocalPkg(depInfo) {
-    if (this._fyn._localPkgBuilder) {
-      await this._fyn._localPkgBuilder.waitForItem(depInfo.dir);
-    } else {
-      logger.error("pkg-installer: there is no this._fyn._localPkgBuilder");
+    if (this._fyn._options.buildLocal && this._fyn._localPkgBuilder) {
+      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`);
+      }
     }
   }
 
@@ -8732,7 +8802,7 @@ const {
 
 const {
   PackageRef
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.12-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)
 
@@ -9263,7 +9333,8 @@ class PkgSrcManager {
       const packument = cached && cached.data && JSON.parse(cached.data);
       foundCache = cached;
       const stale = Date.now() - cached.refreshTime;
-      logger.debug("found", pkgName, "packument cache, refreshTime", cached.refreshTime, "since", (stale / 1000).toFixed(2), "secs");
+      const since = (stale / 1000).toFixed(2);
+      logger.debug(`found packument cache for '${pkgName}' - refreshed ${since}secs ago at ${cached.refreshTime}`);
 
       if (this._fyn._options.refreshMeta !== true && cached && cached.refreshTime && stale < META_CACHE_STALE_TIME) {
         cacheMemoized = true;
@@ -9273,7 +9344,7 @@ class PkgSrcManager {
         const encKey = encodeURIComponent(cacheKey);
         return nodeFetch(`${metaMemoizeUrl}?key=${encKey}`).then(res => {
           if (res.status === 200) {
-            logger.debug(pkgName, "using memoized packument cache");
+            logger.debug(`using memoized packument cache for '${pkgName}'`);
             cacheMemoized = true;
             this._metaStat.wait--;
             return packument;
@@ -9286,7 +9357,8 @@ class PkgSrcManager {
       }
     }).catch(err => {
       if (foundCache) {
-        logger.debug("fail to process packument cache", err.message, "data", foundCache.data && foundCache.data.toString());
+        const data = foundCache.data && foundCache.data.toString();
+        logger.debug(`fail to process packument cache - ${err.message}; data ${data}`);
         throw err;
       }
 
@@ -9748,7 +9820,7 @@ const {
 const {
   FynpoConfigManager,
   FynpoDepGraph
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.12-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 */
 
 
@@ -10841,7 +10913,7 @@ function localSplit(v) {
 
 
 function getAsFilepath(semver) {
-  if (semver.startsWith("file:")) {
+  if (semver.startsWith("file:") || semver.startsWith("link:")) {
     return semver.substr(5);
   }
 
@@ -10961,7 +11033,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 +11318,7 @@ module.exports = __webpack_require__("./node_modules/.f/_/xaa/1.7.0/xaa/dist/xaa
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.12-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";
@@ -11255,7 +11327,7 @@ module.exports = __webpack_require__("./node_modules/.f/_/xaa/1.7.0/xaa/dist/xaa
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.processOutput = exports.processLifecycleInput = exports.processInput = void 0;
+exports.processOutput = exports.processLifecycleInput = exports.processInput = exports.readHashDigest = void 0;
 
 const tslib_1 = __webpack_require__("./node_modules/.f/_/tslib/2.1.0/tslib/tslib.es6.js");
 
@@ -11267,7 +11339,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.12-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
  *
@@ -11280,15 +11352,35 @@ function hashData1(data, encoding = "base64url") {
   return crypto_1.default.createHash("sha256").update(data).digest(encoding);
 }
 
+function makeBase64Url(hash) {
+  return hash.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+}
+
 function hashData2(data, encoding = "base64url") {
   if (encoding === "base64url") {
-    return hashData1(data, "base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+    return makeBase64Url(hashData1(data, "base64"));
   }
 
   return hashData1(data, encoding);
 }
 
-const hashData = typeof crypto_1.default.createHash("sha256").digest("base64url") === "string" ? hashData1 : hashData2;
+const hasBase64Url = typeof crypto_1.default.createHash("sha256").digest("base64url") === "string";
+const hashData = hasBase64Url ? hashData1 : hashData2;
+exports.readHashDigest = hasBase64Url ? (hash, encoding = "base64url") => {
+  hash.setEncoding(encoding);
+  hash.end();
+  return hash.read();
+} : (hash, encoding = "base64url") => {
+  if (encoding === "base64url") {
+    hash.setEncoding("base64");
+    hash.end();
+    return makeBase64Url(hash.read());
+  }
+
+  hash.setEncoding(encoding);
+  hash.end();
+  return hash.read();
+};
 /**
  * generate sha256 has of a file
  *
@@ -11349,17 +11441,6 @@ function makeMmPatterns(patterns, options = {
 }) {
   return [].concat(patterns).map(x => x && new minimatch_1.default.Minimatch(x, options)).filter(x => x);
 }
-/**
- *
- * @param fullPath
- * @param patterns
- * @returns
- */
-
-
-function checkMmMatch(fullPath, patterns) {
-  return !lodash_1.default.isEmpty(patterns) && patterns.find(patternMm => patternMm.match(fullPath));
-}
 /**
  * Scan for files using include and exclude patterns
  *
@@ -11371,7 +11452,7 @@ function checkMmMatch(fullPath, patterns) {
 
 async function scanFiles(cwd, includes, excludes) {
   const filter = (_file, _path, extras) => {
-    if (!checkMmMatch(extras.dirFile, includes) || checkMmMatch(extras.dirFile, excludes)) {
+    if (!(0, minimatch_group_1.checkMmMatch)(extras.dirFile, includes) || (0, minimatch_group_1.checkMmMatch)(extras.dirFile, excludes)) {
       return false;
     }
 
@@ -11381,19 +11462,19 @@ async function scanFiles(cwd, includes, excludes) {
   const dirIncludes = includes.map(mx => (0, minimatch_group_1.deconstructMM)(mx));
 
   const filterDir = (_file, _path, extras) => {
-    const inc = dirIncludes.find(di => checkMmMatch(extras.dirFile, di.mms));
+    const dir = `${extras.dirFile}/`; // add extra / to force matching directory
 
-    if (!inc) {
-      return false;
-    }
+    const inc = dirIncludes.find(di => (0, minimatch_group_1.checkMmMatch)(dir, di.mms));
 
-    const exc = checkMmMatch(extras.dirFile, excludes);
+    if (inc) {
+      const exc = (0, minimatch_group_1.checkMmMatch)(dir, excludes);
 
-    if (exc) {
-      return false;
+      if (!exc) {
+        return true;
+      }
     }
 
-    return true;
+    return false;
   };
 
   return (await (0, filter_scan_dir_1.filterScanDir)({
@@ -11488,7 +11569,7 @@ async function processOutput({
   const mmExcludes = makeMmPatterns(output.exclude, output.minimatchOptions);
   const files = await scanFiles(cwd, mmIncludes, mmExcludes);
   preFiles = [].concat(preFiles).filter(x => {
-    if (!x || checkMmMatch(x, mmExcludes)) {
+    if (!x || (0, minimatch_group_1.unrollMmMatch)(x, mmExcludes)) {
       return false;
     }
 
@@ -11512,12 +11593,13 @@ async function processOutput({
   } //
 
 
+  const now = Date.now();
   return {
     files: allFiles,
     data,
     hash,
-    access: Date.now(),
-    create: Date.now()
+    access: now,
+    create: now
   };
 }
 
@@ -11525,7 +11607,7 @@ exports.processOutput = processOutput;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.12-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";
@@ -11675,7 +11757,7 @@ exports.FynpoConfigManager = FynpoConfigManager;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.12-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";
@@ -11705,9 +11787,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.12-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.12-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 = {
@@ -12428,7 +12510,7 @@ exports.FynpoDepGraph = FynpoDepGraph;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.12-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";
@@ -12450,12 +12532,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.12-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.12-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js"), exports);
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.12-fynlocal_h/@fynpo/base/dist/fynpo-config.js"), exports);
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.12-fynlocal_h/@fynpo/base/dist/util.js"), exports);
-exports.caching = (0, tslib_1.__importStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.12-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
  *
@@ -12711,7 +12793,7 @@ exports.makePkgDeps = makePkgDeps;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.12-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";
@@ -12720,11 +12802,12 @@ exports.makePkgDeps = makePkgDeps;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.deconstructMM = exports.groupMM = void 0;
+exports.unrollMmMatch = exports.checkMmMatch = exports.deconstructMM = exports.groupMM = void 0;
 
 const tslib_1 = __webpack_require__("./node_modules/.f/_/tslib/2.1.0/tslib/tslib.es6.js");
 
 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"));
 /**
  * process a list of minimatch objects and group them by the string prefix of their patterns
  *
@@ -12762,7 +12845,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) {
@@ -12778,35 +12861,78 @@ function deconstructMM(m0) {
     GLOBSTAR
   } = minimatch_1.default;
 
-  for (let ix = 0; ix < set.length - 1; ix++) {
+  for (let ix = 0; ix < set.length; ix++) {
     const s = set[ix];
-    const g = globParts[ix];
+    const g = globParts[ix]; // if we hit something that's not string, then we need a mm with just the strings
+    // because a dir like "src" will not match "src/*"
 
-    if (typeof s !== "string" && s !== GLOBSTAR && iParts.length > 0) {
+    if (typeof s !== "string" && iParts.length > 0) {
       mms.push(new minimatch_1.default.Minimatch(iParts.join("/"), m0.options));
     }
 
-    iParts.push(g);
-
-    if (typeof s !== "string") {
-      mms.push(new minimatch_1.default.Minimatch(iParts.join("/"), m0.options));
-    } // a pattern ending in GLOBSTAR will match anything
+    if (ix === set.length - 1) {
+      mms.push(m0);
+      break;
+    } else {
+      iParts.push(g);
 
+      if (typeof s !== "string") {
+        mms.push(new minimatch_1.default.Minimatch(iParts.join("/"), m0.options));
+      }
+    }
 
     if (s === GLOBSTAR) {
-      return patterns;
+      // a pattern ending in GLOBSTAR will match anything
+      break;
     }
   }
 
-  mms.push(m0);
   return patterns;
 }
 
 exports.deconstructMM = deconstructMM;
+/**
+ * check that a path matches against a list of minimatch patterns
+ *
+ * @param fullPath
+ * @param patterns
+ * @returns the first pattern that match or false
+ */
+
+function checkMmMatch(fullPath, patterns) {
+  return !lodash_1.default.isEmpty(patterns) && patterns.find(patternMm => patternMm.match(fullPath));
+}
+
+exports.checkMmMatch = checkMmMatch;
+/**
+ * Take a full path and match each level of it to a list of minimatch patterns
+ *
+ * @param path
+ * @param mms
+ * @returns
+ */
+
+function unrollMmMatch(path, mms) {
+  const parts = path.split("/");
+  let rp;
+
+  for (let i = 0; i < parts.length - 1; i++) {
+    rp = rp !== undefined ? rp + "/" + parts[i] : parts[i];
+    const m1 = checkMmMatch(`${rp}/`, mms);
+
+    if (m1) {
+      return m1;
+    }
+  }
+
+  return checkMmMatch(path, mms);
+}
+
+exports.unrollMmMatch = unrollMmMatch;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.12-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.30",
+  "version": "1.1.33",
   "description": "The package manager for fynpo, a zero setup monorepo manager",
   "main": "./bin/fyn.js",
   "homepage": "https://jchip.github.io/fynpo/",