Skip to content
Open
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
File renamed without changes.
49 changes: 27 additions & 22 deletions lib/2019.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import type {AnySchemaObject} from "./types"
import AjvCore, {Options} from "./core"
import type {AnySchemaObject} from "./types/index.ts"
import AjvCore, {Options} from "./core.ts"

import draft7Vocabularies from "./vocabularies/draft7"
import dynamicVocabulary from "./vocabularies/dynamic"
import nextVocabulary from "./vocabularies/next"
import unevaluatedVocabulary from "./vocabularies/unevaluated"
import discriminator from "./vocabularies/discriminator"
import addMetaSchema2019 from "./refs/json-schema-2019-09"
import draft7Vocabularies from "./vocabularies/draft7.ts"
import dynamicVocabulary from "./vocabularies/dynamic/index.ts"
import nextVocabulary from "./vocabularies/next.ts"
import unevaluatedVocabulary from "./vocabularies/unevaluated/index.ts"
import discriminator from "./vocabularies/discriminator/index.ts"
import addMetaSchema2019 from "./refs/json-schema-2019-09/index.ts"

const META_SCHEMA_ID = "https://json-schema.org/draft/2019-09/schema"

Expand Down Expand Up @@ -43,10 +43,6 @@ export class Ajv2019 extends AjvCore {
}
}

module.exports = exports = Ajv2019
module.exports.Ajv2019 = Ajv2019
Object.defineProperty(exports, "__esModule", {value: true})

export default Ajv2019

export {
Expand All @@ -68,14 +64,23 @@ export {
AsyncValidateFunction,
ErrorObject,
ErrorNoParams,
} from "./types"
} from "./types/index.ts"

export {Plugin, Options, CodeOptions, InstanceOptions, Logger, ErrorsTextOptions} from "./core"
export {SchemaCxt, SchemaObjCxt} from "./compile"
export {KeywordCxt} from "./compile/validate"
export {DefinedError} from "./vocabularies/errors"
export {JSONType} from "./compile/rules"
export {JSONSchemaType} from "./types/json-schema"
export {_, str, stringify, nil, Name, Code, CodeGen, CodeGenOptions} from "./compile/codegen"
export {default as ValidationError} from "./runtime/validation_error"
export {default as MissingRefError} from "./compile/ref_error"
export {Plugin, Options, CodeOptions, InstanceOptions, Logger, ErrorsTextOptions} from "./core.ts"
export {SchemaCxt, SchemaObjCxt} from "./compile/index.ts"
export {KeywordCxt} from "./compile/validate/index.ts"
export {DefinedError} from "./vocabularies/errors.ts"
export {JSONType} from "./compile/rules.ts"
export {JSONSchemaType} from "./types/json-schema.ts"
export {
_,
str,
stringify,
nil,
Name,
Code,
CodeGen,
CodeGenOptions,
} from "./compile/codegen/index.ts"
export {default as ValidationError} from "./runtime/validation_error.ts"
export {default as MissingRefError} from "./compile/ref_error.ts"
43 changes: 24 additions & 19 deletions lib/2020.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type {AnySchemaObject} from "./types"
import AjvCore, {Options} from "./core"
import type {AnySchemaObject} from "./types/index.ts"
import AjvCore, {Options} from "./core.ts"

import draft2020Vocabularies from "./vocabularies/draft2020"
import discriminator from "./vocabularies/discriminator"
import addMetaSchema2020 from "./refs/json-schema-2020-12"
import draft2020Vocabularies from "./vocabularies/draft2020.ts"
import discriminator from "./vocabularies/discriminator/index.ts"
import addMetaSchema2020 from "./refs/json-schema-2020-12/index.ts"

const META_SCHEMA_ID = "https://json-schema.org/draft/2020-12/schema"

Expand Down Expand Up @@ -37,10 +37,6 @@ export class Ajv2020 extends AjvCore {
}
}

module.exports = exports = Ajv2020
module.exports.Ajv2020 = Ajv2020
Object.defineProperty(exports, "__esModule", {value: true})

export default Ajv2020

export {
Expand All @@ -62,14 +58,23 @@ export {
AsyncValidateFunction,
ErrorObject,
ErrorNoParams,
} from "./types"
} from "./types/index.ts"

export {Plugin, Options, CodeOptions, InstanceOptions, Logger, ErrorsTextOptions} from "./core"
export {SchemaCxt, SchemaObjCxt} from "./compile"
export {KeywordCxt} from "./compile/validate"
export {DefinedError} from "./vocabularies/errors"
export {JSONType} from "./compile/rules"
export {JSONSchemaType} from "./types/json-schema"
export {_, str, stringify, nil, Name, Code, CodeGen, CodeGenOptions} from "./compile/codegen"
export {default as ValidationError} from "./runtime/validation_error"
export {default as MissingRefError} from "./compile/ref_error"
export {Plugin, Options, CodeOptions, InstanceOptions, Logger, ErrorsTextOptions} from "./core.ts"
export {SchemaCxt, SchemaObjCxt} from "./compile/index.ts"
export {KeywordCxt} from "./compile/validate/index.ts"
export {DefinedError} from "./vocabularies/errors.ts"
export {JSONType} from "./compile/rules.ts"
export {JSONSchemaType} from "./types/json-schema.ts"
export {
_,
str,
stringify,
nil,
Name,
Code,
CodeGen,
CodeGenOptions,
} from "./compile/codegen/index.ts"
export {default as ValidationError} from "./runtime/validation_error.ts"
export {default as MissingRefError} from "./compile/ref_error.ts"
44 changes: 24 additions & 20 deletions lib/ajv.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import type {AnySchemaObject} from "./types"
import AjvCore from "./core"
import draft7Vocabularies from "./vocabularies/draft7"
import discriminator from "./vocabularies/discriminator"
import * as draft7MetaSchema from "./refs/json-schema-draft-07.json"

import type {AnySchemaObject} from "./types/index.ts"
import AjvCore from "./core.ts"
import draft7Vocabularies from "./vocabularies/draft7.ts"
import discriminator from "./vocabularies/discriminator/index.ts"
import draft7MetaSchema from "./refs/json-schema-draft-07.json" with {type: "json"}
const META_SUPPORT_DATA = ["/properties"]

const META_SCHEMA_ID = "http://json-schema.org/draft-07/schema"
Expand Down Expand Up @@ -31,10 +30,6 @@ export class Ajv extends AjvCore {
}
}

module.exports = exports = Ajv
module.exports.Ajv = Ajv
Object.defineProperty(exports, "__esModule", {value: true})

export default Ajv

export {
Expand All @@ -57,14 +52,23 @@ export {
SchemaValidateFunction,
ErrorObject,
ErrorNoParams,
} from "./types"
} from "./types/index.ts"

export {Plugin, Options, CodeOptions, InstanceOptions, Logger, ErrorsTextOptions} from "./core"
export {SchemaCxt, SchemaObjCxt} from "./compile"
export {KeywordCxt} from "./compile/validate"
export {DefinedError} from "./vocabularies/errors"
export {JSONType} from "./compile/rules"
export {JSONSchemaType} from "./types/json-schema"
export {_, str, stringify, nil, Name, Code, CodeGen, CodeGenOptions} from "./compile/codegen"
export {default as ValidationError} from "./runtime/validation_error"
export {default as MissingRefError} from "./compile/ref_error"
export {Plugin, Options, CodeOptions, InstanceOptions, Logger, ErrorsTextOptions} from "./core.ts"
export {SchemaCxt, SchemaObjCxt} from "./compile/index.ts"
export {KeywordCxt} from "./compile/validate/index.ts"
export {DefinedError} from "./vocabularies/errors.ts"
export {JSONType} from "./compile/rules.ts"
export {JSONSchemaType} from "./types/json-schema.ts"
export {
_,
str,
stringify,
nil,
Name,
Code,
CodeGen,
CodeGenOptions,
} from "./compile/codegen/index.ts"
export {default as ValidationError} from "./runtime/validation_error.ts"
export {default as MissingRefError} from "./compile/ref_error.ts"
10 changes: 5 additions & 5 deletions lib/compile/codegen/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type {ScopeValueSets, NameValue, ValueScope, ValueScopeName} from "./scope"
import {_, nil, _Code, Code, Name, UsedNames, CodeItem, addCodeArg, _CodeOrName} from "./code"
import {Scope, varKinds} from "./scope"
import type {ScopeValueSets, NameValue, ValueScope, ValueScopeName} from "./scope.ts"
import {_, nil, _Code, Code, Name, UsedNames, CodeItem, addCodeArg, _CodeOrName} from "./code.ts"
import {Scope, varKinds} from "./scope.ts"

export {_, str, strConcat, nil, getProperty, stringify, regexpCode, Name, Code} from "./code"
export {Scope, ScopeStore, ValueScope, ValueScopeName, ScopeValueSets, varKinds} from "./scope"
export {_, str, strConcat, nil, getProperty, stringify, regexpCode, Name, Code} from "./code.ts"
export {Scope, ScopeStore, ValueScope, ValueScopeName, ScopeValueSets, varKinds} from "./scope.ts"

// type for expressions that can be safely inserted in code without quotes
export type SafeExpr = Code | number | boolean | null
Expand Down
2 changes: 1 addition & 1 deletion lib/compile/codegen/scope.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {_, nil, Code, Name} from "./code"
import {_, nil, Code, Name} from "./code.ts"

interface NameGroup {
prefix: string
Expand Down
12 changes: 6 additions & 6 deletions lib/compile/errors.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type {KeywordErrorCxt, KeywordErrorDefinition} from "../types"
import type {SchemaCxt} from "./index"
import {CodeGen, _, str, strConcat, Code, Name} from "./codegen"
import {SafeExpr} from "./codegen/code"
import {getErrorPath, Type} from "./util"
import N from "./names"
import type {KeywordErrorCxt, KeywordErrorDefinition} from "../types/index.ts"
import type {SchemaCxt} from "./index.ts"
import {CodeGen, _, str, strConcat, Code, Name} from "./codegen/index.ts"
import {SafeExpr} from "./codegen/code.ts"
import {getErrorPath, Type} from "./util.ts"
import N from "./names.ts"

export const keywordError: KeywordErrorDefinition = {
message: ({keyword}) => str`must pass "${keyword}" keyword validation`,
Expand Down
27 changes: 17 additions & 10 deletions lib/compile/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,24 @@ import type {
AsyncValidateFunction,
EvaluatedProperties,
EvaluatedItems,
} from "../types"
import type Ajv from "../core"
import type {InstanceOptions} from "../core"
import {CodeGen, _, nil, stringify, Name, Code, ValueScopeName} from "./codegen"
import ValidationError from "../runtime/validation_error"
import N from "./names"
import {LocalRefs, getFullPath, _getFullPath, inlineRef, normalizeId, resolveUrl} from "./resolve"
import {schemaHasRulesButRef, unescapeFragment} from "./util"
import {validateFunctionCode} from "./validate"
} from "../types/index.ts"
import type Ajv from "../core.ts"
import type {InstanceOptions} from "../core.ts"
import {CodeGen, _, nil, stringify, Name, Code, ValueScopeName} from "./codegen/index.ts"
import ValidationError from "../runtime/validation_error.ts"
import N from "./names.ts"
import {
LocalRefs,
getFullPath,
_getFullPath,
inlineRef,
normalizeId,
resolveUrl,
} from "./resolve.ts"
import {schemaHasRulesButRef, unescapeFragment} from "./util.ts"
import {validateFunctionCode} from "./validate/index.ts"
import {URIComponent} from "fast-uri"
import {JSONType} from "./rules"
import {JSONType} from "./rules.ts"

export type SchemaRefs = {
[Ref in string]?: SchemaEnv | AnySchema
Expand Down
2 changes: 1 addition & 1 deletion lib/compile/names.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Name} from "./codegen"
import {Name} from "./codegen/index.ts"

const names = {
// validation function arguments
Expand Down
4 changes: 2 additions & 2 deletions lib/compile/ref_error.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {resolveUrl, normalizeId, getFullPath} from "./resolve"
import type {UriResolver} from "../types"
import {resolveUrl, normalizeId, getFullPath} from "./resolve.ts"
import type {UriResolver} from "../types/index.ts"

export default class MissingRefError extends Error {
readonly missingRef: string
Expand Down
10 changes: 5 additions & 5 deletions lib/compile/resolve.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type {AnySchema, AnySchemaObject, UriResolver} from "../types"
import type Ajv from "../ajv"
import type {AnySchema, AnySchemaObject, UriResolver} from "../types/index.ts"
import type Ajv from "../ajv.ts"
import type {URIComponent} from "fast-uri"
import {eachItem} from "./util"
import * as equal from "fast-deep-equal"
import * as traverse from "json-schema-traverse"
import {eachItem} from "./util.ts"
import equal from "fast-deep-equal"
import traverse from "json-schema-traverse"

// the hash of local references inside the schema (created by getSchemaRefs), used for inline resolution
export type LocalRefs = {[Ref in string]?: AnySchemaObject}
Expand Down
2 changes: 1 addition & 1 deletion lib/compile/rules.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type {AddedKeywordDefinition} from "../types"
import type {AddedKeywordDefinition} from "../types/index.ts"

const _jsonTypes = ["string", "number", "integer", "boolean", "null", "object", "array"] as const

Expand Down
10 changes: 5 additions & 5 deletions lib/compile/util.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type {AnySchema, EvaluatedProperties, EvaluatedItems} from "../types"
import type {SchemaCxt, SchemaObjCxt} from "."
import {_, getProperty, Code, Name, CodeGen} from "./codegen"
import {_Code} from "./codegen/code"
import type {Rule, ValidationRules} from "./rules"
import type {AnySchema, EvaluatedProperties, EvaluatedItems} from "../types/index.ts"
import type {SchemaCxt, SchemaObjCxt} from "./index.ts"
import {_, getProperty, Code, Name, CodeGen} from "./codegen/index.ts"
import {_Code} from "./codegen/code.ts"
import type {Rule, ValidationRules} from "./rules.ts"

// TODO refactor to use Set
export function toHash<T extends string = string>(arr: T[]): {[K in T]?: true} {
Expand Down
6 changes: 3 additions & 3 deletions lib/compile/validate/applicability.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type {AnySchemaObject} from "../../types"
import type {SchemaObjCxt} from ".."
import type {JSONType, RuleGroup, Rule} from "../rules"
import type {AnySchemaObject} from "../../types/index.ts"
import type {SchemaObjCxt} from "../index.ts"
import type {JSONType, RuleGroup, Rule} from "../rules.ts"

export function schemaHasRulesForType(
{schema, self}: SchemaObjCxt,
Expand Down
10 changes: 5 additions & 5 deletions lib/compile/validate/boolSchema.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import type {KeywordErrorDefinition, KeywordErrorCxt} from "../../types"
import type {SchemaCxt} from ".."
import {reportError} from "../errors"
import {_, Name} from "../codegen"
import N from "../names"
import type {KeywordErrorDefinition, KeywordErrorCxt} from "../../types/index.ts"
import type {SchemaCxt} from "../index.ts"
import {reportError} from "../errors.ts"
import {_, Name} from "../codegen/index.ts"
import N from "../names.ts"

const boolError: KeywordErrorDefinition = {
message: "boolean schema is false",
Expand Down
14 changes: 7 additions & 7 deletions lib/compile/validate/dataType.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import type {
KeywordErrorCxt,
ErrorObject,
AnySchemaObject,
} from "../../types"
import type {SchemaObjCxt} from ".."
import {isJSONType, JSONType} from "../rules"
import {schemaHasRulesForType} from "./applicability"
import {reportError} from "../errors"
import {_, nil, and, not, operators, Code, Name} from "../codegen"
import {toHash, schemaRefOrVal} from "../util"
} from "../../types/index.ts"
import type {SchemaObjCxt} from "../index.ts"
import {isJSONType, JSONType} from "../rules.ts"
import {schemaHasRulesForType} from "./applicability.ts"
import {reportError} from "../errors.ts"
import {_, nil, and, not, operators, Code, Name} from "../codegen/index.ts"
import {toHash, schemaRefOrVal} from "../util.ts"

export enum DataType {
Correct,
Expand Down
6 changes: 3 additions & 3 deletions lib/compile/validate/defaults.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type {SchemaObjCxt} from ".."
import {_, getProperty, stringify} from "../codegen"
import {checkStrictMode} from "../util"
import type {SchemaObjCxt} from "../index.ts"
import {_, getProperty, stringify} from "../codegen/index.ts"
import {checkStrictMode} from "../util.ts"

export function assignDefaults(it: SchemaObjCxt, ty?: string): void {
const {properties, items} = it.schema
Expand Down
Loading
Loading