@cratis/fundamentals 5.5.1 → 5.6.1

package/JsonSerializer.ts

@@ -2,13 +2,21 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 import { Constructor } from './Constructor';
+import { DerivedType } from './DerivedType';
 import { Field } from './Field';
 import { Fields } from './Fields';
-import { DerivedType } from './DerivedType';
 import { Guid } from './Guid';
 
 type typeSerializer = (value: any) => any;
 
+const typeConverters: 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() ?? '']
+]);
+
 const typeSerializers: Map<Constructor, typeSerializer> = new Map<Constructor, typeSerializer>([
     [Number, (value: any) => value],
     [String, (value: any) => value],
@@ -17,6 +25,16 @@ const typeSerializers: Map<Constructor, typeSerializer> = new Map<Constructor, t
     [Guid, (value: any) => Guid.parse(value.toString())],
 ]);
 
+const serializeValueForType = (type: Constructor, value: any) => {
+    if (!value) return value;
+
+    if (typeConverters.has(type)) {
+        return typeConverters.get(type)!(value);
+    } else {
+        return convertTypesOnInstance(value);
+    }
+};
+
 const deserializeValueFromType = (type: Constructor, value: any) => {
     if (typeSerializers.has(type)) {
         return typeSerializers.get(type)!(value);
@@ -39,12 +57,41 @@ const deserializeValueFromField = (field: Field, value: any) => {
     }
 };
 
+const convertTypesOnInstance = (instance: any) => {
+    const properties = Object.getOwnPropertyNames(instance);
+    const converted: any = {};
+    properties.forEach(property => {
+        let value = instance[property];
+        if (value !== undefined) {
+            if (Array.isArray(value)) {
+                value = value.map(_ => convertTypesOnInstance(_));
+            } else {
+                value = serializeValueForType(value.__proto__.constructor, value);
+            }
+        }
+
+        converted[property] = value;
+    });
+
+    return converted;
+};
+
 /**
  * Represents a serializer for JSON.
  */
 export class JsonSerializer {
     static readonly DerivedTypeIdProperty: string = "_derivedTypeId";
 
+    /**
+     * Serialize with strong type information.
+     * @param {*} value The value to serialize.
+     * @returns A JSON string.
+     */
+    static serialize(value: any): string {
+        const converted = convertTypesOnInstance(value);
+        return JSON.stringify(converted);
+    }
+
     /**
      * Deserialize a JSON string to the specific type.
      * @param {Constructor} targetType Type to deserialize to.
@@ -76,7 +123,7 @@ export class JsonSerializer {
     static deserializeFromInstance<TResult extends {}>(targetType: Constructor<TResult>, instance: any): TResult {
         const fields = Fields.getFieldsForType(targetType as Constructor);
 
-        if( typeSerializers.has(targetType) ) {
+        if (typeSerializers.has(targetType)) {
             return deserializeValueFromType(targetType, instance);
         }
 

package/dist/cjs/JsonSerializer.d.ts

@@ -1,6 +1,7 @@
 import { Constructor } from './Constructor';
 export declare class JsonSerializer {
     static readonly DerivedTypeIdProperty: string;
+    static serialize(value: any): string;
     static deserialize<TResult extends {}>(targetType: Constructor<TResult>, json: string): TResult;
     static deserializeArray<TResult extends {}>(targetType: Constructor<TResult>, json: string): TResult[];
     static deserializeFromInstance<TResult extends {}>(targetType: Constructor<TResult>, instance: any): TResult;

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

@@ -1 +1 @@
-{"version":3,"file":"JsonSerializer.d.ts","sourceRoot":"","sources":["../../JsonSerializer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAyC5C,qBAAa,cAAc;IACvB,MAAM,CAAC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAoB;IAQjE,MAAM,CAAC,WAAW,CAAC,OAAO,SAAS,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAW/F,MAAM,CAAC,gBAAgB,CAAC,OAAO,SAAS,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,EAAE;IAWtG,MAAM,CAAC,uBAAuB,CAAC,OAAO,SAAS,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,GAAG,GAAG,OAAO;IAwC5G,MAAM,CAAC,4BAA4B,CAAC,OAAO,SAAS,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,GAAG,GAAG,OAAO,EAAE;CASvH"}
+{"version":3,"file":"JsonSerializer.d.ts","sourceRoot":"","sources":["../../JsonSerializer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AA8E5C,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,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAW/F,MAAM,CAAC,gBAAgB,CAAC,OAAO,SAAS,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,EAAE;IAWtG,MAAM,CAAC,uBAAuB,CAAC,OAAO,SAAS,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,GAAG,GAAG,OAAO;IAwC5G,MAAM,CAAC,4BAA4B,CAAC,OAAO,SAAS,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,GAAG,GAAG,OAAO,EAAE;CASvH"}

package/dist/cjs/JsonSerializer.js

@@ -1,9 +1,16 @@
 'use strict';
 
-var Fields = require('./Fields.js');
 var DerivedType = require('./DerivedType.js');
+var Fields = require('./Fields.js');
 var Guid = require('./Guid.js');
 
+const typeConverters = new Map([
+    [Number, (value) => value],
+    [String, (value) => value],
+    [Boolean, (value) => value],
+    [Date, (value) => value.toISOString()],
+    [Guid.Guid, (value) => { var _a; return (_a = value === null || value === void 0 ? void 0 : value.toString()) !== null && _a !== void 0 ? _a : ''; }]
+]);
 const typeSerializers = new Map([
     [Number, (value) => value],
     [String, (value) => value],
@@ -11,6 +18,16 @@ const typeSerializers = new Map([
     [Date, (value) => new Date(value)],
     [Guid.Guid, (value) => Guid.Guid.parse(value.toString())],
 ]);
+const serializeValueForType = (type, value) => {
+    if (!value)
+        return value;
+    if (typeConverters.has(type)) {
+        return typeConverters.get(type)(value);
+    }
+    else {
+        return convertTypesOnInstance(value);
+    }
+};
 const deserializeValueFromType = (type, value) => {
     if (typeSerializers.has(type)) {
         return typeSerializers.get(type)(value);
@@ -32,7 +49,28 @@ const deserializeValueFromField = (field, value) => {
         return JsonSerializer.deserialize(type, JSON.stringify(value));
     }
 };
+const convertTypesOnInstance = (instance) => {
+    const properties = Object.getOwnPropertyNames(instance);
+    const converted = {};
+    properties.forEach(property => {
+        let value = instance[property];
+        if (value !== undefined) {
+            if (Array.isArray(value)) {
+                value = value.map(_ => convertTypesOnInstance(_));
+            }
+            else {
+                value = serializeValueForType(value.__proto__.constructor, value);
+            }
+        }
+        converted[property] = value;
+    });
+    return converted;
+};
 class JsonSerializer {
+    static serialize(value) {
+        const converted = convertTypesOnInstance(value);
+        return JSON.stringify(converted);
+    }
     static deserialize(targetType, json) {
         const parsed = JSON.parse(json);
         return this.deserializeFromInstance(targetType, parsed);

package/dist/cjs/JsonSerializer.js.map

@@ -1 +1 @@
-{"version":3,"file":"JsonSerializer.js","sources":["../../JsonSerializer.ts"],"sourcesContent":["// Copyright (c) Cratis. All rights reserved.\n// Licensed under the MIT license. See LICENSE file in the project root for full license information.\n\nimport { Constructor } from './Constructor';\nimport { Field } from './Field';\nimport { Fields } from './Fields';\nimport { DerivedType } from './DerivedType';\nimport { Guid } from './Guid';\n\ntype typeSerializer = (value: any) => any;\n\nconst typeSerializers: Map<Constructor, typeSerializer> = new Map<Constructor, typeSerializer>([\n    [Number, (value: any) => value],\n    [String, (value: any) => value],\n    [Boolean, (value: any) => value],\n    [Date, (value: any) => new Date(value)],\n    [Guid, (value: any) => Guid.parse(value.toString())],\n]);\n\nconst deserializeValueFromType = (type: Constructor, value: any) => {\n    if (typeSerializers.has(type)) {\n        return typeSerializers.get(type)!(value);\n    } else {\n        return JsonSerializer.deserialize(type, JSON.stringify(value));\n    }\n};\n\nconst deserializeValueFromField = (field: Field, value: any) => {\n    if (typeSerializers.has(field.type)) {\n        return typeSerializers.get(field.type)!(value);\n    } else {\n        let type = field.type;\n        if (field.derivatives.length > 0 && value[JsonSerializer.DerivedTypeIdProperty]) {\n            const derivedTypeId = value[JsonSerializer.DerivedTypeIdProperty];\n            type = field.derivatives.find(_ => DerivedType.get(_) == derivedTypeId) || type;\n        }\n\n        return JsonSerializer.deserialize(type, JSON.stringify(value));\n    }\n};\n\n/**\n * Represents a serializer for JSON.\n */\nexport class JsonSerializer {\n    static readonly DerivedTypeIdProperty: string = \"_derivedTypeId\";\n\n    /**\n     * Deserialize a JSON string to the specific type.\n     * @param {Constructor} targetType Type to deserialize to.\n     * @param {string} json Actual JSON to deserialize.\n     * @returns An instance of the target type.\n     */\n    static deserialize<TResult extends {}>(targetType: Constructor<TResult>, json: string): TResult {\n        const parsed = JSON.parse(json);\n        return this.deserializeFromInstance<TResult>(targetType, parsed);\n    }\n\n    /**\n     * Deserialize a array JSON string to an array of the specific instance type.\n     * @param {Constructor} targetType Type to deserialize to.\n     * @param {string} json Actual JSON to deserialize.\n     * @returns An array of instances of the target type.\n     */\n    static deserializeArray<TResult extends {}>(targetType: Constructor<TResult>, json: string): TResult[] {\n        const parsed = JSON.parse(json);\n        return this.deserializeArrayFromInstance(targetType, parsed);\n    }\n\n    /**\n     * Deserialize an any instance to a specific instance type.\n     * @param {Constructor} targetType Type to deserialize to.\n     * @param {*} instance Actual instance to deserialize.\n     * @returns An instance of the target type.\n     */\n    static deserializeFromInstance<TResult extends {}>(targetType: Constructor<TResult>, instance: any): TResult {\n        const fields = Fields.getFieldsForType(targetType as Constructor);\n\n        if( typeSerializers.has(targetType) ) {\n            return deserializeValueFromType(targetType, instance);\n        }\n\n        const deserialized = new targetType();\n        for (const field of fields) {\n            let value = instance[field.name];\n            if (value) {\n                if (field.enumerable) {\n                    value = value.map(_ => deserializeValueFromField(field, _));\n                } else {\n                    value = deserializeValueFromField(field, value);\n                }\n            }\n\n            deserialized[field.name] = value;\n        }\n\n        if ((targetType as Constructor) == Object) {\n            const objectFields = Object.keys(instance).filter((value, index, arr) => {\n                return !fields.some(_ => _.name == value);\n            });\n\n            for (const field of objectFields) {\n                deserialized[field] = instance[field];\n            }\n        }\n\n        return deserialized;\n    }\n\n    /**\n     * Deserialize an array of any instances to an array of specific instance types.\n     * @param {Constructor} targetType Type to deserialize to.\n     * @param {instances} instances Actual instances to deserialize.\n     * @returns An array of instances of the target type.\n     */\n    static deserializeArrayFromInstance<TResult extends {}>(targetType: Constructor<TResult>, instances: any): TResult[] {\n        const deserialized: TResult[] = [];\n\n        for (const instance of instances) {\n            deserialized.push(this.deserializeFromInstance<TResult>(targetType, instance));\n        }\n\n        return deserialized;\n    }\n}\n"],"names":["Guid","DerivedType","Fields"],"mappings":"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"}
+{"version":3,"file":"JsonSerializer.js","sources":["../../JsonSerializer.ts"],"sourcesContent":["// Copyright (c) Cratis. All rights reserved.\n// Licensed under the MIT license. See LICENSE file in the project root for full license information.\n\nimport { Constructor } from './Constructor';\nimport { DerivedType } from './DerivedType';\nimport { Field } from './Field';\nimport { Fields } from './Fields';\nimport { Guid } from './Guid';\n\ntype typeSerializer = (value: any) => any;\n\nconst typeConverters: Map<Constructor, typeSerializer> = new Map<Constructor, typeSerializer>([\n    [Number, (value: number) => value],\n    [String, (value: string) => value],\n    [Boolean, (value: boolean) => value],\n    [Date, (value: Date) => value.toISOString()],\n    [Guid, (value: Guid) => value?.toString() ?? '']\n]);\n\nconst typeSerializers: Map<Constructor, typeSerializer> = new Map<Constructor, typeSerializer>([\n    [Number, (value: any) => value],\n    [String, (value: any) => value],\n    [Boolean, (value: any) => value],\n    [Date, (value: any) => new Date(value)],\n    [Guid, (value: any) => Guid.parse(value.toString())],\n]);\n\nconst serializeValueForType = (type: Constructor, value: any) => {\n    if (!value) return value;\n\n    if (typeConverters.has(type)) {\n        return typeConverters.get(type)!(value);\n    } else {\n        return convertTypesOnInstance(value);\n    }\n};\n\nconst deserializeValueFromType = (type: Constructor, value: any) => {\n    if (typeSerializers.has(type)) {\n        return typeSerializers.get(type)!(value);\n    } else {\n        return JsonSerializer.deserialize(type, JSON.stringify(value));\n    }\n};\n\nconst deserializeValueFromField = (field: Field, value: any) => {\n    if (typeSerializers.has(field.type)) {\n        return typeSerializers.get(field.type)!(value);\n    } else {\n        let type = field.type;\n        if (field.derivatives.length > 0 && value[JsonSerializer.DerivedTypeIdProperty]) {\n            const derivedTypeId = value[JsonSerializer.DerivedTypeIdProperty];\n            type = field.derivatives.find(_ => DerivedType.get(_) == derivedTypeId) || type;\n        }\n\n        return JsonSerializer.deserialize(type, JSON.stringify(value));\n    }\n};\n\nconst convertTypesOnInstance = (instance: any) => {\n    const properties = Object.getOwnPropertyNames(instance);\n    const converted: any = {};\n    properties.forEach(property => {\n        let value = instance[property];\n        if (value !== undefined) {\n            if (Array.isArray(value)) {\n                value = value.map(_ => convertTypesOnInstance(_));\n            } else {\n                value = serializeValueForType(value.__proto__.constructor, value);\n            }\n        }\n\n        converted[property] = value;\n    });\n\n    return converted;\n};\n\n/**\n * Represents a serializer for JSON.\n */\nexport class JsonSerializer {\n    static readonly DerivedTypeIdProperty: string = \"_derivedTypeId\";\n\n    /**\n     * Serialize with strong type information.\n     * @param {*} value The value to serialize.\n     * @returns A JSON string.\n     */\n    static serialize(value: any): string {\n        const converted = convertTypesOnInstance(value);\n        return JSON.stringify(converted);\n    }\n\n    /**\n     * Deserialize a JSON string to the specific type.\n     * @param {Constructor} targetType Type to deserialize to.\n     * @param {string} json Actual JSON to deserialize.\n     * @returns An instance of the target type.\n     */\n    static deserialize<TResult extends {}>(targetType: Constructor<TResult>, json: string): TResult {\n        const parsed = JSON.parse(json);\n        return this.deserializeFromInstance<TResult>(targetType, parsed);\n    }\n\n    /**\n     * Deserialize a array JSON string to an array of the specific instance type.\n     * @param {Constructor} targetType Type to deserialize to.\n     * @param {string} json Actual JSON to deserialize.\n     * @returns An array of instances of the target type.\n     */\n    static deserializeArray<TResult extends {}>(targetType: Constructor<TResult>, json: string): TResult[] {\n        const parsed = JSON.parse(json);\n        return this.deserializeArrayFromInstance(targetType, parsed);\n    }\n\n    /**\n     * Deserialize an any instance to a specific instance type.\n     * @param {Constructor} targetType Type to deserialize to.\n     * @param {*} instance Actual instance to deserialize.\n     * @returns An instance of the target type.\n     */\n    static deserializeFromInstance<TResult extends {}>(targetType: Constructor<TResult>, instance: any): TResult {\n        const fields = Fields.getFieldsForType(targetType as Constructor);\n\n        if (typeSerializers.has(targetType)) {\n            return deserializeValueFromType(targetType, instance);\n        }\n\n        const deserialized = new targetType();\n        for (const field of fields) {\n            let value = instance[field.name];\n            if (value) {\n                if (field.enumerable) {\n                    value = value.map(_ => deserializeValueFromField(field, _));\n                } else {\n                    value = deserializeValueFromField(field, value);\n                }\n            }\n\n            deserialized[field.name] = value;\n        }\n\n        if ((targetType as Constructor) == Object) {\n            const objectFields = Object.keys(instance).filter((value, index, arr) => {\n                return !fields.some(_ => _.name == value);\n            });\n\n            for (const field of objectFields) {\n                deserialized[field] = instance[field];\n            }\n        }\n\n        return deserialized;\n    }\n\n    /**\n     * Deserialize an array of any instances to an array of specific instance types.\n     * @param {Constructor} targetType Type to deserialize to.\n     * @param {instances} instances Actual instances to deserialize.\n     * @returns An array of instances of the target type.\n     */\n    static deserializeArrayFromInstance<TResult extends {}>(targetType: Constructor<TResult>, instances: any): TResult[] {\n        const deserialized: TResult[] = [];\n\n        for (const instance of instances) {\n            deserialized.push(this.deserializeFromInstance<TResult>(targetType, instance));\n        }\n\n        return deserialized;\n    }\n}\n"],"names":["Guid","DerivedType","Fields"],"mappings":"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"}

package/dist/esm/JsonSerializer.d.ts

@@ -1,6 +1,7 @@
 import { Constructor } from './Constructor';
 export declare class JsonSerializer {
     static readonly DerivedTypeIdProperty: string;
+    static serialize(value: any): string;
     static deserialize<TResult extends {}>(targetType: Constructor<TResult>, json: string): TResult;
     static deserializeArray<TResult extends {}>(targetType: Constructor<TResult>, json: string): TResult[];
     static deserializeFromInstance<TResult extends {}>(targetType: Constructor<TResult>, instance: any): TResult;

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

@@ -1 +1 @@
-{"version":3,"file":"JsonSerializer.d.ts","sourceRoot":"","sources":["../../JsonSerializer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAyC5C,qBAAa,cAAc;IACvB,MAAM,CAAC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,CAAoB;IAQjE,MAAM,CAAC,WAAW,CAAC,OAAO,SAAS,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAW/F,MAAM,CAAC,gBAAgB,CAAC,OAAO,SAAS,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,EAAE;IAWtG,MAAM,CAAC,uBAAuB,CAAC,OAAO,SAAS,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,GAAG,GAAG,OAAO;IAwC5G,MAAM,CAAC,4BAA4B,CAAC,OAAO,SAAS,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,GAAG,GAAG,OAAO,EAAE;CASvH"}
+{"version":3,"file":"JsonSerializer.d.ts","sourceRoot":"","sources":["../../JsonSerializer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AA8E5C,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,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAW/F,MAAM,CAAC,gBAAgB,CAAC,OAAO,SAAS,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,EAAE;IAWtG,MAAM,CAAC,uBAAuB,CAAC,OAAO,SAAS,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,GAAG,GAAG,OAAO;IAwC5G,MAAM,CAAC,4BAA4B,CAAC,OAAO,SAAS,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,GAAG,GAAG,OAAO,EAAE;CASvH"}

package/dist/esm/JsonSerializer.js

@@ -1,7 +1,14 @@
-import { Fields } from './Fields.js';
 import { DerivedType } from './DerivedType.js';
+import { Fields } from './Fields.js';
 import { Guid } from './Guid.js';
 
+const typeConverters = new Map([
+    [Number, (value) => value],
+    [String, (value) => value],
+    [Boolean, (value) => value],
+    [Date, (value) => value.toISOString()],
+    [Guid, (value) => { var _a; return (_a = value === null || value === void 0 ? void 0 : value.toString()) !== null && _a !== void 0 ? _a : ''; }]
+]);
 const typeSerializers = new Map([
     [Number, (value) => value],
     [String, (value) => value],
@@ -9,6 +16,16 @@ const typeSerializers = new Map([
     [Date, (value) => new Date(value)],
     [Guid, (value) => Guid.parse(value.toString())],
 ]);
+const serializeValueForType = (type, value) => {
+    if (!value)
+        return value;
+    if (typeConverters.has(type)) {
+        return typeConverters.get(type)(value);
+    }
+    else {
+        return convertTypesOnInstance(value);
+    }
+};
 const deserializeValueFromType = (type, value) => {
     if (typeSerializers.has(type)) {
         return typeSerializers.get(type)(value);
@@ -30,7 +47,28 @@ const deserializeValueFromField = (field, value) => {
         return JsonSerializer.deserialize(type, JSON.stringify(value));
     }
 };
+const convertTypesOnInstance = (instance) => {
+    const properties = Object.getOwnPropertyNames(instance);
+    const converted = {};
+    properties.forEach(property => {
+        let value = instance[property];
+        if (value !== undefined) {
+            if (Array.isArray(value)) {
+                value = value.map(_ => convertTypesOnInstance(_));
+            }
+            else {
+                value = serializeValueForType(value.__proto__.constructor, value);
+            }
+        }
+        converted[property] = value;
+    });
+    return converted;
+};
 class JsonSerializer {
+    static serialize(value) {
+        const converted = convertTypesOnInstance(value);
+        return JSON.stringify(converted);
+    }
     static deserialize(targetType, json) {
         const parsed = JSON.parse(json);
         return this.deserializeFromInstance(targetType, parsed);

package/dist/esm/JsonSerializer.js.map

@@ -1 +1 @@
-{"version":3,"file":"JsonSerializer.js","sources":["../../JsonSerializer.ts"],"sourcesContent":["// Copyright (c) Cratis. All rights reserved.\n// Licensed under the MIT license. See LICENSE file in the project root for full license information.\n\nimport { Constructor } from './Constructor';\nimport { Field } from './Field';\nimport { Fields } from './Fields';\nimport { DerivedType } from './DerivedType';\nimport { Guid } from './Guid';\n\ntype typeSerializer = (value: any) => any;\n\nconst typeSerializers: Map<Constructor, typeSerializer> = new Map<Constructor, typeSerializer>([\n    [Number, (value: any) => value],\n    [String, (value: any) => value],\n    [Boolean, (value: any) => value],\n    [Date, (value: any) => new Date(value)],\n    [Guid, (value: any) => Guid.parse(value.toString())],\n]);\n\nconst deserializeValueFromType = (type: Constructor, value: any) => {\n    if (typeSerializers.has(type)) {\n        return typeSerializers.get(type)!(value);\n    } else {\n        return JsonSerializer.deserialize(type, JSON.stringify(value));\n    }\n};\n\nconst deserializeValueFromField = (field: Field, value: any) => {\n    if (typeSerializers.has(field.type)) {\n        return typeSerializers.get(field.type)!(value);\n    } else {\n        let type = field.type;\n        if (field.derivatives.length > 0 && value[JsonSerializer.DerivedTypeIdProperty]) {\n            const derivedTypeId = value[JsonSerializer.DerivedTypeIdProperty];\n            type = field.derivatives.find(_ => DerivedType.get(_) == derivedTypeId) || type;\n        }\n\n        return JsonSerializer.deserialize(type, JSON.stringify(value));\n    }\n};\n\n/**\n * Represents a serializer for JSON.\n */\nexport class JsonSerializer {\n    static readonly DerivedTypeIdProperty: string = \"_derivedTypeId\";\n\n    /**\n     * Deserialize a JSON string to the specific type.\n     * @param {Constructor} targetType Type to deserialize to.\n     * @param {string} json Actual JSON to deserialize.\n     * @returns An instance of the target type.\n     */\n    static deserialize<TResult extends {}>(targetType: Constructor<TResult>, json: string): TResult {\n        const parsed = JSON.parse(json);\n        return this.deserializeFromInstance<TResult>(targetType, parsed);\n    }\n\n    /**\n     * Deserialize a array JSON string to an array of the specific instance type.\n     * @param {Constructor} targetType Type to deserialize to.\n     * @param {string} json Actual JSON to deserialize.\n     * @returns An array of instances of the target type.\n     */\n    static deserializeArray<TResult extends {}>(targetType: Constructor<TResult>, json: string): TResult[] {\n        const parsed = JSON.parse(json);\n        return this.deserializeArrayFromInstance(targetType, parsed);\n    }\n\n    /**\n     * Deserialize an any instance to a specific instance type.\n     * @param {Constructor} targetType Type to deserialize to.\n     * @param {*} instance Actual instance to deserialize.\n     * @returns An instance of the target type.\n     */\n    static deserializeFromInstance<TResult extends {}>(targetType: Constructor<TResult>, instance: any): TResult {\n        const fields = Fields.getFieldsForType(targetType as Constructor);\n\n        if( typeSerializers.has(targetType) ) {\n            return deserializeValueFromType(targetType, instance);\n        }\n\n        const deserialized = new targetType();\n        for (const field of fields) {\n            let value = instance[field.name];\n            if (value) {\n                if (field.enumerable) {\n                    value = value.map(_ => deserializeValueFromField(field, _));\n                } else {\n                    value = deserializeValueFromField(field, value);\n                }\n            }\n\n            deserialized[field.name] = value;\n        }\n\n        if ((targetType as Constructor) == Object) {\n            const objectFields = Object.keys(instance).filter((value, index, arr) => {\n                return !fields.some(_ => _.name == value);\n            });\n\n            for (const field of objectFields) {\n                deserialized[field] = instance[field];\n            }\n        }\n\n        return deserialized;\n    }\n\n    /**\n     * Deserialize an array of any instances to an array of specific instance types.\n     * @param {Constructor} targetType Type to deserialize to.\n     * @param {instances} instances Actual instances to deserialize.\n     * @returns An array of instances of the target type.\n     */\n    static deserializeArrayFromInstance<TResult extends {}>(targetType: Constructor<TResult>, instances: any): TResult[] {\n        const deserialized: TResult[] = [];\n\n        for (const instance of instances) {\n            deserialized.push(this.deserializeFromInstance<TResult>(targetType, instance));\n        }\n\n        return deserialized;\n    }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"JsonSerializer.js","sources":["../../JsonSerializer.ts"],"sourcesContent":["// Copyright (c) Cratis. All rights reserved.\n// Licensed under the MIT license. See LICENSE file in the project root for full license information.\n\nimport { Constructor } from './Constructor';\nimport { DerivedType } from './DerivedType';\nimport { Field } from './Field';\nimport { Fields } from './Fields';\nimport { Guid } from './Guid';\n\ntype typeSerializer = (value: any) => any;\n\nconst typeConverters: Map<Constructor, typeSerializer> = new Map<Constructor, typeSerializer>([\n    [Number, (value: number) => value],\n    [String, (value: string) => value],\n    [Boolean, (value: boolean) => value],\n    [Date, (value: Date) => value.toISOString()],\n    [Guid, (value: Guid) => value?.toString() ?? '']\n]);\n\nconst typeSerializers: Map<Constructor, typeSerializer> = new Map<Constructor, typeSerializer>([\n    [Number, (value: any) => value],\n    [String, (value: any) => value],\n    [Boolean, (value: any) => value],\n    [Date, (value: any) => new Date(value)],\n    [Guid, (value: any) => Guid.parse(value.toString())],\n]);\n\nconst serializeValueForType = (type: Constructor, value: any) => {\n    if (!value) return value;\n\n    if (typeConverters.has(type)) {\n        return typeConverters.get(type)!(value);\n    } else {\n        return convertTypesOnInstance(value);\n    }\n};\n\nconst deserializeValueFromType = (type: Constructor, value: any) => {\n    if (typeSerializers.has(type)) {\n        return typeSerializers.get(type)!(value);\n    } else {\n        return JsonSerializer.deserialize(type, JSON.stringify(value));\n    }\n};\n\nconst deserializeValueFromField = (field: Field, value: any) => {\n    if (typeSerializers.has(field.type)) {\n        return typeSerializers.get(field.type)!(value);\n    } else {\n        let type = field.type;\n        if (field.derivatives.length > 0 && value[JsonSerializer.DerivedTypeIdProperty]) {\n            const derivedTypeId = value[JsonSerializer.DerivedTypeIdProperty];\n            type = field.derivatives.find(_ => DerivedType.get(_) == derivedTypeId) || type;\n        }\n\n        return JsonSerializer.deserialize(type, JSON.stringify(value));\n    }\n};\n\nconst convertTypesOnInstance = (instance: any) => {\n    const properties = Object.getOwnPropertyNames(instance);\n    const converted: any = {};\n    properties.forEach(property => {\n        let value = instance[property];\n        if (value !== undefined) {\n            if (Array.isArray(value)) {\n                value = value.map(_ => convertTypesOnInstance(_));\n            } else {\n                value = serializeValueForType(value.__proto__.constructor, value);\n            }\n        }\n\n        converted[property] = value;\n    });\n\n    return converted;\n};\n\n/**\n * Represents a serializer for JSON.\n */\nexport class JsonSerializer {\n    static readonly DerivedTypeIdProperty: string = \"_derivedTypeId\";\n\n    /**\n     * Serialize with strong type information.\n     * @param {*} value The value to serialize.\n     * @returns A JSON string.\n     */\n    static serialize(value: any): string {\n        const converted = convertTypesOnInstance(value);\n        return JSON.stringify(converted);\n    }\n\n    /**\n     * Deserialize a JSON string to the specific type.\n     * @param {Constructor} targetType Type to deserialize to.\n     * @param {string} json Actual JSON to deserialize.\n     * @returns An instance of the target type.\n     */\n    static deserialize<TResult extends {}>(targetType: Constructor<TResult>, json: string): TResult {\n        const parsed = JSON.parse(json);\n        return this.deserializeFromInstance<TResult>(targetType, parsed);\n    }\n\n    /**\n     * Deserialize a array JSON string to an array of the specific instance type.\n     * @param {Constructor} targetType Type to deserialize to.\n     * @param {string} json Actual JSON to deserialize.\n     * @returns An array of instances of the target type.\n     */\n    static deserializeArray<TResult extends {}>(targetType: Constructor<TResult>, json: string): TResult[] {\n        const parsed = JSON.parse(json);\n        return this.deserializeArrayFromInstance(targetType, parsed);\n    }\n\n    /**\n     * Deserialize an any instance to a specific instance type.\n     * @param {Constructor} targetType Type to deserialize to.\n     * @param {*} instance Actual instance to deserialize.\n     * @returns An instance of the target type.\n     */\n    static deserializeFromInstance<TResult extends {}>(targetType: Constructor<TResult>, instance: any): TResult {\n        const fields = Fields.getFieldsForType(targetType as Constructor);\n\n        if (typeSerializers.has(targetType)) {\n            return deserializeValueFromType(targetType, instance);\n        }\n\n        const deserialized = new targetType();\n        for (const field of fields) {\n            let value = instance[field.name];\n            if (value) {\n                if (field.enumerable) {\n                    value = value.map(_ => deserializeValueFromField(field, _));\n                } else {\n                    value = deserializeValueFromField(field, value);\n                }\n            }\n\n            deserialized[field.name] = value;\n        }\n\n        if ((targetType as Constructor) == Object) {\n            const objectFields = Object.keys(instance).filter((value, index, arr) => {\n                return !fields.some(_ => _.name == value);\n            });\n\n            for (const field of objectFields) {\n                deserialized[field] = instance[field];\n            }\n        }\n\n        return deserialized;\n    }\n\n    /**\n     * Deserialize an array of any instances to an array of specific instance types.\n     * @param {Constructor} targetType Type to deserialize to.\n     * @param {instances} instances Actual instances to deserialize.\n     * @returns An array of instances of the target type.\n     */\n    static deserializeArrayFromInstance<TResult extends {}>(targetType: Constructor<TResult>, instances: any): TResult[] {\n        const deserialized: TResult[] = [];\n\n        for (const instance of instances) {\n            deserialized.push(this.deserializeFromInstance<TResult>(targetType, instance));\n        }\n\n        return deserialized;\n    }\n}\n"],"names":[],"mappings":"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"}

package/for_JsonSerializer/Types.ts

@@ -0,0 +1,67 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+import { field } from '../fieldDecorator';
+import { derivedType } from '../derivedTypeDecorator';
+import { Guid } from '../Guid';
+
+export class OtherType {
+    @field(Number)
+    someNumber!: number;
+
+    @field(String)
+    someString!: string;
+
+    @field(Date)
+    someDate!: Date;
+
+    @field(Guid)
+    someGuid!: Guid;
+
+    @field(Date)
+    collectionOfDates!: Date[];
+
+    @field(Number)
+    collectionOfNumbers!: number[];
+}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface ITargetType { }
+
+@derivedType('ad7593d1-71be-4e26-9026-aedb32fc43d3')
+export class FirstDerivative implements ITargetType {
+    @field(Number)
+    firstDerivativeProperty!: number;
+}
+
+@derivedType('a038ca48-360e-46a7-8cb2-882ff21bb623')
+export class SecondDerivative implements ITargetType {
+    @field(Number)
+    secondDerivativeProperty!: number;
+}
+
+export class TopLevel {
+    @field(Number)
+    someNumber!: number;
+
+    @field(String)
+    someString!: string;
+
+    @field(Date)
+    someDate!: Date;
+
+    @field(Boolean)
+    someBoolean!: boolean;
+
+    @field(Guid)
+    someGuid!: Guid;
+
+    @field(OtherType)
+    otherType!: OtherType;
+
+    @field(OtherType, true)
+    collectionOfOtherType!: OtherType[];
+
+    @field(Object, true, [FirstDerivative, SecondDerivative])
+    collectionOfDerivedTypes!: ITargetType[];
+}

package/for_JsonSerializer/when_deserializing_complex_nested_object_with_multiple_wellknown_types.ts

@@ -1,85 +1,34 @@
 // Copyright (c) Cratis. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-import { field } from '../fieldDecorator';
 import { JsonSerializer } from '../JsonSerializer';
-import { derivedType } from '../derivedTypeDecorator';
-
-class OtherType {
-    @field(Number)
-    someNumber!: number;
-
-    @field(String)
-    someString!: string;
-
-    @field(Date)
-    someDate!: Date;
-
-    @field(Date)
-    collectionOfDates!: Date[];
-
-    @field(Number)
-    collectionOfNumbers!: number[];
-}
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-interface ITargetType { }
-
-@derivedType('ad7593d1-71be-4e26-9026-aedb32fc43d3')
-class FirstDerivative implements ITargetType {
-    @field(Number)
-    firstDerivativeProperty!: number;
-}
-
-@derivedType('a038ca48-360e-46a7-8cb2-882ff21bb623')
-class SecondDerivative implements ITargetType {
-    @field(Number)
-    secondDerivativeProperty!: number;
-}
-
-class TopLevel {
-    @field(Number)
-    someNumber!: number;
-
-    @field(String)
-    someString!: string;
-
-    @field(Date)
-    someDate!: Date;
-
-    @field(Boolean)
-    someBoolean!: boolean;
-
-    @field(OtherType)
-    otherType!: OtherType;
-
-    @field(OtherType, true)
-    collectionOfOtherType!: OtherType[];
-
-    @field(Object, true, [FirstDerivative, SecondDerivative])
-    collectionOfDerivedTypes!: ITargetType[];
-}
+import { Guid } from '../Guid';
+import { FirstDerivative, SecondDerivative, TopLevel } from './Types';
 
 const json = '{' +
     '    "someNumber": 42,' +
     '    "someString": "forty two",' +
     '    "someDate": "2022-10-07 15:51",' +
     '    "someBoolean": true,' +
+    '    "someGuid": "f0fa7c5e-9f7b-4688-8851-e0b6eeebe28b",' +
     '    "otherType": {' +
     '       "someNumber": 43,' +
     '       "someString": "forty three",' +
-    '       "someDate": "2022-11-07 15:51"' +
+    '       "someDate": "2022-11-07 15:51",' +
+    '       "someGuid": "a97f20cb-7f13-4f05-ab15-efb2b43c2457"' +
     '    },' +
     '    "collectionOfOtherType": [' +
     '       {' +
     '           "someNumber": 44,' +
     '           "someString": "forty four",' +
-    '           "someDate": "2022-12-07 15:51"' +
+    '           "someDate": "2022-12-07 15:51",' +
+    '           "someGuid": "6d96dcba-3f71-4cb1-ab2c-cd6e52b7e7fd"' +
     '       },' +
     '       {' +
     '           "someNumber": 45,' +
     '           "someString": "forty five",' +
-    '           "someDate": "2022-13-07 15:51"' +
+    '           "someDate": "2023-01-07 15:51",' +
+    '           "someGuid": "3d7666c9-8929-4d41-9293-768100d0a019"' +
     '       }' +
     '    ],' +
     '   "collectionOfDerivedTypes": [' +
@@ -96,15 +45,30 @@ describe('when deserializing complex nested object with multiple wellknown types
     it('should hold correct number for first level number', () => result.someNumber.should.equal(42));
     it('should hold correct string for first level string', () => result.someString.should.equal('forty two'));
     it('should hold correct bool value for first level boolean', () => result.someBoolean.should.be.true);
+    it('should hold correct guid value for first level guid', () => result.someGuid.toString().should.equal('f0fa7c5e-9f7b-4688-8851-e0b6eeebe28b'));
+    it('should hold correct type for first level guid', () => result.someGuid.constructor.should.equal(Guid));
     it('should hold correct type for first level date', () => result.someDate.constructor.should.equal(Date));
     it('should hold correct value for first level date', () => result.someDate.toString().should.equal(new Date('2022-10-07 15:51').toString()));
 
     it('should hold correct number for second level number', () => result.otherType.someNumber.should.equal(43));
     it('should hold correct string for second level string', () => result.otherType.someString.should.equal('forty three'));
     it('should hold correct type for second level date', () => result.otherType.someDate.constructor.should.equal(Date));
+    it('should hold correct guid value for second level guid', () => result.otherType.someGuid.toString().should.equal('a97f20cb-7f13-4f05-ab15-efb2b43c2457'));
+    it('should hold correct type for second level guid', () => result.otherType.someGuid.constructor.should.equal(Guid));
     it('should hold correct value for second level date', () => result.otherType.someDate.toString().should.equal(new Date('2022-11-07 15:51').toString()));
 
     it('should have 2 items in the children', () => result.collectionOfOtherType.length.should.equal(2));
+    it('should hold correct number for number in first child', () => result.collectionOfOtherType[0].someNumber.should.equal(44));
+    it('should hold correct string for string in first child', () => result.collectionOfOtherType[0].someString.should.equal('forty four'));
+    it('should hold correct type for date in first child', () => result.collectionOfOtherType[0].someDate.constructor.should.equal(Date));
+    it('should hold correct value for date in first child', () => result.collectionOfOtherType[0].someDate.toString().should.equal(new Date('2022-12-07 15:51').toString()));
+    it('should hold correct guid value for guid in first child', () => result.collectionOfOtherType[0].someGuid.toString().should.equal('6d96dcba-3f71-4cb1-ab2c-cd6e52b7e7fd'));
+
+    it('should hold correct number for number in second child', () => result.collectionOfOtherType[1].someNumber.should.equal(45));
+    it('should hold correct string for string in second child', () => result.collectionOfOtherType[1].someString.should.equal('forty five'));
+    it('should hold correct type for date in second child', () => result.collectionOfOtherType[1].someDate.constructor.should.equal(Date));
+    it('should hold correct value for date in second child', () => result.collectionOfOtherType[1].someDate.toString().should.equal(new Date('2023-01-07 15:51').toString()));
+    it('should hold correct guid value for guid in second child', () => result.collectionOfOtherType[1].someGuid.toString().should.equal('3d7666c9-8929-4d41-9293-768100d0a019'));
 
     it('should have 2 items in the derived types collection', () => result.collectionOfDerivedTypes.length.should.equal(2));
     it('should have correct type for first derivative', () => result.collectionOfDerivedTypes[0].constructor.should.equal(FirstDerivative));

package/for_JsonSerializer/when_serializing_complex_nested_object_with_multiple_wellknown_types.ts

@@ -0,0 +1,57 @@
+// Copyright (c) Cratis. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+import { JsonSerializer } from '../JsonSerializer';
+import { Guid } from '../Guid';
+import { OtherType, TopLevel } from './Types';
+
+describe('when serializing complex nested object with multiple wellknown types', () => {
+    const instance = new TopLevel();
+    instance.someNumber = 42;
+    instance.someString = 'forty two';
+    instance.someDate = new Date('2022-10-07 15:51');
+    instance.someBoolean = true;
+    instance.someGuid = Guid.parse('f0fa7c5e-9f7b-4688-8851-e0b6eeebe28b');
+    instance.otherType = new OtherType();
+    instance.otherType.someNumber = 43;
+    instance.otherType.someString = 'forty three';
+    instance.otherType.someDate = new Date('2022-11-07 15:51');
+    instance.otherType.someGuid = Guid.parse('a97f20cb-7f13-4f05-ab15-efb2b43c2457');
+    instance.collectionOfOtherType = [
+        new OtherType(),
+        new OtherType()
+    ];
+    instance.collectionOfOtherType[0].someNumber = 44;
+    instance.collectionOfOtherType[0].someString = 'forty four';
+    instance.collectionOfOtherType[0].someGuid = Guid.parse('b8987c5c-6506-4da7-8f19-a50cfc218c54');
+    instance.collectionOfOtherType[0].someDate = new Date('2022-12-07 15:51');
+    instance.collectionOfOtherType[1].someNumber = 45;
+    instance.collectionOfOtherType[1].someString = 'forty five';
+    instance.collectionOfOtherType[1].someGuid = Guid.parse('ee503799-63a7-4666-84b8-46eb1641206a');
+    instance.collectionOfOtherType[1].someDate = new Date('2023-01-07 15:51');
+   
+    const result = JsonSerializer.serialize(instance);
+    const deserialized = JSON.parse(result);
+
+    it('should hold correct number for first level number', () => deserialized.someNumber.should.equal(42));
+    it('should hold correct string for first level string', () => deserialized.someString.should.equal('forty two'));
+    it('should hold correct bool value for first level boolean', () => deserialized.someBoolean.should.be.true);
+    it('should hold correct guid value for first level guid', () => deserialized.someGuid.should.equal(instance.someGuid.toString()));
+    it('should hold correct value for first level date', () => deserialized.someDate.toString().should.equal(JSON.stringify(instance.someDate).slice(1, -1)));
+
+    it('should hold correct number for second level number', () => deserialized.otherType.someNumber.should.equal(43));
+    it('should hold correct string for second level string', () => deserialized.otherType.someString.should.equal('forty three'));
+    it('should hold correct guid value for second level guid', () => deserialized.otherType.someGuid.should.equal(instance.otherType.someGuid.toString()));
+    it('should hold correct value for second level date', () => deserialized.otherType.someDate.toString().should.equal(JSON.stringify(instance.otherType.someDate).slice(1, -1)));
+
+    it('should have 2 items in the children', () => deserialized.collectionOfOtherType.length.should.equal(2));
+    it('should hold correct number for number in first child', () => deserialized.collectionOfOtherType[0].someNumber.should.equal(44));
+    it('should hold correct string for string in first child', () => deserialized.collectionOfOtherType[0].someString.should.equal('forty four'));
+    it('should hold correct value for date in first child', () => deserialized.collectionOfOtherType[0].someDate.toString().should.equal(JSON.stringify(instance.collectionOfOtherType[0].someDate).slice(1, -1)));
+    it('should hold correct guid value for guid in first child', () => deserialized.collectionOfOtherType[0].someGuid.toString().should.equal(instance.collectionOfOtherType[0].someGuid.toString()));
+
+    it('should hold correct number for number in second child', () => deserialized.collectionOfOtherType[1].someNumber.should.equal(45));
+    it('should hold correct string for string in second child', () => deserialized.collectionOfOtherType[1].someString.should.equal('forty five'));
+    it('should hold correct value for date in second child', () => deserialized.collectionOfOtherType[1].someDate.toString().should.equal(JSON.stringify(instance.collectionOfOtherType[1].someDate).slice(1, -1)));
+    it('should hold correct guid value for guid in second child', () => deserialized.collectionOfOtherType[1].someGuid.toString().should.equal(instance.collectionOfOtherType[1].someGuid.toString()));
+});

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cratis/fundamentals",
-    "version": "5.5.1",
+    "version": "5.6.1",
     "description": "",
     "author": "Cratis",
     "license": "MIT",