refactor: move sharedState to presenter from context

src/Context/index.ts

@@ -11,6 +11,7 @@ import he from 'he'
 import { set, get } from 'lodash'
 import { Macroable } from 'macroable'
 import { EdgeError } from 'edge-error'
+import { Presenter } from '../Presenter'
 import { ContextContract } from '../Contracts'
 
 /**
@@ -56,7 +57,7 @@ export class Context extends Macroable implements ContextContract {
   public $filename = ''
   public $lineNumber = 0
 
-  constructor (public presenter: any, public sharedState: any) {
+  constructor (public presenter: Presenter) {
     super()
   }
 
@@ -76,7 +77,7 @@ export class Context extends Macroable implements ContextContract {
   private getCurrentState () {
     return Object.assign(
       {},
-      this.sharedState,
+      this.presenter.sharedState,
       this.presenter.state,
       ...this.frames,
     )
@@ -221,10 +222,10 @@ export class Context extends Macroable implements ContextContract {
     }
 
     /**
-     * Finally fallback to defined globals
+     * Finally fallback to shared globals
      */
-    value = this.sharedState[key]
-    return typeof (value) === 'function' ? value.bind(this.sharedState) : value
+    value = this.presenter.sharedState[key]
+    return typeof (value) === 'function' ? value.bind(this.presenter.sharedState) : value
   }
 
   /**

src/Presenter/index.ts

@@ -7,14 +7,16 @@
 * file that was distributed with this source code.
 */
 
+import { PresenterContract } from '../Contracts'
+
 /**
  * The Base presenter is passed to context for reading
  * the state values.
  *
  * However, a custom presenter a do a lot by defining
  * custom properties and methods.
  */
-export class Presenter {
-  constructor (public state: any) {
+export class Presenter implements PresenterContract {
+  constructor (public state: any, public sharedState: any) {
   }
 }

src/Template/index.ts

@@ -1,7 +1,3 @@
-/**
- * @module edge
- */
-
 /*
 * edge
 *
@@ -26,10 +22,10 @@ export class Template {
    * The shared state is used to hold the globals and locals,
    * since it is shared with components too.
    */
-  private _sharedState: any
+  private sharedState: any
 
-  constructor (private _compiler: CompilerContract, globals: any, locals: any) {
-    this._sharedState = merge({}, globals, locals)
+  constructor (private compiler: CompilerContract, globals: any, locals: any) {
+    this.sharedState = merge({}, globals, locals)
   }
 
   /**
@@ -43,7 +39,7 @@ export class Template {
    * ```
    */
   public renderInline (templatePath: string): Function {
-    return new Function('template', 'ctx', this._compiler.compile(templatePath, true).template)
+    return new Function('template', 'ctx', this.compiler.compile(templatePath, true).template)
   }
 
   /**
@@ -58,11 +54,11 @@ export class Template {
    * ```
    */
   public renderWithState (template: string, state: any, slots: any): string {
-    const { template: compiledTemplate, Presenter } = this._compiler.compile(template, false)
-    const presenter = new (Presenter || BasePresenter)(merge(state, { $slots: slots }))
-    const ctx = new Context(presenter, this._sharedState)
+    const { template: compiledTemplate, Presenter } = this.compiler.compile(template, false)
+    const presenter = new (Presenter || BasePresenter)(merge(state, { $slots: slots }), this.sharedState)
+    const ctx = new Context(presenter)
 
-    return new Function('template', 'ctx', `return ${compiledTemplate}`)(this, ctx)
+    return new Function('template', 'ctx', compiledTemplate)(this, ctx)
   }
 
   /**
@@ -73,10 +69,9 @@ export class Template {
    * ```
    */
   public render (template: string, state: any): string {
-    const { template: compiledTemplate, Presenter } = this._compiler.compile(template, false)
-    const presenter = new (Presenter || BasePresenter)(state)
-    const ctx = new Context(presenter, this._sharedState)
-
-    return new Function('template', 'ctx', `return ${compiledTemplate}`)(this, ctx)
+    const { template: compiledTemplate, Presenter } = this.compiler.compile(template, false)
+    const presenter = new (Presenter || BasePresenter)(state, this.sharedState)
+    const ctx = new Context(presenter)
+    return new Function('template', 'ctx', compiledTemplate)(this, ctx)
   }
 }

test/compiler.spec.ts

@@ -535,7 +535,7 @@ test.group('Compiler | Compile', (group) => {
     try {
       new Function('template', 'ctx', compiler.compile('index.edge', false).template)(
         {},
-        new Context({ state: {} }, {}),
+        new Context({ state: {}, sharedState: {} }),
       )
     } catch (error) {
       assert.equal(error.message, 'getUserName is not a function')
@@ -570,7 +570,7 @@ test.group('Compiler | Compile', (group) => {
 
     try {
       const fn = new Function('template', 'ctx', compiler.compile('index.edge', false).template)
-      fn({}, new Context({ state: {} }, {}))
+      fn({}, new Context({ state: {}, sharedState: {} }))
     } catch (error) {
       assert.equal(error.message, 'getContent is not a function')
       assert.equal(error.filename, join(fs.basePath, 'index.edge'))