gingersnap 0.23.12 → 0.23.13

package/data/model/model.cjs

@@ -165,11 +165,12 @@ class Model {
     /**
      * Converts the current model to a JSON object
      */
-    object(removeMissingFields = false) {
+    object(options) {
         var _a, _b;
+        const { removeMissingFields = false, keepOptionals = true } = options || {};
         const serialize = (value) => {
             if (value instanceof Model) {
-                return value.object(removeMissingFields);
+                return value.object({ removeMissingFields, keepOptionals });
             }
             else if (value instanceof Array || Array.isArray(value)) {
                 return value.map((v) => serialize(v));
@@ -189,6 +190,13 @@ class Model {
             else if (value instanceof Function) {
                 return null;
             }
+            else if (value instanceof Optional) {
+                if (keepOptionals)
+                    return value;
+                if (value.isPresent())
+                    return value.get();
+                return null;
+            }
             return value;
         };
         return R__namespace.reduce((acc, [key, fieldProps]) => {
@@ -203,46 +211,45 @@ class Model {
             return acc;
         }, {}, Array.from(((_b = (_a = Model.buildPropTree(Object.getPrototypeOf(this))) === null || _a === void 0 ? void 0 : _a.fields) !== null && _b !== void 0 ? _b : new Map()).entries()));
     }
-    // TODO add support for union fields in serialization and deserialization, and later date include schema generation
     /**
      * Converts the current model to a JSON string
      */
-    json(removeMissingFields = false) {
-        return JSON.stringify(this.object(removeMissingFields));
+    json(options) {
+        return JSON.stringify(this.object(options));
     }
     /**
      * Converts the current model to an arraybuffer
      */
-    buffer(removeMissingFields = false) {
-        return new TextEncoder().encode(this.json(removeMissingFields));
+    buffer(options) {
+        return new TextEncoder().encode(this.json(options));
     }
     /**
      * Converts the current model to a blob
      */
-    blob(removeMissingFields = false) {
-        return new Blob([this.buffer(removeMissingFields)]);
+    blob(options) {
+        return new Blob([this.buffer(options)]);
     }
     /**
      * Converts the current model to an XML string
      */
-    xml(removeMissingFields = false) {
-        return Model.__xmlParser__.js2xml(this.object(removeMissingFields));
+    xml(options) {
+        return Model.__xmlParser__.js2xml(this.object(options));
     }
     /**
      * Converts the current model to message pack binary format
      * @returns message pack binary
      */
-    messagePack(removeMissingFields = false) {
-        return msgpack.encode(this.object(removeMissingFields)).buffer;
+    messagePack(options) {
+        return msgpack.encode(this.object(options)).buffer;
     }
     /**
      * Converts the current model to csv format
-     * @param removeMissingFields
+     * @param options
      * @param config CSV unparsing configuration
      * @returns csv string
      */
-    csv(removeMissingFields = false, config) {
-        return Papa.unparse([this.object(removeMissingFields)], config);
+    csv(options, config) {
+        return Papa.unparse([this.object(options)], config);
     }
     clone() {
         const newModel = new (Object.getPrototypeOf(this))();
@@ -253,10 +260,10 @@ class Model {
     }
     /**
      * Retrieves the schema of the current model based on the selected format
-     * @param format data format
+     * @param includeTitleAndDraft boolean whether the title and JSON schema draft version should be referenced in the schema
      * @returns the schema for the current model
      */
-    static schema(addTitleAndDraftRef = true) {
+    static schema(includeTitleAndDraft = true) {
         const model = new this();
         const props = this.buildPropTree(Object.getPrototypeOf(model));
         const handleArrays = (v, entry) => {
@@ -348,24 +355,38 @@ class Model {
             }
             return entry;
         }));
-        if (addTitleAndDraftRef)
-            return {
-                $schema: "https://json-schema.org/draft/2020-12/schema",
-                title: this.name,
+        const fieldEntries = Array.from(props.fields.entries());
+        const optionals = Object.getOwnPropertyNames(this.prototype)
+            .filter((key) => key !== "constructor")
+            .map((key) => [key, model[key]])
+            .map(([key, modelValue]) => ({
+            modelValue,
+            fieldProps: fieldEntries.find(([k, v]) => { var _a; return k === key || ((_a = v.aliases) === null || _a === void 0 ? void 0 : _a.includes(key)); }),
+        }))
+            .filter(({ modelValue, fieldProps }) => { var _a, _b, _c; return modelValue !== undefined || ((_b = (_a = fieldProps[1].schema) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.optional) || ((_c = fieldProps[1].ignore) === null || _c === void 0 ? void 0 : _c.deserialize); })
+            .map(({ fieldProps }) => fieldProps[0]);
+        const required = fieldEntries.filter(([k]) => !optionals.includes(k)).map(([k]) => k);
+        const result = required.length
+            ? {
                 type: "object",
                 properties: generateProperties(),
                 additionalProperties: false,
-            };
-        else {
-            return {
+                required,
+            }
+            : {
                 type: "object",
                 properties: generateProperties(),
                 additionalProperties: false,
             };
+        if (includeTitleAndDraft) {
+            return Object.assign(Object.assign({}, result), { $schema: "https://json-schema.org/draft/2020-12/schema", title: this.name });
+        }
+        else {
+            return result;
         }
     }
     toString() {
-        return this.json(true);
+        return this.json({ removeMissingFields: true, keepOptionals: false });
     }
     /**
      * Constructs the model properties by traversing the inheritance tree of the current Model being instantiated
@@ -416,7 +437,7 @@ class Model {
         const model = new this();
         const props = this.buildPropTree(Object.getPrototypeOf(model));
         R__namespace.forEach(([key, fieldProps]) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
             let value = data[key];
             if (value === undefined || value === null) {
                 for (const alias of (_a = fieldProps.aliases) !== null && _a !== void 0 ? _a : []) {
@@ -437,12 +458,101 @@ class Model {
             else if ((value === undefined || value === null) && !(model[key] === undefined || model[key] === null)) {
                 return;
             }
+            const checkOtherTypes = (value, Type, fallback) => {
+                var _a, _b;
+                if ((Type === null || Type === void 0 ? void 0 : Type.name) === "String") {
+                    return processValue(fieldProps, String(value));
+                }
+                else if ((Type === null || Type === void 0 ? void 0 : Type.name) === "Boolean") {
+                    return processValue(fieldProps, Boolean(value));
+                }
+                else if ((Type === null || Type === void 0 ? void 0 : Type.name) === "Number") {
+                    const v = Number(value);
+                    if (isNaN(v))
+                        throw new ParsingError.ParsingError([], `value for ${key} is not a valid number`);
+                    return processValue(fieldProps, v);
+                }
+                else if ((Type === null || Type === void 0 ? void 0 : Type.name) === "Map") {
+                    const valueType = typeof value;
+                    switch (valueType) {
+                        case "object": {
+                            try {
+                                return processValue(fieldProps, value instanceof Array || Array.isArray(value) ? new Map(value) : new Map(Object.entries(value)));
+                            }
+                            catch (e) {
+                                throw new ParsingError.ParsingError([], (_a = e === null || e === void 0 ? void 0 : e.message) !== null && _a !== void 0 ? _a : String(e));
+                            }
+                        }
+                        case "string":
+                            try {
+                                value = JSON.parse(value);
+                                return processValue(fieldProps, value instanceof Array || Array.isArray(value) ? new Map(value) : new Map(Object.entries(value)));
+                            }
+                            catch (e) {
+                                throw new ParsingError.ParsingError([], (_b = e === null || e === void 0 ? void 0 : e.message) !== null && _b !== void 0 ? _b : String(e));
+                            }
+                        default:
+                            throw new ParsingError.ParsingError([value], `value for ${key} cannot be converted to a Map`);
+                    }
+                }
+                else if ((Type === null || Type === void 0 ? void 0 : Type.name) === "Set") {
+                    if (value instanceof Array || Array.isArray(value)) {
+                        return processValue(fieldProps, new Set(value));
+                    }
+                    else if (typeof value === "string") {
+                        return processValue(fieldProps, new Set(JSON.parse(value)));
+                    }
+                    throw new ParsingError.ParsingError([value], `value for ${key} cannot be converted to a Set`);
+                }
+                else {
+                    return fallback();
+                }
+            };
+            function processUnionField(value) {
+                let foundMatch = false;
+                let result;
+                for (const unionType of fieldProps.unionTypes) {
+                    try {
+                        result = checkOtherTypes(value, unionType, () => {
+                            if (unionType.prototype instanceof Model) {
+                                const parser$1 = parser.parse({
+                                    string: (v) => unionType.fromString(v, format),
+                                    object: (v) => unionType.fromObject(v, format),
+                                    default: () => {
+                                        throw new ParsingError.ParsingError([], `value for ${key} is expected to be an Array, instead received ${typeof value}`);
+                                    },
+                                    supportArray: true,
+                                });
+                                return processValue(fieldProps, parser$1(value));
+                            }
+                            throw new ParsingError.ParsingError([], `value for ${key} type is unsupported ${typeof value}`);
+                        });
+                        foundMatch = true;
+                        break;
+                    }
+                    catch (e) { }
+                }
+                if (!foundMatch) {
+                    throw new ParsingError.ParsingError([], `value for ${key} does not match any of the union types expected`);
+                }
+                return result;
+            }
             if ((_e = Object.getOwnPropertyDescriptor(Object.getPrototypeOf(model), key)) === null || _e === void 0 ? void 0 : _e.set) {
                 model[key] = processValue(fieldProps, value);
             }
             else if ((_f = Object.getOwnPropertyDescriptor(Object.getPrototypeOf(model), key)) === null || _f === void 0 ? void 0 : _f.get) {
                 return;
             }
+            else if (fieldProps.isUnion) {
+                if (!fieldProps.isArray) {
+                    model[key] = processUnionField(value);
+                }
+                else if (fieldProps.isArray && Array.isArray(value)) {
+                    model[key] = value.map((item) => processUnionField(item));
+                }
+                else
+                    throw new ParsingError.ParsingError([], `value for ${key} is expected to be an array`);
+            }
             else if (model[key] instanceof fieldProps.Type &&
                 typeof model[key] === "function" &&
                 fieldProps.Type instanceof Function) {
@@ -552,51 +662,8 @@ class Model {
                     }
                 }));
             }
-            else if (((_k = fieldProps.Type) === null || _k === void 0 ? void 0 : _k.name) === "String") {
-                model[key] = processValue(fieldProps, String(value));
-            }
-            else if (((_l = fieldProps.Type) === null || _l === void 0 ? void 0 : _l.name) === "Boolean") {
-                model[key] = processValue(fieldProps, Boolean(value));
-            }
-            else if (((_m = fieldProps.Type) === null || _m === void 0 ? void 0 : _m.name) === "Number") {
-                model[key] = processValue(fieldProps, Number(value));
-            }
-            else if (((_o = fieldProps.Type) === null || _o === void 0 ? void 0 : _o.name) === "Map") {
-                const valueType = typeof value;
-                switch (valueType) {
-                    case "object": {
-                        try {
-                            model[key] = processValue(fieldProps, value instanceof Array || Array.isArray(value) ? new Map(value) : new Map(Object.entries(value)));
-                        }
-                        catch (e) {
-                            throw new ParsingError.ParsingError([], (_p = e === null || e === void 0 ? void 0 : e.message) !== null && _p !== void 0 ? _p : String(e));
-                        }
-                        break;
-                    }
-                    case "string":
-                        try {
-                            value = JSON.parse(value);
-                            model[key] = processValue(fieldProps, value instanceof Array || Array.isArray(value) ? new Map(value) : new Map(Object.entries(value)));
-                        }
-                        catch (e) {
-                            throw new ParsingError.ParsingError([], (_q = e === null || e === void 0 ? void 0 : e.message) !== null && _q !== void 0 ? _q : String(e));
-                        }
-                        break;
-                    default:
-                        throw new ParsingError.ParsingError([value], `value for ${key} cannot be converted to a Map`);
-                }
-            }
-            else if (((_r = fieldProps.Type) === null || _r === void 0 ? void 0 : _r.name) === "Set") {
-                if (value instanceof Array || Array.isArray(value)) {
-                    model[key] = processValue(fieldProps, new Set(value));
-                }
-                else if (typeof value === "string") {
-                    model[key] = processValue(fieldProps, new Set(JSON.parse(value)));
-                }
-                throw new ParsingError.ParsingError([value], `value for ${key} cannot be converted to a Set`);
-            }
             else {
-                model[key] = processValue(fieldProps, new fieldProps.Type(value));
+                model[key] = checkOtherTypes(value, fieldProps.Type, () => processValue(fieldProps, new fieldProps.Type(value)));
             }
             if (fieldProps.readonly) {
                 Object.defineProperty(model, key, {
@@ -608,7 +675,7 @@ class Model {
             R__namespace.forEach(([k, v]) => {
                 if (v.__callback__)
                     v.__callback__(k, v.properties, model, key);
-            }, R__namespace.toPairs((_s = fieldProps.customTags) !== null && _s !== void 0 ? _s : {}));
+            }, R__namespace.toPairs((_k = fieldProps.customTags) !== null && _k !== void 0 ? _k : {}));
         }, Array.from(props.fields.entries()));
         return Object.seal(model);
     }

package/data/model/model.d.ts

@@ -95,6 +95,10 @@ export interface ModelURLConversionOptions extends ModelAdvanceConversionOptions
     requestHeaders?: any;
     mode?: any;
 }
+export interface ModelExportOptions {
+    removeMissingFields?: boolean;
+    keepOptionals?: boolean;
+}
 export type ModelJSONConversionOptions = Omit<ModelConversionOptions, "format">;
 /**
  * A Data de/serializer class that manages and validates data as JavaScript Objects
@@ -148,7 +152,6 @@ export declare class Model {
      * @remarks
      * If the data format is a binary one, the provided string should be a hexadecimal string.
      * @param data string data source
-     * @param format data format
      * @param options
      */
     static fromString<T extends Model>(this: ModelConstructor<T>, data: string, options?: Omit<ModelAdvanceConversionOptions, "array" | "maybeArray">): T;
@@ -171,44 +174,44 @@ export declare class Model {
     /**
      * Converts the current model to a JSON object
      */
-    object(removeMissingFields?: boolean): {
+    object(options?: ModelExportOptions): {
         [string: string]: any;
     };
     /**
      * Converts the current model to a JSON string
      */
-    json(removeMissingFields?: boolean): string;
+    json(options?: ModelExportOptions): string;
     /**
      * Converts the current model to an arraybuffer
      */
-    buffer(removeMissingFields?: boolean): ArrayBuffer;
+    buffer(options?: ModelExportOptions): ArrayBuffer;
     /**
      * Converts the current model to a blob
      */
-    blob(removeMissingFields?: boolean): Blob;
+    blob(options?: ModelExportOptions): Blob;
     /**
      * Converts the current model to an XML string
      */
-    xml(removeMissingFields?: boolean): string;
+    xml(options?: ModelExportOptions): string;
     /**
      * Converts the current model to message pack binary format
      * @returns message pack binary
      */
-    messagePack(removeMissingFields?: boolean): Buffer;
+    messagePack(options?: ModelExportOptions): Buffer;
     /**
      * Converts the current model to csv format
-     * @param removeMissingFields
+     * @param options
      * @param config CSV unparsing configuration
      * @returns csv string
      */
-    csv(removeMissingFields?: boolean, config?: Papa.UnparseConfig): string;
+    csv(options?: ModelExportOptions, config?: Papa.UnparseConfig): string;
     clone(): any;
     /**
      * Retrieves the schema of the current model based on the selected format
-     * @param format data format
+     * @param includeTitleAndDraft boolean whether the title and JSON schema draft version should be referenced in the schema
      * @returns the schema for the current model
      */
-    static schema(addTitleAndDraftRef?: boolean): {
+    static schema(includeTitleAndDraft?: boolean): {
         [string: string]: any;
     };
     toString(): string;

package/data/model/model.mjs

@@ -144,11 +144,12 @@ class Model {
     /**
      * Converts the current model to a JSON object
      */
-    object(removeMissingFields = false) {
+    object(options) {
         var _a, _b;
+        const { removeMissingFields = false, keepOptionals = true } = options || {};
         const serialize = (value) => {
             if (value instanceof Model) {
-                return value.object(removeMissingFields);
+                return value.object({ removeMissingFields, keepOptionals });
             }
             else if (value instanceof Array || Array.isArray(value)) {
                 return value.map((v) => serialize(v));
@@ -168,6 +169,13 @@ class Model {
             else if (value instanceof Function) {
                 return null;
             }
+            else if (value instanceof Optional) {
+                if (keepOptionals)
+                    return value;
+                if (value.isPresent())
+                    return value.get();
+                return null;
+            }
             return value;
         };
         return R.reduce((acc, [key, fieldProps]) => {
@@ -182,46 +190,45 @@ class Model {
             return acc;
         }, {}, Array.from(((_b = (_a = Model.buildPropTree(Object.getPrototypeOf(this))) === null || _a === void 0 ? void 0 : _a.fields) !== null && _b !== void 0 ? _b : new Map()).entries()));
     }
-    // TODO add support for union fields in serialization and deserialization, and later date include schema generation
     /**
      * Converts the current model to a JSON string
      */
-    json(removeMissingFields = false) {
-        return JSON.stringify(this.object(removeMissingFields));
+    json(options) {
+        return JSON.stringify(this.object(options));
     }
     /**
      * Converts the current model to an arraybuffer
      */
-    buffer(removeMissingFields = false) {
-        return new TextEncoder().encode(this.json(removeMissingFields));
+    buffer(options) {
+        return new TextEncoder().encode(this.json(options));
     }
     /**
      * Converts the current model to a blob
      */
-    blob(removeMissingFields = false) {
-        return new Blob([this.buffer(removeMissingFields)]);
+    blob(options) {
+        return new Blob([this.buffer(options)]);
     }
     /**
      * Converts the current model to an XML string
      */
-    xml(removeMissingFields = false) {
-        return Model.__xmlParser__.js2xml(this.object(removeMissingFields));
+    xml(options) {
+        return Model.__xmlParser__.js2xml(this.object(options));
     }
     /**
      * Converts the current model to message pack binary format
      * @returns message pack binary
      */
-    messagePack(removeMissingFields = false) {
-        return encode(this.object(removeMissingFields)).buffer;
+    messagePack(options) {
+        return encode(this.object(options)).buffer;
     }
     /**
      * Converts the current model to csv format
-     * @param removeMissingFields
+     * @param options
      * @param config CSV unparsing configuration
      * @returns csv string
      */
-    csv(removeMissingFields = false, config) {
-        return Papa.unparse([this.object(removeMissingFields)], config);
+    csv(options, config) {
+        return Papa.unparse([this.object(options)], config);
     }
     clone() {
         const newModel = new (Object.getPrototypeOf(this))();
@@ -232,10 +239,10 @@ class Model {
     }
     /**
      * Retrieves the schema of the current model based on the selected format
-     * @param format data format
+     * @param includeTitleAndDraft boolean whether the title and JSON schema draft version should be referenced in the schema
      * @returns the schema for the current model
      */
-    static schema(addTitleAndDraftRef = true) {
+    static schema(includeTitleAndDraft = true) {
         const model = new this();
         const props = this.buildPropTree(Object.getPrototypeOf(model));
         const handleArrays = (v, entry) => {
@@ -327,24 +334,38 @@ class Model {
             }
             return entry;
         }));
-        if (addTitleAndDraftRef)
-            return {
-                $schema: "https://json-schema.org/draft/2020-12/schema",
-                title: this.name,
+        const fieldEntries = Array.from(props.fields.entries());
+        const optionals = Object.getOwnPropertyNames(this.prototype)
+            .filter((key) => key !== "constructor")
+            .map((key) => [key, model[key]])
+            .map(([key, modelValue]) => ({
+            modelValue,
+            fieldProps: fieldEntries.find(([k, v]) => { var _a; return k === key || ((_a = v.aliases) === null || _a === void 0 ? void 0 : _a.includes(key)); }),
+        }))
+            .filter(({ modelValue, fieldProps }) => { var _a, _b, _c; return modelValue !== undefined || ((_b = (_a = fieldProps[1].schema) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.optional) || ((_c = fieldProps[1].ignore) === null || _c === void 0 ? void 0 : _c.deserialize); })
+            .map(({ fieldProps }) => fieldProps[0]);
+        const required = fieldEntries.filter(([k]) => !optionals.includes(k)).map(([k]) => k);
+        const result = required.length
+            ? {
                 type: "object",
                 properties: generateProperties(),
                 additionalProperties: false,
-            };
-        else {
-            return {
+                required,
+            }
+            : {
                 type: "object",
                 properties: generateProperties(),
                 additionalProperties: false,
             };
+        if (includeTitleAndDraft) {
+            return Object.assign(Object.assign({}, result), { $schema: "https://json-schema.org/draft/2020-12/schema", title: this.name });
+        }
+        else {
+            return result;
         }
     }
     toString() {
-        return this.json(true);
+        return this.json({ removeMissingFields: true, keepOptionals: false });
     }
     /**
      * Constructs the model properties by traversing the inheritance tree of the current Model being instantiated
@@ -395,7 +416,7 @@ class Model {
         const model = new this();
         const props = this.buildPropTree(Object.getPrototypeOf(model));
         R.forEach(([key, fieldProps]) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
             let value = data[key];
             if (value === undefined || value === null) {
                 for (const alias of (_a = fieldProps.aliases) !== null && _a !== void 0 ? _a : []) {
@@ -416,12 +437,101 @@ class Model {
             else if ((value === undefined || value === null) && !(model[key] === undefined || model[key] === null)) {
                 return;
             }
+            const checkOtherTypes = (value, Type, fallback) => {
+                var _a, _b;
+                if ((Type === null || Type === void 0 ? void 0 : Type.name) === "String") {
+                    return processValue(fieldProps, String(value));
+                }
+                else if ((Type === null || Type === void 0 ? void 0 : Type.name) === "Boolean") {
+                    return processValue(fieldProps, Boolean(value));
+                }
+                else if ((Type === null || Type === void 0 ? void 0 : Type.name) === "Number") {
+                    const v = Number(value);
+                    if (isNaN(v))
+                        throw new ParsingError([], `value for ${key} is not a valid number`);
+                    return processValue(fieldProps, v);
+                }
+                else if ((Type === null || Type === void 0 ? void 0 : Type.name) === "Map") {
+                    const valueType = typeof value;
+                    switch (valueType) {
+                        case "object": {
+                            try {
+                                return processValue(fieldProps, value instanceof Array || Array.isArray(value) ? new Map(value) : new Map(Object.entries(value)));
+                            }
+                            catch (e) {
+                                throw new ParsingError([], (_a = e === null || e === void 0 ? void 0 : e.message) !== null && _a !== void 0 ? _a : String(e));
+                            }
+                        }
+                        case "string":
+                            try {
+                                value = JSON.parse(value);
+                                return processValue(fieldProps, value instanceof Array || Array.isArray(value) ? new Map(value) : new Map(Object.entries(value)));
+                            }
+                            catch (e) {
+                                throw new ParsingError([], (_b = e === null || e === void 0 ? void 0 : e.message) !== null && _b !== void 0 ? _b : String(e));
+                            }
+                        default:
+                            throw new ParsingError([value], `value for ${key} cannot be converted to a Map`);
+                    }
+                }
+                else if ((Type === null || Type === void 0 ? void 0 : Type.name) === "Set") {
+                    if (value instanceof Array || Array.isArray(value)) {
+                        return processValue(fieldProps, new Set(value));
+                    }
+                    else if (typeof value === "string") {
+                        return processValue(fieldProps, new Set(JSON.parse(value)));
+                    }
+                    throw new ParsingError([value], `value for ${key} cannot be converted to a Set`);
+                }
+                else {
+                    return fallback();
+                }
+            };
+            function processUnionField(value) {
+                let foundMatch = false;
+                let result;
+                for (const unionType of fieldProps.unionTypes) {
+                    try {
+                        result = checkOtherTypes(value, unionType, () => {
+                            if (unionType.prototype instanceof Model) {
+                                const parser = parse({
+                                    string: (v) => unionType.fromString(v, format),
+                                    object: (v) => unionType.fromObject(v, format),
+                                    default: () => {
+                                        throw new ParsingError([], `value for ${key} is expected to be an Array, instead received ${typeof value}`);
+                                    },
+                                    supportArray: true,
+                                });
+                                return processValue(fieldProps, parser(value));
+                            }
+                            throw new ParsingError([], `value for ${key} type is unsupported ${typeof value}`);
+                        });
+                        foundMatch = true;
+                        break;
+                    }
+                    catch (e) { }
+                }
+                if (!foundMatch) {
+                    throw new ParsingError([], `value for ${key} does not match any of the union types expected`);
+                }
+                return result;
+            }
             if ((_e = Object.getOwnPropertyDescriptor(Object.getPrototypeOf(model), key)) === null || _e === void 0 ? void 0 : _e.set) {
                 model[key] = processValue(fieldProps, value);
             }
             else if ((_f = Object.getOwnPropertyDescriptor(Object.getPrototypeOf(model), key)) === null || _f === void 0 ? void 0 : _f.get) {
                 return;
             }
+            else if (fieldProps.isUnion) {
+                if (!fieldProps.isArray) {
+                    model[key] = processUnionField(value);
+                }
+                else if (fieldProps.isArray && Array.isArray(value)) {
+                    model[key] = value.map((item) => processUnionField(item));
+                }
+                else
+                    throw new ParsingError([], `value for ${key} is expected to be an array`);
+            }
             else if (model[key] instanceof fieldProps.Type &&
                 typeof model[key] === "function" &&
                 fieldProps.Type instanceof Function) {
@@ -531,51 +641,8 @@ class Model {
                     }
                 }));
             }
-            else if (((_k = fieldProps.Type) === null || _k === void 0 ? void 0 : _k.name) === "String") {
-                model[key] = processValue(fieldProps, String(value));
-            }
-            else if (((_l = fieldProps.Type) === null || _l === void 0 ? void 0 : _l.name) === "Boolean") {
-                model[key] = processValue(fieldProps, Boolean(value));
-            }
-            else if (((_m = fieldProps.Type) === null || _m === void 0 ? void 0 : _m.name) === "Number") {
-                model[key] = processValue(fieldProps, Number(value));
-            }
-            else if (((_o = fieldProps.Type) === null || _o === void 0 ? void 0 : _o.name) === "Map") {
-                const valueType = typeof value;
-                switch (valueType) {
-                    case "object": {
-                        try {
-                            model[key] = processValue(fieldProps, value instanceof Array || Array.isArray(value) ? new Map(value) : new Map(Object.entries(value)));
-                        }
-                        catch (e) {
-                            throw new ParsingError([], (_p = e === null || e === void 0 ? void 0 : e.message) !== null && _p !== void 0 ? _p : String(e));
-                        }
-                        break;
-                    }
-                    case "string":
-                        try {
-                            value = JSON.parse(value);
-                            model[key] = processValue(fieldProps, value instanceof Array || Array.isArray(value) ? new Map(value) : new Map(Object.entries(value)));
-                        }
-                        catch (e) {
-                            throw new ParsingError([], (_q = e === null || e === void 0 ? void 0 : e.message) !== null && _q !== void 0 ? _q : String(e));
-                        }
-                        break;
-                    default:
-                        throw new ParsingError([value], `value for ${key} cannot be converted to a Map`);
-                }
-            }
-            else if (((_r = fieldProps.Type) === null || _r === void 0 ? void 0 : _r.name) === "Set") {
-                if (value instanceof Array || Array.isArray(value)) {
-                    model[key] = processValue(fieldProps, new Set(value));
-                }
-                else if (typeof value === "string") {
-                    model[key] = processValue(fieldProps, new Set(JSON.parse(value)));
-                }
-                throw new ParsingError([value], `value for ${key} cannot be converted to a Set`);
-            }
             else {
-                model[key] = processValue(fieldProps, new fieldProps.Type(value));
+                model[key] = checkOtherTypes(value, fieldProps.Type, () => processValue(fieldProps, new fieldProps.Type(value)));
             }
             if (fieldProps.readonly) {
                 Object.defineProperty(model, key, {
@@ -587,7 +654,7 @@ class Model {
             R.forEach(([k, v]) => {
                 if (v.__callback__)
                     v.__callback__(k, v.properties, model, key);
-            }, R.toPairs((_s = fieldProps.customTags) !== null && _s !== void 0 ? _s : {}));
+            }, R.toPairs((_k = fieldProps.customTags) !== null && _k !== void 0 ? _k : {}));
         }, Array.from(props.fields.entries()));
         return Object.seal(model);
     }

package/data/model/property.cjs

@@ -141,6 +141,7 @@ const UnionField = (types, name) => (target, key) => {
     fieldProp.isUnion = true;
     fieldProp.schema = schema;
     fieldProp.unionTypes = types;
+    fieldProp.Type = {};
     props.fields.set(key, fieldProp);
     if (typeof name === "string" && name) {
         if (fieldProp.aliases) {
@@ -168,8 +169,9 @@ const ArrayField = (type, name) => (target, key) => {
     const schema = { dataType: types.DataType.ARRAY };
     const dtype = Reflect.getMetadata("design:type", target, key);
     const optional = dtype === model.Optional;
+    const fieldProp = (_b = props.fields.get(key)) !== null && _b !== void 0 ? _b : {};
     schema.options = { useOptionalObj: optional, optional };
-    schema.description = (_b = name === null || name === void 0 ? void 0 : name.description) !== null && _b !== void 0 ? _b : "";
+    schema.description = (_c = name === null || name === void 0 ? void 0 : name.description) !== null && _c !== void 0 ? _c : "";
     if (type instanceof Number) {
         schema.itemType = types.DataType.DOUBLE;
     }
@@ -182,7 +184,10 @@ const ArrayField = (type, name) => (target, key) => {
     else if (type instanceof model.Model) {
         schema.options.recordClass = type;
     }
-    const fieldProp = (_c = props.fields.get(key)) !== null && _c !== void 0 ? _c : {};
+    else if (Array.isArray(type)) {
+        fieldProp.isUnion = true;
+        fieldProp.unionTypes = type;
+    }
     fieldProp.name = key;
     fieldProp.Type = type;
     fieldProp.isArray = true;

package/data/model/property.d.ts

@@ -1,4 +1,4 @@
-import { IgnoreProps, Model } from "./model";
+import { IgnoreProps } from "./model";
 import { DataType } from "./types";
 /**
  * A property that exist in the incoming data
@@ -11,7 +11,7 @@ export declare const Field: (name?: string | {
     name: string;
     description: string;
 }, type?: any) => (target: any, key: string) => void;
-export declare const UnionField: <T extends new (...args: any[]) => Model>(types: T[], name?: string | {
+export declare const UnionField: (types: any[], name?: string | {
     name: string;
     description: string;
 }) => (target: any, key: string) => void;
@@ -22,7 +22,7 @@ export declare const UnionField: <T extends new (...args: any[]) => Model>(types
  * property name
  * @constructor
  */
-export declare const ArrayField: (type: any, name?: string | {
+export declare const ArrayField: (type: any | any[], name?: string | {
     name: string;
     description: string;
 }) => (target: any, key: string) => void;

package/data/model/property.mjs

@@ -120,6 +120,7 @@ const UnionField = (types, name) => (target, key) => {
     fieldProp.isUnion = true;
     fieldProp.schema = schema;
     fieldProp.unionTypes = types;
+    fieldProp.Type = {};
     props.fields.set(key, fieldProp);
     if (typeof name === "string" && name) {
         if (fieldProp.aliases) {
@@ -147,8 +148,9 @@ const ArrayField = (type, name) => (target, key) => {
     const schema = { dataType: DataType.ARRAY };
     const dtype = Reflect.getMetadata("design:type", target, key);
     const optional = dtype === Optional;
+    const fieldProp = (_b = props.fields.get(key)) !== null && _b !== void 0 ? _b : {};
     schema.options = { useOptionalObj: optional, optional };
-    schema.description = (_b = name === null || name === void 0 ? void 0 : name.description) !== null && _b !== void 0 ? _b : "";
+    schema.description = (_c = name === null || name === void 0 ? void 0 : name.description) !== null && _c !== void 0 ? _c : "";
     if (type instanceof Number) {
         schema.itemType = DataType.DOUBLE;
     }
@@ -161,7 +163,10 @@ const ArrayField = (type, name) => (target, key) => {
     else if (type instanceof Model) {
         schema.options.recordClass = type;
     }
-    const fieldProp = (_c = props.fields.get(key)) !== null && _c !== void 0 ? _c : {};
+    else if (Array.isArray(type)) {
+        fieldProp.isUnion = true;
+        fieldProp.unionTypes = type;
+    }
     fieldProp.name = key;
     fieldProp.Type = type;
     fieldProp.isArray = true;

package/package.json

@@ -1 +1 @@
-{"name":"gingersnap","version":"0.23.12","description":"A general purpose library built with the aim of filling the gaps of javascript shortcomings","dependencies":{"@msgpack/msgpack":"^3.0.0-beta2","browser-or-node":"^3.0.0-pre.0","modern-isomorphic-ws":"^1.0.5","object-hash":"^3.0.0","papaparse":"^5.4.1","protobufjs":"^7.2.6","ramda":"^0.30.1","reflect-metadata":"^0.2.2","tslib":"^2.6.3","uuid":"^9.0.1","ws":"^8.16.0","x2js":"^3.4.4"},"author":"CookieNerds LLC","exports":{"./synchronize":{"import":{"types":"./synchronize.d.ts","default":"./synchronize.mjs"},"require":{"types":"./synchronize.d.ts","default":"./synchronize.cjs"}},"./mocks":{"import":{"types":"./mocks.d.ts","default":"./mocks.mjs"},"require":{"types":"./mocks.d.ts","default":"./mocks.cjs"}},"./socket":{"import":{"types":"./socket.d.ts","default":"./socket.mjs"},"require":{"types":"./socket.d.ts","default":"./socket.cjs"}},"./typing":{"import":{"types":"./typing.d.ts","default":"./typing.mjs"},"require":{"types":"./typing.d.ts","default":"./typing.cjs"}},"./stream":{"import":{"types":"./stream/index.d.ts","default":"./stream.mjs"},"require":{"types":"./stream/index.d.ts","default":"./stream.cjs"}},"./reflection/injector":{"import":{"types":"./reflection/injector.d.ts","default":"./reflection/injector.mjs"},"require":{"types":"./reflection/injector.d.ts","default":"./reflection/injector.cjs"}},"./stream/call":{"import":{"types":"./stream/call.d.ts","default":"./stream/call.mjs"},"require":{"types":"./stream/call.d.ts","default":"./stream/call.cjs"}},"./stream/state":{"import":{"types":"./stream/state.d.ts","default":"./stream/state.mjs"},"require":{"types":"./stream/state.d.ts","default":"./stream/state.cjs"}},"./stream/collector":{"import":{"types":"./stream/collector.d.ts","default":"./stream/collector.mjs"},"require":{"types":"./stream/collector.d.ts","default":"./stream/collector.cjs"}},"./stream/observable":{"import":{"types":"./stream/observable.d.ts","default":"./stream/observable.mjs"},"require":{"types":"./stream/observable.d.ts","default":"./stream/observable.cjs"}},"./networking":{"import":{"types":"./networking/index.d.ts","default":"./networking.mjs"},"require":{"types":"./networking/index.d.ts","default":"./networking.cjs"}},"./managers":{"import":{"types":"./managers/index.d.ts","default":"./managers.mjs"},"require":{"types":"./managers/index.d.ts","default":"./managers.cjs"}},"./future":{"import":{"types":"./future/index.d.ts","default":"./future.mjs"},"require":{"types":"./future/index.d.ts","default":"./future.cjs"}},"./errors":{"import":{"types":"./errors/index.d.ts","default":"./errors.mjs"},"require":{"types":"./errors/index.d.ts","default":"./errors.cjs"}},"./data-structures/array":{"import":{"types":"./data-structures/array/index.d.ts","default":"./data-structures/array.mjs"},"require":{"types":"./data-structures/array/index.d.ts","default":"./data-structures/array.cjs"}},"./data-structures/object":{"import":{"types":"./data-structures/object/index.d.ts","default":"./data-structures/object.mjs"},"require":{"types":"./data-structures/object/index.d.ts","default":"./data-structures/object.cjs"}},"./data/decoders":{"import":{"types":"./data/decoders/index.d.ts","default":"./data/decoders.mjs"},"require":{"types":"./data/decoders/index.d.ts","default":"./data/decoders.cjs"}},"./data/model":{"import":{"types":"./data/model/index.d.ts","default":"./data/model.mjs"},"require":{"types":"./data/model/index.d.ts","default":"./data/model.cjs"}},"./data/bus":{"import":{"types":"./data/bus.d.ts","default":"./data/bus.mjs"},"require":{"types":"./data/bus.d.ts","default":"./data/bus.cjs"}},"./data/AtomicValue":{"import":{"types":"./data/AtomicValue.d.ts","default":"./data/AtomicValue.mjs"},"require":{"types":"./data/AtomicValue.d.ts","default":"./data/AtomicValue.cjs"}},"./data/store":{"import":{"types":"./data/store/index.d.ts","default":"./data/store.mjs"},"require":{"types":"./data/store/index.d.ts","default":"./data/store.cjs"}},"./functools":{"import":{"types":"./functools/index.d.ts","default":"./functools.mjs"},"require":{"types":"./functools/index.d.ts","default":"./functools.cjs"}}}}
+{"name":"gingersnap","version":"0.23.13","description":"A general purpose library built with the aim of filling the gaps of javascript shortcomings","dependencies":{"@msgpack/msgpack":"^3.0.0-beta2","browser-or-node":"^3.0.0-pre.0","modern-isomorphic-ws":"^1.0.5","object-hash":"^3.0.0","papaparse":"^5.4.1","protobufjs":"^7.2.6","ramda":"^0.30.1","reflect-metadata":"^0.2.2","tslib":"^2.6.3","uuid":"^9.0.1","ws":"^8.16.0","x2js":"^3.4.4"},"author":"CookieNerds LLC","exports":{"./synchronize":{"import":{"types":"./synchronize.d.ts","default":"./synchronize.mjs"},"require":{"types":"./synchronize.d.ts","default":"./synchronize.cjs"}},"./mocks":{"import":{"types":"./mocks.d.ts","default":"./mocks.mjs"},"require":{"types":"./mocks.d.ts","default":"./mocks.cjs"}},"./socket":{"import":{"types":"./socket.d.ts","default":"./socket.mjs"},"require":{"types":"./socket.d.ts","default":"./socket.cjs"}},"./typing":{"import":{"types":"./typing.d.ts","default":"./typing.mjs"},"require":{"types":"./typing.d.ts","default":"./typing.cjs"}},"./stream":{"import":{"types":"./stream/index.d.ts","default":"./stream.mjs"},"require":{"types":"./stream/index.d.ts","default":"./stream.cjs"}},"./reflection/injector":{"import":{"types":"./reflection/injector.d.ts","default":"./reflection/injector.mjs"},"require":{"types":"./reflection/injector.d.ts","default":"./reflection/injector.cjs"}},"./stream/call":{"import":{"types":"./stream/call.d.ts","default":"./stream/call.mjs"},"require":{"types":"./stream/call.d.ts","default":"./stream/call.cjs"}},"./stream/state":{"import":{"types":"./stream/state.d.ts","default":"./stream/state.mjs"},"require":{"types":"./stream/state.d.ts","default":"./stream/state.cjs"}},"./stream/collector":{"import":{"types":"./stream/collector.d.ts","default":"./stream/collector.mjs"},"require":{"types":"./stream/collector.d.ts","default":"./stream/collector.cjs"}},"./stream/observable":{"import":{"types":"./stream/observable.d.ts","default":"./stream/observable.mjs"},"require":{"types":"./stream/observable.d.ts","default":"./stream/observable.cjs"}},"./networking":{"import":{"types":"./networking/index.d.ts","default":"./networking.mjs"},"require":{"types":"./networking/index.d.ts","default":"./networking.cjs"}},"./managers":{"import":{"types":"./managers/index.d.ts","default":"./managers.mjs"},"require":{"types":"./managers/index.d.ts","default":"./managers.cjs"}},"./future":{"import":{"types":"./future/index.d.ts","default":"./future.mjs"},"require":{"types":"./future/index.d.ts","default":"./future.cjs"}},"./errors":{"import":{"types":"./errors/index.d.ts","default":"./errors.mjs"},"require":{"types":"./errors/index.d.ts","default":"./errors.cjs"}},"./data-structures/array":{"import":{"types":"./data-structures/array/index.d.ts","default":"./data-structures/array.mjs"},"require":{"types":"./data-structures/array/index.d.ts","default":"./data-structures/array.cjs"}},"./data-structures/object":{"import":{"types":"./data-structures/object/index.d.ts","default":"./data-structures/object.mjs"},"require":{"types":"./data-structures/object/index.d.ts","default":"./data-structures/object.cjs"}},"./data/decoders":{"import":{"types":"./data/decoders/index.d.ts","default":"./data/decoders.mjs"},"require":{"types":"./data/decoders/index.d.ts","default":"./data/decoders.cjs"}},"./data/model":{"import":{"types":"./data/model/index.d.ts","default":"./data/model.mjs"},"require":{"types":"./data/model/index.d.ts","default":"./data/model.cjs"}},"./data/bus":{"import":{"types":"./data/bus.d.ts","default":"./data/bus.mjs"},"require":{"types":"./data/bus.d.ts","default":"./data/bus.cjs"}},"./data/AtomicValue":{"import":{"types":"./data/AtomicValue.d.ts","default":"./data/AtomicValue.mjs"},"require":{"types":"./data/AtomicValue.d.ts","default":"./data/AtomicValue.cjs"}},"./data/store":{"import":{"types":"./data/store/index.d.ts","default":"./data/store.mjs"},"require":{"types":"./data/store/index.d.ts","default":"./data/store.cjs"}},"./functools":{"import":{"types":"./functools/index.d.ts","default":"./functools.mjs"},"require":{"types":"./functools/index.d.ts","default":"./functools.cjs"}}}}