p2 2.2 → 2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b35bc76b761dd22bacd7e2b8844f3be20cabdb38ee6174d4e4eaeb144f5562d8
-  data.tar.gz: d677436567940ef41f922892b55844685d31fc52a8287c06f2ea0d89d2f1db55
+  metadata.gz: 43fb47ab7470259fddb850f19724caf5b8fdc07a232df7d893405a1031211313
+  data.tar.gz: 80999e97751f662940ad37f23f9fe10a4ce7914bb80084dc1ffe120d1cafc872
 SHA512:
-  metadata.gz: 37dd322edd50f7061e4375dbc8cb06a22d137106757250d99bc58b625e2dae8c7ea8fc00990e801caee03bae5fe59ba040b8456ef4e14b632874c30cf0784476
-  data.tar.gz: fe24352b6bbc3843c0213e842f07cd094ae83bbb6475f86174e43dd8a55ba9497b832e9b195ef8364f7c5984dc60c4370fc971a7297a79c8d692e9453456d63a
+  metadata.gz: ac2f9c15a39756f9da5da13d5a5cfcc9e4819574da83851c9e526c0d687b16cd36d6634bcabee3f3e15d59e199a54c6915e9251d87749aa4ff187f1c73c44d8e
+  data.tar.gz: 537dc36e03464ddf332bd63b73bc8cbdbc2e00063480307df60dabba4afed5829ebfa851c69f28cfbd161d292e5e01af183e28fe114532b6aac997caae651b21

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 2.4 2025-08-10
+
+- Add P2::Template wrapper class
+
+# 2.3 2025-08-10
+
+- Fix whitespace issue in visit_yield_node
+- Reimplement and optimize exception backtrace translation
+- Minor improvement to code generation
+
 # 2.2 2025-08-09
 
 - Update docs

data/lib/p2/compiler.rb

@@ -48,6 +48,15 @@ module P2
       eval(code, proc.binding, source_map[:compiled_fn])
     end
 
+    def self.source_map_store
+      @source__map_store ||= {}
+    end
+
+    def self.store_source_map(source_map)
+      fn = source_map[:compiled_fn]
+      source_map_store[fn] = source_map
+    end
+
     attr_reader :source_map
 
     # Initializes a compiler.
@@ -90,7 +99,7 @@ module P2
       source_code = @buffer
       @buffer = +''
       if wrap
-        emit("# frozen_string_literal: true\n(#{@source_map.inspect}).then { |src_map| ->(__buffer__")
+        emit("# frozen_string_literal: true\n->(__buffer__")
 
         params = orig_ast.parameters
         params = params&.parameters
@@ -103,16 +112,19 @@ module P2
           emit(', &__block__')
         end
 
-        emit(") do\n")
+        emit(") {\n")
       end
       @buffer << source_code
       emit_defer_postlude if @defer_mode
       if wrap
         emit('; __buffer__')
         adjust_whitespace(orig_ast.closing_loc)
-        emit(";") if @buffer !~ /\n\s*$/m
-        emit("rescue Exception => e; P2.translate_backtrace(e, src_map); raise e; end }")
+        emit('}')
+        # emit(";") if @buffer !~ /\n\s*$/m
+        # emit("rescue Exception => e; P2.translate_backtrace(e, src_map); raise e; end }")
       end
+      update_source_map
+      Compiler.store_source_map(@source_map)
       @buffer
     end
 
@@ -136,19 +148,16 @@ module P2
       when Prism::BlockArgumentNode
         flush_html_parts!
         adjust_whitespace(node.block)
-        emit("; #{format_code(node.block.expression)}.render_to_buffer(__buffer__)")
+        emit("; #{format_code(node.block.expression)}.compiled_proc.(__buffer__)")
       end
 
       if node.inner_text
         if is_static_node?(node.inner_text)
           emit_html(node.location, ERB::Escape.html_escape(format_literal(node.inner_text)))
         else
-          convert_to_s = !is_string_type_node?(node.inner_text)
-          if convert_to_s
-            emit_html(node.location, interpolated("ERB::Escape.html_escape((#{format_code(node.inner_text)}).to_s)"))
-          else
-            emit_html(node.location, interpolated("ERB::Escape.html_escape(#{format_code(node.inner_text)})"))
-          end
+          to_s = is_string_type_node?(node.inner_text) ? '' : '.to_s'
+
+          emit_html(node.location, interpolated("ERB::Escape.html_escape((#{format_code(node.inner_text)})#{to_s})"))
         end
       end
       emit_html(node.location, format_html_tag_close(tag))
@@ -165,7 +174,7 @@ module P2
         emit(node.receiver.location)
         emit('::')
       end
-      emit("; #{node.name}.render_to_buffer(__buffer__")
+      emit("; #{node.name}.compiled_proc.(__buffer__")
       if node.arguments
         emit(', ')
         visit(node.arguments)
@@ -284,15 +293,15 @@ module P2
     # @param node [P2::YieldNode] node
     # @return [void]
     def visit_yield_node(node)
-      adjust_whitespace(node.location)
       flush_html_parts!
+      adjust_whitespace(node.location)
       @yield_used = true
-      emit("; (__block__ ? __block__.render_to_buffer(__buffer__")
+      emit("; (__block__ ? __block__.compiled_proc.(__buffer__")
       if node.arguments
         emit(', ')
         visit(node.arguments)
       end
-      emit(") : raise(LocalJumpError, 'no block given (yield)'))")
+      emit(") : raise(LocalJumpError, 'no block given (yield/emit_yield)'))")
     end
 
     private

data/lib/p2/proc_ext.rb

@@ -49,6 +49,9 @@ class ::Proc
   # @return [String] HTML string
   def render(*a, **b, &c)
     compiled_proc.(+'', *a, **b, &c)
+  rescue Exception => e
+    P2.translate_backtrace(e)
+    raise e
   end
 
   # Renders the proc into the given buffer

data/lib/p2/template.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module P2
+  # Template wrapper class. This class can be used to distinguish between P2
+  # templates and other kinds of procs.
+  class Template
+    attr_reader :proc
+    def initialize(proc) = @proc = proc
+    def render(*, **, &) = @proc.render(*, **, &)
+  end
+end

data/lib/p2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module P2
-  VERSION = '2.2'
+  VERSION = '2.4'
 end

data/lib/p2.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'p2/template'
 require_relative 'p2/compiler'
 require_relative 'p2/proc_ext'
 
@@ -44,29 +45,28 @@ module P2
   # @param source_map [Hash] source map
   #
   # @return [Exception] raised exception
-  def translate_backtrace(exception, source_map)
-    re = compute_source_map_re(source_map)
-    source_fn = source_map[:source_fn]
-    backtrace = exception.backtrace.map {
-      if (m = it.match(re))
-        line = m[2].to_i
-        source_line = source_map[line] || "?(#{line})"
-        it.sub(m[1], "#{source_fn}:#{source_line}")
-      else
-        it
-      end
-    }
+  def translate_backtrace(exception)
+    cache = {}
+    backtrace = exception.backtrace.map { |e| compute_backtrace_entry(e, cache) }
     exception.set_backtrace(backtrace)
     exception
   end
 
-  # Computes a Regexp for matching hits in a backtrace.
-  #
-  # @param source_map [Hash] source map
-  # @return [Regexp] computed regexp
-  def compute_source_map_re(source_map)
-    escaped = source_map[:compiled_fn].gsub(/[\(\)]/) { "\\#{it[0]}" }
-    /^(#{escaped}\:(\d+))/
+  # Computes a backtrace entry with caching.
+  # 
+  # @param entry [String] backtrace entry
+  # @param cache [Hash] cache store mapping compiled filename to source_map
+  def compute_backtrace_entry(entry, cache)
+    m = entry.match(/^((\:\:\(.+\:.+\))\:(\d+))/)
+    return entry if !m
+
+    fn = m[2]
+    line = m[3].to_i
+    source_map = cache[fn] ||= Compiler.source_map_store[fn]
+    return entry if !source_map
+
+    source_line = source_map[line] || "?(#{line})"
+    entry.sub(m[1], "#{source_map[:source_fn]}:#{source_line}")
   end
 
   # Renders Markdown into HTML. The `opts` argument will be merged with the

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: p2
 version: !ruby/object:Gem::Version
-  version: '2.2'
+  version: '2.4'
 platform: ruby
 authors:
 - Sharon Rosner
@@ -107,6 +107,7 @@ files:
 - lib/p2/compiler/nodes.rb
 - lib/p2/compiler/tag_translator.rb
 - lib/p2/proc_ext.rb
+- lib/p2/template.rb
 - lib/p2/version.rb
 - p2.png
 homepage: http://github.com/digital-fabric/p2