fyn 1.1.29 → 1.1.32

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) {
@@ -1313,7 +1321,8 @@ const pickOptions = async (argv, nixClap, checkFynpo = true) => {
   return {
     opts: argv.opts,
     rcData,
-    _cliSource: argv.source
+    _cliSource: argv.source,
+    _fynpo: fynpo
   };
 };
 
@@ -1600,7 +1609,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);
@@ -4076,7 +4086,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);
@@ -5762,7 +5776,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");
 
@@ -7953,10 +7967,8 @@ class PkgInstaller {
   }
 
   async _buildLocalPkg(depInfo) {
-    if (this._fyn._localPkgBuilder) {
+    if (this._fyn._options.buildLocal && this._fyn._localPkgBuilder) {
       await this._fyn._localPkgBuilder.waitForItem(depInfo.dir);
-    } else {
-      logger.error("pkg-installer: there is no this._fyn._localPkgBuilder");
     }
   }
 
@@ -8732,7 +8744,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 +9275,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 +9286,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 +9299,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 +9762,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 */
 
 
@@ -11246,7 +11260,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 +11269,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");
 
@@ -11266,6 +11280,8 @@ const lodash_1 = (0, tslib_1.__importDefault)(__webpack_require__("./node_module
 const fs_1 = (0, tslib_1.__importDefault)(__webpack_require__("fs"));
 const path_1 = (0, tslib_1.__importDefault)(__webpack_require__("path"));
 const crypto_1 = (0, tslib_1.__importDefault)(__webpack_require__("crypto"));
+
+const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
 /**
  * create a sha256 hash for some data
  *
@@ -11273,19 +11289,40 @@ const crypto_1 = (0, tslib_1.__importDefault)(__webpack_require__("crypto"));
  * @returns
  */
 
+
 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
  *
@@ -11346,17 +11383,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
  *
@@ -11368,21 +11394,46 @@ 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;
     }
 
     return true;
   };
 
+  const dirIncludes = includes.map(mx => (0, minimatch_group_1.deconstructMM)(mx));
+
+  const filterDir = (_file, _path, extras) => {
+    const dir = `${extras.dirFile}/`; // add extra / to force matching directory
+
+    const inc = dirIncludes.find(di => (0, minimatch_group_1.checkMmMatch)(dir, di.mms));
+
+    if (inc) {
+      const exc = (0, minimatch_group_1.checkMmMatch)(dir, excludes);
+
+      if (!exc) {
+        return true;
+      }
+    }
+
+    return false;
+  };
+
   return (await (0, filter_scan_dir_1.filterScanDir)({
     cwd,
     filter,
-    filterDir: filter,
+    filterDir,
     fullStat: false,
     concurrency: 500
   })).sort();
 }
+/**
+ * process caching input rules and return result from it
+ *
+ * @param param0
+ * @returns result from processing input rules
+ */
+
 
 async function processInput({
   cwd,
@@ -11392,7 +11443,7 @@ async function processInput({
 } = {
   input: {}
 }) {
-  const files = await scanFiles(cwd, makeMmPatterns(input.include), makeMmPatterns(input.exclude));
+  const files = await scanFiles(cwd, makeMmPatterns(input.include, input.minimatchOptions), makeMmPatterns(input.exclude, input.minimatchOptions));
   const fileHashes = await hashFiles(cwd, files);
   const data = {
     env: lodash_1.default.pick(process.env, input.includeEnv),
@@ -11412,6 +11463,7 @@ async function processInput({
 
 exports.processInput = processInput;
 /**
+ * process lifecycle caching input rules
  *
  * @param param0
  * @returns
@@ -11440,7 +11492,7 @@ async function processLifecycleInput({
 
 exports.processLifecycleInput = processLifecycleInput;
 /**
- * Process build cache output file config.
+ * Process build cache output rules.
  *
  * @param param0
  * @returns
@@ -11455,11 +11507,11 @@ async function processOutput({
 } = {
   output: {}
 }) {
-  const mmIncludes = makeMmPatterns(output.include);
-  const mmExcludes = makeMmPatterns(output.exclude);
+  const mmIncludes = makeMmPatterns(output.include, output.minimatchOptions);
+  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;
     }
 
@@ -11483,12 +11535,13 @@ async function processOutput({
   } //
 
 
+  const now = Date.now();
   return {
     files: allFiles,
     data,
     hash,
-    access: Date.now(),
-    create: Date.now()
+    access: now,
+    create: now
   };
 }
 
@@ -11496,7 +11549,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";
@@ -11646,7 +11699,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";
@@ -11676,9 +11729,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 = {
@@ -12399,7 +12452,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";
@@ -12421,12 +12474,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
  *
@@ -12682,8 +12735,8 @@ exports.makePkgDeps = makePkgDeps;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.12-fynlocal_h/@fynpo/base/dist/minimatch-group.js":
-/***/ ((__unused_webpack_module, exports) => {
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.14-fynlocal_h/@fynpo/base/dist/minimatch-group.js":
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
@@ -12691,7 +12744,12 @@ exports.makePkgDeps = makePkgDeps;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-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
  *
@@ -12725,10 +12783,98 @@ function groupMM(mms, groups) {
 }
 
 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 m0 minimatch pattern
+ */
+
+function deconstructMM(m0) {
+  const mms = [];
+  const patterns = {
+    m0,
+    mms
+  };
+  const set = m0.set[0];
+  const globParts = m0.globParts[0];
+  const iParts = [];
+  const {
+    GLOBSTAR
+  } = minimatch_1.default;
+
+  for (let ix = 0; ix < set.length; ix++) {
+    const s = set[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" && iParts.length > 0) {
+      mms.push(new minimatch_1.default.Minimatch(iParts.join("/"), m0.options));
+    }
+
+    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) {
+      // a pattern ending in GLOBSTAR will match anything
+      break;
+    }
+  }
+
+  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.29",
+  "version": "1.1.32",
   "description": "The package manager for fynpo, a zero setup monorepo manager",
   "main": "./bin/fyn.js",
   "homepage": "https://jchip.github.io/fynpo/",