fyn 1.1.23 → 1.1.26

package/dist/fyn.js

@@ -2471,7 +2471,7 @@ const {
   AggregateError
 } = __webpack_require__("./node_modules/.f/_/@jchip/error/1.0.3/@jchip/error/dist/index.js");
 
-const filterScanDir = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.0/filter-scan-dir/lib/index.js");
+const filterScanDir = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.5/filter-scan-dir/lib/index.js");
 
 const Crypto = __webpack_require__("crypto");
 /**
@@ -5753,7 +5753,7 @@ const {
 const {
   getDepSection,
   makeDepStep
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.10-fynlocal_h/@fynpo/base/dist/index.js");
 
 const xaa = __webpack_require__("./lib/util/xaa.js");
 
@@ -8723,7 +8723,7 @@ const {
 
 const {
   PackageRef
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.10-fynlocal_h/@fynpo/base/dist/index.js");
 
 const WATCH_TIME = 5000; // consider meta cache stale after this much time (30 minutes)
 
@@ -9739,7 +9739,7 @@ const {
 const {
   FynpoConfigManager,
   FynpoDepGraph
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.10-fynlocal_h/@fynpo/base/dist/index.js");
 /* eslint-disable no-magic-numbers, max-statements, no-empty, complexity, no-eval */
 
 
@@ -11170,7 +11170,7 @@ const Path = __webpack_require__("path");
 
 const mm = __webpack_require__("./node_modules/.f/_/minimatch/3.0.4/minimatch/minimatch.js");
 
-const filterScanDir = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.0/filter-scan-dir/lib/index.js");
+const filterScanDir = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.5/filter-scan-dir/lib/index.js");
 
 async function _scanFileStats(dir, ignores, baseDir = "") {
   const ignore = fullPath => ignores.find(pattern => mm(fullPath, pattern, {
@@ -11237,7 +11237,257 @@ module.exports = __webpack_require__("./node_modules/.f/_/xaa/1.7.0/xaa/dist/xaa
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/fynpo-config.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.10-fynlocal_h/@fynpo/base/dist/caching.js":
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.processOutput = exports.processLifecycleInput = exports.processInput = void 0;
+
+const tslib_1 = __webpack_require__("./node_modules/.f/_/tslib/2.1.0/tslib/tslib.es6.js");
+
+const filter_scan_dir_1 = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.5/filter-scan-dir/lib/index.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"));
+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"));
+/**
+ * create a sha256 hash for some data
+ *
+ * @param data
+ * @returns
+ */
+
+function hashData1(data, encoding = "base64url") {
+  return crypto_1.default.createHash("sha256").update(data).digest(encoding);
+}
+
+function hashData2(data, encoding = "base64url") {
+  if (encoding === "base64url") {
+    return hashData1(data, "base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+  }
+
+  return crypto_1.default.createHash("sha256").update(data).digest(encoding);
+}
+
+const hashData = typeof crypto_1.default.createHash("sha256").digest("base64url") === "string" ? hashData1 : hashData2;
+/**
+ * generate sha256 has of a file
+ *
+ * @param filename
+ * @returns
+ */
+
+async function hashFile(filename, encoding = "base64url") {
+  const data = await fs_1.default.promises.readFile(filename);
+  const hash = hashData(data, encoding);
+  return hash;
+}
+/**
+ * generate hash for an array of files
+ *
+ * @param files
+ * @returns object with each file point to its hash
+ */
+
+
+async function hashFiles(cwd, files, encoding = "base64url") {
+  const hashes = {};
+  const promises = [];
+
+  for (const file of files) {
+    promises.push(hashFile(path_1.default.join(cwd, file), encoding).then(h => hashes[file] = h));
+  }
+
+  await Promise.all(promises);
+  const result = {};
+
+  for (const file of files) {
+    result[file] = hashes[file];
+  }
+
+  return result;
+}
+/**
+ *
+ * @param cwd
+ * @returns
+ */
+
+
+async function readPackageJson(cwd) {
+  return JSON.parse(await fs_1.default.promises.readFile(path_1.default.join(cwd, "package.json"), "utf-8"));
+}
+/**
+ * Convert minimatch string patterns to Minimatch instances
+ *
+ * @param patterns
+ * @returns
+ */
+
+
+function makeMmPatterns(patterns, options = {
+  dot: true
+}) {
+  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
+ *
+ * @param cwd
+ * @param input
+ * @returns
+ */
+
+
+async function scanFiles(cwd, includes, excludes) {
+  const filter = (_file, _path, extras) => {
+    if (!checkMmMatch(extras.dirFile, includes) || checkMmMatch(extras.dirFile, excludes)) {
+      return false;
+    }
+
+    return true;
+  };
+
+  return (await (0, filter_scan_dir_1.filterScanDir)({
+    cwd,
+    filter,
+    filterDir: filter,
+    fullStat: false,
+    concurrency: 500
+  })).sort();
+}
+
+async function processInput({
+  cwd,
+  input,
+  packageJson,
+  extra
+} = {
+  input: {}
+}) {
+  const files = await scanFiles(cwd, makeMmPatterns(input.include), makeMmPatterns(input.exclude));
+  const fileHashes = await hashFiles(cwd, files);
+  const data = {
+    env: lodash_1.default.pick(process.env, input.includeEnv),
+    versions: lodash_1.default.pick(process.versions, input.includeVersions),
+    npmScripts: lodash_1.default.pick(lodash_1.default.get(packageJson || (await readPackageJson(cwd)), "scripts"), input.npmScripts),
+    fileHashes,
+    extra: extra || "" // additional data
+
+  };
+  const hash = hashData(JSON.stringify(data));
+  return {
+    files,
+    data,
+    hash
+  };
+}
+
+exports.processInput = processInput;
+/**
+ *
+ * @param param0
+ * @returns
+ */
+
+async function processLifecycleInput({
+  cwd,
+  input,
+  packageJson
+} = {
+  input: {}
+}) {
+  packageJson = packageJson || (await readPackageJson(cwd));
+  const npmScripts = lodash_1.default.pick(lodash_1.default.get(packageJson, "scripts"), input.npmScripts);
+
+  if (lodash_1.default.isEmpty(npmScripts)) {
+    return {};
+  }
+
+  return await processInput({
+    cwd,
+    input,
+    packageJson
+  });
+}
+
+exports.processLifecycleInput = processLifecycleInput;
+/**
+ * Process build cache output file config.
+ *
+ * @param param0
+ * @returns
+ */
+
+async function processOutput({
+  cwd,
+  inputHash,
+  calcHash,
+  output,
+  preFiles
+} = {
+  output: {}
+}) {
+  const mmIncludes = makeMmPatterns(output.include);
+  const mmExcludes = makeMmPatterns(output.exclude);
+  const files = await scanFiles(cwd, mmIncludes, mmExcludes);
+  preFiles = [].concat(preFiles).filter(x => {
+    if (!x || checkMmMatch(x, mmExcludes)) {
+      return false;
+    }
+
+    return true;
+  }).map(x => x.replace(`${cwd}${path_1.default.sep}`, ""));
+  let hash = "";
+  let fileHashes = {};
+  const allFiles = lodash_1.default.uniq(files.concat(preFiles)).sort();
+  let data = {
+    inputHash,
+    fileHashes
+  }; //
+
+  if (calcHash) {
+    fileHashes = await hashFiles(cwd, allFiles);
+    data = {
+      inputHash,
+      fileHashes
+    };
+    hash = hashData(JSON.stringify(data));
+  } //
+
+
+  return {
+    files: allFiles,
+    data,
+    hash,
+    access: Date.now(),
+    create: Date.now()
+  };
+}
+
+exports.processOutput = processOutput;
+
+/***/ }),
+
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.10-fynlocal_h/@fynpo/base/dist/fynpo-config.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11387,7 +11637,7 @@ exports.FynpoConfigManager = FynpoConfigManager;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.10-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11411,14 +11661,15 @@ const path_1 = (0, tslib_1.__importDefault)(__webpack_require__("path"));
 
 const fs_1 = __webpack_require__("fs");
 
-const filter_scan_dir_1 = (0, tslib_1.__importDefault)(__webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.0/filter-scan-dir/lib/index.js"));
+const filter_scan_dir_1 = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.5/filter-scan-dir/lib/index.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"));
 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.7-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
+const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.10-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
 
-const util_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/util.js");
+const util_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.10-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 = {
@@ -11733,9 +11984,10 @@ class FynpoDepGraph {
     const files = [];
 
     for (const prefix in groups) {
-      const scanned = await (0, filter_scan_dir_1.default)({
+      const scanned = await (0, filter_scan_dir_1.filterScanDir)({
         cwd,
         prefix,
+        concurrency: 500,
         filter: (file, path) => {
           if (path && path !== "." && file === "package.json") {
             if (foundInAutoSearch(path)) {
@@ -11767,7 +12019,7 @@ class FynpoDepGraph {
       files.push(scanned);
     }
 
-    const allFiles = [].concat(...files); // Read each package.json and generate PackageInfo for it
+    const allFiles = [].concat(...files).sort(); // Read each package.json and generate PackageInfo for it
 
     for (const pkgFile of allFiles) {
       await this.addPackageByFile(pkgFile);
@@ -12138,7 +12390,7 @@ exports.FynpoDepGraph = FynpoDepGraph;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/index.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.10-fynlocal_h/@fynpo/base/dist/index.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -12147,7 +12399,7 @@ exports.FynpoDepGraph = FynpoDepGraph;
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.makePkgDeps = exports.readFynpoPackages = void 0;
+exports.makePkgDeps = exports.readFynpoPackages = exports.caching = void 0;
 
 const tslib_1 = __webpack_require__("./node_modules/.f/_/tslib/2.1.0/tslib/tslib.es6.js");
 
@@ -12155,15 +12407,17 @@ const path_1 = (0, tslib_1.__importDefault)(__webpack_require__("path"));
 
 const fs_1 = __webpack_require__("fs");
 
-const filter_scan_dir_1 = (0, tslib_1.__importDefault)(__webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.0/filter-scan-dir/lib/index.js"));
+const filter_scan_dir_1 = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.5/filter-scan-dir/lib/index.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"));
 
-const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
+const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.10-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
 
-(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);
+(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.10-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js"), exports);
+(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.10-fynlocal_h/@fynpo/base/dist/fynpo-config.js"), exports);
+(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.10-fynlocal_h/@fynpo/base/dist/util.js"), exports);
+exports.caching = (0, tslib_1.__importStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.10-fynlocal_h/@fynpo/base/dist/caching.js"));
 /**
  * Take an array of packages and figure out their dependencies on each other
  *
@@ -12279,9 +12533,10 @@ async function readFynpoPackages({
   const files = [];
 
   for (const prefix in groups) {
-    files.push(await (0, filter_scan_dir_1.default)({
+    files.push(await (0, filter_scan_dir_1.filterScanDir)({
       cwd,
       prefix,
+      concurrency: 500,
       filter: f => f === "package.json",
       filterDir: (dir, _p, extras) => {
         if (dir !== "node_modules") {
@@ -12293,7 +12548,7 @@ async function readFynpoPackages({
     }));
   }
 
-  const allFiles = [].concat(...files);
+  const allFiles = [].concat(...files).sort();
   const allPkgs = {};
 
   for (const pkgFile of allFiles) {
@@ -12418,7 +12673,7 @@ exports.makePkgDeps = makePkgDeps;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/minimatch-group.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.10-fynlocal_h/@fynpo/base/dist/minimatch-group.js":
 /***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
@@ -12464,7 +12719,7 @@ exports.groupMM = groupMM;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/util.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.10-fynlocal_h/@fynpo/base/dist/util.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -41701,7 +41956,7 @@ function entries(obj) {
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/filter-scan-dir/1.5.0/filter-scan-dir/dist/filter-scan-dir.js":
+/***/ "./node_modules/.f/_/filter-scan-dir/1.5.5/filter-scan-dir/dist/index.js":
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -41725,6 +41980,19 @@ const path_1 = __importDefault(__webpack_require__("path"));
 
 const util_1 = __importDefault(__webpack_require__("util"));
 
+const util_2 = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.5/filter-scan-dir/dist/util.js");
+/**
+ * create a new ExtrasData object
+ *
+ * @param file
+ * @param fullFile
+ * @param path
+ * @param stat
+ * @param options
+ * @returns
+ */
+
+
 function makeExtrasData(file, fullFile, path, stat, options) {
   const dirFile = options._join2(path, file);
 
@@ -41845,29 +42113,6 @@ function getResult(options) {
     files: []
   }, options.result) : options.result.files || [];
 }
-/**
- * compare Dirent for sorting
- *
- * @param a
- * @param b
- * @returns
- */
-
-
-const direntCmp = (a, b) => {
-  /* istanbul ignore next */
-  if (a.name === b.name) {
-    /* istanbul ignore next */
-    return 0;
-    /* istanbul ignore next */
-  } else if (a.name > b.name) {
-    /* istanbul ignore next */
-    return 1;
-  } else {
-    /* istanbul ignore next */
-    return -1;
-  }
-};
 /**
  * sync version of directory walk
  *
@@ -41888,7 +42133,7 @@ function walkSync(path, options, level = 0) {
       if (options.fullStat) {
         files = files.sort();
       } else {
-        files = files.sort(direntCmp);
+        files = files.sort(util_2.direntCmp);
       }
     }
 
@@ -41962,7 +42207,7 @@ async function walk(path, options, level = 0) {
       if (options.fullStat) {
         files = files.sort();
       } else {
-        files = files.sort(direntCmp);
+        files = files.sort(util_2.direntCmp);
       }
     }
 
@@ -42074,20 +42319,16 @@ function makeOptions(opts) {
   }; // `includeRoot` was renamed to `prependCwd`, this avoid breaking code still using that
 
 
-  const prependCwd = (options.hasOwnProperty("includeRoot") ? options.includeRoot : options.prependCwd) || false; // a simple and faster version of path.join that handles just 2
-  // arguments using posix separator
-
-  const _join2 = (a, b) => a && b ? a + sep + b : a ? a : b; // eslint-disable-line
-
-
+  const prependCwd = (options.hasOwnProperty("includeRoot") ? options.includeRoot : options.prependCwd) || false;
   const opts2 = Object.assign({
-    _join2,
+    _join2: undefined,
     maxLevel: Infinity,
     prefix: "",
     prependCwd,
     fullStat: true,
     concurrency: 50,
-    readdirOpts: undefined
+    readdirOpts: undefined,
+    grouping: undefined
   }, options, {
     dir: cwd,
     result: {},
@@ -42095,6 +42336,7 @@ function makeOptions(opts) {
     filterExt: [].concat(options.filterExt).map(cleanExt).filter(x => x),
     _concurrentCount: 0
   });
+  opts2._join2 = (0, util_2.makePathJoin2)(sep, opts2.dir, opts2.prefix);
 
   if (!opts2.fullStat) {
     opts2.readdirOpts = {
@@ -42104,12 +42346,6 @@ function makeOptions(opts) {
 
   return opts2;
 }
-/**
- * async version of filter scan dir
- * @param options
- * @returns
- */
-
 
 function filterScanDir(options = {}) {
   const options2 = makeOptions(options);
@@ -42117,7 +42353,6 @@ function filterScanDir(options = {}) {
 }
 
 exports.filterScanDir = filterScanDir;
-/** sync version of filter scan dir */
 
 function filterScanDirSync(options = {}) {
   const options2 = makeOptions(options);
@@ -42128,10 +42363,82 @@ exports.filterScanDirSync = filterScanDirSync;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/filter-scan-dir/1.5.0/filter-scan-dir/lib/index.js":
+/***/ "./node_modules/.f/_/filter-scan-dir/1.5.5/filter-scan-dir/dist/util.js":
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var __importDefault = this && this.__importDefault || function (mod) {
+  return mod && mod.__esModule ? mod : {
+    "default": mod
+  };
+};
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.makePathJoin2 = exports.direntCmp = void 0;
+
+const path_1 = __importDefault(__webpack_require__("path"));
+/* @ignore */
+
+/**
+ * compare Dirent for sorting
+ *
+ * @param a
+ * @param b
+ * @returns
+ * @ignore
+ */
+
+
+const direntCmp = (a, b) => {
+  if (a.name === b.name) {
+    return 0;
+  } else if (a.name > b.name) {
+    return 1;
+  } else {
+    return -1;
+  }
+};
+
+exports.direntCmp = direntCmp;
+/**
+ * Make a specialized and simple but faster version of path.join that handles just 2 args
+ */
+
+const makePathJoin2 = (sep, cwd, prefix) => {
+  // user passed cwd or prefix that contains ../ or ..\\, which only path.join
+  // can handle
+  if (["../", "..\\"].find(s => cwd.includes(s) || prefix.includes(s)) || cwd.startsWith(".") && cwd.length > 1 || prefix.startsWith(".") && prefix.length > 1) {
+    return path_1.default.join;
+  }
+
+  return (a, b) => {
+    if (a === ".") {
+      return b || a;
+    } else if (b === ".") {
+      return a || b;
+    } else if (a && b) {
+      return a + sep + b;
+    } else {
+      return a || b || ".";
+    }
+  };
+};
+
+exports.makePathJoin2 = makePathJoin2;
+
+/***/ }),
+
+/***/ "./node_modules/.f/_/filter-scan-dir/1.5.5/filter-scan-dir/lib/index.js":
 /***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
-const fsd = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.0/filter-scan-dir/dist/filter-scan-dir.js");
+"use strict";
+
+
+const fsd = __webpack_require__("./node_modules/.f/_/filter-scan-dir/1.5.5/filter-scan-dir/dist/index.js");
 
 const asyncApi = options => fsd.filterScanDir(options);
 
@@ -101619,7 +101926,7 @@ exports.chain = __webpack_require__("./node_modules/.f/_/slide/1.1.6/slide/lib/c
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/smart-buffer/4.1.0/smart-buffer/build/smartbuffer.js":
+/***/ "./node_modules/.f/_/smart-buffer/4.2.0/smart-buffer/build/smartbuffer.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -101629,7 +101936,7 @@ Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
 
-const utils_1 = __webpack_require__("./node_modules/.f/_/smart-buffer/4.1.0/smart-buffer/build/utils.js"); // The default Buffer size if one is not provided.
+const utils_1 = __webpack_require__("./node_modules/.f/_/smart-buffer/4.2.0/smart-buffer/build/utils.js"); // The default Buffer size if one is not provided.
 
 
 const DEFAULT_SMARTBUFFER_SIZE = 4096; // The default string encoding to use for reading/writing strings.
@@ -101664,7 +101971,7 @@ class SmartBuffer {
         } // Check for initial Buffer
 
       } else if (options.buff) {
-        if (options.buff instanceof Buffer) {
+        if (Buffer.isBuffer(options.buff)) {
           this._buff = options.buff;
           this.length = options.buff.length;
         } else {
@@ -103065,7 +103372,7 @@ exports.SmartBuffer = SmartBuffer;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/smart-buffer/4.1.0/smart-buffer/build/utils.js":
+/***/ "./node_modules/.f/_/smart-buffer/4.2.0/smart-buffer/build/utils.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -103413,7 +103720,7 @@ const debug_1 = __importDefault(__webpack_require__("./stubs/debug.js"));
 
 const agent_base_1 = __webpack_require__("./node_modules/.f/_/agent-base/6.0.2/agent-base/dist/src/index.js");
 
-const socks_1 = __webpack_require__("./node_modules/.f/_/socks/2.6.1/socks/build/index.js");
+const socks_1 = __webpack_require__("./node_modules/.f/_/socks/2.6.2/socks/build/index.js");
 
 const debug = debug_1.default('socks-proxy-agent');
 
@@ -103700,7 +104007,7 @@ const net = __webpack_require__("net");
 
 const ip = __webpack_require__("./node_modules/.f/_/ip/1.1.5/ip/lib/ip.js");
 
-const smart_buffer_1 = __webpack_require__("./node_modules/.f/_/smart-buffer/4.1.0/smart-buffer/build/smartbuffer.js");
+const smart_buffer_1 = __webpack_require__("./node_modules/.f/_/smart-buffer/4.2.0/smart-buffer/build/smartbuffer.js");
 
 const constants_1 = __webpack_require__("./node_modules/.f/_/socks/2.3.3/socks/build/common/constants.js");
 
@@ -104868,7 +105175,7 @@ __export(__webpack_require__("./node_modules/.f/_/socks/2.3.3/socks/build/client
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/socks/2.6.1/socks/build/client/socksclient.js":
+/***/ "./node_modules/.f/_/socks/2.6.2/socks/build/client/socksclient.js":
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -104917,15 +105224,15 @@ const net = __webpack_require__("net");
 
 const ip = __webpack_require__("./node_modules/.f/_/ip/1.1.5/ip/lib/ip.js");
 
-const smart_buffer_1 = __webpack_require__("./node_modules/.f/_/smart-buffer/4.1.0/smart-buffer/build/smartbuffer.js");
+const smart_buffer_1 = __webpack_require__("./node_modules/.f/_/smart-buffer/4.2.0/smart-buffer/build/smartbuffer.js");
 
-const constants_1 = __webpack_require__("./node_modules/.f/_/socks/2.6.1/socks/build/common/constants.js");
+const constants_1 = __webpack_require__("./node_modules/.f/_/socks/2.6.2/socks/build/common/constants.js");
 
-const helpers_1 = __webpack_require__("./node_modules/.f/_/socks/2.6.1/socks/build/common/helpers.js");
+const helpers_1 = __webpack_require__("./node_modules/.f/_/socks/2.6.2/socks/build/common/helpers.js");
 
-const receivebuffer_1 = __webpack_require__("./node_modules/.f/_/socks/2.6.1/socks/build/common/receivebuffer.js");
+const receivebuffer_1 = __webpack_require__("./node_modules/.f/_/socks/2.6.2/socks/build/common/receivebuffer.js");
 
-const util_1 = __webpack_require__("./node_modules/.f/_/socks/2.6.1/socks/build/common/util.js");
+const util_1 = __webpack_require__("./node_modules/.f/_/socks/2.6.2/socks/build/common/util.js");
 
 Object.defineProperty(exports, "SocksClientError", ({
   enumerable: true,
@@ -104939,7 +105246,7 @@ class SocksClient extends events_1.EventEmitter {
     super();
     this.options = Object.assign({}, options); // Validate SocksClientOptions
 
-    helpers_1.validateSocksClientOptions(options); // Default state
+    (0, helpers_1.validateSocksClientOptions)(options); // Default state
 
     this.setState(constants_1.SocksClientState.Created);
   }
@@ -104957,7 +105264,7 @@ class SocksClient extends events_1.EventEmitter {
     return new Promise((resolve, reject) => {
       // Validate SocksClientOptions
       try {
-        helpers_1.validateSocksClientOptions(options, ['connect']);
+        (0, helpers_1.validateSocksClientOptions)(options, ['connect']);
       } catch (err) {
         if (typeof callback === 'function') {
           callback(err);
@@ -105007,7 +105314,7 @@ class SocksClient extends events_1.EventEmitter {
     return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
       // Validate SocksClientChainOptions
       try {
-        helpers_1.validateSocksClientChainOptions(options);
+        (0, helpers_1.validateSocksClientChainOptions)(options);
       } catch (err) {
         if (typeof callback === 'function') {
           callback(err);
@@ -105020,7 +105327,7 @@ class SocksClient extends events_1.EventEmitter {
       let sock; // Shuffle proxies
 
       if (options.randomizeChain) {
-        util_1.shuffleArray(options.proxies);
+        (0, util_1.shuffleArray)(options.proxies);
       }
 
       try {
@@ -105029,7 +105336,7 @@ class SocksClient extends events_1.EventEmitter {
           const nextProxy = options.proxies[i]; // If we've reached the last proxy in the chain, the destination is the actual destination, otherwise it's the next proxy.
 
           const nextDestination = i === options.proxies.length - 1 ? options.destination : {
-            host: options.proxies[i + 1].ipaddress,
+            host: options.proxies[i + 1].host || options.proxies[i + 1].ipaddress,
             port: options.proxies[i + 1].port
           }; // Creates the next connection in the chain.
 
@@ -105770,7 +106077,7 @@ exports.SocksClient = SocksClient;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/socks/2.6.1/socks/build/common/constants.js":
+/***/ "./node_modules/.f/_/socks/2.6.2/socks/build/common/constants.js":
 /***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
@@ -105906,7 +106213,7 @@ exports.SocksClientState = SocksClientState;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/socks/2.6.1/socks/build/common/helpers.js":
+/***/ "./node_modules/.f/_/socks/2.6.2/socks/build/common/helpers.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -105917,9 +106224,9 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.validateSocksClientChainOptions = exports.validateSocksClientOptions = void 0;
 
-const util_1 = __webpack_require__("./node_modules/.f/_/socks/2.6.1/socks/build/common/util.js");
+const util_1 = __webpack_require__("./node_modules/.f/_/socks/2.6.2/socks/build/common/util.js");
 
-const constants_1 = __webpack_require__("./node_modules/.f/_/socks/2.6.1/socks/build/common/constants.js");
+const constants_1 = __webpack_require__("./node_modules/.f/_/socks/2.6.2/socks/build/common/constants.js");
 
 const stream = __webpack_require__("stream");
 /**
@@ -106055,7 +106362,7 @@ function isValidTimeoutValue(value) {
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/socks/2.6.1/socks/build/common/receivebuffer.js":
+/***/ "./node_modules/.f/_/socks/2.6.2/socks/build/common/receivebuffer.js":
 /***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
@@ -106118,7 +106425,7 @@ exports.ReceiveBuffer = ReceiveBuffer;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/socks/2.6.1/socks/build/common/util.js":
+/***/ "./node_modules/.f/_/socks/2.6.2/socks/build/common/util.js":
 /***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
@@ -106158,7 +106465,7 @@ exports.shuffleArray = shuffleArray;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/socks/2.6.1/socks/build/index.js":
+/***/ "./node_modules/.f/_/socks/2.6.2/socks/build/index.js":
 /***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
@@ -106185,7 +106492,7 @@ Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
 
-__exportStar(__webpack_require__("./node_modules/.f/_/socks/2.6.1/socks/build/client/socksclient.js"), exports);
+__exportStar(__webpack_require__("./node_modules/.f/_/socks/2.6.2/socks/build/client/socksclient.js"), exports);
 
 /***/ }),
 

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "fyn",
-  "version": "1.1.23",
-  "description": "A node package manager, fast, workspace, and better productivity and efficiency",
+  "version": "1.1.26",
+  "description": "The package manager for fynpo, a zero setup monorepo manager",
   "main": "./bin/fyn.js",
-  "homepage": "https://www.electrode.io/fynpo/",
+  "homepage": "https://jchip.github.io/fynpo/",
   "license": "Apache-2.0",
   "scripts": {
     "test": "xrun xarc/test-only",
@@ -62,7 +62,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/electrode-io/fynpo.git",
+    "url": "https://github.com/jchip/fynpo.git",
     "directory": "packages/fyn"
   },
   "contributors": [