@quenk/wml 2.11.2 → 2.12.0

package/lib/parse/wml.y

@@ -100,6 +100,7 @@ Text ({DoubleStringCharacter}*)|({SingleStringCharacter}*)
 <CONTROL>'false'                                         return 'FALSE';
 <CONTROL>'where'                                         return 'WHERE';
 <CONTROL>'let'                                           return 'LET';
+<CONTROL>'to'                                            return 'TO';
 <CONTROL>{Constructor}                             return 'CONSTRUCTOR';
 <CONTROL>{Identifier}                              return 'IDENTIFIER';
 <CONTROL>'@'                                             return '@';
@@ -372,15 +373,18 @@ view_statement
           ;
 
 view_statement_context
-          : type 
+          : constructor_type 
             { $$ = $1; }
 
-          | unqualified_constructor FROM string_literal
-            {$$ = new yy.ast.ImportStatement(new yy.ast.CompositeMember([$1],@$),
-               $3, @$);
-            }
+          | context_from_statement
+            {$$ = $1; }
           ;
 
+context_from_statement
+            : constructor_type FROM string_literal
+              {$$ = new yy.ast.ContextFromStatement($1, $3, @$); }
+            ;
+
 view_directives
           : let_statement
             { $$ = [$1]; }
@@ -464,11 +468,11 @@ non_function_type
           ;
 
 constructor_type
-          : cons
+          : unqualified_constructor
             { $$ = new yy.ast.ConstructorType($1, [], @$);              }
 
-          | cons type_parameters
-            { $$ = new yy.ast.ConstructorType($1, $2, @$);               }
+          | unqualified_constructor type_parameters
+            { $$ = new yy.ast.ConstructorType($1, $2, @$);              }
           ;
 
 record_type
@@ -481,11 +485,11 @@ record_type
           ;
 
 list_type
-          : cons '[' ']'
+          : unqualified_constructor '[' ']'
             { $$ = new yy.ast.ListType(
                      new yy.ast.ConstructorType($1, []), @$);           }
 
-          | cons type_parameters '[' ']'
+          | unqualified_constructor type_parameters '[' ']'
             { $$ = new yy.ast.ListType(
                      new yy.ast.ConstructorType($1, $2), @$);           }
 
@@ -680,6 +684,9 @@ for_statement
 
           | for_of 
             {$$ = $1;}
+
+          | for_from
+            {$$ + $1;}
           ;
 
 for_in
@@ -702,20 +709,32 @@ for_of
             {$$ = new yy.ast.ForOfStatement($3, $5, $7, $11, @$);}
           ;
 
+for_from
+          : '{%' FOR untyped_parameter '=' expression TO expression '%}' 
+              children 
+            '{%' ENDFOR '%}'
+            {$$ = new yy.ast.ForFromStatement($3, $5, $7, $9, [], @$);}
+          ;
+
 for_parameters
-          : parameter 
+          : for_parameter
             {$$ = [$1];                                                 }
 
-          | untyped_parameter
-            { $$ = [$1];                                                }
-
           | for_parameters ',' parameter
             {$$ = $1.concat($3);                                        }
 
           | for_parameters ',' untyped_parameter
             {$$ = $1.concat($3);                                        }
           ;
-            
+
+for_parameter
+          : parameter 
+            {$$ = $1;          }
+
+          | untyped_parameter
+            { $$ = $1;         }
+          ;
+
 if_statement
           : '{%' IF expression '%}' children '{%' ENDIF '%}'
            {$$ = new yy.ast.IfStatement($3, $5, undefined, @$); }
@@ -818,8 +837,8 @@ simple_expression
              |member_expression 
              |literal 
              |context_property 
-             |cons 
-             |identifier 
+             |unqualified_constructor 
+             |unqualified_identifier 
              |context_variable)
             { $$ = $1; }
           ;
@@ -846,24 +865,24 @@ type_arg_list
           ;
 
 construct_expression
-          : cons '(' arguments ')'
+          : unqualified_constructor '(' arguments ')'
             { $$ = new yy.ast.ConstructExpression($1, $3, @$); }
 
-          | cons '(' ')'
+          | unqualified_constructor '(' ')'
             { $$ = new yy.ast.ConstructExpression($1, [], @$); }
           ;
 
 call_expression
-          : identifier type_arguments '(' arguments ')'
+          : unqualified_identifier type_arguments '(' arguments ')'
             {$$ = new yy.ast.CallExpression($1, $2, $4, @$);    }
 
-          | identifier type_arguments '(' ')'
+          | unqualified_identifier type_arguments '(' ')'
             {$$ = new yy.ast.CallExpression($1, $2, [], @$);    }
 
-          | identifier '(' arguments ')'
+          | unqualified_identifier '(' arguments ')'
             {$$ = new yy.ast.CallExpression($1, [], $3, @$);    }
 
-          | identifier '(' ')'
+          | unqualified_identifier '(' ')'
             {$$ = new yy.ast.CallExpression($1, [], [], @$);    }
 
           | context_property type_arguments '(' arguments ')'
@@ -910,43 +929,34 @@ call_expression
           ;
 
 member_expression
-
-          : qualified_identifier '.' unqualified_identifier
+          : member_expression_head '.' member_expression_tail
             {$$ = new yy.ast.MemberExpression($1, $3, @$); }
 
-          | qualified_constructor '.' unqualified_identifier
+          | member_expression '.' member_expression_tail
             {$$ = new yy.ast.MemberExpression($1, $3, @$); }
 
-          | context_variable '.' unqualified_identifier
-            {$$ = new yy.ast.MemberExpression($1, $3, @$); }
-
-          | context_property '.' unqualified_identifier
-            {$$ = new yy.ast.MemberExpression($1, $3, @$); }
-
-          | list '.' unqualified_identifier   
-            {$$ = new yy.ast.MemberExpression($1, $3, @$); }
-
-          | record '.' unqualified_identifier   
-            {$$ = new yy.ast.MemberExpression($1, $3, @$); }
-
-          | string_literal '.' unqualified_identifier
-            {$$ = new yy.ast.MemberExpression($1, $3, @$); }
-
-          | call_expression '.' unqualified_identifier
+          | member_expression '[' string_literal ']'
             {$$ = new yy.ast.MemberExpression($1, $3, @$); }
+          ;
 
-          |'(' expression ')' '.' unqualified_identifier
-            {$$ = new yy.ast.MemberExpression($2, $5, @$); }
-
-          | member_expression '.' unqualified_identifier
-            {$$ = new yy.ast.MemberExpression($1, $3, @$); }
+member_expression_head:
+           ( unqualified_identifier 
+           | unqualified_constructor
+           | context_variable 
+           | context_property 
+           | list 
+           | record 
+           | string_literal 
+           | call_expression 
+           |'(' expression ')' 
+           )
+           ;
 
-          | member_expression '[' string_literal ']'
-            {$$ = new yy.ast.MemberExpression($1, $3, @$); }
+member_expression_tail
+          : (unqualified_identifier| unqualified_constructor|string_literal)
           ;
 
 function_expression
-
           : parameters '->'  expression
             {$$ = new yy.ast.FunctionExpression($1, $3, @$); }
 

package/lib/tsconfig.json

@@ -3,7 +3,7 @@
         "baseUrl": "src",
         "lib": ["es5", "ES2015", "DOM"],
         "module": "commonjs",
-        "target": "es5",
+        "target": "es6",
         "rootDir": ".",
         "moduleResolution": "node",
         "allowUnreachableCode": true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenk/wml",
-  "version": "2.11.2",
+  "version": "2.12.0",
   "description": "(WML) is a DSL for describing user interfaces in web applications.",
   "main": "lib/index.js",
   "scripts": {
@@ -23,7 +23,6 @@
     "jison-gho": "^0.6.1-216",
     "mocha": "^9.0.0",
     "ts-node": "^10.5.0",
-    "typedoc": "^0.20.36",
     "typescript": "^4.3.2"
   },
   "dependencies": {