Merge branch 'master' into feature/json-and-model-external-references-fe

taras-dubyk · web-flow · commit 72dd1dde208e · 2020-09-16T13:35:00.000+03:00
diff --git a/forward_engineering/api.js b/forward_engineering/api.js
@@ -107,9 +107,14 @@ const addCommentsSigns = (string, format) => {
 	const commentsEnd = /hackoladeCommentEnd\d+/i;
 	const innerCommentStart = /hackoladeInnerCommentStart/i;
 	const innerCommentEnd = /hackoladeInnerCommentEnd/i;
+	const innerCommentStartYamlArrayItem = /- hackoladeInnerCommentStart/i;
 	
 	const { result } = string.split('\n').reduce(({ isCommented, result }, line, index, array) => {
 		if (commentsStart.test(line) || innerCommentStart.test(line)) {
+			if (innerCommentStartYamlArrayItem.test(line)) {
+				const lineBeginsAt = array[index + 1].search(/\S/);
+				array[index + 1] = array[index + 1].slice(0, lineBeginsAt) + '- ' + array[index + 1].slice(lineBeginsAt);
+			}
 			return { isCommented: true, result: result };
 		}
 		if (commentsEnd.test(line)) {
@@ -123,7 +128,7 @@ const addCommentsSigns = (string, format) => {
 		}
 
 		const isNextLineInnerCommentStart = index + 1 < array.length && innerCommentStart.test(array[index + 1]);
-		if (isCommented || isNextLineInnerCommentStart) {
+		if ((isCommented || isNextLineInnerCommentStart) && !innerCommentStartYamlArrayItem.test(array[index + 1])) {
 			result = result + '# ' + line + '\n';
 		} else {
 			result = result + line + '\n';
diff --git a/forward_engineering/helpers/commentsHelper.js b/forward_engineering/helpers/commentsHelper.js
@@ -0,0 +1,36 @@
+const commentFlags = {
+	inner: {
+		start: 'hackoladeInnerCommentStart',
+		end: 'hackoladeInnerCommentEnd'
+	},
+	outer: {
+		start: 'hackoladeCommentStart',
+		end: 'hackoladeCommentEnd'
+	}
+};
+
+function commentDeactivatedItem(item, isActivated, isParentActivated, commentFlagNames) {
+	if (!item || !isParentActivated) {
+		return item;
+	}
+
+	if (isActivated === false) {
+		return {
+			[commentFlagNames.start]: true,
+			...item,
+			[commentFlagNames.end]: true
+		};
+	}
+
+	return item;
+}
+
+function commentDeactivatedItemInner(item, isActivated, isParentActivated) {
+	return commentDeactivatedItem(item, isActivated, isParentActivated, commentFlags.inner);
+}
+
+function commentDeactivatedItemOuter(item, isActivated, isParentActivated) {
+	return commentDeactivatedItem(item, isActivated, isParentActivated, commentFlags.outer);
+}
+
+module.exports = { commentFlags, commentDeactivatedItemInner, commentDeactivatedItemOuter };
diff --git a/forward_engineering/helpers/componentsHelpers/parametersHelper.js b/forward_engineering/helpers/componentsHelpers/parametersHelper.js
@@ -3,6 +3,7 @@ const getExtensions = require('../extensionsHelper');
 const { mapSchema } = require('./schemasHelper');
 const { getExamples } = require('./examplesHelper');
 const { getRef, hasRef, hasChoice } = require('../typeHelper');
+const { commentDeactivatedItemInner } = require('../commentsHelper');
 
 function getParameters(data) {
 	if (!data || !data.properties) {
@@ -20,14 +21,14 @@ function getParameters(data) {
 		}, {});
 }
 
-function mapParameter(data, required) {
+function mapParameter(data, required, isParentActivated = false) {
 	if (!data) {
 		return;
 	}
 	if (hasRef(data)) {
-		return getRef(data);
+		return commentDeactivatedItemInner(getRef(data), data.isActivated, isParentActivated);
 	}
-
+	const isActivated = data.isActivated && isParentActivated;
 	const parameter = {
 		name: data.parameterName,
 		in: getIn(data.type),
@@ -38,14 +39,14 @@ function mapParameter(data, required) {
 		style: data.style,
 		explode: data.explode,
 		allowReserved: data.allowReserved,
-		schema: mapSchema(get(data, 'properties.schema'), 'schema'),
+		schema: mapSchema(get(data, 'properties.schema'), 'schema', isActivated),
 		example: data.sample,
 		examples: getExamples(get(data, 'properties.examples')),
-		content: getContent(get(data, 'properties.content'))
+		content: getContent(get(data, 'properties.content'), isActivated)
 	};
 	const extensions = getExtensions(data.scopesExtensions);
 
-	return Object.assign({}, parameter, extensions);
+	return commentDeactivatedItemInner(Object.assign({}, parameter, extensions), data.isActivated, isParentActivated);
 }
 
 function getIn(parameterType) {
@@ -59,37 +60,39 @@ function getIn(parameterType) {
 	return parameterTypeToIn[parameterType];
 }
 
-function getHeaders(data) {
+function getHeaders(data, isParentActivated = false) {
 	if (!data || !data.properties) {
 		return;
 	}
 
 	return Object.entries(data.properties)
 		.map(([key, value]) => {
+			const isActivated = value.isActivated;
 			return {
 				key,
-				value: mapHeader(value)
+				value: mapHeader(value, isActivated && isParentActivated),
+				isActivated
 			};
 		})
-		.reduce((acc, { key, value }) => {
-			acc[key] = value;
+		.reduce((acc, { key, value, isActivated }) => {
+			acc[key] = commentDeactivatedItemInner(value, isActivated, isParentActivated);
 			return acc;
 		}, {});
 }
 
-function mapHeader(data) {
+function mapHeader(data, isParentActivated = false) {
 	if (!data) {
 		return;
 	} 
 	if (hasRef(data)) {
-		return getRef(data);
+		return commentDeactivatedItemInner(getRef(data), data.isActivated, isParentActivated);
 	}
 
 	delete data.parameterName;
-    return mapParameter(data);
+    return mapParameter(data, false, isParentActivated);
 }
 
-function getContent(data) {
+function getContent(data, isParentActivated) {
     if (!data || !data.properties) {
         return;
     }
@@ -104,24 +107,32 @@ function getContent(data) {
 		if (isSchemaEmpty && isExamplesEmpty) {
 			return;
 		}
-        acc[key] = mapMediaTypeObject(data.properties[key]);
+		const isActivated = data.properties[key].isActivated;
+        acc[key] = commentDeactivatedItemInner(
+			mapMediaTypeObject(
+				data.properties[key],
+				isActivated && isParentActivated
+			),
+			isActivated,
+			isParentActivated
+		);
         return acc;
     }, {});
 }
 
-function mapMediaTypeObject(data) {
+function mapMediaTypeObject(data, isParentActivated = false) {
     if (!data || !data.properties) {
         return;
     }
-	let schema = mapSchema(get(data, 'properties.schema'), 'schema');
+	let schema = mapSchema(get(data, 'properties.schema'), 'schema', isParentActivated);
 	if (!schema && hasChoice(data)) {
 		schema = mapSchema({
 			type: 'object',
 			allOf: data.allOf,
 			oneOf: data.oneOf,
 			anyOf: data.anyOf,
 			not: data.not
-		}, 'schema');
+		}, 'schema', isParentActivated);
 	}
     const examples = getExamples(get(data, 'properties.examples'));
     const encoding = mapEncoding(get(data, 'properties.encoding'));
diff --git a/forward_engineering/helpers/componentsHelpers/requestBodiesHelper.js b/forward_engineering/helpers/componentsHelpers/requestBodiesHelper.js
@@ -2,6 +2,7 @@ const get = require('lodash.get');
 const { getContent } = require('./parametersHelper');
 const getExtensions = require('../extensionsHelper');
 const { getRef, hasRef } = require('../typeHelper');
+const { commentDeactivatedItemInner } = require('../commentsHelper');
 
 function getRequestBodies(data) {
 	if (!data || !data.properties) {
@@ -21,15 +22,15 @@ function getRequestBodies(data) {
         }, {});
 }
 
-function mapRequestBody(data, required) {
+function mapRequestBody(data, required, isParentActivated = false) {
     if (!data) {
         return;
     }
     if (hasRef(data)) {
-		return getRef(data);
+		return commentDeactivatedItemInner(getRef(data), data.isActivated, isParentActivated);
 	}
 
-    const content = getContent(data);
+    const content = getContent(data, data.isActivated && isParentActivated);
     if (!content) {
         return;
     }
@@ -41,7 +42,7 @@ function mapRequestBody(data, required) {
     }
     const extensions = getExtensions(data.scopesExtensions);
 
-    return Object.assign({}, requestBody, extensions);
+    return commentDeactivatedItemInner(Object.assign({}, requestBody, extensions), data.isActivated, isParentActivated);
 }
 
 module.exports = {
diff --git a/forward_engineering/helpers/componentsHelpers/responsesHelper.js b/forward_engineering/helpers/componentsHelpers/responsesHelper.js
@@ -30,8 +30,8 @@ function mapResponse(data, responseCollectionDescription, shouldResponseBeCommen
 		return getRef(data);
 	}
 	const description = data.description || responseCollectionDescription || '';
-	const headers = getHeaders(get(data, `properties.headers`));
-	const content = getContent(get(data, `properties.content`));
+	const headers = getHeaders(get(data, `properties.headers`), !shouldResponseBeCommented);
+	const content = getContent(get(data, `properties.content`), !shouldResponseBeCommented);
 	const links = getLinks(get(data, `properties.links`));
 	const extensions = getExtensions(data.scopesExtensions);
 	const response = {};
diff --git a/forward_engineering/helpers/componentsHelpers/schemasHelper.js b/forward_engineering/helpers/componentsHelpers/schemasHelper.js
@@ -11,8 +11,8 @@ function getSchemas(data) {
 	}, {});
 }
 
-function mapSchema(data, key) {
-	return typeHelper.getType(data, key);
+function mapSchema(data, key, isParentActivated = false) {
+	return typeHelper.getType(data, key, isParentActivated);
 }
 
 module.exports = {
diff --git a/forward_engineering/helpers/pathHelper.js b/forward_engineering/helpers/pathHelper.js
@@ -6,6 +6,7 @@ const { mapParameter } = require('./componentsHelpers/parametersHelper');
 const { mapRequestBody } = require('./componentsHelpers/requestBodiesHelper');
 const { mapResponse } = require('./componentsHelpers/responsesHelper');
 const { hasRef, getRef } = require('./typeHelper');
+const { commentDeactivatedItemInner } = require('./commentsHelper');
 
 function getPaths(containers, containersIdsForCallbacks = []) {
 	return containers
@@ -46,21 +47,38 @@ function getRequestData(collections, containers, containerId, containersPath = [
 	return collections
 		.filter(collection => collection.entityType === 'request')
 		.map(data => {
+			const isRequestActivated = data.isActivated && isPathActivated;
 			const request = {
 				tags: commonHelper.mapArrayFieldByName(data.tags, 'tag'),
 				summary: data.summary,
 				description: data.description,
 				externalDocs: commonHelper.mapExternalDocs(data.externalDocs),
 				operationId: data.operationId,
-				parameters: mapRequestParameters(get(data, 'properties.parameters')),
-				requestBody: mapRequestBody(get(data, 'properties.requestBody'), get(data, 'required', []).includes('requestBody')),
-				responses: mapResponses(collections, data.GUID, isPathActivated && data.isActivated),
-				callbacks: getCallbacks(get(data, 'properties.callbacks'), containers, containerId, containersPath),
+				parameters: mapRequestParameters(
+					get(data, 'properties.parameters'),
+					isRequestActivated
+				),
+				requestBody: mapRequestBody(
+					get(data, 'properties.requestBody'),
+					get(data, 'required', []).includes('requestBody'),
+					isRequestActivated
+				),
+				responses: mapResponses(
+					collections,
+					data.GUID,
+					isRequestActivated
+				),
+				callbacks: getCallbacks(
+					get(data, 'properties.callbacks'),
+					containers,
+					containerId,
+					containersPath
+				),
 				deprecated: data.deprecated,
 				security: commonHelper.mapSecurity(data.security),
 				servers: getServers(data.servers),
 				methodName: data.collectionName,
-				isActivated: data.isActivated
+				isActivated: data.isActivated,
 			};
 			const extensions = getExtensions(data.scopesExtensions);
 
@@ -82,15 +100,14 @@ function getRequestData(collections, containers, containerId, containersPath = [
 		}, {});
 }
 
-function mapRequestParameters(parameters) {
+function mapRequestParameters(parameters, isParentActivated = false) {
 	if (!parameters || !parameters.items) {
 		return;
 	}
 	if (Array.isArray(parameters.items)) {
-		return parameters.items.map(item => mapParameter(item));
+		return parameters.items.map(item => mapParameter(item, false, isParentActivated));
 	}
-
-	return [mapParameter(parameters.items)];
+	return [mapParameter(parameters.items, false, isParentActivated)];
 }
 
 function mapResponses(collections, collectionId, isParentActivated) {
diff --git a/forward_engineering/helpers/typeHelper.js b/forward_engineering/helpers/typeHelper.js
diff --git a/package.json b/package.json
diff --git a/properties_pane/container_level/containerLevelConfig.json b/properties_pane/container_level/containerLevelConfig.json

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ const get = require('lodash.get');`
`2`	`2`	`const { getContent } = require('./parametersHelper');`
`3`	`3`	`const getExtensions = require('../extensionsHelper');`
`4`	`4`	`const { getRef, hasRef } = require('../typeHelper');`
	`5`	`+const { commentDeactivatedItemInner } = require('../commentsHelper');`
`5`	`6`
`6`	`7`	`function getRequestBodies(data) {`
`7`	`8`	`if (!data \|\| !data.properties) {`
`@@ -21,15 +22,15 @@ function getRequestBodies(data) {`
`21`	`22`	`}, {});`
`22`	`23`	`}`
`23`	`24`
`24`		`-function mapRequestBody(data, required) {`
	`25`	`+function mapRequestBody(data, required, isParentActivated = false) {`
`25`	`26`	`if (!data) {`
`26`	`27`	`return;`
`27`	`28`	`}`
`28`	`29`	`if (hasRef(data)) {`
`29`		`- return getRef(data);`
	`30`	`+ return commentDeactivatedItemInner(getRef(data), data.isActivated, isParentActivated);`
`30`	`31`	`}`
`31`	`32`
`32`		`- const content = getContent(data);`
	`33`	`+ const content = getContent(data, data.isActivated && isParentActivated);`
`33`	`34`	`if (!content) {`
`34`	`35`	`return;`
`35`	`36`	`}`
`@@ -41,7 +42,7 @@ function mapRequestBody(data, required) {`
`41`	`42`	`}`
`42`	`43`	`const extensions = getExtensions(data.scopesExtensions);`
`43`	`44`
`44`		`- return Object.assign({}, requestBody, extensions);`
	`45`	`+ return commentDeactivatedItemInner(Object.assign({}, requestBody, extensions), data.isActivated, isParentActivated);`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`module.exports = {`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ function getSchemas(data) {`
`11`	`11`	`}, {});`
`12`	`12`	`}`
`13`	`13`
`14`		`-function mapSchema(data, key) {`
`15`		`- return typeHelper.getType(data, key);`
	`14`	`+function mapSchema(data, key, isParentActivated = false) {`
	`15`	`+ return typeHelper.getType(data, key, isParentActivated);`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`module.exports = {`