squared 0.6.15 → 0.7.0

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

@@ -5,7 +5,7 @@ module Squared
     module Project
       class Node < Git
         OPT_NPM = {
-          common: %w[dry-run=!? force=!? loglevel=b include-workspace-root=!? workspaces=!? w|workspace=v].freeze,
+          common: %w[dry-run=!? loglevel=b include-workspace-root=!? workspaces=!? w|workspace=v].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,
@@ -149,11 +149,11 @@ module Squared
           'pack' => nil
         })
 
-        def initialize(*, init: nil, ts: 'tsconfig.json', asdf: 'nodejs', **kwargs)
+        def initialize(*, ts: 'tsconfig.json', asdf: 'nodejs', **kwargs)
           super
           if @pass.include?(Node.ref)
             initialize_ref Node.ref
-            initialize_logger(**kwargs)
+            initialize_logger kwargs[:log]
           else
             initialize_build(Node.ref, prod: prod?, **kwargs)
             initialize_env(**kwargs)
@@ -161,7 +161,7 @@ module Squared
           @dependname = 'package.json'
           dependfile_set [@dependname]
           @tsfile = basepath! ts
-          @pm = { __: init }
+          @pm = { __: kwargs[:init] }
         end
 
         def ref
@@ -181,7 +181,7 @@ module Squared
                 when 'add'
                   format_desc action, nil, 'save?=[=-]prod|dev|optional|peer|bundle,(-)name+'
                   task action, [:save] do |_, args|
-                    packages = if args.save =~ /^([=-]*)(prod|dev|optional|peer|bundle)$/
+                    packages = if args.save =~ /\A([=-]*)?(prod|dev|optional|peer|bundle)\z/
                                  save = [$2, $1.include?('='), $1.include?('-')]
                                  args.extras
                                else
@@ -201,23 +201,24 @@ module Squared
                       format_list(list, "run[#{indexchar}N]", 'scripts', grep: args.extras, from: dependfile)
                     else
                       args = param_guard(action, 'script', args: args.to_a)
-                      opts = []
-                      args.each do |val|
+                      opts = args.each_with_object([]) do |val, out|
                         if (n, extra = indexitem(val))
                           if (item = list[n.pred])
                             run compose([item.first, extra].compact.join(' '), script: true)
                           elsif exception
                             indexerror n, list
                           else
-                            next log.warn "run script #{n} of #{list.size} (out of range)"
+                            log.warn "run script #{n} of #{list.size}".subhint('out of range')
+                            next
                           end
                         else
-                          opts << val
+                          out << val
                         end
                       end
                       next if opts.empty?
 
-                      list = if (yarn = dependtype(:yarn)) > 0
+                      yarn = dependtype(:yarn)
+                      list = if yarn > 0
                                yarn == 1 ? OPT_YARN[:run] + OPT_YARN[:common] : OPT_BERRY[:run]
                              elsif pnpm?
                                pnpmopts :run, :common_filter
@@ -260,14 +261,20 @@ module Squared
                     run(from: :exec)
                   end
                 when 'nvm'
-                  next unless ENV['NVM_DIR']
+                  next unless ENV['NVM_DIR'] && !workspace.windows?
 
-                  format_desc action, nil, 'version,args*'
+                  format_desc action, nil, 'version?,args*'
                   task action, [:version] do |_, args|
-                    version = param_guard(action, 'version', args: args, key: :version)
+                    path = ->(s) { File.join(ENV['NVM_DIR'], s) }
+                    unless (version = args.version)
+                      cmd = ". #{path.call('nvm.sh')} && nvm list --no-colors --no-alias"
+                      version = pwd_set(from: :nvm) do
+                        choice_index('Select a version', IO.popen(cmd).map { |line| line[/\s(v\S+)/, 1] }, series: true)
+                      end
+                    end
                     args = args.extras
                     args << readline('Enter command', force: true) if args.empty?
-                    args.unshift(File.join(ENV['NVM_DIR'], 'nvm-exec'))
+                    args.unshift(path.call('nvm-exec'))
                     run(args.join(' '), { 'NODE_VERSION' => version }, banner: false, from: :nvm)
                   end
                 when 'pack'
@@ -423,11 +430,12 @@ module Squared
               begin
                 unless packed
                   require 'open3'
-                  files = pwd_set do
-                    Open3.capture2e(session_output('npm', 'pack --dry-run --no-color', npmname).to_s)
+                  cmd = session_output 'npm', 'pack --dry-run --no-color', npmname
+                  files = pwd_set(cmd, from: :'npm:pack') do
+                    Open3.capture2e(cmd.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
@@ -435,21 +443,21 @@ module Squared
                 base = dest.join(into, npmname)
                 base.mkpath
                 log.info "cp npm:#{npmname} #{base}"
-                subdir = []
                 errors = 0
-                files.each do |file|
-                  s, d = file.is_a?(Array) ? file : [file, file]
+                subdir = files.each_with_object([]) do |file, out|
+                  s, d = file.is_a?(Array) ? file : [file] * 2
                   dest = base + d
-                  unless subdir.include?((target = dest.dirname).to_s)
+                  target = dest.dirname
+                  unless out.include?(dirname = target.to_s)
                     target.mkpath
-                    subdir << target.to_s
+                    out << dirname
                   end
                   FileUtils.cp(basepath(s), dest, verbose: !silent?)
-                rescue StandardError => e
-                  print_error e
+                rescue => e
+                  print_error(Logger::ERROR, e, subject: name)
                   errors += 1
                 end
-              rescue StandardError => e
+              rescue => e
                 on_error e, :copy
               else
                 puts message(base, subdir.size, files.size - errors) unless silent?
@@ -469,9 +477,8 @@ module Squared
                         begin
                           doc = JSON.parse(file.read)
                           doc['name']
-                        rescue StandardError => e
-                          log.error e
-                          raise if exception
+                        rescue => e
+                          print_error(Logger::ERROR, e, subject: proj.name)
                         end
                       end
                 if sub
@@ -486,8 +493,8 @@ module Squared
             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: !silent?)
-            rescue StandardError => e
-              on_error e, :copy
+            rescue => e
+              on_error e
             end
           end
           on :last, :copy
@@ -499,7 +506,7 @@ module Squared
             super
           elsif outdated?
             workspace.rev_clear(name, sync: sync)
-            return update if !flag && env('NODE_UPDATE')
+            return update if !flag && (env('UPDATE') || env('NODE_UPDATE'))
 
             add = flag == :add
             if add
@@ -526,39 +533,35 @@ module Squared
             rm = lambda do |target|
               return if remove.empty?
 
-              run(target.temp(*remove).sub!(/ (?:add|install) /, ' remove '), from: :remove, sync: sync)
+              run(target.temp(*remove).sub!(/ (?:add|install) /, ' remove '), sync: sync, from: :remove)
             end
-            if (yarn = dependtype(:yarn)) > 0
-              if !flag && yarn > 1 && prod?
-                cmd = session 'yarn', 'workspaces focus --all --production'
+            yarn = dependtype(:yarn)
+            if yarn > 0
+              cmd = session('yarn', flag || 'install')
+              append_loglevel
+              if yarn == 1
+                cmd << '--ignore-engines' if option('ignore-engines')
+                cmd << '--ignore-scripts' if option('ignore-scripts')
+                cmd << '--force' if option('force')
               else
-                cmd = session('yarn', flag || 'install')
+                cmd << '--mode=skip-build' if option('ignore-scripts')
+                cmd << '--check-cache' if !flag && option('force')
+              end
+              if nolockfile?('yarn')
+                cmd << '--no-lockfile'
+              elsif option('ci')
                 if yarn == 1
-                  cmd << '--production' if prod?
-                  cmd << '--ignore-engines' unless option('ignore-engines', equals: '0')
-                  cmd << '--ignore-scripts' if option('ignore-scripts')
-                  cmd << '--force' if option('force')
-                else
-                  cmd << '--mode=skip-build' if option('ignore-scripts')
-                  cmd << '--check-cache' if !flag && option('force')
-                end
-                if nolockfile?('yarn')
-                  cmd << '--no-lockfile'
-                elsif option('ci')
-                  if yarn == 1
-                    cmd << '--frozen-lockfile'
-                  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)
-                  cmd << '--exact' if exact
+                  cmd << '--frozen-lockfile'
+                elsif !flag
+                  cmd << '--immutable' << '--refresh-lockfile'
                 end
               end
-              append_loglevel
+              if add
+                cmd << '-W' if yarn == 1 && option('w', 'ignore-workspace-root-check', notequals: '0')
+                rm.call(cmd)
+                om.call(cmd)
+                cmd << '--exact' if exact
+              end
             elsif pnpm?
               cmd = session('pnpm', flag || 'install')
               append_nocolor
@@ -569,7 +572,6 @@ module Squared
                 cmd << '--save-exact' if exact
                 option('allow-build') { |val| cmd << quote_option('allow-build', val) }
               else
-                cmd << '--prod' if prod?
                 append_platform
               end
               option('public-hoist-pattern') do |val|
@@ -588,28 +590,12 @@ module Squared
             else
               cmd = session 'npm'
               cmd << (ci = option('ci') ? 'ci' : 'install')
-              option('approve-scripts') do |val|
-                cmd = npm_output 'approve-scripts'
-                cmd << case val
-                       when '1'
-                         '--all --no-allow-scripts-pin'
-                       when 'true', 'all'
-                         '--all'
-                       else
-                         val.split(/\s+/).quote!.join(' ')
-                       end
-                print_run cmd, silent?
-                run(cmd, banner: false)
-              end
               cmd << '--workspaces=false' if ws
-              cmd << '--force' if option('force')
               append_nocolor
               append_loglevel
               if omit
                 cmd << "--omit=#{save || omit}"
                 save = nil
-              elsif !add && prod?
-                cmd << '--include=prod'
               end
               unless ci
                 if add
@@ -628,7 +614,7 @@ module Squared
 
               cmd.merge(packages.quote!)
             end
-            run(from: flag || :depend, sync: sync)
+            run(sync: sync, from: flag || :depend)
           end
         end
 
@@ -642,14 +628,14 @@ module Squared
           banner = format_banner(cmd.temp(('--dry-run' if dryrun)))
           print_item banner if sync
           begin
-            data = pwd_set(dryrun: dryrun) { `#{cmd.temp('--json --loglevel=error')}` }
+            data = pwd_set(cmd, dryrun: dryrun) { `#{cmd.temp('--json --loglevel=error')}` }
             doc = dependfile.read
             json = JSON.parse(doc)
             dep1 = json['dependencies'] || {}
             dep2 = json['devDependencies'] || {}
             target = json['name']
-          rescue StandardError => e
-            on_error(e, :outdated, dryrun: dryrun)
+          rescue => e
+            on_error(e, dryrun: dryrun)
             return
           end
           found = []
@@ -714,7 +700,7 @@ module Squared
                         when :patch
                           a == c && b == d && f[4] != w[4]
                         end
-              if upgrade && !w[6]
+              if upgrade && !w[5]
                 next if file == want
 
                 found << [key, file, want, if a != c
@@ -870,22 +856,17 @@ module Squared
           package(:update, from: :update)
         end
 
-        def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, access: nil, dryrun: nil,
-                    workspace: false)
+        def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, access: nil, dryrun: nil)
           if read_package('private')
-            return if workspace
-
             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')
-              ws.each do |proj|
-                proj.publish(flag, sync: sync, otp: otp, tag: tag, access: access, dryrun: dryrun, workspace: true)
-              end
+              ws.each { |proj| proj.publish(flag, sync: sync, otp: otp, tag: tag, access: access, dryrun: dryrun) }
             end
             return
           end
-          return print_error('version not found', subject: name, hint: dependname) unless version
+          return print_error("version: #{dependname}", subject: name, hint: 'not found') unless version
 
           cmd = session 'npm', 'publish'
           cmd << basic_option('otp', otp) if otp ||= option('otp')
@@ -908,8 +889,9 @@ module Squared
           else
             require 'open3'
             on :first, from
-            pwd_set(from: from, dryrun: dryrun) do
-              Open3.popen2e(cmd = session_done(cmd)) do |_, out|
+            pwd_set(cmd, dryrun: dryrun) do
+              cmd = session_done cmd
+              Open3.popen2e(cmd) do |_, out|
                 write_lines(out, banner: format_banner(cmd),
                                  sub: npmnotice(opt_style(color(:bright_blue), /^(.+)(Tarball .+)$/, 2)))
               end
@@ -954,7 +936,7 @@ module Squared
                                            end, cmd, project: self)
             if yarn == 1 && flag != :reinstall
               op << '--no-lockfile' if nolockfile?('yarn')
-              op << '--ignore-engines' unless option('ignore-engines', equals: '0')
+              op << '--ignore-engines' if option('ignore-engines')
             end
           else
             args = if pnpm?
@@ -969,22 +951,18 @@ module Squared
                        flag = :install
                      end
                      flags = [flag]
-                     unless flag == :rebuild
-                       flags << :install_a
-                       no = OPT_PNPM[:no][flag]
+                     flags << :install_a unless flag == :rebuild
+                     unless flag == :dedupe
+                       flags << :common_filter
+                       unless flag == :add
+                         flags << :install_b
+                         flags << :common_cpu unless flag == :update
+                       end
                      end
+                     no = OPT_PNPM[:no][flag]
                      [
                        opts,
-                       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,
+                       pnpmopts(*flags),
                        session('pnpm', flag)
                      ]
                    else
@@ -1006,12 +984,12 @@ module Squared
                        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
+                             opts << basic_option(key, case val
+                                                       when '0', 'false'
+                                                         false
+                                                       else
+                                                         true
+                                                       end)
                            end
                          end
                          flags << :install_b
@@ -1043,15 +1021,14 @@ module Squared
                 op.found << (spec == 2 && (n = opt.index('@')) ? opt[0, n] : opt)
               end
             end
-            op.swap
-              .concat(packages)
+            op.swap.concat(packages)
             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}")
+          run(from: from || symjoin('package', flag))
         end
 
         def bump(flag, val = nil)
@@ -1081,8 +1058,8 @@ module Squared
           else
             raise_error 'version not found', hint: dependfile
           end
-        rescue StandardError => e
-          on_error(e, :bump, dryrun: dryrun?)
+        rescue => e
+          on_error(e, dryrun: dryrun?)
         end
 
         def pack(opts = [])
@@ -1142,11 +1119,9 @@ module Squared
           print_run(cmd, banner, **kwargs)
           session 'npx', cmd
           start = time_epoch if kwargs.fetch(:verbose, verbose? && !stdin?)
-          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)
-          end
+          ret = run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception?), from: from)
+          print_status(name, subject: 'tsc', start: start) if success?(ret, banner, start.nil?) && start
+          ret
         end
 
         def compose(target, opts = nil, script: false, args: nil, from: nil, **)
@@ -1265,12 +1240,8 @@ module Squared
 
         private
 
-        def npm_output(*cmd, **kwargs)
-          session_output('npm', *cmd, **kwargs)
-        end
-
         def read_package(key = 'packageManager', update: false)
-          if !@pm.key?(key) || update
+          unless !update && @pm.key?(key)
             doc = JSON.parse(dependfile.read)
             @pm[key] = case key
                        when 'packageManager'
@@ -1287,7 +1258,7 @@ module Squared
               @pm[:_] = true
             end
           end
-        rescue StandardError => e
+        rescue => e
           log.debug e
           @pm[key] = nil
         else
@@ -1330,7 +1301,7 @@ module Squared
           else
             1
           end
-        rescue StandardError => e
+        rescue => e
           return 0 if exist
 
           log.debug e
@@ -1349,7 +1320,7 @@ module Squared
           else
             4
           end
-        rescue StandardError => e
+        rescue => e
           if exist
             %w[pnpm-lock.yaml pnpm-workspace.yaml].any? { |val| exist?(val) } ? 4 : 0
           else
@@ -1360,14 +1331,14 @@ module Squared
 
         def remove_modules(prefix = dependbin)
           modules = basepath 'node_modules'
-          return false unless modules.directory? && confirm_basic('Remove?', modules, prefix: prefix)
+          return false unless modules.directory? && (option('y', prefix: prefix) || confirm_basic('Remove?', modules))
 
           modules.rmtree
         rescue Timeout::Error => e
           puts
           print_error(e, hint: modules, pass: true)
           exit 1
-        rescue StandardError => e
+        rescue => e
           print_error(e, pass: true)
           false
         else
@@ -1448,23 +1419,23 @@ module Squared
         end
 
         def lockfile(delete = false)
-          file = basepath(if yarn?
-                            'yarn.lock'
-                          else
-                            pnpm? ? 'pnpm-lock.yaml' : 'package-lock.json'
-                          end)
-          if file.exist?
+          ret = basepath(if yarn?
+                           'yarn.lock'
+                         else
+                           pnpm? ? 'pnpm-lock.yaml' : 'package-lock.json'
+                         end)
+          if ret.exist?
             if delete
-              file.delete
+              ret.delete
               return
             end
-            file
-          elsif (file = rootpath(file.basename, ascend: dependroot)).exist?
-            file
+            ret
+          elsif (ret = rootpath(ret.basename, ascend: dependroot)).exist?
+            ret
           end
-        rescue StandardError => e
+        rescue => e
           log.debug e
-          file
+          ret
         end
 
         def nolockfile?(prefix = dependbin)