Skip to content

Commit 4b17d7f

Browse files
committed
json-script.com -> jsonscript.org; update dependencies
1 parent 698e643 commit 4b17d7f

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ This method throws exception if you use the name that is already used (including
113113

114114
Define JSONScript instruction. Core instructions are added using this method too.
115115

116-
`definition` should be valid according to the [instruction schema](http://www.json-script.com/schema/instruction.json#).
116+
`definition` should be valid according to the [instruction schema](http://www.jsonscript.org/schema/instruction.json#).
117117

118118
`func` is the function used to evaluate instruction, it can return:
119119

@@ -129,7 +129,7 @@ Class `Script` is available as the property of both the class and the instance o
129129

130130
Define macro. Core macros are added using this method too.
131131

132-
`definition` should be valid according to the [macro schema](http://www.json-script.com/schema/macro.json#).
132+
`definition` should be valid according to the [macro schema](http://www.jsonscript.org/schema/macro.json#).
133133

134134

135135
## Options
@@ -143,7 +143,7 @@ Defaults:
143143
}
144144
```
145145

146-
- _strict_: use strict JSONScript schema (see [schemas](http://www.json-script.com/schema.html)). Strict schema validates instruction keyword values if they are defined as constant so it would fail faster if the script is invalid and no instructions will be executed, but the validation itself takes longer.
146+
- _strict_: use strict JSONScript schema (see [schemas](http://www.jsonscript.org/schema.html)). Strict schema validates instruction keyword values if they are defined as constant so it would fail faster if the script is invalid and no instructions will be executed, but the validation itself takes longer.
147147
- _executors_: an object with executors (keys are names).
148148

149149

lib/jsonscript.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ function evaluateScript(script, data, shouldExpandMacros) {
9696
/**
9797
* add JSONScript instruction to the interpreter
9898
* @this JSONScript
99-
* @param {Object} definition instruction definition, should be valid according to the schema http://www.json-script.com/schema/instruction.json#
99+
* @param {Object} definition instruction definition, should be valid according to the schema http://www.jsonscript.org/schema/instruction.json#
100100
* @param {Function} keywordFunc function to implement the instruction, accepts instruction object and dataPath as parameter, should return sync/async value or Script instance
101101
* @param {Boolean} _regenerateSchemas pass false to prevent regenerating the schemas, can be used when multiple instructions are added
102102
*/
@@ -115,7 +115,7 @@ function addInstruction(definition, keywordFunc, _regenerateSchemas) {
115115
/**
116116
* add JSONScript macro to the interpreter
117117
* @this JSONScript
118-
* @param {Object} definition macro definition, should be valid according to the schema http://www.json-script.com/schema/macro.json#
118+
* @param {Object} definition macro definition, should be valid according to the schema http://www.jsonscript.org/schema/macro.json#
119119
* @param {Boolean} _regenerateSchemas pass false to prevent regenerating the schemas, can be used when multiple macros are added
120120
*/
121121
function addMacro(definition, _regenerateSchemas) {

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jsonscript-js",
3-
"version": "0.5.2",
3+
"version": "0.6.0",
44
"description": "JavaScript interpreter for JSONScript",
55
"main": "lib/jsonscript.js",
66
"scripts": {
@@ -27,17 +27,17 @@
2727
},
2828
"homepage": "https://github.com/JSONScript/jsonscript-js",
2929
"dependencies": {
30-
"ajv": "^4.0.5",
30+
"ajv": "^4.7.0",
3131
"dot": "^1.0.3",
3232
"json-pointer": "^0.3.1",
33-
"jsonscript": "^0.5.0"
33+
"jsonscript": "^0.6.0"
3434
},
3535
"devDependencies": {
3636
"coveralls": "^2.11.6",
3737
"eslint": "^2.2.0",
3838
"istanbul": "^0.4.2",
39-
"jsonscript-test": "^0.4.0",
40-
"jsonscript-test-suite": "^0.5.0",
39+
"jsonscript-test": "^0.6.0",
40+
"jsonscript-test-suite": "^0.6.0",
4141
"mocha": "^2.4.5",
4242
"pre-commit": "^1.1.2"
4343
}

0 commit comments

Comments
 (0)