Handle edge cases

Author: amake

lib/src/query/grammar.dart

@@ -55,6 +55,8 @@ class OrgQueryGrammarDefinition extends GrammarDefinition {
       .plusLazy(ref0(op))
       .flatten(message: 'Property name expected');
 
+  // TODO(aaron): Support the optional "*" suffix that only matches when the
+  // tested property is present
   Parser op() =>
       string('<=') |
       string('=>') |

lib/src/query/model.dart

@@ -68,7 +68,9 @@ class OrgQueryPropertyMatcher extends OrgQueryMatcher {
         if (value is String) {
           return evaluateString(actual, operator, value);
         } else if (actual != null && value is num) {
-          return evaluateNumber(num.parse(actual), operator, value);
+          // Real Org Mode calls `string-to-number` on the actual value, which
+          // returns 0 on failure
+          return evaluateNumber(num.tryParse(actual) ?? 0, operator, value);
         }
     }
     return false;

lib/src/todo/model.dart

@@ -42,7 +42,7 @@ class OrgTodoStates {
   bool contains(String keyword) =>
       todo.contains(keyword) || done.contains(keyword);
   bool isEndState(String keyword) =>
-      done.contains(keyword) || done.isEmpty && todo.last == keyword;
+      done.contains(keyword) || done.isEmpty && todo.lastOrNull == keyword;
 
   @override
   String toString() => 'TodoStates[${todo.join(' ')} | ${done.join(' ')}]';

test/query/model_test.dart

@@ -147,6 +147,48 @@ void main() {
         rejectsSection('* blah'),
       );
     });
+    test('missing property with ordering operators', () {
+      expect(
+        OrgQueryPropertyMatcher(
+          property: 'TODO',
+          operator: '>',
+          value: 'A',
+        ),
+        acceptsSection('* blah'),
+      );
+      expect(
+        OrgQueryPropertyMatcher(
+          property: 'lorem',
+          operator: '<',
+          value: 'ipsum',
+        ),
+        rejectsSection('* blah'),
+      );
+    });
+    test('non-numeric property with numeric comparison', () {
+      expect(
+        OrgQueryPropertyMatcher(
+          property: 'lorem',
+          operator: '>',
+          value: 1,
+        ),
+        rejectsSection('''* blah
+:PROPERTIES:
+:lorem: ipsum
+:END:'''),
+      );
+      expect(
+        OrgQueryPropertyMatcher(
+          property: 'lorem',
+          operator: '=',
+          value: 0,
+        ),
+        acceptsSection('''* blah
+:PROPERTIES:
+:lorem: ipsum
+:END:'''),
+      );
+    });
     test('case-insensitive key', () {
       expect(
         OrgQueryPropertyMatcher(property: 'todo', operator: '=', value: 'DONE'),

test/todo_test.dart

@@ -310,4 +310,10 @@ void main() {
       expect(result, <OrgTodoStates>[]);
     });
   });
+  group('states', () {
+    test('isEndState empty definitions', () {
+      final states = OrgTodoStates();
+      expect(states.isEndState('DONE'), isFalse);
+    });
+  });
 }