Minor fixes (#120)

urbas · Apr 29, 2024 · 5b1d18b · 5b1d18b
1 parent af43fae
commit 5b1d18b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/nixjs-rt/src/lib.ts b/nixjs-rt/src/lib.ts
@@ -607,11 +607,6 @@ function _recursiveDisjointMerge(
 function _assertIsMergeable(value: NixType, attrPath: string[]): Attrset {
   const valueStrict = value.toStrict();
   if (!(valueStrict instanceof Attrset)) {
-    // FIXME: Is this error relevant? I'm not sure why it was here, but I'll leave it as a comment
-    // throw new EvalException(
-    //   `Attribute '${attrPath.join(".")}' already defined.`,
-    // );
-
     throw typeMismatchError(
       valueStrict,
       Attrset,

diff --git a/src/tests/operators.rs b/src/tests/operators.rs
@@ -190,13 +190,13 @@ fn eval_string_operator_errors() {
     );
 
     // FIXME: It says string instead of int, because nixjs flips the operator. Should we address?
-    // assert_eq!(
-    //     eval_err("\"hello\" < 123"),
-    //     NixErrorKind::TypeMismatch {
-    //         expected: vec![],
-    //         got: NixTypeKind::Int
-    //     }
-    // );
+    assert_eq!(
+        eval_err("\"hello\" < 123"),
+        NixErrorKind::TypeMismatch {
+            expected: vec![],
+            got: NixTypeKind::String
+        }
+    );
     assert_eq!(
         eval_err("\"hello\" > 123"),
         NixErrorKind::TypeMismatch {
@@ -212,13 +212,13 @@ fn eval_string_operator_errors() {
         }
     );
     // FIXME: It says string instead of int, because nixjs flips the operator. Should we address?
-    // assert_eq!(
-    //     eval_err("\"hello\" >= 123"),
-    //     NixErrorKind::TypeMismatch {
-    //         expected: vec![],
-    //         got: NixTypeKind::Int
-    //     }
-    // );
+    assert_eq!(
+        eval_err("\"hello\" >= 123"),
+        NixErrorKind::TypeMismatch {
+            expected: vec![],
+            got: NixTypeKind::String
+        }
+    );
 }
 
 #[test]