na 1.2.94 → 1.2.95

data/bin/commands/next.rb

@@ -136,6 +136,39 @@ class App
           options[:depth].nil? ? global_options[:depth].to_i : options[:depth].to_i
         end
 
+      # Detect TaskPaper-style @search() syntax in QUERY arguments and delegate
+      # directly to the TaskPaper search runner (supports item paths and
+      # advanced TaskPaper predicates).
+      joined_args = args.join(' ')
+      if joined_args =~ /@search\((.+)\)/
+        inner = Regexp.last_match(1)
+        expr = "@search(#{inner})"
+
+        file_path = options[:file] ? File.expand_path(options[:file]) : nil
+        NA::Pager.paginate = false if options[:omnifocus]
+
+        NA.run_taskpaper_search(
+          expr,
+          file: file_path,
+          options: {
+            depth: depth,
+            notes: options[:notes],
+            nest: options[:nest],
+            omnifocus: options[:omnifocus],
+            no_file: options[:no_file],
+            times: options[:times],
+            human: options[:human],
+            search_notes: options[:search_notes],
+            invert: false,
+            regex: options[:regex],
+            project: options[:project],
+            done: options[:done],
+            require_na: true
+          }
+        )
+        next
+      end
+
       if options[:exact] || options[:regex]
         search = options[:search].join(" ")
       else
@@ -263,6 +296,13 @@ class App
 
       file_path = options[:file] ? File.expand_path(options[:file]) : nil
 
+      # Support TaskPaper-style item paths in --project when value starts with '/'
+      project_filter_paths = nil
+      if options[:project]&.start_with?('/')
+        project_filter_paths = NA.resolve_item_path(path: options[:project], file: file_path, depth: depth)
+        options[:project] = nil
+      end
+
       todo = NA::Todo.new({ depth: depth,
                             hidden: options[:hidden],
                             done: options[:done],
@@ -279,6 +319,17 @@ class App
       end
       NA::Pager.paginate = false if options[:omnifocus]
 
+      # Apply item-path project filters, if any
+      if project_filter_paths && project_filter_paths.any?
+        todo.actions.delete_if do |a|
+          parents = Array(a.parent)
+          path = parents.join(':')
+          project_filter_paths.none? do |p|
+            path =~ /\A#{Regexp.escape(p)}(?::|\z)/i
+          end
+        end
+      end
+
       # If a plugin is specified, transform actions in memory for display only
       if options[:plugin]
         NA::Plugins.ensure_plugins_home

data/bin/commands/saved.rb

@@ -27,29 +27,64 @@ class App
       NA.edit_searches if options[:edit]
 
       if args.empty? && !options[:select]
-        searches = NA.load_searches
+        yaml_searches = NA.load_searches
+        taskpaper_searches = NA.load_taskpaper_searches(depth: 1)
         NA.notify("#{NA.theme[:success]}Saved searches stored in #{NA.database_path(file: 'saved_searches.yml').highlight_filename}")
-        NA.notify(searches.map { |k, v| "#{NA.theme[:filename]}#{k}: #{NA.theme[:values]}#{v}" }.join("\n"))
+        lines = yaml_searches.map do |k, v|
+          "#{NA.theme[:filename]}#{k}: #{NA.theme[:values]}#{v}"
+        end
+        unless taskpaper_searches.empty?
+          lines << "#{NA.theme[:prompt]}TaskPaper saved searches:"
+          lines.concat(
+            taskpaper_searches.map do |k, v|
+              "#{NA.theme[:filename]}#{k}: #{NA.theme[:values]}#{v[:expr]} #{NA.theme[:note]}(#{File.basename(v[:file])})"
+            end
+          )
+        end
+        NA.notify(lines.join("\n"))
       else
         NA.delete_search(args.join(',').split(/[ ,]/)) if options[:delete]
 
         if options[:select]
-          searches = NA.load_searches
-          res = NA.choose_from(searches.map { |k, v| "#{NA.theme[:filename]}#{k} #{NA.theme[:value]}(#{v})" }, multiple: true)
+          yaml_searches = NA.load_searches
+          taskpaper_searches = NA.load_taskpaper_searches(depth: 1)
+          combined = {}
+          yaml_searches.each { |k, v| combined[k] = { source: :yaml, value: v } }
+          taskpaper_searches.each { |k, v| combined[k] ||= { source: :taskpaper, value: v } }
+
+          res = NA.choose_from(
+            combined.map do |k, info|
+              val = info[:source] == :yaml ? info[:value] : info[:value][:expr]
+              "#{NA.theme[:filename]}#{k} #{NA.theme[:value]}(#{val})"
+            end,
+            multiple: true
+          )
           NA.notify("#{NA.theme[:error]}Nothing selected", exit_code: 0) if res&.empty?
           args = res.map { |r| r.match(/(\S+)(?= \()/)[1] }
         end
 
         args.each do |arg|
-          searches = NA.load_searches
+          yaml_searches = NA.load_searches
+          taskpaper_searches = NA.load_taskpaper_searches(depth: 1)
+          all_keys = (yaml_searches.keys + taskpaper_searches.keys).uniq
 
-          keys = searches.keys.delete_if { |k| k !~ /#{arg.wildcard_to_rx}/ }
+          keys = all_keys.delete_if { |k| k !~ /#{arg.wildcard_to_rx}/ }
           NA.notify("#{NA.theme[:error]}Search #{arg} not found", exit_code: 1) if keys.empty?
 
           keys.each do |key|
             NA.notify("#{NA.theme[:prompt]}Saved search #{NA.theme[:filename]}#{key}#{NA.theme[:warning]}:")
-            cmd = Shellwords.shellsplit(searches[key])
-            run(cmd)
+            if yaml_searches.key?(key)
+              value = yaml_searches[key]
+              if value.to_s.strip =~ /\A@search\(.+\)\s*\z/
+                NA.run_taskpaper_search(value)
+              else
+                cmd = Shellwords.shellsplit(value)
+                run(cmd)
+              end
+            elsif taskpaper_searches.key?(key)
+              info = taskpaper_searches[key]
+              NA.run_taskpaper_search(info[:expr], file: info[:file])
+            end
           end
         end
       end

data/lib/na/action.rb

@@ -422,7 +422,9 @@ module NA
       return false if keys.empty?
 
       key = keys[0]
-      return true if tag[:comp].nil?
+      # If no comparator is provided, treat this as an "existence" check:
+      # any value for this tag name is acceptable.
+      return true if tag[:comp].nil? || tag[:comp].to_s.empty?
 
       tag_val = @tags[key]
       val = tag[:value]