squared 0.4.12 → 0.4.14

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

@@ -12,6 +12,7 @@ module Squared
           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 = {
@@ -30,6 +31,7 @@ module Squared
           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 = {
@@ -91,6 +93,7 @@ module Squared
           'publish' => %i[latest tag].freeze,
           'add' => nil,
           'run' => nil,
+          'exec' => nil,
           'pack' => nil
         })
 
@@ -103,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
@@ -131,7 +134,7 @@ module Squared
                     end
                     case save
                     when 'prod', 'dev', 'optional', 'peer'
-                      packages = args.to_a.drop(1)
+                      packages = args.extras
                     else
                       save = 'prod'
                       packages = args.to_a
@@ -142,10 +145,10 @@ module Squared
                 when 'run'
                   next if (list = read_scripts).empty?
 
-                  format_desc action, nil, 'script,opts*|^index+|#,pattern*'
+                  format_desc action, nil, "script,opts*|#{indexchar}index+|#,pattern*"
                   task action, [:script] do |_, args|
                     if args.script == '#'
-                      format_list(list, 'run[^N]', 'scripts', grep: args.extras, from: dependfile.to_s)
+                      format_list(list, "run[#{indexchar}N]", 'scripts', grep: args.extras, from: dependfile)
                     else
                       args = param_guard(action, 'script', args: args.to_a)
                       opts = []
@@ -178,6 +181,35 @@ module Squared
                       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.extras
+                      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
+                      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*'
                   task action do |_, args|
@@ -194,7 +226,7 @@ module Squared
                         outdated flag, args.to_a
                       end
                     when 'package'
-                      format_desc(action, flag, 'opts*', after: flag == :dedupe ? nil : 'names*')
+                      format_desc(action, flag, 'opts*', after: flag == :dedupe ? nil : 'name*')
                       task flag do |_, args|
                         package flag, args.to_a
                       end
@@ -304,7 +336,7 @@ module Squared
             next unless from && dest&.directory?
 
             from = path + from
-            glob = as_a(glob || '**/*')
+            glob = Array(glob || '**/*')
             target = []
             if workspace
               Dir.glob(from + '*').each do |path|
@@ -365,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'
@@ -417,7 +448,7 @@ module Squared
               ret = on(:error, :outdated, e)
               raise if exception && ret != true
             end
-            warn log_message(Logger::WARN, e, pass: true) if warning?
+            warn log_message(Logger::WARN, e) if warning?
             return
           else
             dep1 = json['dependencies'] || {}
@@ -527,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
@@ -565,50 +596,43 @@ module Squared
         end
 
         def update(*)
-          package 'update'
+          package('update', from: :update)
         end
 
         def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, dryrun: nil, access: nil)
-          if read_packagemanager(:private)
-            if warning?
-              warn log_message(Logger::WARN, 'invalid task "publish"', subject: name, hint: 'private', pass: true)
-            end
+          if !version || read_packagemanager(:private)
+            warn log_message(Logger::WARN, 'invalid task "publish"', subject: name, hint: version ? 'private' : nil)
             return
           end
-          return unless version
-
           cmd = session 'npm', 'publish'
-          dryrun = dryrun?('npm') if dryrun.nil?
           cmd << basic_option('otp', otp) if otp ||= option('otp')
           cmd << basic_option('tag', tag) if tag ||= option('tag')
           cmd << basic_option('access', access) if access ||= option('access')
-          if verbose
-            if dryrun
-              cmd << '--dry-run'
-            else
-              log.info cmd.to_s
-            end
-            unless sync
-              on :first, :publish unless dryrun
-              pwd_set(from: :publish, dryrun: dryrun) do
-                require 'open3'
-                banner = format_banner(cmd.to_s)
-                Open3.popen2e(cmd.done) do |_, out|
-                  write_lines(out, banner: banner, sub: npmnotice + [
-                    { pat: /^(.+)(Tarball .+)$/, styles: color(:blue), index: 2 }
-                  ])
-                end
+          dryrun = dryrun?('npm') if dryrun.nil?
+          if dryrun
+            cmd << '--dry-run'
+          else
+            from = :publish
+            log.info cmd.to_s
+          end
+          if sync
+            run(from: from, sync: sync, interactive: !dryrun && "Publish #{sub_style(project, styles: theme[:active])}")
+          else
+            on :first, from
+            pwd_set(from: :publish, dryrun: dryrun) do
+              require 'open3'
+              banner = format_banner(cmd.to_s)
+              Open3.popen2e(cmd.done) do |_, out|
+                write_lines(out, banner: banner, sub: npmnotice + [
+                  { pat: /^(.+)(Tarball .+)$/, styles: color(:blue), index: 2 }
+                ])
               end
-              on :last, :publish unless dryrun
-              return
             end
-          elsif dryrun
-            return
+            on :last, from
           end
-          run(from: :publish, sync: sync)
         end
 
-        def package(flag, opts = [])
+        def package(flag, opts = [], from: nil)
           workspace.rev_clear(name)
           if (yarn = dependtype(:yarn)) > 0
             cmd = session 'yarn', if flag == :update
@@ -634,6 +658,7 @@ module Squared
               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]
+              cmd << '--save=true' if option('save')
             end
             op = OptionPartition.new(opts, list, cmd, no: no, project: self)
             op.each do |opt|
@@ -658,7 +683,7 @@ module Squared
             end
             op.clear(errors: true)
           end
-          run(from: :"package:#{flag}")
+          run(from: from || :"package:#{flag}")
         end
 
         def bump(flag, val = nil)
@@ -875,9 +900,11 @@ module Squared
           @pm[:_] = false
           nil
         else
-          return @pm[key] if key
-
-          !(ret = @pm[:_]) || (version && ret[ret.index('@') + 1..-1] < version) ? nil : ret
+          if key
+            @pm[key]
+          elsif (ret = @pm[:_]) && !(version && ret[(ret.index('@') + 1)..-1] < version)
+            ret
+          end
         end
 
         def read_install