Skip to content

Commit

Permalink
Merge 2a6d1a9 into a1ebd03
Browse files Browse the repository at this point in the history
  • Loading branch information
epoberezkin committed Jul 22, 2020
2 parents a1ebd03 + 2a6d1a9 commit 733cfab
Show file tree
Hide file tree
Showing 184 changed files with 10,319 additions and 11,311 deletions.
7 changes: 4 additions & 3 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
extends: eslint:recommended
parserOptions:
ecmaVersion: 6
env:
node: true
browser: true
Expand All @@ -9,20 +11,19 @@ rules:
curly: [2, multi-or-nest, consistent]
dot-location: [2, property]
dot-notation: 2
indent-legacy: [2, 2, SwitchCase: 1]
linebreak-style: [2, unix]
new-cap: 2
no-console: [2, allow: [warn, error]]
no-else-return: 2
no-eq-null: 2
no-extra-semi: 0
no-fallthrough: 2
no-invalid-this: 2
no-return-assign: 2
no-shadow: 1
no-trailing-spaces: 2
no-use-before-define: [2, nofunc]
quotes: [2, single, avoid-escape]
semi: [2, always]
semi: 0
strict: [2, global]
valid-jsdoc: [2, requireReturn: false]
no-control-regex: 0
Expand Down
11 changes: 0 additions & 11 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,13 @@ This template is for bug or error reports. For other issues please use:

**What version of Ajv are you using? Does the issue happen if you use the latest version?**



**Ajv options object**

<!-- See https://github.com/ajv-validator/ajv#options -->

```javascript


```


**JSON Schema**

<!-- Please make it as small as possible to reproduce the issue -->
Expand All @@ -33,7 +28,6 @@ This template is for bug or error reports. For other issues please use:

```


**Sample data**

<!-- Please make it as small as posssible to reproduce the issue -->
Expand All @@ -43,7 +37,6 @@ This template is for bug or error reports. For other issues please use:

```


**Your code**

<!--
Expand All @@ -58,11 +51,8 @@ Thank you!
-->

```javascript


```


**Validation result, data AFTER validation, error messages**

```
Expand All @@ -72,5 +62,4 @@ Thank you!

**What results did you expect?**


**Are you going to resolve the issue?**
18 changes: 3 additions & 15 deletions .github/ISSUE_TEMPLATE/bug-or-error-report.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Bug or error report
about: Please use for issues related to incorrect validation behaviour
title: ''
labels: 'bug report'
assignees: ''

title: ""
labels: "bug report"
assignees: ""
---

<!--
Expand All @@ -17,18 +16,13 @@ For other issues please see https://github.com/ajv-validator/ajv/blob/master/CON

**What version of Ajv are you using? Does the issue happen if you use the latest version?**



**Ajv options object**

<!-- See https://github.com/ajv-validator/ajv#options -->

```javascript


```


**JSON Schema**

<!-- Please make it as small as possible to reproduce the issue -->
Expand All @@ -38,7 +32,6 @@ For other issues please see https://github.com/ajv-validator/ajv/blob/master/CON

```


**Sample data**

<!-- Please make it as small as posssible to reproduce the issue -->
Expand All @@ -48,7 +41,6 @@ For other issues please see https://github.com/ajv-validator/ajv/blob/master/CON

```


**Your code**

<!--
Expand All @@ -63,11 +55,8 @@ Thank you!
-->

```javascript


```


**Validation result, data AFTER validation, error messages**

```
Expand All @@ -77,5 +66,4 @@ Thank you!

**What results did you expect?**


**Are you going to resolve the issue?**
7 changes: 3 additions & 4 deletions .github/ISSUE_TEMPLATE/change.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Feature or change proposal
about: For proposals of new features, options or some other improvements
title: ''
labels: 'enhancement'
assignees: ''

title: ""
labels: "enhancement"
assignees: ""
---

<!--
Expand Down
7 changes: 3 additions & 4 deletions .github/ISSUE_TEMPLATE/compatibility.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Browser and compatibility issue
about: For issues that only happen in a specific environment
title: ''
labels: 'compatibility'
assignees: ''

title: ""
labels: "compatibility"
assignees: ""
---

<!--
Expand Down
7 changes: 3 additions & 4 deletions .github/ISSUE_TEMPLATE/installation.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Installation and dependency issue
about: For issues that happen during installation
title: ''
labels: 'installation'
assignees: ''

title: ""
labels: "installation"
assignees: ""
---

<!--
Expand Down
12 changes: 3 additions & 9 deletions .github/ISSUE_TEMPLATE/typescript.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Missing or incorrect type definition
about: Please use for issues related to typescript types
title: ''
labels: 'typescript'
assignees: ''

title: ""
labels: "typescript"
assignees: ""
---

<!--
Expand All @@ -16,19 +15,15 @@ For other issues please see https://github.com/ajv-validator/ajv/blob/master/CON

**What version of Ajv are you using? Does the issue happen if you use the latest version?**


**Your typescript code**

<!--
Please make it as small as posssible to reproduce the issue
-->

```typescript


```


**Typescript compiler error messages**

```
Expand All @@ -38,5 +33,4 @@ Please make it as small as posssible to reproduce the issue

**Describe the change that should be made to address the issue?**


**Are you going to resolve the issue?**
2 changes: 0 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ Please answer the questions below.

**What issue does this pull request resolve?**


**What changes did you make?**


**Is there anything that requires more attention while reviewing?**
9 changes: 0 additions & 9 deletions .jshintrc

This file was deleted.

6 changes: 6 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
spec/JSON-Schema-Test-Suite
.browser
coverage
dist
.nyc_output
lib/dotjs
28 changes: 14 additions & 14 deletions .tonic_example.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
var Ajv = require('ajv');
var ajv = new Ajv({allErrors: true});
var Ajv = require("ajv")
var ajv = new Ajv({allErrors: true})

var schema = {
"properties": {
"foo": { "type": "string" },
"bar": { "type": "number", "maximum": 3 }
}
};
properties: {
foo: {type: "string"},
bar: {type: "number", maximum: 3},
},
}

var validate = ajv.compile(schema);
var validate = ajv.compile(schema)

test({"foo": "abc", "bar": 2});
test({"foo": 2, "bar": 4});
test({foo: "abc", bar: 2})
test({foo: 2, bar: 4})

function test(data) {
var valid = validate(data);
if (valid) console.log('Valid!');
else console.log('Invalid: ' + ajv.errorsText(validate.errors));
}
var valid = validate(data)
if (valid) console.log("Valid!")
else console.log("Invalid: " + ajv.errorsText(validate.errors))
}
26 changes: 13 additions & 13 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,22 @@ appearance, race, religion, or sexual identity and orientation.
Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
- Using welcoming and inclusive language
- Being respectful of differing viewpoints and experiences
- Gracefully accepting constructive criticism
- Focusing on what is best for the community
- Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
- The use of sexualized language or imagery and unwelcome sexual attention or
advances
- Trolling, insulting/derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or electronic
address, without explicit permission
- Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Expand Down

0 comments on commit 733cfab

Please sign in to comment.