refactor: finalize if and else tags

edge-js · Mar 26, 2020 · 6879174 · 6879174
1 parent ad4ee7e
commit 6879174
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 26 deletions.
diff --git a/src/Tags/ElseIf.ts b/src/Tags/ElseIf.ts
@@ -9,18 +9,12 @@
 
 import { expressions } from 'edge-parser'
 import { TagContract } from '../Contracts'
-import { isNotSubsetOf, unallowedExpression } from '../utils'
+import { isNotSubsetOf, unallowedExpression, parseJsArg } from '../utils'
 
 /**
- * Else if tag is used to define conditional blocks.
- *
- * ```edge
- * @if(username)
- *   // If
- * @elseif(user.username)
- *   // Else if
- * @endif
- * ```
+ * Else if tag is used to define conditional blocks. We keep `@elseif` tag
+ * is a inline tag, so that everything between the `if` and the `elseif`
+ * comes `if` children.
  */
 export const elseIfTag: TagContract = {
   block: false,
@@ -31,11 +25,11 @@ export const elseIfTag: TagContract = {
    * Compiles the else if block node to a Javascript if statement
    */
   compile (parser, buffer, token) {
-    const parsed = parser.utils.transformAst(
-      parser.utils.generateAST(token.properties.jsArg, token.loc, token.filename),
-      token.filename,
-    )
+    const parsed = parseJsArg(parser, token)
 
+    /**
+     * Disallow sequence expressions
+     */
     isNotSubsetOf(
       parsed,
       [expressions.SequenceExpression],
@@ -49,7 +43,7 @@ export const elseIfTag: TagContract = {
     )
 
     /**
-     * Start else block
+     * Start else if block
      */
     buffer.writeStatement(`} else if (${parser.utils.stringify(parsed)}) {`, token.filename, token.loc.start.line)
   },

diff --git a/src/Tags/If.ts b/src/Tags/If.ts
@@ -10,15 +10,10 @@
 import { expressions } from 'edge-parser'
 
 import { TagContract } from '../Contracts'
-import { unallowedExpression, isNotSubsetOf } from '../utils'
+import { unallowedExpression, isNotSubsetOf, parseJsArg } from '../utils'
 
 /**
  * If tag is used to define conditional blocks.
- *
- * ```edge
- * @if(username)
- * @endif
- * ```
  */
 export const ifTag: TagContract = {
   block: true,
@@ -29,11 +24,11 @@ export const ifTag: TagContract = {
    * Compiles the if block node to a Javascript if statement
    */
   compile (parser, buffer, token) {
-    const parsed = parser.utils.transformAst(
-      parser.utils.generateAST(token.properties.jsArg, token.loc, token.filename),
-      token.filename,
-    )
+    const parsed = parseJsArg(parser, token)
 
+    /**
+     * Disallow sequence expressions
+     */
     isNotSubsetOf(
       parsed,
       [expressions.SequenceExpression],
@@ -52,7 +47,7 @@ export const ifTag: TagContract = {
     buffer.writeStatement(`if (${parser.utils.stringify(parsed)}) {`, token.filename, token.loc.start.line)
 
     /**
-     * Process of all kids recursively
+     * Process of all children recursively
      */
     token.children.forEach((child) => parser.processToken(child, buffer))