Skip to content

Commit 5f88ee0

Browse files
authored
Merge branch 'master' into master
2 parents 5917a25 + 2653f56 commit 5f88ee0

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

.npmignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,4 @@ test/
8383
docs/doc-support
8484
docs/documentation
8585
docs/index.html
86-
docs/issue.html
86+
docs/issue.html

docs/lib/JSONSchemaMarkdown.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ class JSONSchemaMarkdown {
5151

5252
/**
5353
* Shorthand method to generate markdown from JSON Schema.
54-
* This is not the prefered method as errors will be more difficult to expose.
54+
* This is not the preferred method as errors will be more difficult to expose.
5555
* @param {Object|String} schema JS object or JSON string.
5656
* @returns {String} generated markdown
5757
*/
@@ -70,7 +70,7 @@ class JSONSchemaMarkdown {
7070
try {
7171
this.schema = JSON.parse(schema);
7272
} catch (e) {
73-
this.error('invalid json');
73+
this.error('invalid json: ' + e.stack);
7474
}
7575
} else {
7676
this.schema = schema;
@@ -223,8 +223,8 @@ class JSONSchemaMarkdown {
223223
}
224224
if (this.notEmpty(data.exclusiveMinimum) || this.notEmpty(data.exclusiveMaximum)) {
225225
this.indent(level);
226-
this.markdown += "Exlusive Range: ";
227-
this.writeMinMaxExlusive(data.exclusiveMinimum, data.exclusiveMaximum);
226+
this.markdown += "Exclusive Range: ";
227+
this.writeMinMaxExclusive(data.exclusiveMinimum, data.exclusiveMaximum);
228228
}
229229
this.writeMultipleOf(data.multipleOf);
230230
}
@@ -280,7 +280,7 @@ class JSONSchemaMarkdown {
280280
}
281281

282282
/**
283-
* This method is a catch for schema types that aren't recongized.
283+
* This method is a catch for schema types that aren't recognized.
284284
* You may want to treat anything resolving to this method as an error.
285285
* @param {name} name The JSON property name
286286
* @param {Object} data The JS data for the schema
@@ -445,7 +445,7 @@ class JSONSchemaMarkdown {
445445

446446
/**
447447
* Write notation for inclusive minimum and maximum.
448-
* @param {number} min Inclusive minimim
448+
* @param {number} min Inclusive minimum
449449
* @param {number} max Inclusive maximum
450450
*
451451
*/
@@ -461,11 +461,11 @@ class JSONSchemaMarkdown {
461461

462462
/**
463463
* Write notation for exclusive minimum and maximum.
464-
* @param {number} min Exclusive minimim
464+
* @param {number} min Exclusive minimum
465465
* @param {number} max Exclusive maximum
466466
*
467467
*/
468-
writeMinMaxExlusive(min, max) {
468+
writeMinMaxExclusive(min, max) {
469469
if (this.notEmpty(min)) {
470470
this.markdown += " > " + min + "\n";
471471
}

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"keywords": [
77
"json-schema"
88
],
9-
"version": "0.1.8",
9+
"version": "0.1.81",
1010
"license": "See LICENSE file",
1111
"repository": {
1212
"type": "git",

scripts/npm.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ const fs = require('fs');
33
var ignore = fs.readFileSync('./.gitignore');
44
ignore += "\n";
55
ignore += "# npm ignore\n";
6-
ignore += "docs/\n";
6+
ignore += "docs/documentation/\n";
77
fs.writeFileSync('./.npmignore', ignore);

0 commit comments

Comments
 (0)