Default value for templates added, new grammar for class and alias

Author: ClassicOldSong

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eft-parser",
-  "version": "0.1.5",
+  "version": "0.2.0",
   "description": "ef.js template parser",
   "main": "dist/eft-parser.min.js",
   "module": "src/eft-parser.js",

src/eft-parser.js

@@ -1,7 +1,7 @@
 import ESCAPE from './escape-parser.js'
 
 const typeSymbols = '>#%@.-+'.split('')
-const reserved = 'attached data element methods subscribe unsubscribe update'.split(' ').map(i => `$${i}`)
+const reserved = 'attached data element nodes methods subscribe unsubscribe update'.split(' ').map(i => `$${i}`)
 const fullMustache = /^\{\{.*\}\}$/
 const mustache = /\{\{.+?\}\}/g
 
@@ -22,11 +22,30 @@ const resolveDepth = (ast, depth) => {
 	return currentNode
 }
 
+const parseTag = (string) => {
+	const [content, ...alias] = string.split('#')
+	const [tag, ...classes] = content.split('.')
+	return {
+		tag,
+		alias: alias.join('#'),
+		class: classes.join(' ')
+	}
+}
+
+const splitDefault = (string) => {
+	string = string.substr(2, string.length - 4)
+	const [_path, ..._default] = string.split('=')
+	const pathArr = _path.trim().split('.')
+	const defaultVal = ESCAPE(_default.join('=').trim())
+	if (defaultVal) pathArr.push([defaultVal])
+	return pathArr
+}
+
 const parseNodeProps = (string) => {
 	const splited = string.split('=')
 	const name = splited.shift().trim()
-	let value = splited.join('=').trim()
-	if (fullMustache.test(value)) return { name, value: value.substr(2, value.length - 4).split('.') }
+	const value = splited.join('=').trim()
+	if (fullMustache.test(value)) return { name, value: splitDefault(value) }
 	return { name, value }
 }
 
@@ -37,9 +56,7 @@ const parseText = (string) => {
 		const texts = string.split(mustache)
 		for (let i = 0; i < texts.length; i++) {
 			if (texts[i]) parts.push(ESCAPE(texts[i]))
-			if (mustaches[i]) parts.push(mustaches[i].substr(2, mustaches[i].length - 4)
-				.trim()
-				.split('.'))
+			if (mustaches[i]) parts.push(splitDefault(mustaches[i]))
 		}
 	} else parts.push(string)
 	return parts
@@ -76,12 +93,15 @@ const eftParser = (template) => {
 						minDepth = depth
 					}
 					prevType = 'tag'
+					const info = parseTag(content)
 					const newNode = [{
-						tag: content,
+						tag: info.tag,
 						attr: {},
 						prop: {},
 						event: {}
 					}]
+					if (info.class) newNode[0].attr.class = info.class
+					if (info.alias) newNode[0].alias = info.alias
 					currentNode.push(newNode)
 					currentNode = newNode
 					break

test/ef.min.js

@@ -91,34 +91,29 @@ var ast = [
 ]
 
 var template = 'this is a comment\n' +
-'>div\n' +
-'	#class = {{class}}\n' +
+'>div.box.test#root\n' +
 '	#style = {{attr.style}}\n' +
 '	#id = testdiv\n' +
 '	#some-attr = some text\n' +
 '	#content =\n' +
 '	%title = {{name}}\n' +
 '	%anotherProperty = text\n' +
-'	%contentEditable = {{edit}}\n' +
-'	.Name: {{name}}&nJob: {{job}}\n' +
+'	.Name: {{name = some name}}&nJob: {{job = some job}}\n' +
 '	>br\n' +
 '	-node1\n' +
-'	>p\n' +
+'	>p#info\n' +
 '		#class = some class name\n' +
 '		@click = alertNotice\n' +
 '		/@mousedown = setState\n' +
 '		>span\n' +
-'			.Notice: {{notice}}\n' +
+'			.Notice: {{notice = N/A}}\n' +
 '		. test\n' +
 '	 	-node2\n' +
 '		+list1'
 
 var data1 = {
 	$data: {
-			class: 'box test class',
-			name: 'Bob',
 			job: 'Assit Alice',
-			notice: 'ooooooops'
 	},
 	$methods: {
 		alertNotice(state) {
@@ -145,10 +140,8 @@ state4.$data.text = 'box'
 
 // state.$data.root.text = 'component 1'
 state2.$data.root.text = 'component 2'
-state3.$data.class = 'box'
 state3.$data.name = 'Alice'
 state3.$data.job = 'Developer'
-state3.$data.notice = 'N/A'
 state4.$data.job = 'Assiting Alice'
 
 var data2 = {