Skip to content

Remove sync/async optimisation, evaluate everything as promise #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 25, 2016
Merged

Remove sync/async optimisation, evaluate everything as promise #1

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
130b141
started rewrite to wrap all values in promises
epoberezkin Mar 5, 2016
7f34fad
convert scalar values to promises
epoberezkin Apr 25, 2016
a953473
removed unused code
epoberezkin Apr 25, 2016
bc881fb
bump versions
epoberezkin Apr 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
convert scalar values to promises
  • Loading branch information
@epoberezkin
epoberezkin committed Apr 25, 2016
commit 7f34fadab5471a754e6c82b5935e859f94268bbe
4 changes: 3 additions & 1 deletion lib/jsonscript.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,9 @@ function addAjvKeywords() {
addAjvKeyword.call(this, 'validateAsync');
addAjvKeyword.call(this, 'itemsSerial', 'array');
this._evalKeywords.objectToAsync = util.objectToPromise;
this._evalKeywords.valueToAsync = util.toPromise;
addAjvKeyword.call(this, 'objectToAsync', 'object', true);
addAjvKeyword.call(this, 'valueToAsync', undefined, true);
this.ajv.addKeyword('resolvePendingRefs', {
validate: evaluationKeywords.resolvePendingRefs,
schema: false
Expand Down Expand Up @@ -151,7 +153,7 @@ function addCoreInstructions() {
* @this JSONScript
*/
function generateSchemas() {
this.ajv.addMetaSchema(_generate.call(this, 'evaluate_metaschema'));
// this.ajv.addMetaSchema(_generate.call(this, 'evaluate_metaschema'));
this._validate = this.ajv.compile(_generate.call(this, 'schema'));
this._evaluate = this.ajv.compile(_generate.call(this, 'evaluate'));
// console.log(this._validate.toString().length, this._evaluate.toString().length);
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jsonscript-js",
"version": "0.1.3",
"version": "0.2.0",
"description": "JavaScript interpreter for JSONScript",
"main": "lib/jsonscript.js",
"scripts": {
Expand Down Expand Up @@ -30,14 +30,14 @@
"ajv": "^3.7.1",
"dot": "^1.0.3",
"json-pointer": "^0.3.1",
"jsonscript": "^0.1.3"
"jsonscript": "^0.2.0"
},
"devDependencies": {
"coveralls": "^2.11.6",
"eslint": "^2.2.0",
"istanbul": "^0.4.2",
"jsonscript-test": "^0.1.1",
"jsonscript-test-suite": "^0.1.1",
"jsonscript-test-suite": "^0.1.2",
"mocha": "^2.4.5",
"pre-commit": "^1.1.2"
}
Expand Down