squared 0.5.4 → 0.5.6

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

@@ -98,7 +98,7 @@ module Squared
           'pack' => nil
         })
 
-        def initialize(*, init: nil, **kwargs)
+        def initialize(*, init: nil, asdf: 'nodejs', **kwargs)
           super
           if @pass.include?(Node.ref)
             initialize_ref Node.ref
@@ -141,12 +141,12 @@ module Squared
                     depend(:add, packages: packages, save: save, exact: exact)
                   end
                 when 'run'
-                  next if (list = read_scripts).empty?
+                  next if scripts.empty?
 
                   format_desc action, nil, "script,opts*|#{indexchar}index+|#,pattern*"
                   task action, [:script] do |_, args|
                     if args.script == '#'
-                      format_list(list, "run[#{indexchar}N]", 'scripts', grep: args.extras, from: dependfile)
+                      format_list(scripts.to_a, "run[#{indexchar}N]", 'scripts', grep: args.extras, from: dependfile)
                     else
                       args = param_guard(action, 'script', args: args.to_a)
                       opts = []
@@ -767,8 +767,8 @@ module Squared
                 seg[4] &&= seg[4].succ
               else
                 seg[2] = seg[2].succ
+                seg[4] &&= '0'
               end
-              seg[4] = '0'
             when :patch
               seg[4] &&= seg[4].succ
             end
@@ -782,15 +782,15 @@ module Squared
                 log.info "bump version #{cur} to #{val} (#{flag})"
                 on :first, :bump
               end
-              if verbose
+              if stdin?
+                puts val
+              elsif 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
@@ -807,7 +807,7 @@ module Squared
           cmd = session dependbin, 'pack'
           if dependtype(:yarn) > 1
             op = OptionPartition.new(opts, OPT_BERRY[:pack], cmd, project: self)
-            op << quote_option('out', Pathname.pwd + "#{project}-#{version}.tgz") unless op.arg?('out')
+            op.append?('out', Pathname.pwd + "#{project}-#{version}.tgz")
           else
             op = OptionPartition.new(opts, pnpm? ? OPT_PNPM[:pack] : OPT_NPM[:pack] + OPT_NPM[:common], cmd,
                                      project: self)
@@ -822,7 +822,7 @@ module Squared
                 end
               end
             end
-            op << quote_option('pack-destination', Dir.pwd) unless op.arg?('pack-destination')
+            op.append?('pack-destination', Dir.pwd)
           end
           op.clear
           run(from: :pack)
@@ -943,6 +943,10 @@ module Squared
           read_packagemanager :name
         end
 
+        def scripts
+          @scripts ||= read_packagemanager(:scripts).yield_self { |ret| ret.is_a?(Hash) ? ret : {} }
+        end
+
         private
 
         def read_packagemanager(key = nil, version: nil, update: false)
@@ -974,13 +978,8 @@ module Squared
           ret
         end
 
-        def read_scripts
-          ret = read_packagemanager(:scripts)
-          ret.is_a?(Hash) ? ret.to_a : []
-        end
-
         def append_loglevel(target: @session)
-          level = env 'NODE_LOGLEVEL'
+          level = env('NODE_LOGLEVEL')
           silent = !verbose || level == 'silent'
           return unless silent || level
 
@@ -1011,10 +1010,6 @@ module Squared
           end
         end
 
-        def dryrun?(prefix = dependbin, **)
-          super || !option('dry-run', prefix: prefix).nil?
-        end
-
         def dependbin
           if yarn?
             'yarn'
@@ -1039,6 +1034,10 @@ module Squared
             { pat: /^(npm )(.+)$/, styles: :bold }
           ]
         end
+
+        def dryrun?(prefix = dependbin, **)
+          super || !option('dry-run', prefix: prefix).nil?
+        end
       end
 
       Application.implement Node

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

@@ -30,7 +30,7 @@ module Squared
         OPT_POETRY = {
           common: %w[ansi no-ansi no-cache n|no-interaction no-plugins q|quiet v|verbose P|project=p].freeze,
           build: %w[clean config-settings=qq f|format=b o|output=p].freeze,
-          publish: %w[build dry-run skip-existing cert=p client-cert=p dist-dir=p p|password=b r|repository=b
+          publish: %w[build dry-run skip-existing cert=p client-cert=p dist-dir=p p|password=b r|repository=q
                       u|username=b].freeze
         }.freeze
         OPT_PDM = {
@@ -45,7 +45,7 @@ module Squared
                      q|quiet v|verbose].freeze,
           build: %w[clean-hooks-after ext hooks-only no-hooks c|clean t|target=b].freeze,
           publish: %w[initialize-auth n|no-prompt y|yes a|auth=q ca-cert=p client-cert=p client-key=p o|option=q
-                      p|publisher=b r|repo=b u|user=q].freeze
+                      p|publisher=b r|repo=q u|user=q].freeze
         }.freeze
         OPT_TWINE = {
           publish: %w[attestations disable-progress-bar non-interactive s|sign skip-existing verbose cert=p
@@ -78,7 +78,7 @@ module Squared
 
         attr_reader :venv, :editable
 
-        def initialize(*, editable: '.', verbose: nil, **kwargs)
+        def initialize(*, editable: '.', verbose: nil, asdf: 'python', **kwargs)
           super
           if @pass.include?(Python.ref)
             initialize_ref Python.ref
@@ -132,7 +132,7 @@ module Squared
                   format_desc action, nil, "script+|#{indexchar}index+|#,pattern*"
                   task action, [:command] do |_, args|
                     found = 0
-                    ['tool.poetry.scripts', 'tool.pdm.scripts', 'project.scripts'].each_with_index do |table, index|
+                    %w[tool.poetry.scripts tool.pdm.scripts project.scripts].each_with_index do |table, index|
                       next if (list = read_pyproject(table)).empty?
 
                       if args.command == '#'
@@ -276,13 +276,16 @@ module Squared
                         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
-                          end
+                          args = case (strategy = args.strategy)
+                                 when 'eager', 'only-if-needed'
+                                   args.extras
+                                 when 'needed'
+                                   strategy = 'only-if-needed'
+                                   args.extras
+                                 else
+                                   strategy = nil
+                                   args.to_a
+                                 end
                           install(flag, args, strategy: strategy)
                         end
                       when :target
@@ -320,12 +323,18 @@ module Squared
                       end
                       break unless flag == :python
                     when 'publish'
-                      format_desc(action, flag, 'opts*', after: case flag
-                                                                when :hatch then 'artifacts?'
-                                                                when :twine then 'dist?'
-                                                                end)
+                      format_desc(action, flag, 'test?,opts*', after: case flag
+                                                                      when :hatch then 'artifacts?'
+                                                                      when :twine then 'dist?'
+                                                                      end)
                       task flag do |_, args|
-                        publish flag, args.to_a
+                        args = args.to_a
+                        publish(flag, args, test: if args.first == 'test'
+                                                    args.shift
+                                                    true
+                                                  else
+                                                    false
+                                                  end)
                       end
                     end
                   end
@@ -532,7 +541,7 @@ module Squared
           run(from: :"#{flag}:build")
         end
 
-        def publish(flag, opts = [])
+        def publish(flag, opts = [], test: false)
           case flag
           when :poetry
             poetry_session 'publish'
@@ -549,10 +558,17 @@ module Squared
           end
           op = OptionPartition.new(opts, list, @session, project: self, single: singleopt(flag))
           dist = lambda do
-            (path + 'dist').tap do |dir|
+            path.join('dist').tap do |dir|
               raise_error('no source files found', hint: dir) unless dir.directory? && !dir.empty?
             end
           end
+          if test
+            if op.arg?('r', flag == :hatch ? 'repo' : 'repository')
+              op.push('test')
+            else
+              op << quote_option('r', 'testpypi')
+            end
+          end
           case flag
           when :hatch, :twine
             if op.empty?
@@ -676,6 +692,7 @@ module Squared
                 op.found << opt
               end
             end
+            op << '--no-build-isolation' if option('build-isolation', equals: '0')
             op.swap
             if edit
               edit = path + edit unless %r{\A[a-z]+(?:\+[a-z]+)?://}i.match?(edit)
@@ -790,7 +807,7 @@ module Squared
             end
             @pyproject[table] = ret
           end
-          return ret.find { |val| val[0] == key }&.last if key
+          return ret.find { |val| val.first == key }&.last if key
 
           ret
         end

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

@@ -25,8 +25,8 @@ module Squared
           common: %w[no-color V|verbose retry=i].freeze,
           install: %w[frozen no-cache no-prune system binstubs=p? path=p standalone=q? target-rbconfig=p trust-policy=b
                       with=q without=q].freeze,
-          install_base: %w[full-index quiet retry gemfile=p j|jobs=i].freeze,
-          update: %w[conservative local pre redownload ruby strict bundler=b? g|group=q source=b].freeze,
+          install_base: %w[force full-index quiet redownload retry gemfile=p j|jobs=i].freeze,
+          update: %w[conservative local pre ruby strict bundler=b? g|group=q source=b].freeze,
           outdated: %w[filter-major filter-minor filter-patch groups local parseable pre only-explicit strict
                        update-strict g|group=q source=b].freeze,
           exec: %w[gemfile=p].freeze,
@@ -91,7 +91,7 @@ module Squared
           'irb' => nil
         })
 
-        def initialize(*, autodetect: false, gemspec: nil, **kwargs)
+        def initialize(*, autodetect: false, gemspec: nil, asdf: 'ruby', **kwargs)
           super
           if @pass.include?(Ruby.ref)
             initialize_ref Ruby.ref
@@ -102,7 +102,13 @@ module Squared
           end
           dependfile_set GEMFILE
           @autodetect = autodetect
-          @gemfile = path + gemspec if gemspec
+          @gemfile = if gemspec == false
+                       false
+                     elsif gemspec
+                       path + (gemspec.include?('.') ? gemspec : "#{gemspec}.gemspec")
+                     elsif (gemspec = path + "#{name}.gemspec").exist? || (gemspec = path + "#{project}.gemspec").exist?
+                       gemspec
+                     end
           return if !@output[0].nil? || !@copy.nil? || version || @autodetect || !rakefile
 
           begin
@@ -140,21 +146,21 @@ module Squared
                   format_desc action, nil, "task+,opts*|#{indexchar}index+|#,pattern*"
                   task action, [:command] do |_, args|
                     if args.command == '#'
-                      format_list(read_rakefile, "rake[#{indexchar}N]", 'tasks', grep: args.extras, from: rakefile,
-                                                                                 each: ->(val) { val[0] + val[1].to_s })
+                      format_list(raketasks, "rake[#{indexchar}N]", 'tasks', grep: args.extras, from: rakefile,
+                                                                             each: ->(val) { val[0] + val[1].to_s })
                     else
                       args, opts = args.to_a.partition { |val| indexitem(val) }
                       if args.empty?
                         rake(opts: opts)
                       else
-                        list = read_rakefile
+                        tasks = raketasks
                         while (n, pre = indexitem(args.shift))
-                          if (item = list[n - 1])
+                          if (item = tasks[n - 1])
                             cmd = pre ? "#{pre} #{item.first}" : item.first
                           elsif exception
-                            indexerror n, list
+                            indexerror n, tasks
                           else
-                            log.warn "rake task #{n} of #{list.size} (out of range)"
+                            log.warn "rake task #{n} of #{tasks.size} (out of range)"
                             next
                           end
                           if opts.empty?
@@ -177,7 +183,8 @@ module Squared
                 else
                   format_desc(action, nil, 'opts*', before: case action
                                                             when 'cache', 'check' then nil
-                                                            else 'command+' end)
+                                                            else 'command+'
+                                                            end)
                   task action do |_, args|
                     bundle(action, *args.to_a)
                   end
@@ -209,7 +216,7 @@ module Squared
                       when :build, :push, :exec, :update
                         format_desc(action, flag, 'opts*', after: case flag
                                                                   when :exec then 'command,args*'
-                                                                  when :push then 'file?'
+                                                                  when :push then 'file?|:'
                                                                   when :update then 'name*'
                                                                   end)
                         task flag do |_, args|
@@ -426,14 +433,23 @@ module Squared
 
         def install(flag, opts = [])
           bundle_session 'install', "--#{flag}"
-          append_bundle opts, OPT_BUNDLE[:install_base] + OPT_BUNDLE[:install] + OPT_BUNDLE[:common]
+          op = append_bundle opts, OPT_BUNDLE[:install_base] + OPT_BUNDLE[:install] + OPT_BUNDLE[:common]
+          if op.arg?('force')
+            op.delete('--force')
+            if flag != :redownload
+              op << '--redownload'
+            elsif (lock = basepath('Gemfile.lock')).exist?
+              config = basepath('.bundle', 'config')
+              lock.delete unless config.exist? && config.read.match?(/\bBUNDLE_FROZEN:\s+"true"/)
+            end
+          end
           run_rb(from: :install)
         end
 
         def update(flag, opts = [])
           bundle_session 'update', "--#{flag}"
           append_bundle(opts, OPT_BUNDLE[:install_base] + OPT_BUNDLE[:update] + OPT_BUNDLE[:common],
-                        append: flag == :all ? nil : /\A[a-z\-]+=/)
+                        append: flag == :all ? nil : /\A[a-z-]+=/)
           run_rb(from: :update)
         end
 
@@ -451,16 +467,44 @@ module Squared
           when :version
             pwd_set do
               out = []
-              [
+              order = { 'rvm' => -1, 'rbenv' => -1, 'chruby' => -1, 'asdf' => -1 }
+              ENV.fetch('PATH', '').split(':').each_with_index do |val, index|
+                order.each_key do |key|
+                  if val.match?(%r{[/.]#{key}/})
+                    order[key] = index
+                    break
+                  end
+                end
+              end
+              paths = [
                 '$HOME/.rvm/bin/rvm',
                 '/usr/local/rvm/bin/rvm',
                 '/usr/share/rvm/bin/rvm',
                 "#{ENV.fetch('RBENV_ROOT', '$HOME/.rbenv')}/bin/rbenv",
                 '/usr/bin/rbenv',
-                '/usr/local/share/chruby/chruby.sh',
-                "#{ENV.fetch('ASDF_DATA_DIR', '$HOME/.asdf')}/plugins/ruby/bin/install",
-                ''
-              ].each do |val|
+                '/usr/local/share/chruby/chruby.sh'
+              ]
+              paths << "#{ENV.fetch('ASDF_DATA_DIR', '$HOME/.asdf')}/installs/#{@asdf.first}" if @asdf
+              paths.sort do |a, b|
+                c = -1
+                d = -1
+                order.each do |key, val|
+                  pat = %r{/\.?#{key}}
+                  c = val if a.match?(pat)
+                  d = val if b.match?(pat)
+                end
+                if c == d
+                  0
+                elsif c == -1
+                  1
+                elsif d == -1
+                  -1
+                else
+                  c < d ? -1 : 1
+                end
+              end
+              .append('')
+              .each do |val|
                 next unless val.empty? || File.exist?(val.sub('$HOME', Dir.home))
 
                 trim = ->(s) { s[/\A\D+\d+\.\d+(?:\.\S+)?/, 0].sub(/\A([a-z]+)-/i, '\1 ') }
@@ -475,12 +519,15 @@ module Squared
                                  when 'chruby.sh'
                                    chruby = session_output 'source', val
                                    `#{chruby.with('ruby --version')}`
-                                 when 'install'
-                                   ver = '.tool-versions'
-                                   `asdf current ruby`[/ruby\s+\S+/, 0].sub(/\s+/, ' ')
                                  else
-                                   ver = nil
-                                   `ruby --version`
+                                   if @asdf
+                                     cmd = 'asdf'
+                                     ver = '.tool-versions'
+                                     `asdf current #{@asdf.first}`[/\A\S+\s+\S+/, 0].sub(/\s+/, ' ')
+                                   else
+                                     ver = nil
+                                     `ruby --version`
+                                   end
                                  end)
                 break if workspace.windows?
 
@@ -488,7 +535,7 @@ module Squared
                   out << trim.call(case cmd
                                    when 'chruby.sh'
                                      `#{chruby.with('chruby --version')}`.sub(':', '')
-                                   when 'install'
+                                   when 'asdf'
                                      "asdf #{`asdf version`.delete_prefix('v')}"
                                    else
                                      `#{cmd} --version`
@@ -500,8 +547,8 @@ module Squared
                                          `rbenv which ruby`
                                        when 'chruby.sh'
                                          `#{chruby.with('which ruby')}`
-                                       when 'install'
-                                         `asdf which ruby`
+                                       when 'asdf'
+                                         `asdf which #{@asdf.first}`
                                        else
                                          `which ruby`
                                        end)
@@ -692,14 +739,14 @@ module Squared
                 .clear(pass: false)
             end
           when :push
-            if op.empty?
-              file = path + (if (spec = gemspec)
+            if op.empty? || (n = op.index(':'))
+              file = path + (if !n && (spec = gemspec)
                                "#{spec.name}-#{spec.version}.gem"
                              else
                                choice_index('Select a file', Dir.glob('*.gem', base: path), force: true)
                              end)
             else
-              file = path + op.shift
+              file = path + op.shift.yield_self { |val| val.include?('.') ? val : "#{val}.gem" }
               raise_error('gem not found', hint: file) unless file.exist?
               raise_error("unknown args: #{op.join(', ')}", hint: flag) unless op.empty?
             end
@@ -815,14 +862,11 @@ module Squared
         def gemspec
           return @gemspec unless @gemspec.nil?
 
-          begin
-            if (file = gemfile)
-              @gemspec = Gem::Specification.load(file.to_s)
-            end
-          rescue StandardError => e
-            log.debug e
-          end
-          @gemspec ||= false
+          @gemspec = if (file = gemfile)
+                       Gem::Specification.load(file.to_s) rescue false
+                     else
+                       false
+                     end
         end
 
         def gemname
@@ -938,6 +982,7 @@ module Squared
           else
             op.clear
           end
+          op
         end
 
         def ruby_session(*cmd, **kwargs)
@@ -979,27 +1024,10 @@ module Squared
           session_output('rake', *cmd, **kwargs)
         end
 
-        def read_rakefile
-          @read_rakefile ||= [].tap do |ret|
-            opt = rakepwd
-            pwd_set(pass: !opt.nil?) do
-              IO.popen(rake_output(opt, '-AT').to_s).each do |line|
-                next unless line =~ /^rake ((?:[^\[: ]+:?)+)(\[[^\]]+\])?/
-
-                ret << [$1, $2]
-              end
-            end
-          end
-        end
-
         def preopts
           verbosetype > 1 && !session_arg?('quiet') ? ['--verbose'] : []
         end
 
-        def gemdir?
-          !@gemdir.nil? && @gemdir.exist? && !@gemdir.empty?
-        end
-
         def variables
           (super + %i[version autodetect]).freeze
         end
@@ -1018,6 +1046,19 @@ module Squared
           quote_option 'C', path
         end
 
+        def raketasks
+          @raketasks ||= [].tap do |ret|
+            opt = rakepwd
+            pwd_set(pass: !opt.nil?) do
+              IO.popen(rake_output(opt, '-AT').to_s).each do |line|
+                next unless line =~ /^rake ((?:[^\[: ]+:?)+)(\[[^\]]+\])?/
+
+                ret << [$1, $2]
+              end
+            end
+          end
+        end
+
         def gempwd
           return unless !pwd? && semgte?(Gem::VERSION, '3.4.2')
 
@@ -1045,6 +1086,10 @@ module Squared
         def gempath(val = version)
           File.join('gems', "#{gemname}-#{val}")
         end
+
+        def gemdir?
+          !@gemdir.nil? && @gemdir.exist? && !@gemdir.empty?
+        end
       end
 
       Application.implement Ruby

data/lib/squared/workspace/project/support/class.rb

@@ -10,15 +10,22 @@ module Squared
           include Common::Shell
           extend Forwardable
 
+          OPT_VALUE = /\A([^=]+)=(.+)\z/
+          private_constant :OPT_VALUE
+
           class << self
             include Common::Format
             include Shell
             include Prompt
 
-            def append(target, *args, delim: false, escape: false, quote: true, **)
+            def append(target, *args, delim: false, escape: false, quote: true, strip: nil, **)
               return if (ret = args.flatten).empty?
 
               target << '--' if delim && !target.include?('--')
+              if strip
+                pat, s = Array(strip)
+                ret.map! { |val| val.gsub(pat, s || '') }
+              end
               ret.map! { |val| escape ? shell_escape(val, quote: quote) : shell_quote(val) } if escape || quote
               if target.is_a?(Set)
                 target.merge(ret)
@@ -74,7 +81,7 @@ module Squared
           def_delegators :@target, :+, :-, :<<, :any?, :none?, :include?, :add, :add?, :find, :find_all, :find_index,
                          :merge, :delete, :delete?, :delete_if, :grep, :grep_v, :inspect, :to_a, :to_s
           def_delegators :@extras, :empty?, :each, :each_with_index, :partition, :dup, :first, :last, :shift, :unshift,
-                         :pop, :push, :index, :delete_at, :join, :map, :map!, :select, :reject, :size
+                         :pop, :push, :concat, :index, :delete_at, :join, :map, :map!, :select, :select!, :reject, :size
 
           def_delegator :@extras, :delete, :remove
           def_delegator :@extras, :delete_if, :remove_if
@@ -164,7 +171,7 @@ module Squared
               elsif opt.start_with?('no-') && no.include?(name = opt[3..-1])
                 add "--no-#{name}"
               else
-                if opt =~ /\A([^=]+)=(.+)\z/
+                if opt =~ OPT_VALUE
                   key = $1
                   val = $2
                   merge = m.include?(key)
@@ -209,6 +216,52 @@ module Squared
             self
           end
 
+          def values_of(*args, strict: true, first: false, last: false)
+            eq, s = strict ? ['=', '[^ ]+'] : ['(?:=| +)', '[^-][^ ]*']
+            grp = ["\"((?:[^\"]|(?<=\\\\)\"(?!$#{Rake::Win32.windows? ? '| ' : ''}))*)\""]
+            grp << "'((?:[^']|'\\\\'')*)'" unless Rake::Win32.windows?
+            grp << "(#{s})"
+            args.map! do |opt|
+              if opt.size == 1
+                /(?:\A| )-#{opt} ?([^ ]+)/
+              else
+                /(?:\A| )--#{opt + eq}(?:#{grp.join('|')})/
+              end
+            end
+            ret = []
+            target.each do |opt|
+              args.each do |pat|
+                next unless opt =~ pat
+
+                ret << ($1 || $2 || $3)
+                break
+              end
+            end
+            return ret unless first || last
+
+            if last
+              last.is_a?(Numeric) ? ret.last(last) : ret.last
+            else
+              first.is_a?(Numeric) ? ret.first(first) : ret.first
+            end
+          end
+
+          def uniq(list)
+            items = map { |val| nameonly(val) }
+            list.reject do |val|
+              next true if items.include?(s = nameonly(val))
+
+              pat = /\A#{s = fill_option(s)}(?:#{s.start_with?('--') ? '[= ]' : '.*'}|\z)/
+              any? { |opt| opt.match?(pat) }
+            end
+          end
+
+          def uniq!(list)
+            n = size
+            concat uniq(list)
+            extras if size > n
+          end
+
           def clear(opts = nil, errors: false, **kwargs)
             styles = project.theme[:inline] if project
             if !opts
@@ -275,7 +328,7 @@ module Squared
             unless found.empty?
               add '--' if delim
               extras.clear
-              extras.concat(other)
+              concat other
               if path
                 found.each { |val| add_path(val) }
               else
@@ -291,9 +344,33 @@ module Squared
             self
           end
 
+          def append?(key, val = nil, type: nil, force: false, **kwargs)
+            return false unless force || !arg?(key)
+
+            val = yield self if block_given?
+            return false unless val
+
+            type ||= :quote if kwargs.empty?
+            add case type
+                when :quote
+                  quote_option(key, val)
+                when :basic
+                  basic_option(key, val)
+                else
+                  shell_option(key, val, **kwargs)
+                end
+            true
+          end
+
           def arg?(*args, **kwargs)
             OptionPartition.arg?(target, *args, **kwargs)
           end
+
+          private
+
+          def nameonly(val)
+            val[OPT_VALUE, 1] || val
+          end
         end
 
         class JoinSet < Set