squared 0.8.6 → 0.9.0.pre2

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,
@@ -483,8 +481,7 @@ module Squared
                     when :url
                       format_desc action, flag, 'path,url,opts*'
                       task flag, [:path, :url] do |_, args|
-                        path = param_guard(action, flag, args: args, key: :path)
-                        url = param_guard(action, flag, args: args, key: :url)
+                        path, url = param_guard(action, flag, args: args, key: %i[path url])
                         submodule(flag, args.extras, path: path, url: url)
                       end
                     else
@@ -665,9 +662,9 @@ module Squared
                     when :files
                       format_desc action, flag, 'path1,path2,patch?'
                       task flag, [:path1, :path2, :patch] do |_, args|
-                        path1 = param_guard(action, flag, args: args, key: :path1)
-                        path2 = param_guard(action, flag, args: args, key: :path2)
-                        diff(flag, refs: [path1, path2, args.patch])
+                        refs = param_guard(action, flag, args: args, key: %i[path1 path2])
+                        refs << args.patch if args.patch
+                        diff(flag, refs: refs)
                       end
                     when :grep
                       format_desc action, flag, 'pattern+,a/ll-match?,in/vert-grep?,i/E/F/P?,max-count?=i,f/ormat?=s'
@@ -814,11 +811,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 +824,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'
@@ -867,8 +859,7 @@ module Squared
                     when :branch
                       format_desc action, flag, 'branch/:,opts*'
                       task flag, [:branch] do |_, args|
-                        branch = args.branch
-                        branch = nil if branch == ':'
+                        branch = args.branch unless args.branch == ':'
                         switch(flag, args.extras, branch: branch || choice_refs('Choose a branch'))
                       end
                     end
@@ -896,7 +887,7 @@ module Squared
                         reset(flag, args.to_a, refs: [])
                       end
                     when :mode
-                      format_desc action, flag, 'mode,ref/:'
+                      format_desc action, flag, 'mode,ref?|:'
                       task flag, [:mode, :ref] do |_, args|
                         mode = param_guard(action, flag, args: args, key: :mode)
                         ref = commithead args.ref
@@ -914,25 +905,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
@@ -1007,7 +979,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
@@ -1099,8 +1071,7 @@ module Squared
                     if flag == :add
                       format_desc action, flag, 'name,url,opts*'
                       task flag, [:name, :url] do |_, args|
-                        name = param_guard(action, flag, args: args, key: :name)
-                        url = param_guard(action, flag, args: args, key: :url)
+                        name, url = param_guard(action, flag, args: args, key: %i[name url])
                         raise ArgumentError, message('invalid url', hint: url) unless url.match?(GIT_PROTO)
 
                         git(:remote, args.extras, extras: [name, url])
@@ -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|
@@ -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
@@ -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,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)
@@ -2057,35 +2032,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
@@ -2149,18 +2095,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 +2182,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 +2311,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,7 +2321,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
@@ -2578,8 +2552,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 +2563,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 interactive T|tilde mode=b].freeze,
+          add_a: %w[C|caret E|exact F|fixed i|interactive no-time-gate 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,
@@ -77,36 +77,37 @@ module Squared
         }.freeze
         OPT_TSC = {
           base: %w[all b|build init listFilesOnly locale=b p|project=p showConfig w|watch].freeze,
-          compiler: %w[allowArbitraryExtensions=!? allowImportingTsExtensions=!? allowJs=!? allowUmdGlobalAccess=!?
-                       allowUnreachableCode=!? allowUnusedLabels=!? assumeChangesOnlyAffectDirectDependencies=!?
-                       charset=b checkJs=!? composite=!? customConditions=q d|declaration=!? declarationDir=p
-                       declarationMap=!? diagnostics=!? disableReferencedProjectLoad=!? disableSizeLimit=!?
-                       disableSolutionSearching=!? emitBOM=!? emitDeclarationOnly=!? emitDecoratorMetadata=!?
-                       erasableSyntaxOnly=!? exactOptionalPropertyTypes=!? experimentalDecorators=!? explainFiles=!?
-                       extendedDiagnostics=!? forceConsistentCasingInFileNames=!? generateCpuProfile=b ignoreConfig=!?
-                       importHelpers=!? importsNotUsedAsValues=b incremental=!? inlineSourceMap=!? inlineSources=!?
-                       isolatedDeclarations=!? isolatedModules=!? jsx=b jsxFactory=q jsxFragmentFactory=q
-                       jsxImportSource=q keyofStringsOnly=!? lib=q libReplacement=!? listEmittedFiles=!? listFiles=!?
-                       mapRoot=p maxNodeModuleJsDepth=i m|module=b moduleDetection=b moduleResolution=b moduleSuffixes=b
-                       newLine=b noCheck=!? noEmit=!? noEmitHelpers=!? noEmitOnError=!? noErrorTruncation=!?
-                       noFallthroughCasesInSwitch=!? noImplicitAny=!? noImplicitOverride=!? noImplicitReturns=!?
-                       noImplicitThis=!? noImplicitUseStrict=!? noLib=!? noPropertyAccessFromIndexSignature=!?
-                       noResolve=!? noStrictGenericChecks=!? noUncheckedIndexedAccess=!? noUncheckedSideEffectImports=!?
-                       noUnusedLocals=!? noUnusedParameters=!? outDir=p paths=q plugins=b preserveConstEnums=!?
-                       preserveSymlinks=!? preserveValueImports=!? preserveWatchOutput=!? pretty=!? reactNamespace=b
-                       removeComments=!? resolveJsonModule=!? resolvePackageJsonExports=!? resolvePackageJsonImports=!?
-                       rewriteRelativeImportExtensions=!? rootDir=p rootDirs=p skipDefaultLibCheck=!? skipLibCheck=!?
-                       sourceMap=!? sourceRoot=p stableTypeOrdering=!? stopBuildOnErrors=!? strict=!?
-                       strictBindCallApply=!? strictBuiltinIteratorReturn=!? strictFunctionTypes=!? strictNullChecks=!?
-                       strictPropertyInitialization=!? stripInternal=!? suppressExcessPropertyErrors=!?
-                       suppressImplicitAnyIndexErrors=!? t|target=b traceResolution=!? tsBuildInfoFile=p typeRoots=p
-                       types=b useDefineForClassFields=!? useUnknownInCatchVariables=!? verbatimModuleSyntax=!?].freeze,
-          build: %w[clean=!? dry=!? force=!? v|verbose=!?].freeze,
-          watch: %w[excludeDirectories=p excludeFiles=p fallbackPolling=b synchronousWatchDirectory=!? watchDirectory=b
+          compiler: %w[allowArbitraryExtensions allowImportingTsExtensions allowJs allowUmdGlobalAccess
+                       allowUnreachableCode allowUnusedLabels assumeChangesOnlyAffectDirectDependencies charset=b
+                       checkJs composite customConditions=q d|declaration declarationDir=p declarationMap diagnostics
+                       disableReferencedProjectLoad disableSizeLimit disableSolutionSearching emitBOM
+                       emitDeclarationOnly emitDecoratorMetadata erasableSyntaxOnly exactOptionalPropertyTypes
+                       experimentalDecorators explainFiles extendedDiagnostics forceConsistentCasingInFileNames
+                       generateCpuProfile=b ignoreConfig importHelpers importsNotUsedAsValues=b incremental
+                       inlineSourceMap inlineSources isolatedDeclarations isolatedModules jsx=b jsxFactory=q
+                       jsxFragmentFactory=q jsxImportSource=q keyofStringsOnly lib=q libReplacement listEmittedFiles
+                       listFiles mapRoot=p maxNodeModuleJsDepth=i m|module=b moduleDetection=b moduleResolution=b
+                       moduleSuffixes=b newLine=b noCheck noEmit noEmitHelpers noEmitOnError noErrorTruncation
+                       noFallthroughCasesInSwitch noImplicitAny noImplicitOverride noImplicitReturns noImplicitThis
+                       noImplicitUseStrict noLib noPropertyAccessFromIndexSignature noResolve noStrictGenericChecks
+                       noUncheckedIndexedAccess noUncheckedSideEffectImports noUnusedLocals noUnusedParameters outDir=p
+                       paths=q plugins=b preserveConstEnums preserveSymlinks preserveValueImports preserveWatchOutput
+                       pretty reactNamespace=b removeComments resolveJsonModule resolvePackageJsonExports
+                       resolvePackageJsonImports rewriteRelativeImportExtensions rootDir=p rootDirs=p
+                       skipDefaultLibCheck skipLibCheck sourceMap sourceRoot=p stableTypeOrdering stopBuildOnErrors
+                       strict strictBindCallApply strictBuiltinIteratorReturn strictFunctionTypes strictNullChecks
+                       strictPropertyInitialization stripInternal suppressExcessPropertyErrors
+                       suppressImplicitAnyIndexErrors t|target=b traceResolution tsBuildInfoFile=p typeRoots=p types=b
+                       useDefineForClassFields useUnknownInCatchVariables verbatimModuleSyntax].freeze,
+          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
+            compiler: %w[allowSyntheticDefaultImports alwaysStrict baseUrl=p downlevelIteration esModuleInterop
+                         outFile=p].freeze
           }.freeze
         }.freeze
         PASS_NODE = {
@@ -347,7 +348,7 @@ module Squared
                                        .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
+                                exit
                               end
                               args.concat(choice_index('Select packages', list, multiple: true, column: /^(\S+)/))
                             end
@@ -545,8 +546,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 +662,7 @@ module Squared
                 end
                 if nolockfile?(prefix: 'yarn')
                   cmd << '--no-lockfile'
-                elsif option('ci') || (ci? && exist?('yarn.lock'))
+                elsif ci? && exist?(yarnlock)
                   if yarn == 1
                     cmd << '--frozen-lockfile'
                   elsif !flag
@@ -698,14 +698,13 @@ module Squared
                        '--force'
                      elsif nolockfile?(prefix: 'pnpm')
                        '--no-lockfile'
-                     elsif option('ci') || (ci? && exist?('pnpm-lock.yaml'))
+                     elsif ci? && exist?(pnpmlock)
                        '--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?(npmlock) ? 'ci' : 'install')
               option('approve-scripts') do |val|
                 cmd = npm_output 'approve-scripts'
                 cmd << case val
@@ -758,7 +757,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
@@ -771,7 +770,7 @@ module Squared
         end
 
         def outdated(flag = nil, opts = [], sync: invoked_sync?('outdated', flag))
-          cmd = session(pnpm? && exist?('pnpm-lock.yaml') ? 'pnpm' : 'npm', 'outdated')
+          cmd = session(pnpm? && exist?(pnpmlock) ? 'pnpm' : 'npm', 'outdated')
           dryrun = has_value?(opts, 'd', 'dry-run') || dryrun?
           unless dryrun
             log.info cmd.to_s
@@ -815,7 +814,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 +959,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 +1038,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 }
 
@@ -1350,37 +1349,46 @@ module Squared
         end
 
         def tsc(*args, with: nil, pass: PASS_NODE[:tsc], sync: true, banner: verbose?, from: :tsc, **kwargs)
-          session_apply(with, args: args, kwargs: kwargs, pass: pass) if with
+          opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
           p = kwargs[:project]
           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, []) })
+          auto = %w[h|help v|version]
           cmd = session 'tsc', if p
                                  quote_option 'p', basepath(p)
                                elsif b
                                  list.concat(OPT_TSC[:build])
+                                 auto[1] = 'version'
                                  '-b'
                                end
           if w
             list.concat(OPT_TSC[:watch])
             cmd << '-w'
           end
-          op = OptionPartition.new(args, list, cmd, project: self, strict: strict?, sep: ' ')
-          unless p
-            if b.is_a?(String)
-              op.add_path(b)
-            elsif w.is_a?(String)
-              op.add_path(w)
-            else
-              op.exist?(add: true)
+          flags, args = args.partition { |val| val.start_with?('-') }
+          op = OptionPartition.new(opts + args, list, cmd, project: self, strict: strict?, auto: auto, explicit: true,
+                                                           sep: ' ')
+          if op.stdout
+            banner = false
+          else
+            unless p
+              if b.is_a?(String)
+                op.add_path(b)
+              elsif w.is_a?(String)
+                op.add_path(w)
+              else
+                op.exist?(add: true)
+              end
             end
+            op.append(flags, escape: kwargs.fetch(:escape, false), quote: kwargs.fetch(:quote, false))
+              .clear
+            print_run(op, banner, **kwargs)
+            start = time_epoch if kwargs.fetch(:verbose, verbose? && !stdin?)
           end
-          op.clear
-          cmd = session_done(op.target)
-          print_run(cmd, banner, **kwargs)
-          session 'npx', cmd
-          start = time_epoch if kwargs.fetch(:verbose, verbose? && !stdin?)
+          session 'npx', session_done(op.target)
           ret = run(sync: sync, banner: banner, exception: exception?(**kwargs), from: from)
           print_status(name, subject: 'tsc', start: start) if success?(ret, banner, start.nil?) && start
           ret
@@ -1452,7 +1460,7 @@ module Squared
         end
 
         def yarn?
-          (@pm[:yarn] ||= if rootpath('yarn.lock', ascend: dependroot).exist?
+          (@pm[:yarn] ||= if rootpath(yarnlock, ascend: dependroot).exist?
                             yarntype
                           elsif (ver = read_package || read_install)
                             if ver =~ /^yarn(?:@(\d)|$)/
@@ -1473,7 +1481,7 @@ module Squared
         end
 
         def pnpm?
-          (@pm[:pnpm] ||= if rootpath('pnpm-lock.yaml', ascend: dependroot).exist?
+          (@pm[:pnpm] ||= if rootpath(pnpmlock, ascend: dependroot).exist?
                             pnpmtype
                           elsif (ver = read_package || read_install)
                             ver.start_with?('pnpm') ? pnpmtype : 0
@@ -1518,7 +1526,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
@@ -1582,7 +1590,7 @@ module Squared
             require 'yaml'
             doc = YAML.load_file(rc)
             doc.nodeLinker == 'node-modules' ? 2 : 3
-          elsif exist && !exist?('yarn.lock')
+          elsif exist && !exist?(yarnlock)
             0
           else
             1
@@ -1594,6 +1602,10 @@ 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))
@@ -1608,13 +1620,21 @@ module Squared
           end
         rescue => e
           if exist
-            %w[pnpm-lock.yaml pnpm-workspace.yaml].any? { |val| exist?(val) } ? 4 : 0
+            %W[#{pnpmlock} 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)
@@ -1696,16 +1716,16 @@ module Squared
           ].concat(args)
         end
 
-        def npmopts(*args)
-          OPT_NPM[:common] + args.flat_map { |name| OPT_NPM.fetch(name, []) }
+        def npmlock
+          'package-lock.json'
         end
 
-        def pnpmopts(*args)
-          OPT_PNPM[:common] + args.flat_map { |name| OPT_PNPM.fetch(name, []) }
+        def npmopts(*args)
+          OPT_NPM[:common] + args.flat_map { |name| OPT_NPM.fetch(name, []) }
         end
 
         def lockfile(delete = false)
-          ret = basepath(yarn? ? 'yarn.lock' : pnpm? ? 'pnpm-lock.yaml' : 'package-lock.json')
+          ret = basepath(yarn? ? yarnlock : pnpm? ? pnpmlock : npmlock)
           if ret.exist?
             if delete
               ret.delete