w_syntax_tree-erb 0.10.0 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e48aeaba8ef070f5f13bdd166cf4dd9f1f1e4693de8537d2dbf5b86f90092de6
-  data.tar.gz: ade025cc4a31c3f0b5461650a97ff2074de6dc868197ab09a2d2b0c047b1d0cc
+  metadata.gz: 657167139e259c320442756b2da4ce405e3ef3df7c3c370e6cd681561c3e7de6
+  data.tar.gz: 7f369c4b9bb2416a533a10734a4b384496712712e9787465d96ff76661a8be6d
 SHA512:
-  metadata.gz: 58ff254dc23a076b7bbc87606c3672c8bde4b5df6d526cb6ea5d6cedf54c1f9fb9b0b832b7ae06d7eb23731bf5a95cade7d0a443e9ce11ea71a1578ce0591d49
-  data.tar.gz: 30fbe095d0e624ed126897ff1fccc229a03f4a0375d67e9718257900856e1587be7b406a510b61e8ea6574af9c7a1c46fd2ee0c15586819c20e90e452bfbbace
+  metadata.gz: 2a4efea93faf97c4fe05e9a7af6e0dcfd488ffbdea1ad1380e4d13d2a033490cc65ce275b3311d1c1d4c50d7d59efce2552fdd4e13a8324fc8cd5d514ac1c513
+  data.tar.gz: 022be3662cdffa4bf6416354a1f8b518bf1ca0f84875c99d5a919519b7b48e8e8ec608f132c6e3a0f1eaeb2651a7ae337dec0b7961ea14782019205f0221faa2

data/CHANGELOG.md

@@ -6,6 +6,19 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [0.10.2] - 2023-08-22
+
+### Fixes
+
+- Handles formatting empty documents and removing leading new-linews in files with content.
+- Removes trailing whitespace from char data if it is the last element in a document, block or group.
+
+## [0.10.1] - 2023-08-20
+
+### Added
+
+- Allow `DOCTYPE` to be after other tags, to work with e.g. ERB-tags on first line.
+
 ## [0.10.0] - 2023-08-20
 
 - Changes how whitespace and newlines are handled.
@@ -70,7 +83,8 @@ Output:
 - Can format a lot of .html.erb-syntax and works as a plugin to syntax_tree.
 - This is still early and there are a lot of different weird syntaxes out there.
 
-[unreleased]: https://github.com/davidwessman/syntax_tree-erb/compare/v0.10.0...HEAD
+[unreleased]: https://github.com/davidwessman/syntax_tree-erb/compare/v0.10.1...HEAD
+[0.10.1]: https://github.com/davidwessman/syntax_tree-erb/compare/v0.10.0...v0.10.1
 [0.10.0]: https://github.com/davidwessman/syntax_tree-erb/compare/v0.9.5...v0.10.0
 [0.9.5]: https://github.com/davidwessman/syntax_tree-erb/compare/v0.9.4...v0.9.5
 [0.9.4]: https://github.com/davidwessman/syntax_tree-erb/compare/v0.9.3...v0.9.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    w_syntax_tree-erb (0.10.0)
+    w_syntax_tree-erb (0.10.2)
       prettier_print (~> 1.2, >= 1.2.0)
       syntax_tree (~> 6.1, >= 6.1.1)
 

data/lib/syntax_tree/erb/format.rb

@@ -327,7 +327,7 @@ module SyntaxTree
         group = []
 
         if child_nodes.size == 1
-          visit(child_nodes.first)
+          visit(child_nodes.first.without_new_line)
           return
         end
 

data/lib/syntax_tree/erb/nodes.rb

@@ -606,6 +606,21 @@ module SyntaxTree
       def skip?
         value.value.strip.empty?
       end
+
+      # Also remove trailing whitespace
+      def without_new_line
+        self.class.new(
+          **deconstruct_keys([]).merge(
+            new_line: nil,
+            value:
+              Token.new(
+                type: value.type,
+                location: value.location,
+                value: value.value.rstrip
+              )
+          )
+        )
+      end
     end
 
     class NewLine < Node

data/lib/syntax_tree/erb/parser.rb

@@ -20,16 +20,16 @@ module SyntaxTree
       def initialize(source)
         @source = source
         @tokens = make_tokens
+        @found_doctype = false
       end
 
       def parse
-        doctype = maybe { parse_doctype }
         elements = many { parse_any_tag }
 
         location =
           elements.first.location.to(elements.last.location) if elements.any?
 
-        Document.new(elements: [doctype].compact + elements, location: location)
+        Document.new(elements: elements, location: location)
       end
 
       def debug_tokens
@@ -44,11 +44,23 @@ module SyntaxTree
         loop do
           tag =
             atleast do
-              maybe { parse_html_comment } || maybe { parse_erb_tag } ||
-                maybe { parse_erb_comment } || maybe { parse_html_element } ||
-                maybe { parse_new_line } || maybe { parse_chardata }
+              maybe { parse_doctype } || maybe { parse_html_comment } ||
+                maybe { parse_erb_tag } || maybe { parse_erb_comment } ||
+                maybe { parse_html_element } || maybe { parse_new_line } ||
+                maybe { parse_chardata }
             end
 
+          if tag.is_a?(Doctype)
+            if @found_doctype
+              raise(ParseError, "Only one doctype element is allowed")
+            else
+              @found_doctype = true
+            end
+          end
+
+          # Ignore new lines in beginning of document
+          next if tag.is_a?(NewLine)
+
           # Allow skipping empty CharData
           return tag unless tag.skip?
         end

data/lib/syntax_tree/erb/version.rb

@@ -2,6 +2,6 @@
 
 module SyntaxTree
   module ERB
-    VERSION = "0.10.0"
+    VERSION = "0.10.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: w_syntax_tree-erb
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.2
 platform: ruby
 authors:
 - Kevin Newton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-20 00:00:00.000000000 Z
+date: 2023-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prettier_print