squared 0.7.8 → 0.8.0

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

@@ -159,13 +159,13 @@ module Squared
         subtasks({
           'package' => %i[install add update dedupe approve deny rebuild reinstall].freeze,
           'outdated' => %i[major minor patch].freeze,
-          'bump' => %i[version major minor patch].freeze,
-          'publish' => %i[latest tag verify].freeze,
+          'publish' => %i[latest tag stage verify].freeze,
           'tsc' => %i[project build].freeze,
           'add' => nil,
           'run' => nil,
           'exec' => nil,
           'nvm' => nil,
+          'bump' => nil,
           'pack' => nil
         })
 
@@ -297,6 +297,18 @@ module Squared
                     args.unshift(path.call('nvm-exec'))
                     run(args.join(' '), { 'NODE_VERSION' => version }, banner: false, from: :nvm)
                   end
+                when 'bump'
+                  format_desc action, nil, 'version|pre?{major,minor,patch}|prerelease'
+                  task action, [:version] do |_, args|
+                    version = param_guard(action, 'to', args: args, key: :version)
+                    if version.match?(/^((pre)?(major|minor|patch))|prerelease$/)
+                      flag = version.to_sym
+                      version = nil
+                    else
+                      flag = :version
+                    end
+                    bump flag, version
+                  end
                 when 'pack'
                   format_desc action, nil, 'opts*'
                   task action do |_, args|
@@ -321,21 +333,6 @@ module Squared
                       task flag do |_, args|
                         package flag, args.to_a
                       end
-                    when 'bump'
-                      break unless version
-
-                      if flag == :version
-                        format_desc action, flag, 'version'
-                        task flag, [:version] do |_, args|
-                          version = param_guard(action, flag, args: args, key: :version)
-                          bump flag, version
-                        end
-                      else
-                        format_desc action, flag
-                        task flag do
-                          bump flag
-                        end
-                      end
                     when 'publish'
                       if flag == :verify
                         format_desc action, flag, 'version?,ext*'
@@ -348,22 +345,70 @@ module Squared
                           publish(flag, version: version, ext: ext)
                         end
                       else
-                        format_desc(action, flag, 'otp?,p/ublic|r/estricted?,d/ry-run?',
-                                    before: ('tag' if flag == :tag))
+                        format_desc(action, flag,
+                                    "otp?,#{'registry?,' if flag == :stage}p/ublic|r/estricted?,d/ry-run?",
+                                    before: case flag
+                                            when :tag then 'tag'
+                                            when :stage then '{select=view,approve,reject,download}|publish=tag?'
+                                            end)
                         task flag do |_, args|
                           args = args.to_a
-                          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
+                          access = nil
+                          dryrun = nil
+                          stage = []
+                          parse = lambda do
+                            access = if has_value!(args, 'r', 'restricted')
+                                       'restricted'
+                                     elsif has_value!(args, 'p', 'public')
+                                       'public'
+                                     end
+                            dryrun = has_value!(args, 'd', 'dry-run')
+                          end
+                          case flag
+                          when :stage
+                            case args.first
+                            when 'view', 'approve', 'reject', 'download'
+                              out = pwd_set { `#{npm_output("stage list #{npmname} --json --loglevel=error")}` }
+                              pad0 = 0
+                              pad1 = 0
+                              data = Array(parse_json(out, kind: Array)).map do |item|
+                                ver = item['version']
+                                tag = item['tag']
+                                pad0 = [pad0, ver.size].max
+                                pad1 = [pad1, tag.size].max
+                                [ver, tag, item['id'], item['actor']]
+                              end
+                              if data.empty?
+                                print_error('no staged releases', loglevel: Logger::INFO, subject: npmname)
+                                exit 1
+                              end
+                              data.each do |item|
+                                item[0] = item[0].rjust(pad0)
+                                item[1] = item[1].rjust(pad1)
+                              end
+                              stage << args.shift
+                              stage << choice_index('Select a release', data.map { |item| item.join('    ') },
+                                                    column: /^(?:\S+\s+){2}(\S+)/)
+                              if %w[approve reject].include?(stage.first)
+                                otp = args.shift if args.first&.match?(/^\d+$/)
+                                registry = args.first
+                                option('otp', prefix: 'npm') { |val| otp = val }
+                                option('registry', prefix: 'npm') { |val| registry = val }
+                              end
+                            else
+                              stage << 'publish'
+                              parse.call
+                              tag, otp = args
+                            end
+                          when :latest
+                            parse.call
                             otp = args.first
                           else
+                            parse.call
                             tag, otp = param_guard(action, flag, args: args)
                           end
-                          publish(flag, otp: otp, tag: tag, access: access, dryrun: dryrun)
+                          publish(flag, otp: otp, tag: tag, access: access, stage: stage, registry: registry,
+                                        dryrun: dryrun)
                         end
                       end
                     when 'tsc'
@@ -420,7 +465,7 @@ module Squared
           return if items.empty?
 
           on :first, :copy
-          print_item unless @output[0] || silent? || task_invoked?(/^copy(?::#{Node.ref}|$)/)
+          print_item unless @output[0] || silent? || task_invoked?(/^copy(:#{Node.ref}|$)/)
           packed = false
           items.each do |dir|
             case dir
@@ -435,7 +480,7 @@ module Squared
                        @workspace.rev_clear(proj.name, sync: sync)
                        proj.path
                      else
-                       log.warn message("copy project :#{dir}", hint: 'missing')
+                       log.warn message('target not found', dir, hint: 'copy')
                        nil
                      end
             when Hash
@@ -455,7 +500,7 @@ module Squared
               dest = dir.path
               @workspace.rev_clear(dir.name, sync: sync)
             else
-              raise_error TypeError, "unknown: #{dir}", hint: 'copy'
+              raise TypeError, message('unknown', dir, hint: 'copy')
             end
             next unless from && dest&.directory?
 
@@ -517,7 +562,7 @@ module Squared
                 if sub
                   target << [entry, dest.join(into, sub)]
                 else
-                  log.debug message("#{dependname} in \"#{entry}\"", hint: 'missing')
+                  log.debug message("missing #{dependname} in \"#{entry}\"", hint: 'copy')
                 end
               end
             else
@@ -566,7 +611,7 @@ module Squared
             rm = lambda do |target|
               return if remove.empty?
 
-              run(target.temp(*remove).sub!(/ (?:add|install) /, ' remove '), sync: sync, from: :remove)
+              run(target.temp(*remove).sub!(/ (add|install) /, ' remove '), sync: sync, from: :remove)
             end
             yarn = dependtype(:yarn)
             if yarn > 0
@@ -583,7 +628,7 @@ module Squared
                   cmd << '--mode=skip-build' if option('ignore-scripts')
                   cmd << '--check-cache' if !flag && option('force')
                 end
-                if nolockfile?('yarn')
+                if nolockfile?(prefix: 'yarn')
                   cmd << '--no-lockfile'
                 elsif option('ci')
                   if yarn == 1
@@ -619,7 +664,7 @@ module Squared
               cmd << '--ignore-workspace' if ws
               cmd << if option('force')
                        '--force'
-                     elsif nolockfile?('pnpm')
+                     elsif nolockfile?(prefix: 'pnpm')
                        '--no-lockfile'
                      elsif option('ci')
                        '--frozen-lockfile'
@@ -661,7 +706,7 @@ module Squared
                   append_platform
                 end
               end
-              cmd << '--package-lock=false' << 'save=false' if nolockfile?('npm')
+              cmd << '--package-lock=false' << 'save=false' if nolockfile?(prefix: 'npm')
               cmd << '--ignore-scripts' if option('ignore-scripts')
             end
             if add
@@ -741,7 +786,7 @@ module Squared
               end
               next unless (current != want || file != want) && (want.match?(SEM_VER) || !file.match?(SEM_VER))
 
-              f = semscan file
+              f = semscan(file, fill: !option('save-exact').nil?)
               w = semscan want
               a = f[0]
               b = f[2]
@@ -751,8 +796,12 @@ module Squared
                         when :major
                           a == '0' ? c == '0' || c == '1' : true
                         when :minor
+                          next unless f[4]
+
                           ch == '^' && (a == '0' ? c == '0' && b == d : a == c)
                         when :patch
+                          next unless b && f[4]
+
                           a == c && b == d && f[4] != w[4]
                         end
               if upgrade && !w[6]
@@ -764,7 +813,7 @@ module Squared
                                              a == '0' ? 1 : 3
                                            else
                                              5
-                                           end, major, f, w]
+                                           end, major, semscan(file), w]
               elsif !major
                 avail << [key, file, latest, latest != current]
               end
@@ -912,18 +961,14 @@ module Squared
         end
 
         def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, access: nil, dryrun: nil,
-                    version: nil, ext: [], workspace: false)
+                    version: nil, stage: [], registry: nil, ext: [], workspace: false)
           if read_package('private')
-            return if workspace
+            return if workspace || !stage.empty?
 
-            ws = children.select { |proj| proj.ref?(Node.ref) }
-            if ws.empty?
-              print_error('nothing to publish', subject: name, hint: 'private')
-            elsif confirm_basic("#{flag == :verify ? 'Verify' : 'Publish'} workspace?", ws.map(&:name).join(', '), 'N')
-              ws.each do |proj|
-                proj.publish(flag, sync: sync, otp: otp, tag: tag, access: access, dryrun: dryrun, version: version,
-                                   ext: ext, workspace: true)
-              end
+            from, accept = flag == :verify ? %w[verify Y] : %w[publish N]
+            each(accept: accept, ref: Node.ref, from: from) do |proj|
+              proj.publish(flag, sync: sync, otp: otp, tag: tag, access: access, dryrun: dryrun, version: version,
+                                 ext: ext, workspace: true)
             end
           elsif version ||= self.version
             if flag == :verify
@@ -994,24 +1039,35 @@ module Squared
                 end
               end
             else
-              cmd = session 'npm', 'publish'
-              cmd << basic_option('otp', otp) if otp ||= option('otp')
-              cmd << basic_option('tag', tag.tr(' ', '-')) if tag ||= option('tag')
-              case access || option('access')
-              when 'p', 'public'
-                cmd << '--access=public'
-              when 'r', 'restricted'
-                cmd << '--access=restricted'
+              args = ['npm']
+              if stage.empty?
+                args << 'publish'
+              else
+                args << 'stage' << stage.shift
+                args.concat(stage)
               end
-              dryrun ||= dryrun?('npm')
+              cmd = session(*args)
+              if stage.empty?
+                otp ||= option('otp')
+                cmd << basic_option('tag', tag.tr(' ', '-')) if tag ||= option('tag')
+                case access || option('access')
+                when 'p', 'public'
+                  cmd << '--access=public'
+                when 'r', 'restricted'
+                  cmd << '--access=restricted'
+                end
+                dryrun ||= dryrun?(prefix: 'npm')
+              end
+              cmd << basic_option('otp', otp) if otp
+              cmd << quote_option('registry', registry) if registry
               if dryrun
                 cmd << '--dry-run'
               else
-                from = :'npm:publish'
                 log.info cmd.to_s
+                from = symjoin args.take(3)
               end
               if sync
-                run(sync: sync, from: from, interactive: !dryrun && ['Publish', 'N', npmname])
+                run(sync: sync, from: from, interactive: !dryrun && stage.empty? && ['Publish', 'N', npmname])
               else
                 require 'open3'
                 on :first, from
@@ -1026,7 +1082,7 @@ module Squared
               end
             end
           elsif !workspace
-            print_error("version: #{dependname}", subject: name, hint: 'not found')
+            print_error('version not found', subject: name, hint: dependname)
           end
         end
 
@@ -1045,7 +1101,7 @@ module Squared
                                     end
                                   when :reinstall
                                     if yarn == 1
-                                      remove_modules 'yarn' if opts.include?('force')
+                                      remove_modules(prefix: 'yarn') if opts.include?('force')
                                     elsif opts.delete('force')
                                       opts << 'check-cache'
                                     end
@@ -1066,7 +1122,7 @@ module Squared
                                                                          end
                                            end, cmd, project: self, strict: strict?)
             if yarn == 1 && flag != :reinstall
-              op << '--no-lockfile' if nolockfile?('yarn')
+              op << '--no-lockfile' if nolockfile?(prefix: 'yarn')
               op << '--ignore-engines' if option('ignore-engines')
             end
           else
@@ -1079,7 +1135,7 @@ module Squared
                      else
                        case flag
                        when :install, :update
-                         opts << 'no-lockfile' if nolockfile?('pnpm')
+                         opts << 'no-lockfile' if nolockfile?(prefix: 'pnpm')
                          spec = 0 if flag == :update
                        when :add
                          spec = 1
@@ -1109,13 +1165,13 @@ module Squared
                      else
                        case flag
                        when :install, :update
-                         opts.unshift('package-lock=false', 'save=false') if nolockfile?('npm')
+                         opts.unshift('package-lock=false', 'save=false') if nolockfile?(prefix: 'npm')
                          spec = flag == :install ? 0 : 2
                        when :add
                          spec = 1
                          flag = :install
                        when :reinstall
-                         remove_modules 'npm' if opts.delete('force')
+                         remove_modules(prefix: 'npm') if opts.delete('force')
                          opts.unshift('package-lock=false') if lockfile(true)
                          flag = :install
                        end
@@ -1176,35 +1232,41 @@ module Squared
           run(from: from || symjoin('package', flag))
         end
 
-        def bump(flag, val = nil)
-          return unless val ||= sembump(version, flag)
+        def bump(flag = :patch, val = nil, workspace: false)
+          if read_package('private')
+            return if workspace
 
-          doc = dependfile.read
-          if doc.sub!(/"version"\s*:\s*"#{version}"/, "\"version\": \"#{val}\"")
-            unless dryrun?
-              log.info "bump version #{version} to #{val.subhint(flag)}"
-              on :first, :bump
-              dependfile.write(doc)
-            end
-            if stdin?
-              puts val
-            elsif !silent?
-              major = flag == :major
-              emphasize("version: #{val}", title: name, border: borderstyle, sub: [
-                headerstyle,
-                opt_style(color(major ? :green : :yellow), /\A(version:)( )(\S+)(.*)\z/, 3),
-                opt_style(theme[major ? :major : :active], /\A(version:)(.*)\z/)
-              ])
-            end
-            unless dryrun?
-              commit(:add, [dependname], pass: true)
-              on :last, :bump
+            each(accept: 'N', ref: Node.ref, from: 'bump') { |proj| proj.bump(flag, val, workspace: true) }
+          elsif val ||= version && sembump(version, flag)
+            begin
+              doc = dependfile.read
+              unless doc.sub!(/"version"\s*:\s*"#{version}"/, "\"version\": \"#{val}\"")
+                raise message('version not found', hint: dependfile)
+              end
+
+              unless dryrun?
+                log.info "bump version #{version} to #{val.subhint(flag)}"
+                on :first, :bump
+                dependfile.write(doc)
+              end
+              if stdin?
+                puts val
+              elsif !silent?
+                major = flag == :major
+                emphasize("version: #{val}", title: name, border: borderstyle, sub: [
+                  headerstyle,
+                  opt_style(color(major ? :green : :yellow), /\A(version:)( )(\S+)(.*)\z/, 3),
+                  opt_style(theme[major ? :major : :active], /\A(version:)(.*)\z/)
+                ])
+              end
+              unless dryrun?
+                commit(:add, [dependname], pass: true)
+                on :last, :bump
+              end
+            rescue => e
+              on_error(e, dryrun: dryrun?)
             end
-          else
-            raise_error 'version not found', hint: dependfile
           end
-        rescue => e
-          on_error(e, dryrun: dryrun?)
         end
 
         def pack(opts = [])
@@ -1276,7 +1338,8 @@ module Squared
 
           if script
             ret = session dependbin, 'run'
-            raise_error "#{dependbin} run: #{target}", hint: from unless append_any(target, build: true)
+            raise message(dependbin, 'run', target, hint: from) unless append_any(target, build: true)
+
             append_any opts if opts
             append_loglevel
             append_any(args, delim: true) if args
@@ -1290,7 +1353,7 @@ module Squared
             when Enumerable
               target.to_a.join(' ')
             else
-              raise_error TypeError, "unknown: #{target}", hint: 'compose'
+              raise TypeError, message('unknown', target, hint: 'compose')
             end
           end
         end
@@ -1390,11 +1453,7 @@ module Squared
         end
 
         def dependbin
-          if yarn?
-            'yarn'
-          else
-            pnpm? ? 'pnpm' : 'npm'
-          end
+          yarn? ? 'yarn' : pnpm? ? 'pnpm' : 'npm'
         end
 
         def version
@@ -1504,7 +1563,7 @@ module Squared
           end
         end
 
-        def remove_modules(prefix = dependbin)
+        def remove_modules(prefix: dependbin)
           modules = basepath 'node_modules'
           return false unless modules.directory? && confirm_basic('Remove?', modules, prefix: prefix)
 
@@ -1569,7 +1628,7 @@ module Squared
         end
 
         def dependroot
-          dependname if parent&.has?('outdated', Node.ref)
+          dependname if parent&.has?('outdated', ref: Node.ref)
         end
 
         def npmname
@@ -1594,11 +1653,7 @@ module Squared
         end
 
         def lockfile(delete = false)
-          ret = basepath(if yarn?
-                           'yarn.lock'
-                         else
-                           pnpm? ? 'pnpm-lock.yaml' : 'package-lock.json'
-                         end)
+          ret = basepath(yarn? ? 'yarn.lock' : pnpm? ? 'pnpm-lock.yaml' : 'package-lock.json')
           if ret.exist?
             if delete
               ret.delete
@@ -1617,11 +1672,11 @@ module Squared
           @serve != false
         end
 
-        def nolockfile?(prefix = dependbin)
+        def nolockfile?(prefix: dependbin)
           option('package-lock', 'lockfile', prefix: prefix, equals: '0') || !option('no-lockfile', prefix: prefix).nil?
         end
 
-        def dryrun?(prefix = dependbin)
+        def dryrun?(prefix: dependbin)
           super(target: @session, prefix: prefix)
         end
       end