fix: fix path to utils file when using date types (#131)

closes #117

Author: raveclassic

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;
@@ -79,30 +82,33 @@ export const SERIALIZED_DATETIME_TYPE = serializedType(
 	[serializedDependency('DateFromISOString', 'io-ts-types/lib/DateFromISOString')],
 	[],
 );
-export const SERIALIZED_DATE_TYPE = serializedType(
-	'Date',
-	'DateFromISODateStringIO',
-	[serializedDependency('DateFromISODateStringIO', '../utils/utils')],
-	[],
-);
 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 'date': {
-					return some(SERIALIZED_DATE_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