npm - @tsoa-next/cli - Versions diffs - 8.0.1 → 8.0.2 - Mend

@tsoa-next/cli 8.0.1 → 8.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (77) hide show

package/dist/api.d.ts +2 -1
package/dist/api.js +171 -148
package/dist/api.js.map +1 -1
package/dist/cli.d.ts +1 -2
package/dist/cli.js +2 -1
package/dist/cli.js.map +1 -1
package/dist/metadataGeneration/controllerGenerator.js +10 -13
package/dist/metadataGeneration/controllerGenerator.js.map +1 -1
package/dist/metadataGeneration/exceptions.d.ts +3 -3
package/dist/metadataGeneration/exceptions.js +5 -12
package/dist/metadataGeneration/exceptions.js.map +1 -1
package/dist/metadataGeneration/extension.js +2 -2
package/dist/metadataGeneration/extension.js.map +1 -1
package/dist/metadataGeneration/initializer-value.js +90 -80
package/dist/metadataGeneration/initializer-value.js.map +1 -1
package/dist/metadataGeneration/metadataGenerator.js +20 -22
package/dist/metadataGeneration/metadataGenerator.js.map +1 -1
package/dist/metadataGeneration/methodGenerator.d.ts +1 -0
package/dist/metadataGeneration/methodGenerator.js +39 -27
package/dist/metadataGeneration/methodGenerator.js.map +1 -1
package/dist/metadataGeneration/parameterGenerator.d.ts +5 -0
package/dist/metadataGeneration/parameterGenerator.js +79 -90
package/dist/metadataGeneration/parameterGenerator.js.map +1 -1
package/dist/metadataGeneration/transformer/dateTransformer.js +3 -5
package/dist/metadataGeneration/transformer/dateTransformer.js.map +1 -1
package/dist/metadataGeneration/transformer/enumTransformer.d.ts +2 -0
package/dist/metadataGeneration/transformer/enumTransformer.js +34 -12
package/dist/metadataGeneration/transformer/enumTransformer.js.map +1 -1
package/dist/metadataGeneration/transformer/primitiveTransformer.js +2 -4
package/dist/metadataGeneration/transformer/primitiveTransformer.js.map +1 -1
package/dist/metadataGeneration/transformer/propertyTransformer.d.ts +1 -0
package/dist/metadataGeneration/transformer/propertyTransformer.js +14 -19
package/dist/metadataGeneration/transformer/propertyTransformer.js.map +1 -1
package/dist/metadataGeneration/transformer/referenceTransformer.d.ts +2 -0
package/dist/metadataGeneration/transformer/referenceTransformer.js +35 -18
package/dist/metadataGeneration/transformer/referenceTransformer.js.map +1 -1
package/dist/metadataGeneration/transformer/transformer.js +3 -4
package/dist/metadataGeneration/transformer/transformer.js.map +1 -1
package/dist/metadataGeneration/typeResolver.d.ts +79 -0
package/dist/metadataGeneration/typeResolver.js +906 -735
package/dist/metadataGeneration/typeResolver.js.map +1 -1
package/dist/module/generate-routes.d.ts +1 -2
package/dist/module/generate-routes.js +18 -17
package/dist/module/generate-routes.js.map +1 -1
package/dist/module/generate-spec.js +1 -3
package/dist/module/generate-spec.js.map +1 -1
package/dist/routeGeneration/defaultRouteGenerator.js +2 -2
package/dist/routeGeneration/defaultRouteGenerator.js.map +1 -1
package/dist/routeGeneration/routeGenerator.d.ts +2 -0
package/dist/routeGeneration/routeGenerator.js +20 -30
package/dist/routeGeneration/routeGenerator.js.map +1 -1
package/dist/swagger/specGenerator.js +1 -1
package/dist/swagger/specGenerator.js.map +1 -1
package/dist/swagger/specGenerator2.d.ts +12 -0
package/dist/swagger/specGenerator2.js +200 -170
package/dist/swagger/specGenerator2.js.map +1 -1
package/dist/swagger/specGenerator3.d.ts +17 -87
package/dist/swagger/specGenerator3.js +178 -172
package/dist/swagger/specGenerator3.js.map +1 -1
package/dist/utils/decoratorUtils.js +25 -32
package/dist/utils/decoratorUtils.js.map +1 -1
package/dist/utils/fs.d.ts +1 -1
package/dist/utils/fs.js +5 -5
package/dist/utils/fs.js.map +1 -1
package/dist/utils/headerTypeHelpers.js +2 -5
package/dist/utils/headerTypeHelpers.js.map +1 -1
package/dist/utils/importClassesFromDirectories.js +2 -2
package/dist/utils/importClassesFromDirectories.js.map +1 -1
package/dist/utils/jsDocUtils.js +4 -11
package/dist/utils/jsDocUtils.js.map +1 -1
package/dist/utils/pathUtils.js +2 -2
package/dist/utils/pathUtils.js.map +1 -1
package/dist/utils/swaggerUtils.js +7 -1
package/dist/utils/swaggerUtils.js.map +1 -1
package/dist/utils/validatorUtils.js +60 -97
package/dist/utils/validatorUtils.js.map +1 -1
package/package.json +2 -2

package/dist/metadataGeneration/parameterGenerator.js.map CHANGED Viewed

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

package/dist/metadataGeneration/transformer/dateTransformer.js CHANGED Viewed

@@ -8,13 +8,11 @@ class DateTransformer extends transformer_1.Transformer {
         if (!parentNode) {
             return { dataType: 'datetime' };
         }
-        const tags = (0, jsDocUtils_1.getJSDocTagNames)(parentNode).filter(name => {
-            return ['isDate', 'isDateTime'].some(m => m === name);
-        });
-        if (tags.length === 0) {
+        const tag = (0, jsDocUtils_1.getJSDocTagNames)(parentNode).find(name => ['isDate', 'isDateTime'].includes(name));
+        if (!tag) {
             return { dataType: 'datetime' };
         }
-        switch (tags[0]) {
+        switch (tag) {
             case 'isDate':
                 return { dataType: 'date' };
             case 'isDateTime':

package/dist/metadataGeneration/transformer/dateTransformer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"dateTransformer.js","sourceRoot":"","sources":["../../../src/metadataGeneration/transformer/dateTransformer.ts"],"names":[],"mappings":";;;AAGA,+CAA2C;AAC3C,uDAAyD;AAEzD,MAAa,eAAgB,SAAQ,yBAAW;IACvC,SAAS,CAAC,UAAiB;QAChC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAA;QACjC,CAAC;QACD,MAAM,~~IAAI~~,GAAG,IAAA,6BAAgB,EAAC,UAAU,CAAC,CAAC,~~MAAM~~,CAAC,IAAI,CAAC,EAAE~~;YACtD~~,~~OAAO~~,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,~~IAAI~~,CAAC,~~CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,~~IAAI,CAAC,~~CAAA;QACvD,~~CAAC,~~CAAC,~~CAAA;~~QAEF~~,IAAI,~~IAAI,~~CAAC,~~MAAM~~,~~KAAK,CAAC,~~EAAE,CAAC;~~YACtB~~,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAA;QACjC,CAAC;QACD,QAAQ,~~IAAI~~,~~CAAC,CAAC,CAAC,~~EAAE,CAAC;~~YAChB~~,KAAK,QAAQ;gBACX,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;YAC7B,KAAK,YAAY;gBACf,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAA;YACjC;gBACE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAA;QACnC,CAAC;IACH,CAAC;CACF;~~AArBD~~,~~0CAqBC~~"}
1	+ {"version":3,"file":"dateTransformer.js","sourceRoot":"","sources":["../../../src/metadataGeneration/transformer/dateTransformer.ts"],"names":[],"mappings":";;;AAGA,+CAA2C;AAC3C,uDAAyD;AAEzD,MAAa,eAAgB,SAAQ,yBAAW;IACvC,SAAS,CAAC,UAAiB;QAChC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAA;QACjC,CAAC;QACD,MAAM,GAAG,GAAG,IAAA,6BAAgB,EAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;QAE9F,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAA;QACjC,CAAC;QACD,QAAQ,GAAG,EAAE,CAAC;YACZ,KAAK,QAAQ;gBACX,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;YAC7B,KAAK,YAAY;gBACf,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAA;YACjC;gBACE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAA;QACnC,CAAC;IACH,CAAC;CACF;AAnBD,0CAmBC"}

package/dist/metadataGeneration/transformer/enumTransformer.d.ts CHANGED Viewed

@@ -9,4 +9,6 @@ export declare class EnumTransformer extends Transformer {
     transform(resolver: TypeResolver, declaration: EnumDeclaration | EnumMember, enumName: string): Tsoa.RefEnumType;
     private transformDeclaration;
     private transformMember;
+    private static mergeDescription;
+    private static mergeOptionalArray;
 }

package/dist/metadataGeneration/transformer/enumTransformer.js CHANGED Viewed

@@ -17,13 +17,13 @@ class EnumTransformer extends transformer_1.Transformer {
             return second;
         if (!second)
             return first;
-        const description = first.description ? (second.description ? `${first.description}\n${second.description}` : first.description) : second.description;
+        const description = this.mergeDescription(first.description, second.description);
         const deprecated = first.deprecated || second.deprecated;
-        const enums = first.enums ? (second.enums ? [...first.enums, ...second.enums] : first.enums) : second.enums;
-        const enumVarnames = first.enumVarnames ? (second.enumVarnames ? [...first.enumVarnames, ...second.enumVarnames] : first.enumVarnames) : second.enumVarnames;
-        const example = first.example || second.example;
-        const title = first.title || second.title;
-        return {
+        const enums = this.mergeOptionalArray(first.enums, second.enums);
+        const enumVarnames = this.mergeOptionalArray(first.enumVarnames, second.enumVarnames);
+        const example = first.example ?? second.example;
+        const title = first.title ?? second.title;
+        const merged = {
             dataType: 'refEnum',
             description,
             enums,
@@ -31,8 +31,11 @@ class EnumTransformer extends transformer_1.Transformer {
             refName: first.refName,
             deprecated,
             example,
-            ...(title && { title }),
         };
+        if (title !== undefined) {
+            merged.title = title;
+        }
+        return merged;
     }
     static transformable(declaration) {
         return (0, typescript_1.isEnumDeclaration)(declaration) || (0, typescript_1.isEnumMember)(declaration);
@@ -44,13 +47,11 @@ class EnumTransformer extends transformer_1.Transformer {
         return this.transformMember(resolver, declaration, enumName);
     }
     transformDeclaration(resolver, declaration, enumName) {
-        const isNotUndefined = (item) => {
-            return item === undefined ? false : true;
-        };
+        const isNotUndefined = (item) => item !== undefined;
         const enums = declaration.members.map(e => resolver.current.typeChecker.getConstantValue(e)).filter(isNotUndefined);
         const enumVarnames = declaration.members.map(e => e.name.getText()).filter(isNotUndefined);
         const title = resolver.getNodeTitle(declaration);
-        return {
+        const refEnum = {
             dataType: 'refEnum',
             description: resolver.getNodeDescription(declaration),
             example: resolver.getNodeExample(declaration),
@@ -58,8 +59,11 @@ class EnumTransformer extends transformer_1.Transformer {
             enumVarnames,
             refName: enumName,
             deprecated: (0, jsDocUtils_1.isExistJSDocTag)(declaration, tag => tag.tagName.text === 'deprecated'),
-            ...(title && { title }),
         };
+        if (title !== undefined) {
+            refEnum.title = title;
+        }
+        return refEnum;
     }
     transformMember(resolver, declaration, enumName) {
         return {
@@ -70,6 +74,24 @@ class EnumTransformer extends transformer_1.Transformer {
             deprecated: (0, jsDocUtils_1.isExistJSDocTag)(declaration, tag => tag.tagName.text === 'deprecated'),
         };
     }
+    static mergeDescription(first, second) {
+        if (first === undefined) {
+            return second;
+        }
+        if (second === undefined) {
+            return first;
+        }
+        return `${first}\n${second}`;
+    }
+    static mergeOptionalArray(first, second) {
+        if (first === undefined) {
+            return second;
+        }
+        if (second === undefined) {
+            return first;
+        }
+        return [...first, ...second];
+    }
 }
 exports.EnumTransformer = EnumTransformer;
 //# sourceMappingURL=enumTransformer.js.map

package/dist/metadataGeneration/transformer/enumTransformer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"enumTransformer.js","sourceRoot":"","sources":["../../../src/metadataGeneration/transformer/enumTransformer.ts"],"names":[],"mappings":";;;AACA,2CAA4D;AAG5D,+CAA2C;AAC3C,uDAAwD;AAGxD,MAAa,eAAgB,SAAQ,yBAAW;IACvC,MAAM,CAAC,SAAS,CAAC,IAAwB;QAC9C,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;YACrC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QACtC,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,KAAuB,EAAE,MAAwB;QACnE,IAAI,CAAC,KAAK;YAAE,OAAO,MAAM,CAAA;QACzB,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAA;QAEzB,MAAM,WAAW,GAAG,~~KAAK~~,CAAC,~~WAAW~~,CAAC,~~CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,~~KAAK,CAAC,WAAW,~~KAAK~~,MAAM,CAAC,WAAW,~~EAAE,~~CAAC,~~CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,~~CAAA;~~QAErJ~~,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,CAAA;~~QAExD~~,MAAM,KAAK,GAAG,~~KAAK~~,CAAC,~~KAAK~~,CAAC,~~CAAC,CAAC,CAAC,MAAM,CAAC,~~KAAK,CAAC,~~CAAC,CAAC,CAAC,GAAG,~~KAAK,~~CAAC,KAAK,~~EAAE,~~GAAG,~~MAAM,CAAC,KAAK,~~CAAC~~,~~CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,~~CAAA;~~QAE3G~~,MAAM,YAAY,GAAG,~~KAAK~~,CAAC,~~YAAY~~,CAAC,~~CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,GAAG,~~KAAK,CAAC,YAAY,EAAE,~~GAAG,~~MAAM,CAAC,YAAY,CAAC,~~CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,YAAY,~~CAAA;~~QAE5J~~,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAA;QAC/C,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAA;~~QAEzC~~,~~OAAO~~;~~YACL~~,QAAQ,EAAE,SAAS;YACnB,WAAW;YACX,KAAK;YACL,YAAY;YACZ,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,UAAU;YACV,OAAO;~~YACP~~,~~GAAG~~,~~CAAC~~,KAAK,~~IAAI~~,EAAE,KAAK,~~EAAE~~,CAAC;~~SACxB~~,CAAA;~~IACH~~,CAAC;IAEM,MAAM,CAAC,aAAa,CAAC,WAAiB;QAC3C,OAAO,IAAA,8BAAiB,EAAC,WAAW,CAAC,IAAI,IAAA,yBAAY,EAAC,WAAW,CAAC,CAAA;IACpE,CAAC;IAEM,SAAS,CAAC,QAAsB,EAAE,WAAyC,EAAE,QAAgB;QAClG,IAAI,IAAA,8BAAiB,EAAC,WAAW,CAAC,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC,oBAAoB,CAAC,QAAQ,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAA;QACnE,CAAC;QACD,OAAO,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAA;IAC9D,CAAC;IAEO,oBAAoB,CAAC,QAAsB,EAAE,WAA4B,EAAE,QAAgB;QACjG,MAAM,cAAc,GAAG,CAAI,IAAO,EAAiC,EAAE~~;YACnE~~,~~OAAO~~,IAAI,KAAK,SAAS,~~CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,~~CAAA;~~QAC1C~~,~~CAAC,CAAA;QACD,~~MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;QACnH,MAAM,YAAY,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAA;QAC1F,MAAM,KAAK,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,CAAC,CAAA;~~QAEhD~~,OAAO;~~YACL~~,QAAQ,EAAE,SAAS;YACnB,WAAW,EAAE,QAAQ,CAAC,kBAAkB,CAAC,WAAW,CAAC;YACrD,OAAO,EAAE,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC;YAC7C,KAAK;YACL,YAAY;YACZ,OAAO,EAAE,QAAQ;YACjB,UAAU,EAAE,IAAA,4BAAe,EAAC,WAAW,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,YAAY,CAAC;~~YAClF~~,~~GAAG~~,~~CAAC~~,KAAK,~~IAAI~~,EAAE,KAAK,~~EAAE~~,CAAC;~~SACxB~~,CAAA;~~IACH~~,CAAC;IAEO,eAAe,CAAC,QAAsB,EAAE,WAAuB,EAAE,QAAgB;QACvF,OAAO;YACL,QAAQ,EAAE,SAAS;YACnB,OAAO,EAAE,QAAQ;YACjB,KAAK,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,WAAW,CAAE,CAAC;YACpE,YAAY,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAC1C,UAAU,EAAE,IAAA,4BAAe,EAAC,WAAW,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,YAAY,CAAC;SACnF,CAAA;IACH,CAAC;CACF;~~AA5ED~~,~~0CA4EC~~"}
1	+ {"version":3,"file":"enumTransformer.js","sourceRoot":"","sources":["../../../src/metadataGeneration/transformer/enumTransformer.ts"],"names":[],"mappings":"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"}

package/dist/metadataGeneration/transformer/primitiveTransformer.js CHANGED Viewed

@@ -49,10 +49,8 @@ class PrimitiveTransformer extends transformer_1.Transformer {
         if (!partentJsDocTagNames || partentJsDocTagNames.length === 0) {
             return { dataType: defaultNumberType };
         }
-        const tags = partentJsDocTagNames.filter(name => {
-            return ['isInt', 'isLong', 'isFloat', 'isDouble'].some(m => m === name);
-        });
-        switch (tags[0]) {
+        const tag = partentJsDocTagNames.find(name => ['isInt', 'isLong', 'isFloat', 'isDouble'].includes(name));
+        switch (tag) {
             case 'isInt':
                 return { dataType: 'integer' };
             case 'isLong':

package/dist/metadataGeneration/transformer/primitiveTransformer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"primitiveTransformer.js","sourceRoot":"","sources":["../../../src/metadataGeneration/transformer/primitiveTransformer.ts"],"names":[],"mappings":";;;AAAA,2CAAsD;AACtD,gDAAsD;AAEtD,+CAA2C;AAE3C,MAAa,oBAAqB,SAAQ,yBAAW;IAC5C,MAAM,CAAC,sBAAsB,CAAC,UAAsB;QACzD,QAAQ,UAAU,EAAE,CAAC;YACnB,KAAK,uBAAU,CAAC,aAAa;gBAC3B,OAAO,QAAQ,CAAA;YACjB,KAAK,uBAAU,CAAC,aAAa;gBAC3B,OAAO,QAAQ,CAAA;YACjB,KAAK,uBAAU,CAAC,cAAc;gBAC5B,OAAO,SAAS,CAAA;YAClB,KAAK,uBAAU,CAAC,WAAW;gBACzB,OAAO,MAAM,CAAA;YACf,KAAK,uBAAU,CAAC,gBAAgB;gBAC9B,OAAO,WAAW,CAAA;YACpB,KAAK,uBAAU,CAAC,WAAW;gBACzB,OAAO,MAAM,CAAA;YACf;gBACE,OAAO,SAAS,CAAA;QACpB,CAAC;IACH,CAAC;IAEM,SAAS,CAAC,iBAAoC,EAAE,QAAkB,EAAE,oBAA+B;QACxG,MAAM,YAAY,GAAG,oBAAoB,CAAC,sBAAsB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAC/E,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAM;QACR,CAAC;QAED,QAAQ,YAAY,EAAE,CAAC;YACrB,KAAK,QAAQ;gBACX,OAAO,IAAI,CAAC,eAAe,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CAAA;YACtE,KAAK,QAAQ,CAAC;YACd,KAAK,SAAS,CAAC;YACf,KAAK,MAAM,CAAC;YACZ,KAAK,WAAW;gBACd,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAA;YACnC,KAAK,MAAM;gBACT,OAAO;oBACL,QAAQ,EAAE,MAAM;oBAChB,KAAK,EAAE,CAAC,IAAI,CAAC;iBACd,CAAA;YACH;gBACE,OAAO,IAAA,qBAAW,EAAC,YAAY,CAAC,CAAA;QACpC,CAAC;IACH,CAAC;IAEO,eAAe,CAAC,iBAAoC,EAAE,oBAA+B;QAC3F,IAAI,CAAC,oBAAoB,IAAI,oBAAoB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/D,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAA;QACxC,CAAC;QAED,MAAM,~~IAAI~~,GAAG,oBAAoB,CAAC,~~MAAM~~,CAAC,IAAI,CAAC,EAAE~~;YAC9C~~,~~OAAO~~,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,~~IAAI~~,CAAC,~~CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,~~IAAI,CAAC,~~CAAA;QACzE,~~CAAC,~~CAAC,~~CAAA;~~QAEF~~,QAAQ,~~IAAI~~,~~CAAC,CAAC,CAAC,~~EAAE,CAAC;~~YAChB~~,KAAK,OAAO;gBACV,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAA;YAChC,KAAK,QAAQ;gBACX,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;YAC7B,KAAK,SAAS;gBACZ,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAA;YAC9B,KAAK,UAAU;gBACb,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAA;YAC/B;gBACE,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAA;QAC1C,CAAC;IACH,CAAC;CACF;~~AAlED~~,~~oDAkEC~~"}
1	+ {"version":3,"file":"primitiveTransformer.js","sourceRoot":"","sources":["../../../src/metadataGeneration/transformer/primitiveTransformer.ts"],"names":[],"mappings":";;;AAAA,2CAAsD;AACtD,gDAAsD;AAEtD,+CAA2C;AAE3C,MAAa,oBAAqB,SAAQ,yBAAW;IAC5C,MAAM,CAAC,sBAAsB,CAAC,UAAsB;QACzD,QAAQ,UAAU,EAAE,CAAC;YACnB,KAAK,uBAAU,CAAC,aAAa;gBAC3B,OAAO,QAAQ,CAAA;YACjB,KAAK,uBAAU,CAAC,aAAa;gBAC3B,OAAO,QAAQ,CAAA;YACjB,KAAK,uBAAU,CAAC,cAAc;gBAC5B,OAAO,SAAS,CAAA;YAClB,KAAK,uBAAU,CAAC,WAAW;gBACzB,OAAO,MAAM,CAAA;YACf,KAAK,uBAAU,CAAC,gBAAgB;gBAC9B,OAAO,WAAW,CAAA;YACpB,KAAK,uBAAU,CAAC,WAAW;gBACzB,OAAO,MAAM,CAAA;YACf;gBACE,OAAO,SAAS,CAAA;QACpB,CAAC;IACH,CAAC;IAEM,SAAS,CAAC,iBAAoC,EAAE,QAAkB,EAAE,oBAA+B;QACxG,MAAM,YAAY,GAAG,oBAAoB,CAAC,sBAAsB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAC/E,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAM;QACR,CAAC;QAED,QAAQ,YAAY,EAAE,CAAC;YACrB,KAAK,QAAQ;gBACX,OAAO,IAAI,CAAC,eAAe,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CAAA;YACtE,KAAK,QAAQ,CAAC;YACd,KAAK,SAAS,CAAC;YACf,KAAK,MAAM,CAAC;YACZ,KAAK,WAAW;gBACd,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAA;YACnC,KAAK,MAAM;gBACT,OAAO;oBACL,QAAQ,EAAE,MAAM;oBAChB,KAAK,EAAE,CAAC,IAAI,CAAC;iBACd,CAAA;YACH;gBACE,OAAO,IAAA,qBAAW,EAAC,YAAY,CAAC,CAAA;QACpC,CAAC;IACH,CAAC;IAEO,eAAe,CAAC,iBAAoC,EAAE,oBAA+B;QAC3F,IAAI,CAAC,oBAAoB,IAAI,oBAAoB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/D,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAA;QACxC,CAAC;QAED,MAAM,GAAG,GAAG,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;QAExG,QAAQ,GAAG,EAAE,CAAC;YACZ,KAAK,OAAO;gBACV,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAA;YAChC,KAAK,QAAQ;gBACX,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAA;YAC7B,KAAK,SAAS;gBACZ,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAA;YAC9B,KAAK,UAAU;gBACb,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAA;YAC/B;gBACE,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAA;QAC1C,CAAC;IACH,CAAC;CACF;AAhED,oDAgEC"}

package/dist/metadataGeneration/transformer/propertyTransformer.d.ts CHANGED Viewed

@@ -8,5 +8,6 @@ export declare class PropertyTransformer extends Transformer {
     transform(resolver: TypeResolver, node: InterfaceDeclaration | ClassDeclaration, overrideToken?: OverrideToken): Tsoa.Property[];
     private propertyFromSignature;
     private propertyFromDeclaration;
+    private resolveRequiredState;
 }
 export {};

package/dist/metadataGeneration/transformer/propertyTransformer.js CHANGED Viewed

@@ -30,7 +30,7 @@ class PropertyTransformer extends transformer_1.Transformer {
             }
         }
         const classConstructor = node.members.find(member => (0, typescript_1.isConstructorDeclaration)(member));
-        if (classConstructor && classConstructor.parameters) {
+        if (classConstructor?.parameters) {
             const constructorProperties = classConstructor.parameters.filter(parameter => this.isAccessibleParameter(parameter));
             properties.push(...constructorProperties);
         }
@@ -38,13 +38,7 @@ class PropertyTransformer extends transformer_1.Transformer {
     }
     propertyFromSignature(resolver, propertySignature, overrideToken) {
         (0, flowUtils_1.throwUnless)(propertySignature.type, new exceptions_1.GenerateMetadataError(`No valid type found for property declaration.`));
-        let required = !propertySignature.questionToken;
-        if (overrideToken && overrideToken.kind === typescript_1.SyntaxKind.MinusToken) {
-            required = true;
-        }
-        else if (overrideToken && overrideToken.kind === typescript_1.SyntaxKind.QuestionToken) {
-            required = false;
-        }
+        const required = this.resolveRequiredState(!propertySignature.questionToken, overrideToken);
         const def = typeResolver_1.TypeResolver.getDefault(propertySignature);
         const property = {
             default: def,
@@ -64,18 +58,10 @@ class PropertyTransformer extends transformer_1.Transformer {
     propertyFromDeclaration(resolver, propertyDeclaration, overrideToken) {
         let typeNode = propertyDeclaration.type;
         const tsType = resolver.current.typeChecker.getTypeAtLocation(propertyDeclaration);
-        if (!typeNode) {
-            // Type is from initializer
-            typeNode = resolver.current.typeChecker.typeToTypeNode(tsType, undefined, typescript_1.NodeBuilderFlags.NoTruncation);
-        }
+        // Type is from initializer
+        typeNode ??= resolver.current.typeChecker.typeToTypeNode(tsType, undefined, typescript_1.NodeBuilderFlags.NoTruncation);
         const type = new typeResolver_1.TypeResolver(typeNode, resolver.current, propertyDeclaration, resolver.context, tsType).resolve();
-        let required = !propertyDeclaration.questionToken && !propertyDeclaration.initializer;
-        if (overrideToken && overrideToken.kind === typescript_1.SyntaxKind.MinusToken) {
-            required = true;
-        }
-        else if (overrideToken && overrideToken.kind === typescript_1.SyntaxKind.QuestionToken) {
-            required = false;
-        }
+        const required = this.resolveRequiredState(!propertyDeclaration.questionToken && !propertyDeclaration.initializer, overrideToken);
         let def = (0, initializer_value_1.getInitializerValue)(propertyDeclaration.initializer, resolver.current.typeChecker);
         if (def === undefined) {
             def = typeResolver_1.TypeResolver.getDefault(propertyDeclaration);
@@ -97,6 +83,15 @@ class PropertyTransformer extends transformer_1.Transformer {
         };
         return property;
     }
+    resolveRequiredState(required, overrideToken) {
+        if (overrideToken?.kind === typescript_1.SyntaxKind.MinusToken) {
+            return true;
+        }
+        if (overrideToken?.kind === typescript_1.SyntaxKind.QuestionToken) {
+            return false;
+        }
+        return required;
+    }
 }
 exports.PropertyTransformer = PropertyTransformer;
 //# sourceMappingURL=propertyTransformer.js.map

package/dist/metadataGeneration/transformer/propertyTransformer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"propertyTransformer.js","sourceRoot":"","sources":["../../../src/metadataGeneration/transformer/propertyTransformer.ts"],"names":[],"mappings":";;;AACA,2CAAkK;AAGlK,+CAA2C;AAC3C,8CAAqD;AACrD,kDAA8C;AAC9C,4DAA0D;AAC1D,+DAAkE;AAClE,uDAAwD;AACxD,+DAAwD;AACxD,qDAAmD;AAInD,MAAa,mBAAoB,SAAQ,yBAAW;IAC3C,SAAS,CAAC,QAAsB,EAAE,IAA6C,EAAE,aAA6B;QACnH,MAAM,SAAS,GAAG,CAAC,CAA6B,EAAE,EAAE;YAClD,IAAI,MAAM,GAAG,IAAA,4BAAe,EAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;YACrE,MAAM,GAAG,MAAM,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,sBAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAA;YAC7D,OAAO,MAAM,CAAA;QACf,CAAC,CAAA;QAED,kBAAkB;QAClB,IAAI,IAAA,mCAAsB,EAAC,IAAI,CAAC,EAAE,CAAC;YACjC,OAAO,IAAI,CAAC,OAAO;iBAChB,MAAM,CAAC,CAAC,MAAM,EAA+B,EAAE,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,IAAA,gCAAmB,EAAC,MAAM,CAAC,CAAC;iBAClG,GAAG,CAAC,CAAC,MAAyB,EAAE,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,CAAA;QACpG,CAAC;QAED,MAAM,UAAU,GAAsD,EAAE,CAAA;QACxE,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YAClC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,IAAA,kCAAqB,EAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC7H,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACzB,CAAC;QACH,CAAC;QAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,IAAA,qCAAwB,EAAC,MAAM,CAAC,~~CAA2B~~,CAAA;~~QAEhH~~,IAAI,gBAAgB,~~IAAI~~,~~gBAAgB,CAAC,~~UAAU,EAAE,CAAC;~~YACpD~~,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAA;YAEpH,UAAU,CAAC,IAAI,CAAC,GAAG,qBAAqB,CAAC,CAAA;QAC3C,CAAC;QAED,OAAO,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,QAAQ,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAA;IACpG,CAAC;IAEO,qBAAqB,CAAC,QAAsB,EAAE,iBAAoC,EAAE,aAA6B;QACvH,IAAA,uBAAW,EAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,kCAAqB,CAAC,+CAA+C,CAAC,CAAC,CAAA;QAE/G,~~IAAI~~,QAAQ,GAAG,~~CAAC,iBAAiB,CAAC,aAAa,CAAA;QAC/C,~~IAAI,~~aAAa,IAAI,aAAa,~~CAAC,~~IAAI~~,~~KAAK,uBAAU,~~CAAC,~~UAAU,EAAE,~~CAAC~~;YAClE~~,~~QAAQ~~,~~GAAG,IAAI,CAAA;QACjB,~~CAAC~~;aAAM~~,~~IAAI,~~aAAa,~~IAAI~~,aAAa,CAAC,~~IAAI,KAAK,uBAAU,CAAC,aAAa,EAAE,CAAC;YAC5E,QAAQ,GAAG,KAAK,~~CAAA;~~QAClB~~,~~CAAC;QAED,~~MAAM,GAAG,GAAG,2BAAY,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAA;QAEtD,MAAM,QAAQ,GAAkB;YAC9B,OAAO,EAAE,GAAG;YACZ,WAAW,EAAE,QAAQ,CAAC,kBAAkB,CAAC,iBAAiB,CAAC;YAC3D,OAAO,EAAE,QAAQ,CAAC,cAAc,CAAC,iBAAiB,CAAC;YACnD,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,iBAAiB,CAAC;YACjD,IAAI,EAAE,QAAQ,CAAC,eAAe,CAAC,iBAAiB,CAAC;YACjD,QAAQ;YACR,IAAI,EAAE,IAAI,2BAAY,CAAC,iBAAiB,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE;YAC3H,UAAU,EAAE,IAAA,sCAAqB,EAAC,iBAAiB,CAAC,IAAI,EAAE;YAC1D,UAAU,EAAE,IAAA,4BAAe,EAAC,iBAAiB,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,YAAY,CAAC;YACxF,KAAK,EAAE,QAAQ,CAAC,YAAY,CAAC,iBAAiB,CAAC;YAC/C,UAAU,EAAE,QAAQ,CAAC,gBAAgB,CAAC,iBAAiB,CAAC;SACzD,CAAA;QACD,OAAO,QAAQ,CAAA;IACjB,CAAC;IAEO,uBAAuB,CAAC,QAAsB,EAAE,mBAA+D,EAAE,aAA6B;QACpJ,IAAI,QAAQ,GAAG,mBAAmB,CAAC,IAAI,CAAA;QAEvC,MAAM,MAAM,GAAG,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,CAAA;QAElF,~~IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,~~2BAA2B;~~YAC3B~~,QAAQ,~~GAAG~~,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,6BAAgB,CAAC,YAAY,CAAE,CAAA;~~QAC3G~~,~~CAAC;QAED,~~MAAM,IAAI,GAAG,IAAI,2BAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,OAAO,EAAE,mBAAmB,EAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,OAAO,EAAE,CAAA;QAElH,~~IAAI~~,QAAQ,GAAG,CAAC,~~mBAAmB~~,CAAC,~~aAAa,IAAI,~~CAAC,mBAAmB,CAAC,~~WAAW,CAAA;QACrF,IAAI,~~aAAa,IAAI,~~aAAa,~~CAAC,~~IAAI~~,~~KAAK,uBAAU,~~CAAC,~~UAAU~~,EAAE,~~CAAC;YAClE,QAAQ,GAAG,IAAI,CAAA;QACjB,CAAC;aAAM,IAAI,~~aAAa,~~IAAI,aAAa,~~CAAC,~~IAAI,KAAK,uBAAU,CAAC,aAAa,EAAE,CAAC;YAC5E,QAAQ,GAAG,KAAK,~~CAAA;~~QAClB~~,~~CAAC;QACD,~~IAAI,GAAG,GAAY,IAAA,uCAAmB,EAAC,mBAAmB,CAAC,WAAW,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QACrG,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACtB,GAAG,GAAG,2BAAY,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAA;QACpD,CAAC;QAED,MAAM,QAAQ,GAAkB;YAC9B,OAAO,EAAE,GAAG;YACZ,WAAW,EAAE,QAAQ,CAAC,kBAAkB,CAAC,mBAAmB,CAAC;YAC7D,OAAO,EAAE,QAAQ,CAAC,cAAc,CAAC,mBAAmB,CAAC;YACrD,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,mBAAmB,CAAC;YACnD,IAAI,EAAE,QAAQ,CAAC,eAAe,CAAC,mBAAmB,CAAC;YACnD,QAAQ;YACR,IAAI;YACJ,UAAU,EAAE,IAAA,sCAAqB,EAAC,mBAAmB,CAAC,IAAI,EAAE;YAC5D,yGAAyG;YACzG,UAAU,EACR,IAAA,4BAAe,EAAC,mBAAmB,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,YAAY,CAAC;gBAC9E,IAAA,4BAAW,EAAC,mBAAmB,EAAE,CAAC,WAAW,EAAE,aAAa,EAAE,EAAE,CAAC,aAAa,KAAK,YAAY,EAAE,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC;YAChI,KAAK,EAAE,QAAQ,CAAC,YAAY,CAAC,mBAAmB,CAAC;YACjD,UAAU,EAAE,QAAQ,CAAC,gBAAgB,CAAC,mBAAmB,CAAC;SAC3D,CAAA;QACD,OAAO,QAAQ,CAAA;IACjB,CAAC;CACF;AAtGD,kDAsGC"}
1	+ {"version":3,"file":"propertyTransformer.js","sourceRoot":"","sources":["../../../src/metadataGeneration/transformer/propertyTransformer.ts"],"names":[],"mappings":"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"}

package/dist/metadataGeneration/transformer/referenceTransformer.d.ts CHANGED Viewed

@@ -7,4 +7,6 @@ export declare class ReferenceTransformer extends Transformer {
     static mergeManyRefObj(many: Tsoa.RefObjectType[]): Tsoa.RefObjectType;
     static mergeRefObj(first: Tsoa.RefObjectType, second: Tsoa.RefObjectType): Tsoa.RefObjectType;
     transform(declaration: TypeAliasDeclaration, refTypeName: string, resolver: TypeResolver, referencer?: Type): Tsoa.ReferenceType;
+    private static mergeDescription;
+    private static mergeAdditionalProperties;
 }

package/dist/metadataGeneration/transformer/referenceTransformer.js CHANGED Viewed

@@ -33,32 +33,24 @@ class ReferenceTransformer extends transformer_1.Transformer {
         return merged;
     }
     static mergeRefObj(first, second) {
-        const description = first.description ? (second.description ? `${first.description}\n${second.description}` : first.description) : second.description;
+        const description = this.mergeDescription(first.description, second.description);
         const deprecated = first.deprecated || second.deprecated;
-        const example = first.example || second.example;
+        const example = first.example ?? second.example;
         const properties = [...first.properties, ...second.properties.filter(prop => first.properties.every(firstProp => firstProp.name !== prop.name))];
-        const mergeAdditionalTypes = (first, second) => {
-            return {
-                dataType: 'union',
-                types: [first, second],
-            };
-        };
-        const additionalProperties = first.additionalProperties
-            ? second.additionalProperties
-                ? mergeAdditionalTypes(first.additionalProperties, second.additionalProperties)
-                : first.additionalProperties
-            : second.additionalProperties;
-        const title = first.title || second.title;
+        const additionalProperties = this.mergeAdditionalProperties(first.additionalProperties, second.additionalProperties);
+        const title = first.title ?? second.title;
         const result = {
             dataType: 'refObject',
             description,
             properties,
-            additionalProperties,
+            additionalProperties: additionalProperties,
             refName: first.refName,
             deprecated,
             example,
-            ...(title && { title }),
         };
+        if (title !== undefined) {
+            result.title = title;
+        }
         return result;
     }
     transform(declaration, refTypeName, resolver, referencer) {
@@ -73,11 +65,36 @@ class ReferenceTransformer extends transformer_1.Transformer {
             format: resolver.getNodeFormat(declaration),
             type: new typeResolver_1.TypeResolver(declaration.type, resolver.current, declaration, resolver.context, resolver.referencer || referencer).resolve(),
             validators: (0, validatorUtils_1.getPropertyValidators)(declaration) || {},
-            ...(example !== undefined ? { example } : {}),
-            ...(title !== undefined ? { title } : {}),
         };
+        if (example !== undefined) {
+            referenceType.example = example;
+        }
+        if (title !== undefined) {
+            referenceType.title = title;
+        }
         return referenceType;
     }
+    static mergeDescription(first, second) {
+        if (first === undefined) {
+            return second;
+        }
+        if (second === undefined) {
+            return first;
+        }
+        return `${first}\n${second}`;
+    }
+    static mergeAdditionalProperties(first, second) {
+        if (!first) {
+            return second;
+        }
+        if (!second) {
+            return first;
+        }
+        return {
+            dataType: 'union',
+            types: [first, second],
+        };
+    }
 }
 exports.ReferenceTransformer = ReferenceTransformer;
 //# sourceMappingURL=referenceTransformer.js.map

package/dist/metadataGeneration/transformer/referenceTransformer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"referenceTransformer.js","sourceRoot":"","sources":["../../../src/metadataGeneration/transformer/referenceTransformer.ts"],"names":[],"mappings":";;;AAGA,+CAA2C;AAC3C,uDAAmD;AACnD,kDAA8C;AAC9C,8CAAqD;AACrD,+DAAkE;AAClE,uDAAwD;AAExD,MAAa,oBAAqB,SAAQ,yBAAW;IAC5C,MAAM,CAAC,KAAK,CAAC,cAAoC;QACtD,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,MAAM,IAAI,kCAAqB,CAAC,0CAA0C,CAAC,CAAA;QAC7E,CAAC;QAED,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,OAAO,cAAc,CAAC,CAAC,CAAC,CAAA;QAC1B,CAAC;QAED,IAAI,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC,EAAE,CAAC;YACpE,qEAAqE;YACrE,OAAO,iCAAe,CAAC,SAAS,CAAC,cAAoC,CAAC,CAAA;QACxE,CAAC;QAED,IAAI,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,QAAQ,KAAK,WAAW,CAAC,EAAE,CAAC;YACtE,qEAAqE;YACrE,OAAO,IAAI,CAAC,eAAe,CAAC,cAAsC,CAAC,CAAA;QACrE,CAAC;QAED,MAAM,IAAI,kCAAqB,CAAC,oDAAoD,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,CAAA;IACvH,CAAC;IAEM,MAAM,CAAC,eAAe,CAAC,IAA0B;QACtD,IAAI,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC;YACrC,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QAC5C,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,MAAM,CAAC,WAAW,CAAC,KAAyB,EAAE,MAA0B;QAC7E,MAAM,WAAW,GAAG,~~KAAK~~,CAAC,~~WAAW~~,CAAC,~~CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,~~KAAK,CAAC,WAAW,~~KAAK~~,MAAM,CAAC,WAAW,~~EAAE,~~CAAC,~~CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,~~CAAA;~~QAErJ~~,MAAM,UAAU,GAAG,KAAK,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,CAAA;QACxD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAA;QAE/C,MAAM,UAAU,GAAG,CAAC,GAAG,KAAK,CAAC,UAAU,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;~~QAEhJ~~,MAAM,oBAAoB,GAAG,~~CAAC~~,~~KAAgB,EAAE,MAAiB,EAAa,EAAE;YAC9E,OAAO;gBACL,QAAQ,EAAE,OAAO;gBACjB,KAAK,EAAE,~~CAAC,~~KAAK~~,~~EAAE,MAAM,~~CAAC~~;aACvB~~,~~CAAA;QACH,CAAC,CAAA;QAED,MAAM,oBAAoB,GAAG,~~KAAK,CAAC,~~oBAAoB;YACrD~~,~~CAAC,CAAC,MAAM,CAAC,oBAAoB;gBAC3B,CAAC,CAAC,oBAAoB,CAAC,KAAK,CAAC,oBAAoB,~~EAAE,MAAM,CAAC,~~oBAAoB~~,CAAC~~;gBAC/E~~,~~CAAC,CAAC,KAAK,CAAC,oBAAoB;YAC9B,CAAC,CAAC,MAAM,CAAC,oBAAoB,~~CAAA;~~QAE/B~~,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAA;QACzC,MAAM,MAAM,GAAuB;YACjC,QAAQ,EAAE,WAAW;YACrB,WAAW;YACX,UAAU;YACV,oBAAoB;~~YACpB~~,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,UAAU;YACV,OAAO;~~YACP~~,~~GAAG~~,~~CAAC~~,KAAK,~~IAAI~~,~~EAAE~~,~~KAAK,~~EAAE,CAAC;~~SACxB~~,CAAA;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAEM,SAAS,CAAC,WAAiC,EAAE,WAAmB,EAAE,QAAsB,EAAE,UAAiB;QAChH,MAAM,OAAO,GAAG,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,CAAA;~~QAEpD~~,MAAM,KAAK,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,CAAC,CAAA;QAChD,MAAM,aAAa,GAAuB;YACxC,QAAQ,EAAE,UAAU;YACpB,OAAO,EAAE,2BAAY,CAAC,UAAU,CAAC,WAAW,CAAC;YAC7C,WAAW,EAAE,QAAQ,CAAC,kBAAkB,CAAC,WAAW,CAAC;YACrD,OAAO,EAAE,WAAW;YACpB,UAAU,EAAE,IAAA,4BAAe,EAAC,WAAW,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,YAAY,CAAC;YAClF,MAAM,EAAE,QAAQ,CAAC,aAAa,CAAC,WAAW,CAAC;YAC3C,IAAI,EAAE,IAAI,2BAAY,CAAC,WAAW,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE,WAAW,EAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,UAAU,IAAI,UAAU,CAAC,CAAC,OAAO,EAAE;YACtI,UAAU,EAAE,IAAA,sCAAqB,EAAC,WAAW,CAAC,IAAI,EAAE;~~YACpD~~,~~GAAG~~,~~CAAC~~,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,~~EAAE~~,CAAC,CAAC,CAAC,EAAE,CAAC;~~YAC7C~~,~~GAAG~~,CAAC,~~KAAK~~,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;~~SAC1C~~,CAAA;~~QACD~~,OAAO,~~aAAa~~,CAAA;~~IACtB~~,CAAC;CACF;~~AArFD~~,~~oDAqFC~~"}
1	+ {"version":3,"file":"referenceTransformer.js","sourceRoot":"","sources":["../../../src/metadataGeneration/transformer/referenceTransformer.ts"],"names":[],"mappings":"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"}

package/dist/metadataGeneration/transformer/transformer.js CHANGED Viewed

@@ -13,10 +13,9 @@ class Transformer {
             }));
     }
     hasStaticModifier(node) {
-        return (node.modifiers &&
-            node.modifiers.some(modifier => {
-                return modifier.kind === typescript_1.SyntaxKind.StaticKeyword;
-            }));
+        return node.modifiers?.some(modifier => {
+            return modifier.kind === typescript_1.SyntaxKind.StaticKeyword;
+        });
     }
     isAccessibleParameter(node) {
         const modifiers = (0, typescript_1.getModifiers)(node);

package/dist/metadataGeneration/transformer/transformer.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"transformer.js","sourceRoot":"","sources":["../../../src/metadataGeneration/transformer/transformer.ts"],"names":[],"mappings":";;;AAAA,2CAAwE;AAExE;;GAEG;AACH,MAAsB,WAAW;IACrB,iBAAiB,CAAC,IAAkB;QAC5C,OAAO,CACL,CAAC,IAAI,CAAC,SAAS;YACf,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;gBAC9B,OAAO,QAAQ,CAAC,IAAI,KAAK,uBAAU,CAAC,gBAAgB,IAAI,QAAQ,CAAC,IAAI,KAAK,uBAAU,CAAC,cAAc,CAAA;YACrG,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAES,iBAAiB,CAAC,IAAkB;QAC5C,OAAO,~~CACL,~~IAAI,CAAC,SAAS~~;YACd~~,~~IAAI~~,~~CAAC,SAAS,CAAC,~~IAAI,CAAC,QAAQ,CAAC,EAAE;~~gBAC7B~~,OAAO,QAAQ,CAAC,IAAI,KAAK,uBAAU,CAAC,aAAa,CAAA;~~YACnD~~,CAAC,CAAC,~~CACH,~~CAAA;~~IACH~~,CAAC;IAES,qBAAqB,CAAC,IAAkB;QAChD,MAAM,SAAS,GAAG,IAAA,yBAAY,EAAC,IAAI,CAAC,CAAA;QAEpC,IAAI,SAAS,IAAI,IAAI,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChD,OAAO,KAAK,CAAA;QACd,CAAC;QAED,4BAA4B;QAC5B,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,uBAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YAC3E,OAAO,IAAI,CAAA;QACb,CAAC;QAED,sDAAsD;QACtD,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,uBAAU,CAAC,eAAe,CAAC,CAAA;QAC3F,MAAM,oBAAoB,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACrD,OAAO,QAAQ,CAAC,IAAI,KAAK,uBAAU,CAAC,gBAAgB,IAAI,QAAQ,CAAC,IAAI,KAAK,uBAAU,CAAC,cAAc,CAAA;QACrG,CAAC,CAAC,CAAA;QACF,OAAO,UAAU,IAAI,CAAC,oBAAoB,CAAA;IAC5C,CAAC;CACF;~~AAtCD~~,~~kCAsCC~~"}
1	+ {"version":3,"file":"transformer.js","sourceRoot":"","sources":["../../../src/metadataGeneration/transformer/transformer.ts"],"names":[],"mappings":";;;AAAA,2CAAwE;AAExE;;GAEG;AACH,MAAsB,WAAW;IACrB,iBAAiB,CAAC,IAAkB;QAC5C,OAAO,CACL,CAAC,IAAI,CAAC,SAAS;YACf,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;gBAC9B,OAAO,QAAQ,CAAC,IAAI,KAAK,uBAAU,CAAC,gBAAgB,IAAI,QAAQ,CAAC,IAAI,KAAK,uBAAU,CAAC,cAAc,CAAA;YACrG,CAAC,CAAC,CACH,CAAA;IACH,CAAC;IAES,iBAAiB,CAAC,IAAkB;QAC5C,OAAO,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE;YACrC,OAAO,QAAQ,CAAC,IAAI,KAAK,uBAAU,CAAC,aAAa,CAAA;QACnD,CAAC,CAAC,CAAA;IACJ,CAAC;IAES,qBAAqB,CAAC,IAAkB;QAChD,MAAM,SAAS,GAAG,IAAA,yBAAY,EAAC,IAAI,CAAC,CAAA;QAEpC,IAAI,SAAS,IAAI,IAAI,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChD,OAAO,KAAK,CAAA;QACd,CAAC;QAED,4BAA4B;QAC5B,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,uBAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YAC3E,OAAO,IAAI,CAAA;QACb,CAAC;QAED,sDAAsD;QACtD,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,uBAAU,CAAC,eAAe,CAAC,CAAA;QAC3F,MAAM,oBAAoB,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACrD,OAAO,QAAQ,CAAC,IAAI,KAAK,uBAAU,CAAC,gBAAgB,IAAI,QAAQ,CAAC,IAAI,KAAK,uBAAU,CAAC,cAAc,CAAA;QACrG,CAAC,CAAC,CAAA;QACF,OAAO,UAAU,IAAI,CAAC,oBAAoB,CAAA;IAC5C,CAAC;CACF;AAnCD,kCAmCC"}

package/dist/metadataGeneration/typeResolver.d.ts CHANGED Viewed

@@ -17,8 +17,49 @@ export declare class TypeResolver {
     constructor(typeNode: ts.TypeNode, current: MetadataGenerator, parentNode?: ts.Node | undefined, context?: Context, referencer?: ts.Type | undefined);
     static clearCache(): void;
     resolve(): Tsoa.Type;
+    private resolveNonReferenceTypeNode;
+    private resolveArrayTypeNode;
+    private resolveRestTypeNode;
+    private resolveUnionTypeNode;
+    private resolveIntersectionTypeNode;
+    private resolveTupleTypeNode;
+    private resolveTupleRestTypeNode;
+    private resolveAnyOrUnknownTypeNode;
+    private resolveLiteralTypeNode;
+    private resolveTypeLiteralNode;
+    private resolveTypeLiteralProperty;
+    private resolveTypeLiteralAdditionalProperties;
+    private resolveObjectKeywordTypeNode;
+    private resolveMappedTypeNode;
+    private getOriginalMappedDeclaration;
+    private isIgnoredMappedProperty;
+    private resolveMappedType;
+    private resolveMappedObjectType;
+    private resolveMappedProperty;
+    private isDeprecatedMappedProperty;
+    private getMappedPropertyDefault;
+    private resolveMappedIndexTypes;
+    private resolveConditionalTypeNode;
+    private resolveTypeOperatorTypeNode;
+    private resolveIndexedAccessTypeNodeWrapper;
+    private resolveTemplateLiteralTypeNode;
+    private resolveParenthesizedTypeNode;
     private resolveTypeOperatorNode;
+    private resolveKeyOfTypeOperator;
+    private resolveKeyOfIndexType;
+    private resolveKeyOfUnionType;
+    private resolveNonLiteralKeyOfUnionType;
+    private warnOnSkippedNonLiteralKeyTypes;
+    private createLiteralKeyOfUnionType;
+    private getKeyLiteralValue;
+    private resolveKeyOfLiteralType;
+    private resolveFallbackKeyOfType;
+    private createStringAndNumberUnion;
     private resolveIndexedAccessTypeNode;
+    private resolveIndexedAccessKeywordType;
+    private resolveIndexedAccessLiteralType;
+    private symbolHasTypeDeclaration;
+    private resolveKeyedIndexedAccessType;
     private resolveTypeReferenceNode;
     private resolveIoTsUtilityTypeReference;
     private resolveIoTsDecodedType;
@@ -34,12 +75,39 @@ export declare class TypeResolver {
     private getReferencer;
     private static typeReferenceToEntityName;
     private calcRefTypeName;
+    private getEntityNameText;
+    private getFallbackRefTypeName;
+    private createInlineReferenceTypeName;
+    private sanitizeInlineTypeName;
+    private getDeclarationBasedRefTypeName;
+    private getDeclarationRefTypeName;
+    private shouldPrefixDeclarationNamespace;
+    private isGlobalDeclaration;
     private calcMemberJsDocProperties;
     private calcTypeName;
+    private getLiteralTypeName;
+    private getStructuralTypeName;
+    private getReferenceLikeTypeName;
+    private getTypeLiteralName;
+    private getTypeLiteralMemberName;
+    private getIndexSignatureTypeName;
+    private getArrayTypeName;
+    private getIntersectionTypeName;
+    private getUnionTypeName;
+    private getTypeOperatorTypeName;
+    private getTypeQueryName;
+    private getIndexedAccessTypeName;
+    private getKeywordTypeName;
+    private getConditionalTypeName;
+    private getParenthesizedTypeName;
     private calcTypeReferenceTypeName;
     private getReferenceType;
+    private resolveReferenceType;
+    private resolveReferenceTypeFallback;
+    private resolveDeclarationReferenceType;
     private addToLocalReferenceTypeCache;
     private getModelReference;
+    private withDefinedReferenceMetadata;
     private getRefTypeName;
     private createCircularDependencyResolver;
     private nodeIsUsable;
@@ -53,6 +121,9 @@ export declare class TypeResolver {
     private getSymbolAtLocation;
     private getModelAdditionalProperties;
     private typeArgumentsToContext;
+    private getReferenceAliasProperties;
+    private appendInheritedProperties;
+    private getInheritedReferenceType;
     private getModelInheritedProperties;
     getNodeDescription(node: UsableDeclaration | ts.PropertyDeclaration | ts.ParameterDeclaration | ts.EnumDeclaration): string | undefined;
     getNodeFormat(node: ts.Node): string | undefined;
@@ -62,5 +133,13 @@ export declare class TypeResolver {
     getNodeExtension(node: ts.Node): Tsoa.Extension[];
     private getDecoratorsByIdentifier;
     static getDefault(node: ts.Node): unknown;
+    private static formatDefaultString;
+    private static formatDefaultCharacter;
+    private static formatDefaultStringCharacter;
+    private static formatEscapedDefaultCharacter;
+    private static formatDefaultNonStringCharacter;
+    private static isDefaultStringDelimiter;
+    private static startsDefaultLineComment;
+    private static skipDefaultLineComment;
 }
 export {};