README.md

@@ -74,6 +74,7 @@ Please review [Contributing guidelines](./CONTRIBUTING.md) and [Code components]
 - [Frequently Asked Questions](./docs/faq.md)
 - [Using in browser](#using-in-browser)
   - [Content Security Policy](./docs/security.md#content-security-policy)
+- [Using in ES5 environment](#using-in-es5-environment)
 - [Command line interface](#command-line-interface)
 - [API reference](./docs/api.md)
   - [Methods](./docs/api.md#ajv-constructor-and-methods)
@@ -307,6 +308,19 @@ The browser bundle is available on [cdnjs](https://cdnjs.com/libraries/ajv).
 
 **Please note**: some frameworks, e.g. Dojo, may redefine global require in a way that is not compatible with CommonJS module format. In this case Ajv bundle has to be loaded before the framework and then you can use global `ajv` (see issue [#234](https://github.com/ajv-validator/ajv/issues/234)).
 
+## Using in ES5 environment
+
+You need to:
+
+- recompile Typescript to ES5 target - it is set to 2018 in the bundled compiled code.
+- generate ES5 validation code:
+
+```javascript
+const ajv = new Ajv({code: {es5: true}})
+```
+
+See [Advanced options](https://github.com/ajv-validator/ajv/blob/master/docs/api.md#advanced-options).
+
 ## Command line interface
 
 CLI is available as a separate npm package [ajv-cli](https://github.com/ajv-validator/ajv-cli). It supports:

docs/keywords.md

@@ -87,12 +87,12 @@ ajv.addKeyword({
     const {schema, parentSchema, data} = cxt
     const [min, max] = schema
     const eq: Code = parentSchema.exclusiveRange ? _`=` : nil
-    gen.fail(_`${data} <${eq} ${min} || ${data} >${eq} ${max}`)
+    cxt.fail(_`${data} <${eq} ${min} || ${data} >${eq} ${max}`)
   },
   metaSchema: {
     type: "array",
     items: [{type: "number"}, {type: "number"}],
-    minItems: 2
+    minItems: 2,
     additionalItems: false,
   },
 })

docs/security.md

@@ -48,6 +48,7 @@ Some keywords in JSON Schemas can lead to very slow validation for certain data.
 You can validate your JSON schemas against [this meta-schema](../lib/refs/json-schema-secure.json) to check that these recommendations are followed:
 
 ```javascript
+ajv = new Ajv({strictTypes: false}) // this option is required for this schema
 const isSchemaSecure = ajv.compile(require("ajv/lib/refs/json-schema-secure.json"))
 
 const schema1 = {format: "email"}

lib/compile/validate/iterate.ts

@@ -1,9 +1,8 @@
 import type {SchemaObjCxt} from ".."
 import type {JSONType, Rule, RuleGroup} from "../rules"
 import {shouldUseGroup, shouldUseRule} from "./applicability"
-import {checkDataType} from "./dataType"
+import {checkDataType, reportTypeError} from "./dataType"
 import {assignDefaults} from "./defaults"
-import {reportTypeError} from "./dataType"
 import {keywordCode} from "./keyword"
 import {schemaHasRulesButRef} from "../util"
 import {checkStrictMode} from "."

lib/vocabularies/applicator/oneOf.ts

@@ -9,7 +9,11 @@ import {_, Name} from "../../compile/codegen"
 import {alwaysValidSchema} from "../../compile/util"
 import {SchemaCxt} from "../../compile"
 
-export type OneOfError = ErrorObject<"oneOf", {passingSchemas: [number, number]}, AnySchema[]>
+export type OneOfError = ErrorObject<
+  "oneOf",
+  {passingSchemas: [number, number] | null},
+  AnySchema[]
+>
 
 const error: KeywordErrorDefinition = {
   message: "should match exactly one schema in oneOf",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ajv",
-  "version": "7.0.2",
+  "version": "7.0.3",
   "description": "Another JSON Schema Validator",
   "main": "dist/ajv.js",
   "types": "dist/ajv.d.ts",

spec/standalone.spec.ts

@@ -2,6 +2,7 @@ import type Ajv from "../dist/core"
 import type {AnyValidateFunction} from "../dist/core"
 import _Ajv from "./ajv"
 import standaloneCode from "../dist/standalone"
+import ajvFormats from "ajv-formats"
 import requireFromString = require("require-from-string")
 import assert = require("assert")
 
@@ -179,4 +180,36 @@ describe("standalone code generation", () => {
       assert.strictEqual(validate("1"), false)
     }
   })
+
+  describe("standalone code with ajv-formats", () => {
+    const schema = {
+      $schema: "http://json-schema.org/draft-07/schema#",
+      definitions: {
+        User: {
+          type: "object",
+          properties: {
+            email: {
+              type: "string",
+              format: "email",
+            },
+          },
+          required: ["email"],
+          additionalProperties: false,
+        },
+      },
+    }
+
+    it("should support formats with standalone code", () => {
+      const ajv = new _Ajv({code: {source: true}})
+      ajvFormats(ajv)
+      ajv.addSchema(schema)
+      const moduleCode = standaloneCode(ajv, {validateUser: "#/definitions/User"})
+      const {validateUser} = requireFromString(moduleCode)
+
+      assert(typeof validateUser == "function")
+      assert.strictEqual(validateUser({}), false)
+      assert.strictEqual(validateUser({email: "foo"}), false)
+      assert.strictEqual(validateUser({email: "foo@bar.com"}), true)
+    })
+  })
 })