0.6.1-dev.1

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 0.6.1-dev.0 ([diff](https://github.com/ykmnkmi/jinja.dart/compare/88996f8..main))
+## 0.6.1-dev.1 ([diff](https://github.com/ykmnkmi/jinja.dart/compare/88996f8..main))
 - added:
   - `UndefinedError` exception
   - `UndefinedFactory` typedef

lib/src/context.dart

@@ -52,15 +52,14 @@ base class Context {
 
   Object? resolve(String key) {
     if (context.containsKey(key)) {
-      print('key: $key');
       return context[key];
     }
 
     if (parent.containsKey(key)) {
       return parent[key];
     }
 
-    return environment.undefined(key);
+    return environment.undefined?.call(key);
   }
 
   Object? attribute(String key, Object? value) {

lib/src/defaults.dart

@@ -1,5 +1,4 @@
 import 'package:jinja/src/context.dart';
-import 'package:jinja/src/exceptions.dart';
 import 'package:jinja/src/namespace.dart';
 import 'package:jinja/src/utils.dart';
 
@@ -30,7 +29,3 @@ Object? getItem(Object? item, dynamic object) {
     return null;
   }
 }
-
-Object? undefined(String name) {
-  throw UndefinedError('$name is not defined.');
-}

lib/src/environment.dart

@@ -134,7 +134,7 @@ base class Environment {
     Random? random,
     AttributeGetter? getAttribute,
     this.getItem = defaults.getItem,
-    this.undefined = defaults.undefined,
+    this.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 = defaults.undefined,
+    UndefinedFactory? undefined,
   }) {
     if (environment == null) {
       return Environment(

pubspec.yaml

@@ -1,5 +1,5 @@
 name: jinja
-version: 0.6.1-dev.0
+version: 0.6.1-dev.1
 description: >-
   Jinja2 template engine for Dart.
   Variables, expressions, control structures and template inheritance.

test/check.dart

@@ -15,38 +15,8 @@ const JsonEncoder jsonEncoder = JsonEncoder.withIndent('  ');
 const String source = '''
 {{ user.name }}''';
 
-Object? undefined(String key) {
-  return Undefined(key);
-}
-
-final class Undefined {
-  const Undefined(this.name);
-
-  final String name;
-
-  Object? operator [](Object? key) {
-    if (key is int) {
-      throw UndefinedError('$name has no element $key');
-    }
-
-    throw UndefinedError('$name has no property $key');
-  }
-
-  @override
-  dynamic noSuchMethod(Invocation invocation) {
-    var symbol = '${invocation.memberName}'; // Symbol('name')
-    var memberName = symbol.substring(8, symbol.length - 2);
-    throw UndefinedError('$name has no property $memberName');
-  }
-
-  @override
-  String toString() {
-    return 'Undefined($name)';
-  }
-}
-
 void main() {
-  var environment = Environment(undefined: undefined);
+  var environment = Environment();
 
   var tokens = environment.lex(source);
   // print('tokens:');

test/file_system_loader_test.dart

@@ -2,15 +2,13 @@
 library;
 
 import 'dart:convert';
-import 'dart:io';
 
 import 'package:jinja/jinja.dart';
 import 'package:jinja/loaders.dart';
 import 'package:test/test.dart';
 
 void main() {
-  var pathUri = Directory.current.uri.resolve('test/res/templates');
-  var paths = <String>[pathUri.path];
+  var paths = <String>['test/res/templates'];
 
   group('FileSystemLoader', () {
     test('paths', () {