@cratis/fundamentals 7.14.0 → 7.15.1

package/JsonSerializer.ts

@@ -6,38 +6,53 @@ import { Constructor } from './Constructor';
 import { DerivedType } from './DerivedType';
 import { Field } from './Field';
 import { Fields } from './Fields';
-import { Guid } from './Guid';
-import { TimeSpan } from './TimeSpan';
 import { ValueMap } from './ValueMap';
+import { 
+    JsonConverter, 
+    DateJsonConverter, 
+    GuidJsonConverter, 
+    TimeSpanJsonConverter, 
+    PointJsonConverter,
+    LineStringJsonConverter,
+    PolygonJsonConverter,
+    ValueMapJsonConverter
+} from './json';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 type typeSerializer = (value: any) => any;
 
-const typeConverters: Map<Constructor, typeSerializer> = new Map<Constructor, typeSerializer>([
+// Initialize converters
+const converters: JsonConverter[] = [
+    new DateJsonConverter(),
+    new GuidJsonConverter(),
+    new TimeSpanJsonConverter(),
+    new PointJsonConverter(),
+    new LineStringJsonConverter(),
+    new PolygonJsonConverter(),
+    new ValueMapJsonConverter()
+];
+
+// Build converter maps from the converters
+const typeConverters: Map<Constructor, JsonConverter> = new Map<Constructor, JsonConverter>();
+const typeSerializers: Map<Constructor, JsonConverter> = new Map<Constructor, JsonConverter>();
+
+for (const converter of converters) {
+    typeConverters.set(converter.type, converter);
+    typeSerializers.set(converter.type, converter);
+}
+
+// Add primitive type converters that don't need a full JsonConverter class
+const primitiveConverters: Map<Constructor, typeSerializer> = new Map<Constructor, typeSerializer>([
     [Number, (value: number) => value],
     [String, (value: string) => value],
-    [Boolean, (value: boolean) => value],
-    [Date, (value: Date) => value.toISOString()],
-    [Guid, (value: Guid) => value?.toString() ?? ''],
-    [TimeSpan, (value: TimeSpan) => value?.toString() ?? ''],
-    [ValueMap, (value: ValueMap<any, any>) => {
-        const converted: any = {};
-        for (const [key, mapValue] of value.entries()) {
-            converted[serializeMapKey(key)] = convertTypesOnInstance(mapValue);
-        }
-
-        return converted;
-    }]
+    [Boolean, (value: boolean) => value]
 ]);
 
-const typeSerializers: Map<Constructor, typeSerializer> = new Map<Constructor, typeSerializer>([
+const primitiveSerializers: Map<Constructor, typeSerializer> = new Map<Constructor, typeSerializer>([
     [Number, (value: any) => value],
     [String, (value: any) => value],
-    [Boolean, (value: any) => value],
-    [Date, (value: any) => new Date(value)],
-    [Guid, (value: any) => Guid.parse(value.toString())],
-    [TimeSpan, (value: any) => TimeSpan.parse(value.toString())],
+    [Boolean, (value: any) => value]
 ]);
 
 /**
@@ -72,11 +87,18 @@ const serializeValueForType = (type: Constructor, value: any) => {
         return serializeValueForType(innerValue.constructor, innerValue);
     }
 
+    // Check if there's a registered converter
     if (typeConverters.has(type)) {
-        return typeConverters.get(type)!(value);
-    } else {
-        return convertTypesOnInstance(value);
+        const converter = typeConverters.get(type)!;
+        return converter.write(value);
+    }
+    
+    // Check primitive converters
+    if (primitiveConverters.has(type)) {
+        return primitiveConverters.get(type)!(value);
     }
+    
+    return convertTypesOnInstance(value);
 };
 
 const deserializeValueFromType = (type: Constructor, value: any) => {
@@ -85,11 +107,18 @@ const deserializeValueFromType = (type: Constructor, value: any) => {
         return new type(value);
     }
     
+    // Check if there's a registered converter
     if (typeSerializers.has(type)) {
-        return typeSerializers.get(type)!(value);
-    } else {
-        return JsonSerializer.deserialize(type, JSON.stringify(value));
+        const converter = typeSerializers.get(type)!;
+        return converter.read(value);
+    }
+    
+    // Check primitive serializers
+    if (primitiveSerializers.has(type)) {
+        return primitiveSerializers.get(type)!(value);
     }
+    
+    return JsonSerializer.deserialize(type, JSON.stringify(value));
 };
 
 const deserializeValueFromField = (field: Field, value: any) => {
@@ -102,18 +131,25 @@ const deserializeValueFromField = (field: Field, value: any) => {
         return new field.type(value);
     }
 
+    // Check if there's a registered converter
     if (typeSerializers.has(field.type)) {
-        return typeSerializers.get(field.type)!(value);
-    } else {
-        let type = field.type;
-        if (value[JsonSerializer.DerivedTypeIdProperty]) {
-            const derivedTypeId = value[JsonSerializer.DerivedTypeIdProperty];
-            const candidates = [...field.derivatives, ...DerivedType.getDerivedTypesFor(field.type)];
-            type = candidates.find(_ => DerivedType.get(_) == derivedTypeId) || type;
-        }
-
-        return JsonSerializer.deserialize(type, JSON.stringify(value));
+        const converter = typeSerializers.get(field.type)!;
+        return converter.read(value);
+    }
+    
+    // Check primitive serializers
+    if (primitiveSerializers.has(field.type)) {
+        return primitiveSerializers.get(field.type)!(value);
     }
+    
+    let type = field.type;
+    if (value[JsonSerializer.DerivedTypeIdProperty]) {
+        const derivedTypeId = value[JsonSerializer.DerivedTypeIdProperty];
+        const candidates = [...field.derivatives, ...DerivedType.getDerivedTypesFor(field.type)];
+        type = candidates.find(_ => DerivedType.get(_) == derivedTypeId) || type;
+    }
+
+    return JsonSerializer.deserialize(type, JSON.stringify(value));
 };
 
 const serializeMapKey = (key: any): string => {
@@ -149,12 +185,10 @@ const deserializeMapKey = (keyType: Constructor, key: string): any => {
         return key.toLowerCase() === 'true';
     }
 
-    if (keyType === Date) {
-        return new Date(key);
-    }
-
+    // Check if there's a converter for this type
     if (typeSerializers.has(keyType)) {
-        return typeSerializers.get(keyType)!(key);
+        const converter = typeSerializers.get(keyType)!;
+        return converter.read(key);
     }
 
     return JsonSerializer.deserialize(keyType, key);
@@ -165,8 +199,10 @@ const deserializeMapValue = (valueType: Constructor | undefined, value: any): an
         return value;
     }
 
+    // Check if there's a converter for this type
     if (typeSerializers.has(valueType)) {
-        return typeSerializers.get(valueType)!(value);
+        const converter = typeSerializers.get(valueType)!;
+        return converter.read(value);
     }
 
     return JsonSerializer.deserialize(valueType, JSON.stringify(value));
@@ -191,9 +227,15 @@ const deserializeValueMapFromField = (field: Field, value: any): ValueMap<any, a
 };
 
 const convertTypesOnInstance = (instance: any) => {
+    // Check if there's a converter for this type
     if (typeConverters.has(instance.constructor)) {
         return serializeValueForType(instance.constructor, instance);
     }
+    
+    // Check primitive converters
+    if (primitiveConverters.has(instance.constructor)) {
+        return primitiveConverters.get(instance.constructor)!(instance);
+    }
 
     const properties = Object.getOwnPropertyNames(instance);
     const converted: any = {};
@@ -218,6 +260,10 @@ const convertTypesOnInstance = (instance: any) => {
     return converted;
 };
 
+// Initialize ValueMapJsonConverter with helper functions to avoid circular dependencies
+// Must be done after serializeMapKey and convertTypesOnInstance are defined
+ValueMapJsonConverter.setHelpers(serializeMapKey, convertTypesOnInstance);
+
 /**
  * Represents a serializer for JSON.
  */

package/README.md

@@ -21,6 +21,16 @@ You should look at it as a convenience layer on top of the existing base environ
 
 Read more about how to use it in our documentation.
 
+## Support
+
+Cratis is an open community, and we are glad to help users, teams evaluating the stack, and contributors.
+
+| Channel | Details |
+|---|---|
+| Discord | Join the community on [Discord](https://discord.gg/kt4AMpV8WV) for questions and discussions |
+| GitHub Issues | [Report bugs or request features](https://github.com/Cratis/Fundamentals/issues) |
+| Documentation | Read the docs at [cratis.io](https://cratis.io) |
+
 ## Contributing
 
 If you want to jump into building this repository and possibly contributing, please refer to [contributing](./Documentation/contributing/index.md).

package/dist/JsonSerializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"JsonSerializer.d.ts","sourceRoot":"","sources":["../JsonSerializer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AA2N5C,qBAAa,cAAc;IACvB,MAAM,CAAC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAoB;IAOjE,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM;IAWpC,MAAM,CAAC,WAAW,CAAC,OAAO,SAAS,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAWnG,MAAM,CAAC,gBAAgB,CAAC,OAAO,SAAS,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,EAAE;IAW1G,MAAM,CAAC,uBAAuB,CAAC,OAAO,SAAS,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,GAAG,GAAG,OAAO;IAwChH,MAAM,CAAC,4BAA4B,CAAC,OAAO,SAAS,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,GAAG,GAAG,OAAO,EAAE;CAS3H"}
+{"version":3,"file":"JsonSerializer.d.ts","sourceRoot":"","sources":["../JsonSerializer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAyQ5C,qBAAa,cAAc;IACvB,MAAM,CAAC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAoB;IAOjE,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM;IAWpC,MAAM,CAAC,WAAW,CAAC,OAAO,SAAS,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAWnG,MAAM,CAAC,gBAAgB,CAAC,OAAO,SAAS,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,EAAE;IAW1G,MAAM,CAAC,uBAAuB,CAAC,OAAO,SAAS,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,GAAG,GAAG,OAAO;IAwChH,MAAM,CAAC,4BAA4B,CAAC,OAAO,SAAS,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,GAAG,GAAG,OAAO,EAAE;CAS3H"}

package/dist/JsonSerializer.js

@@ -1,31 +1,32 @@
 import { ConceptAs } from './ConceptAs';
 import { DerivedType } from './DerivedType';
 import { Fields } from './Fields';
-import { Guid } from './Guid';
-import { TimeSpan } from './TimeSpan';
 import { ValueMap } from './ValueMap';
-const typeConverters = new Map([
+import { DateJsonConverter, GuidJsonConverter, TimeSpanJsonConverter, PointJsonConverter, LineStringJsonConverter, PolygonJsonConverter, ValueMapJsonConverter } from './json';
+const converters = [
+    new DateJsonConverter(),
+    new GuidJsonConverter(),
+    new TimeSpanJsonConverter(),
+    new PointJsonConverter(),
+    new LineStringJsonConverter(),
+    new PolygonJsonConverter(),
+    new ValueMapJsonConverter()
+];
+const typeConverters = new Map();
+const typeSerializers = new Map();
+for (const converter of converters) {
+    typeConverters.set(converter.type, converter);
+    typeSerializers.set(converter.type, converter);
+}
+const primitiveConverters = new Map([
     [Number, (value) => value],
     [String, (value) => value],
-    [Boolean, (value) => value],
-    [Date, (value) => value.toISOString()],
-    [Guid, (value) => value?.toString() ?? ''],
-    [TimeSpan, (value) => value?.toString() ?? ''],
-    [ValueMap, (value) => {
-            const converted = {};
-            for (const [key, mapValue] of value.entries()) {
-                converted[serializeMapKey(key)] = convertTypesOnInstance(mapValue);
-            }
-            return converted;
-        }]
+    [Boolean, (value) => value]
 ]);
-const typeSerializers = new Map([
+const primitiveSerializers = new Map([
     [Number, (value) => value],
     [String, (value) => value],
-    [Boolean, (value) => value],
-    [Date, (value) => new Date(value)],
-    [Guid, (value) => Guid.parse(value.toString())],
-    [TimeSpan, (value) => TimeSpan.parse(value.toString())],
+    [Boolean, (value) => value]
 ]);
 const isConceptAs = (type) => {
     if (!type || !type.prototype)
@@ -47,22 +48,26 @@ const serializeValueForType = (type, value) => {
         return serializeValueForType(innerValue.constructor, innerValue);
     }
     if (typeConverters.has(type)) {
-        return typeConverters.get(type)(value);
+        const converter = typeConverters.get(type);
+        return converter.write(value);
     }
-    else {
-        return convertTypesOnInstance(value);
+    if (primitiveConverters.has(type)) {
+        return primitiveConverters.get(type)(value);
     }
+    return convertTypesOnInstance(value);
 };
 const deserializeValueFromType = (type, value) => {
     if (isConceptAs(type)) {
         return new type(value);
     }
     if (typeSerializers.has(type)) {
-        return typeSerializers.get(type)(value);
+        const converter = typeSerializers.get(type);
+        return converter.read(value);
     }
-    else {
-        return JsonSerializer.deserialize(type, JSON.stringify(value));
+    if (primitiveSerializers.has(type)) {
+        return primitiveSerializers.get(type)(value);
     }
+    return JsonSerializer.deserialize(type, JSON.stringify(value));
 };
 const deserializeValueFromField = (field, value) => {
     if (field.type === ValueMap) {
@@ -72,17 +77,19 @@ const deserializeValueFromField = (field, value) => {
         return new field.type(value);
     }
     if (typeSerializers.has(field.type)) {
-        return typeSerializers.get(field.type)(value);
-    }
-    else {
-        let type = field.type;
-        if (value[JsonSerializer.DerivedTypeIdProperty]) {
-            const derivedTypeId = value[JsonSerializer.DerivedTypeIdProperty];
-            const candidates = [...field.derivatives, ...DerivedType.getDerivedTypesFor(field.type)];
-            type = candidates.find(_ => DerivedType.get(_) == derivedTypeId) || type;
-        }
-        return JsonSerializer.deserialize(type, JSON.stringify(value));
+        const converter = typeSerializers.get(field.type);
+        return converter.read(value);
+    }
+    if (primitiveSerializers.has(field.type)) {
+        return primitiveSerializers.get(field.type)(value);
     }
+    let type = field.type;
+    if (value[JsonSerializer.DerivedTypeIdProperty]) {
+        const derivedTypeId = value[JsonSerializer.DerivedTypeIdProperty];
+        const candidates = [...field.derivatives, ...DerivedType.getDerivedTypesFor(field.type)];
+        type = candidates.find(_ => DerivedType.get(_) == derivedTypeId) || type;
+    }
+    return JsonSerializer.deserialize(type, JSON.stringify(value));
 };
 const serializeMapKey = (key) => {
     if (key === undefined || key === null) {
@@ -109,11 +116,9 @@ const deserializeMapKey = (keyType, key) => {
     if (keyType === Boolean) {
         return key.toLowerCase() === 'true';
     }
-    if (keyType === Date) {
-        return new Date(key);
-    }
     if (typeSerializers.has(keyType)) {
-        return typeSerializers.get(keyType)(key);
+        const converter = typeSerializers.get(keyType);
+        return converter.read(key);
     }
     return JsonSerializer.deserialize(keyType, key);
 };
@@ -122,7 +127,8 @@ const deserializeMapValue = (valueType, value) => {
         return value;
     }
     if (typeSerializers.has(valueType)) {
-        return typeSerializers.get(valueType)(value);
+        const converter = typeSerializers.get(valueType);
+        return converter.read(value);
     }
     return JsonSerializer.deserialize(valueType, JSON.stringify(value));
 };
@@ -144,6 +150,9 @@ const convertTypesOnInstance = (instance) => {
     if (typeConverters.has(instance.constructor)) {
         return serializeValueForType(instance.constructor, instance);
     }
+    if (primitiveConverters.has(instance.constructor)) {
+        return primitiveConverters.get(instance.constructor)(instance);
+    }
     const properties = Object.getOwnPropertyNames(instance);
     const converted = {};
     const derivedTypeId = DerivedType.get(instance.constructor);
@@ -164,6 +173,7 @@ const convertTypesOnInstance = (instance) => {
     });
     return converted;
 };
+ValueMapJsonConverter.setHelpers(serializeMapKey, convertTypesOnInstance);
 export class JsonSerializer {
     static DerivedTypeIdProperty = "_derivedTypeId";
     static serialize(value) {

package/dist/JsonSerializer.js.map

@@ -1 +1 @@
-{"version":3,"file":"JsonSerializer.js","sourceRoot":"","sources":["../JsonSerializer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"JsonSerializer.js","sourceRoot":"","sources":["../JsonSerializer.ts"],"names":[],"mappings":"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"}

package/dist/cjs/JsonSerializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"JsonSerializer.d.ts","sourceRoot":"","sources":["../../JsonSerializer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AA2N5C,qBAAa,cAAc;IACvB,MAAM,CAAC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAoB;IAOjE,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM;IAWpC,MAAM,CAAC,WAAW,CAAC,OAAO,SAAS,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAWnG,MAAM,CAAC,gBAAgB,CAAC,OAAO,SAAS,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,EAAE;IAW1G,MAAM,CAAC,uBAAuB,CAAC,OAAO,SAAS,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,GAAG,GAAG,OAAO;IAwChH,MAAM,CAAC,4BAA4B,CAAC,OAAO,SAAS,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,GAAG,GAAG,OAAO,EAAE;CAS3H"}
+{"version":3,"file":"JsonSerializer.d.ts","sourceRoot":"","sources":["../../JsonSerializer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAyQ5C,qBAAa,cAAc;IACvB,MAAM,CAAC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAoB;IAOjE,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,GAAG,MAAM;IAWpC,MAAM,CAAC,WAAW,CAAC,OAAO,SAAS,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAWnG,MAAM,CAAC,gBAAgB,CAAC,OAAO,SAAS,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,EAAE;IAW1G,MAAM,CAAC,uBAAuB,CAAC,OAAO,SAAS,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,GAAG,GAAG,OAAO;IAwChH,MAAM,CAAC,4BAA4B,CAAC,OAAO,SAAS,MAAM,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,GAAG,GAAG,OAAO,EAAE;CAS3H"}

package/dist/cjs/JsonSerializer.js

@@ -3,32 +3,39 @@
 var ConceptAs = require('./ConceptAs.js');
 var DerivedType = require('./DerivedType.js');
 var Fields = require('./Fields.js');
-var Guid = require('./Guid.js');
-var TimeSpan = require('./TimeSpan.js');
 var ValueMap = require('./ValueMap.js');
+var DateJsonConverter = require('./json/DateJsonConverter.js');
+var GuidJsonConverter = require('./json/GuidJsonConverter.js');
+var TimeSpanJsonConverter = require('./json/TimeSpanJsonConverter.js');
+var PointJsonConverter = require('./json/PointJsonConverter.js');
+var LineStringJsonConverter = require('./json/LineStringJsonConverter.js');
+var PolygonJsonConverter = require('./json/PolygonJsonConverter.js');
+var ValueMapJsonConverter = require('./json/ValueMapJsonConverter.js');
 
-const typeConverters = new Map([
+const converters = [
+    new DateJsonConverter.DateJsonConverter(),
+    new GuidJsonConverter.GuidJsonConverter(),
+    new TimeSpanJsonConverter.TimeSpanJsonConverter(),
+    new PointJsonConverter.PointJsonConverter(),
+    new LineStringJsonConverter.LineStringJsonConverter(),
+    new PolygonJsonConverter.PolygonJsonConverter(),
+    new ValueMapJsonConverter.ValueMapJsonConverter()
+];
+const typeConverters = new Map();
+const typeSerializers = new Map();
+for (const converter of converters) {
+    typeConverters.set(converter.type, converter);
+    typeSerializers.set(converter.type, converter);
+}
+const primitiveConverters = new Map([
     [Number, (value) => value],
     [String, (value) => value],
-    [Boolean, (value) => value],
-    [Date, (value) => value.toISOString()],
-    [Guid.Guid, (value) => value?.toString() ?? ''],
-    [TimeSpan.TimeSpan, (value) => value?.toString() ?? ''],
-    [ValueMap.ValueMap, (value) => {
-            const converted = {};
-            for (const [key, mapValue] of value.entries()) {
-                converted[serializeMapKey(key)] = convertTypesOnInstance(mapValue);
-            }
-            return converted;
-        }]
+    [Boolean, (value) => value]
 ]);
-const typeSerializers = new Map([
+const primitiveSerializers = new Map([
     [Number, (value) => value],
     [String, (value) => value],
-    [Boolean, (value) => value],
-    [Date, (value) => new Date(value)],
-    [Guid.Guid, (value) => Guid.Guid.parse(value.toString())],
-    [TimeSpan.TimeSpan, (value) => TimeSpan.TimeSpan.parse(value.toString())],
+    [Boolean, (value) => value]
 ]);
 const isConceptAs = (type) => {
     if (!type || !type.prototype)
@@ -50,22 +57,26 @@ const serializeValueForType = (type, value) => {
         return serializeValueForType(innerValue.constructor, innerValue);
     }
     if (typeConverters.has(type)) {
-        return typeConverters.get(type)(value);
+        const converter = typeConverters.get(type);
+        return converter.write(value);
     }
-    else {
-        return convertTypesOnInstance(value);
+    if (primitiveConverters.has(type)) {
+        return primitiveConverters.get(type)(value);
     }
+    return convertTypesOnInstance(value);
 };
 const deserializeValueFromType = (type, value) => {
     if (isConceptAs(type)) {
         return new type(value);
     }
     if (typeSerializers.has(type)) {
-        return typeSerializers.get(type)(value);
+        const converter = typeSerializers.get(type);
+        return converter.read(value);
     }
-    else {
-        return JsonSerializer.deserialize(type, JSON.stringify(value));
+    if (primitiveSerializers.has(type)) {
+        return primitiveSerializers.get(type)(value);
     }
+    return JsonSerializer.deserialize(type, JSON.stringify(value));
 };
 const deserializeValueFromField = (field, value) => {
     if (field.type === ValueMap.ValueMap) {
@@ -75,17 +86,19 @@ const deserializeValueFromField = (field, value) => {
         return new field.type(value);
     }
     if (typeSerializers.has(field.type)) {
-        return typeSerializers.get(field.type)(value);
-    }
-    else {
-        let type = field.type;
-        if (value[JsonSerializer.DerivedTypeIdProperty]) {
-            const derivedTypeId = value[JsonSerializer.DerivedTypeIdProperty];
-            const candidates = [...field.derivatives, ...DerivedType.DerivedType.getDerivedTypesFor(field.type)];
-            type = candidates.find(_ => DerivedType.DerivedType.get(_) == derivedTypeId) || type;
-        }
-        return JsonSerializer.deserialize(type, JSON.stringify(value));
+        const converter = typeSerializers.get(field.type);
+        return converter.read(value);
+    }
+    if (primitiveSerializers.has(field.type)) {
+        return primitiveSerializers.get(field.type)(value);
     }
+    let type = field.type;
+    if (value[JsonSerializer.DerivedTypeIdProperty]) {
+        const derivedTypeId = value[JsonSerializer.DerivedTypeIdProperty];
+        const candidates = [...field.derivatives, ...DerivedType.DerivedType.getDerivedTypesFor(field.type)];
+        type = candidates.find(_ => DerivedType.DerivedType.get(_) == derivedTypeId) || type;
+    }
+    return JsonSerializer.deserialize(type, JSON.stringify(value));
 };
 const serializeMapKey = (key) => {
     if (key === undefined || key === null) {
@@ -112,11 +125,9 @@ const deserializeMapKey = (keyType, key) => {
     if (keyType === Boolean) {
         return key.toLowerCase() === 'true';
     }
-    if (keyType === Date) {
-        return new Date(key);
-    }
     if (typeSerializers.has(keyType)) {
-        return typeSerializers.get(keyType)(key);
+        const converter = typeSerializers.get(keyType);
+        return converter.read(key);
     }
     return JsonSerializer.deserialize(keyType, key);
 };
@@ -125,7 +136,8 @@ const deserializeMapValue = (valueType, value) => {
         return value;
     }
     if (typeSerializers.has(valueType)) {
-        return typeSerializers.get(valueType)(value);
+        const converter = typeSerializers.get(valueType);
+        return converter.read(value);
     }
     return JsonSerializer.deserialize(valueType, JSON.stringify(value));
 };
@@ -147,6 +159,9 @@ const convertTypesOnInstance = (instance) => {
     if (typeConverters.has(instance.constructor)) {
         return serializeValueForType(instance.constructor, instance);
     }
+    if (primitiveConverters.has(instance.constructor)) {
+        return primitiveConverters.get(instance.constructor)(instance);
+    }
     const properties = Object.getOwnPropertyNames(instance);
     const converted = {};
     const derivedTypeId = DerivedType.DerivedType.get(instance.constructor);
@@ -167,6 +182,7 @@ const convertTypesOnInstance = (instance) => {
     });
     return converted;
 };
+ValueMapJsonConverter.ValueMapJsonConverter.setHelpers(serializeMapKey, convertTypesOnInstance);
 class JsonSerializer {
     static DerivedTypeIdProperty = "_derivedTypeId";
     static serialize(value) {