Merge pull request #62 from dukefirehawk/fix-bug/jael

Fixed JAEL

packages/jael/angel_jael/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 6.0.1
+
+* Updated `jael3`
+* Updated `jael_preprocessor`
+
 ## 6.0.0
 
 * Updated to SDK 2.16.x

packages/jael/angel_jael/pubspec.yaml

@@ -1,5 +1,5 @@
 name: angel3_jael
-version: 6.0.0
+version: 6.0.1
 description: Angel support for the Jael templating engine, similar to Blade or Liquid.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/jael/angel_jael

packages/jael/jael/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 6.0.1
+
+* Fixed analyze errors
+
 ## 6.0.0
 
 * Updated to SDK 2.16.x

packages/jael/jael/lib/src/ast/map.dart

@@ -13,7 +13,8 @@ class MapLiteral extends Literal {
   @override
   Map compute(scope) {
     return pairs.fold<Map>({}, (out, p) {
-      var key, value;
+      dynamic key;
+      dynamic value;
 
       if (p.colon == null) {
         if (p.key is! Identifier) {

packages/jael/jael/lib/src/ast/string.dart

@@ -2,8 +2,6 @@ import 'package:charcode/charcode.dart';
 import 'package:source_span/source_span.dart';
 import 'package:belatuk_symbol_table/belatuk_symbol_table.dart';
 import '../ast/ast.dart';
-import 'expression.dart';
-import 'token.dart';
 
 class StringLiteral extends Literal {
   final Token string;

packages/jael/jael/lib/src/ast/token.dart

@@ -49,7 +49,7 @@ enum TokenType {
   plus,
   minus,
   elvis,
-  elvis_dot,
+  elvisDot,
   lte,
   gte,
   equ,

packages/jael/jael/lib/src/text/parselet/infix.dart

@@ -2,7 +2,7 @@ part of jael.src.text.parselet;
 
 const Map<TokenType, InfixParselet> infixParselets = {
   TokenType.lParen: CallParselet(),
-  TokenType.elvis_dot: MemberParselet(),
+  TokenType.elvisDot: MemberParselet(),
   TokenType.dot: MemberParselet(),
   TokenType.lBracket: IndexerParselet(),
   TokenType.asterisk: BinaryParselet(14),

packages/jael/jael/lib/src/text/scanner.dart

@@ -54,7 +54,7 @@ final Map<Pattern, TokenType> _expressionPatterns = {
   ',': TokenType.comma,
   '.': TokenType.dot,
   '??': TokenType.elvis,
-  '?.': TokenType.elvis_dot,
+  '?.': TokenType.elvisDot,
   //'=': TokenType.equals,
   '!': TokenType.exclamation,
   '-': TokenType.minus,

packages/jael/jael/pubspec.yaml

@@ -1,5 +1,5 @@
 name: jael3
-version: 6.0.0
+version: 6.0.1
 description:  A simple server-side HTML templating engine for Dart. Comparable to Blade or Liquid.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/jael/jael

packages/jael/jael_preprocessor/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 6.0.1
+
+* Fixed `jael3` version
+
 ## 6.0.0
 
 * Updated to SDK 2.16.x

packages/jael/jael_preprocessor/pubspec.yaml

@@ -1,5 +1,5 @@
 name: jael3_preprocessor
-version: 6.0.0
+version: 6.0.1
 description: A pre-processor for resolving blocks and includes within Jael templates.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/jael/jael_preprocessor
@@ -7,7 +7,7 @@ environment:
   sdk: '>=2.16.0 <3.0.0'
 dependencies:
   file: ^6.1.0
-  jael3: ^5.0.0
+  jael3: ^6.0.0
   belatuk_symbol_table: ^3.0.0
   collection: ^1.15.0
 dev_dependencies: