fyn 1.1.17 → 1.1.18

package/dist/fyn.js

@@ -3796,14 +3796,23 @@ class Fyn {
     }
   }
 
-  async moveToBackup(dir, reason) {
-    // TODO: create backup dir and move
-    logger.warn("Removing", dir, "due to", reason);
-    return await Fs.$.rimraf(dir);
+  async moveToFv(dir, pkg, pkgJson) {
+    const toDir = this.getInstalledPkgDir(pkgJson.name, pkgJson.version, {});
+
+    try {
+      await Fs.access(toDir); // a copy already exist in FV dir, so remove it
+
+      logger.warn(`Removing ${dir} because its version ${pkgJson.version} is different from ${pkg.version}`);
+      await Fs.$.rimraf(dir);
+    } catch (err) {
+      logger.debug(`Moving ${dir} to ${toDir} to replace with version ${pkg.version}`);
+      await Fs.$.mkdirp(Path.dirname(toDir));
+      await Fs.rename(dir, toDir);
+    }
   }
 
-  async unlinkLocalPackage(pkg, dir) {
-    logger.warn("Removing symlink", dir);
+  async unlinkLocalPackage(dir, reason) {
+    logger.warn(`Removing ${dir} because it's ${reason}`);
     return await Fs.$.rimraf(dir);
   } //
   // A pkg that's to be extracted must:
@@ -3829,21 +3838,21 @@ class Fyn {
     }
 
     if (ostat.isSymbolicLink()) {
-      await this.unlinkLocalPackage(pkg, fullOutDir);
+      await this.unlinkLocalPackage(fullOutDir, "a symlink");
     } else if (!ostat.isDirectory()) {
-      await this.moveToBackup(fullOutDir, "not a directory");
+      await this.unlinkLocalPackage(fullOutDir, "not a directory");
     } else {
       try {
         const pkgJson = await this.loadJsonForPkg(pkg, fullOutDir);
 
         if (!pkgJson._invalid) {
           return pkgJson;
-        } // no valid package.json found
-
+        }
 
-        const id = pkgJson._id ? ` (id ${pkgJson._id})` : "";
-        await this.moveToBackup(fullOutDir, `invalid existing package${id}`);
-      } catch (err) {}
+        await this.moveToFv(fullOutDir, pkg, pkgJson);
+      } catch (err) {
+        logger.warn(`ensureProperPkgdir:`, err);
+      }
     }
 
     return null;
@@ -5763,7 +5772,7 @@ const {
 const {
   getDepSection,
   makeDepStep
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.6-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/index.js");
 
 const xaa = __webpack_require__("./lib/util/xaa.js");
 
@@ -6849,7 +6858,7 @@ ${item.depPath.join(" > ")}`);
       return false;
     }
 
-    const force = this._lockOnly && isOpt; // check if an already resolved local package satisfies item
+    const force = this._lockOnly && !isOpt; // check if an already resolved local package satisfies item
     // before trying to resolve with lock data
 
     if (!this._fyn.preferLock) {
@@ -8070,13 +8079,17 @@ class PkgInstaller {
 
     if (scope) await xaa.try(() => Fs.rmdir(Path.join(outDir, scope))); // get rid of potentially empty FV_DIR dir
 
-    await xaa.try(() => Fs.rmdir(this._fyn.getFvDir()));
+    await xaa.try(() => Fs.rmdir(this._fyn.getFvDir("_")));
   }
   /**
    * Process detail layout for node_modules.
    *
-   * Make links under node_modules for packages that exist app's package.json and
-   * flattened packages under node_modules/${FV_DIR}/node_modules
+   * Real copies of packages are store under FV_DIR.
+   *
+   * 1. For top level packages that exist in app's package.json, make symlinks under node_modules.
+   * 2. For packages that could be promoted to the top level:
+   * - If flattenTop enabled, make symlinks under node_modules
+   * - flattenTop disabled, make symlinks under FV_Dir/node_modules
    *
    * @returns {*} none
    */
@@ -8729,7 +8742,7 @@ const {
 
 const {
   PackageRef
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.6-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/index.js");
 
 const WATCH_TIME = 5000; // consider meta cache stale after this much time (30 minutes)
 
@@ -8916,7 +8929,7 @@ class PkgSrcManager {
       const publishUtilConfig = this.getPublishUtil(json, fullPath);
 
       if (publishUtilConfig) {
-        logger.info(`processing local package.json at ${fullPath} with https://www.npmjs.com/package/publish-util prePackObj`);
+        logger.debug(`processing local package.json at ${fullPath} with https://www.npmjs.com/package/publish-util prePackObj`);
         prePackObj(json, _objectSpread(_objectSpread({}, publishUtilConfig), {}, {
           silent: true
         }));
@@ -9745,7 +9758,7 @@ const {
 const {
   FynpoConfigManager,
   FynpoDepGraph
-} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.6-fynlocal_h/@fynpo/base/dist/index.js");
+} = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/index.js");
 /* eslint-disable no-magic-numbers, max-statements, no-empty, complexity, no-eval */
 
 
@@ -11002,7 +11015,7 @@ module.exports = __webpack_require__("./node_modules/.f/_/xaa/1.7.0/xaa/dist/xaa
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.6-fynlocal_h/@fynpo/base/dist/fynpo-config.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/fynpo-config.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11152,7 +11165,7 @@ exports.FynpoConfigManager = FynpoConfigManager;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.6-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11181,9 +11194,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.6-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
+const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
 
-const util_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.6-fynlocal_h/@fynpo/base/dist/util.js");
+const util_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-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 = {
@@ -11903,7 +11916,7 @@ exports.FynpoDepGraph = FynpoDepGraph;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.6-fynlocal_h/@fynpo/base/dist/index.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/index.js":
 /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
@@ -11924,11 +11937,11 @@ const filter_scan_dir_1 = (0, tslib_1.__importDefault)(__webpack_require__("./no
 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.6-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
+const minimatch_group_1 = __webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/minimatch-group.js");
 
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.6-fynlocal_h/@fynpo/base/dist/fynpo-dep-graph.js"), exports);
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.6-fynlocal_h/@fynpo/base/dist/fynpo-config.js"), exports);
-(0, tslib_1.__exportStar)(__webpack_require__("./node_modules/.f/_/@fynpo/base/1.1.6-fynlocal_h/@fynpo/base/dist/util.js"), exports);
+(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);
 /**
  * Take an array of packages and figure out their dependencies on each other
  *
@@ -12183,7 +12196,7 @@ exports.makePkgDeps = makePkgDeps;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.6-fynlocal_h/@fynpo/base/dist/minimatch-group.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.7-fynlocal_h/@fynpo/base/dist/minimatch-group.js":
 /***/ ((__unused_webpack_module, exports) => {
 
 "use strict";
@@ -12229,7 +12242,7 @@ exports.groupMM = groupMM;
 
 /***/ }),
 
-/***/ "./node_modules/.f/_/@fynpo/base/1.1.6-fynlocal_h/@fynpo/base/dist/util.js":
+/***/ "./node_modules/.f/_/@fynpo/base/1.1.7-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.17",
+  "version": "1.1.18",
   "description": "A node package manager, fast, workspace, and better productivity and efficiency",
   "main": "./bin/fyn.js",
   "homepage": "https://www.electrode.io/fynpo/",