Skip to content

Commit f59852f

Browse files
committed
temporary stash
Signed-off-by: Balakrishna Avulapati <ba@bavulapati.com>
1 parent 92cca7b commit f59852f

15 files changed

+5633
-18
lines changed

spec/ajv.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type Ajv from ".."
22
import type {KeywordCxt, SchemaObject} from ".."
33
import _Ajv from "./ajv"
44
import {_} from "../dist/compile/codegen/code"
5-
import assert = require("assert")
5+
import assert from "assert"
66
import chai from "./chai"
77
const should = chai.should()
88

spec/async_schemas.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import getAjvAsyncInstances from "./ajv_async_instances"
2-
import jsonSchemaTest = require("json-schema-test")
2+
import jsonSchemaTest from "json-schema-test"
33
import {afterError} from "./after_test"
44
import type Ajv from ".."
55
import _Ajv from "./ajv"

spec/codegen.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
Code,
1111
Name,
1212
} from "../dist/compile/codegen"
13-
import assert = require("assert")
13+
import assert from "assert"
1414

1515
describe("code generation", () => {
1616
describe("Name", () => {

spec/dynamic-ref.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type {SchemaObject} from ".."
33
import _Ajv from "./ajv2019"
44
import getAjvInstances from "./ajv_instances"
55
import options from "./ajv_options"
6-
import assert = require("assert")
6+
import assert from "assert"
77

88
describe("recursiveRef and dynamicRef", () => {
99
let ajvs: Ajv[]

spec/extras.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import getAjvAllInstances from "./ajv_all_instances"
22
import {withStandalone} from "./ajv_standalone"
33
import {_} from "../dist/compile/codegen/code"
4-
import jsonSchemaTest = require("json-schema-test")
4+
import jsonSchemaTest from "json-schema-test"
55
import options from "./ajv_options"
66
import {afterError, afterEach} from "./after_test"
77
import chai from "./chai"

spec/issues/1344_non_root_recursive_ref_standalone.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import _Ajv from "../ajv"
22
import standaloneCode from "../../dist/standalone"
3-
import requireFromString = require("require-from-string")
4-
import assert = require("assert")
3+
import requireFromString from "require-from-string"
4+
import assert from "assert"
55

66
const schema = {
77
$schema: "http://json-schema.org/draft-07/schema#",

spec/issues/1414_base_uri_change.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import _Ajv from "../ajv"
2-
import assert = require("assert")
2+
import assert from "assert"
33

44
const schema1 = {
55
$id: "one",

spec/issues/1683_re2_engine.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import getAjvAllInstances from "../ajv_all_instances"
22
import {withStandalone} from "../ajv_standalone"
33
import {_} from "../../dist/compile/codegen/code"
4-
import jsonSchemaTest = require("json-schema-test")
4+
import jsonSchemaTest from "json-schema-test"
55
import options from "../ajv_options"
66
import {afterError, afterEach} from "../after_test"
77
import chai from "../chai"
8-
import re2 from "../../dist/runtime/re2"
8+
// import re2 from "../../dist/runtime/re2"
99
import re2tests from "./re2"
1010

1111
const instances = getAjvAllInstances(options, {
@@ -18,7 +18,7 @@ const instances = getAjvAllInstances(options, {
1818
instances.forEach((ajv) => {
1919
ajv.opts.code.source = true
2020
ajv.opts.code.formats = _`{allowedUnknown: true}`
21-
ajv.opts.code.regExp = re2
21+
// ajv.opts.code.regExp = re2
2222
})
2323

2424
jsonSchemaTest(withStandalone(instances), {

spec/json-schema.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import _Ajv2019 from "./ajv2019"
44
import _Ajv2020 from "./ajv2020"
55
import getAjvInstances from "./ajv_instances"
66
import {withStandalone} from "./ajv_standalone"
7-
import jsonSchemaTest = require("json-schema-test")
7+
import jsonSchemaTest from "json-schema-test"
88
import options from "./ajv_options"
99
import {afterError, afterEach} from "./after_test"
1010
import ajvFormats from "@theflashlabs/ajv-formats"

spec/keyword.spec.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import type AjvCore from "../dist/core"
44
import {_, nil} from "../dist/compile/codegen/code"
55
import getAjvAllInstances from "./ajv_all_instances"
66
import _Ajv from "./ajv"
7-
import equal from "../dist/runtime/equal"
8-
import assert = require("assert")
7+
import assert from "assert"
98
import chai from "./chai"
109
const should = chai.should()
1110

@@ -234,7 +233,7 @@ describe("User-defined keywords", () => {
234233
return typeof schema == "object" && schema !== null ? isDeepEqual : isStrictEqual
235234

236235
function isDeepEqual(data) {
237-
return equal(data, schema)
236+
return assert.deepEqual(data, schema)
238237
}
239238
function isStrictEqual(data) {
240239
return data === schema

0 commit comments

Comments
 (0)