fyn 1.1.24 → 1.1.25

package/dist/fyn.js

@@ -5753,7 +5753,7 @@ const {
 const {
   getDepSection,
   makeDepStep
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.8-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.9-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.8-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.9-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.8-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.9-fynlocal_h/@fynpo/base/dist/index.js");
 /* eslint-disable no-magic-numbers, max-statements, no-empty, complexity, no-eval */
 
 
@@ -11237,7 +11237,248 @@ module.exports = __webpack_require__("./node_modules/.f/_/xaa/1.7.0/xaa/dist/xaa
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.8-fynlocal_h/@fynpo/base/dist/fynpo-config.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.9-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"));
+/**
+ * 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 = crypto_1.default.createHash("sha256").update(data).digest(encoding);
+  return hash;
+}
+/**
+ * create a sha256 hash for some data
+ *
+ * @param data
+ * @returns
+ */
+
+
+function hashData(data, encoding = "base64url") {
+  return crypto_1.default.createHash("sha256").update(data).digest(encoding);
+}
+/**
+ * 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.9-fynlocal_h/@fynpo/base/dist/fynpo-config.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11387,7 +11628,7 @@ exports.FynpoConfigManager = FynpoConfigManager;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.8-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.9-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11411,14 +11652,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.5/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.8-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
+const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.9-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
 
-const util_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.8-fynlocal_h/@fynpo/base/dist/util.js");
+const util_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.9-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 +11975,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 +12010,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 +12381,7 @@ exports.FynpoDepGraph = FynpoDepGraph;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.8-fynlocal_h/@fynpo/base/dist/index.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.9-fynlocal_h/@fynpo/base/dist/index.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -12147,7 +12390,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 +12398,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.5/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.8-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
+const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.9-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
 
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.8-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js"), exports);
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.8-fynlocal_h/@fynpo/base/dist/fynpo-config.js"), exports);
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.8-fynlocal_h/@fynpo/base/dist/util.js"), exports);
+(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.9-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js"), exports);
+(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.9-fynlocal_h/@fynpo/base/dist/fynpo-config.js"), exports);
+(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.9-fynlocal_h/@fynpo/base/dist/util.js"), exports);
+exports.caching = (0, tslib_1.__importStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.9-fynlocal_h/@fynpo/base/dist/caching.js"));
 /**
  * Take an array of packages and figure out their dependencies on each other
  *
@@ -12279,9 +12524,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 +12539,7 @@ async function readFynpoPackages({
     }));
   }
 
-  const allFiles = [].concat(...files);
+  const allFiles = [].concat(...files).sort();
   const allPkgs = {};
 
   for (const pkgFile of allFiles) {
@@ -12418,7 +12664,7 @@ exports.makePkgDeps = makePkgDeps;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.8-fynlocal_h/@fynpo/base/dist/minimatch-group.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.9-fynlocal_h/@fynpo/base/dist/minimatch-group.js":
 /***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
@@ -12464,7 +12710,7 @@ exports.groupMM = groupMM;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.8-fynlocal_h/@fynpo/base/dist/util.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.9-fynlocal_h/@fynpo/base/dist/util.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "fyn",
-  "version": "1.1.24",
-  "description": "A node package manager, fast, workspace, and better productivity and efficiency",
+  "version": "1.1.25",
+  "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": [