jekyll-awesome-nav 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01fa08c8a44630c6314fb330db8db6de0977bc66adb8e2c48dd5f127ede6ff8d
-  data.tar.gz: 29964bc8684fc64593bb76b9385ec19706b578aef5ee780155be2f518c50873b
+  metadata.gz: 92223e2c3e03f661381ed950b514da942c9ce18ddc97b5a51e1ffd3536971efa
+  data.tar.gz: a12d8cc9e0500e4deb65803b8ad1bd94cfa88f291b452f21edceb9fd16016c32
 SHA512:
-  metadata.gz: d191dc308b3c7b7b2431417f12c4cdfe59b7acb4c2461364beec68a481909b81dad07724405ee2a2a1644203b6bf13705e86f60af8e98b0895363b3a202a5cb1
-  data.tar.gz: ef4ed52b48b7595d0994ff1f19ba64d70d4e81998ea1ded6b14b395f165a11a0ea5efe43bff3de73ebd8c7e35a48a5e06e7ec1054ff2407becfc838e7ceae6ae
+  metadata.gz: e9fdc037fed9c4fa24186e83047cb98a6ed0bd36e313163d9cc6b8ae87b02bfe07225e6bd1180c502ab437c0764242c78de8ae5bcef5558d29ad2ede34951f88
+  data.tar.gz: 0f973ac341990dc4dfebb041621e8e90e8ab3650d3ea701a4e87bcf8e94a276d360a44af9699306d768cb64810ef1fa74a9a67f8bbcb7716894d82894664b2f2

data/.copier-answers.ci.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
-_commit: aac269f
+_commit: 467877a
 _src_path: gh:athackst/ci
 automerge_mode: poll
 bump_script_path: ''

data/lib/jekyll/awesome_nav/generator.rb

@@ -15,35 +15,52 @@ module Jekyll
         pages = PageSet.new(site, config)
         return if pages.empty?
 
+        result = build_navigation_result(site, config, pages)
+        assign_page_navigation(pages, result)
+        assign_site_navigation(site, result)
+      end
+
+      private
+
+      def build_navigation_result(site, config, pages)
         tree = TreeBuilder.new(pages: pages, root_dir: config.root_dir).build
         nav_map = NavFileLoader.new(site: site, config: config).load
-        resolved_tree = NavResolver.new(root_dir: config.root_dir, nav_map: nav_map).apply(tree, config.root_dir)
-        result = NavigationResult.new(
+        resolved_tree = NavResolver.new(
+          root_dir: config.root_dir,
+          nav_map: nav_map,
+          root_page: pages.root_page
+        ).apply(tree, config.root_dir)
+
+        NavigationResult.new(
           tree: resolved_tree,
           root_dir: config.root_dir,
           root_page: pages.root_page,
           nav_map: nav_map
         )
+      end
 
+      def assign_page_navigation(pages, result)
         pages.each do |page|
           page_dir = Utils.source_dir_for(page)
           nav_dir = result.nav_dir_for(page_dir)
           page_url = Utils.normalize_url(page.url)
+          page_entry = result.nav_entry_for(page_url)
+
           page.data["awesome_nav"] = deep_copy(result.serialized_tree)
           page.data["awesome_nav_local"] = deep_copy(result.local_nav_for(nav_dir))
           page.data["awesome_nav_dir"] = nav_dir
           page.data["breadcrumbs"] = result.breadcrumbs_for(page)
-          page.data["awesome_nav_previous"] = deep_copy(result.nav_entry_for(page_url)&.fetch("previous", nil))
-          page.data["awesome_nav_next"] = deep_copy(result.nav_entry_for(page_url)&.fetch("next", nil))
+          page.data["awesome_nav_previous"] = deep_copy(page_entry&.fetch("previous", nil))
+          page.data["awesome_nav_next"] = deep_copy(page_entry&.fetch("next", nil))
         end
+      end
 
+      def assign_site_navigation(site, result)
         site.config["awesome_nav_tree"] = deep_copy(result.serialized_tree)
         site.config["awesome_nav_local_map"] = deep_copy(result.serialized_local_nav_map)
         site.config["awesome_nav_files"] = deep_copy(result.serialized_nav_files)
       end
 
-      private
-
       def deep_copy(value)
         Marshal.load(Marshal.dump(value))
       end

data/lib/jekyll/awesome_nav/nav_resolver.rb

@@ -2,12 +2,16 @@
 
 module Jekyll
   module AwesomeNav
+    # This class centralizes override resolution, matching, and unmatched append
+    # behavior, so a narrow class-length suppression keeps the logic together.
+    # rubocop:disable Metrics/ClassLength
     class NavResolver
       ResolutionContext = Struct.new(:append_unmatched, :sort_options, :ignore_patterns, keyword_init: true)
 
-      def initialize(root_dir:, nav_map:)
+      def initialize(root_dir:, nav_map:, root_page: nil)
         @root_dir = root_dir
         @nav_map = nav_map
+        @root_page = root_page
         @generated_by_dir = {}
         @generated_by_path = {}
       end
@@ -149,7 +153,13 @@ module Jekyll
         return [] unless generated
         return [] if hidden?(generated)
 
-        return [section_page_node(generated, item.title)] if generated.section? && Utils.normalize_dir(generated.dir) == current_dir
+        if generated.section? &&
+           (Utils.normalize_dir(generated.dir) == current_dir || references_section_index?(item, current_dir, generated))
+          node = section_page_node(generated, item.title)
+          mark_matched(node, matched)
+          mark_section_consumed(generated, matched)
+          return [node]
+        end
 
         node = generated.deep_dup
         node.title = item.title if item.title
@@ -229,7 +239,10 @@ module Jekyll
           next if ignored?(item, current_dir, context.ignore_patterns)
 
           node = item.deep_dup
-          with_resolved_children(node, Utils.normalize_dir(node.dir), context)
+          pruned = prune_matched_descendants(node, matched, context, current_dir)
+          next if pruned.nil?
+
+          with_resolved_children(pruned, Utils.normalize_dir(pruned.dir), context)
         end
       end
 
@@ -240,6 +253,9 @@ module Jekyll
 
           section = @generated_by_dir[candidate]
           return section if section
+
+          root = root_page_node_for(candidate)
+          return root if root
         end
 
         nil
@@ -337,10 +353,38 @@ module Jekyll
         matched[node_key(item)]
       end
 
+      def prune_matched_descendants(item, matched, context, current_dir)
+        return nil if matched?(item, matched)
+        return item unless item.section?
+
+        child_dir = Utils.normalize_dir(item.dir)
+        pruned_children = item.children.filter_map do |child|
+          next if hidden?(child)
+          next if ignored?(child, child_dir.empty? ? current_dir : child_dir, context.ignore_patterns)
+
+          prune_matched_descendants(child.deep_dup, matched, context, child_dir.empty? ? current_dir : child_dir)
+        end
+
+        return nil if pruned_children.empty? && item.url.nil?
+
+        Node.section(
+          dir: item.dir,
+          title: item.title,
+          url: item.url,
+          children: pruned_children,
+          path: item.path,
+          filename: item.filename
+        )
+      end
+
       def node_key(item)
         item.section? ? "dir:#{Utils.normalize_dir(item.dir)}" : "path:#{Utils.normalize_dir(item.path || item.url)}"
       end
 
+      def mark_section_consumed(item, matched)
+        matched["dir:#{Utils.normalize_dir(item.dir)}"] = true
+      end
+
       def child_dir_for_item(parent_dir, item)
         return Utils.normalize_dir(item.dir) if item.dir
         return nil unless item.url
@@ -365,6 +409,29 @@ module Jekyll
         segments = path.split("/")
         File.extname(segments.last).empty? ? segments.join("/") : segments[0...-1].join("/")
       end
+
+      def root_page_node_for(candidate)
+        return nil unless @root_page
+
+        normalized = Utils.normalize_dir(candidate)
+        root_index_path = Utils.normalize_dir(File.join(@root_dir, "index.md"))
+        return nil unless [@root_dir, root_index_path, "index.md"].include?(normalized)
+
+        Node.page(
+          dir: @root_dir,
+          title: Utils.page_title(@root_page, File.basename(@root_page.path, File.extname(@root_page.path))),
+          url: Utils.normalize_url(@root_page.url),
+          path: Utils.source_path_for(@root_page),
+          filename: File.basename(Utils.source_path_for(@root_page))
+        )
+      end
+
+      def references_section_index?(item, current_dir, generated)
+        return false unless generated.path
+
+        candidates_for(item.target, current_dir).include?(Utils.normalize_dir(generated.path))
+      end
     end
+    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/jekyll/awesome_nav/version.rb

@@ -2,7 +2,7 @@
 
 module Jekyll
   module AwesomeNav
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
 
     def self.warn_if_unstamped_version(output = $stderr)
       return unless VERSION == "0.0.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-awesome-nav
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Allison Thackston
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-05-07 00:00:00.000000000 Z
+date: 2026-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll