squared 0.8.5 → 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
@@ -1004,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
@@ -1145,6 +1119,8 @@ module Squared
                                'source+,destination'
                              when :revert
                                'commit+'
+                             when :show
+                               'format?'
                              end
                     after = case flag
                             when :add
@@ -1155,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|
@@ -1519,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
@@ -1862,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'
@@ -1963,6 +1940,7 @@ 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)
@@ -2053,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
@@ -2145,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
@@ -2222,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
@@ -2337,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
 
@@ -2345,7 +2320,9 @@ 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
@@ -2570,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
@@ -2581,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

@@ -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
@@ -545,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
@@ -662,7 +664,7 @@ module Squared
                 end
                 if nolockfile?(prefix: 'yarn')
                   cmd << '--no-lockfile'
-                elsif option('ci') || (ci? && exist?('yarn.lock'))
+                elsif ci? && exist?('yarn.lock')
                   if yarn == 1
                     cmd << '--frozen-lockfile'
                   elsif !flag
@@ -698,14 +700,13 @@ module Squared
                        '--force'
                      elsif nolockfile?(prefix: 'pnpm')
                        '--no-lockfile'
-                     elsif option('ci') || (ci? && exist?('pnpm-lock.yaml'))
+                     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?('package-lock.json'))
-              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
@@ -815,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
@@ -960,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) }
@@ -1039,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 }
 
@@ -1355,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
@@ -1518,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

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

@@ -4,7 +4,7 @@ module Squared
   module Workspace
     module Project
       class Python < Git
-        DEP_PYTHON = %w[poetry.lock setup.cfg pyproject.toml setup.py requirements.txt].freeze
+        DEP_PYTHON = %w[poetry.lock pdm.lock pylock.toml setup.cfg pyproject.toml setup.py requirements.txt].freeze
         DIR_PYTHON = (DEP_PYTHON + %w[meson.build README.rst]).freeze
         OPT_PYTHON = {
           common: %w[b=+ B d E h i I O P q=+ s S u v=+ V=+ x c=q m=b W=b X=q check-hash-based-pycs=b].freeze,
@@ -58,8 +58,8 @@ module Squared
                       u|username=qq].freeze
         }.freeze
         OPT_PDM = {
-          common: %w[I|ignore-python no-cache n|non-interactive].freeze,
-          build: %w[C=bm no-clean no-isolation no-sdist no-wheel q|quiet v|verbose=+ config-setting=q d|dest=p
+          common: %w[c|config I|ignore-python no-cache n|non-interactive].freeze,
+          build: %w[C=bm no-clean no-isolation no-sdist no-wheel q|quiet v|verbose=+ config-setting=qq d|dest=p
                     p|project=p k|skip=b].freeze,
           publish: %w[no-build no-very-ssl q|quiet S|sign skip-existing v|verbose=+ ca-certs=p c|comment=q d|dest=p
                       i|identity=b P|password=q p|project=p r|repository=q k|skip=b u|username=qq].freeze
@@ -131,7 +131,7 @@ module Squared
             initialize_build(Python.ref, **kwargs)
             initialize_env(**kwargs)
           end
-          dependfile_set(DEP_PYTHON, default: 2)
+          dependfile_set(DEP_PYTHON, default: 4)
           serve_set kwargs[:serve]
           editable_set editable
           venv_set kwargs[:venv]
@@ -297,7 +297,7 @@ module Squared
                           install flag, ['upgrade', *args.to_a, 'pip']
                         end
                       when :freeze
-                        format_desc action, flag, "file?=#{DEP_PYTHON[4]},u/ninstall?,opts*"
+                        format_desc action, flag, "file?=#{DEP_PYTHON[6]},u/ninstall?,opts*"
                         task flag do |_, args|
                           opts = args.to_a
                           if has_value!(opts, 'u', 'uninstall')
@@ -351,7 +351,7 @@ module Squared
                                            'eager'
                                          when /^only-if|needed$/
                                            'only-if-needed'
-                                         end.yield_self do |val|
+                                         end.then do |val|
                                            if val
                                              args.extras << "upgrade-strategy=#{val}"
                                            else
@@ -430,7 +430,17 @@ module Squared
             workspace.rev_clear(name, sync: sync)
             if !flag && poetry?
               cmd = poetry_session 'install -n'
+              if prod?
+                cmd << '--only=main'
+              else
+                option('with') { |val| cmd << basic_option('with', val) }
+                option('without') { |val| cmd << basic_option('without', val) }
+              end
               cmd << '--no-root' if option('no-root')
+            elsif !flag && pdm?
+              cmd = pdm_session 'install'
+              cmd << '--prod' if prod?
+              option('G', 'group') { |val| cmd << basic_option('G', val) }
             else
               cmd = pip_session 'install'
               cmd << '--upgrade-strategy=eager' if env('UPDATE') || env('PYTHON_UPDATE')
@@ -447,9 +457,13 @@ module Squared
               else
                 append_global
               end
-              if exist?(DEP_PYTHON[4]) && !session_arg?('r', 'requirement')
-                cmd << basic_option('r', DEP_PYTHON[4])
-                cmd << basic_option('c', 'constraints.txt') if exist?('constraints.txt')
+              unless session_arg?('r', 'requirement')
+                if exist?(DEP_PYTHON[2])
+                  cmd << basic_option('r', DEP_PYTHON[2])
+                elsif exist?(DEP_PYTHON[6])
+                  cmd << basic_option('r', DEP_PYTHON[6])
+                  cmd << basic_option('c', 'constraints.txt') if exist?('constraints.txt')
+                end
               end
               append_editable
             end
@@ -569,8 +583,9 @@ module Squared
             end
             if found > 0
               items = if se
-                        choice('Select a package', items.map(&:first),
-                               multiple: true, force: false, index: true, border: true).map { |n| items[n.pred].last }
+                        choice('Select a package', items.map(&:first), multiple: true, force: false, index: true,
+                                                                       border: true, **parse_select)
+                          .map { |n| items[n.pred].last }
                       elsif ia
                         items.map(&:last)
                       else
@@ -786,7 +801,7 @@ module Squared
             ret = kwargs[:requirement] || begin
               file = op.detect { |val| op.exist?(val) }
               op.remove(file) if file
-              basepath(file || DEP_PYTHON[4])
+              basepath(file || DEP_PYTHON[6])
             end
             op.add_quote(ret)
               .clear
@@ -832,7 +847,7 @@ module Squared
           end
           print_run(op, banner, **kwargs)
           run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception?), from: symjoin('pip', flag))
-            .yield_self { |val| ret || val }
+            .then { |val| ret || val }
         end
 
         def serve(root, opts = [], bind: 'localhost', port: nil, **)
@@ -1039,7 +1054,15 @@ module Squared
                     end
                   end
                   ret.last[1] += val
-                elsif line.strip =~ /^(\S+)\s*=\s*([+-]?[\d.]+|true|false|("""|'''|["'\[{])(.*))$/
+                elsif line.strip =~ /^(\S+)\s*=\s*
+                  (
+                    [+-]?(?:[\d._]+(?:[eE].+)?|0x[\dA-Fa-f]+|0[ob]\d+|nan|inf)
+                    |true|false
+                    |\d{4}-\d{2}-\d{2}.*
+                    |\d{2}:\d{2}.*
+                    |("""|'''|["'\[{])(.*)
+                  )$/x
+                  name = $1
                   if (val = $4)
                     case (ch = $3)
                     when '{', '['
@@ -1059,11 +1082,21 @@ module Squared
                             true
                           when 'false'
                             false
+                          when /^\d{4}-/
+                            Time.parse(ch)
+                          when /^\d{2}:/
+                            Time.strptime(ch, '%T')
+                          when /nan$/
+                            Float::NAN
+                          when /inf$/
+                            Float::INFINITY * (ch[0] == '-' ? -1 : 1)
+                          when /^[+-]?0[xob]/
+                            eval ch
                           else
                             ch.include?('.') ? ch.to_f : ch.to_i
                           end
                   end
-                  ret << [$1, val]
+                  ret << [name, val]
                 end
                 if !ch && (val = ret.last[1]).is_a?(String) && (val.match?(/\A\{.+\}\z/m) || val.match?(/\A\[.+\]\z/m))
                   ret.last[1] = JSON.parse(val) rescue nil
@@ -1082,7 +1115,7 @@ module Squared
         end
 
         def pyprojectfile
-          @pyprojectfile = basepath!(DEP_PYTHON[2]) || false if @pyprojectfile.nil?
+          @pyprojectfile = basepath!(DEP_PYTHON[4]) || false if @pyprojectfile.nil?
           @pyprojectfile || nil
         end
 
@@ -1139,7 +1172,7 @@ module Squared
           if windows?
             shell_quote(venvbin.join(powershell? ? 'Activate.ps1' : 'activate.bat'), option: false)
           else
-            { 'VIRTUAL_ENV' => venv.to_s, 'PATH' => "#{venvbin}:#{ENV['PATH']}" }
+            { 'VIRTUAL_ENV' => venv.to_s, 'PATH' => task_join(venvbin, ENV['PATH']) }
           end
         end
 
@@ -1221,6 +1254,8 @@ module Squared
               if poetry?
                 dir += (windows? ? 'Scripts/python.exe' : 'bin/python')
                 cmd = poetry_session 'env use'
+              elsif pdm?
+                cmd = pdm_session 'use -f'
               else
                 puts "Success: #{dir}"
                 return
@@ -1264,13 +1299,17 @@ module Squared
         end
 
         def setuptools?
-          dependtype == 2 || dependtype == 4
+          dependtype == 4 || dependtype == 6
         end
 
         def poetry?
           dependtype == 1
         end
 
+        def pdm?
+          dependtype == 2
+        end
+
         def twine?
           venv_package?('twine')
         end
@@ -1280,7 +1319,7 @@ module Squared
         end
 
         def requirements?
-          dependtype == 5
+          dependtype == 7
         end
       end