refactor: refactor deps updater

Author: zdm

lib/commands/package/update-dependencies.js

@@ -24,7 +24,7 @@ export default class extends Command {
                 },
                 "linked": {
                     "short": "l",
-                    "description": "include linked or missing direct dependencies",
+                    "description": "include linked direct dependencies",
                     "default": false,
                     "schema": {
                         "type": "boolean",

lib/commands/workspace/update-dependencies.js

@@ -25,7 +25,7 @@ export default class extends Command {
                 },
                 "linked": {
                     "short": "l",
-                    "description": "include linked or missing direct dependencies",
+                    "description": "include linked direct dependencies",
                     "default": false,
                     "schema": {
                         "type": "boolean",

lib/package.js

@@ -642,7 +642,7 @@ export default class Package {
         return this.npm.api.getOutdatedDependencies( { all } );
     }
 
-    async updateDependencies ( { all, outdated, linked, missing, install, reinstall, commit, quiet, confirmInstall, outdatedDependencies, cache = {} } = {} ) {
+    async updateDependencies ( { all, outdated, linked, install, reinstall, commit, quiet, confirmInstall, outdatedDependencies, cache = {} } = {} ) {
         if ( !this.dependencies.hasDependencies ) return result( 200 );
 
         var res;
@@ -657,8 +657,8 @@ export default class Package {
 
         outdatedDependencies ||= {};
 
-        // add linked deps
-        if ( linked ) {
+        // add missed / linked deps
+        {
             const linkedDependencies = await this.#getLinkedDependencies();
 
             for ( const dependency of linkedDependencies.values() ) {
@@ -669,10 +669,15 @@ export default class Package {
                     outdatedDependencies[ dependency.name ] = [ outdatedDependencies[ dependency.name ] ];
                 }
 
-                outdatedDependencies[ dependency.name ].push( {
-                    "location": "-",
-                    "linked": dependency.link || true,
-                } );
+                if ( dependency.missed || ( linked && dependency.link ) ) {
+                    outdatedDependencies[ dependency.name ].push( {
+
+                        // XXX location
+                        "location": "-",
+                        "missed": dependency.missed,
+                        "linked": dependency.link,
+                    } );
+                }
             }
         }
 
@@ -690,13 +695,12 @@ export default class Package {
                 specs = [ outdatedDependencies[ name ] ];
             }
 
-            const index = {},
-                locations = {};
+            const index = {};
 
             for ( const spec of specs ) {
 
                 // group specs by id
-                const id = `${ spec.location }/${ spec.current }/${ spec.wanted }/${ spec.latest }`;
+                const id = spec.location;
 
                 index[ id ] ??= {
                     name,
@@ -705,19 +709,12 @@ export default class Package {
                     "latest": spec.latest,
                     "location": spec.location,
                     "dependent": new Set(),
+                    "missed": spec.missed,
                     "linked": spec.linked,
                     "topLevel": this.dependencies.has( name ) && spec.location === path.join( this.root, "node_modules", name ),
                 };
 
                 index[ id ].dependent.add( spec.dependent );
-
-                // detect updatable by location
-                if ( spec.current === spec.wanted ) {
-                    locations[ spec.location ] = false;
-                }
-                else if ( locations[ spec.location ] !== false ) {
-                    locations[ spec.location ] = true;
-                }
             }
 
             specs = Object.values( index ).map( spec => {
@@ -734,20 +731,25 @@ export default class Package {
                 // include installed, updatable deps by default
                 let include;
 
+                // linked
                 if ( spec.linked ) {
-                    spec.updatable = true;
 
-                    include = true;
+                    // XXX
+                    if ( linked ) {
+                        spec.updatable = true;
+
+                        include = true;
+                    }
                 }
                 else {
-                    spec.updatable = locations[ spec.location ];
+                    spec.updatable = spec.current !== spec.wanted;
 
                     if ( spec.updatable && spec.current ) {
                         include = true;
                     }
                 }
 
-                // include outdated deps
+                // include top-level outdated deps
                 if ( outdated && spec.outdated && spec.topLevel ) {
                     include = true;
                 }
@@ -757,8 +759,8 @@ export default class Package {
                     include = true;
                 }
 
-                // include misseing deps
-                if ( missing && !spec.current ) {
+                // include missed deps
+                if ( spec.missed ) {
                     include = true;
                 }
 
@@ -841,7 +843,7 @@ export default class Package {
                             "format": ( value, row ) => {
                                 if ( !value ) {
                                     if ( row.linked === true ) {
-                                        return ansi.error( " MISSING " );
+                                        return ansi.error( " MISSED " );
                                     }
                                     else if ( row.linked ) {
                                         return ansi.error( " LINKED " );
@@ -1565,7 +1567,7 @@ export default class Package {
                         dependencies.set( name, {
                             name,
                             location,
-                            "link": null,
+                            "missed": true,
                         } );
                     }