@quenk/wml 2.11.4 → 2.13.0

package/lib/parse/wml.y

@@ -459,7 +459,7 @@ non_function_type
 
           | record_type
             { $$ = $1;                                                  }
-         
+
           | list_type
             { $$ = $1;                                                  }
 
@@ -468,10 +468,16 @@ non_function_type
           ;
 
 constructor_type
-          : cons
+          : unqualified_constructor
+            { $$ = new yy.ast.ConstructorType($1, [], @$);              }
+
+          | unqualified_constructor type_parameters
+            { $$ = new yy.ast.ConstructorType($1, $2, @$);              }
+
+          | qualified_constructor
             { $$ = new yy.ast.ConstructorType($1, [], @$);              }
 
-          | cons type_parameters
+          | qualified_constructor type_parameters
             { $$ = new yy.ast.ConstructorType($1, $2, @$);              }
           ;
 
@@ -485,11 +491,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), @$);           }
 
@@ -613,17 +619,21 @@ node
           ;
 
 widget
-          : '<' cons attributes '>' children? '</' cons '>'
-             {$$ = new yy.ast.Widget($2, $3, $5||[], $7, @$);}
+          : '<' widget_constructor attributes '>' children? '</' cons '>'
+             {$$ = new yy.ast.Widget($2[0], $2[1], $3, $5||[], $7, @$);}
 
-          | '<' cons '>' children? '</' cons '>'
-             {$$ = new yy.ast.Widget($2, [], $4||[], $6, @$);}
+          | '<' widget_constructor '>' children? '</' cons '>'
+             {$$ = new yy.ast.Widget($2[0], $2[1], [], $4||[], $6, @$);}
 
-          | '<' cons attributes '/>'
-            { $$ = new yy.ast.Widget($2, $3, [], $2, @$); }
+          | '<' widget_constructor attributes '/>'
+            { $$ = new yy.ast.Widget($2[0], $2[1], $3, [], $2, @$); }
+
+          | '<' widget_constructor '/>'
+            { $$ = new yy.ast.Widget($2[0], $2[1], [], [], $2, @$); }
+          ;
 
-          | '<' cons '/>'
-            { $$ = new yy.ast.Widget($2, [], [], $2, @$); }
+widget_constructor
+          : cons type_arguments? {$$ = [$1, $2 || []]; }
           ;
 
 attributes
@@ -778,9 +788,6 @@ expression
           | unary_expression
             { $$ = $1; }
 
-          | type_assertion
-            { $$ = $1; }
-         
           | simple_expression 
             { $$ = $1; }
 
@@ -824,11 +831,6 @@ unary_expression
             {$$ = new yy.ast.UnaryExpression($4, $2, @$); }
           ;
 
-type_assertion
-          : '[' '*' type ']' expression
-            {$$ = new yy.ast.TypeAssertion($3, $5, @$);  }
-          ;
-
 simple_expression
           : (
              construct_expression 
@@ -837,8 +839,8 @@ simple_expression
              |member_expression 
              |literal 
              |context_property 
-             |cons 
-             |identifier 
+             |unqualified_constructor 
+             |unqualified_identifier 
              |context_variable)
             { $$ = $1; }
           ;
@@ -865,24 +867,30 @@ type_arg_list
           ;
 
 construct_expression
-          : cons '(' arguments ')'
-            { $$ = new yy.ast.ConstructExpression($1, $3, @$); }
+          : unqualified_constructor type_arguments '(' arguments ')'
+            { $$ = new yy.ast.ConstructExpression($1, $2, $4, @$); }
 
-          | cons '(' ')'
-            { $$ = new yy.ast.ConstructExpression($1, [], @$); }
+          | unqualified_constructor '(' arguments ')'
+            { $$ = new yy.ast.ConstructExpression($1, [], $3, @$); }
+
+          | unqualified_constructor type_arguments '(' ')'
+            { $$ = new yy.ast.ConstructExpression($1, $2, [], @$); }
+
+          | 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 ')'
@@ -929,43 +937,34 @@ call_expression
           ;
 
 member_expression
-
-          : qualified_identifier '.' unqualified_identifier
-            {$$ = new yy.ast.MemberExpression($1, $3, @$); }
-
-          | qualified_constructor '.' unqualified_identifier
-            {$$ = 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   
+          : member_expression_head '.' member_expression_tail
             {$$ = new yy.ast.MemberExpression($1, $3, @$); }
 
-          | string_literal '.' unqualified_identifier
+          | member_expression '.' member_expression_tail
             {$$ = 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, @$); }
 
@@ -1079,7 +1078,7 @@ unqualified_identifier
          ;
 
 binary_operator
-          : ('>'|'>='|'<'|'<='|'=='|'!='|'+'|'/'|'-'|'='|'&&'|'||'|'^'|INSTANCEOF)
+          : ('>'|'>='|'<'|'<='|'=='|'!='|'+'|'/'|'-'|'='|'&&'|'||'|'^'|INSTANCEOF|AS)
             { $$ = $1; }
           ;
 

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.4",
+  "version": "2.13.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": {