fix(cleanup): dont nest files utils dir

Author: lukekarrys

lib/base-command.js

@@ -167,7 +167,7 @@ class BaseCommand {
     const relativeFrom = prefixInsideCwd ? this.npm.localPrefix : process.cwd()
 
     const filters = this.npm.config.get('workspace')
-    const getWorkspaces = require('./workspaces/get-workspaces.js')
+    const getWorkspaces = require('./utils/get-workspaces.js')
     const ws = await getWorkspaces(filters, {
       path: this.npm.localPrefix,
       includeWorkspaceRoot,

lib/commands/edit.js

@@ -4,7 +4,7 @@
 const { resolve } = require('path')
 const { lstat } = require('fs/promises')
 const cp = require('child_process')
-const completion = require('../utils/completion/installed-shallow.js')
+const completion = require('../utils/installed-shallow.js')
 const BaseCommand = require('../base-command.js')
 
 const splitPackageNames = (path) => {

lib/commands/explain.js

@@ -20,7 +20,7 @@ class Explain extends ArboristWorkspaceCmd {
   // TODO
   /* istanbul ignore next */
   static async completion (opts, npm) {
-    const completion = require('../utils/completion/installed-deep.js')
+    const completion = require('../utils/installed-deep.js')
     return completion(npm, opts)
   }
 

lib/commands/explore.js

@@ -5,7 +5,7 @@ const pkgJson = require('@npmcli/package-json')
 const runScript = require('@npmcli/run-script')
 const { join, relative } = require('path')
 const { log, output } = require('proc-log')
-const completion = require('../utils/completion/installed-shallow.js')
+const completion = require('../utils/installed-shallow.js')
 const BaseCommand = require('../base-command.js')
 
 class Explore extends BaseCommand {

lib/commands/fund.js

@@ -38,7 +38,7 @@ class Fund extends ArboristWorkspaceCmd {
   // TODO
   /* istanbul ignore next */
   static async completion (opts, npm) {
-    const completion = require('../utils/completion/installed-deep.js')
+    const completion = require('../utils/installed-deep.js')
     return completion(npm, opts)
   }
 

lib/commands/init.js

@@ -7,7 +7,7 @@ const libexec = require('libnpmexec')
 const mapWorkspaces = require('@npmcli/map-workspaces')
 const PackageJson = require('@npmcli/package-json')
 const { log, output } = require('proc-log')
-const updateWorkspaces = require('../workspaces/update-workspaces.js')
+const updateWorkspaces = require('../utils/update-workspaces.js')
 const BaseCommand = require('../base-command.js')
 
 const posixPath = p => p.split('\\').join('/')

lib/commands/ls.js

@@ -42,7 +42,7 @@ class LS extends ArboristWorkspaceCmd {
   // TODO
   /* istanbul ignore next */
   static async completion (opts, npm) {
-    const completion = require('../utils/completion/installed-deep.js')
+    const completion = require('../utils/installed-deep.js')
     return completion(npm, opts)
   }
 

lib/commands/rebuild.js

@@ -20,7 +20,7 @@ class Rebuild extends ArboristWorkspaceCmd {
   // TODO
   /* istanbul ignore next */
   static async completion (opts, npm) {
-    const completion = require('../utils/completion/installed-deep.js')
+    const completion = require('../utils/installed-deep.js')
     return completion(npm, opts)
   }
 

lib/commands/uninstall.js

@@ -2,7 +2,7 @@ const { resolve } = require('path')
 const pkgJson = require('@npmcli/package-json')
 
 const reifyFinish = require('../utils/reify-finish.js')
-const completion = require('../utils/completion/installed-shallow.js')
+const completion = require('../utils/installed-shallow.js')
 
 const ArboristWorkspaceCmd = require('../arborist-cmd.js')
 class Uninstall extends ArboristWorkspaceCmd {

lib/commands/update.js

@@ -33,7 +33,7 @@ class Update extends ArboristWorkspaceCmd {
   // TODO
   /* istanbul ignore next */
   static async completion (opts, npm) {
-    const completion = require('../utils/completion/installed-deep.js')
+    const completion = require('../utils/installed-deep.js')
     return completion(npm, opts)
   }
 

lib/commands/version.js

@@ -81,7 +81,7 @@ class Version extends BaseCommand {
   }
 
   async changeWorkspaces (args) {
-    const updateWorkspaces = require('../workspaces/update-workspaces.js')
+    const updateWorkspaces = require('../utils/update-workspaces.js')
     const libnpmversion = require('libnpmversion')
     const prefix = this.npm.config.get('tag-version-prefix')
     const {

lib/workspaces/get-workspaces.js lib/utils/get-workspaces.js

@@ -127,7 +127,7 @@ t.test('arborist-cmd', async t => {
 t.test('handle getWorkspaces raising an error', async t => {
   const { cmd } = await mockArboristCmd(t, null, 'a', {
     mocks: {
-      '{LIB}/workspaces/get-workspaces.js': async () => {
+      '{LIB}/utils/get-workspaces.js': async () => {
         throw new Error('oopsie')
       },
     },

lib/utils/completion/installed-deep.js lib/utils/installed-deep.js

@@ -1,6 +1,6 @@
 const { resolve } = require('path')
 const t = require('tap')
-const getWorkspaces = require('../../../lib/workspaces/get-workspaces.js')
+const getWorkspaces = require('../../../lib/utils/get-workspaces.js')
 
 const normalizePath = p => p
   .replace(/\\+/g, '/')

lib/utils/completion/installed-shallow.js lib/utils/installed-shallow.js

@@ -1,5 +1,5 @@
 const t = require('tap')
-const installedDeep = require('../../../../lib/utils/completion/installed-deep.js')
+const installedDeep = require('../../../lib/utils/installed-deep.js')
 const mockNpm = require('../../../fixtures/mock-npm')
 
 const fixture = {

lib/workspaces/update-workspaces.js lib/utils/update-workspaces.js

@@ -1,5 +1,5 @@
 const t = require('tap')
-const installed = require('../../../../lib/utils/completion/installed-shallow.js')
+const installed = require('../../../lib/utils/installed-shallow.js')
 const mockNpm = require('../../../fixtures/mock-npm')
 
 const mockShallow = async (t, config) => {