squared 0.8.7 → 0.9.0.pre1

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

@@ -53,7 +53,7 @@ module Squared
                   opts = options
                   val.is_a?(String) ? val : key.to_s
                 end
-          unless uri.match?(GIT_PROTO) || Pathname.new(uri).absolute?
+          unless uri.match?(GIT_PROTO) || File.absolute_path?(uri)
             if uri.start_with?('.')
               uri = rootpath uri
             elsif base
@@ -135,8 +135,7 @@ module Squared
       def rev_write(name = nil, data = nil, sync: true, utc: nil)
         return unless @revfile
 
-        sleep 0 while !sync && @revlock
-        @revlock = true
+        (@revlock ||= Monitor.new).enter unless sync
         if name
           data&.each { |key, val| rev_entry(name, key, val: val) }
           rev_timeutc(name, utc) if utc
@@ -145,7 +144,7 @@ module Squared
       rescue => e
         warn log_warn(e, pass: true) if warning
       ensure
-        @revlock = false
+        @revlock.exit unless sync
       end
     end
 
@@ -204,6 +203,8 @@ module Squared
                        X|strategy-option=b].freeze,
             rm: %w[r cached f|force n|dry-run ignore-unmatch pathspec-file-nul q|quiet sparse
                    pathspec-from-file=p].freeze,
+            show: %w[t combined-all-paths no-diff-merges remerge-diff show-notes-by-default show-signature diff-merges=b
+                     encoding=b expand-tabs=i notes=q show-notes=q?].freeze,
             'sparse-checkout': %w[cone sparse-index no-cone no-sparse-index skip-checks].freeze
           }.freeze,
           log: {
@@ -270,8 +271,6 @@ module Squared
                         branches=q? default=q disambiguate=b exclude=q exclude-hidden=b git-path=p glob=q
                         output-object-format=b path-format=b? prefix=q remotes=q? resolve-git-dir=p short=i?
                         show-object-format=b? since=q tags=q? until=q].freeze,
-          show: %w[t combined-all-paths no-diff-merges remerge-diff show-notes-by-default show-signature diff-merges=b
-                   encoding=b expand-tabs=i notes=q show-notes=q?].freeze,
           sparse_checkout: {
             add: %w[skip-checks].freeze,
             clean: %w[n f v].freeze
@@ -370,7 +369,7 @@ module Squared
           'range-diff' => %i[view between contain].freeze,
           'fetch' => %i[origin remote all].freeze,
           'files' => %i[cached modified deleted others].freeze,
-          'git' => %i[add blame clean grep mv revert rm sparse-checkout status].freeze,
+          'git' => %i[add blame clean grep mv revert rm show sparse-checkout status].freeze,
           'log' => %i[grep view between contain].freeze,
           'merge' => %i[commit no-commit send].freeze,
           'pull' => %i[origin remote all].freeze,
@@ -381,7 +380,6 @@ module Squared
           'reset' => %i[commit index patch mode undo].freeze,
           'restore' => %i[source staged worktree].freeze,
           'rev' => %i[commit branch build output].freeze,
-          'show' => %i[format oneline textconv].freeze,
           'sparse-checkout' => %i[add reapply list clean disable].freeze,
           'stash' => %i[push pop apply drop command].freeze,
           'submodule' => %i[status update branch url sync].freeze,
@@ -814,11 +812,6 @@ module Squared
                         end
                         branch(flag, refs: refs, remote: remote)
                       end
-                    when :list
-                      format_desc action, flag, 'opts*,pattern*'
-                      task flag do |_, args|
-                        branch flag, args.to_a
-                      end
                     when :move, :copy
                       format_desc action, flag, 'branch,oldbranch?'
                       task flag, [:branch, :oldbranch] do |_, args|
@@ -832,9 +825,9 @@ module Squared
                         branch(flag, refs: [oldbranch, branch])
                       end
                     else
-                      format_desc action, flag
-                      task flag do
-                        branch flag
+                      format_desc(action, flag, ('opts*,pattern*' if flag == :list))
+                      task flag do |_, args|
+                        branch flag, args.to_a
                       end
                     end
                   when 'clone'
@@ -914,25 +907,6 @@ module Squared
                         reset flag
                       end
                     end
-                  when 'show'
-                    case flag
-                    when :oneline
-                      format_desc action, flag, 'opts*,object*'
-                      task flag do |_, args|
-                        show flag, args.to_a
-                      end
-                    when :format
-                      format_desc action, flag, 'format?,opts*,object*'
-                      task flag, [:format] do |_, args|
-                        show(flag, args.extras, format: args.format)
-                      end
-                    when :textconv
-                      format_desc action, flag, 'files+'
-                      task flag do |_, args|
-                        files = param_guard(action, flag, args: args.to_a)
-                        show(flag, files: files)
-                      end
-                    end
                   when 'rebase', 'merge'
                     case flag
                     when :branch
@@ -968,13 +942,10 @@ module Squared
                     when :commit, :'no-commit'
                       format_desc action, flag, 'branch|:,ours|theirs?,opts*'
                       task flag, [:branch] do |_, args|
-                        branch = if args.branch == ':'
-                                   choice_refs('Choose a branch', accept: "#{action.capitalize}?")
-                                 else
-                                   args.branch
-                                 end
-                        current = git_value 'branch --show-current'
+                        branch = args.branch
+                        current = git_spawn('branch --show-current').chomp
                         if branch
+                          branch = choice_refs('Choose a branch', accept: "#{action.capitalize}?") if branch == ':'
                           opts = args.extras
                           if has_value!(opts, 'ours')
                             opts << 's=ort' << 'X=ours'
@@ -1007,7 +978,7 @@ module Squared
                       task flag, [:ref, :size] do |_, args|
                         ref = commithead args.ref
                         size = args.size
-                        if !size && ref.to_i.between?(4, 40)
+                        if !size && ref.to_i.between?(4, 64)
                           size = ref
                           ref = nil
                         end
@@ -1106,7 +1077,7 @@ module Squared
                         git(:remote, args.extras, extras: [name, url])
                       end
                     else
-                      format_desc(action, flag, 'opts*', before: OPT_GIT[:remote])
+                      format_desc action, flag, "#{OPT_GIT[:remote].keys.join('|')},opts*" if TASK_METADATA
                       task flag, [:command] do |_, args|
                         command = param_guard(action, flag, args: args, key: :command)
                         cmd, opts = git_session('remote', opts: args.extras)
@@ -1148,6 +1119,8 @@ module Squared
                                'source+,destination'
                              when :revert
                                'commit+'
+                             when :show
+                               'format?'
                              end
                     after = case flag
                             when :add
@@ -1158,6 +1131,8 @@ module Squared
                               'dir+'
                             when :clean, :rm, :status
                               'pathspec*'
+                            when :show
+                              'object*'
                             end
                     format_desc(action, flag, 'opts*', before: before, after: after)
                     task flag do |_, args|
@@ -1226,7 +1201,7 @@ module Squared
               (heads.dup << cur).each_with_index do |branch, i|
                 next unless (i < heads.size && cur != branch) || i == heads.size
 
-                git_spawn('switch --quiet', force && '--force', shell_quote(branch))
+                git_spawn 'switch --quiet', force && '--force', shell_quote(branch)
                 pull(nil, opts, sync: false, hint: branch) if heads.include?(branch)
               end
               return
@@ -1302,13 +1277,13 @@ module Squared
           if flag
             return unless dir && ref
 
-            url = git_value "config --get remote.#{remotetrack}.url"
+            url = git_spawn("config --get remote.#{remotetrack}.url")
             cmd, opts = git_session('clone', worktree: false, opts: opts)
             op = OptionPartition.new(opts, OPT_GIT[:clone], cmd, project: self, strict: strict?,
                                                                  no: OPT_GIT[:no][:clone])
             op.add_option('b', ref)
               .delim
-              .add_quote(url)
+              .add_quote(url.chomp)
               .add_path(dir)
               .clear
             source
@@ -1501,7 +1476,7 @@ module Squared
             end
             return
           end
-          sha = git_value 'rev-parse --verify HEAD'
+          sha = git_spawn('rev-parse --verify HEAD').chomp
           return if sha.empty?
 
           sync = kwargs.fetch(:sync) { invoked_sync?('revbuild', flag) }
@@ -1522,7 +1497,7 @@ module Squared
           run_p(*Array(kwargs[:before]), sync: sync, from: symjoin(from, 'before')) if kwargs[:before]
           force = if (force = env('REVBUILD_FORCE', strict: true))
                     force != '0' && force != 'false'
-                  elsif (force = ENV['GIT_FORCE'] || ENV['REVBUILD_FORCE'])
+                  elsif (force = env('GIT_FORCE', suffix: false) || env('REVBUILD_FORCE', suffix: false))
                     split_escape(force).any? { |val| val == '1' || val == 'true' || val == name }
                   end
           if !force && (cur = workspace.rev_entry(name)) && cur['revision'] == sha
@@ -1564,7 +1539,7 @@ module Squared
               .clear(pass: false)
           when :commit
             exit 1 unless ref
-            branch ||= git_value('name-rev --name-only', ref)
+            branch ||= git_spawn('name-rev --name-only', ref).chomp
             raise ArgumentError, message('could not resolve upstream branch', hint: ref) if branch.empty?
 
             op.append(remotetrack, "#{ref}:#{branch}")
@@ -1759,7 +1734,7 @@ module Squared
             end
             if (n = op.index('>'))
               patch = op.slice!(n, 2)[1]
-            elsif !op.last.include?('*') && !op.exist?(op.last)
+            elsif !op.exist?(op.last)
               patch ||= op.pop
             end
             append_pathspec op.extras
@@ -1865,8 +1840,7 @@ module Squared
             if adding.empty? && !cached.empty? && banner?
               puts(cached.lines(chomp: true).map { |val| "cached #{shell_quote(val)}" })
             end
-            source co
-            source pu
+            ENV['COMMIT_PUSH'] = git_spawn 'rev-parse --verify HEAD' if source(co) && source(pu) && !dryrun?
           else
             if banner?
               puts 'Nothing to commit'
@@ -1966,13 +1940,13 @@ module Squared
             print_item banner
             ret = write_lines(out, sub: [
               opt_style(color(:green), /^(\*\s+)(\S+)(.*)$/, 2),
+              opt_style(color(:blue), /^(.+)((?<=\[)[^\]]+(?=\]))(.*)$/, 2),
               opt_style(color(:red), %r{^(\s*)(remotes/\S+)(.*)$}, 2)
             ])
             list_result(ret, 'branches', banner: banner, from: from)
             return
           else
-            head = git_value 'rev-parse --abbrev-ref HEAD'
-            if head.empty?
+            if (head = git_spawn('rev-parse --abbrev-ref HEAD').chomp).empty?
               ret = 0
             else
               git_spawn 'fetch --all --prune --quiet' if option('sync')
@@ -2057,35 +2031,6 @@ module Squared
           source(sync: false, stderr: true)
         end
 
-        def show(flag, opts = [], format: nil, files: [])
-          cmd, opts = git_session('show', opts: opts)
-          case flag
-          when :textconv
-            cmd << '--textconv'
-            append_value(files.flat_map { |val| Dir[val] }
-                              .select { |val| projectpath?(val) }
-                              .map { |val| "HEAD:#{val}" })
-            source(banner: false)
-            return
-          when :oneline
-            format = flag.to_s
-          end
-          case format
-          when 'oneline', 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'raw'
-            cmd << basic_option('format', format)
-          when /^t?format:|%/
-            cmd << quote_option('pretty', format)
-          else
-            opts << format if format
-          end
-          list = OPT_GIT[:show] + OPT_GIT[:diff][:show] + collect_hash(OPT_GIT[:log], pass: [:base])
-          op = OptionPartition.new(opts, list, cmd,
-                                   project: self, strict: strict?,
-                                   no: OPT_GIT[:no][:show] + collect_hash(OPT_GIT[:no][:log], pass: [:base]))
-          op.append
-          source(exception: false, banner: flag != :oneline)
-        end
-
         def rev_parse(flag, opts = [], ref: nil, size: nil)
           cmd, opts = git_session('rev-parse', opts: opts)
           case flag
@@ -2099,7 +2044,7 @@ module Squared
                                                                            else
                                                                              ref
                                                                            end)
-            return git_value(cmd, exception: false)
+            return git_spawn(cmd, exception: false).chomp
           when :output
             if opts.delete('sq-quote')
               cmd << '--sq-quote'
@@ -2149,18 +2094,28 @@ module Squared
 
         def git(flag, opts = [], extras: [])
           cmd, opts = git_session(flag, opts: opts)
-          list = OPT_GIT[:git].fetch(flag, []) + OPT_GIT.fetch(flag, []).yield_self { |a| a.is_a?(Array) ? a : [] }
+          list = OPT_GIT[:git].fetch(flag, []) + OPT_GIT.fetch(flag, []).then { |a| a.is_a?(Array) ? a : [] }
+          no = OPT_GIT[:no].fetch(flag, [])
           case flag
           when :add
             list.concat(OPT_GIT[:log][:diff_context])
           when :revert
             list.concat(VAL_GIT[:rebase][:send])
+          when :show
+            list.concat(OPT_GIT[:diff][:show], collect_hash(OPT_GIT[:log], pass: [:base]))
+            no += collect_hash(OPT_GIT[:no][:log], pass: [:base])
+            case opts.first
+            when 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'raw'
+              cmd << basic_option('format', opts.shift)
+            when /^t?format:|%/
+              cmd << quote_option('pretty', opts.shift)
+            end
           when :'sparse-checkout'
             cmd << 'set'
           end
-          op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?, no: OPT_GIT[:no][flag],
+          op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?, no: no,
                                                     first: case flag
-                                                           when :blame, :revert, :'sparse-checkout' then nil
+                                                           when :blame, :revert, :show, :'sparse-checkout' then nil
                                                            else matchpathspec
                                                            end)
           case flag
@@ -2226,6 +2181,20 @@ module Squared
                 op.add_quote(val)
               end
             end
+          when :show
+            if op.arg?('textconv')
+              op.each do |val|
+                files = Dir[val]
+                if files.empty? || !files.all? { |path| projectpath?(path) }
+                  op.add_quote(val)
+                else
+                  op.append(files.map { |path| "HEAD:#{path}" })
+                end
+              end
+            else
+              op.append
+            end
+            return source(exception: false, banner: !op.arg?('oneline', 'textconv'))
           end
           case flag
           when :revert, :mv, :rm
@@ -2341,7 +2310,9 @@ module Squared
           end
           args = []
           args << quote_option('sort', sort) if sort
-          args << basic_option('count', env('GIT_COUNT', ARG[:CHOICE])) if count
+          if count && (count = env('GIT_COUNT') || ARG[:CHOICE]) && count != Float::INFINITY
+            args << basic_option('count', count)
+          end
           choice_index(msg, foreachref(type, *args, format: format), trim: trim, **kwargs)
         end
 
@@ -2349,11 +2320,13 @@ module Squared
           kwargs[:attempts] ||= 1 unless force
           cmd = git_output(reflog && env('GIT_REFLOG') ? 'reflog' : 'log', range)
           cmd << quote_option('format', "#{commitstyle('%h')} %s")
-          cmd << basic_option('max-count', env('GIT_COUNT', ARG[:CHOICE])) if count
+          if count && (count = env('GIT_COUNT') || ARG[:CHOICE]) && count != Float::INFINITY
+            cmd << basic_option('max-count', count)
+          end
           ret = choice_index(msg, git_spawn(cmd, stdout: false), column: /^(\S+)/, force: force, **kwargs)
           case ret
           when Array
-            ret.map { |val| val.is_a?(Array) ? val.map { |s| s&.stripstyle } : val&.stripstyle }
+            ret.map { |val| val&.stripstyle }
           when String
             ret.stripstyle
           else
@@ -2531,10 +2504,6 @@ module Squared
                                                                       stdout: stdout, banner: banner, **kwargs)
         end
 
-        def git_value(*cmd, exception: true)
-          git_spawn(*cmd, exception: exception).chomp
-        end
-
         def git_grep(cmd, *grep, equals: true, **kwargs)
           ret = []
           git_spawn(cmd, **kwargs).lines(chomp: true).each do |line|
@@ -2578,8 +2547,8 @@ module Squared
           n = origin&.index('/')
           raise message("missing #{origin ? 'branch' : 'remote'} name", hint: origin) unless n && branch
 
-          branch = "#{branch}:#{origin[n.succ..-1]}" unless origin.end_with?("/#{branch}")
-          ret = [origin[0..n.pred], branch]
+          branch = task_join branch, origin[n.succ..] unless origin.end_with?("/#{branch}")
+          ret = [origin[...n], branch]
           ret.quote! if quote
           ret
         end
@@ -2589,7 +2558,7 @@ module Squared
         end
 
         def commithash(val)
-          val[/\A:(\h{5,40})\z/, 1]
+          val[/\A:(\h{5,64})\z/, 1]
         end
 
         def commithead(val)

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

@@ -69,7 +69,7 @@ module Squared
           install: %w[check-cache check-resolutions immutable immutable-cache inline-builds json refresh-lockfile
                       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 i|interactive no-time-gate T|tilde mode=b].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,
@@ -104,6 +104,9 @@ module Squared
           build: %w[clean=!? dry=!? force=!? v|verbose=!?].freeze,
           watch: %w[excludeDirectories=p excludeFiles=p fallbackPolling=b synchronousWatchDirectory=!? watchDirectory=b
                     watchFile=b].freeze,
+          v7: {
+            compiler: %w[builders=i checkers=i singleThreaded=!?]
+          },
           v5: {
             compiler: %w[allowSyntheticDefaultImports=!? alwaysStrict=!? baseUrl=p downlevelIteration=!?
                          esModuleInterop=!? outFile=p].freeze
@@ -305,11 +308,13 @@ module Squared
                   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$/)
-                      bump version.to_sym
+                    if version.match?(/^((pre)?(major|minor|patch))|prerelease$/)
+                      flag = version.to_sym
+                      version = nil
                     else
-                      bump :version, version
+                      flag = :version
                     end
+                    bump flag, version
                   end
                 when 'pack'
                   format_desc action, nil, 'opts*'
@@ -543,8 +548,7 @@ module Squared
                     Open3.capture2e(cmd.to_s)
                          .first
                          .scan(/^npm notice \d+(?:\.\d+)?[a-z]+ (.+)$/i)
-                         .map { |item| Pathname.new(item.first) }
-                         .select(&:exist?)
+                         .filter_map { |item| item.first if File.exist?(item.first) }
                   end.concat(Array(files))
                   packed = true
                 end
@@ -660,7 +664,7 @@ module Squared
                 end
                 if nolockfile?(prefix: 'yarn')
                   cmd << '--no-lockfile'
-                elsif option('ci') || (ci? && exist?(yarnlock))
+                elsif ci? && exist?('yarn.lock')
                   if yarn == 1
                     cmd << '--frozen-lockfile'
                   elsif !flag
@@ -696,14 +700,13 @@ module Squared
                        '--force'
                      elsif nolockfile?(prefix: 'pnpm')
                        '--no-lockfile'
-                     elsif option('ci') || (ci? && exist?(pnpmlock))
+                     elsif ci? && exist?('pnpm-lock.yaml')
                        '--frozen-lockfile'
                      end
               cmd << '--ignore-scripts' if option('ignore-scripts')
               cmd << '--dangerously-allow-all-builds' if option('approve-builds')
             else
-              ci = option('ci', prefix: 'npm') || (ci? && exist?(npmlock))
-              cmd = session('npm', ci ? 'ci' : 'install')
+              cmd = session('npm', ci = ci? && exist?('package-lock.json') ? 'ci' : 'install')
               option('approve-scripts') do |val|
                 cmd = npm_output 'approve-scripts'
                 cmd << case val
@@ -756,7 +759,7 @@ module Squared
                   append_platform
                 end
               end
-              cmd << '--package-lock=false' << '--save=false' if nolockfile?(prefix: 'npm')
+              cmd << '--package-lock=false' << 'save=false' if nolockfile?(prefix: 'npm')
               cmd << '--ignore-scripts' if option('ignore-scripts')
             end
             if add
@@ -769,7 +772,7 @@ module Squared
         end
 
         def outdated(flag = nil, opts = [], sync: invoked_sync?('outdated', flag))
-          cmd = session(pnpm? && exist?(pnpmlock) ? 'pnpm' : 'npm', 'outdated')
+          cmd = session(pnpm? && exist?('pnpm-lock.yaml') ? 'pnpm' : 'npm', 'outdated')
           dryrun = has_value?(opts, 'd', 'dry-run') || dryrun?
           unless dryrun
             log.info cmd.to_s
@@ -813,7 +816,7 @@ module Squared
               latest = val['latest']
               ch = file[0]
               if ch.match?(/[~^]/)
-                file = file[1..-1]
+                file = file[1..]
               elsif ia && flag == :major
                 major = true
               else
@@ -958,7 +961,7 @@ module Squared
                   (1..items.size)
                 else
                   choice('Select a package', items.map(&:first), multiple: true, force: false, index: true,
-                                                                 border: true)
+                                                                 border: true, **parse_select)
                 end.each do |n|
                   item = items[n.pred].last
                   doc.sub!(pat.call(item)) { edit.call(item, $1, $2) }
@@ -1037,7 +1040,7 @@ module Squared
                 c = 0
                 e = 0
                 doc['files'].each do |item|
-                  path = item['path'][n..-1]
+                  path = item['path'][n..]
                   js = File.extname(path)
                   next unless ext.empty? || ext.any? { |val| val == js }
 
@@ -1353,7 +1356,8 @@ module Squared
           b = kwargs[:build]
           w = kwargs[:watch]
           list = OPT_TSC[:base] + OPT_TSC[:compiler]
-          list.concat(Array(kwargs.fetch(:legacy, 5)).flat_map { |n| OPT_TSC.fetch(:"v#{n}", {}).fetch(:compiler, []) })
+          kwargs[:legacy] = semapp('npx', 'tsc', '--version', minor: false) if kwargs[:detect]
+          list.concat(Array(kwargs[:legacy]).flat_map { |n| OPT_TSC.fetch(:"v#{n}", {}).fetch(:compiler, []) })
           cmd = session 'tsc', if p
                                  quote_option 'p', basepath(p)
                                elsif b
@@ -1379,7 +1383,7 @@ module Squared
           print_run(cmd, banner, **kwargs)
           session 'npx', cmd
           start = time_epoch if kwargs.fetch(:verbose, verbose? && !stdin?)
-          ret = run(sync: sync, banner: banner, exception: exception?(**kwargs), from: from)
+          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
@@ -1450,7 +1454,7 @@ module Squared
         end
 
         def yarn?
-          (@pm[:yarn] ||= if rootpath(yarnlock, ascend: dependroot).exist?
+          (@pm[:yarn] ||= if rootpath('yarn.lock', ascend: dependroot).exist?
                             yarntype
                           elsif (ver = read_package || read_install)
                             if ver =~ /^yarn(?:@(\d)|$)/
@@ -1471,7 +1475,7 @@ module Squared
         end
 
         def pnpm?
-          (@pm[:pnpm] ||= if rootpath(pnpmlock, ascend: dependroot).exist?
+          (@pm[:pnpm] ||= if rootpath('pnpm-lock.yaml', ascend: dependroot).exist?
                             pnpmtype
                           elsif (ver = read_package || read_install)
                             ver.start_with?('pnpm') ? pnpmtype : 0
@@ -1516,7 +1520,7 @@ module Squared
         end
 
         def scripts
-          @scripts ||= read_package('scripts').yield_self { |ret| ret.is_a?(Hash) ? ret : {} }
+          @scripts ||= read_package('scripts').then { |ret| ret.is_a?(Hash) ? ret : {} }
         end
 
         private
@@ -1580,7 +1584,7 @@ module Squared
             require 'yaml'
             doc = YAML.load_file(rc)
             doc.nodeLinker == 'node-modules' ? 2 : 3
-          elsif exist && !exist?(yarnlock)
+          elsif exist && !exist?('yarn.lock')
             0
           else
             1
@@ -1592,10 +1596,6 @@ module Squared
           3
         end
 
-        def yarnlock
-          'yarn.lock'
-        end
-
         def pnpmtype(exist: false)
           require 'yaml'
           doc = YAML.load_file(basepath('node_modules/.modules.yaml', ascend: dependroot))
@@ -1610,21 +1610,13 @@ module Squared
           end
         rescue => e
           if exist
-            %W[#{pnpmlock} pnpm-workspace.yaml].any? { |val| exist?(val) } ? 4 : 0
+            %w[pnpm-lock.yaml pnpm-workspace.yaml].any? { |val| exist?(val) } ? 4 : 0
           else
             log.debug e
             4
           end
         end
 
-        def pnpmlock
-          'pnpm-lock.yaml'
-        end
-
-        def pnpmopts(*args)
-          OPT_PNPM[:common] + args.flat_map { |name| OPT_PNPM.fetch(name, []) }
-        end
-
         def remove_modules(prefix: dependbin)
           modules = basepath!('node_modules', type: 'd')
           return false unless modules && confirm_basic('Remove?', modules, prefix: prefix)
@@ -1706,16 +1698,16 @@ module Squared
           ].concat(args)
         end
 
-        def npmlock
-          'package-lock.json'
-        end
-
         def npmopts(*args)
           OPT_NPM[:common] + args.flat_map { |name| OPT_NPM.fetch(name, []) }
         end
 
+        def pnpmopts(*args)
+          OPT_PNPM[:common] + args.flat_map { |name| OPT_PNPM.fetch(name, []) }
+        end
+
         def lockfile(delete = false)
-          ret = basepath(yarn? ? yarnlock : pnpm? ? pnpmlock : npmlock)
+          ret = basepath(yarn? ? 'yarn.lock' : pnpm? ? 'pnpm-lock.yaml' : 'package-lock.json')
           if ret.exist?
             if delete
               ret.delete