WIP: Parse Stone through Acorn

src/CacheManager.js

@@ -1,5 +1,5 @@
 import { FS } from 'grind-support'
-import './AST'
+// import './AST'
 
 const path = require('path')
 

src/Compiler.js

@@ -1,7 +1,8 @@
-import './Errors/StoneCompilerError'
-import './StoneTemplate'
+import './Stone'
+import './Support/StoneSections'
 
 const fs = require('fs')
+const vm = require('vm')
 
 export class Compiler {
 
@@ -34,10 +35,10 @@ export class Compiler {
 			this.engine.view.emit('compile:start', file)
 		}
 
-		const template = new StoneTemplate(this, contents, file)
+		let template = null
 
 		try {
-			template.compile()
+			template = Stone.stringify(Stone.parse(contents, file))
 		} catch(err) {
 			if(!err._hasTemplate) {
 				err._hasTemplate = true
@@ -56,46 +57,16 @@ export class Compiler {
 		}
 
 		if(!shouldEval) {
-			return template.toString()
+			return template
 		}
 
-		return template.toFunction()
-	}
-
-	compileDirective(context, name, args) {
-		if(name === 'directive') {
-			// Avoid infinite loop
-			return null
-		}
-
-		if(typeof this.directives[name] === 'function') {
-			return this.directives[name](context, args)
-		}
-
-		const method = `compile${name[0].toUpperCase()}${name.substring(1)}`
-
-		if(typeof this[method] !== 'function') {
-			throw new StoneCompilerError(context, `@${name} is not a valid Stone directive.`)
+		try {
+			const script = new vm.Script(`(${template})`, { filename: file })
+			return script.runInNewContext({ StoneSections })
+		} catch(err) {
+			console.log('template', template)
+			throw err
 		}
-
-		return this[method](context, args)
 	}
 
-	compileEnd() {
-		return '}'
-	}
-
-}
-
-// Load in the rest of the compilers
-for(const [ name, func ] of Object.entries({
-	...require('./Compiler/Assignments'),
-	...require('./Compiler/Components'),
-	...require('./Compiler/Conditionals'),
-	...require('./Compiler/Layouts'),
-	...require('./Compiler/Loops'),
-	...require('./Compiler/Macros'),
-	...require('./Compiler/Outputs'),
-})) {
-	Compiler.prototype[name] = func
 }