refactor: finalize @include tag

fixtures/include-conditionals/compiled.js

@@ -1,11 +1,9 @@
-return (function (template, ctx) {
 let out = "";
-ctx.$lineNumber = 1;
-ctx.$filename = "{{__dirname}}index.edge";
+let $lineNumber = 1;
+let $filename = "{{__dirname}}index.edge";
 try {
-out += `${template.renderInline(`include-conditionals/${ctx.resolve('username') === "virk" ? "virk.edge" : "guest.edge"}`)(template, ctx)}`;
+out += `${template.renderInline(`include-conditionals/${state.username === "virk" ? "virk.edge" : "guest.edge"}`)(template,state,ctx)}`;
 } catch (error) {
-ctx.reThrow(error);
+ctx.reThrow(error, $filename, $lineNumber);
 }
-return out;
-})(template, ctx)
+return out;

fixtures/include-identifier/compiled.js

@@ -1,11 +1,9 @@
-return (function (template, ctx) {
 let out = "";
-ctx.$lineNumber = 1;
-ctx.$filename = "{{__dirname}}index.edge";
+let $lineNumber = 1;
+let $filename = "{{__dirname}}index.edge";
 try {
-out += `${template.renderInline(ctx.resolve('partial'))(template, ctx)}`;
+out += `${template.renderInline(state.partial)(template,state,ctx)}`;
 } catch (error) {
-ctx.reThrow(error);
+ctx.reThrow(error, $filename, $lineNumber);
 }
-return out;
-})(template, ctx)
+return out;

fixtures/include-literal/compiled.js

@@ -1,11 +1,9 @@
-return (function (template, ctx) {
 let out = "";
-ctx.$lineNumber = 1;
-ctx.$filename = "{{__dirname}}index.edge";
+let $lineNumber = 1;
+let $filename = "{{__dirname}}index.edge";
 try {
-out += `${template.renderInline("include-literal/partial")(template, ctx)}`;
+out += `${template.renderInline("include-literal/partial")(template,state,ctx)}`;
 } catch (error) {
-ctx.reThrow(error);
+ctx.reThrow(error, $filename, $lineNumber);
 }
-return out;
-})(template, ctx)
+return out;

fixtures/include-nested-shared-locals/compiled.js

@@ -0,0 +1,11 @@
+let out = "";
+let $lineNumber = 1;
+let $filename = "{{__dirname}}index.edge";
+try {
+let username = 'virk';
+$lineNumber = 2;
+out += `${template.renderInline("include-nested-shared-locals/partial","username")(template,state,ctx,username)}`;
+} catch (error) {
+ctx.reThrow(error, $filename, $lineNumber);
+}
+return out;

fixtures/include-nested-shared-locals/index.edge

@@ -0,0 +1,2 @@
+@set('username', 'virk')
+@include("include-nested-shared-locals/partial")

fixtures/include-nested-shared-locals/index.json

@@ -0,0 +1,2 @@
+{
+}

fixtures/include-nested-shared-locals/index.txt

@@ -0,0 +1 @@
+Hello virk

fixtures/include-nested-shared-locals/partial-1.edge

@@ -0,0 +1 @@
+Hello {{ username }}

fixtures/include-nested-shared-locals/partial.edge

@@ -0,0 +1 @@
+@include("include-nested-shared-locals/partial-1")

fixtures/include-nested/compiled.js

@@ -1,11 +1,9 @@
-return (function (template, ctx) {
 let out = "";
-ctx.$lineNumber = 1;
-ctx.$filename = "{{__dirname}}index.edge";
+let $lineNumber = 1;
+let $filename = "{{__dirname}}index.edge";
 try {
-out += `${template.renderInline("include-nested/partial")(template, ctx)}`;
+out += `${template.renderInline("include-nested/partial")(template,state,ctx)}`;
 } catch (error) {
-ctx.reThrow(error);
+ctx.reThrow(error, $filename, $lineNumber);
 }
-return out;
-})(template, ctx)
+return out;

fixtures/include-shared-ctx/compiled.js

@@ -1,11 +1,9 @@
-return (function (template, ctx) {
 let out = "";
-ctx.$lineNumber = 1;
-ctx.$filename = "{{__dirname}}index.edge";
+let $lineNumber = 1;
+let $filename = "{{__dirname}}index.edge";
 try {
-out += `${template.renderInline("include-shared-ctx/partial")(template, ctx)}`;
+out += `${template.renderInline("include-shared-ctx/partial")(template,state,ctx)}`;
 } catch (error) {
-ctx.reThrow(error);
+ctx.reThrow(error, $filename, $lineNumber);
 }
-return out;
-})(template, ctx)
+return out;

src/Tags/Include.ts

@@ -10,7 +10,7 @@
 import { expressions } from 'edge-parser'
 
 import { TagContract } from '../Contracts'
-import { unallowedExpression, isSubsetOf } from '../utils'
+import { unallowedExpression, isSubsetOf, parseJsArg } from '../utils'
 
 /**
  * Include tag is used to include partials in the same scope of the parent
@@ -29,11 +29,11 @@ export const includeTag: TagContract = {
    * Compiles else block node to Javascript else statement
    */
   compile (parser, buffer, token) {
-    const parsed = parser.utils.transformAst(
-      parser.utils.generateAST(token.properties.jsArg, token.loc, token.filename),
-      token.filename,
-    )
+    const parsed = parseJsArg(parser, token)
 
+    /**
+     * Only mentioned expressions are allowed inside `@include` tag
+     */
     isSubsetOf(
       parsed,
       [
@@ -55,12 +55,26 @@ export const includeTag: TagContract = {
     )
 
     /**
-     * Include template. Since the partials can be a runtime value, we cannot inline
-     * the content right now and have to defer to runtime to get the value of
-     * the partial and then process it
+     * We need to pass the local variables to the partial render function
      */
+    const localVariables = parser.stack.list()
+
+    /**
+     * Arguments for the `renderInline` method
+     */
+    const renderArgs = localVariables.length
+      ? [parser.utils.stringify(parsed), localVariables.map((localVar) => `"${localVar}"`).join(',')]
+      : [parser.utils.stringify(parsed)]
+
+    /**
+     * Arguments for invoking the output function of `renderInline`
+     */
+    const callFnArgs = localVariables.length
+      ? ['template', 'state', 'ctx', localVariables.map((localVar) => localVar).join(',')]
+      : ['template', 'state', 'ctx']
+
     buffer.outputExpression(
-      `template.renderInline(${parser.utils.stringify(parsed)})(template, ctx)`,
+      `template.renderInline(${renderArgs.join(',')})(${callFnArgs.join(',')})`,
       token.filename,
       token.loc.start.line,
       true,