Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AST, EvaluationPlugin } from "@hyperjump/json-schema/experimental";
import { AST } from "@hyperjump/json-schema/experimental";
import { JsonNode } from "@hyperjump/json-schema/instance/experimental";
import { Localization } from "./localization.js";

Expand Down Expand Up @@ -63,7 +63,6 @@ export type KeywordHandler = {
export type EvaluationContext = {
ast: AST;
errorIndex: ErrorIndex;
plugins: EvaluationPlugin[];
};

export type ErrorIndex = {
Expand Down
24 changes: 2 additions & 22 deletions src/normalized-output.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,9 @@ 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] = {
Expand All @@ -44,18 +39,11 @@ export const evaluateSchema = (schemaLocation, instance, context) => {

const keywordContext = {
ast: context.ast,
errorIndex: context.errorIndex,
plugins: context.plugins
errorIndex: context.errorIndex
};
for (const plugin of context.plugins) {
plugin.beforeKeyword?.(node, instance, keywordContext, context, keyword);
}

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 ?? [])) {
Expand All @@ -68,17 +56,9 @@ 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, keyword);
}
}
}

for (const plugin of context.plugins) {
plugin.afterSchema?.(schemaLocation, instance, context, valid);
}

return output;
};

Expand Down Expand Up @@ -142,6 +122,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, plugins: [] };
const context = { ast, errorIndex };
return evaluateSchema(schemaUri, value, context);
}
Loading