typia 4.0.0-dev.20230527 → 4.0.0-dev.20230604

package/lib/factories/MetadataCollection.js

@@ -37,60 +37,47 @@ var __values = (this && this.__values) || function(o) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MetadataCollection = void 0;
+var MetadataAlias_1 = require("../metadata/MetadataAlias");
+var MetadataArray_1 = require("../metadata/MetadataArray");
 var MetadataObject_1 = require("../metadata/MetadataObject");
+var MetadataTuple_1 = require("../metadata/MetadataTuple");
+var Writable_1 = require("../typings/Writable");
 var MapUtil_1 = require("../utils/MapUtil");
-var TsSymbolUtil_1 = require("../utils/TsSymbolUtil");
+var CommentFactory_1 = require("./CommentFactory");
 var TypeFactory_1 = require("./TypeFactory");
-var MetadataCollection = /** @class */ (function () {
+var MetadataCollection = (function () {
     function MetadataCollection(options) {
         this.options = options;
-        this.dict_ = new Map();
+        this.objects_ = new Map();
+        this.object_unions_ = new Map();
+        this.aliases_ = new Map();
+        this.arrays_ = new Map();
+        this.tuples_ = new Map();
         this.names_ = new Map();
-        this.unions_ = new Map();
-        this.index_ = 0;
+        this.object_index_ = 0;
+        this.recursive_array_index_ = 0;
+        this.recursive_tuple_index_ = 0;
     }
+    MetadataCollection.prototype.aliases = function () {
+        return __spreadArray([], __read(this.aliases_.values()), false);
+    };
     MetadataCollection.prototype.objects = function () {
-        return __spreadArray([], __read(this.dict_.values()), false);
+        return __spreadArray([], __read(this.objects_.values()), false);
     };
     MetadataCollection.prototype.unions = function () {
-        return __spreadArray([], __read(this.unions_.values()), false);
+        return __spreadArray([], __read(this.object_unions_.values()), false);
     };
-    MetadataCollection.prototype.emplace = function (p, type) {
-        var _a;
-        var oldbie = this.dict_.get(type);
-        if (oldbie !== undefined)
-            return [oldbie, false];
-        var $id = this.get_name(p, type);
-        var obj = MetadataObject_1.MetadataObject.create({
-            name: $id,
-            properties: [],
-            description: type.symbol
-                ? TsSymbolUtil_1.TsSymbolUtil.comments(p.tsc)(type.symbol)
-                : undefined,
-            jsDocTags: (_a = (type.symbol
-                ? TsSymbolUtil_1.TsSymbolUtil.getCommentTags(p.tsc)(type.symbol)
-                : undefined)) !== null && _a !== void 0 ? _a : [],
-            validated: false,
-            index: this.index_++,
-            recursive: false,
-            nullables: [],
-        });
-        this.dict_.set(type, obj);
-        return [obj, true];
+    MetadataCollection.prototype.arrays = function () {
+        return __spreadArray([], __read(this.arrays_.values()), false);
     };
-    /**
-     * @internal
-     */
-    MetadataCollection.prototype.getUnionIndex = function (meta) {
-        var key = meta.objects.map(function (obj) { return obj.name; }).join(" | ");
-        MapUtil_1.MapUtil.take(this.unions_)(key, function () { return meta.objects; });
-        return __spreadArray([], __read(this.unions_.keys()), false).indexOf(key);
+    MetadataCollection.prototype.tuples = function () {
+        return __spreadArray([], __read(this.tuples_.values()), false);
     };
-    MetadataCollection.prototype.get_name = function (p, type) {
+    MetadataCollection.prototype.getName = function (checker, type) {
         var _this = this;
         var name = (function () {
             var _a;
-            var str = TypeFactory_1.TypeFactory.getFullName(p)(type);
+            var str = TypeFactory_1.TypeFactory.getFullName(checker)(type);
             return ((_a = _this.options) === null || _a === void 0 ? void 0 : _a.replace) ? _this.options.replace(str) : str;
         })();
         var duplicates = MapUtil_1.MapUtil.take(this.names_)(name, function () { return new Map(); });
@@ -103,6 +90,105 @@ var MetadataCollection = /** @class */ (function () {
         duplicates.set(type, addicted);
         return addicted;
     };
+    MetadataCollection.prototype.getUnionIndex = function (meta) {
+        var key = meta.objects.map(function (obj) { return obj.name; }).join(" | ");
+        MapUtil_1.MapUtil.take(this.object_unions_)(key, function () { return meta.objects; });
+        return __spreadArray([], __read(this.object_unions_.keys()), false).indexOf(key);
+    };
+    MetadataCollection.prototype.emplace = function (checker, type) {
+        var _a, _b, _c;
+        var oldbie = this.objects_.get(type);
+        if (oldbie !== undefined)
+            return [oldbie, false];
+        var $id = this.getName(checker, type);
+        var obj = MetadataObject_1.MetadataObject.create({
+            name: $id,
+            properties: [],
+            description: (_a = (type.symbol && CommentFactory_1.CommentFactory.description(type.symbol))) !== null && _a !== void 0 ? _a : undefined,
+            jsDocTags: (_c = (_b = type.symbol) === null || _b === void 0 ? void 0 : _b.getJsDocTags()) !== null && _c !== void 0 ? _c : [],
+            validated: false,
+            index: this.object_index_++,
+            recursive: null,
+            nullables: [],
+        });
+        this.objects_.set(type, obj);
+        return [obj, true];
+    };
+    MetadataCollection.prototype.emplaceAlias = function (checker, type, symbol) {
+        var _a, _b;
+        var oldbie = this.aliases_.get(type);
+        if (oldbie !== undefined)
+            return [oldbie, false, function () { }];
+        var $id = this.getName(checker, type);
+        var alias = MetadataAlias_1.MetadataAlias.create({
+            name: $id,
+            value: null,
+            description: (_a = CommentFactory_1.CommentFactory.description(symbol)) !== null && _a !== void 0 ? _a : null,
+            recursive: null,
+            nullables: [],
+            jsDocTags: (_b = symbol.getJsDocTags()) !== null && _b !== void 0 ? _b : [],
+        });
+        this.aliases_.set(type, alias);
+        return [alias, true, function (meta) { return ((0, Writable_1.Writable)(alias).value = meta); }];
+    };
+    MetadataCollection.prototype.emplaceArray = function (checker, type) {
+        var oldbie = this.arrays_.get(type);
+        if (oldbie !== undefined)
+            return [oldbie, false, function () { }];
+        var $id = this.getName(checker, type);
+        var array = MetadataArray_1.MetadataArray.create({
+            name: $id,
+            value: null,
+            index: null,
+            recursive: null,
+            nullables: [],
+        });
+        this.arrays_.set(type, array);
+        return [array, true, function (meta) { return ((0, Writable_1.Writable)(array).value = meta); }];
+    };
+    MetadataCollection.prototype.emplaceTuple = function (checker, type) {
+        var oldbie = this.tuples_.get(type);
+        if (oldbie !== undefined)
+            return [oldbie, false, function () { }];
+        var $id = this.getName(checker, type);
+        var tuple = MetadataTuple_1.MetadataTuple.create({
+            name: $id,
+            elements: null,
+            index: null,
+            recursive: null,
+            nullables: [],
+        });
+        this.tuples_.set(type, tuple);
+        return [
+            tuple,
+            true,
+            function (elements) { return ((0, Writable_1.Writable)(tuple).elements = elements); },
+        ];
+    };
+    MetadataCollection.prototype.setObjectRecursive = function (obj, recursive) {
+        (0, Writable_1.Writable)(obj).recursive = recursive;
+    };
+    MetadataCollection.prototype.setAliasRecursive = function (alias, recursive) {
+        (0, Writable_1.Writable)(alias).recursive = recursive;
+    };
+    MetadataCollection.prototype.setArrayRecursive = function (array, recursive) {
+        (0, Writable_1.Writable)(array).recursive = recursive;
+        if (recursive)
+            (0, Writable_1.Writable)(array).index = this.recursive_array_index_++;
+    };
+    MetadataCollection.prototype.setTupleRecursive = function (tuple, recursive) {
+        (0, Writable_1.Writable)(tuple).recursive = recursive;
+        if (recursive)
+            (0, Writable_1.Writable)(tuple).index = this.recursive_tuple_index_++;
+    };
+    MetadataCollection.prototype.toJSON = function () {
+        return {
+            objects: this.objects().map(function (o) { return o.toJSON(); }),
+            aliases: this.aliases().map(function (d) { return d.toJSON(); }),
+            arrays: __spreadArray([], __read(this.arrays_.values()), false).map(function (a) { return a.toJSON(); }),
+            tuples: __spreadArray([], __read(this.tuples_.values()), false).map(function (t) { return t.toJSON(); }),
+        };
+    };
     return MetadataCollection;
 }());
 exports.MetadataCollection = MetadataCollection;
@@ -142,7 +228,8 @@ exports.MetadataCollection = MetadataCollection;
         }
         return str;
     };
-})(MetadataCollection || (exports.MetadataCollection = MetadataCollection = {}));
+})(MetadataCollection = exports.MetadataCollection || (exports.MetadataCollection = {}));
+exports.MetadataCollection = MetadataCollection;
 var REPLACERS = [
     ["$", "_dollar_"],
     ["&", "_and_"],

package/lib/factories/MetadataCollection.js.map

@@ -1 +1 @@
-{"version":3,"file":"MetadataCollection.js","sourceRoot":"","sources":["../../src/factories/MetadataCollection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGA,6DAA4D;AAI5D,4CAA2C;AAC3C,sDAAqD;AAErD,6CAA4C;AAE5C;IAMI,4BACqB,OAA8C;QAA9C,YAAO,GAAP,OAAO,CAAuC;QAE/D,IAAI,CAAC,KAAK,GAAG,IAAI,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;IACpB,CAAC;IAEM,oCAAO,GAAd;QACI,gCAAW,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,UAAE;IACpC,CAAC;IACM,mCAAM,GAAb;QACI,gCAAW,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,UAAE;IACtC,CAAC;IAEM,oCAAO,GAAd,UACI,CAAmB,EACnB,IAAa;;QAEb,IAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAEjD,IAAM,GAAG,GAAW,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QAC3C,IAAM,GAAG,GAAmB,+BAAc,CAAC,MAAM,CAAC;YAC9C,IAAI,EAAE,GAAG;YACT,UAAU,EAAE,EAAE;YACd,WAAW,EAAE,IAAI,CAAC,MAAM;gBACpB,CAAC,CAAC,2BAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;gBAC3C,CAAC,CAAC,SAAS;YACf,SAAS,EACL,MAAA,CAAC,IAAI,CAAC,MAAM;gBACR,CAAC,CAAC,2BAAY,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;gBACjD,CAAC,CAAC,SAAS,CAAC,mCAAI,EAAE;YAC1B,SAAS,EAAE,KAAK;YAChB,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE;YACpB,SAAS,EAAE,KAAK;YAChB,SAAS,EAAE,EAAE;SAChB,CAAC,CAAC;QACH,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAC1B,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACvB,CAAC;IAED;;OAEG;IACI,0CAAa,GAApB,UAAqB,IAAc;QAC/B,IAAM,GAAG,GAAW,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAC,GAAG,IAAK,OAAA,GAAG,CAAC,IAAI,EAAR,CAAQ,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpE,iBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,cAAM,OAAA,IAAI,CAAC,OAAO,EAAZ,CAAY,CAAC,CAAC;QACpD,OAAO,yBAAI,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,UAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IACjD,CAAC;IAEO,qCAAQ,GAAhB,UAAiB,CAAmB,EAAE,IAAa;QAAnD,iBAkBC;QAjBG,IAAM,IAAI,GAAW,CAAC;;YAClB,IAAM,GAAG,GAAW,yBAAW,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACrD,OAAO,CAAA,MAAA,KAAI,CAAC,OAAO,0CAAE,OAAO,EAAC,CAAC,CAAC,KAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;QACnE,CAAC,CAAC,EAAE,CAAC;QAEL,IAAM,UAAU,GAAyB,iBAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAC9D,IAAI,EACJ,cAAM,OAAA,IAAI,GAAG,EAAE,EAAT,CAAS,CAClB,CAAC;QACF,IAAM,MAAM,GAAuB,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO,MAAM,CAAC;QAExC,IAAM,QAAQ,GAAW,UAAU,CAAC,IAAI;YACpC,CAAC,CAAC,UAAG,IAAI,eAAK,UAAU,CAAC,IAAI,CAAE;YAC/B,CAAC,CAAC,IAAI,CAAC;QACX,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC/B,OAAO,QAAQ,CAAC;IACpB,CAAC;IACL,yBAAC;AAAD,CAAC,AA7ED,IA6EC;AA7EY,gDAAkB;AA8E/B,WAAiB,kBAAkB;IAKlB,0BAAO,GAAG,UAAC,GAAW;;;YAC/B,KAA8B,IAAA,cAAA,SAAA,SAAS,CAAA,oCAAA;gBAA5B,IAAA,KAAA,8BAAe,EAAd,MAAM,QAAA,EAAE,KAAK,QAAA;gBACrB,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAAA;;;;;;;;;QACxC,OAAO,GAAG,CAAC;IACf,CAAC,CAAC;IAEW,yBAAM,GAAG,UAAC,GAAW;;;YAC9B,KAA8B,IAAA,cAAA,SAAA,SAAS,CAAA,oCAAA;gBAA5B,IAAA,KAAA,8BAAe,EAAd,MAAM,QAAA,EAAE,KAAK,QAAA;gBACrB,IAAI,KAAK,KAAK,EAAE;oBAAE,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAAA;;;;;;;;;QAC1D,OAAO,GAAG,CAAC;IACf,CAAC,CAAC;AACN,CAAC,EAhBgB,kBAAkB,kCAAlB,kBAAkB,QAgBlC;AACD,IAAM,SAAS,GAAuB;IAClC,CAAC,GAAG,EAAE,UAAU,CAAC;IACjB,CAAC,GAAG,EAAE,OAAO,CAAC;IACd,CAAC,GAAG,EAAE,MAAM,CAAC;IACb,CAAC,GAAG,EAAE,OAAO,CAAC;IACd,CAAC,GAAG,EAAE,OAAO,CAAC;IACd,CAAC,GAAG,EAAE,MAAM,CAAC;IACb,CAAC,GAAG,EAAE,MAAM,CAAC;IACb,CAAC,GAAG,EAAE,OAAO,CAAC;IACd,CAAC,GAAG,EAAE,OAAO,CAAC;IACd,CAAC,GAAG,EAAE,SAAS,CAAC;IAChB,CAAC,GAAG,EAAE,aAAa,CAAC;IACpB,CAAC,GAAG,EAAE,eAAe,CAAC;IACtB,CAAC,GAAG,EAAE,eAAe,CAAC;IACtB,CAAC,GAAG,EAAE,SAAS,CAAC;CACnB,CAAC"}
+{"version":3,"file":"MetadataCollection.js","sourceRoot":"","sources":["../../src/factories/MetadataCollection.ts"],"names":[],"mappings":"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"}

package/lib/factories/MetadataFactory.d.ts

@@ -1,12 +1,16 @@
-import type ts from "typescript/lib/tsclibrary";
+import ts from "typescript";
 import { Metadata } from "../metadata/Metadata";
-import { IProject } from "../transformers/IProject";
 import { MetadataCollection } from "./MetadataCollection";
 export declare namespace MetadataFactory {
     interface IOptions {
         resolve: boolean;
         constant: boolean;
+        absorb: boolean;
         validate?: (meta: Metadata) => void;
     }
-    const analyze: (project: IProject.IModule) => (options: IOptions) => (collection: MetadataCollection) => (type: ts.Type | null) => Metadata;
+    const analyze: (checker: ts.TypeChecker) => (options: IOptions) => (collection: MetadataCollection) => (type: ts.Type | null) => Metadata;
+    /**
+     * @deprecated Use `analyze` function instead
+     */
+    const generate: (checker: ts.TypeChecker, collection: MetadataCollection, type: ts.Type, options: IOptions) => Metadata;
 }

package/lib/factories/MetadataFactory.js

@@ -1,67 +1,23 @@
 "use strict";
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MetadataFactory = void 0;
 var explore_metadata_1 = require("./internal/metadata/explore_metadata");
+var iterate_metadata_collection_1 = require("./internal/metadata/iterate_metadata_collection");
+var iterate_metadata_sort_1 = require("./internal/metadata/iterate_metadata_sort");
 var MetadataFactory;
 (function (MetadataFactory) {
-    MetadataFactory.analyze = function (project) {
+    MetadataFactory.analyze = function (checker) {
         return function (options) {
             return function (collection) {
                 return function (type) {
-                    var e_1, _a;
-                    // CONSTRUCT SCHEMA WITH OBJECTS
-                    var metadata = (0, explore_metadata_1.explore_metadata)(project)(options)(collection)(false)(type);
-                    var _loop_1 = function (object) {
-                        object.recursive = object.properties.some(function (prop) {
-                            return isRecursive(object.name)(prop.value);
-                        });
-                    };
-                    try {
-                        // FIND RECURSIVE OBJECTS
-                        for (var _b = __values(collection.objects()), _c = _b.next(); !_c.done; _c = _b.next()) {
-                            var object = _c.value;
-                            _loop_1(object);
-                        }
-                    }
-                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                    finally {
-                        try {
-                            if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                        }
-                        finally { if (e_1) throw e_1.error; }
-                    }
-                    // RETURNS
-                    return metadata;
+                    var meta = (0, explore_metadata_1.explore_metadata)(checker)(options)(collection)(type, false);
+                    (0, iterate_metadata_collection_1.iterate_metadata_collection)(collection);
+                    (0, iterate_metadata_sort_1.iterate_metadata_sort)(collection)(meta);
+                    return meta;
                 };
             };
         };
     };
-    var isRecursive = function (name) {
-        return function (meta) {
-            var similar = function (str) {
-                return name === str ||
-                    name.indexOf("<".concat(str, ",")) !== -1 ||
-                    name.indexOf(", ".concat(str, ">")) !== -1 ||
-                    name.indexOf(", ".concat(str, ",")) !== -1;
-            };
-            return (meta.objects.some(function (obj) { return similar(obj.name); }) ||
-                meta.arrays.some(function (arr) { return isRecursive(name)(arr); }) ||
-                meta.tuples.some(function (tuple) {
-                    return tuple.some(function (m) { var _a; return isRecursive(name)((_a = m.rest) !== null && _a !== void 0 ? _a : m); });
-                }) ||
-                meta.maps.some(function (map) { return isRecursive(name)(map.value); }));
-        };
-    };
-})(MetadataFactory || (exports.MetadataFactory = MetadataFactory = {}));
+    MetadataFactory.generate = function (checker, collection, type, options) { return MetadataFactory.analyze(checker)(options)(collection)(type); };
+})(MetadataFactory = exports.MetadataFactory || (exports.MetadataFactory = {}));
 //# sourceMappingURL=MetadataFactory.js.map

package/lib/factories/MetadataFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"MetadataFactory.js","sourceRoot":"","sources":["../../src/factories/MetadataFactory.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAGA,yEAAwE;AAMxE,IAAiB,eAAe,CA2C/B;AA3CD,WAAiB,eAAe;IAOf,uBAAO,GAChB,UAAC,OAAyB;QAC1B,OAAA,UAAC,OAAiB;YAClB,OAAA,UAAC,UAA8B;gBAC/B,OAAA,UAAC,IAAoB;;oBACjB,gCAAgC;oBAChC,IAAM,QAAQ,GACV,IAAA,mCAAgB,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;4CAGrD,MAAM;wBACb,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,UAAC,IAAI;4BAC3C,OAAA,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;wBAApC,CAAoC,CACvC,CAAC;;;wBAJN,yBAAyB;wBACzB,KAAqB,IAAA,KAAA,SAAA,UAAU,CAAC,OAAO,EAAE,CAAA,gBAAA;4BAApC,IAAM,MAAM,WAAA;oCAAN,MAAM;yBAGX;;;;;;;;;oBAEN,UAAU;oBACV,OAAO,QAAQ,CAAC;gBACpB,CAAC;YAbD,CAaC;QAdD,CAcC;IAfD,CAeC,CAAC;IAEN,IAAM,WAAW,GACb,UAAC,IAAY;QACb,OAAA,UAAC,IAAc;YACX,IAAM,OAAO,GAAG,UAAC,GAAW;gBACxB,OAAA,IAAI,KAAK,GAAG;oBACZ,IAAI,CAAC,OAAO,CAAC,WAAI,GAAG,MAAG,CAAC,KAAK,CAAC,CAAC;oBAC/B,IAAI,CAAC,OAAO,CAAC,YAAK,GAAG,MAAG,CAAC,KAAK,CAAC,CAAC;oBAChC,IAAI,CAAC,OAAO,CAAC,YAAK,GAAG,MAAG,CAAC,KAAK,CAAC,CAAC;YAHhC,CAGgC,CAAC;YACrC,OAAO,CACH,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAC,GAAG,IAAK,OAAA,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAjB,CAAiB,CAAC;gBAC7C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAC,GAAG,IAAK,OAAA,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,EAAtB,CAAsB,CAAC;gBACjD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAC,KAAK;oBACnB,OAAA,KAAK,CAAC,IAAI,CAAC,UAAC,CAAC,YAAK,OAAA,WAAW,CAAC,IAAI,CAAC,CAAC,MAAA,CAAC,CAAC,IAAI,mCAAI,CAAC,CAAC,CAAA,EAAA,CAAC;gBAAjD,CAAiD,CACpD;gBACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAC,GAAG,IAAK,OAAA,WAAW,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAA5B,CAA4B,CAAC,CACxD,CAAC;QACN,CAAC;IAdD,CAcC,CAAC;AACV,CAAC,EA3CgB,eAAe,+BAAf,eAAe,QA2C/B"}
+{"version":3,"file":"MetadataFactory.js","sourceRoot":"","sources":["../../src/factories/MetadataFactory.ts"],"names":[],"mappings":";;;AAGA,yEAAwE;AACxE,+FAA8F;AAC9F,mFAAkF;AAIlF,IAAiB,eAAe,CA8B/B;AA9BD,WAAiB,eAAe;IAQf,uBAAO,GAChB,UAAC,OAAuB;QACxB,OAAA,UAAC,OAAiB;YAClB,OAAA,UAAC,UAA8B;gBAC/B,OAAA,UAAC,IAAoB;oBACjB,IAAM,IAAI,GAAa,IAAA,mCAAgB,EAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CACrD,UAAU,CACb,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;oBACf,IAAA,yDAA2B,EAAC,UAAU,CAAC,CAAC;oBACxC,IAAA,6CAAqB,EAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC;oBACxC,OAAO,IAAI,CAAC;gBAChB,CAAC;YAPD,CAOC;QARD,CAQC;IATD,CASC,CAAC;IAKO,wBAAQ,GAAG,UACpB,OAAuB,EACvB,UAA8B,EAC9B,IAAa,EACb,OAAiB,IAChB,OAAA,gBAAA,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,EAA3C,CAA2C,CAAC;AACrD,CAAC,EA9BgB,eAAe,GAAf,uBAAe,KAAf,uBAAe,QA8B/B"}

package/lib/factories/MetadataTagFactory.d.ts

@@ -1,6 +1,6 @@
-import { JSDocTagInfo } from "typescript";
+import ts from "typescript";
 import { IMetadataTag } from "../metadata/IMetadataTag";
 import { Metadata } from "../metadata/Metadata";
 export declare namespace MetadataTagFactory {
-    const generate: (metadata: Metadata) => (tagList: JSDocTagInfo[]) => (identifier: () => string) => IMetadataTag[];
+    const generate: (metadata: Metadata) => (tagList: ts.JSDocTagInfo[]) => (identifier: () => string) => IMetadataTag[];
 }

package/lib/factories/MetadataTagFactory.js

@@ -39,22 +39,16 @@ var MetadataTagFactory;
         };
     };
     var parse = function (identifier, metadata, tag, output) {
-        var _a, _b;
+        var _a;
         var closure = MetadataTagFactory._PARSER[tag.name];
         if (closure === undefined)
             return null;
-        var text = (_b = (_a = tag.text) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.text;
+        var text = (_a = (tag.text || [])[0]) === null || _a === void 0 ? void 0 : _a.text;
         if (text === undefined)
             throw new Error("".concat(LABEL, ": no tag value on ").concat(identifier()));
         return closure(identifier, metadata, text, output);
     };
-    /**
-     * @internal
-     */
     MetadataTagFactory._PARSER = {
-        /* -----------------------------------------------------------
-            ARRAY
-        ----------------------------------------------------------- */
         items: function (identifier, metadata, text, output) {
             validate(identifier, metadata, output, "items", "array", [
                 "minItems",
@@ -82,9 +76,6 @@ var MetadataTagFactory;
                 value: parse_number(identifier, text),
             };
         },
-        /* -----------------------------------------------------------
-            NUMBER
-        ----------------------------------------------------------- */
         type: function (_identifier, metadata, text, _output) {
             return has_atomic(metadata)("number") &&
                 (text === "int" || text === "uint")
@@ -146,15 +137,10 @@ var MetadataTagFactory;
                 value: parse_number(identifier, text),
             };
         },
-        /* -----------------------------------------------------------
-            STRING
-        ----------------------------------------------------------- */
         format: function (identifier, metadata, str, output) {
             validate(identifier, metadata, output, "format", "string", [
                 "pattern",
             ]);
-            // Ignore arbitrary @format values in the internal metadata,
-            // these are currently only supported on the typia.application() API.
             var value = FORMATS.get(str);
             if (value === undefined)
                 return null;
@@ -201,7 +187,7 @@ var MetadataTagFactory;
             };
         },
     };
-})(MetadataTagFactory || (exports.MetadataTagFactory = MetadataTagFactory = {}));
+})(MetadataTagFactory = exports.MetadataTagFactory || (exports.MetadataTagFactory = {}));
 var parse_number = function (identifier, str) {
     var value = Number(str);
     if (isNaN(value) === true)
@@ -223,14 +209,12 @@ var FORMATS = new Map([
 var WRONG_TYPE = function (tag, type, identifier) { return "".concat(LABEL, ": ").concat(tag, " requires ").concat(type, " type, but no \"").concat(identifier(), "\"."); };
 var validate = function (identifier, metadata, output, kind, type, neighbors) {
     var e_2, _a;
-    // TYPE CHECKING
     if (type === "array") {
         if (has_array(metadata) === false)
             throw new Error(WRONG_TYPE(kind, "array", identifier));
     }
     else if (has_atomic(metadata)(type) === false)
         throw new Error(WRONG_TYPE(kind, type, identifier));
-    // DUPLICATED TAG
     if (output.some(function (tag) { return tag.kind === kind; }))
         throw new Error("".concat(LABEL, ": duplicated ").concat(kind, " tags on \"").concat(identifier(), "\"."));
     var _loop_1 = function (name_1) {
@@ -238,7 +222,6 @@ var validate = function (identifier, metadata, output, kind, type, neighbors) {
             throw new Error("".concat(LABEL, ": ").concat(kind, " and ").concat(name_1, " tags on \"").concat(identifier(), "\"."));
     };
     try {
-        // NEIGHBOR TAG
         for (var neighbors_1 = __values(neighbors), neighbors_1_1 = neighbors_1.next(); !neighbors_1_1.done; neighbors_1_1 = neighbors_1.next()) {
             var name_1 = neighbors_1_1.value;
             _loop_1(name_1);
@@ -257,14 +240,16 @@ var has_atomic = function (metadata) {
         return metadata.atomics.find(type === "number"
             ? function (atom) { return atom === type || atom === "bigint"; }
             : function (atom) { return atom === type; }) !== undefined ||
-            metadata.arrays.some(function (child) { return has_atomic(child)(type); }) ||
+            metadata.arrays.some(function (child) { return has_atomic(child.value)(type); }) ||
             metadata.tuples.some(function (tuple) {
-                return tuple.some(function (child) { return has_atomic(child)(type); });
+                return tuple.elements.some(function (child) { return has_atomic(child)(type); });
             });
     };
 };
 var has_array = function (metadata) {
     return metadata.arrays.length !== 0 ||
-        metadata.tuples.some(function (tuple) { return tuple.some(function (child) { return has_array(child); }); });
+        metadata.tuples.some(function (tuple) {
+            return tuple.elements.some(function (child) { return has_array(child); });
+        });
 };
 //# sourceMappingURL=MetadataTagFactory.js.map

package/lib/factories/MetadataTagFactory.js.map

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

package/lib/factories/StatementFactory.d.ts

@@ -1,4 +1,5 @@
-import type ts from "typescript/lib/tsclibrary";
+import ts from "typescript";
 export declare namespace StatementFactory {
-    const constant: (tsc: typeof ts) => (name: string, initializer?: ts.Expression) => ts.VariableStatement;
+    const constant: (name: string, initializer?: ts.Expression) => ts.VariableStatement;
+    const transpile: (script: string) => ts.ExpressionStatement;
 }

package/lib/factories/StatementFactory.js

@@ -1,12 +1,19 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StatementFactory = void 0;
+var typescript_1 = __importDefault(require("typescript"));
 var StatementFactory;
 (function (StatementFactory) {
-    StatementFactory.constant = function (tsc) { return function (name, initializer) {
-        return tsc.factory.createVariableStatement(undefined, tsc.factory.createVariableDeclarationList([
-            tsc.factory.createVariableDeclaration(name, undefined, undefined, initializer),
-        ], tsc.NodeFlags.Const));
-    }; };
-})(StatementFactory || (exports.StatementFactory = StatementFactory = {}));
+    StatementFactory.constant = function (name, initializer) {
+        return typescript_1.default.factory.createVariableStatement(undefined, typescript_1.default.factory.createVariableDeclarationList([
+            typescript_1.default.factory.createVariableDeclaration(name, undefined, undefined, initializer),
+        ], typescript_1.default.NodeFlags.Const));
+    };
+    StatementFactory.transpile = function (script) {
+        return typescript_1.default.factory.createExpressionStatement(typescript_1.default.factory.createIdentifier(typescript_1.default.transpile(script)));
+    };
+})(StatementFactory = exports.StatementFactory || (exports.StatementFactory = {}));
 //# sourceMappingURL=StatementFactory.js.map

package/lib/factories/StatementFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"StatementFactory.js","sourceRoot":"","sources":["../../src/factories/StatementFactory.ts"],"names":[],"mappings":";;;AAEA,IAAiB,gBAAgB,CAiBhC;AAjBD,WAAiB,gBAAgB;IAChB,yBAAQ,GACjB,UAAC,GAAc,IAAK,OAAA,UAAC,IAAY,EAAE,WAA2B;QAC1D,OAAA,GAAG,CAAC,OAAO,CAAC,uBAAuB,CAC/B,SAAS,EACT,GAAG,CAAC,OAAO,CAAC,6BAA6B,CACrC;YACI,GAAG,CAAC,OAAO,CAAC,yBAAyB,CACjC,IAAI,EACJ,SAAS,EACT,SAAS,EACT,WAAW,CACd;SACJ,EACD,GAAG,CAAC,SAAS,CAAC,KAAK,CACtB,CACJ;IAbD,CAaC,EAde,CAcf,CAAC;AACd,CAAC,EAjBgB,gBAAgB,gCAAhB,gBAAgB,QAiBhC"}
+{"version":3,"file":"StatementFactory.js","sourceRoot":"","sources":["../../src/factories/StatementFactory.ts"],"names":[],"mappings":";;;;;;AAAA,0DAA4B;AAE5B,IAAiB,gBAAgB,CAqBhC;AArBD,WAAiB,gBAAgB;IAChB,yBAAQ,GAAG,UAAC,IAAY,EAAE,WAA2B;QAC9D,OAAA,oBAAE,CAAC,OAAO,CAAC,uBAAuB,CAC9B,SAAS,EACT,oBAAE,CAAC,OAAO,CAAC,6BAA6B,CACpC;YACI,oBAAE,CAAC,OAAO,CAAC,yBAAyB,CAChC,IAAI,EACJ,SAAS,EACT,SAAS,EACT,WAAW,CACd;SACJ,EACD,oBAAE,CAAC,SAAS,CAAC,KAAK,CACrB,CACJ;IAbD,CAaC,CAAC;IAEO,0BAAS,GAAG,UAAC,MAAc;QACpC,OAAA,oBAAE,CAAC,OAAO,CAAC,yBAAyB,CAChC,oBAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,oBAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CACpD;IAFD,CAEC,CAAC;AACV,CAAC,EArBgB,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAqBhC"}

package/lib/factories/TemplateFactory.d.ts

@@ -1,4 +1,4 @@
-import type ts from "typescript/lib/tsclibrary";
+import ts from "typescript";
 export declare namespace TemplateFactory {
-    const generate: (tsc: typeof ts) => (expressions: ts.Expression[]) => ts.Expression;
+    const generate: (expressions: ts.Expression[]) => ts.Expression;
 }

package/lib/factories/TemplateFactory.js

@@ -1,48 +1,46 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TemplateFactory = void 0;
+var typescript_1 = __importDefault(require("typescript"));
 var TemplateFactory;
 (function (TemplateFactory) {
-    TemplateFactory.generate = function (tsc) {
-        return function (expressions) {
-            if (expressions.every(function (exp) { return tsc.isStringLiteral(exp); }))
-                return tsc.factory.createStringLiteral(expressions
-                    .map(function (str) { return str.text; })
-                    .join(""));
-            var it = {
-                value: "",
-                index: 0,
-            };
-            gather(tsc)(expressions)(it);
-            var head = tsc.factory.createTemplateHead(it.value);
-            var spans = [];
-            while (true) {
-                var elem = expressions[it.index++];
-                gather(tsc)(expressions)(it);
-                var broken = it.index === expressions.length;
-                spans.push(tsc.factory.createTemplateSpan(elem, broken
-                    ? tsc.factory.createTemplateTail(it.value)
-                    : tsc.factory.createTemplateMiddle(it.value)));
-                if (broken === true)
-                    break;
-            }
-            return tsc.factory.createTemplateExpression(head, spans);
+    TemplateFactory.generate = function (expressions) {
+        if (expressions.every(function (exp) { return typescript_1.default.isStringLiteral(exp); }))
+            return typescript_1.default.factory.createStringLiteral(expressions
+                .map(function (str) { return str.text; })
+                .join(""));
+        var it = {
+            value: "",
+            index: 0,
         };
+        gather(expressions)(it);
+        var head = typescript_1.default.factory.createTemplateHead(it.value);
+        var spans = [];
+        while (true) {
+            var elem = expressions[it.index++];
+            gather(expressions)(it);
+            var broken = it.index === expressions.length;
+            spans.push(typescript_1.default.factory.createTemplateSpan(elem, broken
+                ? typescript_1.default.factory.createTemplateTail(it.value)
+                : typescript_1.default.factory.createTemplateMiddle(it.value)));
+            if (broken === true)
+                break;
+        }
+        return typescript_1.default.factory.createTemplateExpression(head, spans);
     };
-    var gather = function (tsc) {
-        return function (expressions) {
-            return function (it) {
-                var found = expressions.findIndex(function (elem, index) {
-                    return index >= it.index && !tsc.isStringLiteral(elem);
-                });
-                var last = found !== -1 ? found : expressions.length;
-                it.value = expressions
-                    .slice(it.index, last)
-                    .map(function (elem) { return elem.text; })
-                    .reduce(function (x, y) { return x + y; }, "");
-                it.index = last;
-            };
+    var gather = function (expressions) {
+        return function (it) {
+            var found = expressions.findIndex(function (elem, index) { return index >= it.index && !typescript_1.default.isStringLiteral(elem); });
+            var last = found !== -1 ? found : expressions.length;
+            it.value = expressions
+                .slice(it.index, last)
+                .map(function (elem) { return elem.text; })
+                .reduce(function (x, y) { return x + y; }, "");
+            it.index = last;
         };
     };
-})(TemplateFactory || (exports.TemplateFactory = TemplateFactory = {}));
+})(TemplateFactory = exports.TemplateFactory || (exports.TemplateFactory = {}));
 //# sourceMappingURL=TemplateFactory.js.map