asciidoctor-reducer 1.0.0.alpha.8 → 1.0.0.alpha.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7df897a17f1fc52a4240d6c4bfe476e9072014dae43042063485634bda01eb13
-  data.tar.gz: 5be6330e865889c0a93cf83eb6a884e5785d644d8421d962b5f33950a0da67bc
+  metadata.gz: 80723a5097c54761a2bee3b3ea88f827c88614b7a5572a6b5f1b10cb7af60c8c
+  data.tar.gz: d6f23a15e6dae8db02f5810d22018f537af9d6e67ac8362dbc2fe3155417df2d
 SHA512:
-  metadata.gz: f4a788b3926a6f9bf925ec5607cc1756688de3ade791ea2178b3e893b9ad35bf0f2912cb0e23b5fc16a8834d2f28be4cc6c0bf6173a10858942522107991091b
-  data.tar.gz: 04afd98f0789e686f0328eb721c56f2c2150261209a66c90025d2dd91c10d9397a969b6a45c0060d77559df549a80cf3839f2940030e47105ca11bcd9ba02e5c
+  metadata.gz: db4173fd2899008fec759e9d76f2732a7f5f7ca0a284f5c66a93040b9fca81dba22cf151e77e86b2b73c535545cec4b3a54c88407324514811260832b8ed1c7d
+  data.tar.gz: ec7a7d27cb1b87dcb0772af642f185002f7348e0a540c40bf3a6e98334d7be0b088b8b00312ca10dd5470cdaff60007e70c2d27708d97c4677c7a3302694473e

data/CHANGELOG.adoc

@@ -4,6 +4,32 @@
 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.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

data/README.adoc

@@ -1,6 +1,6 @@
 = {project-name}
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>
-v1.0.0.alpha.8, 2022-02-23
+v1.0.0.alpha.9, 2022-04-21
 :idprefix:
 :idseparator: -
 ifndef::env-github[:icons: font]
@@ -16,8 +16,8 @@ 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
@@ -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/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,134 +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
-
-    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 = <<~EOS
-        Usage: #{opts.program_name} [OPTION]... FILE
-
-        Reduces a composite AsciiDoc document containing includes and conditionals to a single AsciiDoc document.
+  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
 
-        EOS
+          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 '-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 '-o FILE', '--output=FILE', 'set the output filename or stream' do |file|
+            options[:output_file] = file
+          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 '--preserve-conditionals', 'preserve preprocessor conditional directives in the reduced source' do
+            options[:preserve_conditionals] = true
+          end
 
-        opts.on '-o FILE', '--output=FILE', 'set the output filename or stream' do |file|
-          options[:output_file] = file
-        end
+          opts.on '-q', '--quiet', 'suppress all application log messages' do
+            options[:log_level] = nil
+          end
 
-        opts.on '--preserve-conditionals', 'preserve preprocessor conditional directives in the reduced source' do
-          options[:preserve_conditionals] = true
-        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 '-q', '--quiet', 'suppress all application log messages' do
-          options[:log_level] = nil
-        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 '-rLIBRARY', '--require LIBRARY', 'require the specified library or libraries before running' do |path|
-          (options[:requires] ||= []).concat path.split ','
-        end
+          opts.on '--trace', 'trace the cause of application errors (default: false)' do
+            options[:trace] = true
+          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] = ::Asciidoctor::SafeMode.value_for_name name
-        end
+          opts.on '-v', '--version', 'display the version information and exit' do
+            print_version opts
+            return 0
+          end
 
-        opts.on '--trace', 'trace the cause of application errors (default: false)' do
-          options[:trace] = true
+          opts.on '-h', '--help', 'display this help text and exit' do
+            print_help opts
+            return 0
+          end
         end
 
-        opts.on '-v', '--version', 'display the version information and exit' do
-          print_version opts
-          return 0
+        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 '-h', '--help', 'display this help text and exit' do
-          print_help opts
-          return 0
+      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
 
-      args = opt_parser.parse args
+      private
 
-      if 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
+      def print_help opt_parser
+        $stdout.puts opt_parser.help.chomp
       end
-    rescue ::OptionParser::InvalidOption
-      $stderr.puts %(#{opt_parser.program_name}: #{$!.message})
-      print_help opt_parser
-      1
-    end
 
-    def self.run args = ARGV
-      code, options = new.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
+      def print_version opt_parser
+        $stdout.puts %(#{opt_parser.program_name} #{VERSION})
       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
 
-    private
-
-    def print_help opt_parser
-      $stdout.puts opt_parser.help.chomp
+    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
 
-    def print_version opt_parser
-      $stdout.puts %(#{opt_parser.program_name} #{VERSION})
-    end
+    private_constant :LOG_LEVELS
   end
 end

data/lib/asciidoctor/reducer/conditional_directive_tracker.rb

@@ -8,7 +8,7 @@ module Asciidoctor::Reducer
       cond_lineno = @lineno
       result = super
       return result if @skipping && skip_active
-      drop = @x_include_replacements.current[:drop] ||= []
+      drop = @include_replacements.current[:drop] ||= []
       if (depth_change = @conditional_stack.size - depth) < 0
         if skip_active
           drop.push(*(drop.pop..cond_lineno))

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

@@ -2,34 +2,32 @@
 
 module Asciidoctor::Reducer
   module IncludeDirectiveTracker
+    attr_reader :include_replacements
     attr_writer :source_lines
-    attr_reader :x_include_replacements
 
     def self.extended instance
-      instance.instance_variable_set :@x_include_replacements, ([{}].extend CurrentPosition)
-      instance.instance_variable_set :@x_include_directive_line, nil
-      instance.instance_variable_set :@x_include_pushed, nil
+      instance.instance_variable_set :@include_replacements, ([{}].extend CurrentPosition)
+      instance.instance_variable_set :@x_reducer, {}
     end
 
     def preprocess_include_directive target, attrlist
-      @x_include_directive_line = %(include::#{target}[#{attrlist}])
-      @x_include_pushed = false
+      @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_include_pushed
-        if (ln = peek_line true) && (ln.end_with? ']') && !(unresolved = ln.start_with? 'Unresolved directive in ')
-          if @document.safe >= ::Asciidoctor::SafeMode::SECURE && inc_lineno == @lineno && (ln.start_with? 'link:')
-            unresolved = !(ln = %(#{ln.slice 0, (ln.length - 1)}role=include])).nil?
-          end
+      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_include_directive_line = @x_include_pushed = nil
+      @x_reducer.clear
       result
     end
 
     def push_include data, file, path, lineno, attrs
-      @x_include_pushed = true
+      @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
@@ -38,33 +36,41 @@ module Asciidoctor::Reducer
     end
 
     def pop_include
-      @x_include_replacements.pos = @x_include_replacements.current[:into] unless @x_include_pushed
+      @include_replacements.up unless @x_reducer[:include_pushed]
       super
     end
 
     private
 
     def push_include_replacement lineno, lines, unresolved = false
-      (inc_replacements = @x_include_replacements) << {
-        into: inc_replacements.pos,
+      (inc_replacements = @include_replacements) << {
+        into: inc_replacements.pointer,
         lineno: lineno,
-        line: @x_include_directive_line,
+        line: @x_reducer[:include_directive_line],
         lines: lines,
       }
-      inc_replacements.pos = inc_replacements.size - 1 unless unresolved || lines.empty?
+      inc_replacements.to_end unless unresolved || lines.empty?
       nil
     end
   end
 
   module CurrentPosition
-    attr_accessor :pos
+    attr_reader :pointer
 
     def self.extended instance
-      instance.pos = instance.size - 1
+      instance.to_end
     end
 
     def current
-      self[@pos]
+      self[@pointer]
+    end
+
+    def to_end
+      @pointer = size - 1
+    end
+
+    def up
+      @pointer = current[:into]
     end
   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

@@ -6,8 +6,8 @@ require_relative 'conditional_directive_tracker'
 module Asciidoctor::Reducer
   class Preprocessor < ::Asciidoctor::Extensions::Preprocessor
     def process doc, reader
-      reader.extend IncludeDirectiveTracker
-      reader.extend ConditionalDirectiveTracker unless doc.options[:preserve_conditionals]
+      doc.options[:preserve_conditionals] ?
+        (reader.extend IncludeDirectiveTracker) : (reader.extend ConditionalDirectiveTracker, IncludeDirectiveTracker)
     end
   end
 end

data/lib/asciidoctor/reducer/tree_processor.rb

@@ -3,7 +3,7 @@
 module Asciidoctor::Reducer
   class TreeProcessor < ::Asciidoctor::Extensions::TreeProcessor
     def process doc
-      if (inc_replacements = doc.reader.x_include_replacements).size > 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])

data/lib/asciidoctor/reducer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-reducer
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.8
+  version: 1.0.0.alpha.9
 platform: ruby
 authors:
 - Dan Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2022-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -73,6 +73,8 @@ files:
 - 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/tree_processor.rb
 - lib/asciidoctor/reducer/version.rb
@@ -99,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.2.33
 signing_key: 
 specification_version: 4
 summary: Reduces a composite AsciiDoc document containing includes and conditionals