squared 0.6.4 → 0.6.6

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

@@ -159,7 +159,7 @@ module Squared
           end
           @dependname = 'package.json'
           dependfile_set [@dependname]
-          @tsfile = basepath(ts).yield_self { |file| file if file.exist? }
+          @tsfile = basepath! ts
           @pm = { __: init }
         end
 
@@ -246,11 +246,11 @@ module Squared
                       if op.empty?
                         op << package
                         if (args = readline('Enter arguments', force: false))
-                          op << '--' unless pnpm?
+                          op.delim unless pnpm?
                           op << args
                         end
                       else
-                        op << '--' unless pnpm?
+                        op.delim unless pnpm?
                         op << package << op.join(' ')
                       end
                     else
@@ -426,7 +426,7 @@ module Squared
                     Open3.capture2e(session_output('npm', 'pack --dry-run --no-color', npmname).to_s)
                          .first
                          .scan(/^npm notice \d+(?:\.\d+)?[a-z]+ (.+)$/i)
-                         .map { |item| Pathname.new(item.first) }
+                         .map! { |item| Pathname.new(item.first) }
                          .select(&:exist?)
                   end.concat(Array(files))
                   packed = true
@@ -507,22 +507,23 @@ module Squared
             end
             save, exact, omit = save if save.is_a?(Array)
             ws = env('NODE_WORKSPACES', equals: '0')
-            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
+            om = lambda do |cmd|
+              if omit
+                save = case save
+                       when 'peer'
+                         'optional'
+                       when 'optional'
+                         'dev'
+                       when 'dev'
+                         'prod'
+                       end
+              end
+              return unless save && save != 'bundle'
+
+              cmd << "--#{save}"
             end
             rm = lambda do |target|
-              next if remove.empty?
+              return if remove.empty?
 
               run(target.temp(*remove).sub!(/ (?:add|install) /, ' remove '), from: :remove, sync: sync)
             end
@@ -531,15 +532,15 @@ module Squared
               append_loglevel
               if yarn == 1
                 cmd << '--ignore-engines' unless option('ignore-engines', equals: '0')
-                cmd << '--ignore-scripts' if is.call
+                cmd << '--ignore-scripts' if option('ignore-scripts')
                 cmd << '--force' if option('force')
               else
-                cmd << '--mode=skip-build' if is.call
+                cmd << '--mode=skip-build' if option('ignore-scripts')
                 cmd << '--check-cache' if !flag && option('force')
               end
               if nolockfile?('yarn')
                 cmd << '--no-lockfile'
-              elsif ci.call
+              elsif option('ci')
                 if yarn == 1
                   cmd << '--frozen-lockfile'
                 elsif !flag
@@ -549,8 +550,7 @@ module Squared
               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'
+                om.call(cmd)
                 cmd << '--exact' if exact
               end
             elsif pnpm?
@@ -558,8 +558,7 @@ module Squared
               append_nocolor
               append_loglevel
               if add
-                om.call
-                cmd << "--save-#{save}" if save && save != 'bundle'
+                om.call(cmd)
                 rm.call(cmd)
                 cmd << '--save-exact' if exact
                 option('allow-build') { |val| cmd << quote_option('allow-build', val) }
@@ -574,17 +573,18 @@ module Squared
                        '--force'
                      elsif nolockfile?('pnpm')
                        '--no-lockfile'
-                     elsif ci.call
+                     elsif option('ci')
                        '--frozen-lockfile'
                      end
-              cmd << '--ignore-scripts' if is.call
+              cmd << '--ignore-scripts' if option('ignore-scripts')
             else
-              cmd = session('npm', (ci = ci.call) ? 'ci' : 'install')
+              cmd = session 'npm'
+              cmd << (ci = option('ci') ? 'ci' : 'install')
               cmd << '--workspaces=false' if ws
               append_nocolor
               append_loglevel
               if omit
-                cmd << "--omit=#{save}"
+                cmd << "--omit=#{save || omit}"
                 save = nil
               end
               unless ci
@@ -597,7 +597,7 @@ module Squared
                 end
               end
               cmd << '--package-lock=false' << 'save=false' if nolockfile?('npm')
-              cmd << '--ignore-scripts' if is.call
+              cmd << '--ignore-scripts' if option('ignore-scripts')
             end
             if add
               return if packages.empty?
@@ -630,13 +630,20 @@ module Squared
           end
           found = []
           avail = []
-          rev = flag || (prod? ? :patch : :minor)
+          flag ||= case (up = option('u', 'update'))
+                   when 'major', 'minor'
+                     up.to_sym
+                   else
+                     prod? ? :patch : :minor
+                   end
           if sync && !stdin?
-            if has_value?(opts, 's', 'select') && !dryrun
-              items = []
-            elsif has_value?(opts, 'i', 'interactive')
-              ia = true
-            end
+            items = if has_value?(opts, 's', 'select')
+                      se = true
+                      []
+                    elsif has_value?(opts, 'i', 'interactive')
+                      ia = true
+                      []
+                    end
           end
           unless data.empty?
             JSON.parse(data).each_pair do |key, val|
@@ -647,7 +654,7 @@ module Squared
               ch = file[0]
               if ch.match?(/[~^]/)
                 file = file[1..-1]
-              elsif ia && rev == :major
+              elsif ia && flag == :major
                 major = true
               else
                 avail << [key, file, latest, true]
@@ -656,7 +663,7 @@ module Squared
               current = val['current'] || file
               want = val['wanted']
               unless latest[SEM_VER, 6]
-                case rev
+                case flag
                 when :major
                   want = latest
                 when :minor
@@ -675,7 +682,7 @@ module Squared
               b = f[2]
               c = w[0]
               d = w[2]
-              upgrade = case rev
+              upgrade = case flag
                         when :major
                           a == '0' ? c == '0' || c == '1' : true
                         when :minor
@@ -703,7 +710,7 @@ module Squared
           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
+            return unless verbose
 
             msg, hint = if modified == -1
                           ['Packages were updated', 'more possible']
@@ -717,6 +724,7 @@ module Squared
           if !found.empty?
             col1 = width.call(found, 0) + 4
             col2 = width.call(found, 1) + 4
+            col3 = pad.call(found.size, found).size + 2 + col1 + col2 + width.call(found, 2)
             packages = []
             pat = ->(a) { /("#{Regexp.escape(a[0])}"\s*:\s*)"([~^])#{'?' if a[4]}#{Regexp.escape(a[1])}"/ }
             edit = lambda do |a, pkg, mod|
@@ -724,60 +732,57 @@ module Squared
               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]))
-              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
-                doc.send(items ? :sub : :sub!, pat.call(item)) do |capture|
-                  if $2 == '~' && rev != :patch
-                    cur = -1
-                    pending += 1
-                    capture
-                  else
-                    edit.call(item, $1, $2)
-                  end
+              cur = modified
+              doc.send(items ? :sub : :sub!, pat.call(item)) do |capture|
+                if $2 == '~' && flag != :patch
+                  cur = -1
+                  pending += 1
+                  capture
+                else
+                  edit.call(item, $1, $2)
                 end
               end
-              if f
-                a = ' ' * col1
-                b = ' ' * col2
-              else
-                a = a.ljust(col1)
-                b = b.ljust(col2)
-                sub_style! b, theme[:current] if theme[:current] && !stdin?
+              a = a.ljust(col1)
+              b = b.ljust(col2)
+              sub_style! b, theme[:current] if theme[:current] && !stdin?
+              if cur == -1
+                c = 'SKIP'
+              elsif modified == cur
+                c = 'FAIL'
+              elsif !stdin?
+                if d == 1
+                  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
+                g = item
               end
-              c = if cur == -1
-                    'SKIP'
-                  elsif modified == cur
-                    'FAIL'
-                  elsif stdin?
-                    c
-                  else
-                    g = item
-                    if d == 1
-                      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 "#{f ? ' ' * col0.size : col0}#{s}"
-              elsif g
+              s = "#{pad.call(i, found)}. #{a}#{b}#{c}"
+              if se
                 items << [s, g]
+                next
+              elsif ia && g
+                items << [g]
+                if flag != :major || e || semmajor?(item[5], item[6])
+                  items.pop unless confirm_semver(s.ljust(col3 + s.size - s.stripstyle.size), (d / 2.0).ceil)
+                  next
+                end
               end
+              puts s
             end
             pending = avail.reduce(pending) { |a, b| a + (b[3] ? 0 : 1) }
-            if dryrun || (modified == 0 && (pending > 0 || (items && pending == 0)))
+            if (dryrun && Array(items).empty?) || (modified == 0 && (pending > 0 || (items && pending == 0)))
               n = if items
-                    puts(items.empty? ? 'No updates were found' : items.map(&:first))
-                    items.size
+                    if items.empty?
+                      puts 'No updates were selected'
+                      0
+                    else
+                      puts items.map(&:first) if se
+                      items.size
+                    end
                   else
                     found.size
                   end
@@ -785,24 +790,33 @@ module Squared
             elsif modified > 0
               if items
                 packages.clear
-                choice('Select a package', items.map(&:first), multiple: true, force: false, index: true, border: true)
-                  .each do |n|
-                    item = items[n.pred].last
-                    doc.sub!(pat.call(item)) { edit.call(item, $1, $2) }
-                  end
+                if ia
+                  (1..items.size)
+                else
+                  choice('Select a package', items.map(&:first), multiple: true, force: false, index: true,
+                                                                 border: true)
+                end.each do |n|
+                  item = items[n.pred].last
+                  doc.sub!(pat.call(item)) { edit.call(item, $1, $2) }
+                end
               end
               unless packages.empty?
-                File.write(dependfile, doc)
-                if sync && (opts.include?('diff') || option('diff'))
-                  run(git_output('diff', shell_quote(dependfile)), banner: false)
-                end
-                if has_value?(opts, 'u', 'update') || option('update')
-                  package(:update, packages: packages, from: :'outdated:update')
-                else
-                  modified = -1
+                modified = -1
+                if dryrun
                   footer.call(0, found.size)
+                else
+                  File.write(dependfile, doc)
+                  if sync && (opts.include?('diff') || option('diff'))
+                    run(git_output('diff', shell_quote(dependfile)), banner: false)
+                  end
+                  if has_value?(opts, 'u', 'update') || up
+                    package(:update, packages: packages, from: :'outdated:update')
+                  else
+                    footer.call(0, found.size)
+                  end
+                  printsucc
+                  commit(:add, [dependname], pass: true)
                 end
-                commit(:add, [dependname], pass: true)
               end
             end
           elsif !avail.empty?
@@ -948,7 +962,7 @@ module Squared
                      case flag
                      when :install, :update
                        opts.unshift('package-lock=false', 'save=false') if nolockfile?('npm')
-                       spec = 0
+                       spec = flag == :install ? 0 : 2
                      when :add
                        spec = 1
                        flag = :install
@@ -987,17 +1001,17 @@ module Squared
           end
           append_loglevel
           case spec
-          when 0, 1
+          when Numeric
             op.each do |opt|
               if opt =~ op.values
                 case $1
                 when 'w', 'workspace'
                   op << quotepath($1, $2)
                 end
-              elsif opt.include?('=') || opt.start_with?('-')
+              elsif opt.match?(/^-|=/)
                 op.errors << opt
               else
-                op.found << opt
+                op.found << (spec == 2 && (n = opt.index('@')) ? opt[0, n] : opt)
               end
             end
             op.swap
@@ -1099,7 +1113,7 @@ module Squared
           print_run(cmd, banner, **kwargs)
           session 'npx', cmd
           start = time_epoch if kwargs.fetch(:verbose, verbose? && !stdin?)
-          run(sync: sync, banner: banner, from: from).tap do |ret|
+          run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception), from: from).tap do |ret|
             next unless success?(ret, banner, start.nil?) && start
 
             print_status(name, subject: 'tsc', start: start, from: :completed)
@@ -1313,7 +1327,7 @@ module Squared
 
         def remove_modules(prefix = dependbin)
           modules = basepath 'node_modules'
-          return false unless modules.directory? && (option('Y', prefix: prefix) || confirm_basic('Remove?', modules))
+          return false unless modules.directory? && (option('y', prefix: prefix) || confirm_basic('Remove?', modules))
 
           modules.rmtree
         rescue Timeout::Error => e
@@ -1360,7 +1374,11 @@ module Squared
         end
 
         def append_platform(target: @session)
-          %w[cpu os libc].each { |name| option(name) { |val| target << basic_option(name, val) } }
+          %w[cpu os libc].each do |name|
+            next unless (val = option(name))
+
+            target << basic_option(name, val)
+          end
         end
 
         def quotepath(name, val)