Merge pull request #155 from swisspush/develop

Release 0.9.12
swisspost · Oct 28, 2020 · d99e2bf · d99e2bf
2 parents 93a3c69 + 0da9cb1
commit d99e2bf
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "apikana",
-  "version": "0.9.11",
+  "version": "0.9.12",
   "description": "Integrated tools for REST API design - ｱﾋﾟ",
   "main": "index.js",
   "bin": {

diff --git a/src/generate.js b/src/generate.js
@@ -499,16 +499,7 @@ module.exports = {
                     var type = fileToType[path.parse(value).base];
                     this.update('#/definitions/' + type);
                 }
-                if(this.key === 'id' && this.parent.key === value) {
-                    this.delete(this.key);
-                }
             });
-            var out = path.resolve(dest, 'model/openapi');
-            fse.mkdirsSync(out);
-            fs.writeFileSync(path.resolve(out, 'api.json'), JSON.stringify(restApi, null, 2));
-            fs.writeFileSync(path.resolve(out, 'api.yaml'), yaml.stringify(restApi, 6, 2));
-            fs.writeFileSync(path.resolve(out, 'complete-api.json'), JSON.stringify(completeApi, null, 2));
-            fs.writeFileSync(path.resolve(out, 'complete-api.yaml'), yaml.stringify(completeApi, 6, 2));
 
             var promises = modelNames
                 .map(modelName => ({ modelName, schema: Object.assign({}, completeApi.definitions[modelName])}))
@@ -526,7 +517,21 @@ module.exports = {
                     return jsonSchemaAvro().convert(fullSchema).then(avroSchema =>
                         fs.writeFileSync(path.resolve(avroOutputDir, fileName + '.avsc'), JSON.stringify(avroSchema, 6, 2)));
                 });
-            return Promise.all(promises);
+
+            return Promise.all(promises).then( () => {
+                traverse.forEach(completeApi, function (value) {
+                    if(this.key === 'id' && this.parent.key === value) {
+                        this.delete(this.key);
+                    }
+                });
+
+                var out = path.resolve(dest, 'model/openapi');
+                fse.mkdirsSync(out);
+                fs.writeFileSync(path.resolve(out, 'api.json'), JSON.stringify(restApi, null, 2));
+                fs.writeFileSync(path.resolve(out, 'api.yaml'), yaml.stringify(restApi, 6, 2));
+                fs.writeFileSync(path.resolve(out, 'complete-api.json'), JSON.stringify(completeApi, null, 2));
+                fs.writeFileSync(path.resolve(out, 'complete-api.yaml'), yaml.stringify(completeApi, 6, 2));
+            });
         });
 
         // Traverse the reference tree to keep only the needed definitions for the root schema