Merge pull request #83 from tronsha/bugfix/props-slotfallback-order

Fix raw block order

Author: tronsha

src/Compiler.php

@@ -227,15 +227,16 @@ public function convert(): string
         $resultNode = $this->convertNode($templateElement);
         $html = $this->document->saveHTML($resultNode);
 
-        if (count($this->rawBlocks)) {
-            $html = implode("\n", $this->rawBlocks) . "\n" . $html;
-        }
-
         if (!$html) {
             throw new Exception('Generating html during conversion process failed.');
         }
 
-        $html = $this->addVariableBlocks($html);
+        $this->rawBlocks[] = $this->createVariableBlock();
+
+        if (count($this->rawBlocks)) {
+            $html = implode("\n", $this->rawBlocks) . "\n" . $html;
+        }
+
         $html = $this->replacePlaceholders($html);
         $html = $this->replaceScopedPlaceholders($html);
         $html = $this->replaceAttributeWithIfConditionPlaceholders($html);
@@ -1291,15 +1292,15 @@ protected function addVariable(string $name, $value): void
         $this->variables[$name] = $value;
     }
 
-    protected function addVariableBlocks(string $string): string
+    protected function createVariableBlock(): string
     {
         $blocks = [];
 
         foreach ($this->variables as $varName => $varValue) {
             $blocks[] = $this->builder->createMultilineVariable($varName, $varValue);
         }
 
-        return implode('', $blocks) . $string;
+        return implode('', $blocks);
     }
 
     /**

tests/fixtures/vue-slot/include-child-component-with-default-slot-and-props.twig

@@ -0,0 +1,4 @@
+{% set text = text|default('foo') %}
+{% set slot_default_fallback %}{{ text }}{% endset %}
+{% set slot_default_value %}{{ slot_default|default(slot_default_fallback) }}{% endset %}
+{% include "/templates/ChildComponent.twig" with { 'slot_default': slot_default_value, 'class': "", 'style': "" } %}

tests/fixtures/vue-slot/include-child-component-with-default-slot-and-props.vue

@@ -0,0 +1,19 @@
+<template>
+  <ChildComponent>
+    <slot>{{ text }}</slot>
+  </ChildComponent>
+</template>
+<script>
+  export default {
+    name: 'ComponentWithSlot',
+    component: {
+      ChildComponent,
+    },
+    props: {
+      text: {
+        type: String,
+        default: 'foo'
+      },
+    },
+  };
+</script>