ethdebug · gnidan · Feb 13, 2025 · Feb 13, 2025
diff --git a/packages/format/package.json b/packages/format/package.json
@@ -22,8 +22,12 @@
     "yaml": "^2.3.4"
   },
   "devDependencies": {
+    "@hyperjump/browser": "^1.2.0",
+    "@hyperjump/json-schema": "^1.11.0",
     "chalk": "^4.1.0",
+    "cli-highlight": "^2.1.11",
     "concurrently": "^8.2.2",
+    "indent-string": "^4.0.0",
     "nodemon": "^3.0.2",
     "ts-node": "^10.9.2",
     "typescript": "^5.3.3",

diff --git a/packages/tests/schemas/examples.test.ts → packages/format/src/schemas/examples.test.ts b/packages/tests/schemas/examples.test.ts → packages/format/src/schemas/examples.test.ts
@@ -1,11 +1,11 @@
 import { expect, describe, it } from "vitest";
 
-import type { JSONSchema } from "@ethdebug/format";
-
-import schemas, { schemaExtensions } from "../src/schemas.js";
+import { schemaExtensions } from "../../test/extensions";
+import { schemas } from ".";
+import type { JSONSchema } from "../describe";
 
 // loads schemas into global hyperjump json schema validator
-import "../src/loadSchemas.js";
+import "../../test/hyperjump";
 
 const idsOfSchemasAllowedToOmitExamples = new Set([
   "schema:ethdebug/format/type",

diff --git a/packages/tests/schemas/validity.test.ts → packages/format/src/schemas/validity.test.ts b/packages/tests/schemas/validity.test.ts → packages/format/src/schemas/validity.test.ts
@@ -1,14 +1,28 @@
 import { describe, it } from "vitest";
 import {
+  type OutputUnit,
   validate,
   InvalidSchemaError,
 } from "@hyperjump/json-schema/draft-2020-12";
 
-import schemas from "../src/schemas.js";
-import printErrors from "../src/printErrors.js";
+import { schemas } from ".";
 
 // loads schemas into global hyperjump json schema validator
-import "../src/loadSchemas.js";
+import "../../test/hyperjump";
+
+const printErrors = (output: OutputUnit): string => output.errors!
+  .map((error) => {
+    if (!error.valid && !error.keyword.endsWith("#validate")) {
+      return `${
+        error.instanceLocation
+      } fails schema constraint ${
+        error.absoluteKeywordLocation
+      }`;
+    }
+  })
+  .filter((message): message is string => !!message)
+  .map(message => `  - ${message}`)
+  .join("\n");
 
 describe("Valid schemas", () => {
   for (const [id, schema] of Object.entries(schemas)) {

diff --git a/packages/tests/src/schemas.ts → packages/format/test/extensions.ts b/packages/tests/src/schemas.ts → packages/format/test/extensions.ts
@@ -1,4 +1,4 @@
-import { schemas } from "@ethdebug/format";
+import { schemas } from "../src";
 
 export const schemaExtensions: {
   [schemaId: string]: {
@@ -81,5 +81,3 @@ export const schemaExtensions: {
     extends: new Set(["schema:ethdebug/format/type/complex"])
   },
 }
-
-export default schemas;
diff --git a/packages/tests/src/loadSchemas.ts → packages/format/test/hyperjump.ts b/packages/tests/src/loadSchemas.ts → packages/format/test/hyperjump.ts
@@ -4,18 +4,19 @@ import {
   validate,
   setMetaSchemaOutputFormat,
 } from "@hyperjump/json-schema/draft-2020-12";
+// @ts-ignore
 import { BASIC } from "@hyperjump/json-schema/experimental";
 import { bundle } from "@hyperjump/json-schema/bundle";
-import YAML from "yaml";
+import * as YAML from "yaml";
 import indentString from "indent-string";
 import { highlight } from "cli-highlight";
 
 import {
   describeSchema,
   type DescribeSchemaOptions
-} from "@ethdebug/format";
+} from "../src/describe";
 
-import schemas from "./schemas.js";
+import { schemas } from "../src/schemas";
 
 const main = () => {
   setMetaSchemaOutputFormat(BASIC);

diff --git a/packages/format/vitest.d.ts b/packages/format/vitest.d.ts
@@ -1,6 +1,9 @@
 import "vitest";
+import type { DescribeSchemaOptions } from "./src/describe";
 
 interface CustomMatchers<R = unknown> {
+  toValidate(schemaOptions: DescribeSchemaOptions): R;
+
   toSatisfy(received: any): R;
   toSatisfyAll(values: readonly any[]): R;
 }

diff --git a/packages/tests/.gitignore b/packages/tests/.gitignore
diff --git a/packages/tests/package.json b/packages/tests/package.json
diff --git a/packages/tests/src/printErrors.ts b/packages/tests/src/printErrors.ts
diff --git a/packages/tests/tsconfig.json b/packages/tests/tsconfig.json
diff --git a/packages/tests/typings.d.ts b/packages/tests/typings.d.ts
diff --git a/packages/tests/vitest.config.ts b/packages/tests/vitest.config.ts
diff --git a/yarn.lock b/yarn.lock
@@ -8151,11 +8151,6 @@ indent-string@^4.0.0:
   resolved "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
-indent-string@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz"
-  integrity sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==
-
 infima@0.2.0-alpha.43:
   version "0.2.0-alpha.43"
   resolved "https://registry.npmjs.org/infima/-/infima-0.2.0-alpha.43.tgz"