diff --git a/.eslintrc b/.eslintrc
index ed3e560dfa395db1683d039a40c6a2506e81ee69..0de2b417f7dc97410180fbb6dd93a300a64c0e3b 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -31,6 +31,7 @@
}],
"space-unary-ops": 2,
"comma-spacing": ["error", { "before": false, "after": true }],
- "space-before-function-paren": ["error", "always"]
+ "space-before-function-paren": ["error", "always"],
+ "arrow-spacing": "error"
}
}
diff --git a/cli.js b/cli.js
index dc4337907fbb55832df9044d66e6198ae34ed0a0..a90e1fa52427f28d011ec1dd2183d355e24ebcba 100644
--- a/cli.js
+++ b/cli.js
@@ -85,7 +85,7 @@ if (target.isDirectory()) {
Schema.setAjv(ajv);
Schema.setSchemaPathMap(schemaPathMap);
return Promise.reduce(files, readSchemaFile, schemaPathMap)
- .then((schemaMap)=>{
+ .then((schemaMap) => {
logger.info('finished reading all *.schema.json files in %s, beginning processing….', schemaPath);
return Schema.load(schemaMap, schemaPath, outDir, schemaDir, metaElements);
})
@@ -97,7 +97,7 @@ if (target.isDirectory()) {
process.exit(1);
});
})
- .on('error', (err)=>{
+ .on('error', (err) => {
logger.error(err);
process.exit(1);
});
diff --git a/lib/readSchemaFile.js b/lib/readSchemaFile.js
index 0e49b3de032773349c199877f35830b43b1027cc..5a001e6fd82cde6be5230dfb6619e69979be55ed 100644
--- a/lib/readSchemaFile.js
+++ b/lib/readSchemaFile.js
@@ -15,7 +15,7 @@ module.exports = function readSchemaFile (schemaPathMap, fullPath) {
schemaPathMap = {};
}
return fs.readFileAsync(fullPath)
- .then((data)=>{
+ .then((data) => {
let schema = JSON.parse(data);
let obj = {};
obj.filePath = fullPath;
diff --git a/lib/schema.js b/lib/schema.js
index aa13189863c32f06d38db856fb2beedc03cafcc8..e160c656228df709ef3c79aff5661b522cf1da58 100644
--- a/lib/schema.js
+++ b/lib/schema.js
@@ -87,7 +87,7 @@ var resolve$ref = Promise.method(function (val, base$id){
if (pointer.has(obj, refArr.endpart)){
var ischema = _.cloneDeep(pointer.get(obj, refArr.endpart));
- _.forOwn(val, (v, k)=>{
+ _.forOwn(val, (v, k) => {
if (k !== '$ref'){
ischema[k]=v;
}
@@ -103,8 +103,8 @@ var processFurther = Promise.method(function (val, key, $id){
} else {
if (val['items'] && val['type'] === 'array'){
if (val['items']['$ref']){
- resolve$ref(val['items']).then((s)=>{
- _.forOwn(s, (v, k)=>{
+ resolve$ref(val['items']).then((s) => {
+ _.forOwn(s, (v, k) => {
if (k !== '$ref'){
val['items'][k]=v;
}
@@ -125,12 +125,12 @@ processISchema = Promise.method(function (schema, base$id){
let arr = schema['anyOf']? schema['anyOf'] : schema['oneOf'];
_.each(arr, function (value, index) {
if (value['$ref']){
- resolve$ref(value, base$id).then((piSchema)=>{
+ resolve$ref(value, base$id).then((piSchema) => {
delete arr[index];
arr[index]=piSchema;
});
} else {
- processISchema(value, base$id).then((piSchema)=>{
+ processISchema(value, base$id).then((piSchema) => {
delete arr[index];
arr[index]=piSchema;
});
@@ -149,7 +149,7 @@ processISchema = Promise.method(function (schema, base$id){
} else {
if (val['$ref']){
- resolve$ref(val, base$id).then((piSchema)=>{//check // not sending correct id
+ resolve$ref(val, base$id).then((piSchema) => {//check // not sending correct id
schema['items']=piSchema;
});
} else {
@@ -161,7 +161,7 @@ processISchema = Promise.method(function (schema, base$id){
return schema;
});
function processSchema (schema){
- return new Promise((resolve, reject)=>{
+ return new Promise((resolve, reject) => {
if (!schema.properties) {schema.properties={};}
var $id = schema['$id'] || schema['id'];
var base$id = $id;
@@ -189,7 +189,7 @@ function processSchema (schema){
processSchema(ischema).then((psSchema) => {
if ( psSchema['properties'] ){
_.forOwn(psSchema['properties'], (val, key) => {
- processFurther(val, key, refArr.startpart).then((pfSchema)=>{
+ processFurther(val, key, refArr.startpart).then((pfSchema) => {
if (pfSchema){
schema.properties[key] = pfSchema;
schema.properties[key].$oSchema={};
@@ -212,7 +212,7 @@ function processSchema (schema){
} else {
if ( ischema['properties'] ){
_.forOwn(ischema['properties'], (val, key) => {
- processFurther(val, key, refArr.startpart).then((pfSchema)=>{
+ processFurther(val, key, refArr.startpart).then((pfSchema) => {
if (pfSchema){
schema.properties[key] = pfSchema;
if (refArr.refType === 'yAbsWithDef'){
@@ -251,7 +251,7 @@ function processSchema (schema){
resolve(schema);
} else if (schema['properties']){
_.forOwn(schema['properties'], (val, key) => {
- processFurther(val, key, base$id).then((pfSchema)=>{
+ processFurther(val, key, base$id).then((pfSchema) => {
if (pfSchema){
schema.properties[key] = pfSchema;
@@ -341,14 +341,14 @@ Schema.getExamples = function (filePath, schema){
filename=filename.split('.')[0]+'.example.*.json';
return new Promise((resolve, reject) => {
readdirp({ root: dirname, fileFilter: filename })
- .on('data', (entry)=>exampleFileNames.push(entry.fullPath))
+ .on('data', (entry) => exampleFileNames.push(entry.fullPath))
.on('end', () => resolve(exampleFileNames))
.on('error', (err) => reject(err));
- }).then((exampleFileNames)=>{
+ }).then((exampleFileNames) => {
if (exampleFileNames.length > 0){
var validate=this._ajv.compile(schema);
- return Promise.map(exampleFileNames, (entry)=>{
- return fs.readFileAsync(entry).then((example)=>{
+ return Promise.map(exampleFileNames, (entry) => {
+ return fs.readFileAsync(entry).then((example) => {
var data = JSON.parse(example.toString());
var valid = validate(data);
if (valid) {examples.push(data);} else {logger.error(entry+' is an invalid Example');}
@@ -411,11 +411,11 @@ Schema.load = function (schemaMap, schemaPath, docDir, schemaDir, metaElements)
// wSchema:schemaClone,
// mSchema:traverseSchema(allSchema,schemaMap[schemaKey].filePath)
// })
- return processSchema(schemaClone).then((mSchema)=>{
+ return processSchema(schemaClone).then((mSchema) => {
mSchema.metaElements=metaElements;
return { mSchema:mSchema, wSchema:allSchema, dep:wmap };
});
- }).then((object)=>{
+ }).then((object) => {
return Promise.all([
Writer.generateMarkdown(schemaMap[schemaKey].filePath, object.mSchema, schemaPath, docDir, object.dep),
Writer.generateNewSchemaFiles(schemaMap[schemaKey].filePath, object.wSchema, schemaPath, schemaDir) ]);
diff --git a/lib/writeFiles.js b/lib/writeFiles.js
index 608f1ab615c97a8854a2a33cd6f4deb691696901..903d1afab5d9fa0b89453f0bc35a21fcc43ac77f 100644
--- a/lib/writeFiles.js
+++ b/lib/writeFiles.js
@@ -20,7 +20,7 @@ var validUrl = require('valid-url');
var Writer = {};
var writeFile = function (outputDir, fileName, data) {
if (!fs.existsSync(outputDir)){
- return mkdirp(outputDir).then(()=>{
+ return mkdirp(outputDir).then(() => {
return fs.writeFileAsync(path.join(outputDir, fileName), data);
});
} else {