asciidoctor-reducer 1.0.0.alpha.7 → 1.0.0.alpha.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a685ae408de9db32a7ec96055b70120ea6f7476436dca071cc37155cc680d56
-  data.tar.gz: 39d783c66481423417d64a232ee01bdaa88bef517474d22e8ec9fdeb670d09d9
+  metadata.gz: 425f7379b4e69cb9487a2c2affcd77bd7cc548bd7818b073334f45a64f853f9c
+  data.tar.gz: b3a85d94ee64d2ecee967a3a88a7ce4295af83eda84c76f852df24fcb312b9ee
 SHA512:
-  metadata.gz: a3376645764a9d608f3e3aad5f29f2080748d9ecd20d90a06e2335263cdd7c88c0450a72ea061f8f36c17fa19af0f985a89002ee70e12ce950f4320c483b8140
-  data.tar.gz: a7899259cf2ff2daf619d13b97d88dd460a013b0bc85d2c8402e1283f1b3d6fff3780bc3c112e4c281463ad06e0bcb035385998771528a01e3aac487dd7c6e09
+  metadata.gz: f48fffea4f5dd09c1cec0d375a1fe1050144c5e723802413e2de3191c57e221f0482f210addb533d4b7ddac23a7142ee5b75721e9d5b1269e001d17da97d5726
+  data.tar.gz: a4538dc754a1f4b82aa0fd4bb8b89ed848da9b3932430dbb2c51c3b443d08c0d5a4c345925be75cbbee0c0fa1cf8dce08e60d42d9a27d3b2ddb2b5ad9c30f5c6

data/CHANGELOG.adoc

@@ -4,6 +4,63 @@
 This document provides a high-level view of the changes to the Asciidoctor Reducer by release.
 For a detailed view of what has changed, refer to the {url-repo}/commits/main[commit history] on GitHub.
 
+== 1.0.0.alpha.10 (2022-04-21) - @mojavelinux
+
+=== Changed
+
+* Set Ruby 2.7 as minimum Ruby version
+
+=== Details
+
+{url-repo}/releases/tag/v1.0.0.alpha.10[git tag] | {url-repo}/compare/v1.0.0.alpha.9\...v1.0.0.alpha.10[full diff]
+
+== 1.0.0.alpha.9 (2022-04-21) - @mojavelinux
+
+=== Added
+
+* Add `Asciidoctor::Reducer::IncludeMapper` auxiliary extension, required by `asciidoctor/reducer/include_mapper/extension` (#26)
+* Register `Asciidoctor::Reducer::IncludeMapper` extension when `asciidoctor/reducer/include_mapper` is required (#26)
+* Add `Asciidoctor::Reducer::Extensions.key` method that returns key for registering extension group
+* Update help text to note that the `-a` and `-r` CLI options may be specified multiple times
+* Automate the release process
+
+=== Changed
+
+* Rename x_include_replacements attr on reader to include_replacements since it's public
+* Don't pass `:to` option to `Asciidoctor.load_file`
+* Make `Asciidoctor::Reducer::Cli` a module instead of a class
+
+=== Fixed
+
+* Replace remote include with link if `allow-uri-read` attribute is not set
+* Don't raise error if `Asciidoctor::Reducer::Extensions.unregister` is called when extensions are not registered globally
+* Ensure output is written to file with universal newlines (\n) on Windows
+
+=== Details
+
+{url-repo}/releases/tag/v1.0.0.alpha.9[git tag] | {url-repo}/compare/v1.0.0.alpha.8\...v1.0.0.alpha.9[full diff]
+
+== 1.0.0.alpha.8 (2022-02-23) - @mojavelinux
+
+=== Added
+
+* Add secure mode as value of `-S` CLI option (#31)
+* Add `--trace` option to CLI to trace cause of application errors (#29)
+
+=== Changed
+
+* Replace include directive with link macro if safe mode is secure (#31)
+* Track line numbers in include replacements using 1-based index
+* Only mix in preprocessor conditional tracker if `:preserve_conditionals` option is not set (#36)
+
+=== Fixed
+
+* Handle signals gracefully (#33)
+
+=== Details
+
+{url-repo}/releases/tag/v1.0.0.alpha.8[git tag]
+
 == 1.0.0.alpha.7 (2022-02-14) - @mojavelinux
 
 === Added
@@ -23,6 +80,10 @@ For a detailed view of what has changed, refer to the {url-repo}/commits/main[co
 
 * Require asciidoctor/reducer/version automatically when `Asciidoctor::Reducer::VERSION` is accessed
 
+=== Details
+
+{url-repo}/releases/tag/v1.0.0.alpha.7[git tag]
+
 == 1.0.0.alpha.6 (2022-02-10) - @mojavelinux
 
 === Added
@@ -43,6 +104,10 @@ For a detailed view of what has changed, refer to the {url-repo}/commits/main[co
 * Prevent custom extension registry from activating extensions twice during reload (#21)
 * Retain includes table in document catalog when reloading document (#23)
 
+=== Details
+
+{url-repo}/releases/tag/v1.0.0.alpha.6[git tag]
+
 == 1.0.0.alpha.5 (2022-02-06) - @mojavelinux
 
 === Changed
@@ -56,12 +121,20 @@ For a detailed view of what has changed, refer to the {url-repo}/commits/main[co
 
 * Suppress log messages when reloading document (#14)
 
+=== Details
+
+{url-repo}/releases/tag/v1.0.0.alpha.5[git tag]
+
 == 1.0.0.alpha.4 (2022-02-03) - @mojavelinux
 
 === Fixed
 
 * Fix replacement of nested empty and unresolved includes
 
+=== Details
+
+{url-repo}/releases/tag/v1.0.0.alpha.4[git tag]
+
 == 1.0.0.alpha.3 (2022-02-02) - @mojavelinux
 
 === Changed
@@ -71,6 +144,10 @@ For a detailed view of what has changed, refer to the {url-repo}/commits/main[co
 * Only reload document if source lines have changed; otherwise, update source lines on reader directly
 * Change default safe mode for CLI to :unsafe
 
+=== Details
+
+{url-repo}/releases/tag/v1.0.0.alpha.3[git tag]
+
 == 1.0.0.alpha.2 (2022-01-27) - @mojavelinux
 
 === Added
@@ -90,34 +167,14 @@ For a detailed view of what has changed, refer to the {url-repo}/commits/main[co
 
 * Preserve return value when overridding `preprocess_include_directive` method
 
-== 1.0.0.alpha.1 (2022-01-12) - @mojavelinux
-
-Initial release.
-
-=== Details
-
-{url-repo}/releases/tag/v1.0.0.alpha.1[git tag]
-
 === Details
 
 {url-repo}/releases/tag/v1.0.0.alpha.2[git tag]
 
-=== Details
-
-{url-repo}/releases/tag/v1.0.0.alpha.3[git tag]
-
-=== Details
-
-{url-repo}/releases/tag/v1.0.0.alpha.4[git tag]
-
-=== Details
-
-{url-repo}/releases/tag/v1.0.0.alpha.5[git tag]
-
-=== Details
+== 1.0.0.alpha.1 (2022-01-12) - @mojavelinux
 
-{url-repo}/releases/tag/v1.0.0.alpha.6[git tag]
+Initial release.
 
 === Details
 
-{url-repo}/releases/tag/v1.0.0.alpha.7[git tag]
+{url-repo}/releases/tag/v1.0.0.alpha.1[git tag]

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (C) 2021 Dan Allen
+Copyright (C) 2021-present Dan Allen
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.adoc

@@ -1,6 +1,6 @@
 = {project-name}
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>
-v1.0.0.alpha.7, 2022-02-14
+v1.0.0.alpha.10, 2022-04-21
 :idprefix:
 :idseparator: -
 ifndef::env-github[:icons: font]
@@ -16,14 +16,14 @@ endif::[]
 :url-rvm: https://rvm.io
 :url-repo: https://github.com/asciidoctor/{project-handle}
 
-{project-name} is a tool that reduces a composite AsciiDoc document containing includes to a single AsciiDoc document by expanding any includes reachable from the parent document.
-The tool also applies preprocessor conditionals (unless the option to preserve them is specified), leaving behind only the enabled lines.
+{project-name} is a tool that reduces an AsciiDoc document that contains includes to a single AsciiDoc document by expanding any includes reachable from the parent document.
+The tool also applies preprocessor conditionals (unless the option to preserve them is specified), leaving behind only the selected lines.
 If the document does not contain any preprocessor directives, the tool returns the original source.
 
 == Prerequisites
 
 {project-name} is a Ruby application that you install using Ruby packaging.
-To install and run {project-name}, you need Ruby 2.5 or better.
+To install and run {project-name}, you need Ruby 2.7 or better.
 
 Run the following command to check which version of Ruby you have installed, if any:
 
@@ -197,6 +197,69 @@ This call will cause extensions that run during the load phase to be invoked aga
 An extension can check for this secondary load by checking for the `:reduced` option in the `Document#options` hash.
 If this option is set (the value of which will be `true`), then Asciidoctor is loading the reduced document.
 
+== Include Mapper (Experimental)
+
+One of the challenges of reducing a document is that interdocument xrefs that rely on the includes being registered in the document catalog no longer work.
+That's because when the reduced document is converted, it has no includes and thus all interdocument xrefs are colocated in the same source file.
+To work around this shortcoming, {project-name} provides a utility extension named the include mapper that will carry over the includes in the document catalog to the reduced document so they can be imported during conversion.
+
+CAUTION: The include mapper is experimental and thus subject to change.
+
+To use the include mapper when using the CLI to reduce the document, require it using the `-r` option as follows:
+
+ $ asciidoctor-reducer -r asciidoctor/reducer/include_mapper -o input-reduced.adoc input.adoc
+
+To use the include mapper when converting the reduced document, again require it using the `-r` option as follows:
+
+ $ asciidoctor -r asciidoctor/reducer/include_mapper input-reduced.adoc
+
+To use the include mapper when using the API, first require the extension:
+
+[,ruby]
+----
+require 'asciidocotor/reducer/include_mapper/extension'
+----
+
+You then need to register the extension when reducing the document:
+
+[,ruby]
+----
+Asciidoctor::Reducer.reduce_file 'sample.adoc', to: 'sample-reduced.adoc', extensions: proc {
+  next if document.options[:reduced]
+  tree_processor Asciidoctor::Reducer::IncludeMapper
+}
+----
+
+Then register it again when converting the reduced document:
+
+[,ruby]
+----
+Asciidoctor.convert_file 'sample-reduced.adoc', safe: :safe, extensions: proc {
+  tree_processor Asciidoctor::Reducer::IncludeMapper
+}
+----
+
+You can also register the extension globally:
+
+[,ruby]
+----
+require 'asciidocotor/reducer/include_mapper'
+----
+
+In this case, you don't have to pass it to the API explicitly.
+
+=== How it Works
+
+The include mapper works by adding a magic comment to the bottom of the reduced file.
+Here's an example of that comment:
+
+[,asciidoc]
+----
+//# includes=chapters/chapter-a,chapters/chapter-b
+----
+
+When a document that contains the magic comment is converted, the include mapper reads the comma-separated paths in the value and loads them into the includes table of the document catalog.
+
 == Development
 
 Follow the instructions below to learn how to help develop the project or test-drive the development version.

data/asciidoctor-reducer.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.homepage = 'https://asciidoctor.org'
   s.license = 'MIT'
   # NOTE required ruby version is informational only; it's not enforced since it can't be overridden and can cause builds to break
-  #s.required_ruby_version = '>= 2.5.0'
+  #s.required_ruby_version = '>= 2.7.0'
   s.metadata = {
     'bug_tracker_uri' => 'https://github.com/asciidoctor/asciidoctor-reducer/issues',
     'changelog_uri' => 'https://github.com/asciidoctor/asciidoctor-reducer/blob/main/CHANGELOG.adoc',

data/bin/asciidoctor-reducer

@@ -1,11 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-asciidoctor_reducer_cli = File.absolute_path '../lib/asciidoctor/reducer/cli', __dir__
-if File.exist? asciidoctor_reducer_cli
-  require asciidoctor_reducer_cli
-else
-  require 'asciidoctor/reducer/cli'
-end
-
+asciidoctor_reducer_cli = File.join (File.dirname __dir__), 'lib/asciidoctor/reducer/cli.rb'
+require (File.file? asciidoctor_reducer_cli) ? asciidoctor_reducer_cli : 'asciidoctor/reducer/cli'
 exit Asciidoctor::Reducer::Cli.run

data/lib/asciidoctor/reducer/api.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'pathname'
+autoload :Pathname, 'pathname'
 require_relative 'extensions'
 
 module Asciidoctor::Reducer
@@ -8,8 +8,12 @@ module Asciidoctor::Reducer
 
   class << self
     def reduce input, opts = {}
-      opts = opts.merge extension_registry: (Extensions.prepare_registry opts[:extension_registry] || opts[:extensions])
-      opts[:safe] = ::Asciidoctor::SafeMode::SAFE unless opts.key? :safe
+      opts = opts&.merge || {}
+      if (extension_registry = Extensions.prepare_registry opts[:extension_registry] || opts[:extensions])
+        opts[:extension_registry] = extension_registry
+      end
+      opts[:safe] ||= :safe
+      to = opts.delete :to
       case input
       when ::File
         doc = ::Asciidoctor.load_file input, opts
@@ -18,7 +22,7 @@ module Asciidoctor::Reducer
       else
         doc = ::Asciidoctor.load input, opts
       end
-      write doc, opts[:to]
+      write doc, to
     end
 
     def reduce_file input_file, opts = {}
@@ -28,16 +32,15 @@ module Asciidoctor::Reducer
     private
 
     def write doc, to
-      if to && to != '/dev/null'
-        output = doc.source
-        return output if to == ::String
-        output += LF unless output.empty?
-        if ::Pathname === to || (!(to.respond_to? :write) && (to = ::Pathname.new to.to_s))
-          to.dirname.mkpath
-          to.write output, encoding: UTF_8
-        else
-          to.write output
-        end
+      return doc unless to && to != '/dev/null'
+      output = doc.source
+      return output if to == ::String
+      output += LF unless output.empty?
+      if ::Pathname === to || (!(to.respond_to? :write) && (to = ::Pathname.new to.to_s))
+        to.dirname.mkpath
+        to.write output, encoding: UTF_8, newline: :universal
+      else
+        to.write output
       end
       doc
     end

data/lib/asciidoctor/reducer/cli.rb

@@ -4,114 +4,138 @@ require_relative 'api'
 autoload :OptionParser, 'optparse'
 
 module Asciidoctor::Reducer
-  class Cli
-    LOG_LEVELS = (::Logger::Severity.constants false).each_with_object({}) do |level, accum|
-      accum[level.to_s.downcase] = (::Logger::Severity.const_get level) unless level == :UNKNOWN
-    end
+  module Cli
+    class << self
+      def parse args
+        options = { attributes: {}, log_level: LOG_LEVELS['warn'], safe: :unsafe }
+
+        opt_parser = ::OptionParser.new do |opts|
+          opts.program_name = 'asciidoctor-reducer'
+          opts.banner = <<~END
+          Usage: #{opts.program_name} [OPTION]... FILE
+
+          Reduces a composite AsciiDoc document containing includes and conditionals to a single AsciiDoc document.
+
+          END
+
+          opts.on '-a KEY[=VALUE]', '--attribute=KEY[=VALUE]',
+            'set a document attribute in the AsciiDoc document: [key, key!, key=value]',
+            'may be specified multiple times' do |attr|
+            key, val = attr.split '=', 2
+            val ||= ''
+            options[:attributes][key] = val
+          end
 
-    def parse args
-      options = { attributes: {}, log_level: LOG_LEVELS['warn'], safe: :unsafe }
+          opts.on '--log-level LEVEL', %w(debug info warn error fatal),
+            'set the minimum level of messages to log: [debug, info, warn, error, fatal] (default: warn)' do |level|
+            options[:log_level] = level
+          end
 
-      opt_parser = ::OptionParser.new do |opts|
-        opts.program_name = 'asciidoctor-reducer'
-        opts.banner = <<~EOS
-        Usage: #{opts.program_name} [OPTION]... FILE
+          opts.on '-o FILE', '--output=FILE', 'set the output filename or stream' do |file|
+            options[:output_file] = file
+          end
 
-        Reduces a composite AsciiDoc document containing includes and conditionals to a single AsciiDoc document.
+          opts.on '--preserve-conditionals', 'preserve preprocessor conditional directives in the reduced source' do
+            options[:preserve_conditionals] = true
+          end
 
-        EOS
+          opts.on '-q', '--quiet', 'suppress all application log messages' do
+            options[:log_level] = nil
+          end
 
-        opts.on '-a KEY[=VALUE]', '--attribute=KEY[=VALUE]',
-          'set a document attribute in the AsciiDoc document: [key, key!, key=value]' do |attr|
-          key, val = attr.split '=', 2
-          val ||= ''
-          options[:attributes][key] = val
-        end
+          opts.on '-rLIBRARY', '--require LIBRARY', 'require the specified library or libraries before reducing',
+            'may be specified multiple times' do |path|
+            (options[:requires] ||= []).concat path.split ','
+          end
 
-        opts.on '--log-level LEVEL', %w(debug info warn error fatal),
-          'set the minimum level of messages to log: [debug, info, warn, error, fatal] (default: warn)' do |level|
-          options[:log_level] = level
-        end
+          opts.on '-S', '--safe-mode SAFE_MODE', ['unsafe', 'safe', 'server', 'secure'],
+            'set safe mode level: [unsafe, safe, server, secure] (default: unsafe)' do |name|
+            options[:safe] = name.to_sym
+          end
 
-        opts.on '-o FILE', '--output=FILE', 'set the output filename or stream' do |file|
-          options[:output_file] = file
-        end
+          opts.on '--trace', 'trace the cause of application errors (default: false)' do
+            options[:trace] = true
+          end
 
-        opts.on '--preserve-conditionals', 'preserve preprocessor conditional directives in the reduced source' do
-          options[:preserve_conditionals] = true
-        end
+          opts.on '-v', '--version', 'display the version information and exit' do
+            print_version opts
+            return 0
+          end
 
-        opts.on '-q', '--quiet', 'suppress all application log messages' do
-          options[:log_level] = nil
+          opts.on '-h', '--help', 'display this help text and exit' do
+            print_help opts
+            return 0
+          end
         end
 
-        opts.on '-rLIBRARY', '--require LIBRARY', 'require the specified library or libraries before running' do |path|
-          (options[:requires] ||= []).concat path.split ','
+        if (args = opt_parser.parse args).empty?
+          opt_parser.warn 'Please specify an AsciiDoc file to reduce.'
+          print_help opt_parser
+          1
+        elsif args.size == 1
+          if (requires = options.delete :requires)
+            requires.uniq.each do |path|
+              require path
+            rescue ::LoadError
+              $stderr.puts %(#{opt_parser.program_name}: '#{path}' could not be required (reason: #{$!.message}))
+              return 1
+            end
+          end
+          options[:input_file] = args[0]
+          options[:output_file] = '-' unless options[:output_file]
+          [0, options]
+        else
+          opt_parser.warn %(extra arguments detected (unparsed arguments: #{(args.drop 1).join ' '}))
+          print_help opt_parser
+          1
         end
+      rescue ::OptionParser::InvalidOption
+        $stderr.puts %(#{opt_parser.program_name}: #{$!.message})
+        print_help opt_parser
+        1
+      end
 
-        opts.on '-S', '--safe-mode SAFE_MODE', ['unsafe', 'safe', 'server'],
-          'set supported safe mode level: [unsafe, safe, server] (default: unsafe)' do |name|
-          options[:safe] = ::Asciidoctor::SafeMode.value_for_name name
+      def run args = ARGV
+        code, options = parse (Array args)
+        return code unless code == 0 && options
+        trace = options.delete :trace
+        old_logger = ::Asciidoctor::LoggerManager.logger
+        if (log_level = options.delete :log_level)
+          (options[:logger] = ::Asciidoctor::Logger.new $stderr).level = log_level
+        else
+          options[:logger] = nil
         end
+        options[:to] = (output_file = options.delete :output_file) == '-' ? $stdout : (::Pathname.new output_file)
+        input = (input_file = options.delete :input_file) == '-' ? $stdin : (::Pathname.new input_file)
+        ::Asciidoctor::Reducer.reduce input, options
+        0
+      rescue ::SignalException
+        $stderr.puts if ::Interrupt === $!
+        $!.signo
+      rescue
+        raise $! if trace
+        $stderr.puts %(asciidoctor-reducer: #{$!.message.delete_prefix 'asciidoctor: '})
+        $stderr.puts '  Use --trace to show backtrace'
+        1
+      ensure
+        ::Asciidoctor::LoggerManager.logger = old_logger if old_logger
+      end
 
-        opts.on '-v', '--version', 'display the version information and exit' do
-          $stdout.write %(#{opts.program_name} #{VERSION}\n)
-          return 0
-        end
+      private
 
-        opts.on '-h', '--help', 'display this help text and exit' do
-          $stdout.write opts.help
-          return 0
-        end
+      def print_help opt_parser
+        $stdout.puts opt_parser.help.chomp
       end
 
-      args = opt_parser.parse args
-
-      if args.empty?
-        opt_parser.warn 'Please specify an AsciiDoc file to reduce.'
-        $stdout.write opt_parser.help
-        1
-      elsif args.size == 1
-        if (requires = options.delete :requires)
-          requires.uniq.each do |path|
-            require path
-          rescue ::LoadError
-            $stderr.write %(#{opt_parser.program_name}: '#{path}' could not be required (reason: #{$!.message})\n)
-            return 1
-          end
-        end
-        options[:input_file] = args[0]
-        options[:output_file] = '-' unless options[:output_file]
-        [0, options]
-      else
-        opt_parser.warn %(extra arguments detected (unparsed arguments: #{(args.drop 1).join ' '}))
-        $stdout.write opt_parser.help
-        1
+      def print_version opt_parser
+        $stdout.puts %(#{opt_parser.program_name} #{VERSION})
       end
-    rescue ::OptionParser::InvalidOption
-      $stderr.write %(#{opt_parser.program_name}: #{$!.message}\n)
-      $stdout.write opt_parser.help
-      1
     end
 
-    def self.run args = ARGV
-      code, options = new.parse (Array args)
-      return code unless code == 0 && options
-      old_logger = ::Asciidoctor::LoggerManager.logger
-      if (log_level = options.delete :log_level)
-        (options[:logger] = ::Asciidoctor::Logger.new $stderr).level = log_level
-      else
-        options[:logger] = nil
-      end
-      options[:to] = (output_file = options.delete :output_file) == '-' ? $stdout : (::Pathname.new output_file)
-      input = (input_file = options.delete :input_file) == '-' ? $stdin : (::Pathname.new input_file)
-      ::Asciidoctor::Reducer.reduce input, options
-      0
-    rescue
-      $stderr.write %(asciidoctor-reducer: #{$!.message}\n)
-      1
-    ensure
-      ::Asciidoctor::LoggerManager.logger = old_logger if old_logger
+    LOG_LEVELS = (::Logger::Severity.constants false).each_with_object({}) do |level, accum|
+      accum[level.to_s.downcase] = (::Logger::Severity.const_get level) unless level == :UNKNOWN
     end
+
+    private_constant :LOG_LEVELS
   end
 end

data/lib/asciidoctor/reducer/conditional_directive_tracker.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Asciidoctor::Reducer
+  module ConditionalDirectiveTracker
+    def preprocess_conditional_directive keyword, target, delimiter, text
+      skip_active = @skipping
+      depth = @conditional_stack.size
+      cond_lineno = @lineno
+      result = super
+      return result if @skipping && skip_active
+      drop = @include_replacements.current[:drop] ||= []
+      if (depth_change = @conditional_stack.size - depth) < 0
+        if skip_active
+          drop.push(*(drop.pop..cond_lineno))
+        else
+          drop << cond_lineno
+        end
+      elsif depth_change > 0 || cond_lineno == @lineno
+        drop << cond_lineno
+      else
+        drop << [cond_lineno, text]
+      end
+      result
+    end
+  end
+end

data/lib/asciidoctor/reducer/extensions.rb

@@ -16,24 +16,27 @@ module Asciidoctor::Reducer
       end
     end
 
+    def key
+      :reducer
+    end
+
     def prepare_registry registry = nil
       registry = ::Asciidoctor::Extensions.create(&registry) if ::Proc === registry
-      unless ::Asciidoctor::Extensions.groups[:reducer]
-        if registry
-          registry.groups[:reducer] = group
-        else
-          registry = ::Asciidoctor::Extensions.create :reducer, &group
-        end
+      return registry if ::Asciidoctor::Extensions.groups[key]
+      if registry
+        registry.groups[key] = group
+        registry
+      else
+        ::Asciidoctor::Extensions.create key, &group
       end
-      registry
     end
 
     def register
-      ::Asciidoctor::Extensions.register :reducer, &group
+      ::Asciidoctor::Extensions.register key, &group
     end
 
     def unregister
-      ::Asciidoctor::Extensions.unregister :reducer
+      ::Asciidoctor::Extensions.groups.delete key # NOTE `Extensions.unregister key` fails if groups is not initialized
     end
   end
 end

data/lib/asciidoctor/reducer/include_directive_tracker.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module Asciidoctor::Reducer
+  module IncludeDirectiveTracker
+    attr_reader :include_replacements
+    attr_writer :source_lines
+
+    def self.extended instance
+      instance.instance_variable_set :@include_replacements, ([{}].extend CurrentPosition)
+      instance.instance_variable_set :@x_reducer, {}
+    end
+
+    def preprocess_include_directive target, attrlist
+      @x_reducer[:include_directive_line] = %(include::#{target}[#{attrlist}])
+      @x_reducer[:include_pushed] = false
+      inc_lineno = @lineno # we're currently on the include line, which is 1-based
+      result = super
+      unless @x_reducer[:include_pushed]
+        if ((ln = peek_line true)&.end_with? ']') && !(unresolved = ln.start_with? 'Unresolved directive in ') &&
+            inc_lineno == @lineno && (unresolved = ln.start_with? 'link:')
+          ln = %(#{ln.slice 0, (ln.length - 1)}role=include])
+        end
+        push_include_replacement inc_lineno, (unresolved ? [ln] : []), unresolved
+      end
+      @x_reducer.clear
+      result
+    end
+
+    def push_include data, file, path, lineno, attrs
+      @x_reducer[:include_pushed] = true
+      inc_lineno = @lineno - 1 # we're below the include line, which is 1-based
+      prev_inc_depth = @include_stack.size
+      result = super
+      push_include_replacement inc_lineno, (@include_stack.size > prev_inc_depth ? lines : [])
+      result
+    end
+
+    def pop_include
+      @include_replacements.up unless @x_reducer[:include_pushed]
+      super
+    end
+
+    private
+
+    def push_include_replacement lineno, lines, unresolved = false
+      (inc_replacements = @include_replacements) << {
+        into: inc_replacements.pointer,
+        lineno: lineno,
+        line: @x_reducer[:include_directive_line],
+        lines: lines,
+      }
+      inc_replacements.to_end unless unresolved || lines.empty?
+      nil
+    end
+  end
+
+  module CurrentPosition
+    attr_reader :pointer
+
+    def self.extended instance
+      instance.to_end
+    end
+
+    def current
+      self[@pointer]
+    end
+
+    def to_end
+      @pointer = size - 1
+    end
+
+    def up
+      @pointer = current[:into]
+    end
+  end
+
+  private_constant :CurrentPosition
+end

data/lib/asciidoctor/reducer/include_mapper/extension.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Asciidoctor::Reducer
+  class IncludeMapper < ::Asciidoctor::Extensions::TreeProcessor
+    def process doc
+      if doc.extensions.groups[:reducer]
+        unless (includes = doc.catalog[:includes].select {|_, v| v }.keys).empty?
+          doc.source_lines.concat ['', %(//# includes=#{includes.join ','})]
+        end
+      elsif (last_line = doc.source_lines[-1])&.start_with? '//# includes='
+        doc.catalog[:includes].update ((last_line.slice 13, last_line.length).split ',').map {|it| [it, true] }.to_h
+      end
+      doc
+    end
+  end
+end

data/lib/asciidoctor/reducer/include_mapper.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require_relative 'include_mapper/extension'
+
+Asciidoctor::Extensions.register do
+  next if document.options[:reduced]
+  tree_processor Asciidoctor::Reducer::IncludeMapper
+end

data/lib/asciidoctor/reducer/preprocessor.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
-require_relative 'preprocessor_directive_tracker'
+require_relative 'include_directive_tracker'
+require_relative 'conditional_directive_tracker'
 
 module Asciidoctor::Reducer
   class Preprocessor < ::Asciidoctor::Extensions::Preprocessor
-    def process _, reader
-      reader.extend PreprocessorDirectiveTracker
+    def process doc, reader
+      doc.options[:preserve_conditionals] ?
+        (reader.extend IncludeDirectiveTracker) : (reader.extend ConditionalDirectiveTracker, IncludeDirectiveTracker)
     end
   end
 end

data/lib/asciidoctor/reducer/tree_processor.rb

@@ -3,19 +3,21 @@
 module Asciidoctor::Reducer
   class TreeProcessor < ::Asciidoctor::Extensions::TreeProcessor
     def process doc
-      unless (inc_replacements = doc.reader.x_include_replacements).length == 1 && inc_replacements[0][:drop].empty?
+      if (inc_replacements = doc.reader.include_replacements).size > 1 || !(inc_replacements[0][:drop] || []).empty?
         inc_replacements[0][:lines] = doc.source_lines.dup
         inc_replacements.reverse_each do |it|
           if (into = it[:into])
             target_lines = inc_replacements[into][:lines]
             # adds extra bit of assurance that we're replacing the correct line
-            next unless target_lines[(index = it[:lineno])] == it[:line]
+            next unless target_lines[(idx = it[:lineno] - 1)] == it[:line]
           end
           lines = it[:lines]
-          unless (drop = it[:drop]).empty?
-            drop.reverse_each {|idx| ::Array === idx ? (lines[idx[0]] = idx[1]) : (lines.delete_at idx) }
+          unless (drop = it[:drop] || []).empty?
+            drop.reverse_each do |drop_it|
+              ::Array === drop_it ? (lines[drop_it[0] - 1] = drop_it[1]) : (lines.delete_at drop_it - 1)
+            end
           end
-          target_lines[index] = lines if target_lines
+          target_lines[idx] = lines if target_lines
         end
         source_lines = inc_replacements[0][:lines].flatten
         if doc.sourcemap
@@ -30,7 +32,7 @@ module Asciidoctor::Reducer
           doc.parse
           ::Asciidoctor::LoggerManager.logger = logger
         else
-          source_lines.pop while (last = source_lines[-1]) && last.empty?
+          source_lines.pop while (source_lines[-1] || :eof).empty?
           doc.reader.source_lines = source_lines
         end
       end

data/lib/asciidoctor/reducer/version.rb

@@ -2,6 +2,6 @@
 
 module Asciidoctor
   module Reducer
-    VERSION = '1.0.0.alpha.7'
+    VERSION = '1.0.0.alpha.10'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-reducer
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.7
+  version: 1.0.0.alpha.10
 platform: ruby
 authors:
 - Dan Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -70,9 +70,12 @@ files:
 - lib/asciidoctor/reducer.rb
 - lib/asciidoctor/reducer/api.rb
 - lib/asciidoctor/reducer/cli.rb
+- lib/asciidoctor/reducer/conditional_directive_tracker.rb
 - lib/asciidoctor/reducer/extensions.rb
+- lib/asciidoctor/reducer/include_directive_tracker.rb
+- lib/asciidoctor/reducer/include_mapper.rb
+- lib/asciidoctor/reducer/include_mapper/extension.rb
 - lib/asciidoctor/reducer/preprocessor.rb
-- lib/asciidoctor/reducer/preprocessor_directive_tracker.rb
 - lib/asciidoctor/reducer/tree_processor.rb
 - lib/asciidoctor/reducer/version.rb
 homepage: https://asciidoctor.org
@@ -98,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Reduces a composite AsciiDoc document containing includes and conditionals

data/lib/asciidoctor/reducer/preprocessor_directive_tracker.rb

@@ -1,91 +0,0 @@
-# frozen_string_literal: true
-
-module Asciidoctor::Reducer
-  module PreprocessorDirectiveTracker
-    attr_writer :source_lines
-    attr_reader :x_include_replacements
-
-    def self.extended instance
-      instance.instance_variable_set :@x_include_replacements, ([{ drop: [] }].extend CurrentPosition)
-      instance.instance_variable_set :@x_include_directive_line, nil
-      instance.instance_variable_set :@x_include_pushed, nil
-    end
-
-    def preprocess_conditional_directive keyword, target, delimiter, text
-      return super if @document.options[:preserve_conditionals]
-      skip_active = @skipping
-      depth = @conditional_stack.length
-      cond_lineno = @lineno - 1
-      result = super
-      return result if @skipping && skip_active
-      drop = @x_include_replacements.current[:drop]
-      if (depth_change = @conditional_stack.length - depth) < 0
-        if skip_active
-          drop.push(*(drop.pop..cond_lineno))
-        else
-          drop << cond_lineno
-        end
-      elsif depth_change > 0 || cond_lineno == @lineno - 1
-        drop << cond_lineno
-      else
-        drop << [cond_lineno, text]
-      end
-      result
-    end
-
-    def preprocess_include_directive target, attrlist
-      @x_include_directive_line = %(include::#{target}[#{attrlist}])
-      @x_include_pushed = false
-      inc_lineno = @lineno - 1 # we're currently on the include line, which is 1-based
-      result = super
-      unless @x_include_pushed
-        unresolved = (l = peek_line true) && (l.start_with? 'Unresolved directive in ') && (l.end_with? ']') || nil
-        push_include_replacement inc_lineno, (unresolved ? [l] : []), unresolved
-      end
-      @x_include_directive_line = @x_include_pushed = nil
-      result
-    end
-
-    def push_include data, file, path, lineno, attrs
-      @x_include_pushed = true
-      inc_lineno = @lineno - 2 # we're below the include line, which is 1-based
-      prev_inc_depth = @include_stack.length
-      result = super
-      push_include_replacement inc_lineno, (@include_stack.length > prev_inc_depth ? lines : [])
-      result
-    end
-
-    def pop_include
-      @x_include_replacements.pos = @x_include_replacements.current[:into] unless @x_include_pushed
-      super
-    end
-
-    private
-
-    def push_include_replacement inc_lineno, inc_lines, unresolved = false
-      @x_include_replacements << {
-        into: @x_include_replacements.pos,
-        lineno: inc_lineno,
-        line: @x_include_directive_line,
-        lines: inc_lines,
-        drop: [],
-      }
-      @x_include_replacements.pos = @x_include_replacements.length - 1 unless unresolved || inc_lines.empty?
-      nil
-    end
-  end
-
-  module CurrentPosition
-    attr_accessor :pos
-
-    def self.extended instance
-      instance.pos = instance.length - 1
-    end
-
-    def current
-      self[@pos]
-    end
-  end
-
-  private_constant :CurrentPosition
-end