0.6.1-dev.2

ykmnkmi · May 12, 2024 · 54a9964 · 54a9964
1 parent 6f9028e
commit 54a9964
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.6.1-dev.1 ([diff](https://github.com/ykmnkmi/jinja.dart/compare/88996f8..main))
+## 0.6.1-dev.2 ([diff](https://github.com/ykmnkmi/jinja.dart/compare/88996f8..main))
 - added:
   - `UndefinedError` exception
   - `UndefinedFactory` typedef

diff --git a/README.md b/README.md
@@ -186,8 +186,8 @@ Post issues and feature requests on the GitHub [issue tracker][issues].
 
 [pub_icon]: https://img.shields.io/pub/v/jinja.svg
 [pub]: https://pub.dev/packages/jinja
-[test_ci_icon]: https://github.com/ykmnkmi/jinja.dart/actions/workflows/test-vm.yaml/badge.svg
-[test_ci]: https://github.com/ykmnkmi/jinja.dart/actions/workflows/test-vm.yaml
+[test_ci_icon]: https://github.com/ykmnkmi/jinja.dart/actions/workflows/test_vm.yaml/badge.svg
+[test_ci]: https://github.com/ykmnkmi/jinja.dart/actions/workflows/test_vm.yaml
 [codecov_icon]: https://codecov.io/gh/ykmnkmi/jinja.dart/branch/main/graph/badge.svg?token=PRP3DHMO48
 [codecov]: https://codecov.io/gh/ykmnkmi/jinja.dart
 [jinja]: https://www.palletsprojects.com/p/jinja

diff --git a/lib/src/context.dart b/lib/src/context.dart
@@ -50,24 +50,24 @@ base class Context {
     return parent.containsKey(key);
   }
 
-  Object? resolve(String key) {
-    if (context.containsKey(key)) {
-      return context[key];
+  Object? resolve(String name) {
+    if (context.containsKey(name)) {
+      return context[name];
     }
 
-    if (parent.containsKey(key)) {
-      return parent[key];
+    if (parent.containsKey(name)) {
+      return parent[name];
     }
 
-    return environment.undefined?.call(key);
+    return environment.undefined(name);
   }
 
-  Object? attribute(String key, Object? value) {
-    return environment.getAttribute(key, value);
+  Object? attribute(String name, Object? value) {
+    return environment.getAttribute(name, value);
   }
 
-  Object? item(Object? key, Object? value) {
-    return environment.getItem(key, value);
+  Object? item(Object? name, Object? value) {
+    return environment.getItem(name, value);
   }
 
   Object? filter(

diff --git a/lib/src/defaults.dart b/lib/src/defaults.dart
@@ -29,3 +29,7 @@ Object? getItem(Object? item, dynamic object) {
     return null;
   }
 }
+
+Object? undefined(String name) {
+  return null;
+}
diff --git a/lib/src/environment.dart b/lib/src/environment.dart
@@ -134,7 +134,7 @@ base class Environment {
     Random? random,
     AttributeGetter? getAttribute,
     this.getItem = defaults.getItem,
-    this.undefined,
+    this.undefined = defaults.undefined,
   })  : finalize = wrapFinalizer(finalize),
         globals = HashMap<String, Object?>.of(defaults.globals),
         filters = HashMap<String, Function>.of(defaults.filters),
@@ -268,7 +268,7 @@ base class Environment {
   /// Get an undefined object or throw an error if the variable is not found.
   ///
   /// Default implementation throws [UndefinedError].
-  final UndefinedFactory? undefined;
+  final UndefinedFactory undefined;
 
   @override
   int get hashCode {
@@ -541,7 +541,7 @@ base class Template {
     Random? random,
     AttributeGetter? getAttribute,
     ItemGetter getItem = defaults.getItem,
-    UndefinedFactory? undefined,
+    UndefinedFactory undefined = defaults.undefined,
   }) {
     if (environment == null) {
       return Environment(

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: jinja
-version: 0.6.1-dev.1
+version: 0.6.1-dev.2
 description: >-
   Jinja2 template engine for Dart.
   Variables, expressions, control structures and template inheritance.