@nestia/sdk 7.1.1 → 7.2.0

package/lib/analyses/DtoAnalyzer.d.ts

@@ -0,0 +1,21 @@
+import ts from "typescript";
+import { IReflectImport } from "../structures/IReflectImport";
+import { IReflectType } from "../structures/IReflectType";
+export declare namespace DtoAnalyzer {
+    interface INodeProps {
+        checker: ts.TypeChecker;
+        imports: IReflectImport[];
+        typeNode: ts.TypeNode;
+    }
+    interface ITypeProps {
+        checker: ts.TypeChecker;
+        imports: IReflectImport[];
+        type: ts.Type;
+    }
+    interface IOutput {
+        imports: IReflectImport[];
+        type: IReflectType;
+    }
+    const analyzeNode: (props: INodeProps) => IOutput | null;
+    const analyzeType: (props: ITypeProps) => IOutput | null;
+}

package/lib/analyses/DtoAnalyzer.js

@@ -0,0 +1,208 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DtoAnalyzer = void 0;
+const typescript_1 = __importDefault(require("typescript"));
+const ImportAnalyzer_1 = require("./ImportAnalyzer");
+var DtoAnalyzer;
+(function (DtoAnalyzer) {
+    DtoAnalyzer.analyzeNode = (props) => {
+        try {
+            const container = [];
+            const type = exploreNode({
+                checker: props.checker,
+                imports: props.imports,
+                container,
+            }, props.typeNode);
+            return {
+                type,
+                imports: ImportAnalyzer_1.ImportAnalyzer.merge(container),
+            };
+        }
+        catch (_a) {
+            return null;
+        }
+    };
+    DtoAnalyzer.analyzeType = (props) => {
+        try {
+            const container = [];
+            const type = exploreType({
+                checker: props.checker,
+                imports: props.imports,
+                container,
+            }, props.type);
+            return {
+                type,
+                imports: ImportAnalyzer_1.ImportAnalyzer.merge(container),
+            };
+        }
+        catch (_a) {
+            return null;
+        }
+    };
+    const exploreNode = (ctx, typeNode) => {
+        var _a;
+        // Analyze symbol, and take special cares
+        if (typescript_1.default.isIntersectionTypeNode(typeNode))
+            return {
+                name: typeNode.types
+                    .map((child) => exploreNode(ctx, child))
+                    .map(getEscapedText)
+                    .join(" & "),
+            };
+        else if (typescript_1.default.isUnionTypeNode(typeNode))
+            return {
+                name: typeNode.types
+                    .map((child) => exploreNode(ctx, child))
+                    .map(getEscapedText)
+                    .join(" | "),
+            };
+        else if (typescript_1.default.isParenthesizedTypeNode(typeNode))
+            return {
+                name: `(${exploreNode(ctx, typeNode.type).name})`,
+            };
+        else if (typescript_1.default.isTypeOperatorNode(typeNode)) {
+            const prefix = typeNode.operator === typescript_1.default.SyntaxKind.KeyOfKeyword
+                ? "keyof"
+                : typeNode.operator === typescript_1.default.SyntaxKind.UniqueKeyword
+                    ? "unique"
+                    : typeNode.operator === typescript_1.default.SyntaxKind.ReadonlyKeyword
+                        ? "readonly"
+                        : null;
+            if (prefix === null)
+                return exploreType(ctx, ctx.checker.getTypeFromTypeNode(typeNode));
+            return {
+                name: `${prefix} ${exploreNode(ctx, typeNode.type).name}`,
+            };
+        }
+        else if (typescript_1.default.isTypePredicateNode(typeNode) || typescript_1.default.isTypeQueryNode(typeNode))
+            return exploreType(ctx, ctx.checker.getTypeFromTypeNode(typeNode));
+        else if (typescript_1.default.isTypeReferenceNode(typeNode) === false)
+            return {
+                name: typeNode.getText(),
+            };
+        // Find matched import statement
+        const name = typeNode.typeName.getText();
+        const prefix = name.split(".")[0];
+        let matched = false;
+        const insert = (imp) => {
+            matched || (matched = true);
+            ctx.container.push(imp);
+        };
+        for (const imp of ctx.imports)
+            if (prefix === imp.default)
+                insert({
+                    file: imp.file,
+                    asterisk: null,
+                    default: prefix,
+                    elements: [],
+                });
+            else if (prefix === imp.asterisk)
+                insert({
+                    file: imp.file,
+                    asterisk: prefix,
+                    default: null,
+                    elements: [],
+                });
+            else if (imp.elements.includes(prefix))
+                insert({
+                    file: imp.file,
+                    asterisk: null,
+                    default: null,
+                    elements: [prefix],
+                });
+        if (prefix !== "Promise" && matched === false) {
+            const symbol = name.includes(".")
+                ? ctx.checker.getSymbolAtLocation(typeNode.typeName)
+                : ctx.checker.getTypeAtLocation(typeNode).getSymbol();
+            if (symbol !== undefined)
+                emplaceSymbol(ctx, symbol, prefix);
+        }
+        // Finalize with generic arguments
+        if (!!((_a = typeNode.typeArguments) === null || _a === void 0 ? void 0 : _a.length)) {
+            const top = typeNode.typeArguments[0];
+            if (name === "Promise")
+                return exploreNode(ctx, top);
+            return {
+                name,
+                typeArguments: typeNode.typeArguments.map((child) => exploreNode(ctx, child)),
+            };
+        }
+        return { name };
+    };
+    const exploreType = (ctx, type) => {
+        var _a, _b;
+        // Analyze symbol, and take special cares
+        const symbol = (_a = type.aliasSymbol) !== null && _a !== void 0 ? _a : type.symbol;
+        if (type.aliasSymbol === undefined && type.isUnionOrIntersection()) {
+            const joiner = type.isIntersection() ? " & " : " | ";
+            return {
+                name: type.types
+                    .map((child) => exploreType(ctx, child))
+                    .map(getEscapedText)
+                    .join(joiner),
+            };
+        }
+        else if (symbol === undefined)
+            return {
+                name: ctx.checker.typeToString(type, undefined, typescript_1.default.TypeFormatFlags.NoTruncation),
+            };
+        // Find matched import statement
+        const name = getNameOfSymbol(symbol);
+        const prefix = name.split(".")[0];
+        let matched = false;
+        const insert = (imp) => {
+            matched || (matched = true);
+            ctx.container.push(imp);
+        };
+        for (const imp of ctx.imports)
+            if (imp.elements.includes(prefix))
+                insert({
+                    file: imp.file,
+                    asterisk: null,
+                    default: null,
+                    elements: [prefix],
+                });
+        if (prefix !== "Promise" && matched === false)
+            emplaceSymbol(ctx, symbol, prefix);
+        // Finalize with generic arguments
+        const generic = type.aliasSymbol
+            ? ((_b = type.aliasTypeArguments) !== null && _b !== void 0 ? _b : [])
+            : ctx.checker.getTypeArguments(type);
+        return generic.length
+            ? name === "Promise"
+                ? exploreType(ctx, generic[0])
+                : {
+                    name,
+                    typeArguments: generic.map((child) => exploreType(ctx, child)),
+                }
+            : { name };
+    };
+    const emplaceSymbol = (ctx, symbol, prefix) => {
+        var _a, _b;
+        // GET SOURCE FILE
+        const sourceFile = (_b = (_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.getSourceFile();
+        if (sourceFile === undefined)
+            return;
+        if (sourceFile.fileName.indexOf("/typescript/lib") === -1)
+            ctx.container.push({
+                file: sourceFile.fileName,
+                asterisk: null,
+                default: null,
+                elements: [prefix],
+            });
+    };
+})(DtoAnalyzer || (exports.DtoAnalyzer = DtoAnalyzer = {}));
+const getEscapedText = (type) => type.typeArguments
+    ? `${type.name}<${type.typeArguments.map(getEscapedText).join(", ")}>`
+    : type.name;
+const getNameOfSymbol = (symbol) => {
+    var _a, _b;
+    return exploreName(symbol.escapedName.toString(), (_b = (_a = symbol.getDeclarations()) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.parent);
+};
+const exploreName = (name, decl) => decl && typescript_1.default.isModuleBlock(decl)
+    ? exploreName(`${decl.parent.name.getFullText().trim()}.${name}`, decl.parent.parent)
+    : name;
+//# sourceMappingURL=DtoAnalyzer.js.map

package/lib/analyses/DtoAnalyzer.js.map

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

package/lib/analyses/ImportAnalyzer.d.ts

@@ -1,11 +1,6 @@
 import ts from "typescript";
-import { IReflectType } from "../structures/IReflectType";
-import { IReflectTypeImport } from "../structures/IReflectTypeImport";
+import { IReflectImport } from "../structures/IReflectImport";
 export declare namespace ImportAnalyzer {
-    interface IOutput {
-        imports: IReflectTypeImport[];
-        type: IReflectType | null;
-    }
-    const analyze: (checker: ts.TypeChecker, generics: WeakMap<ts.Type, ts.Type>, type: ts.Type) => IOutput;
-    const unique: (imports: IReflectTypeImport[]) => IReflectTypeImport[];
+    const analyze: (file: ts.SourceFile) => IReflectImport[];
+    const merge: (imports: IReflectImport[]) => IReflectImport[];
 }

package/lib/analyses/ImportAnalyzer.js

@@ -4,119 +4,101 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImportAnalyzer = void 0;
+const path_1 = __importDefault(require("path"));
 const typescript_1 = __importDefault(require("typescript"));
 const MapUtil_1 = require("../utils/MapUtil");
 var ImportAnalyzer;
 (function (ImportAnalyzer) {
-    ImportAnalyzer.analyze = (checker, generics, type) => {
-        const imports = new Map();
+    ImportAnalyzer.analyze = (file) => file.statements
+        .filter(typescript_1.default.isImportDeclaration)
+        .map((imp) => {
+        const clause = imp.importClause;
+        if (clause === undefined)
+            return null;
         try {
-            type = escape(checker, type);
-            return {
-                type: explore({
-                    checker,
-                    generics,
-                    imports,
-                    type,
-                }),
-                imports: [...imports].map(([file, instances]) => ({
-                    file,
-                    instances: Array.from(instances),
-                })),
-            };
+            // no real position
+            // import statement generated by transformer like typia
+            imp.moduleSpecifier.getText();
         }
         catch (_a) {
-            return {
-                imports: [],
-                type: null,
-            };
+            return null;
+        }
+        const reflect = {
+            file: normalizePath(path_1.default.dirname(file.fileName), typescript_1.default.isStringLiteral(imp.moduleSpecifier)
+                ? imp.moduleSpecifier.text
+                : escapeQuotes(imp.moduleSpecifier.getText())),
+            elements: [],
+            default: null,
+            asterisk: null,
+        };
+        if (clause.name)
+            reflect.default = clause.name.getText();
+        if (clause.namedBindings === undefined)
+            return reflect;
+        else if (typescript_1.default.isNamedImports(clause.namedBindings))
+            reflect.elements = clause.namedBindings.elements.map((e) => e.name.getText());
+        else if (typescript_1.default.isNamespaceImport(clause.namedBindings))
+            reflect.asterisk = clause.namedBindings.name.getText();
+        return reflect;
+    })
+        .filter((r) => r !== null);
+    ImportAnalyzer.merge = (imports) => {
+        // group by files
+        const fileGroups = new Map();
+        for (const imp of imports) {
+            const array = MapUtil_1.MapUtil.take(fileGroups, imp.file, () => []);
+            array.push(imp);
         }
+        return Array.from(fileGroups.entries())
+            .map(([key, value]) => mergeGroup(key, value))
+            .flat();
     };
-    ImportAnalyzer.unique = (imports) => {
-        const map = new Map();
-        imports.forEach(({ file, instances }) => {
-            const set = MapUtil_1.MapUtil.take(map, file, () => new Set());
-            instances.forEach((instance) => set.add(instance));
-        });
-        return [...map].map(([file, instances]) => ({
+    function mergeGroup(file, imports) {
+        const allStarImports = Array.from(new Set(imports
+            .filter((imp) => imp.asterisk !== null)
+            .map((imp) => imp.asterisk)))
+            .sort()
+            .map((allStarImport) => ({
             file,
-            instances: Array.from(instances),
+            elements: [],
+            default: null,
+            asterisk: allStarImport,
         }));
-    };
-    /* ---------------------------------------------------------
-      TYPE
-    --------------------------------------------------------- */
-    const escape = (checker, type) => {
-        if (type.symbol && getNameOfSymbol(type.symbol) === "Promise") {
-            const generic = checker.getTypeArguments(type);
-            if (generic.length !== 1)
-                throw new Error("Error on ImportAnalyzer.analyze(): invalid promise type.");
-            type = generic[0];
-        }
-        return type;
-    };
-    const getNameOfSymbol = (symbol) => {
-        var _a, _b;
-        return exploreName(symbol.escapedName.toString(), (_b = (_a = symbol.getDeclarations()) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.parent);
-    };
-    /* ---------------------------------------------------------
-      ESCAPED TEXT WITH IMPORT STATEMENTS
-    --------------------------------------------------------- */
-    const explore = (props) => {
-        var _a, _b, _c, _d;
-        //----
-        // CONDITIONAL BRANCHES
-        //----
-        // DECOMPOSE GENERIC ARGUMENT
-        let type = props.type;
-        while (props.generics.has(type) === true)
-            type = props.generics.get(type);
-        // PRIMITIVE
-        const symbol = (_a = type.aliasSymbol) !== null && _a !== void 0 ? _a : type.symbol;
-        // UNION OR INTERSECT
-        if (type.aliasSymbol === undefined && type.isUnionOrIntersection()) {
-            const joiner = type.isIntersection() ? " & " : " | ";
-            return {
-                name: type.types
-                    .map((child) => explore(Object.assign(Object.assign({}, props), { type: child })))
-                    .map(getEscapedText)
-                    .join(joiner),
-            };
-        }
-        // NO SYMBOL
-        else if (symbol === undefined)
-            return {
-                name: props.checker.typeToString(type, undefined, typescript_1.default.TypeFormatFlags.NoTruncation),
-            };
-        //----
-        // SPECIALIZATION
-        //----
-        const name = getNameOfSymbol(symbol);
-        const sourceFile = (_c = (_b = symbol.declarations) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.getSourceFile();
-        if (sourceFile === undefined)
-            return { name };
-        else if (sourceFile.fileName.indexOf("typescript/lib") === -1) {
-            const set = MapUtil_1.MapUtil.take(props.imports, sourceFile.fileName, () => new Set());
-            set.add(name.split(".")[0]);
+        const defaultImports = Array.from(new Set(imports
+            .filter((imp) => imp.default !== null)
+            .map((imp) => imp.default)))
+            .sort()
+            .map((defaultImport) => ({
+            file,
+            elements: [],
+            default: defaultImport,
+            asterisk: null,
+        }));
+        const instances = new Set(imports.map((imp) => imp.elements).flat());
+        if (instances.size !== 0) {
+            if (defaultImports.length !== 0)
+                defaultImports[0].elements = Array.from(instances).sort();
+            else
+                defaultImports.push({
+                    file,
+                    elements: Array.from(instances).sort(),
+                    default: null,
+                    asterisk: null,
+                });
         }
-        // CHECK GENERIC
-        const generic = type.aliasSymbol
-            ? (_d = type.aliasTypeArguments) !== null && _d !== void 0 ? _d : []
-            : props.checker.getTypeArguments(type);
-        return generic.length
-            ? name === "Promise"
-                ? explore(Object.assign(Object.assign({}, props), { type: generic[0] }))
-                : {
-                    name,
-                    typeArguments: generic.map((child) => explore(Object.assign(Object.assign({}, props), { type: child }))),
-                }
-            : { name };
-    };
-    const exploreName = (name, decl) => decl && typescript_1.default.isModuleBlock(decl)
-        ? exploreName(`${decl.parent.name.getFullText().trim()}.${name}`, decl.parent.parent)
-        : name;
-    const getEscapedText = (type) => type.typeArguments
-        ? `${type.name}<${type.typeArguments.map(getEscapedText).join(", ")}>`
-        : type.name;
+        return [...allStarImports, ...defaultImports];
+    }
+    function escapeQuotes(str) {
+        if (str.startsWith("'") && str.endsWith("'"))
+            return str.slice(1, -1);
+        else if (str.startsWith('"') && str.endsWith('"'))
+            return str.slice(1, -1);
+        return str;
+    }
+    function normalizePath(root, str) {
+        if (str.startsWith("."))
+            return path_1.default.resolve(root, str);
+        return `node_modules/${str}`;
+    }
 })(ImportAnalyzer || (exports.ImportAnalyzer = ImportAnalyzer = {}));
 //# sourceMappingURL=ImportAnalyzer.js.map

package/lib/analyses/ImportAnalyzer.js.map

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

package/lib/analyses/ReflectHttpOperationAnalyzer.js

@@ -82,7 +82,7 @@ var ReflectHttpOperationAnalyzer;
                 errors,
             }),
             tags: (_a = Reflect.getMetadata("swagger/apiUseTags", props.function)) !== null && _a !== void 0 ? _a : [],
-            imports: ImportAnalyzer_1.ImportAnalyzer.unique([
+            imports: ImportAnalyzer_1.ImportAnalyzer.merge([
                 ...props.metadata.parameters
                     .filter((x) => parameters.some((y) => x.index === y.index))
                     .map((x) => x.imports),

package/lib/analyses/ReflectHttpOperationAnalyzer.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReflectHttpOperationAnalyzer.js","sourceRoot":"","sources":["../../src/analyses/ReflectHttpOperationAnalyzer.ts"],"names":[],"mappings":";;;AAAA,wDAA0E;AAC1E,+BAA8B;AAS9B,kDAA+C;AAC/C,qDAAkD;AAClD,iDAA8C;AAC9C,mGAAgG;AAChG,mGAAgG;AAChG,iGAA8F;AAC9F,uEAAoE;AAEpE,IAAiB,4BAA4B,CAwJ5C;AAxJD,WAAiB,4BAA4B;IAQ9B,oCAAO,GAAG,CAAC,KAAa,EAAgC,EAAE;;QACrE,IACE,qBAAS,CAAC,GAAG,CACX,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC,EACvC,yBAAa,EACb,2BAAe,CAChB,KAAK,KAAK;YAEX,OAAO,IAAI,CAAC;QAEd,MAAM,MAAM,GAA6B,EAAE,CAAC;QAC5C,MAAM,MAAM,GACV,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,2BAAe,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;QAChE,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAE9D,MAAM,UAAU,GACd,6EAAqC,CAAC,OAAO,CAAC;YAC5C,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,UAAU,EAAE,MAAM;YAClB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,YAAY,EAAE,KAAK,CAAC,IAAI;YACxB,MAAM;SACP,CAAC,CAAC;QACL,MAAM,OAAO,GAAwC,CAAC,GAAG,EAAE;YACzD,MAAM,WAAW,GAA6B,EAAE,CAAC;YACjD,MAAM,OAAO,GAAG,2EAAoC,CAAC,OAAO,CAAC;gBAC3D,UAAU,EAAE,KAAK,CAAC,UAAU;gBAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,YAAY,EAAE,KAAK,CAAC,IAAI;gBACxB,UAAU,EAAE,MAAM;gBAClB,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,MAAM;aACP,CAAC,CAAC;YACH,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;gBACvB,MAAM,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;gBAC5B,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,EAAE,CAAC;QACL,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;YACrC,OAAO,IAAI,CAAC;QACd,CAAC;aAAM,IAAI,OAAO,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAEzC,eAAe;QACf,MAAM,SAAS,GAA0B;YACvC,QAAQ,EAAE,MAAM;YAChB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,MAAM,EAAE,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;YAC1C,KAAK,EAAE,iDAAuB,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;gBAClE,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC;oBAC/B,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;wBAC1B,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,IAAI;wBAC3B,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI;wBAClC,QAAQ,EAAE,KAAK,CAAC,IAAI;wBACpB,IAAI,EAAE,EAAE;wBACR,QAAQ,EAAE,CAAC,+CAA+C,CAAC;qBAC5D,CAAC,CAAC;oBACH,OAAO,KAAK,CAAC;gBACf,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC;YACF,QAAQ,EAAE,iDAAuB,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC;YAC1D,UAAU;YACV,OAAO;YACP,QAAQ,EAAE,iDAAuB,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC;YAC5D,UAAU,EAAE,6EAAqC,CAAC,OAAO,CAAC;gBACxD,UAAU,EAAE,KAAK,CAAC,UAAU;gBAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,YAAY,EAAE,KAAK,CAAC,IAAI;gBACxB,UAAU,EAAE,MAAM;gBAClB,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,MAAM;aACP,CAAC;YACF,IAAI,EAAE,MAAA,OAAO,CAAC,WAAW,CAAC,oBAAoB,EAAE,KAAK,CAAC,QAAQ,CAAC,mCAAI,EAAE;YACrE,OAAO,EAAE,+BAAc,CAAC,MAAM,CAC5B;gBACE,GAAG,KAAK,CAAC,QAAQ,CAAC,UAAU;qBACzB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC;qBAC1D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;gBACxB,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO;gBACjC,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;aAClE,CAAC,IAAI,EAAE,CACT;YACD,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,WAAW;YACvC,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,SAAS;YACnC,WAAW,EAAE,MAAA,MAAA,KAAK,CAAC,QAAQ,CAAC,SAAS;iBAClC,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,aAAa,CAAC,0CACzC,IAAI,0CAAG,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAC5B,IAAI,EAAE;YACT,UAAU,EAAE,iDAAuB,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC;SAC/D,CAAC;QAEF,0BAA0B;QAC1B,KAAK,MAAM,kBAAkB,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK;YACrD,KAAK,MAAM,YAAY,IAAI,SAAS,CAAC,KAAK,EAAE,CAAC;gBAC3C,qBAAqB;gBACrB,MAAM,QAAQ,GAAW,2BAAY,CAAC,IAAI,CACxC,kBAAkB,EAClB,YAAY,CACb,CAAC;gBACF,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;oBAAE,SAAS;gBAErC,qBAAqB;gBACrB,MAAM,MAAM,GAAoB,2BAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;gBAClE,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;oBACpB,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;wBACxB,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,IAAI;wBAC3B,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI;wBAClC,QAAQ,EAAE,KAAK,CAAC,IAAI;wBACpB,IAAI,EAAE,cAAc;wBACpB,QAAQ,EAAE,CAAC,iBAAiB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC;qBACzD,CAAC,CAAC;oBACH,SAAS;gBACX,CAAC;gBACD,MAAM,UAAU,GAAa,SAAS,CAAC,UAAU;qBAC9C,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,KAAK,OAAO,CAAC;qBAC7C,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAM,CAAC;qBAC5B,IAAI,EAAE,CAAC;gBAEV,cAAc;gBACd,IAAI,aAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,UAAU,CAAC,KAAK,KAAK;oBACnD,MAAM,CAAC,IAAI,CAAC;wBACV,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,IAAI;wBAC3B,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI;wBAClC,QAAQ,EAAE,KAAK,CAAC,IAAI;wBACpB,IAAI,EAAE,cAAc;wBACpB,QAAQ,EAAE;4BACR,oHAAoH,MAAM,CAAC,IAAI,CAC7H,IAAI,CACL,mBAAmB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK;yBAC/C;qBACF,CAAC,CAAC;YACP,CAAC;QAEH,UAAU;QACV,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;YACrC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;AACJ,CAAC,EAxJgB,4BAA4B,4CAA5B,4BAA4B,QAwJ5C;AAED,+DAA+D;AAC/D,MAAM,OAAO,GAAG;IACd,KAAK;IACL,MAAM;IACN,KAAK;IACL,QAAQ;IACR,OAAO;IACP,KAAK;IACL,SAAS;IACT,MAAM;CACP,CAAC"}
+{"version":3,"file":"ReflectHttpOperationAnalyzer.js","sourceRoot":"","sources":["../../src/analyses/ReflectHttpOperationAnalyzer.ts"],"names":[],"mappings":"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"}

package/lib/analyses/ReflectWebSocketOperationAnalyzer.js

@@ -98,7 +98,7 @@ var ReflectWebSocketOperationAnalyzer;
             function: ctx.function,
             versions: ReflectMetadataAnalyzer_1.ReflectMetadataAnalyzer.versions(ctx.function),
             parameters,
-            imports: ImportAnalyzer_1.ImportAnalyzer.unique(imports),
+            imports: ImportAnalyzer_1.ImportAnalyzer.merge(imports),
             description: (_b = ctx.metadata.description) !== null && _b !== void 0 ? _b : null,
             jsDocTags: ctx.metadata.jsDocTags,
         };

package/lib/analyses/ReflectWebSocketOperationAnalyzer.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReflectWebSocketOperationAnalyzer.js","sourceRoot":"","sources":["../../src/analyses/ReflectWebSocketOperationAnalyzer.ts"],"names":[],"mappings":";;;AAAA,+BAA8B;AAQ9B,oDAAiD;AACjD,qDAAkD;AAClD,iDAA8C;AAC9C,uEAAoE;AAEpE,IAAiB,iCAAiC,CA8JjD;AA9JD,WAAiB,iCAAiC;IAQnC,yCAAO,GAAG,CAAC,GAAW,EAAqC,EAAE;;QACxE,MAAM,KAAK,GAAoC,OAAO,CAAC,WAAW,CAChE,uBAAuB,EACvB,GAAG,CAAC,QAAQ,CACb,CAAC;QACF,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAErC,iCAAiC;QACjC,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,MAAM,aAAa,GAEf,CAAC,MAAA,OAAO,CAAC,WAAW,CAClB,kCAAkC,EAClC,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,EAC9B,GAAG,CAAC,IAAI,CACT,mCAAI,EAAE,CACR,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,KAAK,UAAU,CAAC,KAAK,SAAS,CAAC;YACtE,MAAM,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;QACpE,IAAI,aAAa,CAAC,MAAM,KAAK,GAAG,CAAC,QAAQ,CAAC,MAAM;YAC9C,MAAM,CAAC,IAAI,CACT;gBACE,wCAAwC;gBACxC,gCAAgC;gBAChC,8BAA8B;gBAC9B,8BAA8B;gBAC9B,6BAA6B;gBAC7B,6BAA6B;aAC9B,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;QAEJ,MAAM,OAAO,GAAyB,EAAE,CAAC;QACzC,MAAM,UAAU,GAA0C,aAAa;aACpE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;;YACT,gBAAgB;YAChB,MAAM,OAAO,GACX,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC;YAE3D,qBAAqB;YACrB,IAAI,OAAO,KAAK,SAAS;gBACvB,OAAO,MAAM,CAAC,IAAI,CAChB,wCAAwC,CAAC,CAAC,KAAK,QAAQ,CACxD,CAAC;iBACC,IAAI,OAAO,CAAC,IAAI,KAAK,IAAI;gBAC5B,OAAO,MAAM,CAAC,IAAI,CAChB,+CAA+C,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAC/E,CAAC;iBACC,IACH,CAAC,CAAC,QAAQ,KAAK,OAAO;gBACtB,CAAC,CAAA,MAAC,CAAgD,CAAC,KAAK,0CAAE,MAAM,CAAA;gBAEhE,OAAO,MAAM,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAC;iBACnE,IACH,CAAC,CAAC,QAAQ,KAAK,UAAU;gBACzB,CAAA,MAAA,MAAA,OAAO,CAAC,IAAI,0CAAE,aAAa,0CAAE,MAAM,MAAK,CAAC;gBAEzC,OAAO,4DAA4D,CAAC;iBACjE,IACH,CAAC,CAAC,QAAQ,KAAK,QAAQ;gBACvB,CAAA,MAAA,MAAA,OAAO,CAAC,IAAI,0CAAE,aAAa,0CAAE,MAAM,MAAK,CAAC;gBAEzC,OAAO,MAAM,CAAC,IAAI,CAChB,uDAAuD,CACxD,CAAC;YAEJ,uBAAuB;YACvB,OAAO,CAAC,IAAI,CACV,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CACvB,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CACC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;gBAC5B,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC;oBAC7B,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC,CAC7C,CACJ,CACF,CAAC;YACF,IACE,CAAC,CAAC,QAAQ,KAAK,UAAU;gBACzB,CAAC,CAAC,QAAQ,KAAK,QAAQ;gBACvB,CAAC,CAAC,QAAQ,KAAK,OAAO;gBAEtB,uCACK,CAAC,KACJ,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,IAAI,EAAE,OAAO,CAAC,IAAI,IAClB;iBACC,IAAI,CAAC,CAAC,QAAQ,KAAK,OAAO;gBAC7B,OAAO,gCACF,CAAC,KACJ,QAAQ,EAAE,OAAO,EACjB,KAAK,EAAE,CAAC,CAAC,KAAM,EACf,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,OAAO,EAAE,OAAO,CAAC,OAAO,EACxB,WAAW,EAAE,OAAO,CAAC,WAAW,EAChC,SAAS,EAAE,OAAO,CAAC,SAAS,GACwB,CAAC;YACzD,kCAAkC;iBAC7B,CAAC;gBACJ,IAAI,CAAC,CAAC,QAAQ,KAAK,QAAQ;oBACzB,MAAM,CAAC,IAAI,CACT,mBAAmB,uBAAU,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,yEAAyE,CAC9H,CAAC;gBACJ,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,CAAC,EAA4C,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAEhE,MAAM,MAAM,GAAa,aAAa;aACnC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC;aACrC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,MAAA,CAAC,CAAC,KAAK,mCAAI,EAAE,CAAA,EAAA,CAAC;aACzB,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,CAAC,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,CAAA,CAAC;aACnD,IAAI,EAAE,CAAC;QACV,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,UAAU,CAAC,KAAK;YACrC,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBAC/B,MAAM,QAAQ,GAAW,2BAAY,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;gBACvD,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;oBAAE,SAAS;gBAErC,MAAM,MAAM,GAAoB,2BAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;gBAClE,IAAI,MAAM,KAAK,IAAI;oBACjB,MAAM,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;qBACvD,IAAI,aAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,MAAM,CAAC,KAAK,KAAK;oBACpD,MAAM,CAAC,IAAI,CACT,oHAAoH,MAAM,CAAC,IAAI,CAC7H,IAAI,CACL,mBAAmB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAC3C,CAAC;YACN,CAAC;QACH,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;gBACtB,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC,IAAI;gBACzB,KAAK,EAAE,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI;gBAChC,QAAQ,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI;gBAC3B,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,QAAQ,EAAE,MAAM;aACjB,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO;YACL,QAAQ,EAAE,WAAW;YACrB,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,QAAQ,EAAE,GAAG,CAAC,QAAQ;YACtB,QAAQ,EAAE,iDAAuB,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC;YACxD,UAAU;YACV,OAAO,EAAE,+BAAc,CAAC,MAAM,CAAC,OAAO,CAAC;YACvC,WAAW,EAAE,MAAA,GAAG,CAAC,QAAQ,CAAC,WAAW,mCAAI,IAAI;YAC7C,SAAS,EAAE,GAAG,CAAC,QAAQ,CAAC,SAAS;SAClC,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC,EA9JgB,iCAAiC,iDAAjC,iCAAiC,QA8JjD"}
+{"version":3,"file":"ReflectWebSocketOperationAnalyzer.js","sourceRoot":"","sources":["../../src/analyses/ReflectWebSocketOperationAnalyzer.ts"],"names":[],"mappings":"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"}

package/lib/generates/internal/E2eFileProgrammer.js

@@ -26,17 +26,11 @@ var E2eFileProgrammer;
     E2eFileProgrammer.generate = (project) => (props) => (route) => __awaiter(this, void 0, void 0, function* () {
         const importer = new ImportDictionary_1.ImportDictionary(`${props.current}/${getFunctionName(route)}.ts`);
         if (project.config.clone !== true)
-            for (const tuple of route.imports)
-                for (const instance of tuple.instances)
-                    importer.internal({
-                        file: tuple.file,
-                        type: true,
-                        instance,
-                    });
+            importer.declarations(route.imports);
         importer.internal({
-            type: false,
             file: props.api,
-            instance: null,
+            declaration: false,
+            type: "default",
             name: "api",
         });
         const functor = generateFunctor(project)(importer)(route);

package/lib/generates/internal/E2eFileProgrammer.js.map

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