fix: ability to run spec tests

.gitignore

@@ -49,3 +49,4 @@ docs/license.md
 docs/.vuepress/components/Contributors/
 docs/packages/*
 !docs/packages/README.md
+.idea/

lib/compile/index.ts

@@ -206,9 +206,9 @@ export function resolveRef(
   this: Ajv,
   root: SchemaEnv,
   baseId: string,
-  ref: string
+  origRef: string
 ): AnySchema | SchemaEnv | undefined {
-  ref = resolveUrl(baseId, ref)
+  const ref = resolveUrl(baseId, origRef)
   const schOrFunc = root.refs[ref]
   if (schOrFunc) return schOrFunc
 
@@ -219,6 +219,15 @@ export function resolveRef(
     if (schema) _sch = new SchemaEnv({schema, schemaId, root, baseId})
   }
 
+  if (_sch === undefined && this.opts.loadSchemaSync) {
+    const remoteSchema = this.opts.loadSchemaSync(baseId, origRef, ref)
+
+    if (remoteSchema && !(this.refs[ref] || this.schemas[ref])) {
+      this.addSchema(remoteSchema, ref, undefined)
+      _sch = resolve.call(this, root, ref)
+    }
+  }
+
   if (_sch === undefined) return
   return (root.refs[ref] = inlineOrCompile.call(this, _sch))
 }

lib/core.ts

@@ -109,8 +109,11 @@ export interface CurrentOptions {
   schemas?: AnySchema[] | {[Key in string]?: AnySchema}
   logger?: Logger | false
   loadSchema?: (uri: string) => Promise<AnySchemaObject>
+  loadSchemaSync?: (base: string, $ref: string, id: string) => AnySchemaObject | boolean
   // options to modify validated data:
   removeAdditional?: boolean | "all" | "failing"
+  defaultAdditionalProperties?: boolean;
+
   useDefaults?: boolean | "empty"
   coerceTypes?: boolean | "array"
   // advanced options:

lib/vocabularies/applicator/additionalProperties.ts

@@ -30,7 +30,8 @@ const def: CodeKeywordDefinition & AddedKeywordDefinition = {
   trackErrors: true,
   error,
   code(cxt) {
-    const {gen, schema, parentSchema, data, errsCount, it} = cxt
+    const {gen, parentSchema, data, errsCount, it} = cxt
+    const { schema = it.opts.defaultAdditionalProperties } = cxt
     /* istanbul ignore if */
     if (!errsCount) throw new Error("ajv implementation error")
     const {allErrors, opts} = it

lib/vocabularies/applicator/properties.ts

@@ -10,7 +10,7 @@ const def: CodeKeywordDefinition = {
   schemaType: "object",
   code(cxt: KeywordCxt) {
     const {gen, schema, parentSchema, data, it} = cxt
-    if (it.opts.removeAdditional === "all" && parentSchema.additionalProperties === undefined) {
+    if (it.opts.removeAdditional === "all" && parentSchema.additionalProperties === undefined || it.opts.defaultAdditionalProperties === false) {
       apDef.code(new KeywordCxt(it, apDef, "additionalProperties"))
     }
     const allProps = allSchemaProperties(schema)

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "ajv",
+  "name": "@redocly/ajv",
   "version": "8.6.0",
   "description": "Another JSON Schema Validator",
   "main": "dist/ajv.js",
@@ -13,8 +13,8 @@
     "eslint": "eslint \"lib/**/*.ts\" \"spec/**/*.*s\" scripts --ignore-pattern spec/JSON-Schema-Test-Suite",
     "prettier:write": "prettier --write \"./**/*.{json,yaml,js,ts}\"",
     "prettier:check": "prettier --list-different \"./**/*.{json,yaml,js,ts}\"",
-    "test-spec": "cross-env TS_NODE_PROJECT=spec/tsconfig.json mocha -r ts-node/register \"spec/**/*.spec.{ts,js}\" -R dot -g \\(.recursiveRef.with.no..recursiveAnchor\\|.dynamicRef.with.no..dynamicAnchor\\).in.the.initial.target.schema.resource -i",
-    "test-codegen": "nyc cross-env TS_NODE_PROJECT=spec/tsconfig.json mocha -r ts-node/register 'spec/codegen.spec.ts' -R spec",
+    "test-spec": "cross-env TS_NODE_TRANSPILE_ONLY=true TS_NODE_PROJECT=spec/tsconfig.json mocha -r ts-node/register \"spec/**/*.spec.{ts,js}\" -R dot -g \\(.recursiveRef.with.no..recursiveAnchor\\|.dynamicRef.with.no..dynamicAnchor\\).in.the.initial.target.schema.resource -i",
+    "test-codegen": "nyc cross-env TS_NODE_TRANSPILE_ONLY=true TS_NODE_PROJECT=spec/tsconfig.json mocha -r ts-node/register 'spec/codegen.spec.ts' -R spec",
     "test-debug": "npm run test-spec -- --inspect-brk",
     "test-cov": "nyc npm run test-spec",
     "bundle": "rm -rf bundle && rollup -c",