Merge remote-tracking branch 'origin/master' into response-type-support

# Conflicts:
#	src/language/typescript/common/data/serialized-type.ts

Author: Artem Parkhomenko

src/language/typescript/2.0/serializers/items-object.ts

@@ -18,7 +18,7 @@ export const serializeItemsObject = (from: Ref, itemsObject: ItemsObject): Eithe
 			return pipe(serializeItemsObject(from, itemsObject.items), either.map(getSerializedArrayType()));
 		}
 		case 'string': {
-			return right(getSerializedStringType(itemsObject.format));
+			return getSerializedStringType(from, itemsObject.format);
 		}
 		case 'number': {
 			return right(SERIALIZED_NUMBER_TYPE);

src/language/typescript/2.0/serializers/parameter-object.ts

@@ -28,7 +28,10 @@ export const serializeParameterObject = (
 		case 'formData': {
 			switch (parameterObject.type) {
 				case 'string': {
-					return right(toSerializedParameter(getSerializedStringType(parameterObject.format)));
+					return pipe(
+						getSerializedStringType(from, parameterObject.format),
+						either.map(toSerializedParameter),
+					);
 				}
 				case 'number': {
 					return right(toSerializedParameter(SERIALIZED_NUMBER_TYPE));

src/language/typescript/2.0/serializers/schema-object.ts

@@ -139,7 +139,7 @@ const serializePrimitive = (from: Ref, schemaObject: PrimitiveSchemaObject): Eit
 			return right(SERIALIZED_NULL_TYPE);
 		}
 		case 'string': {
-			return right(getSerializedStringType(schemaObject.format));
+			return getSerializedStringType(from, schemaObject.format);
 		}
 		case 'number': {
 			return right(SERIALIZED_NUMBER_TYPE);

src/language/typescript/3.0/serializers/schema-object.ts

@@ -80,7 +80,7 @@ const serializeSchemaObjectWithRecursion = (from: Ref, shouldTrackRecursion: boo
 		case 'boolean':
 		case 'integer':
 		case 'number': {
-			return pipe(serializePrimitive(from, schemaObject), getSerializedNullableType(isNullable), right);
+			return pipe(serializePrimitive(from, schemaObject), either.map(getSerializedNullableType(isNullable)));
 		}
 		case 'array': {
 			const { items } = schemaObject;
@@ -182,19 +182,19 @@ const serializeChildren = (
 			: serializeSchemaObjectWithRecursion(from, false)(item),
 	);
 
-const serializePrimitive = (from: Ref, schemaObject: PrimitiveSchemaObject): SerializedType => {
+const serializePrimitive = (from: Ref, schemaObject: PrimitiveSchemaObject): Either<Error, SerializedType> => {
 	switch (schemaObject.type) {
 		case 'string': {
-			return getSerializedStringType(schemaObject.format);
+			return getSerializedStringType(from, schemaObject.format);
 		}
 		case 'number': {
-			return SERIALIZED_NUMBER_TYPE;
+			return right(SERIALIZED_NUMBER_TYPE);
 		}
 		case 'integer': {
-			return SERIALIZED_INTEGER_TYPE;
+			return right(SERIALIZED_INTEGER_TYPE);
 		}
 		case 'boolean': {
-			return SERIALIZED_BOOLEAN_TYPE;
+			return right(SERIALIZED_BOOLEAN_TYPE);
 		}
 	}
 };

src/language/typescript/asyncapi-2.0.0/serializers/schema-object.ts

@@ -70,7 +70,7 @@ const serializeSchemaObjectWithRecursion = (
 			return right(SERIALIZED_NULL_TYPE);
 		}
 		case 'string': {
-			return right(getSerializedStringType(schemaObject.format));
+			return getSerializedStringType(from, schemaObject.format);
 		}
 		case 'number': {
 			return right(SERIALIZED_NUMBER_TYPE);

src/language/typescript/common/data/serialized-type.ts

@@ -19,6 +19,9 @@ import { JSONPrimitive } from '../../../../utils/io-ts';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { nonEmptyArray, option } from 'fp-ts';
 import { none, Option, some } from 'fp-ts/lib/Option';
+import { utilsRef } from '../bundled/utils';
+import { Either } from 'fp-ts/lib/Either';
+import { combineEither } from '@devexperts/utils/dist/adt/either.utils';
 
 export interface SerializedType {
 	readonly type: string;
@@ -86,25 +89,35 @@ export const SERIALIZED_DATE_TYPE = serializedType(
 	[],
 );
 export const SERIALIZED_STRING_TYPE = serializedType('string', 'string', [serializedDependency('string', 'io-ts')], []);
-export const getSerializedStringType = (format: Option<string>): SerializedType => {
-	return pipe(
-		format,
-		option.chain(format => {
-			// https://xml2rfc.tools.ietf.org/public/rfc/html/rfc3339.html#anchor14
-			switch (format) {
-				case 'date-time': {
-					return some(SERIALIZED_DATETIME_TYPE);
+export const getSerializedStringType = (from: Ref, format: Option<string>): Either<Error, SerializedType> => {
+	return combineEither(utilsRef, utilsRef => {
+		return pipe(
+			format,
+			option.chain(format => {
+				// https://xml2rfc.tools.ietf.org/public/rfc/html/rfc3339.html#anchor14
+				switch (format) {
+					case 'date-time': {
+						return some(SERIALIZED_DATETIME_TYPE);
+					}
+					case 'date': {
+						return some(
+							serializedType(
+								'Date',
+								'DateFromISODateStringIO',
+								[serializedDependency('DateFromISODateStringIO', getRelativePath(from, utilsRef))],
+								[],
+							),
+						);
+					}
+					case 'binary': {
+						return some(SERIALIZED_UNKNOWN_TYPE);
+					}
 				}
-				case 'date': {
-					return some(SERIALIZED_DATE_TYPE);
-				}
-				case 'binary':
-					return some(SERIALIZED_UNKNOWN_TYPE);
-			}
-			return none;
-		}),
-		option.getOrElse(() => SERIALIZED_STRING_TYPE),
-	);
+				return none;
+			}),
+			option.getOrElse(() => SERIALIZED_STRING_TYPE),
+		);
+	});
 };
 export const SERIALIZED_NULL_TYPE = serializedType('null', 'nullType', [serializedDependency('nullType', 'io-ts')], []);
 export const getSerializedNullableType = (isNullable: boolean) => (type: SerializedType): SerializedType =>

test/specs/3.0/demo.yml

@@ -126,6 +126,15 @@ components:
         items:
           type: string
           nullable: true
+    TestDate:
+      type: object
+      properties:
+        foo:
+          type: string
+          format: date
+        bar:
+          type: string
+          format: date-time
   requestBodies:
     RefRequestBody:
       description: ref request body

yarn.lock

@@ -1176,11 +1176,6 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@~2.20.0:
-  version "2.20.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
-  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
-
 comment-parser@^0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-0.7.2.tgz#baf6d99b42038678b81096f15b630d18142f4b8a"
@@ -2395,25 +2390,15 @@ growly@^1.3.0:
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
   integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
-handlebars@^4.1.0:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
-  integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
+handlebars@^4.1.0, handlebars@^4.1.2:
+  version "4.7.6"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.6.tgz#d4c05c1baf90e9945f77aa68a7a219aa4a7df74e"
+  integrity sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==
   dependencies:
+    minimist "^1.2.5"
     neo-async "^2.6.0"
-    optimist "^0.6.1"
-    source-map "^0.6.1"
-  optionalDependencies:
-    uglify-js "^3.1.4"
-
-handlebars@^4.1.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.4.2.tgz#8810a9821a9d6d52cb2f57d326d6ce7c3dfe741d"
-  integrity sha512-cIv17+GhL8pHHnRJzGu2wwcthL5sb8uDKBHvZ2Dtu5s1YNt0ljbzKbamnc+gr69y7bzwQiBdr5+hOpRd5pnOdg==
-  dependencies:
-    neo-async "^2.6.0"
-    optimist "^0.6.1"
     source-map "^0.6.1"
+    wordwrap "^1.0.0"
   optionalDependencies:
     uglify-js "^3.1.4"
 
@@ -3786,15 +3771,10 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-  integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
+minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
 minipass@^2.2.1, minipass@^2.3.4:
   version "2.3.5"
@@ -3883,9 +3863,9 @@ needle@^2.2.1:
     sax "^1.2.4"
 
 neo-async@^2.6.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
-  integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
 nice-try@^1.0.4:
   version "1.0.5"
@@ -4092,14 +4072,6 @@ ono@^5.0.1:
   resolved "https://registry.yarnpkg.com/ono/-/ono-5.1.0.tgz#8cafa7e56afa2211ad63dd2eb798427e64f1a070"
   integrity sha512-GgqRIUWErLX4l9Up0khRtbrlH8Fyj59A0nKv8V6pWEto38aUgnOGOOF7UmgFFLzFnDSc8REzaTXOc0hqEe7yIw==
 
-optimist@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
-  integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
-  dependencies:
-    minimist "~0.0.1"
-    wordwrap "~0.0.2"
-
 optionator@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
@@ -5516,12 +5488,9 @@ typescript@^3.6.3:
   integrity sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==
 
 uglify-js@^3.1.4:
-  version "3.5.12"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.5.12.tgz#6b759cabc08c3e91fe82323d6387019f0c5864cd"
-  integrity sha512-KeQesOpPiZNgVwJj8Ge3P4JYbQHUdZzpx6Fahy6eKAYRSV4zhVmLXoC+JtOeYxcHCHTve8RG1ZGdTvpeOUM26Q==
-  dependencies:
-    commander "~2.20.0"
-    source-map "~0.6.1"
+  version "3.10.4"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.10.4.tgz#dd680f5687bc0d7a93b14a3482d16db6eba2bfbb"
+  integrity sha512-kBFT3U4Dcj4/pJ52vfjCSfyLyvG9VYYuGYPmrPvAxRw/i7xHiT4VvCev+uiEMcEEiu6UNB6KgWmGtSUYIWScbw==
 
 undefsafe@^2.0.2:
   version "2.0.2"
@@ -5735,12 +5704,7 @@ word-wrap@~1.2.3:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
-wordwrap@~0.0.2:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
-  integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
-
-wordwrap@~1.0.0:
+wordwrap@^1.0.0, wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=