Redocly/redoc
1
1
Fork 0
mirror of https://github.com/Redocly/redoc.git synced 2024-11-23 00:56:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix reference resolution from external files (fixes #96)

Browse Source
This commit is contained in:
Roman Hotsiy 2016-11-08 11:02:36 +02:00
parent 8e074c6319
commit 31373bd965
No known key found for this signature in database
GPG Key ID: 5CB7B3ACABA57CB0
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/utils/spec-manager.ts
View File

@ -15,6 +15,7 @@ export class SpecManager {
public spec = new BehaviorSubject<any|null>(null);
private _instance: any;
private _url: string;
private parser: any;
static instance() {
return new SpecManager();
@ -31,7 +32,8 @@ export class SpecManager {
load(urlOrObject: string|Object) {
this.schema = null;
let promise = new Promise((resolve, reject) => {
JsonSchemaRefParser.bundle(urlOrObject, {http: {withCredentials: false}})
this.parser = new JsonSchemaRefParser();
this.parser.bundle(urlOrObject, {http: {withCredentials: false}})
.then(schema => {
if (typeof urlOrObject === 'string') {
this._url = urlOrObject;
@ -97,9 +99,16 @@ export class SpecManager {
byPointer(pointer) {
let res = null;
if (pointer == undefined) return null;
try {
res = JsonPointer.get(this._schema, decodeURIComponent(pointer));
} catch(e) {/*skip*/ }
} catch(e) {
// if resolved from outer files simple jsonpointer.get fails to get correct schema
if (pointer.charAt(0) !== '#') pointer = '#' + pointer;
try {
res = this.parser.$refs.get(decodeURIComponent(pointer));
} catch(e) { /* skip */ }
}
return res;
}