@travetto/test 5.0.10 → 5.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/test",
-  "version": "5.0.10",
+  "version": "5.0.11",
   "description": "Declarative test framework",
   "keywords": [
     "unit-testing",
@@ -27,15 +27,15 @@
     "directory": "module/test"
   },
   "dependencies": {
-    "@travetto/registry": "^5.0.10",
-    "@travetto/runtime": "^5.0.10",
-    "@travetto/terminal": "^5.0.10",
-    "@travetto/worker": "^5.0.10",
-    "yaml": "^2.5.1"
+    "@travetto/registry": "^5.0.11",
+    "@travetto/runtime": "^5.0.11",
+    "@travetto/terminal": "^5.0.11",
+    "@travetto/worker": "^5.0.11",
+    "yaml": "^2.6.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^5.0.10",
-    "@travetto/transformer": "^5.0.8"
+    "@travetto/cli": "^5.0.11",
+    "@travetto/transformer": "^5.0.9"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/assert/check.ts

@@ -161,7 +161,7 @@ export class AssertCheck {
       // Else treat as a simple function to build an error or not
       const res = shouldThrow(err);
       if (res && !(res instanceof Error)) {
-        return new AppError(`Invalid check, "${shouldThrow.name}" should return an Error or undefined`, 'data');
+        return new AppError(`Invalid check, "${shouldThrow.name}" should return an Error or undefined`, { category: 'data' });
       } else {
         return res;
       }

package/src/consumer/serialize.ts

@@ -1,9 +1,9 @@
-import { AppError, TypedObject } from '@travetto/runtime';
+import { AppError, hasToJSON } from '@travetto/runtime';
 
 import { TestEvent, } from '../model/event';
 
 
-export type SerializedError = { $?: boolean, message: string, stack?: string, name: string };
+export type SerializedError = { [K in keyof Error]: Error[K] extends Function ? never : Error[K] } & { $: true };
 
 function isError(e: unknown): e is SerializedError {
   return !!e && (typeof e === 'object') && '$' in e;
@@ -14,25 +14,20 @@ export class SerializeUtil {
   /**
    *  Prepare error for transmission
    */
-  static serializeError(e: Error | SerializedError): Error;
+  static serializeError(e: Error | SerializedError): SerializedError;
   static serializeError(e: undefined): undefined;
-  static serializeError(e: Error | SerializedError | undefined): Error | undefined {
-    let error: SerializedError | undefined;
-
-    if (e) {
-      error = { $: true, name: e.name, message: '' };
-      for (const k of TypedObject.keys<{ name: string }>(e)) {
-        error[k] = e[k];
-      }
-      error.name = e.name;
-      if (e instanceof AppError) {
-        Object.assign(error, e.toJSON());
-      }
-      error.message ||= e.message;
-      error.stack ??= e.stack?.replace(/.*\[ERR_ASSERTION\]:\s*/, '');
+  static serializeError(e: Error | SerializedError | undefined): SerializedError | undefined {
+    if (!e) {
+      return;
     }
 
-    return error;
+    return {
+      $: true,
+      ...hasToJSON(e) ? e.toJSON() : e,
+      name: e.name,
+      message: e.message,
+      stack: e.stack?.replace(/.*\[ERR_ASSERTION\]:\s*/, ''),
+    };
   }
 
   /**
@@ -42,13 +37,10 @@ export class SerializeUtil {
   static deserializeError(e: undefined): undefined;
   static deserializeError(e: Error | SerializedError | undefined): Error | undefined {
     if (isError(e)) {
-      const err = new Error();
-
-      for (const k of TypedObject.keys(e)) {
-        if (k === '$') {
-          continue;
-        }
-        err[k] = e[k]!;
+      const err = AppError.fromJSON(e) ?? new Error();
+      if (!(err instanceof AppError)) {
+        const { $: _, ...rest } = e;
+        Object.assign(err, rest);
       }
       err.message = e.message;
       err.stack = e.stack;

package/src/consumer/types/tap.ts

@@ -1,7 +1,7 @@
 import { stringify } from 'yaml';
 
 import { Terminal } from '@travetto/terminal';
-import { AppError, TimeUtil, Runtime, RuntimeIndex } from '@travetto/runtime';
+import { TimeUtil, Runtime, RuntimeIndex, hasToJSON } from '@travetto/runtime';
 
 import { TestEvent } from '../../model/event';
 import { SuitesSummary, TestConsumer } from '../types';
@@ -104,7 +104,7 @@ export class TapEmitter implements TestConsumer {
       if (test.status === 'failed') {
         if (test.error && test.error.name !== 'AssertionError') {
           const err = SerializeUtil.deserializeError(test.error);
-          this.logMeta({ error: err instanceof AppError ? err.toJSON() : err });
+          this.logMeta({ error: hasToJSON(err) ? err.toJSON() : err });
         }
       }
 
@@ -128,7 +128,7 @@ export class TapEmitter implements TestConsumer {
     if (summary.errors.length) {
       this.log('---\n');
       for (const err of summary.errors) {
-        this.log(this.#enhancer.failure(err instanceof AppError ? JSON.stringify(err.toJSON(), null, 2) : `${err}`));
+        this.log(this.#enhancer.failure(hasToJSON(err) ? JSON.stringify(err.toJSON(), null, 2) : `${err}`));
       }
     }