squared 0.6.1 → 0.6.3

data/lib/squared/workspace/project/node.rb

@@ -6,20 +6,22 @@ module Squared
       class Node < Git
         OPT_NPM = {
           common: %w[dry-run=!? loglevel=b include-workspace-root=!? workspaces=!? w|workspace=v].freeze,
-          install: %w[package-lock-only=!? prefer-dedupe=!? cpu=b libc=b os=b].freeze,
-          install_a: %w[audit=! bin-links=! fund=! ignore-scripts=!? install-links=!? package-lock=! strict-peer-deps=!?
-                        include=b install-strategy=b omit=b].freeze,
-          install_b: %w[no-save save-bundle save-dev save-optional save-peer save-prod before=q foreground-scripts=!?
-                        g|global=!? S|save=!? E|save-exact=!?].freeze,
+          install: %w[package-lock-only=!? prefer-dedupe=!? E|save-exact=!? before=q cpu=b libc=b os=b].freeze,
+          install_a: %w[audit=! bin-links=! foreground-scripts=!? fund=! ignore-scripts=!? install-links=!?
+                        package-lock=! strict-peer-deps=!? include=b install-strategy=b omit=b].freeze,
+          install_b: %w[no-save B|save-bundle D|save-dev O|save-optional save-peer P|save-prod g|global=!?
+                        S|save=!?].freeze,
           run: %w[foreground-scripts=!? if-present=!? ignore-scripts=!? script-shell=p].freeze,
           exec: %w[c|call=q package=b].freeze,
           pack: %w[ignore-scripts=!? json=!? pack-destination=p].freeze,
+          rebuild: %w[bin-links=! foreground-scripts=!? global=!? ignore-scripts=!? install-links=!?].freeze,
           no: {
             install: %w[audit bin-links fund package-lock].freeze
           }.freeze
         }.freeze
         OPT_PNPM = {
-          common: %w[aggregate-output color no-color stream use-stderr C|dir=p loglevel=b w|workspace-root].freeze,
+          common: %w[aggregate-output color ignore-workspace-root-check no-color stream use-stderr C|dir=p loglevel=b
+                     r|recursive w|workspace-root].freeze,
           common_cpu: %w[cpu=b libc=b os=b].freeze,
           common_filter: %w[fail-if-no-match changed-files-ignore-pattern=q filter=q filter-prod=q
                             test-pattern=q].freeze,
@@ -30,15 +32,18 @@ module Squared
                       modules-dir=p network-concurrency=i package-import-method=b public-hoist-pattern=q
                       reporter=b].freeze,
           install_a: %w[global-dir ignore-scripts offline prefer-offline store-dir=p virtual-store-dir=p].freeze,
-          install_b: %w[D|dev global-dir no-optional P|prod r|recursive].freeze,
+          install_b: %w[D|dev no-optional P|prod].freeze,
+          add: %w[allow-build config g|global save-catalog D|save-dev O|save-optional save-peer P|save-prod
+                  save-catalog-name=b].freeze,
           update: %w[g|global i|interactive L|latest depth=i].freeze,
           dedupe: %w[check].freeze,
-          run: %w[if-present no-bail parallel r|recursive report-summary reporter-hide-prefix resume-from
-                  sequential].freeze,
-          exec: %w[no-reporter-hide-prefix parallel r|recursive report-summary resume-from c|shell-mode].freeze,
-          pack: %w[json r|recursive pack-destination=p pack-gzip-level=i out=p workspace-concurrency=i].freeze,
+          run: %w[if-present no-bail parallel report-summary reporter-hide-prefix resume-from sequential].freeze,
+          exec: %w[no-reporter-hide-prefix parallel report-summary resume-from c|shell-mode].freeze,
+          pack: %w[json pack-destination=p pack-gzip-level=i out=p workspace-concurrency=i].freeze,
+          rebuild: %w[filter=q].freeze,
           no: {
-            install: %w[frozen-lockfile verify-store-integrity].freeze
+            install: %w[frozen-lockfile verify-store-integrity].freeze,
+            add: %w[save-exact save-workspace-protocol].freeze
           }.freeze
         }.freeze
         OPT_YARN = {
@@ -50,13 +55,16 @@ module Squared
                      network-timeout=i preferred-cache-folder=p production=b? proxy=q otp=b registry=q update-checksums
                      use-yarnrc=p].freeze,
           install: %w[A|audit g|global S|save D|save-dev E|save-exact P|save-peer O|save-optional T|save-tilde].freeze,
+          add: %w[A|audit D|dev E|exact O|optional P|peer T|tilde ignore-workspace-root-check].freeze,
           update: %w[A|audit C|caret E|exact L|latest T|tilde P|pattern=q S|scope=b].freeze,
           run: %w[scripts-prepend-node-path=b?].freeze
         }.freeze
         OPT_BERRY = {
           install: %w[check-cache check-resolutions immutable immutable-cache inline-builds json refresh-lockfile
                       mode=b].freeze,
-          update: %w[C|caret E|exact F|fixed interactive T|tilde R|recursive mode=b].freeze,
+          add: %w[cached D|dev json O|optional P|peer prefer-dev].freeze,
+          add_a: %w[C|caret E|exact F|fixed interactive T|tilde mode=b].freeze,
+          update: %w[R|recursive].freeze,
           dedupe: %w[check json mode=b strategy=b].freeze,
           run: %w[B|binaries-only inspect inspect-brk T|top-level require=q].freeze,
           pack: %w[n|dry-run install-if-needed json o|out=p].freeze
@@ -128,7 +136,7 @@ module Squared
         end
 
         subtasks({
-          'package' => %i[install reinstall dedupe update].freeze,
+          'package' => %i[install add update dedupe rebuild reinstall].freeze,
           'outdated' => %i[major minor patch].freeze,
           'bump' => %i[version major minor patch].freeze,
           'publish' => %i[latest tag].freeze,
@@ -170,18 +178,17 @@ module Squared
               if flags.nil?
                 case action
                 when 'add'
-                  format_desc action, nil, 'save?=prod|dev|optional|peer,name+'
+                  format_desc action, nil, 'save?=[=-]prod|dev|optional|peer|bundle,(-)name+'
                   task action, [:save] do |_, args|
-                    packages = if args.save =~ /\A(=)?(prod|dev|optional|peer)\z/
-                                 exact = !$1.nil?
-                                 save = $2
+                    packages = if args.save =~ /\A([=-]*)?(prod|dev|optional|peer|bundle)\z/
+                                 save = [$2, $1.include?('='), $1.include?('-')]
                                  args.extras
                                else
                                  save = 'prod'
                                  args.to_a
                                end
                     param_guard(action, 'name', args: packages)
-                    depend(:add, packages: packages, save: save, exact: exact)
+                    depend(:add, packages: packages, save: save)
                   end
                 when 'run'
                   next if scripts.empty?
@@ -279,7 +286,7 @@ module Squared
                       end
                     when 'package'
                       format_desc(action, flag, 'opts*', before: case flag
-                                                                 when :dedupe then nil
+                                                                 when :dedupe, :rebuild then nil
                                                                  when :reinstall then 'force?'
                                                                  else 'name*'
                                                                  end)
@@ -302,22 +309,21 @@ module Squared
                         end
                       end
                     when 'publish'
-                      format_desc(action, flag, 'otp?,d/ry-run?,p/ublic|r/estricted?',
-                                  before: ('tag' if flag == :tag))
+                      format_desc(action, flag, 'otp?,p/ublic|r/estricted?,d/ry-run?', before: ('tag' if flag == :tag))
                       task flag do |_, args|
                         args = args.to_a
-                        dryrun = true if args.delete('dry-run') || args.delete('d')
-                        access = if args.delete('public') || args.delete('p')
-                                   'public'
-                                 elsif args.delete('restricted') || args.delete('r')
+                        access = if has_value!(args, 'r', 'restricted')
                                    'restricted'
+                                 elsif has_value!(args, 'p', 'public')
+                                   'public'
                                  end
+                        dryrun = has_value!(args, 'd', 'dry-run')
                         if flag == :latest
                           otp = args.first
                         else
                           tag, otp = param_guard(action, flag, args: args)
                         end
-                        publish(flag, otp: otp, tag: tag, dryrun: dryrun, access: access)
+                        publish(flag, otp: otp, tag: tag, access: access, dryrun: dryrun)
                       end
                     when 'tsc'
                       break unless @tsfile
@@ -325,15 +331,11 @@ module Squared
                       format_desc(action, flag, 'opts*', "#{flag == :project ? 'before' : 'after'}": 'config?')
                       task flag do |_, args|
                         args = args.to_a
-                        if flag == :project
-                          project = if !args.empty? && exist?(args.first)
-                                      args.shift
-                                    else
-                                      @tsfile
-                                    end
-                        end
-                        watch = !(args.delete('watch') || args.delete('w')).nil?
-                        tsc(*args, banner: true, project: project, build: flag == :build, watch: watch)
+                        tsc(*args, banner: true, "#{flag}": if flag == :build
+                                                              true
+                                                            else
+                                                              exist?(args.first) ? args.shift : @tsfile
+                                                            end, watch: has_value!(args, 'w', 'watch'))
                       end
                     end
                   end
@@ -345,6 +347,8 @@ module Squared
 
         def copy(from: 'build', into: 'node_modules', scope: nil, also: nil, create: nil, files: nil, workspace: false,
                  link: false, force: false, override: false, sync: invoked_sync?('copy'), **kwargs)
+          return if @copy == false
+
           glob = kwargs[:include]
           pass = kwargs[:exclude]
           if @copy && !override
@@ -361,8 +365,6 @@ module Squared
             create = @copy[:create] if @copy.key?(:create)
             glob = @copy[:include] if @copy.key?(:include)
             pass = @copy[:exclude] if @copy.key?(:exclude)
-          elsif @copy == false
-            return
           end
           items = []
           if build? && path != @workspace.home && @workspace.home?
@@ -373,7 +375,7 @@ module Squared
           return if items.empty?
 
           on :first, :copy
-          print_item unless @output[0] || !verbose || task_invoked?(/^copy(?::#{Node.ref}|$)/)
+          print_item unless @output[0] || silent? || task_invoked?(/^copy(?::#{Node.ref}|$)/)
           packed = false
           items.each do |dir|
             case dir
@@ -381,7 +383,7 @@ module Squared
               dest = dir
               @workspace.rev_clear(dest, sync: sync)
             when String
-              dest = @workspace.root + dir
+              dest = @workspace.rootpath(dir)
               @workspace.rev_clear(dest, sync: sync)
             when Symbol
               dest = if (proj = @workspace.find(name: dir))
@@ -422,8 +424,7 @@ module Squared
                          .scan(/^npm notice \d+(?:\.\d+)?[a-z]+ (.+)$/i)
                          .map { |item| Pathname.new(item.first) }
                          .select(&:exist?)
-                  end
-                  .concat(Array(files))
+                  end.concat(Array(files))
                   packed = true
                 end
                 base = dest.join(into, npmname)
@@ -438,7 +439,7 @@ module Squared
                     target.mkpath
                     subdir << target.to_s
                   end
-                  FileUtils.cp(basepath(s), dest, verbose: verbosetype > 0)
+                  FileUtils.cp(basepath(s), dest, verbose: !silent?)
                 rescue StandardError => e
                   print_error e
                   errors += 1
@@ -446,7 +447,7 @@ module Squared
               rescue StandardError => e
                 on_error e, :copy
               else
-                puts message(base, subdir.size, files.size - errors) if verbose
+                puts message(base, subdir.size, files.size - errors) unless silent?
               end
               next
             end
@@ -479,7 +480,7 @@ module Squared
             end
             target.each do |src, to|
               glob.each { |val| log.info "cp #{from + val} #{to}" }
-              copy_dir(src, to, glob, create: create, link: link, force: force, pass: pass, verbose: verbosetype > 0)
+              copy_dir(src, to, glob, create: create, link: link, force: force, pass: pass, verbose: !silent?)
             rescue StandardError => e
               on_error e, :copy
             end
@@ -487,45 +488,81 @@ module Squared
           on :last, :copy
         end
 
-        def depend(flag = nil, *, sync: invoked_sync?('depend', flag), packages: [], save: nil, exact: nil, **)
+        def depend(flag = nil, *, sync: invoked_sync?('depend', flag), packages: [], save: nil, exact: nil,
+                   omit: env('NPM_OMIT'), **)
           if @depend && !flag
             super
           elsif outdated?
             workspace.rev_clear(name, sync: sync)
             return update if !flag && env('NODE_UPDATE')
 
+            add = flag == :add
+            if add
+              remove, packages = packages.partition { |val| val.delete_prefix!('-') }
+              remove.map! { |pkg| shell_quote(pkg) }
+            end
+            save, exact, omit = save if save.is_a?(Array)
             ws = env('NODE_WORKSPACES', equals: '0')
-            ci = option('ci')
+            ci = -> { option('ci') }
+            is = -> { option('ignore-scripts') }
+            om = lambda do
+              next unless omit
+
+              save = case save
+                     when 'peer'
+                       'optional'
+                     when 'optional'
+                       'dev'
+                     when 'dev'
+                       'prod'
+                     end
+            end
+            rm = lambda do |target|
+              next if remove.empty?
+
+              run(target.temp(*remove).sub!(/ (?:add|install) /, ' remove '), from: :remove, sync: sync)
+            end
             if (yarn = dependtype(:yarn)) > 0
-              cmd = session 'yarn'
-              if flag == :add
-                cmd << 'add'
-                cmd << "--#{save}" unless save == 'prod'
-                cmd << '--exact' if exact
+              cmd = session('yarn', flag || 'install')
+              append_loglevel
+              if yarn == 1
+                cmd << '--ignore-engines' unless option('ignore-engines', equals: '0')
+                cmd << '--ignore-scripts' if is.call
+                cmd << '--force' if option('force')
               else
-                cmd << 'install'
-                cmd << '--ignore-engines' if yarn == 1 && !option('ignore-engines', equals: '0')
-                cmd << (yarn == 1 ? '--force' : '--check-cache') if option('force')
+                cmd << '--mode=skip-build' if is.call
+                cmd << '--check-cache' if !flag && option('force')
               end
               if nolockfile?('yarn')
                 cmd << '--no-lockfile'
-              elsif ci
+              elsif ci.call
                 if yarn == 1
                   cmd << '--frozen-lockfile'
-                else
+                elsif !flag
                   cmd << '--immutable' << '--refresh-lockfile'
                 end
               end
+              if add
+                cmd << '-W' if yarn == 1 && !option('w', 'ignore-workspace-root-check', equals: '0')
+                rm.call(cmd)
+                om.call
+                cmd << "--#{save}" if save && save != 'bundle'
+                cmd << '--exact' if exact
+              end
             elsif pnpm?
-              cmd = session 'pnpm'
-              if flag == :add
-                cmd << 'add' << "--save-#{save}"
+              cmd = session('pnpm', flag || 'install')
+              append_nocolor
+              append_loglevel
+              if add
+                om.call
+                cmd << "--save-#{save}" if save && save != 'bundle'
+                rm.call(cmd)
                 cmd << '--save-exact' if exact
+                option('allow-build') { |val| cmd << quote_option('allow-build', val) }
               else
-                cmd << 'install'
                 append_platform
               end
-              option('public-hoist-pattern', ignore: false) do |val|
+              option('public-hoist-pattern') do |val|
                 split_escape(val) { |opt| cmd << shell_option('public-hoist-pattern', opt) }
               end
               cmd << '--ignore-workspace' if ws
@@ -533,30 +570,37 @@ module Squared
                        '--force'
                      elsif nolockfile?('pnpm')
                        '--no-lockfile'
-                     elsif ci
+                     elsif ci.call
                        '--frozen-lockfile'
                      end
-              append_nocolor
+              cmd << '--ignore-scripts' if is.call
             else
-              cmd = session 'npm'
-              if ci
-                cmd << 'ci'
-              else
-                cmd << 'install'
-                if flag == :add
-                  cmd << "--save-#{save}"
+              cmd = session('npm', (ci = ci.call) ? 'ci' : 'install')
+              cmd << '--workspaces=false' if ws
+              append_nocolor
+              append_loglevel
+              if omit
+                cmd << "--omit=#{save}"
+                save = nil
+              end
+              unless ci
+                if add
+                  cmd << "--save-#{save}" if save
+                  rm.call(cmd)
                   cmd << '--save-exact' if exact
-                  cmd.merge(packages.map { |pkg| shell_quote(pkg) })
                 else
                   append_platform
                 end
               end
-              cmd << '--workspaces=false' if ws
               cmd << '--package-lock=false' << 'save=false' if nolockfile?('npm')
-              append_nocolor
+              cmd << '--ignore-scripts' if is.call
             end
-            append_loglevel
-            run(from: :depend, sync: sync)
+            if add
+              return if packages.empty?
+
+              cmd.merge(packages.map { |pkg| shell_quote(pkg) })
+            end
+            run(from: flag || :depend, sync: sync)
           end
         end
 
@@ -652,11 +696,8 @@ module Squared
           end
           pending = 0
           modified = 0
-          size_col = ->(a, i) { a.map { |aa| aa[i] }.max_by(&:size).size }
-          pad_ord = lambda do |val, ord|
-            ret = val.succ.to_s
-            ord.size > 9 ? ret.rjust(ord.size.to_s.size) : ret
-          end
+          width = ->(a, i) { a.map { |aa| aa[i] }.max_by(&:size).size }
+          pad = ->(val, ord) { val.succ.to_s.rjust([ord.size.to_s.size, 2].max) }
           footer = lambda do |val, size|
             next unless verbose
 
@@ -670,19 +711,21 @@ module Squared
           end
           print_item banner unless sync
           if !found.empty?
-            col1 = size_col.call(found, 0) + 4
-            col2 = size_col.call(found, 1) + 4
+            col1 = width.call(found, 0) + 4
+            col2 = width.call(found, 1) + 4
             packages = []
-            pat = ->(a) { /("#{Regexp.escape(a[0])}"\s*:\s*)"([~^])#{a[4] ? '?' : ''}#{Regexp.escape(a[1])}"/ }
+            pat = ->(a) { /("#{Regexp.escape(a[0])}"\s*:\s*)"([~^])#{'?' if a[4]}#{Regexp.escape(a[1])}"/ }
             edit = lambda do |a, pkg, mod|
               packages << a[0]
               modified += 1
               "#{pkg}\"#{mod || (a[3] == 1 && a[4] ? '^' : '')}#{a[2]}\""
             end
+            kwargs = { col1: col1, col2: col2, col3: width.call(found, 2), timeout: 0 }
             found.each_with_index do |item, i|
               a, b, c, d, e = item
               f = ia && (rev != :major || e || semmajor?(item[5], item[6]))
-              if f && !confirm_outdated(a, c, (d / 2.0).ceil, b, lock: e, col1: col1, timeout: 0)
+              col0 = "#{pad.call(i, found)}. "
+              if f && !confirm_outdated(a, c, (d / 2.0).ceil, b, lock: e, col0: col0, **kwargs)
                 cur = -1
               else
                 cur = modified
@@ -696,9 +739,14 @@ module Squared
                   end
                 end
               end
-              a = a.ljust(col1)
-              b = b.ljust(col2)
-              b = sub_style(b, styles: theme[:current]) if theme[:current] && !stdin?
+              if f
+                a = ' ' * col1
+                b = ' ' * col2
+              else
+                a = a.ljust(col1)
+                b = b.ljust(col2)
+                sub_style! b, theme[:current] if theme[:current] && !stdin?
+              end
               c = if cur == -1
                     'SKIP'
                   elsif modified == cur
@@ -708,15 +756,15 @@ module Squared
                   else
                     g = item
                     if d == 1
-                      a = sub_style(a, styles: theme[:major])
-                      sub_style(c, :bold, styles: color(:green))
+                      sub_style! a, theme[:major]
+                      sub_style c, :bold, color(:green)
                     else
                       sub_style(c, **opt_style(color(d == 3 ? :green : :yellow), SEM_VER, d))
                     end
                   end
               s = a + b + c
               if !items
-                puts "#{pad_ord.call(i, found)}. #{s}"
+                puts "#{f ? ' ' * col0.size : col0}#{s}"
               elsif g
                 items << [s, g]
               end
@@ -754,20 +802,20 @@ module Squared
               end
             end
           elsif !avail.empty?
-            col1 = size_col.call(avail, 0) + 4
-            col2 = size_col.call(avail, 1)
-            col3 = size_col.call(avail, 2) + 4
+            col1 = width.call(avail, 0) + 4
+            col2 = width.call(avail, 1)
+            col3 = width.call(avail, 2) + 4
             avail.each_with_index do |item, i|
               a, b, c, d = item
               a = a.ljust(col1)
-              b = sub_style(b.ljust(col2), styles: color(d ? :red : :yellow))
+              b = sub_style b.ljust(col2), color(d ? :red : :yellow)
               c = c.ljust(col3)
               unless d
-                a = sub_style(a, styles: theme[:active])
-                c = sub_style(c, styles: color(:green))
+                sub_style! a, theme[:active]
+                sub_style! c, color(:green)
                 pending += 1
               end
-              puts "#{pad_ord.call(i, avail)}. #{(a + c + b).subhint(d ? 'locked' : 'latest')}"
+              puts "#{pad.call(i, avail)}. #{(a + c + b).subhint(d ? 'locked' : 'latest')}"
             end
             footer.call(0, avail.size)
           else
@@ -782,7 +830,7 @@ module Squared
 
         def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, access: nil, dryrun: nil)
           if read_package('private')
-            ws = @children.select { |proj| proj.ref?(Node.ref) }
+            ws = children.select { |proj| proj.ref?(Node.ref) }
             if ws.empty?
               print_error('nothing to publish', subject: name, hint: 'private')
             elsif confirm_basic('Publish workspace?', ws.map(&:name).join(', '), 'N')
@@ -825,10 +873,16 @@ module Squared
 
         def package(flag, opts = [], packages: [], from: nil)
           workspace.rev_clear(name)
-          if (yarn = dependtype(:yarn)) > 0
+          yarn = dependtype(:yarn)
+          if yarn > 0 && !(yarn == 1 && ((flag == :update && !packages.empty?) || flag == :rebuild))
             cmd = session 'yarn', case flag
                                   when :update
-                                    yarn == 1 ? 'upgrade' : 'up'
+                                    if yarn == 1
+                                      'upgrade'
+                                    else
+                                      spec = 0
+                                      'up'
+                                    end
                                   when :reinstall
                                     if yarn == 1
                                       remove_modules 'yarn' if opts.include?('force')
@@ -837,35 +891,51 @@ module Squared
                                     end
                                     opts << 'no-lockfile' if lockfile(true)
                                     'install'
+                                  when :add
+                                    spec = 1
+                                    'add'
                                   else
                                     yarn == 1 && flag == :dedupe ? 'install' : flag
                                   end
             op = OptionPartition.new(opts, if yarn == 1
                                              OPT_YARN.fetch(flag == :dedupe ? :install : flag, []) + OPT_YARN[:common]
                                            else
-                                             OPT_BERRY.fetch(flag, [])
+                                             OPT_BERRY.fetch(flag, []) + case flag
+                                                                         when :add, :update then OPT_BERRY[:add_a]
+                                                                         else []
+                                                                         end
                                            end, cmd, project: self)
             if yarn == 1 && flag != :reinstall
               op << '--no-lockfile' if nolockfile?('yarn')
               op << '--ignore-engines' unless option('ignore-engines', equals: '0')
             end
-            op.clear
-            append_loglevel
           else
             args = if pnpm?
                      case flag
                      when :install, :update
                        opts << 'no-lockfile' if nolockfile?('pnpm')
+                       spec = 0 if flag == :update
+                     when :add
+                       spec = 1
                      when :reinstall
                        opts << 'force'
                        flag = :install
                      end
-                     no = OPT_PNPM[:no][flag]
+                     flags = [flag]
+                     unless flag == :rebuild
+                       flags << :install_a
+                       no = OPT_PNPM[:no][flag]
+                     end
                      [
                        opts,
-                       [flag, :install_a].yield_self do |out|
-                         out.push(:install_b, :common_filter) unless flag == :dedupe
-                         out << :common_cpu unless flag == :update
+                       flags.yield_self do |out|
+                         unless flag == :dedupe
+                           out << :common_filter
+                           unless flag == :add
+                             out << :install_b
+                             out << :common_cpu unless flag == :update
+                           end
+                         end
                          pnpmopts(*out)
                        end,
                        session('pnpm', flag)
@@ -874,27 +944,51 @@ module Squared
                      case flag
                      when :install, :update
                        opts.unshift('package-lock=false', 'save=false') if nolockfile?('npm')
+                       spec = 0
+                     when :add
+                       spec = 1
+                       flag = :install
                      when :reinstall
                        remove_modules 'npm' if opts.delete('force')
                        opts.unshift('package-lock=false') if lockfile(true)
                        flag = :install
                      end
-                     no = OPT_NPM[:no][:install]
+                     flags = [flag]
+                     unless flag == :rebuild
+                       flags << :install_a
+                       unless flag == :dedupe
+                         %w[save ignore-scripts strict-peer-deps].each do |key|
+                           option(key, prefix: 'npm', ignore: false) do |val|
+                             opts << case val
+                                     when '0', 'false'
+                                       "#{key}=false"
+                                     else
+                                       "#{key}=true"
+                                     end
+                           end
+                         end
+                         flags << :install_b
+                       end
+                       no = OPT_NPM[:no][:install]
+                     end
                      [
                        opts,
-                       [flag, :install_a].yield_self do |out|
-                         out << :install_b unless flag == :dedupe
-                         npmopts(*out)
-                       end,
+                       npmopts(*flags),
                        session('npm', flag)
                      ]
                    end
             op = OptionPartition.new(*args, no: no, project: self)
+            append_platform if flag == :install
+            append_nocolor
+          end
+          append_loglevel
+          case spec
+          when 0, 1
             op.each do |opt|
               if opt =~ op.values
                 case $1
                 when 'w', 'workspace'
-                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, basepath($2)) : shell_option($1, $2))
+                  op << quotepath($1, $2)
                 end
               elsif opt.include?('=') || opt.start_with?('-')
                 op.errors << opt
@@ -904,26 +998,18 @@ module Squared
             end
             op.swap
               .concat(packages)
-            append_platform if flag == :install
-            append_nocolor
-            append_loglevel
-            if flag == :dedupe
-              op.clear
-            else
-              op.append(quote: true)
-            end
-            op.clear(errors: true)
+            raise_error ArgumentError, 'no packages to add' if op.empty? && spec == 1
+            op.append(quote: true)
+              .clear(errors: true)
+          else
+            op.clear
           end
           run(from: from || :"package:#{flag}")
         end
 
         def bump(flag, val = nil)
-          if flag != :version
-            val = sembump version, flag
-            return if val == version
-          elsif !val
-            return
-          end
+          return unless val ||= sembump(version, flag)
+
           doc = dependfile.read
           if doc.sub!(/"version"\s*:\s*"#{version}"/, "\"version\": \"#{val}\"")
             unless dryrun?
@@ -933,7 +1019,7 @@ module Squared
             end
             if stdin?
               puts val
-            elsif verbose
+            elsif !silent?
               major = flag == :major
               emphasize("version: #{val}", title: name, border: borderstyle, sub: [
                 headerstyle,
@@ -967,7 +1053,7 @@ module Squared
 
                 case $1
                 when 'w', 'workspace'
-                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, basepath($2)) : shell_option($1, $2))
+                  op << quotepath($1, $2)
                   op.found << opt
                 end
               end
@@ -1239,7 +1325,7 @@ module Squared
 
         def append_loglevel(target: @session)
           level = env('NODE_LOGLEVEL')
-          silent = !verbose || level == 'silent'
+          silent = silent? || level == 'silent'
           return unless silent || level
 
           if yarn?
@@ -1273,6 +1359,14 @@ module Squared
           %w[cpu os libc].each { |name| option(name) { |val| target << basic_option(name, val) } }
         end
 
+        def quotepath(name, val)
+          if $2.include?(File::SEPARATOR) || (workspace.windows? && val.match?(%r{[\\/]}))
+            quote_option name, basepath(val)
+          else
+            shell_option name, val
+          end
+        end
+
         def dependroot
           dependname if parent&.has?('outdated', Node.ref)
         end