squared 0.4.19 → 0.5.0

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

@@ -94,10 +94,11 @@ module Squared
           'add' => nil,
           'run' => nil,
           'exec' => nil,
+          'nvm' => nil,
           'pack' => nil
         })
 
-        def initialize(*, init: nil, **kwargs)
+        def initialize(*, **kwargs)
           super
           if @pass.include?(Node.ref)
             initialize_ref Node.ref
@@ -107,7 +108,7 @@ module Squared
             initialize_env(**kwargs)
           end
           @dependfile = @path + 'package.json'
-          @pm = { __: init }
+          @pm = {}
         end
 
         def ref
@@ -116,11 +117,11 @@ module Squared
 
         def populate(*, **)
           super
-          return unless (outdated? && ref?(Node.ref)) || @only
+          return unless outdated? && ref?(Node.ref)
 
           namespace name do
             Node.subtasks do |action, flags|
-              next if task_pass?(action)
+              next if @pass.include?(action)
 
               if flags.nil?
                 case action
@@ -134,7 +135,7 @@ module Squared
                     end
                     case save
                     when 'prod', 'dev', 'optional', 'peer'
-                      packages = args.extras
+                      packages = args.to_a.drop(1)
                     else
                       save = 'prod'
                       packages = args.to_a
@@ -145,10 +146,10 @@ module Squared
                 when 'run'
                   next if (list = read_scripts).empty?
 
-                  format_desc action, nil, "script,opts*|#{indexchar}index+|#,pattern*"
+                  format_desc action, nil, 'script,opts*|^index+|#,pattern*'
                   task action, [:script] do |_, args|
                     if args.script == '#'
-                      format_list(list, "run[#{indexchar}N]", 'scripts', grep: args.extras, from: dependfile)
+                      format_list(list, 'run[^N]', 'scripts', grep: args.extras, from: dependfile.to_s)
                     else
                       args = param_guard(action, 'script', args: args.to_a)
                       opts = []
@@ -185,7 +186,7 @@ module Squared
                   format_desc action, nil, 'pkg/cmd,opts*,args*'
                   task action, [:package] do |_, args|
                     if (package = args.package)
-                      args = args.extras
+                      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'
@@ -210,6 +211,17 @@ module Squared
                     end
                     run(from: :exec)
                   end
+                when 'nvm'
+                  next unless ENV['NVM_DIR']
+
+                  format_desc action, nil, 'version,args*'
+                  task action, [:version] do |_, args|
+                    version = param_guard(action, 'version', args: args, key: :version)
+                    args = args.to_a.drop(1)
+                    args << readline('Enter command', force: true) if args.empty?
+                    args.prepend(File.join(ENV['NVM_DIR'], 'nvm-exec'))
+                    run(args.join(' '), { 'NODE_VERSION' => version }, banner: false, from: :nvm)
+                  end
                 when 'pack'
                   format_desc action, nil, 'opts*'
                   task action do |_, args|
@@ -226,7 +238,7 @@ module Squared
                         outdated flag, args.to_a
                       end
                     when 'package'
-                      format_desc(action, flag, 'opts*', after: flag == :dedupe ? nil : 'name*')
+                      format_desc(action, flag, 'opts*', after: flag == :dedupe ? nil : 'names*')
                       task flag do |_, args|
                         package flag, args.to_a
                       end
@@ -247,7 +259,7 @@ module Squared
                       format_desc(action, flag, 'otp?,dry-run?,public|restricted?', before: flag == :tag ? 'tag' : nil)
                       task flag do |_, args|
                         args = args.to_a
-                        dryrun = true if args.delete('dry-run') || args.delete('true') || args.delete('d')
+                        dryrun = true if args.delete('dry-run') || args.delete('d')
                         if args.delete('public') || args.delete('p')
                           access = 'public'
                         elsif args.delete('restricted') || args.delete('r')
@@ -257,11 +269,6 @@ module Squared
                           otp = args.first
                         else
                           tag, otp = param_guard(action, flag, args: args)
-                          unless SEM_VER.match?(tag)
-                            a = sub_style(project, styles: theme[:active])
-                            b = sub_style(tag, styles: theme[:inline])
-                            exit 1 unless confirm("Publish #{a}@#{b}? [y/N] ", 'N')
-                          end
                         end
                         publish(flag, otp: otp, tag: tag, dryrun: dryrun, access: access)
                       end
@@ -273,7 +280,7 @@ module Squared
           end
         end
 
-        def copy(from: 'build', into: 'node_modules', scope: nil, also: nil, create: nil, files: nil, workspace: false,
+        def copy(from: 'build', into: 'node_modules', scope: nil, also: nil, create: nil, workspace: false,
                  link: false, force: false, override: false, sync: invoked_sync?('copy'), **kwargs)
           glob = kwargs[:include]
           pass = kwargs[:exclude]
@@ -282,7 +289,6 @@ module Squared
 
             from = @copy[:from] if @copy.key?(:from)
             into = @copy[:into] if @copy.key?(:into)
-            files = @copy[:files] if @copy.key?(:files)
             workspace = @copy[:workspace] if @copy.key?(:workspace)
             link = @copy[:link] if @copy.key?(:link)
             force = @copy[:force] if @copy.key?(:force)
@@ -304,7 +310,6 @@ module Squared
 
           on :first, :copy
           print_item unless @output[0] || !verbose || task_invoked?(/^copy(?::#{Node.ref}|$)/)
-          packed = false
           items.each do |dir|
             case dir
             when Pathname
@@ -342,56 +347,16 @@ module Squared
             end
             next unless from && dest&.directory?
 
-            if from == :npm
-              begin
-                unless packed
-                  require 'open3'
-                  files = pwd_set do
-                    Open3.capture2e(session_output('npm', 'pack --dry-run --no-color', npmname).to_s)
-                         .first
-                         .scan(/^npm notice \d+(?:\.\d+)?[a-z]+ (.+)$/i)
-                         .map { |item| Pathname.new(item.first) }
-                         .select(&:exist?)
-                  end
-                  .concat(Array(files))
-                  packed = true
-                end
-                to = dest.join(into, npmname)
-                to.mkpath
-                log.info "cp npm:#{npmname} #{to}"
-                subdir = []
-                errors = 0
-                files.each do |file|
-                  s, d = file.is_a?(Array) ? file : [file, file]
-                  dest = to + d
-                  unless subdir.include?((target = dest.dirname).to_s)
-                    target.mkpath
-                    subdir << target.to_s
-                  end
-                  begin
-                    FileUtils.cp(path + s, dest, verbose: verbose.is_a?(Numeric) && verbose > 0)
-                  rescue StandardError => e
-                    print_error e
-                    errors += 1
-                  end
-                end
-              rescue StandardError => e
-                on_error e, :copy
-              else
-                puts message(to, subdir.size, files.size - errors) if verbose
-              end
-              next
-            end
-            glob = Array(glob || '**/*')
-            target = []
             from = path + from
+            glob = as_a(glob || '**/*')
+            target = []
             if workspace
-              Dir.glob(from + '*').each do |path|
-                next unless (path = Pathname.new(path)).directory?
+              from.glob('*').each do |entry|
+                next unless entry.directory?
 
-                sub = if (proj = @workspace.find(path))
+                sub = if (proj = @workspace.find(entry))
                         proj.packagename
-                      elsif (file = path + 'package.json').exist?
+                      elsif (file = entry + 'package.json').exist?
                         begin
                           doc = JSON.parse(file.read)
                         rescue StandardError => e
@@ -402,20 +367,22 @@ module Squared
                         end
                       end
                 if sub
-                  target << [path, dest.join(into, sub)]
+                  target << [entry, dest.join(into, sub)]
                 else
-                  log.debug message("package.json in \"#{path}\"", hint: 'not found')
+                  log.debug message("package.json in \"#{entry}\"", hint: 'not found')
                 end
               end
             else
-              target << [from, dest.join(into, scope || npmname)]
+              target << [from, dest.join(into, scope || project)]
             end
             target.each do |src, to|
               glob.each { |val| log.info "cp #{from + val} #{to}" }
               begin
                 copy_dir(src, to, glob, create: create, link: link, force: force, pass: pass, verbose: verbose)
               rescue StandardError => e
-                on_error e, :copy
+                log.error e
+                ret = on(:error, :copy, e)
+                raise if exception && ret != true
               end
             end
           end
@@ -429,19 +396,7 @@ module Squared
             workspace.rev_clear(name, sync: sync)
             return update if !flag && env('NODE_UPDATE')
 
-            pnpm = pnpm?
-            yarn = pnpm ? 0 : dependtype(:yarn)
-            if @pm[:__] && !pnpm && yarn == 0
-              case @pm[:__]
-              when 'pnpm'
-                pnpm = true
-              when 'yarn'
-                yarn = 1
-              when 'berry'
-                yarn = 2
-              end
-            end
-            if yarn > 0
+            if (yarn = dependtype(:yarn)) > 0
               cmd = session 'yarn'
               if flag == :add
                 cmd << 'add'
@@ -451,7 +406,7 @@ module Squared
                 cmd << 'install'
                 cmd << '--ignore-engines' if yarn == 1 && !option('ignore-engines', equals: '0')
               end
-            elsif pnpm
+            elsif pnpm?
               cmd = session 'pnpm'
               if flag == :add
                 cmd << 'add' << "--save-#{save}"
@@ -459,7 +414,7 @@ module Squared
               else
                 cmd << 'install'
               end
-              if (val = option('public-hoist-pattern', ignore: false))
+              option('public-hoist-pattern', ignore: false) do |val|
                 split_escape(val).each { |opt| cmd << shell_option('public-hoist-pattern', opt) }
               end
               cmd << '--ignore-workspace' if env('NODE_WORKSPACES', equals: '0')
@@ -493,14 +448,19 @@ module Squared
             log.info cmd.to_s
             on :first, :outdated
           end
-          banner = format_banner(cmd.temp(dryrun ? '--dry-run' : nil))
+          banner = format_banner(cmd.temp(dryrun ? ' --dry-run' : nil))
           print_item banner if sync
           begin
             data = pwd_set { `#{cmd.temp('--json', '--loglevel=error')}` }
             doc = dependfile.read
             json = JSON.parse(doc)
           rescue StandardError => e
-            on_error(e, :outdated, dryrun: dryrun)
+            log.error e
+            unless dryrun
+              ret = on(:error, :outdated, e)
+              raise if exception && ret != true
+            end
+            warn log_message(Logger::WARN, e, pass: true) if warning?
             return
           else
             dep1 = json['dependencies'] || {}
@@ -584,7 +544,7 @@ module Squared
             found.each_with_index do |item, i|
               a, b, c, d, e = item
               f = inter && (rev != :major || e || semmajor?(item[5], item[6]))
-              if f && !confirm_outdated(a, c, (d / 2.0).ceil, lock: e)
+              if f && !confirm_outdated(a, c, (d / 2.0).ceil, b, lock: e, col1: col1)
                 cur = -1
               else
                 cur = modified
@@ -648,42 +608,49 @@ module Squared
         end
 
         def update(*)
-          package('update', from: :update)
+          package 'update'
         end
 
-        def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, access: nil, dryrun: nil)
-          if !version || read_packagemanager(:private)
-            warn log_message(Logger::WARN, 'invalid task "publish"', subject: name, hint: version ? 'private' : nil)
+        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
             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')
-          dryrun ||= dryrun?('npm')
-          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(npmname, styles: theme[:active])}")
-          else
-            on :first, from
-            pwd_set(from: from, dryrun: dryrun) do
-              require 'open3'
-              banner = format_banner cmd.to_s
-              Open3.popen2e(cmd.done) do |_, out|
-                write_lines(out, sub: npmnotice + [pat: /^(.+)(Tarball .+)$/, styles: color(:blue), index: 2],
-                                 banner: banner)
+          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) do
+                require 'open3'
+                banner = format_banner cmd.to_s
+                Open3.popen2e(cmd.done) do |_, out|
+                  write_lines(out, sub: npmnotice + [pat: /^(.+)(Tarball .+)$/, styles: color(:blue), index: 2],
+                                   banner: banner)
+                end
               end
+              on :last, :publish unless dryrun
+              return
             end
-            on :last, from
+          elsif dryrun
+            return
           end
+          run(from: :publish, sync: sync)
         end
 
-        def package(flag, opts = [], from: nil)
+        def package(flag, opts = [])
           workspace.rev_clear(name)
           if (yarn = dependtype(:yarn)) > 0
             cmd = session 'yarn', if flag == :update
@@ -709,7 +676,6 @@ 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|
@@ -734,7 +700,7 @@ module Squared
             end
             op.clear(errors: true)
           end
-          run(from: from || :"package:#{flag}")
+          run(from: :"package:#{flag}")
         end
 
         def bump(flag, val = nil)
@@ -748,17 +714,14 @@ module Squared
             when :major
               if seg[0] != '0' || seg[2].nil?
                 seg[0] = seg[0].succ
-                seg[2] = '0'
               else
                 seg[2] = seg[2].succ
               end
-              seg[4] = '0'
             when :minor
               if seg[0] == '0'
                 seg[4] &&= seg[4].succ
               else
                 seg[2] = seg[2].succ
-                seg[4] &&= '0'
               end
             when :patch
               seg[4] &&= seg[4].succ
@@ -774,22 +737,24 @@ module Squared
                 log.info "bump version #{cur} to #{val} (#{flag})"
                 on :first, :bump
               end
-              if stdin?
-                puts val
-              elsif verbose
+              if verbose
                 major = flag == :major
                 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 val
               end
               on :last, :bump unless dryrun?
             else
               raise_error('version not found', hint: dependfile)
             end
           rescue StandardError => e
-            on_error e, :bump
+            log.debug e
+            ret = on(:error, :bump, e)
+            raise if exception && ret != true
           end
         end
 
@@ -799,7 +764,7 @@ module Squared
           cmd = session dependbin, 'pack'
           if dependtype(:yarn) > 1
             op = OptionPartition.new(opts, OPT_BERRY[:pack], cmd, project: self)
-            op.append?('out', Pathname.pwd + "#{project}-#{version}.tgz")
+            op << quote_option('out', Pathname.pwd + "#{project}-#{version}.tgz") unless op.arg?('out')
           else
             op = OptionPartition.new(opts, pnpm? ? OPT_PNPM[:pack] : OPT_NPM[:pack] + OPT_NPM[:common], cmd,
                                      project: self)
@@ -814,7 +779,7 @@ module Squared
                 end
               end
             end
-            op.append?('pack-destination', Dir.pwd)
+            op << quote_option('pack-destination', Dir.pwd) unless op.arg?('pack-destination')
           end
           op.clear
           run(from: :pack)
@@ -826,9 +791,9 @@ module Squared
           if script
             ret = session dependbin, 'run'
             raise_error("#{dependbin} run: given #{target}", hint: from) unless append_any(target, build: true)
-            append_any opts if opts
+            append_any opts
             append_loglevel
-            append_any(args, delim: true) if args
+            append_any(args, delim: true)
             ret
           else
             case target
@@ -928,17 +893,13 @@ module Squared
         end
 
         def version
-          @version ||= read_packagemanager(:version)
+          super || (@version = read_packagemanager(:version))
         end
 
         def packagename
           read_packagemanager :name
         end
 
-        def scripts
-          @scripts ||= read_scripts.to_h
-        end
-
         private
 
         def read_packagemanager(key = nil, version: nil, update: false)
@@ -956,11 +917,9 @@ module Squared
           @pm[:_] = false
           nil
         else
-          if key
-            @pm[key]
-          elsif (ret = @pm[:_]) && (!version || semgte?(ret[(ret.index('@') + 1)..-1], version))
-            ret
-          end
+          return @pm[key] if key
+
+          !(ret = @pm[:_]) || (version && ret[ret.index('@') + 1..-1] < version) ? nil : ret
         end
 
         def read_install
@@ -976,7 +935,7 @@ module Squared
         end
 
         def append_loglevel(target: @session)
-          level = env('NODE_LOGLEVEL')
+          level = env 'NODE_LOGLEVEL'
           silent = !verbose || level == 'silent'
           return unless silent || level
 
@@ -1007,6 +966,10 @@ module Squared
           end
         end
 
+        def dryrun?(prefix = dependbin, **)
+          super || !option('dry-run', prefix: prefix).nil?
+        end
+
         def dependbin
           if yarn?
             'yarn'
@@ -1019,10 +982,6 @@ module Squared
           'package.json' if parent&.has?('outdated', Node.ref)
         end
 
-        def npmname
-          packagename || project
-        end
-
         def npmnotice
           [
             { pat: /^(npm error )(code|\d+)(.+)$/, styles: color(:cyan), index: 2 },
@@ -1031,10 +990,6 @@ module Squared
             { pat: /^(npm )(.+)$/, styles: :bold }
           ]
         end
-
-        def dryrun?(prefix = dependbin, **)
-          super || !option('dry-run', prefix: prefix).nil?
-        end
       end
 
       Application.implement Node