@quenk/wml 2.10.3 → 2.11.0

package/lib/parse/index.js

@@ -10,7 +10,7 @@ var error_1 = require("@quenk/noni/lib/control/error");
  */
 var parse = function (str, ast) {
     if (ast === void 0) { ast = nodes; }
-    return error_1.attempt(function () {
+    return (0, error_1.attempt)(function () {
         parser.parser.yy = { ast: ast };
         return parser.parser.parse(str);
     });

package/lib/parse/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAAA,uCAAuC;;;AAEvC,oCAAsC;AACtC,6BAA+B;AAE/B,uDAAgE;AAEhE;;GAEG;AACI,IAAM,KAAK,GAAG,UAAC,GAAW,EAAE,GAAgB;IAAhB,oBAAA,EAAA,WAAgB;IAC/C,OAAA,eAAO,CAAC;QAEJ,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,KAAA,EAAE,CAAC;QAE3B,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEpC,CAAC,CAAC;AANF,CAME,CAAC;AAPM,QAAA,KAAK,SAOX"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";AAAA,uCAAuC;;;AAEvC,oCAAsC;AACtC,6BAA+B;AAE/B,uDAAgE;AAEhE;;GAEG;AACI,IAAM,KAAK,GAAG,UAAC,GAAW,EAAE,GAAgB;IAAhB,oBAAA,EAAA,WAAgB;IAC/C,OAAA,IAAA,eAAO,EAAC;QAEJ,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,KAAA,EAAE,CAAC;QAE3B,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEpC,CAAC,CAAC;AANF,CAME,CAAC;AAPM,QAAA,KAAK,SAOX"}

package/lib/parse/test.js

@@ -144,6 +144,9 @@ exports.tests = {
     'should parse context variables': {
         input: '<Input name={{@level.name}}/>'
     },
+    '[view] should allow inline context import': {
+        input: '{% view MyView (Context from "./") %}} <div>{{@text}}</div>'
+    },
     'should allow construct expression': {
         input: '<TextView android:thing={value=1}>{{Person(@value)}}</TextView>'
     },
@@ -221,8 +224,6 @@ exports.tests = {
     '[context] should mark nested properties as optional if all are': "{% context Paper where object.\"type\"?: String %}",
     'should parse type statements': "{% type Type = String | Number | Boolean | Type[] | Type -> Type %}",
     'should parse tupe types': "{% type Tuple = [Number, String, Number] %}",
-    'should parse primitives used as type': '{% type Prims = 1|2|"three"|true|false|"1,2,three,true,false" %}',
-    'should parse this type': '{% type SortDir = 1 | -1 %}',
     'should parse type assertion': '<Panel onClick={{ \e -> [*User]foo(e) }} />',
     'should parse partial application in expression': '<Link ww:text={{truncate(50)(@text)}} />',
     'should transform special primitives': "<div>\n            {% for kind in [\n                            String,\n                            Boolean,\n                            Number,\n                            Object,\n                            Undefined,\n                            Null,\n                            Void,\n                            Never,\n                            Any] %}\n              {{ kind | text }}\n            {% endfor %}\n        </div>",
@@ -234,6 +235,7 @@ exports.tests = {
     '[comment] should parse wml comments': "{# This is a wml comment #}",
     '[comment] should parse wml comments in statements': "{% view Name {# This is a comment! #} (Object) %} <div/> %}",
     '[fun] should parse multi dimensional array parameters': "\n    {% fun test (value:List[][]) %}<p/>{% endfun %}",
-    'should allow index access on context properties': "{% view Test (Object) %}\n       <div>\n        {% if @[\"type\"]?? %}\n            <div/>\n        {% endif %}\n      </div>"
+    'should allow index access on context properties': "{% view Test (Object) %}\n       <div>\n        {% if @[\"type\"]?? %}\n            <div/>\n        {% endif %}\n      </div>",
+    'should allow paths to use brackets': "\n   {% view Test (Object) %} \n    <div>\n     {% if @values.controls[\"@type\"] %} value {% endif %}\n     {% if @values.controls[\"@type\"].value %} value {% endif %}\n    </div>"
 };
 //# sourceMappingURL=test.js.map

package/lib/parse/test.js.map

@@ -1 +1 @@
-{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["test.ts"],"names":[],"mappings":"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"}

package/lib/parse/test.ts

@@ -222,6 +222,11 @@ export const tests: { [key: string]: any } = {
 
         input: '<Input name={{@level.name}}/>'
 
+    },
+    '[view] should allow inline context import': {
+
+        input: '{% view MyView (Context from "./") %}} <div>{{@text}}</div>'
+
     },
     'should allow construct expression': {
 
@@ -556,12 +561,6 @@ export const tests: { [key: string]: any } = {
 
     'should parse tupe types': `{% type Tuple = [Number, String, Number] %}`,
 
-    'should parse primitives used as type':
-        '{% type Prims = 1|2|"three"|true|false|"1,2,three,true,false" %}',
-
-    'should parse this type':
-        '{% type SortDir = 1 | -1 %}',
-
     'should parse type assertion':
         '<Panel onClick={{ \e -> [*User]foo(e) }} />',
 
@@ -622,6 +621,13 @@ export const tests: { [key: string]: any } = {
         {% if @["type"]?? %}
             <div/>
         {% endif %}
-      </div>`
+      </div>`,
+
+    'should allow paths to use brackets': `
+   {% view Test (Object) %} 
+    <div>
+     {% if @values.controls["@type"] %} value {% endif %}
+     {% if @values.controls["@type"].value %} value {% endif %}
+    </div>`
 
 }

package/lib/parse/wml.y

@@ -336,22 +336,26 @@ member_path
 
 view_statement
 
-           : '{%' VIEW unqualified_constructor '(' type ')' '%}' element
+           : '{%' VIEW unqualified_constructor '(' view_statement_context ')'
+             '%}' element
              { $$ = new yy.ast.ViewStatement($3, [], $5, [], $8, @$);          }
 
-           | '{%' VIEW unqualified_constructor '(' type ')' '%}'
+           | '{%' VIEW unqualified_constructor '(' view_statement_context ')' '%}'
              view_directives element
             { $$ = new yy.ast.ViewStatement($3, [], $5, $8, $9, @$);           }
 
-           | '{%' VIEW unqualified_constructor type_parameters '(' type ')' '%}' 
+           | '{%' VIEW unqualified_constructor type_parameters 
+             '(' view_statement_context ')' '%}' 
               element
              { $$ = new yy.ast.ViewStatement($3, $4, $6, [], $9, @$);          }
 
-           | '{%' VIEW unqualified_constructor type_parameters '(' type ')' '%}'
+           | '{%' VIEW unqualified_constructor type_parameters 
+             '(' view_statement_context ')' '%}'
              view_directives element
              { $$ = new yy.ast.ViewStatement($3, $4, $6, $9, $10, @$);         }
 
-           | '{%' VIEW unqualified_constructor WHERE context_members '%}' element
+           | '{%' VIEW unqualified_constructor WHERE context_members '%}' 
+             element
              { $$ = new yy.ast.ViewStatement($3, [], $5, [], $7, @$);          }
 
            | '{%' VIEW unqualified_constructor WHERE context_members '%}' 
@@ -367,6 +371,16 @@ view_statement
              { $$ = new yy.ast.ViewStatement($3, $4, $6, $8, $9, @$);          }
           ;
 
+view_statement_context
+          : type 
+            { $$ = $1; }
+
+          | unqualified_constructor FROM string_literal
+            {$$ = new yy.ast.ImportStatement(new yy.ast.CompositeMember([$1],@$),
+               $3, @$);
+            }
+          ;
+
 view_directives
           : let_statement
             { $$ = [$1]; }
@@ -439,15 +453,6 @@ non_function_type
           : constructor_type
             { $$ = $1;                                                  }
 
-          | string_literal
-            { $$ = $1;                                                  }
-
-          | number_literal
-            { $$ = $1;                                                  }
-
-          | boolean_literal
-            { $$ = $1;                                                  }
-
           | record_type
             { $$ = $1;                                                  }
          
@@ -480,19 +485,10 @@ list_type
             { $$ = new yy.ast.ListType(
                      new yy.ast.ConstructorType($1, []), @$);           }
 
-           | cons type_parameters '[' ']'
+          | cons type_parameters '[' ']'
             { $$ = new yy.ast.ListType(
                      new yy.ast.ConstructorType($1, $2), @$);           }
 
-          | string_literal '[' ']'
-            { $$ = new yy.ast.ListType($1, @$);                         }
-
-          | number_literal '[' ']'
-            { $$ = new yy.ast.ListType($1, @$);                         }
-
-          | boolean_literal '[' ']'
-            { $$ = new yy.ast.ListType($1, @$);                         }
-
           | record_type '[' ']'
             { $$ = new yy.ast.ListType($1, @$);                         }
          
@@ -508,7 +504,6 @@ list_type
           ; 
 
 tuple_type
-
           : '[' ']'
             { $$ = new yy.ast.TupleType([], @$);                        }
 
@@ -747,19 +742,10 @@ characters
           ;
 
 arguments
-          : '(' ')'
-            {$$ = []; }
-
-          | '(' argument_list ')'
-            {$$ = $2; }
-
-          ;
-
-argument_list
           : expression
             {$$ = [$1]; }
 
-          | argument_list ',' expression
+          | arguments ',' expression
             {$$ = $1.concat($3); }
           ;
 
@@ -817,21 +803,18 @@ unary_expression
 
           | '(' expression ')' '??'
             {$$ = new yy.ast.UnaryExpression($4, $2, @$); }
-          
           ;
 
 type_assertion
-
           : '[' '*' type ']' expression
             {$$ = new yy.ast.TypeAssertion($3, $5, @$);  }
           ;
 
 simple_expression
           : (
-             view_construction
-             |fun_application
-             |construct_expression 
+             construct_expression 
              |call_expression 
+             |view_construction
              |member_expression 
              |literal 
              |context_property 
@@ -842,31 +825,11 @@ simple_expression
           ;
 
 view_construction
-          : '<' cons '(' expression ')' '>'
-            { $$ = new yy.ast.ViewConstruction($2, $4, @$); }
-          ;
-          
-fun_application
-          : '<' fun_target type_arguments arguments '>'
-            { $$ = new yy.ast.FunApplication($2, $3, $4, @$); }
-
-          | '<' fun_target arguments '>'
-            { $$ = new yy.ast.FunApplication($2, [], $3, @$); }
-
-          | '<' fun_target '>'
-            { $$ = new yy.ast.FunApplication($2, [], [], @$); }
-
-          ;
+          : '<' simple_expression '>'
+            { $$ = new yy.ast.ViewConstruction($2, @$); }
 
-fun_target
-          : identifier 
-            { $$ = $1; }
-
-          | context_property 
-            { $$ = $1; }
-
-          | '(' expression ')'
-            { $$ = $2; }
+          | '<' '(' expression ')' '>'
+            { $$ = new yy.ast.ViewConstruction($3, @$); }
           ;
 
 type_arguments
@@ -883,37 +846,67 @@ type_arg_list
           ;
 
 construct_expression
-          : cons arguments
-            { $$ = new yy.ast.ConstructExpression($1, $2, @$); }
+          : cons '(' arguments ')'
+            { $$ = new yy.ast.ConstructExpression($1, $3, @$); }
+
+          | cons '(' ')'
+            { $$ = new yy.ast.ConstructExpression($1, [], @$); }
           ;
 
 call_expression
-          : identifier type_arguments arguments
-            {$$ = new yy.ast.CallExpression($1, $2, $3, @$);    }
+          : identifier type_arguments '(' arguments ')'
+            {$$ = new yy.ast.CallExpression($1, $2, $4, @$);    }
+
+          | identifier type_arguments '(' ')'
+            {$$ = new yy.ast.CallExpression($1, $2, [], @$);    }
+
+          | identifier '(' arguments ')'
+            {$$ = new yy.ast.CallExpression($1, [], $3, @$);    }
+
+          | identifier '(' ')'
+            {$$ = new yy.ast.CallExpression($1, [], [], @$);    }
+
+          | context_property type_arguments '(' arguments ')'
+            {$$ = new yy.ast.CallExpression($1, $2, $4, @$);    }
+
+          | context_property type_arguments '(' ')'
+            {$$ = new yy.ast.CallExpression($1, $2, [], @$);    }
 
-          | identifier arguments
-            {$$ = new yy.ast.CallExpression($1, [], $2, @$);    }
+          | context_property '(' arguments ')'
+            {$$ = new yy.ast.CallExpression($1, [], $3, @$);    }
 
-          | context_property type_arguments arguments
-            {$$ = new yy.ast.CallExpression($1, $2, $3, @$);    }
+          | context_property '(' ')'
+            {$$ = new yy.ast.CallExpression($1, [], [], @$);    }
 
-          | context_property arguments
-            {$$ = new yy.ast.CallExpression($1, [], $2, @$);    }
+          | member_expression type_arguments '(' arguments ')'
+            {$$ = new yy.ast.CallExpression($1, $2, $4, @$);    }
 
-          | member_expression type_arguments arguments
-            {$$ = new yy.ast.CallExpression($1, $2, $3, @$);    }
+          | member_expression type_arguments '(' ')'
+            {$$ = new yy.ast.CallExpression($1, $2, [], @$);    }
 
-          | member_expression arguments
-            {$$ = new yy.ast.CallExpression($1, [], $2, @$);    }
+          | member_expression '(' arguments ')'
+            {$$ = new yy.ast.CallExpression($1, [], $3, @$);    }
 
-          | '(' expression ')' type_arguments arguments
-            {$$ = new yy.ast.CallExpression($2, $4, $5, @$);    }
+          | member_expression '(' ')'
+            {$$ = new yy.ast.CallExpression($1, [], [], @$);    }
 
-          | '(' expression ')' arguments
-            {$$ = new yy.ast.CallExpression($2, [], $4, @$);    }
+          | '(' expression ')' type_arguments '(' arguments ')'
+            {$$ = new yy.ast.CallExpression($2, $4, $6, @$);    }
 
-          | call_expression arguments
-            {$$ = new yy.ast.CallExpression($1, [], $2, @$);    }
+          | '(' expression ')' type_arguments '(' ')'
+            {$$ = new yy.ast.CallExpression($2, $4, [], @$);    }
+
+          | '(' expression ')' '(' arguments ')'
+            {$$ = new yy.ast.CallExpression($2, [], $5, @$);    }
+
+          | '(' expression ')' '(' ')'
+            {$$ = new yy.ast.CallExpression($2, [], [], @$);    }
+
+          | call_expression '(' arguments ')'
+            {$$ = new yy.ast.CallExpression($1, [], $3, @$);    }
+
+          | call_expression '(' ')'
+            {$$ = new yy.ast.CallExpression($1, [], [], @$);    }
           ;
 
 member_expression
@@ -947,6 +940,9 @@ member_expression
 
           | member_expression '.' unqualified_identifier
             {$$ = new yy.ast.MemberExpression($1, $3, @$); }
+
+          | member_expression '[' string_literal ']'
+            {$$ = new yy.ast.MemberExpression($1, $3, @$); }
           ;
 
 function_expression
@@ -990,7 +986,7 @@ list
           : '[' ']'
             {$$ = new yy.ast.List([], @$); }
 
-          | '[' argument_list ']'
+          | '[' arguments ']'
             {$$ = new yy.ast.List($2, @$); }
           ;
 

package/package.json

@@ -1,8 +1,11 @@
 {
   "name": "@quenk/wml",
-  "version": "2.10.3",
+  "version": "2.11.0",
   "description": "(WML) is a DSL for describing user interfaces in web applications.",
   "main": "lib/index.js",
+  "scripts": {
+    "test": "./node_modules/.bin/mocha $(find -name *_test.ts)"
+  },
   "types": "lib/index.d.ts",
   "files": [
     "lib"
@@ -19,7 +22,7 @@
     "@types/node": "^15.12.2",
     "jison-gho": "^0.6.1-216",
     "mocha": "^9.0.0",
-    "ts-node": "^10.0.0",
+    "ts-node": "^10.5.0",
     "typedoc": "^0.20.36",
     "typescript": "^4.3.2"
   },