Compactor

Author: joeldrapper

lib/phlex/compiler/compactor.rb

@@ -0,0 +1,74 @@
+# frozen_string_literal: true
+
+class Phlex::Compiler::Compactor < Refract::MutationVisitor
+	visit Refract::StatementsNode do |node|
+		queue = []
+		results = []
+		current_buffer = nil
+		nil_context = false
+
+		node.body.reverse_each { |n| queue << n }
+
+		while (child_node = queue.pop)
+			case child_node
+			when Refract::StatementsNode
+				child_node.body.reverse_each { |n| queue << n }
+			when Phlex::Compiler::Concat
+				if current_buffer
+					current_buffer << child_node.node
+					unless nil_context
+						results << Refract::NilNode.new
+						nil_context = true
+					end
+				else
+					current_buffer = [child_node.node]
+					results << Refract::ParenthesesNode.new(
+						body: Refract::StatementsNode.new(
+							body: [
+								Refract::IfNode.new(
+									inline: false,
+									predicate: Refract::LocalVariableReadNode.new(
+										name: :__phlex_should_render__
+									),
+									statements: Refract::StatementsNode.new(
+										body: [
+											Refract::CallNode.new(
+												receiver: Refract::CallNode.new(
+													name: :__phlex_buffer__,
+												),
+												name: :<<,
+												arguments: Refract::ArgumentsNode.new(
+													arguments: [
+														Refract::InterpolatedStringNode.new(
+															parts: current_buffer
+														),
+													]
+												)
+											),
+										]
+									)
+								),
+								Refract::NilNode.new,
+							]
+						)
+					)
+					nil_context = true
+				end
+			else
+				resolved = visit(child_node)
+				case resolved
+				when Refract::StatementsNode
+					resolved.body.reverse_each { |n| queue << n }
+				else
+					current_buffer = nil
+					results << resolved
+					nil_context = false
+				end
+			end
+		end
+
+		node.copy(
+			body: results
+		)
+	end
+end

lib/phlex/compiler/method_compiler.rb

@@ -3,24 +3,22 @@
 require "prism"
 
 module Phlex::Compiler
+	Concat = Data.define(:node) do
+		def start_line = nil
+		def accept(visitor) = self
+	end
+
 	class MethodCompiler < Refract::MutationVisitor
 		def initialize(component)
 			super()
 			@component = component
-			@current_buffer = nil
 			@preamble = []
 		end
 
 		def compile(node)
-			visit(node)
-		end
-
-		def around_visit(node)
-			unless node in Refract::StatementsNode | Refract::CallNode | nil
-				clear_buffer
-			end
-
-			super
+			Compactor.new.visit(
+				visit(node)
+			)
 		end
 
 		visit Refract::ClassNode do |node|
@@ -105,7 +103,6 @@ def around_visit(node)
 				end
 			end
 
-			clear_buffer
 			super(node)
 		end
 
@@ -175,8 +172,6 @@ def compile_phlex_attributes(node)
 					)
 				end
 
-				clear_buffer
-
 				Refract::CallNode.new(
 					name: :__render_attributes__,
 					arguments: Refract::ArgumentsNode.new(
@@ -208,7 +203,6 @@ def compile_phlex_block(node)
 				end
 			end
 
-			clear_buffer
 			Refract::CallNode.new(
 				name: :__yield_content__,
 				block: node
@@ -291,7 +285,6 @@ def compile_plain_helper(node)
 			if node.arguments.arguments in [Refract::StringNode]
 				raw(node.arguments.arguments.first.unescaped)
 			else
-				clear_buffer
 				node
 			end
 		end
@@ -351,8 +344,6 @@ def compile_comment_helper(node)
 
 		def compile_raw_helper(node)
 			node => Refract::CallNode
-
-			clear_buffer
 			node
 		end
 
@@ -404,46 +395,16 @@ def compile_raw_helper(node)
 		private def buffer(node)
 			node => Refract::StringNode | Refract::EmbeddedStatementsNode
 
-			if @current_buffer
-				@current_buffer << node
-
-				nil
-			else
-				@current_buffer = [node]
-
-				Refract::StatementsNode.new(
-					body: [
-						Refract::IfNode.new(
-							inline: false,
-							predicate: Refract::LocalVariableReadNode.new(
-								name: should_render_local
-							),
-							statements: Refract::StatementsNode.new(
-								body: [
-									Refract::CallNode.new(
-										receiver: Refract::CallNode.new(
-											name: buffer_local,
-										),
-										name: :<<,
-										arguments: Refract::ArgumentsNode.new(
-											arguments: [
-												Refract::InterpolatedStringNode.new(
-													parts: @current_buffer
-												),
-											]
-										)
-									),
-								]
-							)
-						),
-						Refract::NilNode.new,
-					]
-				)
-			end
-		end
+			should_render_local
+			buffer_local
 
-		private def clear_buffer
-			@current_buffer = nil
+			Refract::StatementsNode.new(
+				body: [
+					Concat.new(
+						node
+					),
+				]
+			)
 		end
 
 		private def output_block?(node)