typia 3.8.8 → 3.9.0-dev.20230603

package/lib/metadata/Metadata.js

@@ -37,12 +37,15 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Metadata = void 0;
+var Writable_1 = require("../typings/Writable");
 var ArrayUtil_1 = require("../utils/ArrayUtil");
+var MetadataArray_1 = require("./MetadataArray");
+var MetadataDefinition_1 = require("./MetadataDefinition");
 var MetadataObject_1 = require("./MetadataObject");
 var MetadataProperty_1 = require("./MetadataProperty");
+var MetadataTuple_1 = require("./MetadataTuple");
 var Metadata = (function () {
     function Metadata(props) {
-        this.name_ = undefined;
         this.parent_resolved_ = false;
         this.any = props.any;
         this.required = props.required;
@@ -57,6 +60,7 @@ var Metadata = (function () {
         this.arrays = props.arrays;
         this.tuples = props.tuples;
         this.objects = props.objects;
+        this.definitions = props.definitions;
         this.natives = props.natives;
         this.sets = props.sets;
         this.maps = props.maps;
@@ -79,6 +83,7 @@ var Metadata = (function () {
             arrays: [],
             tuples: [],
             objects: [],
+            definitions: [],
             rest: null,
             natives: [],
             sets: [],
@@ -101,11 +106,10 @@ var Metadata = (function () {
             }),
             resolved: this.resolved ? this.resolved.toJSON() : null,
             rest: this.rest ? this.rest.toJSON() : null,
-            arrays: this.arrays.map(function (meta) { return meta.toJSON(); }),
-            tuples: this.tuples.map(function (meta) {
-                return meta.map(function (meta) { return meta.toJSON(); });
-            }),
+            arrays: this.arrays.map(function (array) { return array.name; }),
+            tuples: this.tuples.map(function (tuple) { return tuple.name; }),
             objects: this.objects.map(function (obj) { return obj.name; }),
+            definitions: this.definitions.map(function (def) { return def.name; }),
             natives: this.natives.slice(),
             sets: this.sets.map(function (meta) { return meta.toJSON(); }),
             maps: this.maps.map(function (entry) { return ({
@@ -114,41 +118,86 @@ var Metadata = (function () {
             }); }),
         };
     };
-    Metadata.from = function (meta, objects) {
-        var e_1, _a, e_2, _b, _c;
-        var dict = new Map();
+    Metadata.from = function (meta, collection) {
+        var e_1, _a, _b, e_2, _c, e_3, _d, e_4, _e;
+        var _this = this;
+        var dict = {
+            objects: new Map(collection.objects.map(function (obj) { return [
+                obj.name,
+                MetadataObject_1.MetadataObject._From_without_properties(obj),
+            ]; })),
+            definitions: new Map(collection.definitions.map(function (def) { return [
+                def.name,
+                MetadataDefinition_1.MetadataDefinition._From_without_value(def),
+            ]; })),
+            arrays: new Map(collection.arrays.map(function (arr) { return [
+                arr.name,
+                MetadataArray_1.MetadataArray._From_without_value(arr),
+            ]; })),
+            tuples: new Map(collection.tuples.map(function (tpl) { return [
+                tpl.name,
+                MetadataTuple_1.MetadataTuple._From_without_elements(tpl),
+            ]; })),
+        };
         try {
-            for (var objects_1 = __values(objects), objects_1_1 = objects_1.next(); !objects_1_1.done; objects_1_1 = objects_1.next()) {
-                var obj = objects_1_1.value;
-                dict.set(obj.name, MetadataObject_1.MetadataObject._From_without_properties(obj));
+            for (var _f = __values(collection.objects), _g = _f.next(); !_g.done; _g = _f.next()) {
+                var obj = _g.value;
+                var initialized = dict.objects.get(obj.name);
+                (_b = initialized.properties).push.apply(_b, __spreadArray([], __read(obj.properties.map(function (prop) {
+                    return MetadataProperty_1.MetadataProperty._From(prop, dict);
+                })), false));
             }
         }
         catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
-                if (objects_1_1 && !objects_1_1.done && (_a = objects_1.return)) _a.call(objects_1);
+                if (_g && !_g.done && (_a = _f.return)) _a.call(_f);
             }
             finally { if (e_1) throw e_1.error; }
         }
         try {
-            for (var objects_2 = __values(objects), objects_2_1 = objects_2.next(); !objects_2_1.done; objects_2_1 = objects_2.next()) {
-                var obj = objects_2_1.value;
-                var initialized = dict.get(obj.name);
-                (_c = initialized.properties).push.apply(_c, __spreadArray([], __read(obj.properties.map(function (prop) {
-                    return MetadataProperty_1.MetadataProperty._From(prop, dict);
-                })), false));
+            for (var _h = __values(collection.definitions), _j = _h.next(); !_j.done; _j = _h.next()) {
+                var def = _j.value;
+                (0, Writable_1.Writable)(dict.definitions.get(def.name)).value = this._From(def.value, dict);
             }
         }
         catch (e_2_1) { e_2 = { error: e_2_1 }; }
         finally {
             try {
-                if (objects_2_1 && !objects_2_1.done && (_b = objects_2.return)) _b.call(objects_2);
+                if (_j && !_j.done && (_c = _h.return)) _c.call(_h);
             }
             finally { if (e_2) throw e_2.error; }
         }
+        try {
+            for (var _k = __values(collection.arrays), _l = _k.next(); !_l.done; _l = _k.next()) {
+                var array = _l.value;
+                (0, Writable_1.Writable)(dict.arrays.get(array.name)).value = this._From(array.value, dict);
+            }
+        }
+        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        finally {
+            try {
+                if (_l && !_l.done && (_d = _k.return)) _d.call(_k);
+            }
+            finally { if (e_3) throw e_3.error; }
+        }
+        try {
+            for (var _m = __values(collection.tuples), _o = _m.next(); !_o.done; _o = _m.next()) {
+                var tuple = _o.value;
+                (0, Writable_1.Writable)(dict.tuples.get(tuple.name)).elements =
+                    tuple.elements.map(function (elem) { return _this._From(elem, dict); });
+            }
+        }
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+        finally {
+            try {
+                if (_o && !_o.done && (_e = _m.return)) _e.call(_m);
+            }
+            finally { if (e_4) throw e_4.error; }
+        }
         return this._From(meta, dict);
     };
-    Metadata._From = function (meta, objects) {
+    Metadata._From = function (meta, dict) {
         var _this = this;
         return this.create({
             any: meta.any,
@@ -159,30 +208,45 @@ var Metadata = (function () {
             constants: JSON.parse(JSON.stringify(meta.constants)),
             atomics: meta.atomics.slice(),
             templates: meta.templates.map(function (tpl) {
-                return tpl.map(function (meta) { return _this._From(meta, objects); });
+                return tpl.map(function (meta) { return _this._From(meta, dict); });
             }),
-            resolved: meta.resolved ? this._From(meta.resolved, objects) : null,
-            rest: meta.rest ? this._From(meta.rest, objects) : null,
-            arrays: meta.arrays.map(function (meta) { return _this._From(meta, objects); }),
-            tuples: meta.tuples.map(function (tuple) {
-                return tuple.map(function (meta) { return _this._From(meta, objects); });
+            resolved: meta.resolved ? this._From(meta.resolved, dict) : null,
+            rest: meta.rest ? this._From(meta.rest, dict) : null,
+            arrays: meta.arrays.map(function (id) {
+                var array = dict.arrays.get(id);
+                if (array === undefined)
+                    throw new Error("Error on Metadata.from(): failed to find array \"".concat(id, "\"."));
+                return array;
+            }),
+            tuples: meta.tuples.map(function (id) {
+                var tuple = dict.tuples.get(id);
+                if (tuple === undefined)
+                    throw new Error("Error on Metadata.from(): failed to find tuple \"".concat(id, "\"."));
+                return tuple;
             }),
             objects: meta.objects.map(function (name) {
-                var found = objects.get(name);
+                var found = dict.objects.get(name);
                 if (found === undefined)
                     throw new Error("Error on Metadata.from(): failed to find object \"".concat(name, "\"."));
                 return found;
             }),
+            definitions: meta.definitions.map(function (def) {
+                var found = dict.definitions.get(def);
+                if (found === undefined)
+                    throw new Error("Error on Metadata.from(): failed to find definition \"".concat(def, "\"."));
+                return found;
+            }),
             natives: meta.natives.slice(),
-            sets: meta.sets.map(function (meta) { return _this._From(meta, objects); }),
+            sets: meta.sets.map(function (meta) { return _this._From(meta, dict); }),
             maps: meta.maps.map(function (entry) { return ({
-                key: _this._From(entry.key, objects),
-                value: _this._From(entry.value, objects),
+                key: _this._From(entry.key, dict),
+                value: _this._From(entry.value, dict),
             }); }),
         });
     };
     Metadata.prototype.getName = function () {
-        this.name_ || (this.name_ = getName(this));
+        var _a;
+        (_a = this.name_) !== null && _a !== void 0 ? _a : (this.name_ = getName(this));
         return this.name_;
     };
     Metadata.prototype.empty = function () {
@@ -191,18 +255,19 @@ var Metadata = (function () {
     Metadata.prototype.size = function () {
         return ((this.resolved ? 1 : 0) +
             (this.functional ? 1 : 0) +
+            (this.rest ? this.rest.size() : 0) +
             this.templates.length +
             this.atomics.length +
             this.constants
                 .map(function (c) { return c.values.length; })
                 .reduce(function (x, y) { return x + y; }, 0) +
-            (this.rest ? this.rest.size() : 0) +
             this.arrays.length +
             this.tuples.length +
-            this.objects.length +
             this.natives.length +
+            this.maps.length +
             this.sets.length +
-            this.maps.length);
+            this.objects.length +
+            this.definitions.length);
     };
     Metadata.prototype.bucket = function () {
         return ((this.resolved ? 1 : 0) +
@@ -213,10 +278,11 @@ var Metadata = (function () {
             (this.rest ? this.rest.size() : 0) +
             (this.arrays.length ? 1 : 0) +
             (this.tuples.length ? 1 : 0) +
-            (this.objects.length ? 1 : 0) +
             (this.natives.length ? 1 : 0) +
             (this.sets.length ? 1 : 0) +
-            (this.maps.length ? 1 : 0));
+            (this.maps.length ? 1 : 0) +
+            (this.objects.length ? 1 : 0) +
+            (this.definitions.length ? 1 : 0));
     };
     Metadata.prototype.isConstant = function () {
         return this.bucket() === (this.constants.length ? 1 : 0);
@@ -245,126 +311,39 @@ var Metadata = (function () {
 }());
 exports.Metadata = Metadata;
 (function (Metadata) {
-    Metadata.intersects = function (x, y, deep) {
-        var e_3, _a, e_4, _b, e_5, _c, e_6, _d, e_7, _e, e_8, _f, e_9, _g, e_10, _h;
+    Metadata.intersects = function (x, y) {
+        var e_5, _a, e_6, _b;
         if (x.any || y.any)
             return true;
         if (x.required === false && false === y.required)
             return true;
         if (x.nullable === true && true === y.nullable)
             return true;
-        if (deep === true) {
-            try {
-                for (var _j = __values(x.arrays), _k = _j.next(); !_k.done; _k = _j.next()) {
-                    var xa = _k.value;
-                    try {
-                        for (var _l = (e_4 = void 0, __values(y.arrays)), _m = _l.next(); !_m.done; _m = _l.next()) {
-                            var ya = _m.value;
-                            if (Metadata.intersects(xa, ya, deep)) {
-                                return true;
-                            }
-                        }
-                    }
-                    catch (e_4_1) { e_4 = { error: e_4_1 }; }
-                    finally {
-                        try {
-                            if (_m && !_m.done && (_b = _l.return)) _b.call(_l);
-                        }
-                        finally { if (e_4) throw e_4.error; }
-                    }
-                }
-            }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
-            finally {
-                try {
-                    if (_k && !_k.done && (_a = _j.return)) _a.call(_j);
-                }
-                finally { if (e_3) throw e_3.error; }
-            }
-            try {
-                for (var _o = __values(x.objects), _p = _o.next(); !_p.done; _p = _o.next()) {
-                    var xo = _p.value;
-                    try {
-                        for (var _q = (e_6 = void 0, __values(y.objects)), _r = _q.next(); !_r.done; _r = _q.next()) {
-                            var yo = _r.value;
-                            if (MetadataObject_1.MetadataObject.intersects(xo, yo)) {
-                                return true;
-                            }
-                        }
-                    }
-                    catch (e_6_1) { e_6 = { error: e_6_1 }; }
-                    finally {
-                        try {
-                            if (_r && !_r.done && (_d = _q.return)) _d.call(_q);
-                        }
-                        finally { if (e_6) throw e_6.error; }
-                    }
-                }
-            }
-            catch (e_5_1) { e_5 = { error: e_5_1 }; }
-            finally {
-                try {
-                    if (_p && !_p.done && (_c = _o.return)) _c.call(_o);
-                }
-                finally { if (e_5) throw e_5.error; }
-            }
-        }
-        else {
-            if (x.arrays.length && y.arrays.length)
-                return true;
-            if (x.objects.length && y.objects.length)
-                return true;
-        }
-        try {
-            for (var _s = __values(x.tuples), _t = _s.next(); !_t.done; _t = _s.next()) {
-                var xt = _t.value;
-                var _loop_1 = function (yt) {
-                    if (xt.length === 0 || yt.length === 0)
-                        return { value: xt.length === 0 && yt.length === 0 };
-                    else if (xt
-                        .slice(0, Math.min(xt.length, yt.length))
-                        .some(function (xv, i) { return Metadata.intersects(xv, yt[i], deep); }))
-                        return { value: true };
-                };
-                try {
-                    for (var _u = (e_8 = void 0, __values(y.tuples)), _v = _u.next(); !_v.done; _v = _u.next()) {
-                        var yt = _v.value;
-                        var state_1 = _loop_1(yt);
-                        if (typeof state_1 === "object")
-                            return state_1.value;
-                    }
-                }
-                catch (e_8_1) { e_8 = { error: e_8_1 }; }
-                finally {
-                    try {
-                        if (_v && !_v.done && (_f = _u.return)) _f.call(_u);
-                    }
-                    finally { if (e_8) throw e_8.error; }
-                }
-            }
-        }
-        catch (e_7_1) { e_7 = { error: e_7_1 }; }
-        finally {
-            try {
-                if (_t && !_t.done && (_e = _s.return)) _e.call(_s);
-            }
-            finally { if (e_7) throw e_7.error; }
-        }
+        if (x.functional === true && y.functional === true)
+            return true;
+        if (x.arrays.length && y.arrays.length)
+            return true;
+        if (x.tuples.length && y.tuples.length)
+            return true;
+        if (x.objects.length && y.objects.length)
+            return true;
+        if (x.definitions.length && y.definitions.length)
+            return true;
         try {
-            for (var _w = __values(x.atomics), _x = _w.next(); !_x.done; _x = _w.next()) {
-                var atomic = _x.value;
+            for (var _c = __values(x.atomics), _d = _c.next(); !_d.done; _d = _c.next()) {
+                var atomic = _d.value;
                 if (y.atomics.includes(atomic))
                     return true;
             }
         }
-        catch (e_9_1) { e_9 = { error: e_9_1 }; }
+        catch (e_5_1) { e_5 = { error: e_5_1 }; }
         finally {
             try {
-                if (_x && !_x.done && (_g = _w.return)) _g.call(_w);
+                if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
             }
-            finally { if (e_9) throw e_9.error; }
+            finally { if (e_5) throw e_5.error; }
         }
-        var _loop_2 = function (constant) {
+        var _loop_1 = function (constant) {
             var opposite = y.constants.find(function (elem) { return elem.type === constant.type; });
             if (opposite === undefined)
                 return "continue";
@@ -373,115 +352,161 @@ exports.Metadata = Metadata;
                 return { value: true };
         };
         try {
-            for (var _y = __values(x.constants), _z = _y.next(); !_z.done; _z = _y.next()) {
-                var constant = _z.value;
-                var state_2 = _loop_2(constant);
-                if (typeof state_2 === "object")
-                    return state_2.value;
+            for (var _e = __values(x.constants), _f = _e.next(); !_f.done; _f = _e.next()) {
+                var constant = _f.value;
+                var state_1 = _loop_1(constant);
+                if (typeof state_1 === "object")
+                    return state_1.value;
             }
         }
-        catch (e_10_1) { e_10 = { error: e_10_1 }; }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
         finally {
             try {
-                if (_z && !_z.done && (_h = _y.return)) _h.call(_y);
+                if (_f && !_f.done && (_b = _e.return)) _b.call(_e);
             }
-            finally { if (e_10) throw e_10.error; }
+            finally { if (e_6) throw e_6.error; }
         }
-        if (x.functional === true && y.functional === true)
-            return true;
         return false;
     };
-    Metadata.covers = function (x, y) {
-        var e_11, _a, e_12, _b, e_13, _c, e_14, _d, e_15, _e;
-        if (x.any)
+    Metadata.covers = function (x, y, level) {
+        var e_7, _a, e_8, _b, e_9, _c, e_10, _d, e_11, _e, e_12, _f, e_13, _g;
+        if (level === void 0) { level = 0; }
+        if (x === y)
+            return false;
+        else if (x.any)
             return true;
         else if (y.any)
             return false;
-        var _loop_3 = function (ya) {
-            if (x.arrays.some(function (xa) { return Metadata.covers(xa, ya) === true; }) === false)
-                return { value: false };
-        };
-        try {
-            for (var _f = __values(y.arrays), _g = _f.next(); !_g.done; _g = _f.next()) {
-                var ya = _g.value;
-                var state_3 = _loop_3(ya);
-                if (typeof state_3 === "object")
-                    return state_3.value;
+        if (level === 0) {
+            var _loop_2 = function (ya) {
+                if (!x.arrays.some(function (xa) {
+                    return Metadata.covers(xa.value, ya.value, level + 1);
+                })) {
+                    return { value: false };
+                }
+            };
+            try {
+                for (var _h = __values(y.arrays), _j = _h.next(); !_j.done; _j = _h.next()) {
+                    var ya = _j.value;
+                    var state_2 = _loop_2(ya);
+                    if (typeof state_2 === "object")
+                        return state_2.value;
+                }
             }
-        }
-        catch (e_11_1) { e_11 = { error: e_11_1 }; }
-        finally {
+            catch (e_7_1) { e_7 = { error: e_7_1 }; }
+            finally {
+                try {
+                    if (_j && !_j.done && (_a = _h.return)) _a.call(_h);
+                }
+                finally { if (e_7) throw e_7.error; }
+            }
+            var _loop_3 = function (yt) {
+                if (yt.elements.length !== 0 &&
+                    x.tuples.some(function (xt) {
+                        return xt.elements.length >= yt.elements.length &&
+                            xt.elements
+                                .slice(yt.elements.length)
+                                .every(function (xv, i) {
+                                return Metadata.covers(xv, yt.elements[i], level + 1);
+                            });
+                    }) === false)
+                    return { value: false };
+            };
             try {
-                if (_g && !_g.done && (_a = _f.return)) _a.call(_f);
+                for (var _k = __values(y.tuples), _l = _k.next(); !_l.done; _l = _k.next()) {
+                    var yt = _l.value;
+                    var state_3 = _loop_3(yt);
+                    if (typeof state_3 === "object")
+                        return state_3.value;
+                }
+            }
+            catch (e_8_1) { e_8 = { error: e_8_1 }; }
+            finally {
+                try {
+                    if (_l && !_l.done && (_b = _k.return)) _b.call(_k);
+                }
+                finally { if (e_8) throw e_8.error; }
             }
-            finally { if (e_11) throw e_11.error; }
         }
         var _loop_4 = function (yo) {
             if (x.objects.some(function (xo) { return MetadataObject_1.MetadataObject.covers(xo, yo); }) === false)
                 return { value: false };
         };
         try {
-            for (var _h = __values(y.objects), _j = _h.next(); !_j.done; _j = _h.next()) {
-                var yo = _j.value;
+            for (var _m = __values(y.objects), _o = _m.next(); !_o.done; _o = _m.next()) {
+                var yo = _o.value;
                 var state_4 = _loop_4(yo);
                 if (typeof state_4 === "object")
                     return state_4.value;
             }
         }
-        catch (e_12_1) { e_12 = { error: e_12_1 }; }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
         finally {
             try {
-                if (_j && !_j.done && (_b = _h.return)) _b.call(_h);
+                if (_o && !_o.done && (_c = _m.return)) _c.call(_m);
             }
-            finally { if (e_12) throw e_12.error; }
+            finally { if (e_9) throw e_9.error; }
         }
-        var _loop_5 = function (yt) {
-            if (yt.length !== 0 &&
-                x.tuples.some(function (xt) {
-                    return xt.length >= yt.length &&
-                        xt
-                            .slice(yt.length)
-                            .every(function (xv, i) { return Metadata.covers(xv, yt[i]); });
-                }) === false)
+        var _loop_5 = function (yd) {
+            if (x.definitions.some(function (xd) { return xd.name === yd.name; }) === false)
                 return { value: false };
         };
         try {
-            for (var _k = __values(y.tuples), _l = _k.next(); !_l.done; _l = _k.next()) {
-                var yt = _l.value;
-                var state_5 = _loop_5(yt);
+            for (var _p = __values(y.definitions), _q = _p.next(); !_q.done; _q = _p.next()) {
+                var yd = _q.value;
+                var state_5 = _loop_5(yd);
                 if (typeof state_5 === "object")
                     return state_5.value;
             }
         }
-        catch (e_13_1) { e_13 = { error: e_13_1 }; }
+        catch (e_10_1) { e_10 = { error: e_10_1 }; }
         finally {
             try {
-                if (_l && !_l.done && (_c = _k.return)) _c.call(_k);
+                if (_q && !_q.done && (_d = _p.return)) _d.call(_p);
             }
-            finally { if (e_13) throw e_13.error; }
+            finally { if (e_10) throw e_10.error; }
         }
-        var _loop_6 = function (ys) {
-            if (x.sets.some(function (xs) { return Metadata.covers(xs, ys); }) === false)
+        var _loop_6 = function (yn) {
+            if (x.natives.some(function (xn) { return xn === yn; }) === false)
                 return { value: false };
         };
         try {
-            for (var _m = __values(y.sets), _o = _m.next(); !_o.done; _o = _m.next()) {
-                var ys = _o.value;
-                var state_6 = _loop_6(ys);
+            for (var _r = __values(y.natives), _s = _r.next(); !_s.done; _s = _r.next()) {
+                var yn = _s.value;
+                var state_6 = _loop_6(yn);
                 if (typeof state_6 === "object")
                     return state_6.value;
             }
         }
-        catch (e_14_1) { e_14 = { error: e_14_1 }; }
+        catch (e_11_1) { e_11 = { error: e_11_1 }; }
         finally {
             try {
-                if (_o && !_o.done && (_d = _m.return)) _d.call(_m);
+                if (_s && !_s.done && (_e = _r.return)) _e.call(_r);
             }
-            finally { if (e_14) throw e_14.error; }
+            finally { if (e_11) throw e_11.error; }
+        }
+        var _loop_7 = function (ys) {
+            if (x.sets.some(function (xs) { return Metadata.covers(xs, ys); }) === false)
+                return { value: false };
+        };
+        try {
+            for (var _t = __values(y.sets), _u = _t.next(); !_u.done; _u = _t.next()) {
+                var ys = _u.value;
+                var state_7 = _loop_7(ys);
+                if (typeof state_7 === "object")
+                    return state_7.value;
+            }
+        }
+        catch (e_12_1) { e_12 = { error: e_12_1 }; }
+        finally {
+            try {
+                if (_u && !_u.done && (_f = _t.return)) _f.call(_t);
+            }
+            finally { if (e_12) throw e_12.error; }
         }
         if (y.atomics.some(function (atomic) { return x.atomics.includes(atomic) === false; }))
             return false;
-        var _loop_7 = function (yc) {
+        var _loop_8 = function (yc) {
             var xc = x.constants.find(function (elem) { return elem.type === yc.type; });
             if (xc === undefined)
                 return { value: false };
@@ -489,27 +514,27 @@ exports.Metadata = Metadata;
                 return { value: false };
         };
         try {
-            for (var _p = __values(y.constants), _q = _p.next(); !_q.done; _q = _p.next()) {
-                var yc = _q.value;
-                var state_7 = _loop_7(yc);
-                if (typeof state_7 === "object")
-                    return state_7.value;
+            for (var _v = __values(y.constants), _w = _v.next(); !_w.done; _w = _v.next()) {
+                var yc = _w.value;
+                var state_8 = _loop_8(yc);
+                if (typeof state_8 === "object")
+                    return state_8.value;
             }
         }
-        catch (e_15_1) { e_15 = { error: e_15_1 }; }
+        catch (e_13_1) { e_13 = { error: e_13_1 }; }
         finally {
             try {
-                if (_q && !_q.done && (_e = _p.return)) _e.call(_p);
+                if (_w && !_w.done && (_g = _v.return)) _g.call(_v);
             }
-            finally { if (e_15) throw e_15.error; }
+            finally { if (e_13) throw e_13.error; }
         }
         if (x.functional === false && y.functional)
             return false;
         return true;
     };
     Metadata.merge = function (x, y) {
-        var e_16, _a, e_17, _b, e_18, _c;
-        var _d;
+        var e_14, _a, e_15, _b, e_16, _c, e_17, _d, e_18, _e;
+        var _f;
         var output = Metadata.create({
             any: x.any || y.any,
             nullable: x.nullable || y.nullable,
@@ -524,83 +549,106 @@ exports.Metadata = Metadata;
             templates: x.templates.slice(),
             rest: x.rest !== null && y.rest !== null
                 ? Metadata.merge(x.rest, y.rest)
-                : (_d = x.rest) !== null && _d !== void 0 ? _d : y.rest,
+                : (_f = x.rest) !== null && _f !== void 0 ? _f : y.rest,
             arrays: x.arrays.slice(),
             tuples: x.tuples.slice(),
             objects: x.objects.slice(),
+            definitions: x.definitions.slice(),
             natives: __spreadArray([], __read(new Set(__spreadArray(__spreadArray([], __read(x.natives), false), __read(y.natives), false))), false),
             sets: x.sets.slice(),
             maps: x.maps.slice(),
         });
-        var _loop_8 = function (constant) {
-            var e_19, _l;
+        var _loop_9 = function (constant) {
+            var e_19, _s;
             var target = ArrayUtil_1.ArrayUtil.take(output.constants, function (elem) { return elem.type === constant.type; }, function () { return ({
                 type: constant.type,
                 values: [],
             }); });
             try {
-                for (var _m = (e_19 = void 0, __values(constant.values)), _o = _m.next(); !_o.done; _o = _m.next()) {
-                    var value = _o.value;
+                for (var _t = (e_19 = void 0, __values(constant.values)), _u = _t.next(); !_u.done; _u = _t.next()) {
+                    var value = _u.value;
                     ArrayUtil_1.ArrayUtil.add(target.values, value);
                 }
             }
             catch (e_19_1) { e_19 = { error: e_19_1 }; }
             finally {
                 try {
-                    if (_o && !_o.done && (_l = _m.return)) _l.call(_m);
+                    if (_u && !_u.done && (_s = _t.return)) _s.call(_t);
                 }
                 finally { if (e_19) throw e_19.error; }
             }
         };
         try {
-            for (var _e = __values(y.constants), _f = _e.next(); !_f.done; _f = _e.next()) {
-                var constant = _f.value;
-                _loop_8(constant);
+            for (var _g = __values(y.constants), _h = _g.next(); !_h.done; _h = _g.next()) {
+                var constant = _h.value;
+                _loop_9(constant);
+            }
+        }
+        catch (e_14_1) { e_14 = { error: e_14_1 }; }
+        finally {
+            try {
+                if (_h && !_h.done && (_a = _g.return)) _a.call(_g);
+            }
+            finally { if (e_14) throw e_14.error; }
+        }
+        try {
+            for (var _j = __values(y.arrays), _k = _j.next(); !_k.done; _k = _j.next()) {
+                var array = _k.value;
+                ArrayUtil_1.ArrayUtil.set(output.arrays, array, function (elem) { return elem.name; });
+            }
+        }
+        catch (e_15_1) { e_15 = { error: e_15_1 }; }
+        finally {
+            try {
+                if (_k && !_k.done && (_b = _j.return)) _b.call(_j);
+            }
+            finally { if (e_15) throw e_15.error; }
+        }
+        try {
+            for (var _l = __values(y.tuples), _m = _l.next(); !_m.done; _m = _l.next()) {
+                var tuple = _m.value;
+                ArrayUtil_1.ArrayUtil.set(output.tuples, tuple, function (elem) { return elem.name; });
             }
         }
         catch (e_16_1) { e_16 = { error: e_16_1 }; }
         finally {
             try {
-                if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
+                if (_m && !_m.done && (_c = _l.return)) _c.call(_l);
             }
             finally { if (e_16) throw e_16.error; }
         }
         try {
-            for (var _g = __values(y.arrays), _h = _g.next(); !_h.done; _h = _g.next()) {
-                var array = _h.value;
-                ArrayUtil_1.ArrayUtil.set(output.arrays, array, function (elem) { return elem.getName(); });
+            for (var _o = __values(y.objects), _p = _o.next(); !_p.done; _p = _o.next()) {
+                var obj = _p.value;
+                ArrayUtil_1.ArrayUtil.set(output.objects, obj, function (elem) { return elem.name; });
             }
         }
         catch (e_17_1) { e_17 = { error: e_17_1 }; }
         finally {
             try {
-                if (_h && !_h.done && (_b = _g.return)) _b.call(_g);
+                if (_p && !_p.done && (_d = _o.return)) _d.call(_o);
             }
             finally { if (e_17) throw e_17.error; }
         }
         try {
-            for (var _j = __values(y.objects), _k = _j.next(); !_k.done; _k = _j.next()) {
-                var obj = _k.value;
-                ArrayUtil_1.ArrayUtil.set(output.objects, obj, function (elem) { return elem.name; });
+            for (var _q = __values(y.definitions), _r = _q.next(); !_r.done; _r = _q.next()) {
+                var def = _r.value;
+                ArrayUtil_1.ArrayUtil.set(output.definitions, def, function (elem) { return elem.name; });
             }
         }
         catch (e_18_1) { e_18 = { error: e_18_1 }; }
         finally {
             try {
-                if (_k && !_k.done && (_c = _j.return)) _c.call(_j);
+                if (_r && !_r.done && (_e = _q.return)) _e.call(_q);
             }
             finally { if (e_18) throw e_18.error; }
         }
-        if (x.rest !== null)
-            ArrayUtil_1.ArrayUtil.set(output.arrays, x.rest, function (elem) { return elem.getName(); });
-        if (y.rest !== null)
-            ArrayUtil_1.ArrayUtil.set(output.arrays, y.rest, function (elem) { return elem.getName(); });
         return output;
     };
 })(Metadata = exports.Metadata || (exports.Metadata = {}));
 exports.Metadata = Metadata;
 var getName = function (metadata) {
-    var e_20, _a, e_21, _b, e_22, _c, e_23, _d, e_24, _e, e_25, _f, e_26, _g, e_27, _h, e_28, _j, e_29, _k;
+    var e_20, _a, e_21, _b, e_22, _c, e_23, _d, e_24, _e, e_25, _f, e_26, _g, e_27, _h, e_28, _j, e_29, _k, e_30, _l;
     if (metadata.any === true)
         return "any";
     var elements = [];
@@ -609,31 +657,31 @@ var getName = function (metadata) {
     if (metadata.required === false)
         elements.push("undefined");
     try {
-        for (var _l = __values(metadata.atomics), _m = _l.next(); !_m.done; _m = _l.next()) {
-            var type = _m.value;
+        for (var _m = __values(metadata.atomics), _o = _m.next(); !_o.done; _o = _m.next()) {
+            var type = _o.value;
             elements.push(type);
         }
     }
     catch (e_20_1) { e_20 = { error: e_20_1 }; }
     finally {
         try {
-            if (_m && !_m.done && (_a = _l.return)) _a.call(_l);
+            if (_o && !_o.done && (_a = _m.return)) _a.call(_m);
         }
         finally { if (e_20) throw e_20.error; }
     }
     try {
-        for (var _o = __values(metadata.constants), _p = _o.next(); !_p.done; _p = _o.next()) {
-            var constant = _p.value;
+        for (var _p = __values(metadata.constants), _q = _p.next(); !_q.done; _q = _p.next()) {
+            var constant = _q.value;
             try {
-                for (var _q = (e_22 = void 0, __values(constant.values)), _r = _q.next(); !_r.done; _r = _q.next()) {
-                    var value = _r.value;
+                for (var _r = (e_22 = void 0, __values(constant.values)), _s = _r.next(); !_s.done; _s = _r.next()) {
+                    var value = _s.value;
                     elements.push(JSON.stringify(value));
                 }
             }
             catch (e_22_1) { e_22 = { error: e_22_1 }; }
             finally {
                 try {
-                    if (_r && !_r.done && (_c = _q.return)) _c.call(_q);
+                    if (_s && !_s.done && (_c = _r.return)) _c.call(_r);
                 }
                 finally { if (e_22) throw e_22.error; }
             }
@@ -642,13 +690,13 @@ var getName = function (metadata) {
     catch (e_21_1) { e_21 = { error: e_21_1 }; }
     finally {
         try {
-            if (_p && !_p.done && (_b = _o.return)) _b.call(_o);
+            if (_q && !_q.done && (_b = _p.return)) _b.call(_p);
         }
         finally { if (e_21) throw e_21.error; }
     }
     try {
-        for (var _s = __values(metadata.templates), _t = _s.next(); !_t.done; _t = _s.next()) {
-            var template = _t.value;
+        for (var _t = __values(metadata.templates), _u = _t.next(); !_u.done; _u = _t.next()) {
+            var template = _u.value;
             elements.push("`" +
                 template
                     .map(function (child) {
@@ -665,90 +713,103 @@ var getName = function (metadata) {
     catch (e_23_1) { e_23 = { error: e_23_1 }; }
     finally {
         try {
-            if (_t && !_t.done && (_d = _s.return)) _d.call(_s);
+            if (_u && !_u.done && (_d = _t.return)) _d.call(_t);
         }
         finally { if (e_23) throw e_23.error; }
     }
     try {
-        for (var _u = __values(metadata.natives), _v = _u.next(); !_v.done; _v = _u.next()) {
-            var native = _v.value;
+        for (var _v = __values(metadata.natives), _w = _v.next(); !_w.done; _w = _v.next()) {
+            var native = _w.value;
             elements.push(native);
         }
     }
     catch (e_24_1) { e_24 = { error: e_24_1 }; }
     finally {
         try {
-            if (_v && !_v.done && (_e = _u.return)) _e.call(_u);
+            if (_w && !_w.done && (_e = _v.return)) _e.call(_v);
         }
         finally { if (e_24) throw e_24.error; }
     }
     try {
-        for (var _w = __values(metadata.sets), _x = _w.next(); !_x.done; _x = _w.next()) {
-            var set = _x.value;
+        for (var _x = __values(metadata.sets), _y = _x.next(); !_y.done; _y = _x.next()) {
+            var set = _y.value;
             elements.push("Set<".concat(set.getName(), ">"));
         }
     }
     catch (e_25_1) { e_25 = { error: e_25_1 }; }
     finally {
         try {
-            if (_x && !_x.done && (_f = _w.return)) _f.call(_w);
+            if (_y && !_y.done && (_f = _x.return)) _f.call(_x);
         }
         finally { if (e_25) throw e_25.error; }
     }
     try {
-        for (var _y = __values(metadata.maps), _z = _y.next(); !_z.done; _z = _y.next()) {
-            var map = _z.value;
+        for (var _z = __values(metadata.maps), _0 = _z.next(); !_0.done; _0 = _z.next()) {
+            var map = _0.value;
             elements.push("Map<".concat(map.key.getName(), ", ").concat(map.value.getName(), ">"));
         }
     }
     catch (e_26_1) { e_26 = { error: e_26_1 }; }
     finally {
         try {
-            if (_z && !_z.done && (_g = _y.return)) _g.call(_y);
+            if (_0 && !_0.done && (_g = _z.return)) _g.call(_z);
         }
         finally { if (e_26) throw e_26.error; }
     }
     if (metadata.rest !== null)
         elements.push("...".concat(metadata.rest.getName()));
     try {
-        for (var _0 = __values(metadata.tuples), _1 = _0.next(); !_1.done; _1 = _0.next()) {
-            var tuple = _1.value;
-            elements.push("[".concat(tuple.map(function (elem) { return elem.getName(); }).join(", "), "]"));
+        for (var _1 = __values(metadata.tuples), _2 = _1.next(); !_2.done; _2 = _1.next()) {
+            var tuple = _2.value;
+            elements.push(tuple.name);
         }
     }
     catch (e_27_1) { e_27 = { error: e_27_1 }; }
     finally {
         try {
-            if (_1 && !_1.done && (_h = _0.return)) _h.call(_0);
+            if (_2 && !_2.done && (_h = _1.return)) _h.call(_1);
         }
         finally { if (e_27) throw e_27.error; }
     }
     try {
-        for (var _2 = __values(metadata.arrays), _3 = _2.next(); !_3.done; _3 = _2.next()) {
-            var array = _3.value;
-            elements.push("Array<".concat(array.getName(), ">"));
+        for (var _3 = __values(metadata.arrays), _4 = _3.next(); !_4.done; _4 = _3.next()) {
+            var array = _4.value;
+            elements.push(array.name);
         }
     }
     catch (e_28_1) { e_28 = { error: e_28_1 }; }
     finally {
         try {
-            if (_3 && !_3.done && (_j = _2.return)) _j.call(_2);
+            if (_4 && !_4.done && (_j = _3.return)) _j.call(_3);
         }
         finally { if (e_28) throw e_28.error; }
     }
     try {
-        for (var _4 = __values(metadata.objects), _5 = _4.next(); !_5.done; _5 = _4.next()) {
-            var object = _5.value;
+        for (var _5 = __values(metadata.objects), _6 = _5.next(); !_6.done; _6 = _5.next()) {
+            var object = _6.value;
             elements.push(object.name);
         }
     }
     catch (e_29_1) { e_29 = { error: e_29_1 }; }
     finally {
         try {
-            if (_5 && !_5.done && (_k = _4.return)) _k.call(_4);
+            if (_6 && !_6.done && (_k = _5.return)) _k.call(_5);
         }
         finally { if (e_29) throw e_29.error; }
     }
+    try {
+        for (var _7 = __values(metadata.definitions), _8 = _7.next(); !_8.done; _8 = _7.next()) {
+            var def = _8.value;
+            elements.push(def.name);
+        }
+    }
+    catch (e_30_1) { e_30 = { error: e_30_1 }; }
+    finally {
+        try {
+            if (_8 && !_8.done && (_l = _7.return)) _l.call(_7);
+        }
+        finally { if (e_30) throw e_30.error; }
+    }
     if (metadata.resolved !== null)
         elements.push(metadata.resolved.getName());
     if (elements.length === 0)