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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b0c9530e403be351428ec664c9a5d763a0f27686505e8328d831f46f9ad580b
-  data.tar.gz: ea5116a19ea8e1199415f5e50ee9339dcec66b87b2c574f60306c8b68e9083b8
+  metadata.gz: 2a685ae408de9db32a7ec96055b70120ea6f7476436dca071cc37155cc680d56
+  data.tar.gz: 39d783c66481423417d64a232ee01bdaa88bef517474d22e8ec9fdeb670d09d9
 SHA512:
-  metadata.gz: c3f8025d47b14f4701c4883151403e7fc1aa498cb3d82b9180f7935e14e2aa95a149517e9b037f92d4086d01bd1133aae3088158018ecd088de8f0dc221d5602
-  data.tar.gz: 79ee7b026d7de3f74b2423e193b85c3e0d8d1e1a783e27af4e838522f13c7712871c1379556757ebc432999a0625590d8e03c80d6ef5259104c088a412fa8d25
+  metadata.gz: a3376645764a9d608f3e3aad5f29f2080748d9ecd20d90a06e2335263cdd7c88c0450a72ea061f8f36c17fa19af0f985a89002ee70e12ce950f4320c483b8140
+  data.tar.gz: a7899259cf2ff2daf619d13b97d88dd460a013b0bc85d2c8402e1283f1b3d6fff3780bc3c112e4c281463ad06e0bcb035385998771528a01e3aac487dd7c6e09

data/CHANGELOG.adoc

@@ -4,6 +4,64 @@
 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.7 (2022-02-14) - @mojavelinux
+
+=== Added
+
+* Add asciidoctor/reducer/api to require main API (#3)
+* Add `Asciidoctor::Reducer.reduce` and `Asciidoctor::Reducer.reduce_file` API methods (#3)
+* Add asciidoctor/reducer/extensions to require extensions API (#3)
+* Add `Asciidoctor::Reducer::Extensions` API (#3)
+
+=== Changed
+
+* Scope extensions to single call instead of registering them globally (#3)
+* Use `:safe` as the default safe mode when using the API
+* Make `CurrentPosition` module private to the `PreprocessorDirectiveTracker` module
+
+=== Fixed
+
+* Require asciidoctor/reducer/version automatically when `Asciidoctor::Reducer::VERSION` is accessed
+
+== 1.0.0.alpha.6 (2022-02-10) - @mojavelinux
+
+=== Added
+
+* Add `-S`, `--safe-mode` option to CLI to set safe mode (#13)
+* Add `-r`, `--require` option to CLI to specify additional libraries to require before running (#17)
+
+=== Changed
+
+* Sort CLI options in help text, except for the `-h`, `--help` option
+* Update CLI to always use a new logger instance
+* Defer initializing logger until run method is called
+
+=== Fixed
+
+* Replace include directives that follow an unresolved include (#19)
+* Don't activate reducer extensions on reduced document
+* Prevent custom extension registry from activating extensions twice during reload (#21)
+* Retain includes table in document catalog when reloading document (#23)
+
+== 1.0.0.alpha.5 (2022-02-06) - @mojavelinux
+
+=== Changed
+
+* Removing trailing empty lines after reducing when sourcemap is not enabled
+* Remove unnecessary override of lineno in preprocess_include_directive override
+* Simplify how include replacement target is tracked
+* Classify extensions in group named `:reducer`
+
+=== Fixed
+
+* Suppress log messages when reloading document (#14)
+
+== 1.0.0.alpha.4 (2022-02-03) - @mojavelinux
+
+=== Fixed
+
+* Fix replacement of nested empty and unresolved includes
+
 == 1.0.0.alpha.3 (2022-02-02) - @mojavelinux
 
 === Changed
@@ -17,15 +75,15 @@ For a detailed view of what has changed, refer to the {url-repo}/commits/main[co
 
 === Added
 
-* Add `-a` / `--attribute` option to CLI for setting an AsciiDoc document attribute at runtime (#6)
+* Add `-a`, `--attribute` option to CLI for setting an AsciiDoc document attribute at runtime (#6)
 
 === Changed
 
-* Reduce preprocessor conditionals by default; add option (`--preserve-conditionals` / `:preserve_conditionals`) to preserve them (#8)
+* Reduce preprocessor conditionals by default; add option (`--preserve-conditionals`, `:preserve_conditionals`) to preserve them (#8)
 * Don't enable sourcemap automatically (#4)
 * Don't override logger by default; instead, rely on `:logger` API option to change logger
 * Add `--log-level` option to CLI to set severity level on logger (#9)
-* Add `-q` / `--quiet` option to CLI to suppress log messages (#9)
+* Add `-q`, `--quiet` option to CLI to suppress log messages (#9)
 * Reserve zero index in include replacements for top-level document
 
 === Fixed
@@ -47,3 +105,19 @@ Initial release.
 === 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
+
+{url-repo}/releases/tag/v1.0.0.alpha.6[git tag]
+
+=== Details
+
+{url-repo}/releases/tag/v1.0.0.alpha.7[git tag]

data/README.adoc

@@ -1,6 +1,6 @@
 = {project-name}
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>
-v1.0.0.alpha.3, 2022-02-02
+v1.0.0.alpha.7, 2022-02-14
 :idprefix:
 :idseparator: -
 ifndef::env-github[:icons: font]
@@ -22,15 +22,15 @@ If the document does not contain any preprocessor directives, the tool returns t
 
 == Prerequisites
 
-{project-name} is a Ruby program that you install using Ruby packaging.
-Therefore, to install and run {project-name}, you need Ruby 2.5 or better installed.
+{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 check whether you have Ruby installed, and which version, run the following command:
+Run the following command to check which version of Ruby you have installed, if any:
 
  $ ruby -v
 
 If Ruby is not installed, you can install it using {url-rvm}[RVM] (or, if you prefer, the package manager for your system).
-We generally recommend using RVM because it allows you to install gems without requiring elevated privileges or messing with system libraries.
+We generally recommend using RVM as it allows you to install gems without requiring elevated privileges or messing with system libraries.
 
 == Installation
 
@@ -41,7 +41,9 @@ You can install the latest version of the gem using the following command:
  $ gem install asciidoctor-reducer --pre
 
 Installing this gem makes the `asciidoctor-reducer` command available on your $PATH.
-You can also require the gem into the Ruby runtime to use it as an Asciidoctor extension.
+You can also require the gem into the Ruby runtime to use it as a library or Asciidoctor extension.
+
+=== Project-scoped
 
 If you prefer to manage the application as a project-scoped dependency, you can declare the gem in the project's [.path]_Gemfile_:
 
@@ -61,7 +63,7 @@ Installing the gem this way makes the `bundle exec asciidoctor-reducer` command
 
 == Usage
 
-=== As command
+=== Command
 
 You can run this tool using the provided command (i.e., CLI), named `asciidoctor-reducer`.
 To learn how to use the command, and to verify it's available, run the command with the `-h` option:
@@ -75,7 +77,9 @@ asciidoctor-reducer [OPTION]... FILE
 ....
 
 The argument `FILE` is the AsciiDoc file you want to reduce.
-To use the command, pass the AsciiDoc file as the sole argument:
+The options, represented by `+[OPTION]...+`, are optional, as the name suggestions.
+
+Thus, to use the command, pass the AsciiDoc file as the sole argument:
 
  $ asciidoctor-reducer input.adoc
 
@@ -89,27 +93,26 @@ To use the command in this way, pass `-` as the first argument:
 
  $ cat input.adoc | asciidoctor-reducer -
 
-To write the output to a file instead of stdout, also specify an output file using the `-o` option:
+To write the output to a file in this case, specify an output file using the `-o` option:
 
  $ cat input.adoc | asciidoctor-reducer -o output.adoc -
 
-Note that top-level include files in the input AsciiDoc document are resolved relative to current working directory.
-
-=== As extension
+=== API
 
-You can use this tool as an Asciidoctor extension when using the Asciidoctor API.
-To do so, require it before calling the `Asciidoctor.load` method.
+You can also use this tool from a Ruby application using the provided API.
+To begin, require the API for this library.
 
 [,ruby]
 ----
-require 'asciidoctor/reducer'
+require 'asciidoctor/reducer/api'
 ----
 
-Next, load a parent document that contains includes.
+Next, reduce a parent document that contains includes.
+This works without having to specify the safe mode since the default safe mode when using the API is `:safe`.
 
 [,ruby]
 ----
-doc = Asciidoctor.load_file 'sample.adoc', safe: :safe
+doc = Asciidoctor::Reducer.reduce_file 'sample.adoc'
 ----
 
 Finally, you can retrieve the reduced source from the returned document.
@@ -119,11 +122,60 @@ Finally, you can retrieve the reduced source from the returned document.
 puts doc.source
 ----
 
-You can write this source to a file to save the reduced document.
+The benefit of this approach is that you can access the reduced source and the parsed document that corresponds to it.
+
+If you don't need the parsed document, you can retrieve the reduced source directly by passing the `String` type to the `:to` option:
+
+[,ruby]
+----
+puts Asciidoctor::Reducer.reduce_file 'sample.adoc', to: String
+----
+
+You can write the reduced source directly to a file by passing a file path to the `:to` option:
+
+[,ruby]
+----
+Asciidoctor::Reducer.reduce_file 'sample.adoc', to: 'sample-reduced.adoc'
+----
+
+== Extension
+
+Instead of using the API for this library, you can use the load API provided by Asciidoctor.
+If you want to register the extension globally, require the library as follows:
+
+[,ruby]
+----
+require 'asciidoctor/reducer'
+----
+
+When you use the Asciidoctor load API, the document will automatically be reduced.
+
+[,ruby]
+----
+puts (Asciidoctor.load_file 'sample.adoc', safe: :safe).source
+----
+
+If you want to keep the extension scoped to the call, require the library as follows:
+
+[,ruby]
+----
+require 'asciidoctor/reducer/extensions'
+----
+
+Next, use the extensions API to prepare an extension registry and pass it to the Asciidoctor load API:
+
+[,ruby]
+----
+puts (Asciidoctor.load_file 'sample.adoc', safe: :safe, extension_registry: Asciidoctor::Reducer.prepare_registry).source
+----
+
+Working with the extension directly is intended for low-level operations.
+Most of the time, you should use the API provided by this library.
 
 == How it Works
 
 {project-name} uses a collection of Asciidoctor extensions to rebuild the AsciiDoc source as a single document.
+Top-level include files in the input AsciiDoc document are resolved relative to current working directory.
 
 It starts by using a preprocessor extension to enhance the PreprocessorReader class to be notified each time an include is entered (pushed) or exited (popped).
 When an include directive is encountered, the enhanced reader stores the resolved lines and location of the include directive, thus keeping track of where those lines should be inserted in the original source.
@@ -189,7 +241,7 @@ For more fine-grained control, you can also run the tests directly using RSpec:
 
 To run all tests in a single spec, point RSpec at the spec file:
 
- $ bundle exec rspec spec/asciidoctor_reducer_spec.rb
+ $ bundle exec rspec spec/reducer_spec.rb
 
 ==== Run specific tests
 
@@ -234,7 +286,7 @@ When running the `asciidoctor-reducer` command from source, you must prefix the
 [subs=attributes+]
  $ bundle exec asciidoctor-reducer sample.adoc
 
-To avoid having to do this, or make the `asciidoctor-reducer` command available from anywhere, you need to build the development gem and install it.
+To avoid having to do this, or to make the `asciidoctor-reducer` command available from anywhere, you need to build the development gem and install it.
 
 == Copyright and License
 

data/asciidoctor-reducer.gemspec

@@ -35,5 +35,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'asciidoctor', '~> 2.0'
 
   s.add_development_dependency 'rake', '~> 13.0.0'
-  s.add_development_dependency 'rspec', '~> 3.10.0'
+  s.add_development_dependency 'rspec', '~> 3.11.0'
 end

data/bin/asciidoctor-reducer

@@ -1,13 +1,11 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-asciidoctor_reducer = File.absolute_path '../lib/asciidoctor/reducer', __dir__
-if File.exist? asciidoctor_reducer
-  require asciidoctor_reducer
+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'
+  require 'asciidoctor/reducer/cli'
 end
 
-require 'asciidoctor/reducer/cli'
-
 exit Asciidoctor::Reducer::Cli.run

data/lib/asciidoctor/reducer/api.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'pathname'
+require_relative 'extensions'
+
+module Asciidoctor::Reducer
+  autoload :VERSION, (::File.join __dir__, 'version.rb')
+
+  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
+      case input
+      when ::File
+        doc = ::Asciidoctor.load_file input, opts
+      when ::Pathname
+        doc = ::Asciidoctor.load_file input.to_path, opts
+      else
+        doc = ::Asciidoctor.load input, opts
+      end
+      write doc, opts[:to]
+    end
+
+    def reduce_file input_file, opts = {}
+      reduce (::Pathname.new input_file), opts
+    end
+
+    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
+      end
+      doc
+    end
+  end
+
+  LF = ?\n
+  UTF_8 = ::Encoding::UTF_8
+
+  private_constant :LF, :UTF_8
+end

data/lib/asciidoctor/reducer/cli.rb

@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 
+require_relative 'api'
 autoload :OptionParser, 'optparse'
-autoload :Pathname, 'pathname'
 
 module Asciidoctor::Reducer
-  autoload :VERSION, (::File.join __dir__, 'version.rb')
-
   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: {}, safe: :unsafe }
+      options = { attributes: {}, log_level: LOG_LEVELS['warn'], safe: :unsafe }
 
       opt_parser = ::OptionParser.new do |opts|
         opts.program_name = 'asciidoctor-reducer'
@@ -19,10 +21,6 @@ module Asciidoctor::Reducer
 
         EOS
 
-        opts.on '-o FILE', '--output=FILE', 'set the output filename or stream' do |file|
-          options[:output_file] = file
-        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
@@ -30,28 +28,41 @@ module Asciidoctor::Reducer
           options[:attributes][key] = val
         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 '-o FILE', '--output=FILE', 'set the output filename or stream' do |file|
+          options[:output_file] = file
+        end
+
         opts.on '--preserve-conditionals', 'preserve preprocessor conditional directives in the reduced source' do
           options[:preserve_conditionals] = true
         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[:logger] = ::Asciidoctor::Logger.new $stderr).level = level unless level == 'warn'
+        opts.on '-q', '--quiet', 'suppress all application log messages' do
+          options[:log_level] = nil
         end
 
-        opts.on '-q', '--quiet', 'suppress all application log messages' do
-          options[:logger] = ::Asciidoctor::NullLogger.new
+        opts.on '-rLIBRARY', '--require LIBRARY', 'require the specified library or libraries before running' do |path|
+          (options[:requires] ||= []).concat path.split ','
         end
 
-        opts.on '-h', '--help', 'display this help text and exit' do
-          $stdout.write opts.help
-          return 0
+        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
         end
 
         opts.on '-v', '--version', 'display the version information and exit' do
           $stdout.write %(#{opts.program_name} #{VERSION}\n)
           return 0
         end
+
+        opts.on '-h', '--help', 'display this help text and exit' do
+          $stdout.write opts.help
+          return 0
+        end
       end
 
       args = opt_parser.parse args
@@ -61,13 +72,21 @@ module Asciidoctor::Reducer
         $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, options]
+        1
       end
     rescue ::OptionParser::InvalidOption
       $stderr.write %(#{opt_parser.program_name}: #{$!.message}\n)
@@ -76,26 +95,23 @@ module Asciidoctor::Reducer
     end
 
     def self.run args = ARGV
-      old_logger = ::Asciidoctor::LoggerManager.logger
       code, options = new.parse (Array args)
       return code unless code == 0 && options
-      if (output_file = options.delete :output_file) == '-'
-        to = $stdout
-      else
-        (to = ::Pathname.new output_file).dirname.mkpath
-      end
-      if (input_file = options.delete :input_file) == '-'
-        reduced = (::Asciidoctor.load $stdin, options).source + ?\n
+      old_logger = ::Asciidoctor::LoggerManager.logger
+      if (log_level = options.delete :log_level)
+        (options[:logger] = ::Asciidoctor::Logger.new $stderr).level = log_level
       else
-        reduced = (::Asciidoctor.load_file input_file, (options.merge to_file: false)).source + ?\n
+        options[:logger] = nil
       end
-      ::Pathname === to ? (to.write reduced, encoding: ::Encoding::UTF_8) : (to.write reduced)
+      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
+      ::Asciidoctor::LoggerManager.logger = old_logger if old_logger
     end
   end
 end

data/lib/asciidoctor/reducer/extensions.rb

@@ -1,4 +1,39 @@
 # frozen_string_literal: true
 
+require 'asciidoctor' unless defined? Asciidoctor.load
 require_relative 'preprocessor'
 require_relative 'tree_processor'
+
+module Asciidoctor::Reducer
+  module Extensions
+    module_function
+
+    def group
+      proc do
+        next if document.options[:reduced]
+        preprocessor Preprocessor
+        tree_processor TreeProcessor
+      end
+    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
+      end
+      registry
+    end
+
+    def register
+      ::Asciidoctor::Extensions.register :reducer, &group
+    end
+
+    def unregister
+      ::Asciidoctor::Extensions.unregister :reducer
+    end
+  end
+end

data/lib/asciidoctor/reducer/preprocessor.rb

@@ -4,8 +4,8 @@ require_relative 'preprocessor_directive_tracker'
 
 module Asciidoctor::Reducer
   class Preprocessor < ::Asciidoctor::Extensions::Preprocessor
-    def process doc, reader
-      doc.options[:reduced] ? reader : (reader.extend PreprocessorDirectiveTracker)
+    def process _, reader
+      reader.extend PreprocessorDirectiveTracker
     end
   end
 end

data/lib/asciidoctor/reducer/preprocessor_directive_tracker.rb

@@ -6,12 +6,13 @@ module Asciidoctor::Reducer
     attr_reader :x_include_replacements
 
     def self.extended instance
-      instance.instance_variable_set :@x_include_replacements, ([{ drop: [] }].extend CurrentPointer)
-      instance.instance_variable_set :@x_parents, [0]
+      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 (opts = @document.options)[:preserve_conditionals] || opts[:reduced]
+      return super if @document.options[:preserve_conditionals]
       skip_active = @skipping
       depth = @conditional_stack.length
       cond_lineno = @lineno - 1
@@ -34,70 +35,57 @@ module Asciidoctor::Reducer
 
     def preprocess_include_directive target, attrlist
       @x_include_directive_line = %(include::#{target}[#{attrlist}])
-      @x_push_include_called = false
+      @x_include_pushed = false
       inc_lineno = @lineno - 1 # we're currently on the include line, which is 1-based
       result = super
-      return result if @x_push_include_called
-      parent_depth = (parents = @x_parents).length
-      if (depth_change = @include_stack.length - (parent_depth - 1)) < 0
-        parent_depth -= (parents.slice! parent_depth + depth_change, -depth_change).length
+      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
-      inc_lines = ((line = lines[0].to_s).start_with? 'Unresolved directive in ') && (line.end_with? ']') ? [line] : []
-      push_include_replacement inc_lines, parent_depth, inc_lineno
+      @x_include_directive_line = @x_include_pushed = nil
       result
     end
 
     def push_include data, file, path, lineno, attrs
-      @x_push_include_called = true
+      @x_include_pushed = true
       inc_lineno = @lineno - 2 # we're below the include line, which is 1-based
       prev_inc_depth = @include_stack.length
-      # Q: can we do this without resetting the lineno?
-      lineno = 1 # rubocop:disable Lint/ShadowedArgument
-      super
-      parent_depth = (parents = @x_parents).length
-      # push_include did not push to the stack
-      if (inc_depth = @include_stack.length) == prev_inc_depth
-        if (depth_change = inc_depth - (parent_depth - 1)) < 0
-          parent_depth -= (parents.slice! parent_depth + depth_change, -depth_change).length
-        end
-      else
-        if (depth_change = inc_depth - parent_depth) > 0
-          parents << @x_include_replacements.length.pred
-          parent_depth += 1
-        elsif depth_change < 0
-          parent_depth -= (parents.slice! parent_depth + depth_change, -depth_change).length
-        end
-        inc_lines = lines
-      end
-      push_include_replacement inc_lines, parent_depth, inc_lineno
-      self
+      result = super
+      push_include_replacement inc_lineno, (@include_stack.length > prev_inc_depth ? lines : [])
+      result
     end
 
     def pop_include
-      @x_include_replacements.current = @x_include_replacements[@x_include_replacements.current[:into] || 0]
+      @x_include_replacements.pos = @x_include_replacements.current[:into] unless @x_include_pushed
       super
     end
 
     private
 
-    def push_include_replacement inc_lines, parent_depth, inc_lineno
+    def push_include_replacement inc_lineno, inc_lines, unresolved = false
       @x_include_replacements << {
-        lines: inc_lines || [],
+        into: @x_include_replacements.pos,
+        lineno: inc_lineno,
+        line: @x_include_directive_line,
+        lines: inc_lines,
         drop: [],
-        into: @x_parents[parent_depth - 1],
-        index: inc_lineno,
-        replace: @x_include_directive_line,
       }
-      @x_include_replacements.current = @x_include_replacements[-1] if inc_lines
+      @x_include_replacements.pos = @x_include_replacements.length - 1 unless unresolved || inc_lines.empty?
       nil
     end
   end
 
-  module CurrentPointer
-    attr_accessor :current
+  module CurrentPosition
+    attr_accessor :pos
 
     def self.extended instance
-      instance.current = instance[-1]
+      instance.pos = instance.length - 1
+    end
+
+    def current
+      self[@pos]
     end
   end
+
+  private_constant :CurrentPosition
 end

data/lib/asciidoctor/reducer/tree_processor.rb

@@ -3,15 +3,13 @@
 module Asciidoctor::Reducer
   class TreeProcessor < ::Asciidoctor::Extensions::TreeProcessor
     def process doc
-      return if doc.options[:reduced]
-      inc_replacements = doc.reader.x_include_replacements
-      unless inc_replacements.length == 1 && inc_replacements[0][:drop].empty?
+      unless (inc_replacements = doc.reader.x_include_replacements).length == 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[:index])] == it[:replace]
+            next unless target_lines[(index = it[:lineno])] == it[:line]
           end
           lines = it[:lines]
           unless (drop = it[:drop]).empty?
@@ -21,9 +19,18 @@ module Asciidoctor::Reducer
         end
         source_lines = inc_replacements[0][:lines].flatten
         if doc.sourcemap
-          # WARNING: if include directives remain that can still be resolved, the sourcemap won't match the source lines
-          doc = ::Asciidoctor.load source_lines, (doc.options.merge reduced: true)
+          logger = ::Asciidoctor::LoggerManager.logger
+          opts = doc.options.merge logger: nil, parse: false, reduced: true
+          if (ext_reg = opts[:extension_registry])
+            opts[:extension_registry] = ::Asciidoctor::Extensions::Registry.new ext_reg.groups
+          end
+          includes = doc.catalog[:includes]
+          doc = ::Asciidoctor.load source_lines, opts
+          doc.catalog[:includes] = includes
+          doc.parse
+          ::Asciidoctor::LoggerManager.logger = logger
         else
+          source_lines.pop while (last = source_lines[-1]) && last.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.3'
+    VERSION = '1.0.0.alpha.7'
   end
 end

data/lib/asciidoctor/reducer.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'asciidoctor'
 require_relative 'reducer/extensions'
 
-Asciidoctor::Extensions.register do
-  preprocessor Asciidoctor::Reducer::Preprocessor
-  tree_processor Asciidoctor::Reducer::TreeProcessor
-end
+Asciidoctor::Reducer::Extensions.register

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-reducer
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.3
+  version: 1.0.0.alpha.7
 platform: ruby
 authors:
 - Dan Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-02 00:00:00.000000000 Z
+date: 2022-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: 3.11.0
 description: A tool that reduces a composite AsciiDoc document containing preprocessor
   directives (includes and conditionals) to a single AsciiDoc document by expanding
   the includes and applying the conditionals.
@@ -68,6 +68,7 @@ files:
 - bin/asciidoctor-reducer
 - lib/asciidoctor-reducer.rb
 - lib/asciidoctor/reducer.rb
+- lib/asciidoctor/reducer/api.rb
 - lib/asciidoctor/reducer/cli.rb
 - lib/asciidoctor/reducer/extensions.rb
 - lib/asciidoctor/reducer/preprocessor.rb