squared 0.8.8 → 0.9.0.pre1

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

@@ -11,7 +11,7 @@ module Squared
           install_a: %w[audit=! bin-links=! engine-strict=!? foreground-scripts=!? fund=! ignore-scripts=!?
                         install-links=!? package-lock=! strict-peer-deps=!? include=b install-strategy=b omit=b].freeze,
           install_b: %w[no-save B|save-bundle D|save-dev O|save-optional save-peer P|save-prod g|global=!?
-                        min-release-age=i min-release-age-exclude=q S|save=!?].freeze,
+                        S|save=!?].freeze,
           install_c: %w[allow-directory=b? allow-file=b? allow-git=b? allow-remote=b?].freeze,
           run: %w[foreground-scripts=!? if-present=!? ignore-scripts=!? script-shell=p].freeze,
           exec: %w[c|call=q package=b].freeze,
@@ -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*'
@@ -329,39 +334,26 @@ module Squared
                     when 'package'
                       case flag
                       when :approve, :deny
-                        format_desc(action, flag, 'opts*', before: flag == :approve ? 'name*|:' : 'name*|:|::')
+                        format_desc action, flag, 'name*|:,opts*'
                         task flag do |_, args|
                           args = args.to_a
-                          if choice!(args) || (flag == :deny && (all = choice!(args, char: '::')))
-                            list = []
-                            pad = 0
-                            size = ->(s) { pad = [pad, s.size].max }
+                          if choice!(args)
                             pwd_set do
-                              json = JSON.parse(`#{npm_output('install-scripts ls --json')}`)
-                              json&.fetch('allowScripts', [])&.each do |data|
-                                line = data['changes']&.find { |item| item['change'] == 'pending' }
-                                next unless line && line['key'] =~ /^(.+)@([^@]+)$/
-
-                                size.call($1)
-                                list << [$1, $2]
-                              end
-                              if all
-                                current = read_package 'allowScripts'
-                                current&.each_pair do |key, val|
-                                  next unless val
-
-                                  md = key.match(/^(.+?)(?:@([^@]+))?$/)
-                                  size.call(md[1])
-                                  list << [md[1], sub_style(md[2] || 'any', theme[:inline])]
-                                end
+                              pad = 0
+                              list = IO.popen(npm_output('approve-scripts --allow-scripts-pending').to_s)
+                                       .each_with_object([]) do |line, out|
+                                         next unless line =~ /^\s+([a-z\d@][^@]*)@(\S+)/
+
+                                         pad = [pad, $1.size].max
+                                         out << [$1, $2]
+                                       end
+                                       .map { |name, ver| name.ljust(pad + 4) + ver }
+                              if list.empty?
+                                puts log_message('no packages to review', subject: name, hint: "#{flag}-scripts")
+                                exit 0
                               end
+                              args.concat(choice_index('Select packages', list, multiple: true, column: /^(\S+)/))
                             end
-                            if list.empty?
-                              puts log_message('no packages to review', subject: name, hint: "#{flag}-scripts")
-                              exit 0
-                            end
-                            list.map! { |name, ver| name.ljust(pad + ARG[:TAB]) + ver }
-                            args.concat(choice_index('Select packages', list, multiple: true, column: /^(\S+)/))
                           end
                           package flag, args
                         end
@@ -556,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
@@ -673,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
@@ -709,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
@@ -769,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
@@ -782,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
@@ -826,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
@@ -899,9 +889,9 @@ module Squared
           end
           print_item banner unless sync
           if !found.empty?
-            col1 = width.call(found, 0) + ARG[:TAB]
-            col2 = width.call(found, 1) + ARG[:TAB]
-            col3 = pad.call(found, found.size).size + (ARG[:TAB] / 2) + col1 + col2 + width.call(found, 2)
+            col1 = width.call(found, 0) + 4
+            col2 = width.call(found, 1) + 4
+            col3 = pad.call(found, found.size).size + 2 + col1 + col2 + width.call(found, 2)
             packages = []
             pat = ->(a) { /("#{Regexp.escape(a[0])}"\s*:\s*)"([~^])#{'?' if a[4]}#{Regexp.escape(a[1])}"/ }
             edit = lambda do |a, pkg, mod|
@@ -971,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) }
@@ -997,9 +987,9 @@ module Squared
               end
             end
           elsif !avail.empty?
-            col1 = width.call(avail, 0) + ARG[:TAB]
+            col1 = width.call(avail, 0) + 4
             col2 = width.call(avail, 1)
-            col3 = width.call(avail, 2) + ARG[:TAB]
+            col3 = width.call(avail, 2) + 4
             avail.each_with_index do |item, i|
               a, b, c, d = item
               a = a.ljust(col1)
@@ -1050,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 }
 
@@ -1366,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
@@ -1392,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
@@ -1463,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)|$)/
@@ -1484,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
@@ -1529,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
@@ -1593,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
@@ -1605,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))
@@ -1623,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)
@@ -1719,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