Refactoring tests (#119)

urbas · Apr 27, 2024 · af43fae · af43fae
1 parent 1252ab3
commit af43fae
Show file tree

Hide file tree

Showing 12 changed files with 935 additions and 433 deletions.
diff --git a/nixjs-rt/src/errors/errorMessage.ts b/nixjs-rt/src/errors/errorMessage.ts
@@ -36,14 +36,6 @@ function isErrorMessagePart(part: any): part is ErrorMessagePart {
   );
 }
 
-function isErrorMessage(parts: any): parts is ErrorMessage {
-  if (!Array.isArray(parts)) {
-    return false;
-  }
-
-  return parts.every(isErrorMessagePart);
-}
-
 /** A helper to convert instances to their respective class in a type-safe way, for better error messages */
 export function instanceToClass(instance: NixTypeInstance | NixTypeClass) {
   if (instance instanceof NixBool) {
@@ -144,6 +136,8 @@ export function errTypes(...types: NixTypeClass[]): ErrorMessage {
     }
     message.push(...errType(types[i]));
   }
+
+  return message;
 }
 
 export function highlighted(message: string | ErrorMessage): ErrorMessage {

diff --git a/nixjs-rt/src/lib.test.ts → nixjs-rt/src/legacyTests.test.ts b/nixjs-rt/src/lib.test.ts → nixjs-rt/src/legacyTests.test.ts
diff --git a/nixjs-rt/src/lib.ts b/nixjs-rt/src/lib.ts
@@ -153,7 +153,7 @@ export abstract class NixType {
   }
 
   asString(): string {
-    throw typeMismatchError(this, NixString);
+    throw typeMismatchError(this, [NixString, Path]);
   }
 
   concat(other: NixType): NixList {
@@ -956,6 +956,9 @@ export class NixString extends NixType {
     if (rhs instanceof NixString) {
       return new NixString(this.value + rhs.value);
     }
+    if (rhs instanceof Path) {
+      return new NixString(normalizePath(this.value + rhs.path));
+    }
     return super.add(rhs);
   }
 
@@ -1023,6 +1026,10 @@ export class Path extends NixType {
     return _nixBoolFromJs(this.path < rhs.path);
   }
 
+  asString(): string {
+    return this.path;
+  }
+
   toJs() {
     return this.path;
   }

diff --git a/src/eval/mod.rs b/src/eval/mod.rs
@@ -2,5 +2,4 @@ pub mod emit_js;
 pub mod error;
 pub mod execution;
 pub mod helpers;
-pub mod tests;
 pub mod types;