Change order of data merge for layouts

eta-dev · Sep 21, 2020 · f14b609 · f14b609
1 parent 2b27782
commit f14b609
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 16 deletions.
diff --git a/deno_dist/compile-string.ts b/deno_dist/compile-string.ts
@@ -33,11 +33,11 @@ export default function compileToString(
     (config.includeFile
       ? "if(__l)tR=" +
         (config.async ? "await " : "") +
-        `includeFile(__l,Object.assign(__lP||${config.varName},{body:tR}))\n`
+        `includeFile(__l,Object.assign(${config.varName},{body:tR},__lP))\n`
       : config.include
       ? "if(__l)tR=" +
         (config.async ? "await " : "") +
-        `include(__l,Object.assign(__lP||${config.varName},{body:tR}))\n`
+        `include(__l,Object.assign(${config.varName},{body:tR},__lP))\n`
       : "") +
     "if(cb){cb(null,tR)} return tR" +
     (config.useWith ? "}" : "");

diff --git a/src/compile-string.ts b/src/compile-string.ts
@@ -31,11 +31,11 @@ export default function compileToString(str: string, config: EtaConfig): string
     (config.includeFile
       ? 'if(__l)tR=' +
         (config.async ? 'await ' : '') +
-        `includeFile(__l,Object.assign(__lP||${config.varName},{body:tR}))\n`
+        `includeFile(__l,Object.assign(${config.varName},{body:tR},__lP))\n`
       : config.include
       ? 'if(__l)tR=' +
         (config.async ? 'await ' : '') +
-        `include(__l,Object.assign(__lP||${config.varName},{body:tR}))\n`
+        `include(__l,Object.assign(${config.varName},{body:tR},__lP))\n`
       : '') +
     'if(cb){cb(null,tR)} return tR' +
     (config.useWith ? '}' : '')

diff --git a/test/async.spec.ts b/test/async.spec.ts
@@ -50,7 +50,7 @@ describe('Async Render checks', () => {
 var tR='',__l,__lP,include=E.include.bind(E),includeFile=E.includeFile.bind(E)
 function layout(p,d){__l=p;__lP=d}
 tR+=E.e(@#$%^)
-if(__l)tR=await includeFile(__l,Object.assign(__lP||it,{body:tR}))
+if(__l)tR=await includeFile(__l,Object.assign(it,{body:tR},__lP))
 if(cb){cb(null,tR)} return tR
 `)
       )
@@ -64,7 +64,7 @@ if(cb){cb(null,tR)} return tR
 var tR='',__l,__lP,include=E.include.bind(E),includeFile=E.includeFile.bind(E)
 function layout(p,d){__l=p;__lP=d}
 tR+=E.e(@#$%^)
-if(__l)tR=await includeFile(__l,Object.assign(__lP||it,{body:tR}))
+if(__l)tR=await includeFile(__l,Object.assign(it,{body:tR},__lP))
 if(cb){cb(null,tR)} return tR
 `)
         )

diff --git a/test/compile-string.spec.ts b/test/compile-string.spec.ts
@@ -15,7 +15,7 @@ describe('Compile to String test', () => {
 function layout(p,d){__l=p;__lP=d}
 tR+='hi '
 tR+=E.e(hey)
-if(__l)tR=includeFile(__l,Object.assign(__lP||it,{body:tR}))
+if(__l)tR=includeFile(__l,Object.assign(it,{body:tR},__lP))
 if(cb){cb(null,tR)} return tR`)
   })
 
@@ -38,7 +38,7 @@ if(cb){cb(null,tR)} return tR`)
 function layout(p,d){__l=p;__lP=d}
 tR+='hi '
 tR+=hey
-if(__l)tR=includeFile(__l,Object.assign(__lP||it,{body:tR}))
+if(__l)tR=includeFile(__l,Object.assign(it,{body:tR},__lP))
 if(cb){cb(null,tR)} return tR`)
   })
 
@@ -50,7 +50,7 @@ function layout(p,d){__l=p;__lP=d}
 tR+='hi'
 tR+=E.e(hey)
 tR+=E.e(hi)
-if(__l)tR=includeFile(__l,Object.assign(__lP||it,{body:tR}))
+if(__l)tR=includeFile(__l,Object.assign(it,{body:tR},__lP))
 if(cb){cb(null,tR)} return tR`)
   })
 
@@ -82,7 +82,7 @@ tR+='      \\n  '
 }
 tR+='\\nThis is a partial: '
 tR+=include("mypartial")
-if(__l)tR=includeFile(__l,Object.assign(__lP||it,{body:tR}))
+if(__l)tR=includeFile(__l,Object.assign(it,{body:tR},__lP))
 if(cb){cb(null,tR)} return tR`
     )
   })

diff --git a/test/compile.spec.ts b/test/compile.spec.ts
@@ -34,7 +34,7 @@ describe('Compile test', () => {
 var tR='',__l,__lP,include=E.include.bind(E),includeFile=E.includeFile.bind(E)
 function layout(p,d){__l=p;__lP=d}
 hi (=h)
-if(__l)tR=includeFile(__l,Object.assign(__lP||it,{body:tR}))
+if(__l)tR=includeFile(__l,Object.assign(it,{body:tR},__lP))
 if(cb){cb(null,tR)} return tR
 `)
     )

diff --git a/test/file-handlers.spec.ts b/test/file-handlers.spec.ts
@@ -111,7 +111,7 @@ var tR='',__l,__lP,include=E.include.bind(E),includeFile=E.includeFile.bind(E)
 function layout(p,d){__l=p;__lP=d}
 tR+='Hi '
 tR+=E.e(badSyntax(=!)
-if(__l)tR=await includeFile(__l,Object.assign(__lP||it,{body:tR}))
+if(__l)tR=await includeFile(__l,Object.assign(it,{body:tR},__lP))
 if(cb){cb(null,tR)} return tR
 `)
       )
@@ -130,7 +130,7 @@ var tR='',__l,__lP,include=E.include.bind(E),includeFile=E.includeFile.bind(E)
 function layout(p,d){__l=p;__lP=d}
 tR+='Hi '
 tR+=E.e(badSyntax(=!)
-if(__l)tR=includeFile(__l,Object.assign(__lP||it,{body:tR}))
+if(__l)tR=includeFile(__l,Object.assign(it,{body:tR},__lP))
 if(cb){cb(null,tR)} return tR
 `)
     )
@@ -150,7 +150,7 @@ var tR='',__l,__lP,include=E.include.bind(E),includeFile=E.includeFile.bind(E)
 function layout(p,d){__l=p;__lP=d}
 tR+='Hi '
 tR+=E.e(badSyntax(=!)
-if(__l)tR=includeFile(__l,Object.assign(__lP||it,{body:tR}))
+if(__l)tR=includeFile(__l,Object.assign(it,{body:tR},__lP))
 if(cb){cb(null,tR)} return tR
 */
 

diff --git a/test/layouts.spec.ts b/test/layouts.spec.ts
@@ -7,15 +7,15 @@ describe('Layout Tests', () => {
   it('Nested layouts work as expected', async () => {
     var res = await renderFile(
       'index.eta',
-      { title: 'Cool  Title' },
+      { title: 'Cool Title' },
       // Async can be true or false
       { views: path.join(__dirname, 'templates'), async: true }
     )
 
     expect(res).toEqual(`<!DOCTYPE html>
 <html lang="en">
 <head>
-    <title>Cool  Title</title>
+    <title>Cool Title</title>
 </head>
 <body>
 This is the template body.
@@ -38,4 +38,25 @@ This is a layout`,
 
     expect(res).toEqual('###Cool Title###,This is a layout')
   })
+
+  it("Layouts are called with arguments if they're provided", async () => {
+    templates.define(
+      'my-layout',
+      compile(`<%= it.title %> - <%~ it.body %> - <%~ it.content %> - <%~ it.randomNum %>`, {
+        includeFile: undefined
+      })
+    )
+
+    var res = await render(
+      `<% layout("my-layout", { title: 'Nifty title', content: 'Nice content'}) %>
+This is a layout`,
+      { title: 'Cool Title', randomNum: 3 },
+      { includeFile: undefined }
+    )
+
+    // Note that layouts automatically accept the data of the template which called them,
+    // after it is merged with {body:tR} and custom data
+
+    expect(res).toEqual('Nifty title - This is a layout - Nice content - 3')
+  })
 })