Skip to content
Snippets Groups Projects
Commit 24078816 authored by Anjan Kaur's avatar Anjan Kaur
Browse files

Bug Fix for single file #25

parent a7e813a6
No related branches found
No related tags found
No related merge requests found
......@@ -111,9 +111,7 @@ var GenerateForAllFiles = function (dirname) {
.then(() => {
logger.info("Read Schema files!!!")
return Schema.load(schemaPathMap,schemaPath,outDir,metaElements)
// .then(()=>{
// console.log(data);
// })
})
})
......@@ -122,19 +120,23 @@ var GenerateForAllFiles = function (dirname) {
if(argv.f){
//generating markdown for a single file
Schema.load( schemaPath , baseURL)
.then((processedSchemas) => {
if(argv.s)
return Promise.all([generateMarkdown(schemaPath,processedSchemas.mSchema),
generateNewSchemaFiles(schemaPath,processedSchemas.wSchema)]);
else
return generateMarkdown(schemaPath,processedSchemas.mSchema);
})
.then(() => logger.info("Done!!!"))
.catch((err) => {logger.error(err)})
}
else {
GenerateForAllFiles(schemaPath)
.then(()=>{logger.info("Done!!!")})
.catch((err) => {logger.error(err)})
}
readSchemaFiles(schemaPath).then(()=>{
ajv.addSchema(require(schemaPath),schemaPath);
Schema.setAjv(ajv);
Schema.setSchemaPathMap(schemaPathMap);
logger.info("Read Schema files!!!");
Schema.load( schemaPathMap , schemaPath, outDir, metaElements)
.then(()=>{logger.info("Done!!!")})
.catch((err) => {
logger.error("Error Occurred. Processing Incomplete!!!")
logger.error(err)})
})
}
else {
GenerateForAllFiles(schemaPath)
.then(()=>{logger.info("Done!!!")})
.catch((err) => {
logger.error("Error Occurred. Processing Incomplete!!!")
logger.error(err)
})
}
......@@ -425,37 +425,38 @@ Schema.load = function(schemaMap,schemaPath,outDir,metaElements){
smap=schemaMap;
let keys = Object.keys(schemaMap);
return Promise.mapSeries(keys,(schemaKey) => {
{
var props = Object.keys(wmap);
for (var i = 0; i < props.length; i++) {
delete wmap[props[i]];
}
}
let schema = schemaMap[schemaKey].jsonSchema;
sPath=schemaMap[schemaKey].filePath;
return Schema.getExamples(schemaMap[schemaKey].filePath,schema)
.then((egs_schema) => Schema.getDescription(schemaMap[schemaKey].filePath,egs_schema))
.then((all_schema) => {
var schemaClone = _.cloneDeep(all_schema);
return Schema.getExamples(schemaMap[schemaKey].filePath,schema)
.then((egs_schema) => Schema.getDescription(schemaMap[schemaKey].filePath,egs_schema))
.then((all_schema) => {
var schemaClone = _.cloneDeep(all_schema);
// return Promise.props({
// wSchema:schemaClone,
// mSchema:traverseSchema(all_schema,schemaMap[schemaKey].filePath)
// })
return processSchema(schemaClone).then((mSchema)=>{
return processSchema(schemaClone).then((mSchema)=>{
mSchema.metaElements=metaElements;
return {mSchema:mSchema,wSchema:all_schema,dep:wmap}
})
}).then((object)=>{
return Promise.all([Writer.generateMarkdown(schemaMap[schemaKey].filePath,object.mSchema,schemaPath,outDir,object.dep),
Writer.generateNewSchemaFiles(schemaMap[schemaKey].filePath,object.wSchema,schemaPath,outDir)]);
})
// })
}).then((object)=>{
return Promise.all([Writer.generateMarkdown(schemaMap[schemaKey].filePath,object.mSchema,schemaPath,outDir,object.dep),
Writer.generateNewSchemaFiles(schemaMap[schemaKey].filePath,object.wSchema,schemaPath,outDir)]);
})
// })
}).then(()=>{
// console.log(JSON.stringify(wmap));
})
.catch((err) => console.error(err));
// .then(()=>{
// // console.log(JSON.stringify(wmap));
// })
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment