squared 0.1.3 → 0.2.1

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

@@ -8,7 +8,7 @@ module Squared
           def populate(*); end
 
           def tasks
-            %i[outdated].freeze
+            [:outdated].freeze
           end
 
           def batchargs
@@ -35,11 +35,12 @@ module Squared
         end
 
         @@tasks[ref] = {
-          install: %i[force frozen dedupe].freeze,
-          outdated: %i[major minor patch].freeze,
-          bump: %i[major minor patch].freeze,
-          update: nil,
-          run: nil
+          'install' => %i[force frozen dedupe].freeze,
+          'outdated' => %i[major minor patch].freeze,
+          'bump' => %i[version major minor patch].freeze,
+          'add' => nil,
+          'update' => nil,
+          'run' => nil
         }.freeze
 
         def initialize(*, **kwargs)
@@ -59,25 +60,45 @@ module Squared
           Node.ref
         end
 
-        def populate(*)
+        def populate(*, **)
           super
           return unless outdated? && ref?(Node.ref)
 
           namespace name do
             @@tasks[Node.ref].each do |action, flags|
+              next if @pass.include?(action)
+
               if flags.nil?
                 case action
-                when :run
-                  desc format_desc(action, nil, 'command+|^index|#,pattern*')
+                when 'add'
+                  format_desc action, nil, 'save?=prod|dev|optional|peer,name+'
+                  task action, [:save, :name] do |_, args|
+                    save = param_guard(action, 'save', args: args, key: :save)
+                    if save.start_with?('=')
+                      exact = true
+                      save = save[1..-1]
+                    end
+                    case save
+                    when 'prod', 'dev', 'optional', 'peer'
+                      name = param_guard(action, 'name', args: args.to_a.drop(1))
+                    else
+                      save = 'prod'
+                      name = param_guard(action, 'name', args: args.to_a)
+                    end
+                    depend(:add, packages: name, save: save, exact: exact)
+                  end
+                when 'run'
+                  next if (list = read_scripts).empty?
+
+                  format_desc action, nil, 'command+|^index|#,pattern*'
                   task action, [:command] do |_, args|
                     if args.command == '#'
-                      format_list(read_scripts, 'run[^N]', 'scripts', grep: args.extras, from: dependfile.to_s)
+                      format_list(list, 'run[^N]', 'scripts', grep: args.extras, from: dependfile.to_s)
                     else
-                      cmd = guard_params(action, 'command', args: args.to_a)
+                      cmd = param_guard(action, 'command', args: args.to_a)
                       cmd.each do |val|
                         if (data = indexitem(val))
                           n, opts = data
-                          list = read_scripts
                           if (item = list[n - 1])
                             val = opts ? "#{item.first} #{opts}" : item.first
                           elsif exception
@@ -90,9 +111,9 @@ module Squared
                       end
                     end
                   end
-                when :update
-                  desc format_desc(action, nil, 'packages*')
-                  task action, [:packages] do |_, args|
+                when 'update'
+                  format_desc action, nil, 'packages*'
+                  task action do |_, args|
                     update args.to_a
                   end
                 end
@@ -100,20 +121,28 @@ module Squared
                 namespace action do
                   flags.each do |flag|
                     case action
-                    when :install
-                      desc format_desc(action, flag)
+                    when 'install'
+                      format_desc action, flag
                       task flag do
                         depend flag
                       end
-                    when :outdated
-                      desc format_desc(action, flag, %w[prune interactive dry-run].freeze, arg: 'opts?')
-                      task flag, [:opts] do |_, args|
+                    when 'outdated'
+                      format_desc(action, flag, %w[prune interactive dry-run].freeze, arg: 'opts?')
+                      task flag do |_, args|
                         outdated(flag, opts: args.to_a)
                       end
-                    else
-                      desc format_desc(action, flag)
-                      task flag do
-                        __send__(action, flag)
+                    when 'bump'
+                      if flag == :version
+                        format_desc action, flag, 'version'
+                        task flag, [:version] do |_, args|
+                          version = param_guard(action, flag, args: args, key: :version)
+                          bump flag, version
+                        end
+                      else
+                        format_desc action, flag
+                        task flag do
+                          bump flag
+                        end
                       end
                     end
                   end
@@ -124,7 +153,7 @@ module Squared
         end
 
         def copy(from: 'build', into: 'node_modules', workspace: false, include: nil, exclude: nil, scope: nil,
-                 also: nil, create: nil, override: false)
+                 also: nil, create: nil, link: false, force: false, override: false)
           return if @copy == false
 
           if @copy && !override
@@ -133,6 +162,8 @@ module Squared
             from = @copy[:from] if @copy.key?(:from)
             into = @copy[:into] if @copy.key?(:into)
             workspace = @copy[:workspace] if @copy.key?(:workspace)
+            link = @copy[:link] if @copy.key?(:link)
+            force = @copy[:force] if @copy.key?(:link)
             glob = @copy[:include]
             exclude = @copy[:exclude]
             scope = @copy[:scope]
@@ -144,7 +175,8 @@ module Squared
           items += as_a(also) if also
           return if items.empty?
 
-          print_item unless @output[0] || !verbose || task_invoked?(/\Acopy(?::#{Node.ref}|$)/)
+          on :first, :copy
+          print_item unless @output[0] || !verbose || task_invoked?(/^copy(?::#{Node.ref}|$)/)
           items.each do |dir|
             case dir
             when Pathname
@@ -160,6 +192,8 @@ module Squared
               from = dir[:from] if dir.key?(:from)
               into = dir[:into] if dir.key?(:into)
               scope = dir[:scope] if dir.key?(:scope)
+              link = dir[:link] if dir.key?(:link)
+              force = dir[:force] if dir.key?(:force)
               dest = dir[:target]
               create = dir[:create]
               workspace = dir[:workspace]
@@ -183,10 +217,11 @@ module Squared
                       elsif (file = path.join('package.json')).exist?
                         begin
                           doc = JSON.parse(file.read)
-                          doc['name']
                         rescue StandardError => e
                           log.error e
                           raise if exception
+                        else
+                          doc['name']
                         end
                       end
                 if sub
@@ -200,18 +235,29 @@ module Squared
             end
             target.each do |src, to|
               glob.each { |val| log.info "cp #{from.join(val)} #{to}" }
-              copy_d(src, to, glob: glob, create: create, pass: exclude, verbose: verbose)
+              begin
+                copy_dir(src, to, glob, create: create, link: link, force: force, pass: exclude, verbose: verbose)
+              rescue StandardError => e
+                log.error e
+                ret = on(:error, :copy, e)
+                raise if exception && ret != true
+              end
             end
           end
+          on :last, :copy
         end
 
-        def depend(flag = nil, sync: invoked_sync?('depend', flag))
+        def depend(flag = nil, sync: invoked_sync?('depend', flag), packages: [], save: nil, exact: nil)
           if @depend && !flag
             super
           elsif outdated?
             if (yarn = dependtype(:yarn)) > 0
               cmd = session 'yarn'
-              if yarn > 1
+              if flag == :add
+                cmd << 'add'
+                cmd << "--#{save}" unless save == 'prod'
+                cmd << '--exact' if exact
+              elsif yarn > 1
                 if flag == :dedupe
                   cmd << 'dedupe'
                 else
@@ -232,7 +278,12 @@ module Squared
               end
             elsif pnpm?
               cmd = session 'pnpm'
-              if flag == :dedupe
+              case flag
+              when :add
+                cmd << 'add'
+                cmd << "--save-#{save}"
+                cmd << '--save-exact' if exact
+              when :dedupe
                 cmd << 'dedupe'
               else
                 cmd << 'install' << if flag == :force
@@ -246,10 +297,15 @@ module Squared
                 split_escape(val).each { |opt| cmd << shell_option('public-hoist-pattern', opt, quote: true) }
               end
               cmd << '--ignore-workspace' if env('NODE_WORKSPACES', equals: '0')
-              append_nocolor option('no-color')
+              append_nocolor
             else
               cmd = session 'npm'
-              if flag == :dedupe
+              case flag
+              when :add
+                cmd << 'install'
+                cmd << "--save-#{save}"
+                cmd << '--save-exact' if exact
+              when :dedupe
                 cmd << 'dedupe'
               else
                 cmd << 'install' << if flag == :force
@@ -258,34 +314,41 @@ module Squared
                                       '--package-lock-only'
                                     end
               end
-              cmd << '--omit=dev' if flag && prod?
+              if flag == :add
+                cmd.merge(packages.map { |pkg| shell_escape(pkg) })
+              elsif flag && prod?
+                cmd << '--omit=dev'
+              end
               cmd << '--workspaces=false' if env('NODE_WORKSPACES', equals: '0')
               cmd << '--package-lock=false' if option('package-lock', equals: '0')
-              append_nocolor option('no-color')
+              append_nocolor
             end
             append_loglevel
-            run(sync: sync)
+            run(from: :depend, sync: sync)
           end
         end
 
-        def outdated(rev = nil, opts: [], sync: invoked_sync?('outdated', rev))
+        def outdated(flag = nil, sync: invoked_sync?('outdated', flag), opts: [])
           dryrun = opts.include?('dry-run')
-          if pnpm? && read_packagemanager(version: '7.15')
-            cmd = 'pnpm outdated'
+          if pnpm? && read_packagemanager(version: '7.15', update: true)
+            cmd = session 'pnpm', 'outdated'
             dryrun ||= dryrun?('pnpm')
           else
-            cmd = 'npm outdated'
+            cmd = session 'npm', 'outdated'
             dryrun ||= dryrun?('npm')
           end
-          log.info cmd
-          banner = format_banner("#{cmd}#{dryrun ? ' --dry-run' : ''}")
+          log.info cmd.to_s
+          on :first, :outdated unless dryrun
+          banner = format_banner(cmd.temp(dryrun ? ' --dry-run' : nil))
           print_item banner if sync
           begin
-            data = pwd_set { `#{cmd} --json --loglevel=error` }
-            json = JSON.parse(doc = dependfile.read)
+            data = pwd_set { `#{cmd.temp('--json', '--loglevel=error')}` }
+            doc = dependfile.read
+            json = JSON.parse(doc)
           rescue StandardError => e
             log.error e
-            raise if exception
+            ret = on(:error, :outdated, e)
+            raise if exception && ret != true
 
             warn log_message(Logger::WARN, e) if warning?
             return
@@ -296,7 +359,7 @@ module Squared
           end
           found = []
           avail = []
-          rev ||= (prod? ? :patch : :minor)
+          rev = flag || (prod? ? :patch : :minor)
           inter = opts.include?('interactive')
           unless data.empty?
             JSON.parse(data).each_pair do |key, val|
@@ -354,7 +417,7 @@ module Squared
             ret = val.succ.to_s
             ord.size > 9 ? ret.rjust(ord.size.to_s.size) : ret
           end
-          footer = lambda do |val = 0|
+          footer = lambda do |val, size|
             next unless verbose
 
             msg, hint = if modified == -1
@@ -362,7 +425,8 @@ module Squared
                         else
                           ['No packages were updated', 'possible']
                         end
-            puts print_footer(empty_status(msg, hint, pending + val))
+            possible = pending + val
+            puts print_footer(empty_status(msg, hint, possible == size ? 0 : possible))
           end
           print_item banner unless sync
           if !found.empty?
@@ -386,6 +450,8 @@ module Squared
                 end
               end
               a = a.ljust(col1)
+              b = b.ljust(col2)
+              b = sub_style(b, styles: theme[:current]) if theme[:current]
               c = if cur == -1
                     'SKIP'
                   elsif modified == cur
@@ -396,14 +462,14 @@ module Squared
                   else
                     sub_style(c, pat: SEM_VER, styles: color(:green), index: d)
                   end
-              puts "#{pad_ord.(i, found)}. #{a}#{b.ljust(col2)}#{c}"
+              puts "#{pad_ord.(i, found)}. #{a + b + c}"
             end
             pending = avail.reduce(pending) { |a, b| a + (b[3] ? 0 : 1) }
             if dryrun || (modified == 0 && pending > 0)
-              footer.(modified)
+              footer.(modified, found.size)
             elsif modified > 0
               modified = -1
-              footer.()
+              footer.(0, found.size)
               File.write(dependfile, doc)
               commit(:add, ['package.json'], pass: true)
               install if opts.include?('prune')
@@ -424,51 +490,58 @@ module Squared
               end
               puts "#{pad_ord.(i, avail)}. #{a + c + b} (#{d ? 'locked' : 'latest'})"
             end
-            footer.()
+            footer.(0, avail.size)
           else
             puts 'No updates were found'
           end
+          on :last, :outdated unless dryrun
         end
 
-        def bump(flag = nil)
-          return unless (ver = version)
+        def bump(flag, val = nil)
+          return unless (cur = version)
 
-          seg = semscan(ver, fill: false)
-          case flag
-          when :major
-            if seg[0] != '0' || seg[2].nil?
-              seg[0] = seg[0].succ
-            else
-              seg[2] = seg[2].succ
-            end
-          when :minor
-            if seg[0] == '0'
+          if flag == :version
+            return unless val
+          else
+            seg = semscan(cur, fill: false)
+            case flag
+            when :major
+              if seg[0] != '0' || seg[2].nil?
+                seg[0] = seg[0].succ
+              else
+                seg[2] = seg[2].succ
+              end
+            when :minor
+              if seg[0] == '0'
+                seg[4] &&= seg[4].succ
+              else
+                seg[2] = seg[2].succ
+              end
+            when :patch
               seg[4] &&= seg[4].succ
-            else
-              seg[2] = seg[2].succ
             end
-          else
-            seg[4] &&= seg[4].succ
+            return if (val = seg.join) == cur
           end
-          return if (out = seg.join) == ver
 
           begin
             doc = dependfile.read
-            if doc.sub!(/"version"\s*:\s*"#{ver}"/, "\"version\": \"#{out}\"")
+            if doc.sub!(/"version"\s*:\s*"#{cur}"/, "\"version\": \"#{val}\"")
               unless dryrun?
                 dependfile.write(doc)
-                log.info "bump version #{ver} to #{out} (#{flag})"
+                log.info "bump version #{cur} to #{val} (#{flag})"
+                on :first, :bump
               end
               if verbose
                 major = flag == :major
-                emphasize("version: #{out}", title: name, border: borderstyle, sub: [
+                emphasize("version: #{val}", title: name, border: borderstyle, sub: [
                   headerstyle,
                   { pat: /\A(version:)( )(\S+)(.*)\z/, styles: color(major ? :green : :yellow), index: 3 },
                   { pat: /\A(version:)(.*)\z/, styles: theme[major ? :major : :active] }
                 ])
               elsif stdin?
-                puts out
+                puts val
               end
+              on :last, :bump unless dryrun?
             else
               raise_error('not found', hint: 'version')
             end
@@ -490,19 +563,19 @@ module Squared
           elsif pnpm?
             cmd = session 'pnpm', 'update'
             cmd << '--prod' if prod?
-            append_nocolor option('no-color')
+            append_nocolor
           else
             cmd = session 'npm', 'update'
             cmd << '--omit=dev' if prod?
-            append_nocolor option('no-color')
+            append_nocolor
           end
           append_loglevel
           append_value pkgs
           run
         end
 
-        def compose(opts, flags = nil, script: false)
-          return unless opts && script
+        def compose(opts, flags = nil, script: false, from: :build)
+          return unless opts && script && from == :build
 
           ret = session dependbin, 'run', flags
           append_loglevel
@@ -512,7 +585,7 @@ module Squared
           when String
             ret << opts
           else
-            raise_error("#{ret.first} script name", hint: opts.nil? ? 'missing' : 'invalid')
+            raise_error("#{dependbin} script name", hint: opts.nil? ? 'missing' : 'invalid')
           end
           ret
         end
@@ -536,13 +609,14 @@ module Squared
                                 require 'yaml'
                                 doc = YAML.load_file(rc)
                                 doc.nodeLinker == 'node-modules' ? 2 : 3
-                              rescue StandardError
+                              rescue StandardError => e
+                                log.debug e
                                 3
                               end
                             else
                               1
                             end
-                          elsif (ver = read_packagemanager || read_install) && ver.start_with?('yarn')
+                          elsif (ver = read_packagemanager || read_install)&.start_with?('yarn')
                             ver == 'yarn' || ver.include?('@1') ? 1 : 3
                           else
                             0
@@ -563,7 +637,8 @@ module Squared
                               else
                                 4
                               end
-                            rescue StandardError
+                            rescue StandardError => e
+                              log.debug e
                               4
                             end
                           else
@@ -575,8 +650,7 @@ module Squared
           if pnpm?
             basepath('pnpm-workspace.yaml').exist?
           else
-            read_packagemanager
-            @pm[:workspaces].is_a?(Array)
+            read_packagemanager(:workspaces).is_a?(Array)
           end
         end
 
@@ -596,19 +670,17 @@ module Squared
         end
 
         def version
-          read_packagemanager
-          @pm[:version]
+          super || (@version = read_packagemanager(:version))
         end
 
         def packagename
-          read_packagemanager
-          @pm[:name]
+          read_packagemanager :name
         end
 
         private
 
-        def read_packagemanager(version: nil)
-          if @pm[:_].nil?
+        def read_packagemanager(key = nil, version: nil, update: false)
+          if @pm[:_].nil? || update
             doc = JSON.parse(dependfile.read)
             @pm[:_] = (val = doc['packageManager']) ? val[0..(val.index('+') || 0) - 1] : false
             @pm[:name] = doc['name']
@@ -617,10 +689,12 @@ module Squared
             @pm[:workspaces] = doc['workspaces']
           end
         rescue StandardError => e
-          log.debug e if dependfile.exist?
+          log.debug e
           @pm[:_] = false
           nil
         else
+          return @pm[key] if key
+
           !(ret = @pm[:_]) || (version && ret[ret.index('@') + 1..-1] < version) ? nil : ret
         end
 
@@ -632,11 +706,11 @@ module Squared
         end
 
         def read_scripts
-          read_packagemanager
-          @pm[:scripts].is_a?(Hash) ? @pm[:scripts].to_a : []
+          ret = read_packagemanager(:scripts)
+          ret.is_a?(Hash) ? ret.to_a : []
         end
 
-        def append_loglevel
+        def append_loglevel(target: @session)
           level = env('NODE_LOGLEVEL')
           silent = !verbose || level == 'silent'
           return unless silent || level
@@ -644,26 +718,26 @@ module Squared
           if yarn?
             if dependtype(:yarn) == 1
               if silent
-                @session << '--silent'
+                target << '--silent'
               elsif level == 'verbose'
-                @session << '--verbose'
+                target << '--verbose'
               end
             end
           elsif pnpm?
             if silent
-              @session << shell_option('reporter', 'silent', escape: false)
+              target << '--reporter=silent'
               level ||= 'error'
             end
             case level
             when 'debug', 'info', 'warn', 'error'
-              @session << shell_option('loglevel', level, escape: false)
+              target << basic_option('loglevel', level)
             end
           elsif silent
-            @session << shell_option('loglevel', 'silent', escape: false)
+            target << '--loglevel=silent'
           else
             case level
             when 'error', 'warn', 'notice', 'http', 'info', 'verbose', 'silly'
-              @session << shell_option('loglevel', level, escape: false)
+              target << basic_option('loglevel', level)
             end
           end
         end
@@ -684,7 +758,7 @@ module Squared
         end
 
         def dryrun?(prefix = dependbin)
-          !option('dry-run', prefix: prefix).nil?
+          super || !option('dry-run', prefix: prefix).nil?
         end
 
         def dependbin