squared 0.4.11 → 0.4.13

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

@@ -11,10 +11,13 @@ module Squared
           install_no: %w[audit bin-links fund package-lock].freeze,
           install_as: %w[foreground-scripts g|global no-save save save-bundle save-dev E|save-exact save-optional
                          save-peer S|save-prod].freeze,
+          run: %w[foreground-scripts if-present ignore-scripts script-shell=p].freeze,
+          exec: %w[c|call=q package=b].freeze,
           pack: %w[json ignore-scripts pack-destination=p].freeze
         }.freeze
         OPT_PNPM = {
           common: %w[aggregate-output color no-color stream use-stderr C|dir=p loglevel=b w|workspace-root].freeze,
+          filter: %w[fail-if-no-match changed-files-ignore-pattern=q filter=q filter-prod=q test-pattern=q].freeze,
           install: %w[fix-lockfile force ignore-pnpmfile ignore-workspace lockfile-only merge-git-branch-lockfiles
                       no-hoist no-lockfile no-optional prefer-frozen-lockfile resolution-only shamefully-hoist
                       side-effects-cache side-effects-cache-readonly s|silent strict-peer-dependencies
@@ -23,28 +26,32 @@ module Squared
                       reporter=b].freeze,
           install_base: %w[global-dir ignore-scripts offline prefer-offline store-dir=p virtual-store-dir=p].freeze,
           install_no: %w[frozen-lockfile verify-store-integrity].freeze,
-          install_as: %w[D|dev fail-if-no-match global-dir no-optional P|prod r|recursive
-                         changed-files-ignore-pattern=q filter=q filter-prod=q test-pattern=q].freeze,
+          install_as: %w[D|dev global-dir no-optional P|prod r|recursive].freeze,
           update: %w[global interactive latest depth=i].freeze,
           dedupe: %w[check].freeze,
+          run: %w[if-present no-bail parallel r|recursive report-summary reporter-hide-prefix resume-from sequential
+                  stream use-stderr].freeze,
+          exec: %w[no-reporter-hide-prefix parallel r|recursive report-summary resume-from c|shell-mode].freeze,
           pack: %w[json pack-destination=p pack-gzip-level=i].freeze
         }.freeze
         OPT_YARN = {
-          common: %w[no-default-rc s|silent verbose cwd=p use-yarnrc=p].freeze,
+          common: %w[check-files disable-pnp enable-pnp flat focus force frozen-lockfile json har ignore-engines
+                     ignore-optional ignore-platform ignore-scripts link-duplicates no-bin-links no-default-rc
+                     no-lockfile no-node-version-check no-progress non-interactive offline pnp prefer-offline prod
+                     pure-lockfile s|silent skip-integrity-check strict-semver verbose cache-folder=p cwd=p emoji=b?
+                     global-folder=p https-proxy=q link-folder=p modules-folder=p mutex=q network-concurrency=i
+                     network-timeout=i preferred-cache-folder=p production=b? proxy=q otp=b registry=q update-checksums
+                     use-yarnrc=p].freeze,
           install: %w[A|audit g|global S|save D|save-dev E|save-exact P|save-peer O|save-optional T|save-tilde].freeze,
-          install_base: %w[check-files disable-pnp enable-pnp flat focus force frozen-lockfile har ignore-platform
-                           ignore-engines ignore-optional ignore-scripts json link-duplicates no-bin-links no-lockfile
-                           no-node-version-check no-progress non-interactive offline pnp prefer-offline prod
-                           pure-lockfile skip-integrity-check strict-semver update-checksums cache-folder=p emoji=b?
-                           global-folder=p https-proxy=q link-folder=p modules-folder=p mutex=q network-concurrency=i
-                           network-timeout=i preferred-cache-folder=p production=b? proxy=q otp=b registry=q].freeze,
-          update: %w[A|audit C|caret E|exact L|latest T|tilde P|pattern=q S|scope=b].freeze
+          update: %w[A|audit C|caret E|exact L|latest T|tilde P|pattern=q S|scope=b].freeze,
+          run: %w[scripts-prepend-node-path=b?].freeze
         }.freeze
         OPT_BERRY = {
           install: %w[check-cache check-resolutions immutable immutable-cache inline-builds json refresh-lockfile
                       mode=b].freeze,
           update: %w[C|caret E|exact F|fixed interactive T|tilde R|recursive mode=b].freeze,
           dedupe: %w[check json mode=b strategy=b].freeze,
+          run: %w[B|binaries-only inspect inspect-brk T|top-level require=q].freeze,
           pack: %w[n|dry-run install-if-needed json o|out=p].freeze
         }.freeze
         private_constant :OPT_NPM, :OPT_PNPM, :OPT_YARN, :OPT_BERRY
@@ -86,6 +93,7 @@ module Squared
           'publish' => %i[latest tag].freeze,
           'add' => nil,
           'run' => nil,
+          'exec' => nil,
           'pack' => nil
         })
 
@@ -98,8 +106,8 @@ module Squared
             initialize_build(Node.ref, prod: prod?, **kwargs)
             initialize_env(**kwargs)
           end
-          @pm = {}
           @dependfile = @path + 'package.json'
+          @pm = {}
         end
 
         def ref
@@ -137,25 +145,70 @@ module Squared
                 when 'run'
                   next if (list = read_scripts).empty?
 
-                  format_desc action, nil, 'command+|^index|#,pattern*'
-                  task action, [:command] do |_, args|
-                    if args.command == '#'
+                  format_desc action, nil, 'script,opts*|^index+|#,pattern*'
+                  task action, [:script] do |_, args|
+                    if args.script == '#'
                       format_list(list, 'run[^N]', 'scripts', grep: args.extras, from: dependfile.to_s)
                     else
-                      cmd = param_guard(action, 'command', args: args.to_a)
-                      cmd.each do |val|
-                        if (n, opts = indexitem(val))
+                      args = param_guard(action, 'script', args: args.to_a)
+                      opts = []
+                      args.each do |val|
+                        if (n, extra = indexitem(val))
                           if (item = list[n - 1])
-                            val = opts ? "#{item.first} #{opts}" : item.first
+                            val = extra ? "#{item.first} #{extra}" : item.first
                           elsif exception
                             indexerror n, list
                           else
                             next log.warn "run script #{n} of #{list.size} (out of range)"
                           end
+                          run compose(val, script: true)
+                        else
+                          opts << val
+                        end
+                      end
+                      next if opts.empty?
+
+                      list = if (yarn = dependtype(:yarn)) > 0
+                               yarn == 1 ? OPT_YARN[:run] + OPT_YARN[:common] : OPT_BERRY[:run]
+                             elsif pnpm?
+                               OPT_PNPM[:run] + OPT_PNPM[:filter] + OPT_PNPM[:common]
+                             else
+                               OPT_NPM[:run] + OPT_NPM[:common]
+                             end
+                      op = OptionPartition.new(opts, list, session(dependbin, 'run'), project: self)
+                      op << op.extras.shift
+                      op.append(delim: true, quote: false)
+                      run(from: :run)
+                    end
+                  end
+                when 'exec'
+                  format_desc action, nil, 'pkg/cmd,opts*,args*'
+                  task action, [:package] do |_, args|
+                    if (package = args.package)
+                      args = args.to_a.drop(1)
+                      if pnpm?
+                        pre = ->(ch) { "-#{ch}" if (ch = args.delete(ch)) }
+                        cmd = session 'pnpm', pre.call('r'), pre.call('c'), 'exec'
+                        list = OPT_PNPM[:exec] + OPT_PNPM[:filter] + OPT_PNPM[:common]
+                      else
+                        cmd = session 'npm', 'exec'
+                        list = OPT_NPM[:exec] + OPT_NPM[:common]
+                      end
+                      op = OptionPartition.new(args, list, cmd, project: self)
+                      if op.empty?
+                        op << package
+                        if (args = readline('Enter arguments', force: false))
+                          op << '--' unless pnpm?
+                          op << args
                         end
-                        run compose(val, script: true)
+                      else
+                        op << '--' unless pnpm?
+                        op << package << op.join(' ')
                       end
+                    else
+                      session 'npm', 'exec', quote_option('c', readline('Enter command', force: true), double: true)
                     end
+                    run(from: :exec)
                   end
                 when 'pack'
                   format_desc action, nil, 'opts*'
@@ -344,8 +397,7 @@ module Squared
             elsif pnpm?
               cmd = session 'pnpm'
               if flag == :add
-                cmd << 'add'
-                cmd << "--save-#{save}"
+                cmd << 'add' << "--save-#{save}"
                 cmd << '--save-exact' if exact
               else
                 cmd << 'install'
@@ -372,7 +424,7 @@ module Squared
         end
 
         def outdated(flag = nil, opts = [], sync: invoked_sync?('outdated', flag))
-          dryrun = opts.include?('dry-run')
+          dryrun = opts.include?('dry-run') || opts.include?('d')
           if pnpm? && read_packagemanager(version: '7.15', update: true)
             cmd = session 'pnpm', 'outdated'
             dryrun ||= dryrun?('pnpm')
@@ -406,7 +458,7 @@ module Squared
           found = []
           avail = []
           rev = flag || (prod? ? :patch : :minor)
-          inter = opts.include?('interactive')
+          inter = opts.include?('interactive') || opts.include?('i')
           unless data.empty?
             JSON.parse(data).each_pair do |key, val|
               val = val.find { |obj| obj['dependent'] == target } if val.is_a?(Array)
@@ -446,7 +498,7 @@ module Squared
                 found << [key, file, want, if a != c
                                              1
                                            elsif b != d
-                                             3
+                                             a == '0' ? 1 : 3
                                            else
                                              5
                                            end, major, f, w]
@@ -479,8 +531,8 @@ module Squared
             col2 = size_col.call(found, 1) + 4
             found.each_with_index do |item, i|
               a, b, c, d, e = item
-              inter &&= rev != :major || e || semmajor?(item[5], item[6])
-              if inter && !confirm_outdated(a, c, (d / 2.0).ceil, lock: e)
+              f = inter && (rev != :major || e || semmajor?(item[5], item[6]))
+              if f && !confirm_outdated(a, c, (d / 2.0).ceil, lock: e)
                 cur = -1
               else
                 cur = modified
@@ -506,7 +558,7 @@ module Squared
                     a = sub_style(a, styles: theme[:major])
                     sub_style(c, :bold, styles: color(:green))
                   else
-                    sub_style(c, pat: SEM_VER, styles: color(:green), index: d)
+                    sub_style(c, pat: SEM_VER, styles: color(d == 3 ? :green : :yellow), index: d)
                   end
               puts "#{pad_ord.call(i, found)}. #{a + b + c}"
             end
@@ -518,7 +570,7 @@ module Squared
               footer.call(0, found.size)
               File.write(dependfile, doc)
               commit(:add, refs: ['package.json'], pass: true)
-              install if opts.include?('prune')
+              install if opts.include?('prune') || opts.include?('p')
             end
           elsif !avail.empty?
             col1 = size_col.call(avail, 0) + 4
@@ -596,47 +648,47 @@ module Squared
                                     flag
                                   end
             op = OptionPartition.new(opts, if yarn == 1
-                                             OPT_PNPM[:install_base] + OPT_YARN.fetch(flag, []) + OPT_YARN[:common]
+                                             OPT_YARN.fetch(flag, []) + OPT_YARN[:common]
                                            else
                                              OPT_BERRY[flag]
                                            end, cmd, project: self)
             op.clear
             append_loglevel
-            run(from: :"package:#{flag}")
-            return
-          elsif pnpm?
-            cmd = session 'pnpm', flag
-            list = OPT_PNPM[:install_base] + OPT_PNPM.fetch(flag, []) + OPT_PNPM[:common]
-            list.concat(OPT_PNPM[:install_as]) unless flag == :dedupe
-            no = OPT_PNPM[:"#{flag}_no"]
           else
-            cmd = session 'npm', flag
-            list = OPT_NPM[:install_base] + OPT_NPM.fetch(flag, []) + OPT_NPM[:common]
-            list.concat(OPT_NPM[:install_as]) unless flag == :dedupe
-            no = OPT_NPM[:install_no]
-          end
-          op = OptionPartition.new(opts, list, cmd, no: no, project: self)
-          op.each do |opt|
-            if opt =~ op.values
-              case $1
-              when 'w', 'workspace'
-                op << ($2.match?(%r{[\\/]}) ? quote_option($1, path + $2) : shell_option($1, $2))
+            if pnpm?
+              cmd = session 'pnpm', flag
+              list = OPT_PNPM[:install_base] + OPT_PNPM.fetch(flag, []) + OPT_PNPM[:common]
+              list.concat(OPT_PNPM[:install_as] + OPT_PNPM[:filter]) unless flag == :dedupe
+              no = OPT_PNPM[:"#{flag}_no"]
+            else
+              cmd = session 'npm', flag
+              list = OPT_NPM[:install_base] + OPT_NPM.fetch(flag, []) + OPT_NPM[:common]
+              list.concat(OPT_NPM[:install_as]) unless flag == :dedupe
+              no = OPT_NPM[:install_no]
+            end
+            op = OptionPartition.new(opts, list, cmd, no: no, project: self)
+            op.each do |opt|
+              if opt =~ op.values
+                case $1
+                when 'w', 'workspace'
+                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, path + $2) : shell_option($1, $2))
+                end
+              elsif opt.include?('=')
+                op.errors << opt
+              else
+                op.found << opt
               end
-            elsif opt.include?('=')
-              op.errors << opt
+            end
+            op.swap
+            append_nocolor
+            append_loglevel
+            if flag == :dedupe
+              op.clear
             else
-              op.found << opt
+              op.append(escape: true)
             end
+            op.clear(errors: true)
           end
-          op.swap
-          append_nocolor
-          append_loglevel
-          if flag == :dedupe
-            op.clear
-          else
-            op.append(escape: true)
-          end
-          op.clear(errors: true)
           run(from: :"package:#{flag}")
         end
 

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

@@ -80,24 +80,19 @@ module Squared
             initialize_build(Python.ref, **kwargs)
             initialize_env(**kwargs)
           end
-          @dependindex = DEP_PYTHON.index { |file| basepath(file).exist? }
-          @dependfile = @path + DEP_PYTHON[@dependindex || 0]
+          dependfile_set DEP_PYTHON
           @verbose = verbose.size if verbose.is_a?(String) && verbose.match?(/\Av+\z/)
-          @editable = case editable
-                      when '.', Pathname
-                        editable
-                      when String
-                        Pathname.new(editable)
-                      end
+          editable_set editable
           venv_set venv if venv
         end
 
         subtasks({
-          'venv' => %i[run create remove show].freeze,
+          'venv' => %i[exec create remove show].freeze,
           'pip' => %i[uninstall freeze].freeze,
           'install' => %i[user force upgrade target editable].freeze,
           'build' => %i[python poetry hatch].freeze,
-          'publish' => %i[poetry twine hatch].freeze
+          'publish' => %i[poetry twine hatch].freeze,
+          'exec' => nil
         })
 
         def ref
@@ -112,111 +107,130 @@ module Squared
             Python.subtasks do |action, flags|
               next if @pass.include?(action)
 
-              namespace action do
-                flags.each do |flag|
-                  case action
-                  when 'venv'
-                    if flag == :create
-                      format_desc action, flag, 'dir,opts*'
-                      task flag, [:dir] do |_, args|
-                        dir = path + param_guard(action, flag, args: args, key: :dir)
-                        cmd, opts = python_session('-m venv', opts: args.extras)
-                        op = OptionPartition.new(opts, OPT_PYTHON[:venv], cmd, project: self)
-                        op.append(dir, delim: true)
-                          .clear(pass: false)
-                        v = op.arg?(/\A-v+\z/, 'verbose')
-                        run(exception: true)
-                        puts(dir.directory? ? "Success: #{dir}" : 'Failed') unless v
+              if flags.nil?
+                case action
+                when 'exec'
+                  format_desc action, nil, 'command|:,args*'
+                  task action do |_, args|
+                    i = (args = args.to_a).delete(':')
+                    cmd = if i && !workspace.windows?
+                            readline('Enter script', force: true, multiline: ['##', ';'])
+                          elsif i || args.empty?
+                            readline('Enter command', force: true)
+                          else
+                            if (val = command_args(args, prefix: 'python'))
+                              args << val
+                            end
+                            args.join(' ')
+                          end
+                    Kernel.exec(cmd, chdir: path)
+                  end
+                end
+              else
+                namespace action do
+                  flags.each do |flag|
+                    case action
+                    when 'venv'
+                      if flag == :create
+                        format_desc action, flag, 'dir,opts*'
+                        task flag, [:dir] do |_, args|
+                          dir = path + param_guard(action, flag, args: args, key: :dir)
+                          venv_create dir, args.extras
+                        end
+                      elsif venv
+                        case flag
+                        when :remove
+                          next unless projectpath?(venv)
+
+                          format_desc action, flag, 'c|create?,d|depend?'
+                          task flag do |_, args|
+                            rm_rf(venv, verbose: true)
+                            venv_init if has_value?(%w[c create], args.to_a)
+                            depend if has_value?(%w[d depend], args.to_a)
+                          end
+                        when :exec
+                          format_desc action, flag, 'command,args*'
+                          task flag do |_, args|
+                            args = args.to_a
+                            if args.empty?
+                              args = readline('Enter command', force: true).split(' ', 2)
+                            elsif args.size == 1 && !option('interactive', prefix: 'venv', equals: '0')
+                              args << readline('Enter arguments', force: false)
+                            end
+                            venv_init
+                            run args.join(' ')
+                          end
+                        when :show
+                          format_desc action, flag
+                          task flag do
+                            puts venv
+                          end
+                        end
                       end
-                    elsif venv
+                    when 'pip'
                       case flag
-                      when :remove
-                        next unless projectpath?(venv)
-
-                        format_desc action, flag, 'c|reate?,d|epend?'
+                      when :freeze
+                        format_desc action, flag, "file?=#{DEP_PYTHON[4]},opts*"
                         task flag do |_, args|
-                          rm_rf(venv, verbose: true)
-                          venv_init if has_value?(%w[c create], args.to_a)
-                          depend if has_value?(%w[d depend], args.to_a)
+                          if (file = pip(flag, args.to_a)) && verbose
+                            puts File.read(file)
+                          end
                         end
-                      when :run
-                        format_desc action, flag, 'args+'
+                      when :uninstall
+                        format_desc action, flag, 'package+,opts*'
                         task flag do |_, args|
-                          args = args.to_a
-                          args = readline('Enter command', force: true).split(' ', 2) if args.empty?
-                          venv_init
-                          run session(*args, path: false)
-                        end
-                      when :show
-                        format_desc action, flag
-                        task flag do
-                          puts venv
+                          pip flag, args.to_a
                         end
                       end
-                    end
-                  when 'pip'
-                    case flag
-                    when :freeze
-                      format_desc action, flag, "file?=#{DEP_PYTHON[4]},opts*"
-                      task flag do |_, args|
-                        if (file = pip(flag, args.to_a)) && verbose
-                          puts File.read(file)
+                    when 'install'
+                      format_desc(action, flag, 'opts*', before: case flag
+                                                                 when :target then 'dir'
+                                                                 when :editable then 'path/url?'
+                                                                 when :upgrade then 'strategy?,package+'
+                                                                 end)
+                      case flag
+                      when :editable
+                        task flag do |_, args|
+                          install flag, args.to_a
                         end
-                      end
-                    when :uninstall
-                      format_desc action, flag, 'package+,opts*'
-                      task flag do |_, args|
-                        pip flag, args.to_a
-                      end
-                    end
-                  when 'install'
-                    format_desc(action, flag, 'opts*', before: case flag
-                                                               when :target then 'dir'
-                                                               when :editable then 'path/url?'
-                                                               when :upgrade then 'strategy?,package+'
-                                                               end)
-                    case flag
-                    when :editable
-                      task flag do |_, args|
-                        install flag, args.to_a
-                      end
-                    when :upgrade
-                      task flag, [:strategy] do |_, args|
-                        case (strategy = args.strategy)
-                        when 'eager', 'only-if-needed'
-                          args = args.extras
-                        else
-                          args = args.to_a
-                          strategy = nil
+                      when :upgrade
+                        task flag, [:strategy] do |_, args|
+                          case (strategy = args.strategy)
+                          when 'eager', 'only-if-needed'
+                            args = args.extras
+                          else
+                            args = args.to_a
+                            strategy = nil
+                          end
+                          install(flag, args, strategy: strategy)
+                        end
+                      when :target
+                        task flag, [:dir] do |_, args|
+                          dir = param_guard(action, flag, args: args, key: :dir)
+                          depend(flag, args.extras, target: dir)
+                        end
+                      else
+                        task flag do |_, args|
+                          depend flag, args.to_a
                         end
-                        install(flag, args, strategy: strategy)
                       end
-                    when :target
-                      task flag, [:dir] do |_, args|
-                        dir = param_guard(action, flag, args: args, key: :dir)
-                        depend(flag, args.extras, target: dir)
+                    when 'build'
+                      format_desc(action, flag, 'opts*', after: case flag
+                                                                when :python then 'srcdir?'
+                                                                when :hatch then 'location?'
+                                                                end)
+                      task flag do |_, args|
+                        build! flag, args.to_a
                       end
-                    else
+                    when 'publish'
+                      format_desc(action, flag, 'opts*', after: case flag
+                                                                when :hatch then 'artifacts?'
+                                                                when :twine then 'dist?'
+                                                                end)
                       task flag do |_, args|
-                        depend flag, args.to_a
+                        publish flag, args.to_a
                       end
                     end
-                  when 'build'
-                    format_desc(action, flag, 'opts*', after: case flag
-                                                              when :python then 'srcdir?'
-                                                              when :hatch then 'location?'
-                                                              end)
-                    task flag do |_, args|
-                      build! flag, args.to_a
-                    end
-                  when 'publish'
-                    format_desc(action, flag, 'opts*', after: case flag
-                                                              when :hatch then 'artifacts?'
-                                                              when :twine then 'dist?'
-                                                              end)
-                    task flag do |_, args|
-                      publish flag, args.to_a
-                    end
                   end
                 end
               end
@@ -438,7 +452,9 @@ module Squared
             else
               log.warn "variable_set: @#{key}=#{req} (not supported)"
             end
-          when :venv, :editable
+          when :editable
+            editable_set val.first
+          when :venv
             instance_variable_set(:"@#{key}", val.empty? ? nil : basepath(*val))
           else
             super
@@ -557,6 +573,15 @@ module Squared
           append_nocolor(target: target)
         end
 
+        def editable_set(val)
+          @editable = case val
+                      when '.', Pathname
+                        val
+                      when String
+                        Pathname.new(editable)
+                      end
+        end
+
         def singleopt(flag = nil)
           case flag
           when :python
@@ -598,6 +623,10 @@ module Squared
         end
 
         def venv_set(val)
+          if val.is_a?(Array)
+            val, *opts = val
+            @venvopts = opts
+          end
           @venv = Pathname.new(val)
           @venv = @path + @venv unless @venv.absolute?
           if projectpath?(@venv)
@@ -617,11 +646,21 @@ module Squared
           return if !venv || (venvbin.directory? && !venvbin.empty?)
 
           puts log_message(Logger::INFO, venv, subject: 'venv', hint: 'init')
-          cmd = session 'python', '-m venv', shell_option('prompt', name), '--upgrade-deps', shell_quote(venv)
-          run(cmd, false, exception: true, banner: false)
+          @venvopts &&= @venvopts.map { |val| OptionPartition.strip(val) }.flatten
+          venv_create(venv, @venvopts || ["prompt=#{name}", 'upgrade-deps'], env: false, banner: false)
           puts log_message(Logger::INFO, venv, subject: 'venv', hint: 'created')
         end
 
+        def venv_create(dir, opts = [], env: nil, banner: true)
+          cmd, opts = python_session('-m venv', opts: opts)
+          op = OptionPartition.new(opts, OPT_PYTHON[:venv], cmd, project: self)
+          op.append(dir, delim: true)
+            .clear(pass: false)
+          status = op.arg?(/\A-v+\z/, 'verbose')
+          run(op, env, exception: true, banner: banner)
+          puts(dir.directory? ? "Success: #{dir}" : 'Failed') if banner && !status
+        end
+
         def requirements?
           dependtype == 5
         end