natsuzora 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c392b524dfcc75df005176d7e8dc65337be7d94f26575f9b0816c40a7e061d4c
-  data.tar.gz: f660922c286c77a2b2ac6e863ae4a8f2427eb50ba7a70c50838d0d56e524c898
+  metadata.gz: 3e53d2581700430dcb3c1e3c617027e2ba09e4e32e5fc89437fda4f73ac72008
+  data.tar.gz: 17513673d3259129e062528abeb98880d14b391f6df5ff5d02d373568c70aa47
 SHA512:
-  metadata.gz: 56c8ad664c64fb5f94992d1eadb163276c14494ab7c452b19d32d2a7fd81fcaedbf5eb89707cd0d9b0151b90ef7d20efce805a680b594bfd1be7be644e5d383d
-  data.tar.gz: 0f68bef0e391fc137904d96287d5daad54bbd29de293477b705138436bb5c6ff0efe80cbf94d584b2a69d459aa748418b7a5f43aeeacd501df6cef80ef0f6be9
+  metadata.gz: f5038da577f2103e420942316ab84cdc6a2beba76a7aeecb917494871489df1e8a59d4bde14dcedd8376c5b6d1d4ce0a9ba49c18f04c20745fff956573336992
+  data.tar.gz: d0df3745de164a007ee5ce248ab5c6f3077181337bf276f57f127af785114c4ae670d209846b30a1042278878d4189cd4493ee10bbf63511e7972a442fd0b6d9

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 0.4.1
+
+### Added
+- `exe/natsuzora-difftest-worker`: JSONL worker for the
+  cross-implementation differential tests (`spec/difftest.md`).
+
+### Changed
+- Comment content is raw-scanned to the first `]}`; any characters are
+  now allowed inside `{[% ... ]}`.
+- `LexerError` is now a subclass of `ParseError`; the parser raises
+  `ParseError` for include-path violations.
+- Requires `lexer_kit` >= 0.6.1.
+
 ## 0.4.0
 
 ### Added

data/exe/natsuzora-difftest-worker

@@ -0,0 +1,79 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+# JSONL worker for differential testing (see spec/difftest.md).
+#
+# Reads one request per line from stdin:
+#   {"id": 1, "template": "...", "data": {...}, "partials": {"/name": "..."}}
+# Writes one response per line to stdout:
+#   {"id": 1, "ok": true, "output": "..."}
+#   {"id": 1, "ok": false, "error": "<canonical error type>"}
+#
+# Non-Natsuzora exceptions are intentionally not rescued: a crash of this
+# worker is a harness error, not a render outcome.
+
+require 'json'
+require 'tmpdir'
+require 'fileutils'
+require 'natsuzora'
+
+module DifftestWorker
+  module_function
+
+  # Maps a Natsuzora exception to the canonical error type of the
+  # difftest protocol. Order matters: subclasses before parents.
+  def canonical_error(error)
+    case error
+    when Natsuzora::ReservedWordError then 'ReservedWordError'
+    when Natsuzora::ParseError then 'ParseError' # includes LexerError
+    when Natsuzora::UndefinedVariableError then 'UndefinedVariable'
+    when Natsuzora::TypeError then 'TypeError'
+    when Natsuzora::ShadowingError then 'ShadowingError'
+    when Natsuzora::IncludeError then 'IncludeError'
+    else "Unmapped(#{error.class})"
+    end
+  end
+
+  # Same materialization rule as the shared spec tests:
+  # "/a/b" -> <root>/a/_b.ntzr
+  def materialize_partials(partials, dir)
+    partials.each do |name, content|
+      segments = name.split('/').reject(&:empty?)
+      segments[-1] = "_#{segments[-1]}"
+      path = "#{File.join(dir, *segments)}.ntzr"
+      FileUtils.mkdir_p(File.dirname(path))
+      File.write(path, content)
+    end
+  end
+
+  def render(request)
+    template = request.fetch('template')
+    data = request.fetch('data')
+    partials = request['partials']
+
+    return Natsuzora.render(template, data) if partials.nil? || partials.empty?
+
+    Dir.mktmpdir('natsuzora_difftest') do |dir|
+      materialize_partials(partials, dir)
+      Natsuzora.render(template, data, include_root: dir)
+    end
+  end
+
+  def handle(request)
+    { id: request['id'], ok: true, output: render(request) }
+  rescue Natsuzora::Error => e
+    { id: request['id'], ok: false, error: canonical_error(e) }
+  end
+
+  def run(input: $stdin, output: $stdout)
+    output.sync = true
+    input.each_line do |line|
+      line = line.strip
+      next if line.empty?
+
+      output.puts(JSON.generate(handle(JSON.parse(line))))
+    end
+  end
+end
+
+DifftestWorker.run if $PROGRAM_NAME == __FILE__

data/lib/natsuzora/data/lexers/template.lkt1

@@ -1 +1 @@
-{"format":"lkt1","codec":"deflate+base64","kind":"program","table_version":2,"uncompressed_len":2226,"sha256":"f670fe5c25083a9642759f0aa0cd16670997d72b94f1323c676001b403fba8d3","data":"eJzdlW1PFEkQx/89s7M7sICIZj0vJqfx8YUCPmEuhuw2M427x+ws7OwCSsgGFZ/FB/SezCX7/r4Un+C+kvevnj3pAyX4ztjkx1R11VRXV0/1Jgudq/ABKJzCWK/XNplpL5u4N93rodRIl3XSiP9nuEaDq1/fo9/Yo9/co8/s0W9RL3TMagelRdOOTNpBIdZZHUGUtDKDQt0qWSKP0Tmd3ul108xE3bbBiFUbaZR0Y4OyWY0S3dSdRitFsLDSa8xjiI9umpgsQ4miSRjRCjqqWx+dwY9bHa7WajY1ArPU1QnCpa7JbJzhlXqjY7JFHRkEjVjS81B6uPlo4/2LdxiWxHtPt7Y237rTMlwTEALePxiH92ENZboGH9b4t/4X1HmoK/BEOgs1pc7R+SgZt0HURzvs+TA+nyeJ78wXHDlw5KIjlxw5dOQhRx627wMnrLw7X3bkEUcedeQxRz7iyOM2D+CHM7KBpxL5Pf95W7KHbUl+U1Z9IG5iKNlKydyQuJTFMPJCFhPr2EMJv2njztgqMNS+Ku3KXl52/CQLq0d25k9bjTyrL7+3Kx+u0lJJ4IIkqSRxT3L2JdOC7DLYtl5/D/Ip7T/ZQ6yXn9CVA09ZTguYlIXVhnhKHt72p2RsoZ9Y18MWcITclFhqOy/NJNRlqFmoqtjVKUbx8ZVDfRqDCe+LA3mBDrR/S8OzeLZdOVSF1dlNUjas9r/0manvceS1ySsjhRgFIsyd51fLz3p0nc19FpiYAo7zvqiwa39kR53hl3uJH+D0JHDrMvDzLHC7Csyy5apsiSqjVE8TDeg5EpGYGDJP7pA6aZBfyAJJSJOkpEUWyRJpk4x0SJcskxWySu6Se+Q+YSNp3kaal4p+TNhT+hl5Tthz+iXhRaBfkdfkDeHdptlDmr8O+lfyG/md/EF4LelBkerMH8dYnRpvC/4YlCaoT1OXO1S6knPz4sM9o4J+FHu1sIIdPvthRSHie+WrYlO1KPbBOfr4tTBV9PH7YezvhHEBIesB1ieUj69Z6J9mTaK4UAvj4s5/tqGB7WJu67u24YFtKrcxZgDXXh7YZ6w9yONWfJGZp8/cAtGZW5E5+sytWAs9cL7Y55N+9D/OLc/lew8/Dvb/L/ErdH4="}
+{"format":"lkt1","codec":"deflate+base64","kind":"program","table_version":2,"uncompressed_len":2890,"sha256":"36ab7ec483cab141868691c5d10a754e6eb8ef5974f065f29953f8819905b718","data":"eJztVmtvE0cUPTO7a68TJ4SCLFUtLYhXP5AEKIQvTfHau2bXWdskayehCFm0hJZH00dKX6iSv/dP+Xt/FD13dkOm5mWQKoHEWMdz79y7d86cte44XetfgANA4Rjmh8ONKIs2NqNweH44RDnpbgZpEv4ncJEB2/98wr804V+e8Fcm/Cv03X603Ue12et0om5/2OiFN7Cw7w26zbSXRSHcMMhieMaDGxsnS2WaawTda0zMouZgI0LVuAmfG4QRZqPtZhp0gn7S68Jb2xomLVQ4DbpplGUo04xSVjRG0IxNTpDBCXt97kYWAbxofRCk8NcHUWbqzGzFST/KrgfNCF4Skic0ynd27t5+9PAXzMh5hvd2d3d+tpdl2CHAB/Q/OAT9+CZmmeo9vsnPrb+gFqFlOgm1rE4x8zCxYCqoJ2aYd6alAo4TjrXuWrZn2SXLLlu2b9kVy54xzwCfGPtgfdayq5Y9Z9nzln3IshfM3sCnJ+QA96TyI37pXTnDnpDfEdbfyNYSKBuZZK0iKbMSqD6UzSQ6f0fK75i6K0YFlnpGpQNbmxMCZ2Rjddes/FkwKr30uQN7OqVz9RaFpBLiWjg7wtSVU3p7Juvv/Ddg9p94s1PsJ28CuPTStyxvCLgsG6vbkik89N5TMkbo70zqtALOEV9ILbWXS7MEdQ5qFeoqCUJdJB0X0ww1VdazQ78i7rxh3f9n6OJbk5cu5gN9VG5TRPe9atZ4nmq5XzBVH3N+bc7q6djf54XDpL8i/jYNjVwflWunaka5/SEHfs4v501/TO/YyLXJlREh2MPaaJxmB10Ejt4CaieBD5eBj3gvHePtcIKd+zN2yGU2uitLwJfngPoq0LgKhLxCWmzvLVZpHScCIG4QTSIkIqJFXCNiIiHaxBqREh2iS/SI68Q6sUFkRJ8YEJvEFrFN3CC+Ir4m2LBj3noxL6/4W4K9O75PPCDY2+PvCV448Q/Ej8RPBO/QmL065l+Q+FfiN+J34g+C119ciNQjfxyhOnXeSvzTUf6A/nn6cldL9+daR3J4ZiS5kuBZDouiHdSP8GxtPlu5wPVQj/waRu1QjzmPZb0q6zWFdujU/Zqqcx75XcUcZ+yHLoi6L3WpXZk1dccdn5WaoTvywzL2Y34RW8pjYztWKWIrJuaxple34zNFfDWP53VrekybPB2uleg75FYiR4fcSiNfk39YGnOmz/yjlKOR6+I/KbT5F/9Mfuo="}

data/lib/natsuzora/errors.rb

@@ -19,10 +19,10 @@ module Natsuzora
     end
   end
 
-  class LexerError < Error; end
-
   class ParseError < Error; end
 
+  class LexerError < ParseError; end
+
   class ReservedWordError < ParseError; end
 
   class RenderError < Error; end

data/lib/natsuzora/lexer.rb

@@ -50,6 +50,16 @@ module Natsuzora
           line, col = stream.line_col
           raise LexerError.new("Unexpected character: '#{text}'", line: line, column: col)
 
+        when :COMMENT_BODY
+          line, col = stream.line_col
+          result.concat(comment_tokens(text, line, col))
+
+        when :COMMENT_UNCLOSED
+          # No `]}` before EOF: emit PERCENT only; the TokenProcessor
+          # reports the unclosed comment at this location.
+          line, col = stream.line_col
+          result << Token.new(:PERCENT, '%', line: line, column: col)
+
         else
           line, col = stream.line_col
           result << Token.new(name, text, line: line, column: col)
@@ -65,6 +75,24 @@ module Natsuzora
       text.gsub(ESCAPE_SEQUENCE, ESCAPED_VALUE)
     end
 
+    # Expands a raw comment-body match ("%...]}") into the token stream
+    # the TokenProcessor expects: PERCENT [DASH] CLOSE. A `-` immediately
+    # before `]}` is the right-trim flag, never content (spec 4.5.4).
+    def comment_tokens(text, line, column)
+      body = text[1..-3]
+      trim = body.end_with?('-')
+      content = trim ? body[0..-2] : body
+
+      tokens = [Token.new(:PERCENT, '%', line: line, column: column)]
+      pos_line, pos_col = position_after(line, column, "%#{content}")
+      if trim
+        tokens << Token.new(:DASH, '-', line: pos_line, column: pos_col)
+        pos_col += 1
+      end
+      tokens << Token.new(:CLOSE, ']}', line: pos_line, column: pos_col)
+      tokens
+    end
+
     def add_eof(tokens)
       if tokens.empty?
         tokens << Token.new(:EOF, nil, line: 1, column: 1)
@@ -76,10 +104,10 @@ module Natsuzora
     end
 
     def position_after_value(token)
-      line = token.line
-      column = token.column
-      value = token.value || ''
+      position_after(token.line, token.column, token.value || '')
+    end
 
+    def position_after(line, column, value)
       value.each_char do |char|
         if char == "\n"
           line += 1

data/lib/natsuzora/lexers/template.rb

@@ -4,7 +4,12 @@ require 'lexer_kit'
 
 LexerKit.build do
   delimited :TEXT, delimiter: '{[', escape: '{[{]}' do
-    token :PERCENT, '%'
+    # Comment body is raw-scanned to the first `]}` (spec 4.5.4): the
+    # tempered pattern cannot consume a `]}`, so it always terminates at
+    # the first occurrence. COMMENT_UNCLOSED catches the no-`]}` case
+    # (longest match guarantees COMMENT_BODY wins when a `]}` exists).
+    token :COMMENT_BODY, /%([^\]]|\]+[^}\]])*\]*\]\}/, pop: true
+    token :COMMENT_UNCLOSED, /%([^\]]|\]+[^}\]])*\]*/
     token :DASH, '-'
     token :CLOSE, ']}', pop: true
     token :HASH, '#'

data/lib/natsuzora/parser.rb

@@ -257,7 +257,7 @@ module Natsuzora
 
       token = current_token
       if current_type == :INVALID
-        raise LexerError.new("Invalid character in include path: '#{token.value}'",
+        raise ParseError.new("Invalid character in include path: '#{token.value}'",
                              line: token.line, column: token.column)
       end
       unless current_type == :IDENT
@@ -266,7 +266,7 @@ module Natsuzora
 
       ident_token = consume(:IDENT)
       if ident_token.value.start_with?('_')
-        raise LexerError.new("Include segment cannot start with underscore: #{ident_token.value}",
+        raise ParseError.new("Include segment cannot start with underscore: #{ident_token.value}",
                              line: ident_token.line, column: ident_token.column)
       end
 

data/lib/natsuzora/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Natsuzora
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: natsuzora
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Aozora Bunko
 bindir: bin
 cert_chain: []
-date: 2026-05-04 00:00:00.000000000 Z
+date: 2026-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lexer_kit
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.1
 description: Natsuzora is a minimal, display-only template language designed for static
   HTML generation and Rails preview templates.
 email:
@@ -35,6 +35,7 @@ files:
 - ".rubocop.yml"
 - CHANGELOG.md
 - Rakefile
+- exe/natsuzora-difftest-worker
 - lib/natsuzora.rb
 - lib/natsuzora/ast.rb
 - lib/natsuzora/context.rb