Upgrade downconverter to latest api-spec-converter code, with fixes

MikeRalphson · MikeRalphson · commit 151e0a615efe · 2018-11-23T20:54:37.000Z
diff --git a/adaptor.js b/adaptor.js
@@ -767,7 +767,11 @@ function transform(api, defaults, callback) {
         obj.swagger = defaults.swagger;
     }
     else {
-        obj.swagger = downconverter(api);
+        const container = {};
+        container.spec = api;
+        container.source = defaults.source;
+        let conv = new downconverter(container);
+        obj.swagger = conv.convert();
     }
 
     obj["swagger-yaml"] = yaml.safeDump(obj.swagger, {lineWidth:-1}); // set to original if converted v2.0
diff --git a/cg.js b/cg.js
@@ -200,6 +200,7 @@ if (argv.zip) {
     processor.fileFunctions.mkdirp = nop;
     processor.fileFunctions.mkdirp.sync = nop;
 }
+config.defaults.source = defName;
 
 let up = url.parse(defName);
 if (up.protocol && up.protocol.startsWith('http')) {
diff --git a/lib/orange/downconvert.js b/lib/orange/downconvert.js

Original file line number	Diff line number	Diff line change
`@@ -767,7 +767,11 @@ function transform(api, defaults, callback) {`
`767`	`767`	`obj.swagger = defaults.swagger;`
`768`	`768`	`}`
`769`	`769`	`else {`
`770`		`- obj.swagger = downconverter(api);`
	`770`	`+ const container = {};`
	`771`	`+ container.spec = api;`
	`772`	`+ container.source = defaults.source;`
	`773`	`+ let conv = new downconverter(container);`
	`774`	`+ obj.swagger = conv.convert();`
`771`	`775`	`}`
`772`	`776`
`773`	`777`	`obj["swagger-yaml"] = yaml.safeDump(obj.swagger, {lineWidth:-1}); // set to original if converted v2.0`
Original file line number	Diff line number	Diff line change
`@@ -200,6 +200,7 @@ if (argv.zip) {`
`200`	`200`	`processor.fileFunctions.mkdirp = nop;`
`201`	`201`	`processor.fileFunctions.mkdirp.sync = nop;`
`202`	`202`	`}`
	`203`	`+config.defaults.source = defName;`
`203`	`204`
`204`	`205`	`let up = url.parse(defName);`
`205`	`206`	`if (up.protocol && up.protocol.startsWith('http')) {`