@tsoa-next/cli 7.1.0 → 7.3.1

package/dist/utils/decoratorUtils.js

@@ -41,35 +41,73 @@ exports.getSecurites = getSecurites;
 exports.isDecorator = isDecorator;
 exports.getPath = getPath;
 exports.getProduces = getProduces;
+exports.getCanonicalDecoratorName = getCanonicalDecoratorName;
 const ts = __importStar(require("typescript"));
 const initializer_value_1 = require("../metadataGeneration/initializer-value");
+const TSOA_DECORATOR_MODULES = ['@tsoa-next/runtime', 'tsoa-next'];
+const TSOA_DECORATOR_NAMES = new Set([
+    'Body',
+    'BodyProp',
+    'Consumes',
+    'Delete',
+    'Deprecated',
+    'Example',
+    'Extension',
+    'FormField',
+    'Get',
+    'Head',
+    'Header',
+    'Hidden',
+    'Inject',
+    'Middlewares',
+    'NoSecurity',
+    'OperationId',
+    'Options',
+    'Patch',
+    'Path',
+    'Post',
+    'Produces',
+    'Put',
+    'Queries',
+    'Query',
+    'Request',
+    'RequestProp',
+    'Res',
+    'Response',
+    'Route',
+    'Security',
+    'SuccessResponse',
+    'Tags',
+    'UploadedFile',
+    'UploadedFiles',
+    'Validate',
+]);
 function tsHasDecorators(tsNamespace) {
     return typeof tsNamespace.canHaveDecorators === 'function';
 }
-function getDecorators(node, isMatching) {
+function getDecorators(node, isMatching, typeChecker) {
     // beginning in ts4.8 node.decorator is undefined, use getDecorators instead.
     const decorators = tsHasDecorators(ts) && ts.canHaveDecorators(node) ? ts.getDecorators(node) : [];
     if (!decorators || !decorators.length) {
         return [];
     }
     return decorators
-        .map((e) => {
-        while (e.expression !== undefined) {
-            e = e.expression;
-        }
-        return e;
-    })
-        .filter(isMatching);
+        .map(decorator => getDecoratorIdentifier(decorator))
+        .filter((identifier) => !!identifier)
+        .filter(identifier => {
+        const canonicalName = typeChecker ? getCanonicalDecoratorName(identifier, typeChecker) : undefined;
+        return isMatching(identifier, canonicalName);
+    });
 }
-function getNodeFirstDecoratorName(node, isMatching) {
-    const decorators = getDecorators(node, isMatching);
+function getNodeFirstDecoratorName(node, isMatching, typeChecker) {
+    const decorators = getDecorators(node, isMatching, typeChecker);
     if (!decorators || !decorators.length) {
         return;
     }
-    return decorators[0].text;
+    return typeChecker ? getCanonicalDecoratorName(decorators[0], typeChecker) : decorators[0].text;
 }
 function getNodeFirstDecoratorValue(node, typeChecker, isMatching) {
-    const decorators = getDecorators(node, isMatching);
+    const decorators = getDecorators(node, isMatching, typeChecker);
     if (!decorators || !decorators.length) {
         return;
     }
@@ -77,8 +115,10 @@ function getNodeFirstDecoratorValue(node, typeChecker, isMatching) {
     return values && values[0];
 }
 function getDecoratorValues(decorator, typeChecker) {
-    const expression = decorator.parent;
-    const expArguments = expression.arguments;
+    if (!ts.isCallExpression(decorator.parent)) {
+        return [];
+    }
+    const expArguments = decorator.parent.arguments;
     if (!expArguments || !expArguments.length) {
         return [];
     }
@@ -87,12 +127,14 @@ function getDecoratorValues(decorator, typeChecker) {
 function getSecurites(decorator, typeChecker) {
     const [first, second] = getDecoratorValues(decorator, typeChecker);
     if (isObject(first)) {
-        return first;
+        return toSecurity(first);
     }
-    return { [first]: second || [] };
+    const securityName = typeof first === 'string' ? first : '';
+    const scopes = Array.isArray(second) ? second.filter((scope) => typeof scope === 'string') : [];
+    return { [securityName]: scopes };
 }
-function isDecorator(node, isMatching) {
-    const decorators = getDecorators(node, isMatching);
+function isDecorator(node, isMatching, typeChecker) {
+    const decorators = getDecorators(node, isMatching, typeChecker);
     if (!decorators || !decorators.length) {
         return false;
     }
@@ -103,16 +145,116 @@ function isObject(v) {
 }
 function getPath(decorator, typeChecker) {
     const [path] = getDecoratorValues(decorator, typeChecker);
-    if (path === undefined) {
+    if (typeof path !== 'string') {
         return '';
     }
     return path;
 }
 function getProduces(node, typeChecker) {
-    const producesDecorators = getDecorators(node, identifier => identifier.text === 'Produces');
+    const producesDecorators = getDecorators(node, (_identifier, canonicalName) => canonicalName === 'Produces', typeChecker);
     if (!producesDecorators || !producesDecorators.length) {
         return [];
     }
-    return producesDecorators.map(decorator => getDecoratorValues(decorator, typeChecker)[0]);
+    return producesDecorators
+        .map(decorator => getDecoratorValues(decorator, typeChecker)[0])
+        .filter((value) => typeof value === 'string');
+}
+function toSecurity(value) {
+    return Object.fromEntries(Object.entries(value).map(([key, scopes]) => [key, Array.isArray(scopes) ? scopes.filter((scope) => typeof scope === 'string') : []]));
+}
+function getDecoratorIdentifier(decorator) {
+    let expression = decorator.expression;
+    while (ts.isCallExpression(expression) || ts.isPropertyAccessExpression(expression) || ts.isElementAccessExpression(expression) || ts.isParenthesizedExpression(expression)) {
+        expression = expression.expression;
+    }
+    return ts.isIdentifier(expression) ? expression : undefined;
+}
+function getCanonicalDecoratorName(identifier, typeChecker) {
+    const symbol = typeChecker.getSymbolAtLocation(identifier);
+    if (!symbol) {
+        return undefined;
+    }
+    const resolvedSymbol = resolveAliasedSymbol(symbol, typeChecker);
+    const symbolIsRuntimeDecorator = isRuntimeDecoratorSymbol(symbol) || isRuntimeDecoratorSymbol(resolvedSymbol);
+    if (!symbolIsRuntimeDecorator) {
+        return getImportedDecoratorName(symbol);
+    }
+    const candidateName = resolvedSymbol.getName();
+    if (TSOA_DECORATOR_NAMES.has(candidateName)) {
+        return candidateName;
+    }
+    return getImportedDecoratorName(symbol);
+}
+function resolveAliasedSymbol(symbol, typeChecker) {
+    const visited = new Set();
+    let current = symbol;
+    while ((current.flags & ts.SymbolFlags.Alias) !== 0 && !visited.has(current)) {
+        visited.add(current);
+        const aliased = typeChecker.getAliasedSymbol(current);
+        if (!aliased || aliased === current) {
+            break;
+        }
+        current = aliased;
+    }
+    return current;
+}
+function isRuntimeDecoratorSymbol(symbol) {
+    const declarations = symbol.declarations || (symbol.valueDeclaration ? [symbol.valueDeclaration] : []);
+    return declarations.some(declaration => {
+        const moduleSpecifier = getModuleSpecifierText(declaration);
+        if (moduleSpecifier && isTsoaDecoratorModuleSpecifier(moduleSpecifier)) {
+            return true;
+        }
+        const sourceFileName = declaration.getSourceFile().fileName.replace(/\\/g, '/').toLowerCase();
+        return (sourceFileName.includes('/packages/runtime/src/decorators/') ||
+            sourceFileName.includes('/packages/runtime/dist/decorators/') ||
+            sourceFileName.includes('/packages/tsoa/src/') ||
+            sourceFileName.includes('/node_modules/@tsoa-next/runtime/') ||
+            sourceFileName.includes('/node_modules/tsoa-next/'));
+    });
+}
+function isTsoaDecoratorModuleSpecifier(moduleSpecifier) {
+    return TSOA_DECORATOR_MODULES.some(prefix => moduleSpecifier === prefix || moduleSpecifier.startsWith(`${prefix}/`));
+}
+function getModuleSpecifierText(declaration) {
+    if (ts.isImportSpecifier(declaration)) {
+        const importDeclaration = declaration.parent.parent.parent;
+        if (ts.isImportDeclaration(importDeclaration) && ts.isStringLiteral(importDeclaration.moduleSpecifier)) {
+            return importDeclaration.moduleSpecifier.text;
+        }
+    }
+    if (ts.isExportSpecifier(declaration)) {
+        const exportDeclaration = declaration.parent.parent;
+        if (ts.isExportDeclaration(exportDeclaration) && exportDeclaration.moduleSpecifier && ts.isStringLiteral(exportDeclaration.moduleSpecifier)) {
+            return exportDeclaration.moduleSpecifier.text;
+        }
+    }
+    return undefined;
+}
+function getImportedDecoratorName(symbol) {
+    const declarations = symbol.declarations || (symbol.valueDeclaration ? [symbol.valueDeclaration] : []);
+    for (const declaration of declarations) {
+        if (ts.isImportSpecifier(declaration)) {
+            const moduleSpecifier = getModuleSpecifierText(declaration);
+            if (!moduleSpecifier || !isTsoaDecoratorModuleSpecifier(moduleSpecifier)) {
+                continue;
+            }
+            const importedName = declaration.propertyName?.text ?? declaration.name.text;
+            if (TSOA_DECORATOR_NAMES.has(importedName)) {
+                return importedName;
+            }
+        }
+        if (ts.isExportSpecifier(declaration)) {
+            const moduleSpecifier = getModuleSpecifierText(declaration);
+            if (!moduleSpecifier || !isTsoaDecoratorModuleSpecifier(moduleSpecifier)) {
+                continue;
+            }
+            const exportedName = declaration.propertyName?.text ?? declaration.name.text;
+            if (TSOA_DECORATOR_NAMES.has(exportedName)) {
+                return exportedName;
+            }
+        }
+    }
+    return undefined;
 }
 //# sourceMappingURL=decoratorUtils.js.map

package/dist/utils/decoratorUtils.js.map

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

package/dist/utils/jsDocUtils.js

@@ -42,8 +42,11 @@ exports.isExistJSDocTag = isExistJSDocTag;
 exports.commentToString = commentToString;
 const ts = __importStar(require("typescript"));
 const exceptions_1 = require("../metadataGeneration/exceptions");
+function getJsDocs(node) {
+    return node.jsDoc ?? [];
+}
 function getJSDocDescription(node) {
-    const jsDocs = node.jsDoc;
+    const jsDocs = getJsDocs(node);
     if (!jsDocs || !jsDocs.length) {
         return undefined;
     }
@@ -71,7 +74,7 @@ function getJSDocComments(node, tagName) {
 }
 function getJSDocTagNames(node, requireTagName = false) {
     let tags;
-    if (node.kind === ts.SyntaxKind.Parameter) {
+    if (ts.isParameter(node) && ts.isIdentifier(node.name)) {
         const parameterName = node.name.text;
         tags = getJSDocTags(node.parent, tag => {
             if (ts.isJSDocParameterTag(tag)) {
@@ -93,7 +96,7 @@ function getJSDocTagNames(node, requireTagName = false) {
     });
 }
 function getJSDocTags(node, isMatching) {
-    const jsDocs = node.jsDoc;
+    const jsDocs = getJsDocs(node);
     if (!jsDocs || jsDocs.length === 0) {
         return [];
     }

package/dist/utils/jsDocUtils.js.map

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

package/dist/utils/jsonUtils.d.ts

@@ -1 +1 @@
-export declare function safeFromJson(json: string): any;
+export declare function safeFromJson(json: string): unknown;

package/dist/utils/pathUtils.js

@@ -16,13 +16,10 @@ function normalisePath(path, withPrefix, withSuffix, skipPrefixAndSuffixIfEmpty
     if (!path || typeof path !== 'string') {
         path = '' + path;
     }
-    // normalise beginning and end of the path
-    let normalised = path.replace(/^[/\\\s]+|[/\\\s]+$/g, '');
+    let normalised = trimPathDelimiters(path);
     normalised = withPrefix ? withPrefix + normalised : normalised;
     normalised = withSuffix ? normalised + withSuffix : normalised;
-    // normalise / signs amount in all path
-    normalised = normalised.replace(/[/\\\s]+/g, '/');
-    return normalised;
+    return collapsePathDelimiters(normalised);
 }
 function convertColonPathParams(path) {
     if (!path || typeof path !== 'string') {
@@ -34,4 +31,34 @@ function convertColonPathParams(path) {
 function convertBracesPathParams(path) {
     return path.replace(/{(\w*)}/g, ':$1');
 }
+function trimPathDelimiters(path) {
+    let start = 0;
+    let end = path.length;
+    while (start < end && isPathDelimiter(path[start])) {
+        start++;
+    }
+    while (end > start && isPathDelimiter(path[end - 1])) {
+        end--;
+    }
+    return path.slice(start, end);
+}
+function collapsePathDelimiters(path) {
+    const normalisedChars = [];
+    let previousWasDelimiter = false;
+    for (const character of path) {
+        if (isPathDelimiter(character)) {
+            if (!previousWasDelimiter) {
+                normalisedChars.push('/');
+                previousWasDelimiter = true;
+            }
+            continue;
+        }
+        normalisedChars.push(character);
+        previousWasDelimiter = false;
+    }
+    return normalisedChars.join('');
+}
+function isPathDelimiter(character) {
+    return character === '/' || character === '\\' || character.trim() === '';
+}
 //# sourceMappingURL=pathUtils.js.map

package/dist/utils/pathUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"pathUtils.js","sourceRoot":"","sources":["../../src/utils/pathUtils.ts"],"names":[],"mappings":";;AAMA,sCAcC;AAED,wDAOC;AAED,0DAEC;AAjCD;;;;;GAKG;AACH,SAAgB,aAAa,CAAC,IAAY,EAAE,UAAmB,EAAE,UAAmB,EAAE,0BAA0B,GAAG,IAAI;IACrH,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,KAAK,GAAG,CAAC,IAAI,0BAA0B,EAAE,CAAC;QAC1D,OAAO,EAAE,CAAA;IACX,CAAC;IACD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtC,IAAI,GAAG,EAAE,GAAG,IAAI,CAAA;IAClB,CAAC;IACD,0CAA0C;IAC1C,IAAI,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAA;IACzD,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAA;IAC9D,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAA;IAC9D,uCAAuC;IACvC,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,CAAA;IACjD,OAAO,UAAU,CAAA;AACnB,CAAC;AAED,SAAgB,sBAAsB,CAAC,IAAY;IACjD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;IACpD,OAAO,UAAU,CAAA;AACnB,CAAC;AAED,SAAgB,uBAAuB,CAAC,IAAY;IAClD,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;AACxC,CAAC"}
+{"version":3,"file":"pathUtils.js","sourceRoot":"","sources":["../../src/utils/pathUtils.ts"],"names":[],"mappings":";;AAMA,sCAaC;AAED,wDAOC;AAED,0DAEC;AAhCD;;;;;GAKG;AACH,SAAgB,aAAa,CAAC,IAAY,EAAE,UAAmB,EAAE,UAAmB,EAAE,0BAA0B,GAAG,IAAI;IACrH,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,KAAK,GAAG,CAAC,IAAI,0BAA0B,EAAE,CAAC;QAC1D,OAAO,EAAE,CAAA;IACX,CAAC;IACD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtC,IAAI,GAAG,EAAE,GAAG,IAAI,CAAA;IAClB,CAAC;IAED,IAAI,UAAU,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAA;IACzC,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAA;IAC9D,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAA;IAE9D,OAAO,sBAAsB,CAAC,UAAU,CAAC,CAAA;AAC3C,CAAC;AAED,SAAgB,sBAAsB,CAAC,IAAY;IACjD,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAA;IACpD,OAAO,UAAU,CAAA;AACnB,CAAC;AAED,SAAgB,uBAAuB,CAAC,IAAY;IAClD,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;AACxC,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY;IACtC,IAAI,KAAK,GAAG,CAAC,CAAA;IACb,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,CAAA;IAErB,OAAO,KAAK,GAAG,GAAG,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QACnD,KAAK,EAAE,CAAA;IACT,CAAC;IAED,OAAO,GAAG,GAAG,KAAK,IAAI,eAAe,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACrD,GAAG,EAAE,CAAA;IACP,CAAC;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;AAC/B,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAY;IAC1C,MAAM,eAAe,GAAa,EAAE,CAAA;IACpC,IAAI,oBAAoB,GAAG,KAAK,CAAA;IAEhC,KAAK,MAAM,SAAS,IAAI,IAAI,EAAE,CAAC;QAC7B,IAAI,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;YAC/B,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC1B,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBACzB,oBAAoB,GAAG,IAAI,CAAA;YAC7B,CAAC;YACD,SAAQ;QACV,CAAC;QAED,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAC/B,oBAAoB,GAAG,KAAK,CAAA;IAC9B,CAAC;IAED,OAAO,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;AACjC,CAAC;AAED,SAAS,eAAe,CAAC,SAAiB;IACxC,OAAO,SAAS,KAAK,GAAG,IAAI,SAAS,KAAK,IAAI,IAAI,SAAS,CAAC,IAAI,EAAE,KAAK,EAAE,CAAA;AAC3E,CAAC"}

package/dist/utils/validateDecoratorUtils.d.ts

@@ -0,0 +1,9 @@
+import * as ts from 'typescript';
+import { Tsoa } from '@tsoa-next/runtime';
+type ValidateDecoratorParseResult = {
+    validationStrategy: Tsoa.ValidationStrategy;
+    externalValidator: Tsoa.ExternalValidatorDescriptor;
+};
+export declare function getParameterExternalValidator(parameter: ts.ParameterDeclaration, parameterIn: Tsoa.Parameter['in'], typeChecker: ts.TypeChecker): ValidateDecoratorParseResult | undefined;
+export declare function assertValidateDecoratorTargets(program: ts.Program, typeChecker: ts.TypeChecker): void;
+export {};

package/dist/utils/validateDecoratorUtils.js

@@ -0,0 +1,225 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getParameterExternalValidator = getParameterExternalValidator;
+exports.assertValidateDecoratorTargets = assertValidateDecoratorTargets;
+const ts = __importStar(require("typescript"));
+const decoratorUtils_1 = require("./decoratorUtils");
+const exceptions_1 = require("../metadataGeneration/exceptions");
+const SUPPORTED_VALIDATE_TARGETS = new Set(['body', 'body-prop', 'query', 'queries', 'path', 'header', 'formData']);
+const VALIDATOR_MODULE_KIND_MAP = {
+    'io-ts': 'io-ts',
+    'io-ts-types': 'io-ts',
+    joi: 'joi',
+    superstruct: 'superstruct',
+    yup: 'yup',
+    zod: 'zod',
+};
+function isExternalValidatorKind(value) {
+    return value === 'zod' || value === 'joi' || value === 'yup' || value === 'superstruct' || value === 'io-ts';
+}
+function getValidateDecorator(parameter, typeChecker) {
+    const decorators = (0, decoratorUtils_1.getDecorators)(parameter, (_identifier, canonicalName) => canonicalName === 'Validate', typeChecker);
+    if (decorators.length > 1) {
+        throw new exceptions_1.GenerateMetadataError('Only one @Validate decorator is allowed per parameter.', parameter);
+    }
+    const decoratorIdentifier = decorators[0];
+    if (!decoratorIdentifier) {
+        return undefined;
+    }
+    let current = decoratorIdentifier;
+    while (current && !ts.isDecorator(current)) {
+        current = current.parent;
+    }
+    return current;
+}
+function getModuleKindFromImportDeclaration(declaration) {
+    let current = declaration.parent;
+    while (current && !ts.isImportDeclaration(current)) {
+        current = current.parent;
+    }
+    if (current && ts.isImportDeclaration(current) && ts.isStringLiteral(current.moduleSpecifier)) {
+        return VALIDATOR_MODULE_KIND_MAP[current.moduleSpecifier.text];
+    }
+    return undefined;
+}
+function getSymbolDeclarations(symbol) {
+    return symbol.declarations || (symbol.valueDeclaration ? [symbol.valueDeclaration] : []);
+}
+function inferValidatorKindFromDeclaration(declaration, typeChecker, visited) {
+    const fromImport = getModuleKindFromImportDeclaration(declaration);
+    if (fromImport) {
+        return fromImport;
+    }
+    if (ts.isVariableDeclaration(declaration) || ts.isPropertyAssignment(declaration) || ts.isBindingElement(declaration) || ts.isParameter(declaration)) {
+        if (declaration.initializer) {
+            return inferValidatorKindFromExpression(declaration.initializer, typeChecker, visited);
+        }
+    }
+    return undefined;
+}
+function inferValidatorKindFromDeclarations(declarations, typeChecker, visited) {
+    for (const declaration of declarations) {
+        const inferredKind = inferValidatorKindFromDeclaration(declaration, typeChecker, visited);
+        if (inferredKind) {
+            return inferredKind;
+        }
+    }
+    return undefined;
+}
+function inferValidatorKindFromSymbol(symbol, typeChecker, visited) {
+    if (!symbol || visited.has(symbol)) {
+        return undefined;
+    }
+    visited.add(symbol);
+    const directKind = inferValidatorKindFromDeclarations(getSymbolDeclarations(symbol), typeChecker, visited);
+    if (directKind) {
+        return directKind;
+    }
+    const isAliasSymbol = Boolean(symbol.flags & ts.SymbolFlags.Alias);
+    const resolvedSymbol = isAliasSymbol ? typeChecker.getAliasedSymbol(symbol) : symbol;
+    if (resolvedSymbol !== symbol) {
+        const aliasedKind = inferValidatorKindFromSymbol(resolvedSymbol, typeChecker, visited);
+        if (aliasedKind) {
+            return aliasedKind;
+        }
+    }
+    return inferValidatorKindFromDeclarations(getSymbolDeclarations(resolvedSymbol), typeChecker, visited);
+}
+function inferValidatorKindFromExpression(expression, typeChecker, visited = new Set()) {
+    if (ts.isParenthesizedExpression(expression) || ts.isAsExpression(expression) || ts.isTypeAssertionExpression(expression) || ts.isNonNullExpression(expression)) {
+        return inferValidatorKindFromExpression(expression.expression, typeChecker, visited);
+    }
+    if (ts.isPropertyAccessExpression(expression)) {
+        const propertySymbol = typeChecker.getSymbolAtLocation(expression.name);
+        const fromProperty = inferValidatorKindFromSymbol(propertySymbol, typeChecker, visited);
+        if (fromProperty) {
+            return fromProperty;
+        }
+        return inferValidatorKindFromExpression(expression.expression, typeChecker, visited);
+    }
+    if (ts.isElementAccessExpression(expression)) {
+        return inferValidatorKindFromExpression(expression.expression, typeChecker, visited);
+    }
+    if (ts.isCallExpression(expression) || ts.isNewExpression(expression)) {
+        return inferValidatorKindFromExpression(expression.expression, typeChecker, visited);
+    }
+    if (ts.isIdentifier(expression)) {
+        return inferValidatorKindFromSymbol(typeChecker.getSymbolAtLocation(expression), typeChecker, visited);
+    }
+    return undefined;
+}
+function parseValidateKindAndSchemaArgument(expression, parameter, typeChecker) {
+    const args = [...expression.arguments];
+    if (args.length === 0) {
+        throw new exceptions_1.GenerateMetadataError('@Validate requires a schema argument.', parameter);
+    }
+    if (args.length === 1) {
+        const [arg] = args;
+        if (ts.isObjectLiteralExpression(arg)) {
+            const kindProperty = getValidateKindProperty(arg);
+            const schemaProperty = getValidateSchemaProperty(arg);
+            if (!kindProperty || !schemaProperty || !ts.isStringLiteral(kindProperty.initializer) || !isExternalValidatorKind(kindProperty.initializer.text)) {
+                throw new exceptions_1.GenerateMetadataError('@Validate({ kind, schema }) requires a supported string kind and a schema property.', arg);
+            }
+            return {
+                kind: kindProperty.initializer.text,
+                strategy: 'external',
+            };
+        }
+        if (ts.isStringLiteral(arg) && isExternalValidatorKind(arg.text)) {
+            throw new exceptions_1.GenerateMetadataError(`@Validate('${arg.text}', schema) requires a schema argument.`, arg);
+        }
+        const inferredKind = inferValidatorKindFromExpression(arg, typeChecker);
+        if (!inferredKind) {
+            throw new exceptions_1.GenerateMetadataError('@Validate(schema) could not infer the validator kind. Use @Validate(kind, schema) instead.', arg);
+        }
+        return {
+            kind: inferredKind,
+            strategy: 'external',
+        };
+    }
+    if (args.length === 2) {
+        const [kindArg, schemaArg] = args;
+        if (!ts.isStringLiteral(kindArg) || !isExternalValidatorKind(kindArg.text) || !schemaArg) {
+            throw new exceptions_1.GenerateMetadataError('@Validate(kind, schema) requires a supported string kind and schema argument.', expression);
+        }
+        return {
+            kind: kindArg.text,
+            strategy: 'external',
+        };
+    }
+    throw new exceptions_1.GenerateMetadataError('@Validate accepts only (schema), (kind, schema), or ({ kind, schema }).', expression);
+}
+function getValidateKindProperty(objectLiteral) {
+    return objectLiteral.properties.find((property) => ts.isPropertyAssignment(property) && ts.isIdentifier(property.name) && property.name.text === 'kind');
+}
+function getValidateSchemaProperty(objectLiteral) {
+    return objectLiteral.properties.find((property) => (ts.isPropertyAssignment(property) || ts.isShorthandPropertyAssignment(property)) &&
+        ts.isIdentifier(property.name) &&
+        property.name.text === 'schema');
+}
+function getParameterExternalValidator(parameter, parameterIn, typeChecker) {
+    const decorator = getValidateDecorator(parameter, typeChecker);
+    if (!decorator) {
+        return undefined;
+    }
+    if (!SUPPORTED_VALIDATE_TARGETS.has(parameterIn)) {
+        throw new exceptions_1.GenerateMetadataError(`@Validate is not supported on '${parameterIn}' parameters in this release.`, parameter);
+    }
+    if (!ts.isCallExpression(decorator.expression)) {
+        throw new exceptions_1.GenerateMetadataError('@Validate must be called as a decorator function.', decorator);
+    }
+    return {
+        validationStrategy: 'external',
+        externalValidator: parseValidateKindAndSchemaArgument(decorator.expression, parameter, typeChecker),
+    };
+}
+function assertValidateDecoratorTargets(program, typeChecker) {
+    const visit = (node) => {
+        const validateDecorators = (0, decoratorUtils_1.getDecorators)(node, (_identifier, canonicalName) => canonicalName === 'Validate', typeChecker);
+        if (validateDecorators.length > 0) {
+            if (!ts.isParameter(node)) {
+                throw new exceptions_1.GenerateMetadataError('@Validate is currently supported only on controller method parameters.', node);
+            }
+            if (!ts.isMethodDeclaration(node.parent)) {
+                throw new exceptions_1.GenerateMetadataError('@Validate is currently supported only on method parameters.', node);
+            }
+        }
+        ts.forEachChild(node, visit);
+    };
+    program.getSourceFiles().forEach(sourceFile => visit(sourceFile));
+}
+//# sourceMappingURL=validateDecoratorUtils.js.map

package/dist/utils/validateDecoratorUtils.js.map

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