Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix types for NodeNext #2365

Closed
wants to merge 11 commits into from
Closed

Fix types for NodeNext #2365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8b1f3fa
Fix types for NodeNext
benasher44 Jan 8, 2024
111de83
more fixes
benasher44 Jan 8, 2024
a4f6fa4
prettier
benasher44 Jan 8, 2024
867c7ea
fix test
benasher44 Jan 8, 2024
b7b5fd0
temp remove 14
benasher44 Jan 9, 2024
a6872a5
Revert "temp remove 14"
benasher44 Jan 9, 2024
804d27a
fix other files
benasher44 Jan 12, 2024
c0d9645
temp remove 14
benasher44 Jan 12, 2024
60c1502
Put node 14 build back
benasher44 Jan 12, 2024
0768857
Merge branch 'master' into basher/ajv-export-fix
jasoniangreen Feb 24, 2024
4c3c47f
Merge branch 'master' into basher/ajv-export-fix
jasoniangreen Feb 28, 2024
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
108 changes: 71 additions & 37 deletions lib/2019.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type {AnySchemaObject} from "./types"
import AjvCore, {Options} from "./core"
import * as types from "./types"
import * as core from "./core"

import draft7Vocabularies from "./vocabularies/draft7"
import dynamicVocabulary from "./vocabularies/dynamic"
Expand All @@ -10,8 +10,8 @@ import addMetaSchema2019 from "./refs/json-schema-2019-09"

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

class Ajv2019 extends AjvCore {
constructor(opts: Options = {}) {
class Ajv2019 extends core.Ajv {
constructor(opts: core.Options = {}) {
super({
...opts,
dynamicRef: true,
Expand All @@ -37,44 +37,78 @@ class Ajv2019 extends AjvCore {
this.refs["http://json-schema.org/schema"] = META_SCHEMA_ID
}

defaultMeta(): string | AnySchemaObject | undefined {
defaultMeta(): string | types.AnySchemaObject | undefined {
return (this.opts.defaultMeta =
super.defaultMeta() || (this.getSchema(META_SCHEMA_ID) ? META_SCHEMA_ID : undefined))
}
}

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

export default Ajv2019
// eslint-disable-next-line @typescript-eslint/no-namespace, no-redeclare
declare namespace Ajv2019 {
// compatibility with NodeNext
export {Ajv2019 as default}
}

import * as compile from "./compile"
import * as compileValidate from "./compile/validate"
import * as vocabulariesErrors from "./vocabularies/errors"
import * as compileRules from "./compile/rules"
import * as typesJsonSchema from "./types/json-schema"
import * as compileCodegen from "./compile/codegen"
import * as runtimeValidationError from "./runtime/validation_error"
import * as compileRefError from "./compile/ref_error"

// eslint-disable-next-line @typescript-eslint/no-namespace, no-redeclare
namespace Ajv2019 {
/* eslint-disable @typescript-eslint/no-unused-vars */
export import Format = types.Format
export import FormatDefinition = types.FormatDefinition
export import AsyncFormatDefinition = types.AsyncFormatDefinition
export import KeywordDefinition = types.KeywordDefinition
export import KeywordErrorDefinition = types.KeywordErrorDefinition
export import CodeKeywordDefinition = types.CodeKeywordDefinition
export import MacroKeywordDefinition = types.MacroKeywordDefinition
export import FuncKeywordDefinition = types.FuncKeywordDefinition
export import Vocabulary = types.Vocabulary
export import Schema = types.Schema
export import SchemaObject = types.SchemaObject
export import AnySchemaObject = types.AnySchemaObject
export import AsyncSchema = types.AsyncSchema
export import AnySchema = types.AnySchema
export import ValidateFunction = types.ValidateFunction
export import AsyncValidateFunction = types.AsyncValidateFunction
export import ErrorObject = types.ErrorObject
export import ErrorNoParams = types.ErrorNoParams

export import Plugin = core.Plugin
export import Options = core.Options
export import CodeOptions = core.CodeOptions
export import InstanceOptions = core.InstanceOptions
export import Logger = core.Logger
export import ErrorsTextOptions = core.ErrorsTextOptions

export {
Format,
FormatDefinition,
AsyncFormatDefinition,
KeywordDefinition,
KeywordErrorDefinition,
CodeKeywordDefinition,
MacroKeywordDefinition,
FuncKeywordDefinition,
Vocabulary,
Schema,
SchemaObject,
AnySchemaObject,
AsyncSchema,
AnySchema,
ValidateFunction,
AsyncValidateFunction,
ErrorObject,
ErrorNoParams,
} from "./types"
export import SchemaCxt = compile.SchemaCxt
export import SchemaObjCxt = compile.SchemaObjCxt

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 import KeywordCxt = compileValidate.KeywordCxt
export import DefinedError = vocabulariesErrors.DefinedError

export import JSONType = compileRules.JSONType
export import JSONSchemaType = typesJsonSchema.JSONSchemaType
export import _ = compileCodegen._
export import str = compileCodegen.str
export import stringify = compileCodegen.stringify
export import nil = compileCodegen.nil
export import Name = compileCodegen.Name
export import Code = compileCodegen.Code
export import CodeGen = compileCodegen.CodeGen
export import CodeGenOptions = compileCodegen.CodeGenOptions

export import ValidationError = runtimeValidationError.ValidationError
export import MissingRefError = compileRefError.MissingRefError
/* eslint-enable @typescript-eslint/no-unused-vars */
}
108 changes: 71 additions & 37 deletions lib/2020.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import type {AnySchemaObject} from "./types"
import AjvCore, {Options} from "./core"
import * as types from "./types"
import * as core from "./core"

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

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

class Ajv2020 extends AjvCore {
constructor(opts: Options = {}) {
class Ajv2020 extends core.Ajv {
constructor(opts: core.Options = {}) {
super({
...opts,
dynamicRef: true,
Expand All @@ -31,44 +31,78 @@ class Ajv2020 extends AjvCore {
this.refs["http://json-schema.org/schema"] = META_SCHEMA_ID
}

defaultMeta(): string | AnySchemaObject | undefined {
defaultMeta(): string | types.AnySchemaObject | undefined {
return (this.opts.defaultMeta =
super.defaultMeta() || (this.getSchema(META_SCHEMA_ID) ? META_SCHEMA_ID : undefined))
}
}

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

export default Ajv2020
// eslint-disable-next-line @typescript-eslint/no-namespace, no-redeclare
declare namespace Ajv2020 {
// compatibility with NodeNext
export {Ajv2020 as default}
}

import * as compile from "./compile"
import * as compileValidate from "./compile/validate"
import * as vocabulariesErrors from "./vocabularies/errors"
import * as compileRules from "./compile/rules"
import * as typesJsonSchema from "./types/json-schema"
import * as compileCodegen from "./compile/codegen"
import * as runtimeValidationError from "./runtime/validation_error"
import * as compileRefError from "./compile/ref_error"

// eslint-disable-next-line @typescript-eslint/no-namespace, no-redeclare
namespace Ajv2020 {
/* eslint-disable @typescript-eslint/no-unused-vars */
export import Format = types.Format
export import FormatDefinition = types.FormatDefinition
export import AsyncFormatDefinition = types.AsyncFormatDefinition
export import KeywordDefinition = types.KeywordDefinition
export import KeywordErrorDefinition = types.KeywordErrorDefinition
export import CodeKeywordDefinition = types.CodeKeywordDefinition
export import MacroKeywordDefinition = types.MacroKeywordDefinition
export import FuncKeywordDefinition = types.FuncKeywordDefinition
export import Vocabulary = types.Vocabulary
export import Schema = types.Schema
export import SchemaObject = types.SchemaObject
export import AnySchemaObject = types.AnySchemaObject
export import AsyncSchema = types.AsyncSchema
export import AnySchema = types.AnySchema
export import ValidateFunction = types.ValidateFunction
export import AsyncValidateFunction = types.AsyncValidateFunction
export import ErrorObject = types.ErrorObject
export import ErrorNoParams = types.ErrorNoParams

export import Plugin = core.Plugin
export import Options = core.Options
export import CodeOptions = core.CodeOptions
export import InstanceOptions = core.InstanceOptions
export import Logger = core.Logger
export import ErrorsTextOptions = core.ErrorsTextOptions

export {
Format,
FormatDefinition,
AsyncFormatDefinition,
KeywordDefinition,
KeywordErrorDefinition,
CodeKeywordDefinition,
MacroKeywordDefinition,
FuncKeywordDefinition,
Vocabulary,
Schema,
SchemaObject,
AnySchemaObject,
AsyncSchema,
AnySchema,
ValidateFunction,
AsyncValidateFunction,
ErrorObject,
ErrorNoParams,
} from "./types"
export import SchemaCxt = compile.SchemaCxt
export import SchemaObjCxt = compile.SchemaObjCxt

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 import KeywordCxt = compileValidate.KeywordCxt
export import DefinedError = vocabulariesErrors.DefinedError

export import JSONType = compileRules.JSONType
export import JSONSchemaType = typesJsonSchema.JSONSchemaType
export import _ = compileCodegen._
export import str = compileCodegen.str
export import stringify = compileCodegen.stringify
export import nil = compileCodegen.nil
export import Name = compileCodegen.Name
export import Code = compileCodegen.Code
export import CodeGen = compileCodegen.CodeGen
export import CodeGenOptions = compileCodegen.CodeGenOptions

export import ValidationError = runtimeValidationError.ValidationError
export import MissingRefError = compileRefError.MissingRefError
/* eslint-enable @typescript-eslint/no-unused-vars */
}
102 changes: 69 additions & 33 deletions lib/ajv.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,39 +31,75 @@ class Ajv extends AjvCore {
}
}

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

export default Ajv
// eslint-disable-next-line @typescript-eslint/no-namespace, no-redeclare
declare namespace Ajv {
// compatibility with NodeNext
export {Ajv as default}
}

import * as types from "./types"
import * as core from "./core"
import * as compile from "./compile"
import * as compileValidate from "./compile/validate"
import * as vocabulariesErrors from "./vocabularies/errors"
import * as compileRules from "./compile/rules"
import * as typesJsonSchema from "./types/json-schema"
import * as compileCodegen from "./compile/codegen"
import * as runtimeValidationError from "./runtime/validation_error"
import * as compileRefError from "./compile/ref_error"

// eslint-disable-next-line @typescript-eslint/no-namespace, no-redeclare
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems typescript-eslint isn't very aware of the export import feature in namespaces typescript-eslint/typescript-eslint#4129

namespace Ajv {
/* eslint-disable @typescript-eslint/no-unused-vars */
export import Format = types.Format
export import FormatDefinition = types.FormatDefinition
export import AsyncFormatDefinition = types.AsyncFormatDefinition
export import KeywordDefinition = types.KeywordDefinition
export import KeywordErrorDefinition = types.KeywordErrorDefinition
export import CodeKeywordDefinition = types.CodeKeywordDefinition
export import MacroKeywordDefinition = types.MacroKeywordDefinition
export import FuncKeywordDefinition = types.FuncKeywordDefinition
export import Vocabulary = types.Vocabulary
export import Schema = types.Schema
export import SchemaObject = types.SchemaObject
// eslint-disable-next-line no-shadow
export import AnySchemaObject = types.AnySchemaObject
export import AsyncSchema = types.AsyncSchema
export import AnySchema = types.AnySchema
export import ValidateFunction = types.ValidateFunction
export import AsyncValidateFunction = types.AsyncValidateFunction
export import SchemaValidateFunction = types.SchemaValidateFunction
export import ErrorObject = types.ErrorObject
export import ErrorNoParams = types.ErrorNoParams

export {
Format,
FormatDefinition,
AsyncFormatDefinition,
KeywordDefinition,
KeywordErrorDefinition,
CodeKeywordDefinition,
MacroKeywordDefinition,
FuncKeywordDefinition,
Vocabulary,
Schema,
SchemaObject,
AnySchemaObject,
AsyncSchema,
AnySchema,
ValidateFunction,
AsyncValidateFunction,
SchemaValidateFunction,
ErrorObject,
ErrorNoParams,
} from "./types"
export import Plugin = core.Plugin
export import Options = core.Options
export import CodeOptions = core.CodeOptions
export import InstanceOptions = core.InstanceOptions
export import Logger = core.Logger
export import ErrorsTextOptions = core.ErrorsTextOptions

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 import SchemaCxt = compile.SchemaCxt
export import SchemaObjCxt = compile.SchemaObjCxt

export import KeywordCxt = compileValidate.KeywordCxt
export import DefinedError = vocabulariesErrors.DefinedError
export import JSONType = compileRules.JSONType
export import JSONSchemaType = typesJsonSchema.JSONSchemaType
export import _ = compileCodegen._
export import str = compileCodegen.str
export import stringify = compileCodegen.stringify
export import nil = compileCodegen.nil
export import Name = compileCodegen.Name
export import Code = compileCodegen.Code
export import CodeGen = compileCodegen.CodeGen
export import CodeGenOptions = compileCodegen.CodeGenOptions

export import ValidationError = runtimeValidationError.ValidationError
export import MissingRefError = compileRefError.MissingRefError
/* eslint-enable @typescript-eslint/no-unused-vars */
}
4 changes: 3 additions & 1 deletion lib/compile/ref_error.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {resolveUrl, normalizeId, getFullPath} from "./resolve"
import type {UriResolver} from "../types"

export default class MissingRefError extends Error {
export class MissingRefError extends Error {
readonly missingRef: string
readonly missingSchema: string

Expand All @@ -11,3 +11,5 @@ export default class MissingRefError extends Error {
this.missingSchema = normalizeId(getFullPath(resolver, this.missingRef))
}
}

export default MissingRefError
Loading
Loading