fyn 1.1.18 → 1.1.19

package/dist/fyn.js

@@ -2923,7 +2923,7 @@ const semverUtil = __webpack_require__("./lib/util/semver.js");
 
 const Fs = __webpack_require__("./lib/util/file-ops.js");
 
-const fyntil = __webpack_require__("./lib/util/fyntil.js");
+const fynTil = __webpack_require__("./lib/util/fyntil.js");
 
 const FynCentral = __webpack_require__("./lib/fyn-central.js");
 
@@ -2980,7 +2980,7 @@ class Fyn {
     const options = this._options = fynConfig(opts);
     this._layout = options.layout;
     this._cwd = options.cwd || process.cwd();
-    logger.debug(`fyn options`, JSON.stringify(fyntil.removeAuthInfo(options)));
+    logger.debug(`fyn options`, JSON.stringify(fynTil.removeAuthInfo(options)));
     this.localPkgWithNestedDep = [];
 
     if (options.lockTime) {
@@ -3071,13 +3071,21 @@ class Fyn {
     if (this._installConfig.centralDir) {
       centralDir = this._installConfig.centralDir;
       logger.debug(`Enabling central store using dir from install config ${centralDir}`);
-    } else if (process.env.FYN_CENTRAL_DIR) {
+    } else if (centralDir = process.env.FYN_CENTRAL_DIR) {
       // env wins
-      centralDir = process.env.FYN_CENTRAL_DIR;
-      logger.debug(`Enabling central store using dir from env FYN_CENTRAL_DIR ${centralDir}`);
+      if (fynTil.strToBool(centralDir) === false) {
+        logger.debug(`Disabling central store by env FYN_CENTRAL_DIR set to ${centralDir}`);
+        return this._central = false;
+      }
+
+      if (fynTil.isTrueStr(centralDir)) {
+        centralDir = Path.join(this.fynDir, "_central-storage");
+      }
+
+      logger.debug(`Enabling central store by env FYN_CENTRAL_DIR using dir ${centralDir}`);
     } else if (options.centralStore) {
       centralDir = Path.join(this.fynDir, "_central-storage");
-      logger.debug(`Enabling central store for flag using dir ${centralDir}`);
+      logger.debug(`Enabling central store by CLI flag using dir ${centralDir}`);
     } else if (!this._fynpo.config) {
       return this._central = false;
     } else {
@@ -3087,7 +3095,7 @@ class Fyn {
         centralDir = Path.join(this._fynpo.dir, ".fynpo", "_store");
       }
 
-      logger.info(`fynpo monorepo: enabling central dir ${centralDir}`);
+      logger.info(`Enabling central store by fynpo monorepo using dir ${centralDir}`);
     }
 
     return this._central = new FynCentral({
@@ -3144,7 +3152,7 @@ class Fyn {
 
   async _initializePkg() {
     if (!this._fynpo) {
-      this._fynpo = await fyntil.loadFynpo(this._cwd); // TODO: options from CLI should not be override by fynpo config options
+      this._fynpo = await fynTil.loadFynpo(this._cwd); // TODO: options from CLI should not be override by fynpo config options
 
       _.merge(this._options, _.get(this, "_fynpo.fyn.options"));
 
@@ -3242,7 +3250,7 @@ class Fyn {
         retryWait: 500
       });
       const path = posixify(Path.relative(this._fynpo.dir, this.cwd));
-      const fynpoData = await fyntil.readJson(dataFile, {
+      const fynpoData = await fynTil.readJson(dataFile, {
         indirects: {
           [path]: []
         }
@@ -3332,7 +3340,7 @@ class Fyn {
   }
 
   async loadPkgFyn() {
-    this._pkgFyn = await xaa.try(() => fyntil.readJson(Path.resolve(this._cwd, PACKAGE_FYN_JSON)));
+    this._pkgFyn = await xaa.try(() => fynTil.readJson(Path.resolve(this._cwd, PACKAGE_FYN_JSON)));
     return this._pkgFyn;
   }
 
@@ -3353,11 +3361,11 @@ class Fyn {
       this._pkgFile = pkgFile;
 
       try {
-        this._pkg = await fyntil.readPkgJson(pkgFile, true);
+        this._pkg = await fynTil.readPkgJson(pkgFile, true);
       } catch (err) {
         logger.error("failed to read package.json file", pkgFile);
         logger.error(err.message);
-        fyntil.exit(err);
+        fynTil.exit(err);
       }
 
       const pkgFyn = await this.loadPkgFyn(options);
@@ -3860,7 +3868,7 @@ class Fyn {
 
   async loadJsonForPkg(pkg, dir) {
     const fullOutDir = dir || this.getInstalledPkgDir(pkg.name, pkg.version, pkg);
-    const json = await fyntil.readPkgJson(fullOutDir, true);
+    const json = await fynTil.readPkgJson(fullOutDir, true);
     const pkgId = `${pkg.name}@${pkg.version}`;
     const id = `${json.name}@${json.version}`;
 
@@ -7702,7 +7710,7 @@ class PkgInstaller {
         const vdir = this._fyn.getInstalledPkgDir(depInfo.name, depInfo.version, depInfo);
 
         pkgJsonFp = Path.join(vdir, "package.json");
-        await Fs.unlink(pkgJsonFp);
+        await xaa.try(() => Fs.unlink(pkgJsonFp));
       } else {
         pkgJsonFp = Path.join(depInfo.dir, "package.json");
       }
@@ -10021,6 +10029,46 @@ const fyntil = {
 
     return true;
   },
+
+  /**
+   * Convert a string to a bool value.  Considering 0, off, false, no to be `false`, else true.
+   *
+   * @param {*} v
+   * @returns true or false
+   */
+  strToBool: v => {
+    if (!v) {
+      return false;
+    }
+
+    const lv = v.toLowerCase();
+
+    if (lv === "0" || lv === "off" || lv === "false" || lv === "no") {
+      return false;
+    }
+
+    return true;
+  },
+
+  /**
+   * Check if a string looks like a true bool value, considering 1, on, true, yes to be `true`, else `false`
+   *
+   * @param {*} v
+   * @returns true or false
+   */
+  isTrueStr: v => {
+    if (!v) {
+      return false;
+    }
+
+    const lv = v.toLowerCase();
+
+    if (lv === "1" || lv === "on" || lv === "true" || lv === "yes") {
+      return true;
+    }
+
+    return false;
+  },
   posixify
 };
 module.exports = fyntil;
@@ -10058,6 +10106,18 @@ const {
 } = __webpack_require__("./node_modules/.f/_/source-map/0.7.3/source-map/source-map.js");
 
 const ci = __webpack_require__("./node_modules/.f/_/ci-info/2.0.0/ci-info/index.js");
+/**
+ * Hard link a file
+ *
+ * - if the link exist and is link to a different file, then remove it
+ *   and create a new link that points to the new file.
+ *
+ * @param {*} srcFp
+ * @param {*} destFp
+ * @param {*} srcStat
+ * @returns
+ */
+
 
 async function linkFile(srcFp, destFp, srcStat) {
   try {
@@ -10080,6 +10140,13 @@ async function linkFile(srcFp, destFp, srcStat) {
 
   return undefined;
 }
+/**
+ * Copy a file
+ * @param {*} srcFp
+ * @param {*} destFp
+ * @returns
+ */
+
 
 async function copyFile(srcFp, destFp) {
   if (Fs.copyFile) {
@@ -10120,10 +10187,17 @@ async function cleanExtraDest(dest, destFiles) {
 }
 
 const FILES = Symbol("files");
+/**
+ * Generate a tree of files using npm-pack that a package would publish with.
+ *
+ * @param {*} path
+ * @returns
+ */
 
 async function generatePackTree(path) {
   const files = await npmPacklist({
-    path
+    path,
+    includeSymlinks: fynTil.strToBool(process.env.FYN_LOCAL_PACK_SYMLINKS)
   });
   logger.debug(`local package linking - pack tree returned ${files.length} files to link`, JSON.stringify(files, null, 2));
 
@@ -10181,7 +10255,9 @@ function getSourceMapConfig(content, sig = SOURCE_MAP_URL_SIG) {
   return lastMatch && lastMatch[1];
 }
 /**
- * process or generate source map back to original file
+ * process or generate source map back to original file.
+ *
+ * - Do nothing if in CI mode
  *
  * @param {*} param0
  */
@@ -10298,6 +10374,8 @@ async function handleSourceMap({
 /**
  * Link tree of files generated from npm pack
  *
+ * - if env `FYN_LOCAL_COPY_MODE` is defined, then copy file instead  of linking
+ *
  * @param {*} tree
  * @param {*} src
  * @param {*} dest
@@ -10327,7 +10405,13 @@ async function linkPackTree({
     destFiles[file] = true;
     const srcFp = Path.join(src, file);
     const destFp = Path.join(dest, file);
-    await linkFile(srcFp, destFp);
+
+    if (fynTil.strToBool(process.env.FYN_LOCAL_COPY_MODE)) {
+      await copyFile(srcFp, destFp);
+    } else {
+      await linkFile(srcFp, destFp);
+    }
+
     await handleSourceMap({
       file,
       destFiles,
@@ -55025,6 +55109,14 @@ const npmWalker = Class => class Walker extends Class {
       this.bundledScopes = [];
       this.packageJsonCache = this.parent.packageJsonCache;
     }
+
+    this.includeSymlinks = opt.includeSymlinks;
+  }
+
+  walkerOpt(entry) {
+    const opt = super.walkerOpt(entry);
+    opt.includeSymlinks = this.includeSymlinks;
+    return opt;
   }
 
   onReaddir(entries) {
@@ -55101,7 +55193,7 @@ const npmWalker = Class => class Walker extends Class {
 
 
   onstat(st, entry, file, dir, then) {
-    if (st.isSymbolicLink()) then();else super.onstat(st, entry, file, dir, then);
+    if (!this.includeSymlinks && st.isSymbolicLink()) then();else super.onstat(st, entry, file, dir, then);
   }
 
   onReadIgnoreFile(file, data, then) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fyn",
-  "version": "1.1.18",
+  "version": "1.1.19",
   "description": "A node package manager, fast, workspace, and better productivity and efficiency",
   "main": "./bin/fyn.js",
   "homepage": "https://www.electrode.io/fynpo/",