squared 0.7.5 → 0.7.7

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

@@ -6,15 +6,18 @@ module Squared
       class Node < Git
         OPT_NPM = {
           common: %w[dry-run=!? force=!? loglevel=b include-workspace-root=!? workspaces=!? w|workspace=v].freeze,
+          common_scripts: %w[dangerously-allow-all-scripts=!? strict-allow-scripts=!? allow-scripts=q].freeze,
           install: %w[package-lock-only=!? prefer-dedupe=!? E|save-exact=!? before=q cpu=b libc=b os=b].freeze,
           install_a: %w[audit=! bin-links=! foreground-scripts=!? fund=! ignore-scripts=!? install-links=!?
                         package-lock=! strict-peer-deps=!? include=b install-strategy=b omit=b].freeze,
           install_b: %w[no-save B|save-bundle D|save-dev O|save-optional save-peer P|save-prod g|global=!?
                         S|save=!?].freeze,
+          install_c: %w[allow-directory=b? allow-file=b? allow-git=b? allow-remote=b?].freeze,
           run: %w[foreground-scripts=!? if-present=!? ignore-scripts=!? script-shell=p].freeze,
           exec: %w[c|call=q package=b].freeze,
           pack: %w[ignore-scripts=!? json=!? pack-destination=p].freeze,
           rebuild: %w[bin-links=! foreground-scripts=!? global=!? ignore-scripts=!? install-links=!?].freeze,
+          'approve-scripts': %w[a|all allow-scripts-pending allow-scripts-pin=!? no-allow-scripts-pin json].freeze,
           no: {
             install: %w[audit bin-links fund package-lock].freeze
           }.freeze
@@ -26,15 +29,16 @@ module Squared
           common_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
-                      optimistic-repeat-install 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
-                      use-running-store-server use-store-server child-concurrency=i hoist-pattern=q lockfile-dir=p
-                      modules-dir=p network-concurrency=i package-import-method=b public-hoist-pattern=q
-                      reporter=b].freeze,
+                      optimistic-repeat-install no-hoist no-lockfile no-optional no-runtime prefer-frozen-lockfile
+                      resolution-only shamefully-hoist side-effects-cache side-effects-cache-readonly s|silent
+                      strict-peer-dependencies trust-lockfile use-running-store-server use-store-server
+                      child-concurrency=i hoist-pattern=q lockfile-dir=p modules-dir=p network-concurrency=i
+                      package-import-method=b public-hoist-pattern=q reporter=b trust-policy=b trust-policy-exclude=q
+                      trust-policy-ignore-after=i].freeze,
           install_a: %w[dangerously-allow-all-builds global-dir ignore-scripts offline prefer-offline store-dir=p
                         virtual-store-dir=p].freeze,
           install_b: %w[D|dev no-optional P|prod].freeze,
-          add: %w[allow-build config g|global save-catalog D|save-dev O|save-optional save-peer P|save-prod
+          add: %w[allow-build config g|global registry=q save-catalog D|save-dev O|save-optional save-peer P|save-prod
                   save-catalog-name=b].freeze,
           update: %w[g|global i|interactive L|latest depth=i].freeze,
           dedupe: %w[check].freeze,
@@ -153,10 +157,10 @@ module Squared
         end
 
         subtasks({
-          'package' => %i[install add update dedupe rebuild reinstall].freeze,
+          'package' => %i[install add update dedupe approve deny rebuild reinstall].freeze,
           'outdated' => %i[major minor patch].freeze,
           'bump' => %i[version major minor patch].freeze,
-          'publish' => %i[latest tag].freeze,
+          'publish' => %i[latest tag verify].freeze,
           'tsc' => %i[project build].freeze,
           'add' => nil,
           'run' => nil,
@@ -198,7 +202,7 @@ module Squared
                 when 'add'
                   format_desc action, nil, 'save?=[=-]prod|dev|optional|peer|bundle,(-)name+'
                   task action, [:save] do |_, args|
-                    packages = if args.save =~ /\A([=-]*)?(prod|dev|optional|peer|bundle)\z/
+                    packages = if args.save =~ /^([=-]*)(prod|dev|optional|peer|bundle)$/
                                  save = [$2, $1.include?('='), $1.include?('-')]
                                  args.extras
                                else
@@ -209,11 +213,10 @@ module Squared
                     depend(:add, packages: packages, save: save)
                   end
                 when 'run'
-                  next if scripts.empty?
-
                   format_desc action, nil, "script,opts*|#{indexchar}index+|#,pattern*"
                   task action, [:script] do |_, args|
-                    list = scripts.to_a
+                    next if (list = scripts.to_a).empty?
+
                     if args.script == '#'
                       format_list(list, "run[#{indexchar}N]", 'scripts', grep: args.extras, from: dependfile)
                     else
@@ -222,7 +225,7 @@ module Squared
                         if (n, extra = indexitem(val))
                           if (item = list[n.pred])
                             run compose([item.first, extra].compact.join(' '), script: true)
-                          elsif exception
+                          elsif exception?
                             indexerror n, list
                           else
                             log.warn "run script #{n} of #{list.size}".subhint('out of range')
@@ -258,7 +261,7 @@ module Squared
                               list = pnpmopts :exec, :common_filter
                               session 'pnpm', pre.call('r'), pre.call('c'), 'exec'
                             else
-                              list = npmopts :exec
+                              list = npmopts :exec, :common_scripts
                               session 'npm', 'exec'
                             end
                       op = OptionPartition.new(args, list, cmd, project: self, strict: strict?)
@@ -334,21 +337,34 @@ module Squared
                         end
                       end
                     when 'publish'
-                      format_desc(action, flag, 'otp?,p/ublic|r/estricted?,d/ry-run?', before: ('tag' if flag == :tag))
-                      task flag do |_, args|
-                        args = args.to_a
-                        access = if has_value!(args, 'r', 'restricted')
-                                   'restricted'
-                                 elsif has_value!(args, 'p', 'public')
-                                   'public'
-                                 end
-                        dryrun = has_value!(args, 'd', 'dry-run')
-                        if flag == :latest
-                          otp = args.first
-                        else
-                          tag, otp = param_guard(action, flag, args: args)
+                      if flag == :verify
+                        format_desc action, flag, 'version?,ext*'
+                        task flag, [:version] do |_, args|
+                          ext = args.extras
+                          if (version = args.version)&.match?(/^\.?[a-z]+$/i)
+                            ext.unshift(version)
+                            version = nil
+                          end
+                          publish(flag, version: version, ext: ext)
+                        end
+                      else
+                        format_desc(action, flag, 'otp?,p/ublic|r/estricted?,d/ry-run?',
+                                    before: ('tag' if flag == :tag))
+                        task flag do |_, args|
+                          args = args.to_a
+                          access = if has_value!(args, 'r', 'restricted')
+                                     'restricted'
+                                   elsif has_value!(args, 'p', 'public')
+                                     'public'
+                                   end
+                          dryrun = has_value!(args, 'd', 'dry-run')
+                          if flag == :latest
+                            otp = args.first
+                          else
+                            tag, otp = param_guard(action, flag, args: args)
+                          end
+                          publish(flag, otp: otp, tag: tag, access: access, dryrun: dryrun)
                         end
-                        publish(flag, otp: otp, tag: tag, access: access, dryrun: dryrun)
                       end
                     when 'tsc'
                       break unless @tsfile
@@ -532,7 +548,6 @@ module Squared
             end
             save, exact, omit = save if save.is_a?(Array)
             ws = env('NODE_WORKSPACES', equals: '0')
-            ci = option('ci')
             om = lambda do |cmd|
               if omit
                 save = case save
@@ -570,7 +585,7 @@ module Squared
                 end
                 if nolockfile?('yarn')
                   cmd << '--no-lockfile'
-                elsif ci
+                elsif option('ci')
                   if yarn == 1
                     cmd << '--frozen-lockfile'
                   elsif !flag
@@ -606,13 +621,27 @@ module Squared
                        '--force'
                      elsif nolockfile?('pnpm')
                        '--no-lockfile'
-                     elsif ci
+                     elsif option('ci')
                        '--frozen-lockfile'
                      end
               cmd << '--ignore-scripts' if option('ignore-scripts')
               cmd << '--dangerously-allow-all-builds' if option('approve-builds')
             else
-              cmd = session('npm', ci ? 'ci' : 'install')
+              cmd = session 'npm'
+              cmd << (ci = option('ci') ? 'ci' : 'install')
+              option('approve-scripts') do |val|
+                cmd = npm_output 'approve-scripts'
+                cmd << case val
+                       when '1'
+                         '--all --no-allow-scripts-pin'
+                       when 'true', 'all'
+                         '--all'
+                       else
+                         val.split(/\s+/).quote!.join(' ')
+                       end
+                print_run cmd, quiet?
+                run(cmd, banner: false)
+              end
               cmd << '--workspaces=false' if ws
               cmd << '--force' if option('force')
               append_nocolor
@@ -726,7 +755,7 @@ module Squared
                         when :patch
                           a == c && b == d && f[4] != w[4]
                         end
-              if upgrade && !w[5]
+              if upgrade && !w[6]
                 next if file == want
 
                 found << [key, file, want, if a != c
@@ -882,54 +911,130 @@ module Squared
           package(:update, from: :update)
         end
 
-        def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, access: nil, dryrun: nil)
+        def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, access: nil, dryrun: nil,
+                    version: nil, ext: [], workspace: false)
           if read_package('private')
+            return if workspace
+
             ws = children.select { |proj| proj.ref?(Node.ref) }
             if ws.empty?
               print_error('nothing to publish', subject: name, hint: 'private')
-            elsif confirm_basic('Publish workspace?', ws.map(&:name).join(', '), 'N')
-              ws.each { |proj| proj.publish(flag, sync: sync, otp: otp, tag: tag, access: access, dryrun: dryrun) }
+            elsif confirm_basic("#{flag == :verify ? 'Verify' : 'Publish'} workspace?", ws.map(&:name).join(', '), 'N')
+              ws.each do |proj|
+                proj.publish(flag, sync: sync, otp: otp, tag: tag, access: access, dryrun: dryrun, version: version,
+                                   ext: ext, workspace: true)
+              end
             end
-            return
-          end
-          return print_error("version: #{dependname}", subject: name, hint: 'not found') unless version
-
-          cmd = session 'npm', 'publish'
-          cmd << basic_option('otp', otp) if otp ||= option('otp')
-          cmd << basic_option('tag', tag.tr(' ', '-')) if tag ||= option('tag')
-          case access || option('access')
-          when 'p', 'public'
-            cmd << '--access=public'
-          when 'r', 'restricted'
-            cmd << '--access=restricted'
-          end
-          dryrun ||= dryrun?('npm')
-          if dryrun
-            cmd << '--dry-run'
-          else
-            from = :'npm:publish'
-            log.info cmd.to_s
-          end
-          if sync
-            run(sync: sync, from: from, interactive: !dryrun && ['Publish', 'N', npmname])
-          else
-            require 'open3'
-            on :first, from
-            pwd_set(cmd, dryrun: dryrun) do
-              cmd = session_done cmd
-              Open3.popen2e(cmd) do |_, out|
-                write_lines(out, banner: format_banner(cmd),
-                                 sub: npmnotice(opt_style(color(:bright_blue), /^(.+)(Tarball .+)$/, 2)))
+          elsif version ||= self.version
+            if flag == :verify
+              require 'open-uri'
+              require 'digest'
+              ext = ext.map { |val| val[0] == '.' ? val : ".#{val}" }
+              url = "https://unpkg.com/#{read_package('name')}@#{version}?meta"
+              print_item format_banner(url, command: false)
+              URI.open(url) do |f|
+                doc = JSON.parse(f.read)
+                n = doc['prefix'].size
+                i = 0
+                j = doc['files'].size
+                pad = j.to_s.size
+                m = 0
+                c = 0
+                e = 0
+                doc['files'].each do |item|
+                  path = item['path'][n..-1]
+                  js = File.extname(path)
+                  next unless ext.empty? || ext.any? { |val| val == js }
+
+                  begin
+                    raise unless (file = basepath!(path)) && item['integrity'] =~ /^(sha\d+)-(.+)$/
+
+                    hash = case $1
+                           when 'sha384'
+                             Digest::SHA384
+                           when 'sha512'
+                             Digest::SHA512
+                           else
+                             Digest::SHA256
+                           end
+                           .base64digest(file.read)
+                    status = if hash == $2
+                               m += 1
+                               sub_style 'match', color(:green)
+                             else
+                               c += 1
+                               sub_style 'check', theme[:caution]
+                             end
+                  rescue
+                    status = sub_style 'error', theme[:warn]
+                    e += 1
+                  end
+                  i += 1
+                  puts "#{i.to_s.rjust(pad)}. #{status} #{path}"
+                end
+                if i == 0
+                  puts("No files #{ext.empty? ? 'found' : "matched: #{ext.join(', ')}"}")
+                else
+                  total = ["match #{m}"]
+                  total << "check #{c}" unless c == 0
+                  total << "error #{e}" unless e == 0
+                  unless i == j
+                    s = "in #{j}"
+                    if total.size == 1
+                      total[0] += " #{s}"
+                    else
+                      total << s
+                    end
+                  end
+                  puts print_footer(total.join(' / '), right: true, sub: [
+                    opt_style(color(:green), /^(.*)(match)(.+)$/, 2),
+                    opt_style(theme[:caution], /^(.+)(check)(.+)$/, 2),
+                    opt_style(theme[:warn], /^(.+)(error)(.+)$/, 2)
+                  ])
+                end
+              end
+            else
+              cmd = session 'npm', 'publish'
+              cmd << basic_option('otp', otp) if otp ||= option('otp')
+              cmd << basic_option('tag', tag.tr(' ', '-')) if tag ||= option('tag')
+              case access || option('access')
+              when 'p', 'public'
+                cmd << '--access=public'
+              when 'r', 'restricted'
+                cmd << '--access=restricted'
+              end
+              dryrun ||= dryrun?('npm')
+              if dryrun
+                cmd << '--dry-run'
+              else
+                from = :'npm:publish'
+                log.info cmd.to_s
+              end
+              if sync
+                run(sync: sync, from: from, interactive: !dryrun && ['Publish', 'N', npmname])
+              else
+                require 'open3'
+                on :first, from
+                pwd_set(cmd, dryrun: dryrun) do
+                  cmd = session_done cmd
+                  Open3.popen2e(cmd) do |_, out|
+                    write_lines(out, banner: format_banner(cmd),
+                                     sub: npmnotice(opt_style(color(:bright_blue), /^(.+)(Tarball .+)$/, 2)))
+                  end
+                end
+                on :last, from
               end
             end
-            on :last, from
+          elsif !workspace
+            print_error("version: #{dependname}", subject: name, hint: 'not found')
           end
         end
 
         def package(flag, opts = [], packages: [], from: nil)
           workspace.rev_clear(name)
           yarn = dependtype(:yarn)
-          if yarn > 0 && !(yarn == 1 && ((flag == :update && !packages.empty?) || flag == :rebuild))
+          if yarn > 0 && !(yarn == 1 && ((flag == :update && !packages.empty?) || %i[approve deny
+                                                                                     rebuild].include?(flag)))
             cmd = session 'yarn', case flag
                                   when :update
                                     if yarn == 1
@@ -965,66 +1070,77 @@ module Squared
               op << '--ignore-engines' if option('ignore-engines')
             end
           else
+            flags = []
             args = if pnpm?
-                     case flag
-                     when :install, :update
-                       opts << 'no-lockfile' if nolockfile?('pnpm')
-                       spec = 0 if flag == :update
-                     when :add
-                       spec = 1
-                     when :reinstall
-                       opts << 'force'
-                       flag = :install
-                     end
-                     flags = [flag]
-                     flags << :install_a unless flag == :rebuild
-                     unless flag == :dedupe
-                       flags << :common_filter
-                       unless flag == :add
-                         flags << :install_b
-                         flags << :common_cpu unless flag == :update
+                     if flag == :approve || flag == :deny
+                       opts.map! { |val| val.start_with?('!') ? val : "!#{val}" } if flag == :deny
+                       flag = :'approve-builds'
+                       spec = true
+                     else
+                       case flag
+                       when :install, :update
+                         opts << 'no-lockfile' if nolockfile?('pnpm')
+                         spec = 0 if flag == :update
+                       when :add
+                         spec = 1
+                       when :reinstall
+                         opts << 'force'
+                         flag = :install
                        end
+                       flags << :install_a unless flag == :rebuild
+                       unless flag == :dedupe
+                         flags << :common_filter
+                         unless flag == :add
+                           flags << :install_b
+                           flags << :common_cpu unless flag == :update
+                         end
+                       end
+                       no = OPT_PNPM[:no][flag]
                      end
-                     no = OPT_PNPM[:no][flag]
                      [
                        opts,
-                       pnpmopts(*flags),
+                       pnpmopts(flag, *flags),
                        session('pnpm', flag)
                      ]
                    else
-                     case flag
-                     when :install, :update
-                       opts.unshift('package-lock=false', 'save=false') if nolockfile?('npm')
-                       spec = flag == :install ? 0 : 2
-                     when :add
-                       spec = 1
-                       flag = :install
-                     when :reinstall
-                       remove_modules 'npm' if opts.delete('force')
-                       opts.unshift('package-lock=false') if lockfile(true)
-                       flag = :install
-                     end
-                     flags = [flag]
-                     unless flag == :rebuild
-                       flags << :install_a
-                       unless flag == :dedupe
-                         %w[save ignore-scripts strict-peer-deps].each do |key|
-                           option(key, prefix: 'npm', ignore: false) do |val|
-                             opts << basic_option(key, case val
-                                                       when '0', 'false'
-                                                         false
-                                                       else
-                                                         true
-                                                       end)
+                     if flag == :approve || flag == :deny
+                       flag = :"#{flag}-scripts"
+                       spec = true
+                     else
+                       case flag
+                       when :install, :update
+                         opts.unshift('package-lock=false', 'save=false') if nolockfile?('npm')
+                         spec = flag == :install ? 0 : 2
+                       when :add
+                         spec = 1
+                         flag = :install
+                       when :reinstall
+                         remove_modules 'npm' if opts.delete('force')
+                         opts.unshift('package-lock=false') if lockfile(true)
+                         flag = :install
+                       end
+                       unless flag == :rebuild
+                         flags << :install_a
+                         unless flag == :dedupe
+                           %w[save ignore-scripts strict-peer-deps].each do |key|
+                             option(key, prefix: 'npm', ignore: false) do |val|
+                               opts << basic_option(key, case val
+                                                         when '0', 'false'
+                                                           false
+                                                         else
+                                                           true
+                                                         end)
+                             end
                            end
+                           flags << :install_b << :common_scripts
                          end
-                         flags << :install_b
+                         flags << :install_c unless flag == :update
+                         no = OPT_NPM[:no][:install]
                        end
-                       no = OPT_NPM[:no][:install]
                      end
                      [
                        opts,
-                       npmopts(*flags),
+                       npmopts(flag, *flags),
                        session('npm', flag)
                      ]
                    end
@@ -1052,6 +1168,8 @@ module Squared
 
             op.append(quote: true)
               .clear(errors: true)
+          when true
+            op.append(quote: true)
           else
             op.clear
           end
@@ -1293,6 +1411,10 @@ module Squared
 
         private
 
+        def npm_output(*cmd, **kwargs)
+          session_output('npm', *cmd, **kwargs)
+        end
+
         def read_package(key = 'packageManager', update: false)
           unless !update && @pm.key?(key)
             doc = JSON.parse(dependfile.read)

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

@@ -201,7 +201,7 @@ module Squared
                               end
                               found |= 1
                               run(script, from: :run)
-                            elsif exception
+                            elsif exception?
                               indexerror n, list
                             else
                               found |= 2
@@ -216,7 +216,7 @@ module Squared
                               found |= 1
                               run(pdm_session('run', val), from: :run)
                             else
-                              raise "script: #{val}" if exception
+                              raise "script: #{val}" if exception?
 
                               found |= 2
                               log.warn "run script \"#{val}\"".subhint('not indexed')
@@ -228,7 +228,7 @@ module Squared
                     end
                     next if found.anybits?(1)
 
-                    puts log_message(found == 0 ? Logger::INFO : Logger.WARN,
+                    puts log_message(found == 0 ? Logger::INFO : Logger::WARN,
                                      "no scripts #{found == 0 ? 'found' : 'executed'}",
                                      subject: name, hint: pyprojectfile)
                   end
@@ -614,7 +614,7 @@ module Squared
             op.clear
           when :user, :upgrade
             op.concat(packages)
-            raise_error 'no packages listed', hint: flag if op.empty?
+            raise_error ArgumentError, 'no packages listed', hint: flag if op.empty?
             op << "--#{flag}"
             op.append
             python_session('-m pip', *op.to_a.drop(1)) if workspace.windows?
@@ -685,6 +685,7 @@ module Squared
             run(from: from)
           end
         end
+        alias build_ build!
 
         def publish(flag, opts = [], test: false)
           list = case flag
@@ -771,7 +772,7 @@ module Squared
               when :install, :uninstall
                 op << '.' if installable? && !op.arg?('r', 'requirement')
               else
-                raise_error 'no packages listed', hint: flag
+                raise_error ArgumentError, 'no packages listed', hint: flag
               end
             elsif flag == :install
               op.append_any