Implement IDs with syntax like "div.my-class#my-id() {}"

diff --git a/page.jst b/page.jst
index 722c626..9623eb1 100644 (file)
--- a/page.jst
+++ b/page.jst
@@ -1,4 +1,4 @@
-async _env => html.'cls-1'.cls-2(lang=_env.lang true=_env.val something-else="\"val\"") {
+async _env => html.'cls-1'.cls-2#id-1(lang=_env.lang true=_env.val something-else="\"val\"") {
   head {}
   body {
     `hello

diff --git a/src/expression.js b/src/expression.js
index 5a35146..f05ece2 100644 (file)
--- a/src/expression.js
+++ b/src/expression.js
@@ -269,6 +269,12 @@ pp.parseSubscripts = function(base, startPos, startLoc, noCalls) {
       node.computed = !!computed
       if (computed) this.expect(tt.bracketR)
       base = this.finishNode(node, "MemberExpression")
+    } else if (this.eat(tt.hash)) { // Nick
+      let node = this.startNodeAt(startPos, startLoc)
+      node.object = base
+      //node.property = this.parseIdent(true)
+      node.property = this.type === tt.string ? this.parseLiteral(this.value) : this.parseIdent(true) // Nick
+      base = this.finishNode(node, "MemberExpressionHash")
     } else if (!noCalls && this.eat(tt.parenL)) {
       let refDestructuringErrors = new DestructuringErrors, oldYieldPos = this.yieldPos, oldAwaitPos = this.awaitPos
       this.yieldPos = 0

diff --git a/src/tokenize.js b/src/tokenize.js
index 5fbbb27..3014ddc 100644 (file)
--- a/src/tokenize.js
+++ b/src/tokenize.js
@@ -293,6 +293,8 @@ pp.getTokenFromCode = function(code) {
   // by a digit or another two dots.
   case 46: // '.'
     return this.readToken_dot()
+  case 35: // Nick '#'
+    ++this.pos; return this.finishToken(tt.hash)
 
   // Punctuation tokens.
   case 40: ++this.pos; return this.finishToken(tt.parenL)

diff --git a/src/tokentype.js b/src/tokentype.js
index 76b145f..2fe565c 100644 (file)
--- a/src/tokentype.js
+++ b/src/tokentype.js
@@ -69,6 +69,7 @@ export const types = {
   semi: new TokenType(";", beforeExpr),
   colon: new TokenType(":", beforeExpr),
   dot: new TokenType("."),
+  hash: new TokenType("#"), // Nick
   question: new TokenType("?", beforeExpr),
   arrow: new TokenType("=>", beforeExpr),
   template: new TokenType("template"),

diff --git a/template.js b/template.js
index 0d273c5..8c459f5 100644 (file)
--- a/template.js
+++ b/template.js
@@ -13,7 +13,7 @@ let expr_to_tag = (node, context, html_allowed, call_allowed) => {
     if (!expr_to_tag(node.right, context, html_allowed, call_allowed))
       return false;
   }
-  else if (node.type === 'MemberExpression') {
+  else if (node.type === 'MemberExpression' && !node.computed) {
     if (!expr_to_tag(node.object, context, false, false))
       return false;
     context.tag[context.tag_type].push(context.name.join('-'))
@@ -22,6 +22,15 @@ let expr_to_tag = (node, context, html_allowed, call_allowed) => {
     if (!expr_to_tag(node.property, context, html_allowed, call_allowed))
       return false;
   }
+  else if (node.type === 'MemberExpressionHash') {
+    if (!expr_to_tag(node.object, context, false, false))
+      return false;
+    context.tag[context.tag_type].push(context.name.join('-'))
+    context.name = []
+    context.tag_type = 2
+    if (!expr_to_tag(node.property, context, html_allowed, call_allowed))
+      return false;
+  }
   else if (html_allowed && node.type === 'HTMLExpression') {
     if (!expr_to_tag(node.tag, context, false, true))
       return false;
@@ -59,6 +68,9 @@ let html_body = (context, st, c) => {
   if (context.tag[1].length)
     prefix += ' class="' + context.tag[1].join(' ') + '"'
 
+  if (context.tag[2].length)
+    prefix += ' id="' + context.tag[2].join(' ') + '"'
+
   let expr = undefined
   for (var i = 0; i < context.arguments.length; ++i) {
     let argument = context.arguments[i]
@@ -241,7 +253,7 @@ visitors.ExpressionStatement = (node, st, c) => {
     node.expression.type === 'MemberExpression' ||
     node.expression.type === 'HTMLExpression'
   ) {
-    context = {name: [], tag: [[], []], tag_type: 0, arguments: []}
+    context = {name: [], tag: [[], [], []], tag_type: 0, arguments: []}
     if (
       expr_to_tag(node.expression, context, true, false) &&
       context.body !== undefined
@@ -260,7 +272,7 @@ visitors.Expression = (node, st, c) => {
     node.type === 'MemberExpression' ||
     node.type === 'HTMLExpression'
   ) {
-    context = {name: [], tag: [[], []], tag_type: 0, arguments: []}
+    context = {name: [], tag: [[], [], []], tag_type: 0, arguments: []}
     if (
       expr_to_tag(node, context, true, false) &&
       context.body !== undefined