fix(engine): do not unwrap call element (#59)

fixes #58
adobe · May 9, 2019 · 8963ead · 8963ead
1 parent 7016451
commit 8963ead
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/src/parser/plugins/CallPlugin.js b/src/parser/plugins/CallPlugin.js
@@ -15,15 +15,14 @@ const OutputExpression = require('../commands/OutputExpression');
 const MapLiteral = require('../htl/nodes/MapLiteral');
 
 module.exports = class CallPlugin extends Plugin {
-  // eslint-disable-next-line class-methods-use-this
-  beforeElement(stream) {
+  beforeChildren(stream) {
+    const runtimeCall = new RuntimeCall('call', this._expression.root, [new MapLiteral(this._expression.options)]);
+    stream.write(new OutputExpression(runtimeCall));
     stream.beginIgnore();
   }
 
-  afterElement(stream) {
+  // eslint-disable-next-line class-methods-use-this
+  afterChildren(stream) {
     stream.endIgnore();
-
-    const runtimeCall = new RuntimeCall('call', this._expression.root, [new MapLiteral(this._expression.options)]);
-    stream.write(new OutputExpression(runtimeCall));
   }
 };
diff --git a/test/specs/call_spec.txt b/test/specs/call_spec.txt
@@ -5,23 +5,23 @@
 <div data-sly-call="${foo}"></div>
 ===
 
-<section>Template</section>
+<div><section>Template</section></div>
 #
 ### sightly call function with empty attribute value
 #
 <template data-sly-template.foo=""><section>Template</section></template>
 <div data-sly-call="${foo}"></div>
 ===
 
-<section>Template</section>
+<div><section>Template</section></div>
 #
 ### sightly call function with parameter
 #
 <template data-sly-template.foo="${ @ param }"><section>${param}</section></template>
 <div data-sly-call="${foo @ param='Template' }"></div>
 ===
 
-<section>Template</section>
+<div><section>Template</section></div>
 ^^^
     $.out(var_0);
 #
@@ -31,23 +31,23 @@
 <div data-sly-call="${foo:bar @ param='Template' }"></div>
 ===
 
-<section>Template</section>
+<div><section>Template</section></div>
 #
 ### sightly call function with parameter with colon
 #
 <template data-sly-template.foo="${ @ jcr:title }"><section>${jcr:title}</section></template>
 <div data-sly-call="${foo @ jcr:title='Template' }"></div>
 ===
 
-<section>Template</section>
+<div><section>Template</section></div>
 #
 ### sightly call function with missing parameter
 #
 <template data-sly-template.foo="${ @ param='Missing parameter' }"><section>${param}</section></template>
 <div data-sly-call="${foo}"></div>
 ===
 
-<section></section>
+<div><section></section></div>
 ^^^
     $.out(var_0);
 #
@@ -59,14 +59,14 @@
 ===
 
 
-<section>Template 2</section>
+<div><section>Template 2</section></div>
 #
 ### sightly call function in any order
 #
 <div data-sly-call="${foo}"></div>
 <template data-sly-template.foo="${ @ param }"><section>Template</section></template>
 ===
-<section>Template</section>
+<div><section>Template</section></div>
 
 #
 ### sightly call function receives correct scope
@@ -76,7 +76,7 @@
 <template data-sly-template.foo="${ @ param }"><section>${param}</section></template>
 ===
 
-<section></section>
+<div><section></section></div>
 
 ^^^
     $.out(var_0);
@@ -89,7 +89,7 @@
 ===
 
 
-<section>123</section>
+<div><div><section>123</section></div></div>
 ^^^
     $.out(var_0);
 #

diff --git a/test/specs/template_spec.txt b/test/specs/template_spec.txt
@@ -1,22 +1,26 @@
 #
 ### use external template lib and invoke 1 template
 #
-<div data-sly-use.lib="template_spec/templateLib.html" data-sly-call="${lib.one}"></div>
+<!--/* use sly tag to suppress outer elements */-->
+<sly data-sly-use.lib="template_spec/templateLib.html" data-sly-call="${lib.one}"></sly>
 ===
+
 blah 1
 #
 ### use external template lib and invoke template 2
 #
 <div data-sly-call="${lib.two}"></div>
 <sly data-sly-use.lib="template_spec/templateLib.html"></sly>
 ===
-blah 2
+<div>blah 2</div>
 
 #
 ### use external template lib and invoke template with args
 #
-<div data-sly-use.lib="template_spec/templateLib.html" data-sly-call="${lib.any @ jcr:title='Hello, world.'}"></div>
+<!--/* use unwrap to suppress out elements */-->
+<div data-sly-unwrap data-sly-use.lib="template_spec/templateLib.html" data-sly-call="${lib.any @ jcr:title='Hello, world.'}"></div>
 ===
+
 blah Hello, world.
 #
 ###