Restore the plugin system and fix the type error properly

Author: jdesrosiers

src/index.d.ts

@@ -1,4 +1,4 @@
-import { AST } from "@hyperjump/json-schema/experimental";
+import { AST, EvaluationPlugin } from "@hyperjump/json-schema/experimental";
 import { JsonNode } from "@hyperjump/json-schema/instance/experimental";
 import { Localization } from "./localization.js";
 
@@ -63,6 +63,7 @@ export type KeywordHandler = {
 export type EvaluationContext = {
   ast: AST;
   errorIndex: ErrorIndex;
+  plugins: EvaluationPlugin[];
 };
 
 export type ErrorIndex = {

src/normalization-handlers/unevaluatedItems.js

@@ -2,8 +2,8 @@ import { evaluateSchema } from "../normalized-output.js";
 import * as Instance from "@hyperjump/json-schema/instance/experimental";
 
 /**
- * @import { EvaluationContext, KeywordHandler, NormalizedOutput } from "../index.d.ts"
  * @import { EvaluationPlugin } from "@hyperjump/json-schema/experimental"
+ * @import { EvaluationContext, KeywordHandler, NormalizedOutput } from "../index.d.ts"
  */
 
 /**

src/normalized-output.js

@@ -1,4 +1,4 @@
-import { compile, getSchema } from "@hyperjump/json-schema/experimental";
+import { compile, getKeyword, getSchema } from "@hyperjump/json-schema/experimental";
 import * as Instance from "@hyperjump/json-schema/instance/experimental";
 import { pointerSegments } from "@hyperjump/json-pointer";
 import * as Browser from "@hyperjump/browser";
@@ -22,9 +22,14 @@ export const setNormalizationHandler = (uri, handler) => {
 export const evaluateSchema = (schemaLocation, instance, context) => {
   const instanceLocation = Instance.uri(instance);
 
+  let valid = true;
   /** @type API.NormalizedOutput */
   const output = { [instanceLocation]: {} };
 
+  for (const plugin of context.plugins) {
+    plugin.beforeSchema?.(schemaLocation, instance, context);
+  }
+
   const schemaNode = context.ast[schemaLocation];
   if (typeof schemaNode === "boolean") {
     output[instanceLocation] = {
@@ -37,13 +42,22 @@ export const evaluateSchema = (schemaLocation, instance, context) => {
       const [keywordUri, keywordLocation, keywordValue] = node;
       const keyword = keywordHandlers[keywordUri] ?? {};
 
+      const validationKeyword = getKeyword(keywordUri);
+
       const keywordContext = {
         ast: context.ast,
-        errorIndex: context.errorIndex
+        errorIndex: context.errorIndex,
+        plugins: context.plugins
       };
+      for (const plugin of context.plugins) {
+        plugin.beforeKeyword?.(node, instance, keywordContext, context, validationKeyword);
+      }
 
       const keywordOutput = keyword.evaluate?.(keywordValue, instance, keywordContext);
       const isKeywordValid = !context.errorIndex[keywordLocation]?.[instanceLocation];
+      if (!isKeywordValid) {
+        valid = false;
+      }
 
       if (keyword.simpleApplicator) {
         for (const suboutput of (keywordOutput ?? [])) {
@@ -56,9 +70,17 @@ export const evaluateSchema = (schemaLocation, instance, context) => {
         output[instanceLocation][keywordUri] ??= {};
         output[instanceLocation][keywordUri][keywordLocation] = isKeywordValid;
       }
+
+      for (const plugin of context.plugins) {
+        plugin.afterKeyword?.(node, instance, keywordContext, isKeywordValid, context, validationKeyword);
+      }
     }
   }
 
+  for (const plugin of context.plugins) {
+    plugin.afterSchema?.(schemaLocation, instance, context, valid);
+  }
+
   return output;
 };
 
@@ -122,6 +144,6 @@ export async function normalizedErrorOuput(instance, errorOutput, subjectUri) {
   const { schemaUri, ast } = await compile(schema);
   const value = Instance.fromJs(instance);
   /** @type API.EvaluationContext */
-  const context = { ast, errorIndex };
+  const context = { ast, errorIndex, plugins: [] };
   return evaluateSchema(schemaUri, value, context);
 }