Skip to content

set appropriate schema reference if schema id is provided by an object #77

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

Closed
Azerothian wants to merge 4 commits into from
Closed

set appropriate schema reference if schema id is provided by an object #77

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be4d60c
object uri fix
Azerothian Mar 18, 2018
db809dd
Merge pull request #1 from BigstickCarpet/master
Azerothian Mar 22, 2018
7e52912
Merge remote-tracking branch 'origin/master' into set-local-uri
Azerothian Mar 22, 2018
e4d84ff
added a dollar sign
Azerothian Mar 22, 2018
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
11 changes: 9 additions & 2 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,16 @@ $RefParser.prototype.parse = function (path, schema, options, callback) {
pathType = 'file';
}

// Resolve the absolute path of the schema
args.path = url.resolve(url.cwd(), args.path);

if (args.schema && typeof args.schema === 'object') {
// A schema object was passed-in.
if (args.schema.$id) { // if an id is passed it will use the base uri for the path of the object
var u = url.parse(args.schema.$id);
args.path = u.protocol + '//' + u.host + '/#';
}
else {
args.path = url.resolve(url.cwd(), args.path);
}
// So immediately add a new $Ref with the schema object as its value
var $ref = this.$refs._add(args.path);
$ref.value = args.schema;
Expand All @@ -104,6 +109,8 @@ $RefParser.prototype.parse = function (path, schema, options, callback) {
}
else {
// Parse the schema file/url
// Resolve the absolute path of the schema
args.path = url.resolve(url.cwd(), args.path);
promise = parse(args.path, this.$refs, args.options);
}

Expand Down