@buildvision/nest-sdk-generator 1.2.2 → 2.0.0

package/build/analyzer/controllers.js

@@ -13,6 +13,7 @@ const module_1 = require("./module");
 function analyzeControllers(controllers, absoluteSrcPath, project) {
     /** Hierarchised SDK informations */
     const collected = new Map();
+    const usedControllerNames = new Set();
     /**
      * Modules cache: contains for a given directory the nearest module file's path and name
      * This allows to avoid having to analyze the whole directory structure for each controller
@@ -70,10 +71,17 @@ function analyzeControllers(controllers, absoluteSrcPath, project) {
             if (metadata.registrationName in {}) {
                 (0, logging_1.panic)(`Detected controller whose registration name {yellow} collides with a JavaScript's native object property`, metadata.registrationName);
             }
+            // Ensure the each controller has a unique name across modules
+            if (usedControllerNames.has(metadata.camelClassName)) {
+                (0, logging_1.panic)(`Detected two controllers with the same name {yellow}. Second occurrence found in {yellow}`, metadata.registrationName, metadata.path);
+            }
+            else {
+                usedControllerNames.add(metadata.camelClassName);
+            }
             moduleSdkInfos.set(metadata.camelClassName, metadata);
         }
     });
     return collected;
 }
 exports.analyzeControllers = analyzeControllers;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJvbGxlcnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYW5hbHl6ZXIvY29udHJvbGxlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOztHQUVHOzs7QUFFSCx5QkFBd0I7QUFDeEIsNkJBQTRCO0FBRTVCLHdDQUF1RDtBQUN2RCxvQ0FBd0M7QUFDeEMsNkNBQStEO0FBQy9ELHFDQUF3QztBQUl4QyxTQUFnQixrQkFBa0IsQ0FBQyxXQUFxQixFQUFFLGVBQXVCLEVBQUUsT0FBZ0I7SUFDakcsb0NBQW9DO0lBQ3BDLE1BQU0sU0FBUyxHQUFHLElBQUksR0FBRyxFQUFzQyxDQUFBO0lBRS9EOzs7T0FHRztJQUNILE1BQU0sWUFBWSxHQUFHLElBQUksR0FBRyxFQUFrQixDQUFBO0lBRTlDOzs7O09BSUc7SUFDSCxNQUFNLG1CQUFtQixHQUFHLElBQUksR0FBRyxFQUFrQixDQUFBO0lBRXJELElBQUEsZUFBSyxFQUFDLG1DQUFtQyxFQUFFLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUU5RCxXQUFXLENBQUMsT0FBTyxDQUFDLENBQUMsc0JBQXNCLEVBQUUsQ0FBQyxFQUFFLEVBQUU7UUFDaEQsTUFBTSxzQkFBc0IsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLGVBQWUsRUFBRSxzQkFBc0IsQ0FBQyxDQUFBO1FBRXBGLElBQUEsZUFBSyxFQUNILDZDQUE2QyxFQUM3Qyw0QkFBNEIsRUFDNUIsR0FBRyxDQUFDLEdBQUcsQ0FBQyxJQUFJLFdBQVcsQ0FBQyxNQUFNLEVBQUUsRUFDaEMsc0JBQXNCLEVBQ3RCLE9BQU8sQ0FDUixDQUFBO1FBRUQsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxzQkFBc0IsQ0FBQyxDQUFBO1FBRXJELElBQUksVUFBVSxHQUFHLFlBQVksQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUE7UUFFM0MseUNBQXlDO1FBQ3pDLElBQUksQ0FBQyxVQUFVLEVBQUU7WUFD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29udHJvbGxlcnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYW5hbHl6ZXIvY29udHJvbGxlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBOztHQUVHOzs7QUFFSCx5QkFBd0I7QUFDeEIsNkJBQTRCO0FBRTVCLHdDQUF1RDtBQUN2RCxvQ0FBd0M7QUFDeEMsNkNBQStEO0FBQy9ELHFDQUF3QztBQUl4QyxTQUFnQixrQkFBa0IsQ0FBQyxXQUFxQixFQUFFLGVBQXVCLEVBQUUsT0FBZ0I7SUFDakcsb0NBQW9DO0lBQ3BDLE1BQU0sU0FBUyxHQUFHLElBQUksR0FBRyxFQUFzQyxDQUFBO0lBQy9ELE1BQU0sbUJBQW1CLEdBQUcsSUFBSSxHQUFHLEVBQVUsQ0FBQTtJQUU3Qzs7O09BR0c7SUFDSCxNQUFNLFlBQVksR0FBRyxJQUFJLEdBQUcsRUFBa0IsQ0FBQTtJQUU5Qzs7OztPQUlHO0lBQ0gsTUFBTSxtQkFBbUIsR0FBRyxJQUFJLEdBQUcsRUFBa0IsQ0FBQTtJQUVyRCxJQUFBLGVBQUssRUFBQyxtQ0FBbUMsRUFBRSxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUE7SUFFOUQsV0FBVyxDQUFDLE9BQU8sQ0FBQyxDQUFDLHNCQUFzQixFQUFFLENBQUMsRUFBRSxFQUFFO1FBQ2hELE1BQU0sc0JBQXNCLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxlQUFlLEVBQUUsc0JBQXNCLENBQUMsQ0FBQTtRQUVwRixJQUFBLGVBQUssRUFDSCw2Q0FBNkMsRUFDN0MsNEJBQTRCLEVBQzVCLEdBQUcsQ0FBQyxHQUFHLENBQUMsSUFBSSxXQUFXLENBQUMsTUFBTSxFQUFFLEVBQ2hDLHNCQUFzQixFQUN0QixPQUFPLENBQ1IsQ0FBQTtRQUVELE1BQU0sUUFBUSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsc0JBQXNCLENBQUMsQ0FBQTtRQUVyRCxJQUFJLFVBQVUsR0FBRyxZQUFZLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFB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

package/build/analyzer/extractor.js

@@ -8,6 +8,7 @@ const path = require("path");
 const ts_morph_1 = require("ts-morph");
 const logging_1 = require("../logging");
 const classdeps_1 = require("./classdeps");
+const params_1 = require("./params");
 const typedeps_1 = require("./typedeps");
 /** Valid extensions for TypeScript module files */
 exports.MODULE_EXTENSIONS = ['.ts', '.d.ts', '.tsx', '.d.tsx', '.js', '.jsx'];
@@ -323,27 +324,15 @@ function flattenSdkResolvedTypes(sdkModules) {
     for (const module of sdkModules.values()) {
         for (const controller of module.values()) {
             for (const method of controller.methods.values()) {
-                const { parameters: args, query, body } = method.params;
+                const { routeParams, queryParams, bodyParams } = method.params;
                 flattened.push(method.returnType);
-                if (args) {
-                    flattened.push(...args.values());
-                }
-                if (query) {
-                    flattened.push(...query.values());
-                }
-                if (!body) {
-                    continue;
-                }
-                if (body.full) {
-                    flattened.push(body.type);
-                }
-                else {
-                    flattened.push(...body.fields.values());
-                }
+                flattened.push(...(0, params_1.getParamResolvedTypes)(routeParams));
+                flattened.push(...(0, params_1.getParamResolvedTypes)(queryParams));
+                flattened.push(...(0, params_1.getParamResolvedTypes)(bodyParams));
             }
         }
     }
     return flattened;
 }
 exports.flattenSdkResolvedTypes = flattenSdkResolvedTypes;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"extractor.js","sourceRoot":"","sources":["../../src/analyzer/extractor.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,6BAA4B;AAC5B,uCAAoD;AAEpD,wCAAoE;AACpE,2CAA8C;AAE9C,yCAA6F;AAE7F,mDAAmD;AACtC,QAAA,iBAAiB,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;AAkClF;;GAEG;AACH,MAAa,cAAc;IACzB;IACE,uBAAuB;IACP,OAAgB;IAEhC,2BAA2B;IACX,eAAuB;IAEvC,gDAAgD;IAChC,UAA4B;IAE5C,sBAAsB;IACN,YAAmC,IAAI,GAAG,EAAE;QAT5C,YAAO,GAAP,OAAO,CAAS;QAGhB,oBAAe,GAAf,eAAe,CAAQ;QAGvB,eAAU,GAAV,UAAU,CAAkB;QAG5B,cAAS,GAAT,SAAS,CAAmC;IAC3D,CAAC;IAEJ;;OAEG;IACH,gBAAgB,CAAC,GAAwB;QACvC,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QAClD,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;IAChD,CAAC;IAED;;OAEG;IACH,gBAAgB,CAAC,GAAwB;;QACvC,OAAO,MAAA,MAAA,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,0CAAE,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,mCAAI,IAAI,CAAA;IACxE,CAAC;IAED;;;;OAIG;IACH,+BAA+B,CAAC,GAAiB;QAC/C,KAAK,MAAM,GAAG,IAAI,yBAAiB,EAAE;YACnC,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,iBAAiB,GAAG,GAAG,CAAC,EAAE;gBACnD,OAAO,GAAG,CAAC,iBAAiB,GAAG,GAAG,CAAA;aACnC;SACF;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;OAIG;IACH,2BAA2B,CAAC,GAAiB;;QAC3C,KAAK,MAAM,GAAG,IAAI,yBAAiB,EAAE;YACnC,MAAM,GAAG,GAAG,MAAA,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,iBAAiB,GAAG,GAAG,CAAC,0CAAE,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;YAE9E,IAAI,GAAG,EAAE;gBACP,OAAO,GAAG,CAAA;aACX;SACF;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;OAIG;IACH,qBAAqB,CAAC,GAAwB,EAAE,SAAwB;QACtE,IAAI,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QAEhD,IAAI,CAAC,KAAK,EAAE;YACV,KAAK,GAAG,IAAI,GAAG,EAAE,CAAA;YACjB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,KAAK,CAAC,CAAA;SAC5C;QAED,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YAC5B,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;SACnC;IACH,CAAC;IAED;;;;OAIG;IACH,wBAAwB,CAAC,GAAiB;QACxC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE;YAC1C,IAAA,qBAAW,EACT,gHAAgH,EAChH,GAAG,CAAC,iBAAiB,CACtB,CAAA;SACF;QAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC,iBAAiB,CAAC,CAAA;QAEnF,MAAM,MAAM,GAAG,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,CAAA;QAEpD,IAAI,MAAM,EAAE;YACV,OAAO,MAAM,CAAC,YAAY,CAAA;SAC3B;QAED,IAAI,gBAAgB,GAAkB,IAAI,CAAA;QAE1C,KAAK,MAAM,GAAG,IAAI,yBAAiB,EAAE;YACnC,IAAI;gBACF,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,iBAAiB,GAAG,GAAG,CAAC,CAAA;gBAC1D,gBAAgB,GAAG,GAAG,CAAC,iBAAiB,GAAG,GAAG,CAAA;aAC/C;YAAC,OAAO,CAAC,EAAE;gBACV,SAAQ;aACT;SACF;QAED,OAAO,CACL,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAChB,IAAI,KAAK,CACP,IAAA,gBAAM,EAAC,iFAAiF,EAAE,GAAG,CAAC,iBAAiB,EAAE,GAAG,CAAC,QAAQ,CAAC,CAC/H,CACF,CAAA;IACH,CAAC;IAED;;;;;OAKG;IACH,WAAW,CAAC,GAAiB,EAAE,YAAsB,EAAE;;QACrD,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE;YAC1C,IAAA,qBAAW,EACT,gHAAgH,EAChH,GAAG,CAAC,iBAAiB,CACtB,CAAA;SACF;QAED,kDAAkD;QAClD,sGAAsG;QACtG,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC,iBAAiB,CAAC,CAAA;QAEnF,sDAAsD;QACtD,MAAM,MAAM,GAAG,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,CAAA;QAEpD,IAAI,MAAM,EAAE;YACV,OAAO,MAAM,CAAA;SACd;QAED,gFAAgF;QAChF,IAAI,WAAW,GAAgC,IAAI,CAAA;QAEnD,KAAK,MAAM,GAAG,IAAI,yBAAiB,EAAE;YACnC,IAAI;gBACF,WAAW,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,iBAAiB,GAAG,GAAG,CAAC,EAAE,GAAG,CAAC,iBAAiB,GAAG,GAAG,CAAC,CAAA;aACxG;YAAC,OAAO,CAAC,EAAE;gBACV,SAAQ;aACT;SACF;QAED,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,IAAI,KAAK,CACd,IAAA,gBAAM,EAAC,iFAAiF,EAAE,GAAG,CAAC,iBAAiB,EAAE,GAAG,CAAC,QAAQ,CAAC,CAC/H,CAAA;SACF;QAED,MAAM,CAAC,IAAI,EAAE,gBAAgB,CAAC,GAAG,WAAW,CAAA;QAE5C,gDAAgD;QAChD,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;YACvC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,gBAAgB,SAAS,CAAC,kBAAkB,EAAE,CAAC,IAAI,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC,QAAQ,EAAE;gBACpH,IAAA,eAAK,EACH,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;oBAChC,kGAAkG,EACpG,GAAG,CAAC,QAAQ,EACZ,gBAAgB,CACjB,CAAA;gBAED,MAAM,SAAS,GAAkB;oBAC/B,OAAO,EAAE,4DAA4D,GAAG,SAAS,CAAC,kBAAkB;oBACpG,YAAY,EAAE,gBAAgB;oBAC9B,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;oBACxC,QAAQ,EAAE,GAAG,CAAC,QAAQ;oBACtB,UAAU,EAAE,EAAE;oBACd,YAAY,EAAE,EAAE;iBACjB,CAAA;gBAED,SAAS,CAAC,GAAG,EAAE,CAAA;gBAEf,IAAI,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;gBAEhD,IAAI,CAAC,KAAK,EAAE;oBACV,KAAK,GAAG,IAAI,GAAG,EAAE,CAAA;oBACjB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAA;iBAC5C;gBAED,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;gBAElC,OAAO,SAAS,CAAA;aACjB;SACF;QAED,IAAA,eAAK,EAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,uDAAuD,EAAE,GAAG,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAA;QAEnI,iCAAiC;QACjC,MAAM,IAAI,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YACpD,OAAO,CACL,CAAC,eAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC;gBAC3B,eAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC;gBACjC,eAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC;gBACjC,eAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC;gBAC7B,eAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;gBACnC,IAAI,CAAC,OAAO,EAAE,KAAK,GAAG,CAAC,QAAQ,CAChC,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,IAAI,KAAK,CAAC,IAAA,gBAAM,EAAC,+CAA+C,EAAE,GAAG,CAAC,QAAQ,EAAE,gBAAgB,CAAC,CAAC,CAAA;SAC1G;QAED,iIAAiI;QACjI,2HAA2H;QAC3H,MAAM,GAAG,GAAG,IAAI,CAAC,2BAA2B,CAAC,GAAG,CAAC,CAAA;QAEjD,IAAI,GAAG,IAAI,GAAG,CAAC,YAAY,KAAK,gBAAgB,EAAE;YAChD,IAAA,eAAK,EACH,+GAA+G,EAC/G,GAAG,CAAC,YAAY,EAChB,gBAAgB,CACjB,CAAA;SACF;QAED,mCAAmC;QACnC,IAAI,YAAgC,CAAA;QAEpC,mCAAmC;QACnC,IAAI,UAAoB,CAAA;QAExB,uBAAuB;QACvB,IAAI,aAAa,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;QAElC,sBAAsB;QACtB,IAAI,eAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,EAAE;YAChC,YAAY,GAAG,EAAE,CAAA;YACjB,UAAU,GAAG,EAAE,CAAA;SAChB;QAED,sBAAsB;aACjB,IAAI,eAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE;YAC1C,YAAY,GAAG,CAAC,IAAA,kCAAuB,EAAC,IAAI,CAAC,OAAO,EAAE,EAAE,gBAAgB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAA;YAChG,UAAU,GAAG,EAAE,CAAA;SAChB;QAED,oBAAoB;aACf,IAAI,eAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,EAAE;YAC1C,YAAY,GAAG,IAAA,4BAAgB,EAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAA;YAC7E,UAAU,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAA;SAChE;QAED,iBAAiB;QACjB,+GAA+G;QAC/G,yHAAyH;QACzH,6CAA6C;aACxC,IAAI,eAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE;YACtC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAA;YAEpE,IAAI,CAAC,SAAS,EAAE;gBACd,IAAA,qBAAW,EAAC,qEAAqE,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;aACnG;YAED,aAAa,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;YAE5B,MAAM,KAAK,GAAG,MAAA,IAAI,CAAC,OAAO,EAAE,CAAC,kBAAkB,EAAE,mCAAI,IAAI,CAAC,OAAO,EAAE,CAAC,kBAAkB,EAAE,CAAA;YAExF,IAAI,KAAK,EAAE;gBACT,aAAa,IAAI,qCAAqC,GAAG,IAAA,gCAAqB,EAAC,KAAK,CAAC,CAAA;aACtF;YAED,qBAAqB;YACrB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE;gBACtC,IAAI,CAAC,eAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,EAAE;oBACvC,IAAA,cAAI,EAAC,sDAAsD,EAAE,MAAA,IAAI,CAAC,OAAO,EAAE,mCAAI,aAAa,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAA;oBAC/G,SAAQ;iBACT;gBAED,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,EAAE,CAAA;gBAEnC,aAAa,IAAI,YAAY,MAAM,CAAC,OAAO,EAAE,GAC3C,MAAM,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EACjF,KAAK,IAAA,gCAAqB,EAAC,UAAU,CAAC,GAAG,CAAA;aAC1C;YAED,aAAa,IAAI,KAAK,CAAA;YAEtB,YAAY,GAAG,IAAA,4BAAgB,EAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAA;YAC7E,UAAU,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAA;SAChE;QAED,mBAAmB;aACd,IAAI,eAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE;YACzC,YAAY,GAAG,EAAE,CAAA;YACjB,UAAU,GAAG,EAAE,CAAA;SAChB;QAED,uBAAuB;aAClB;YACH,IAAA,eAAK,EAAC,2CAA2C,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;SACxE;QAED,8BAA8B;QAC9B,MAAM,YAAY,GAA0B,EAAE,CAAA;QAE9C,oIAAoI;QACpI,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YACpC,IAAA,qBAAW,EAAC,qEAAqE,EAAE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;SAC3G;QAED,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAE5B,2BAA2B;QAC3B,KAAK,MAAM,aAAa,IAAI,eAAe,CAAC,YAAY,CAAC,EAAE;YACzD,mFAAmF;YACnF,IAAI,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;gBAC/C,SAAQ;aACT;YAED,sCAAsC;YACtC,IAAI,YAA4B,CAAA;YAEhC,MAAM,MAAM,GAAG,IAAI,CAAC,2BAA2B,CAAC,aAAa,CAAC,CAAA;YAE9D,IAAI,MAAM,EAAE;gBACV,YAAY,GAAG,MAAM,CAAC,YAAY,CAAA;aACnC;iBAAM,IAAI,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;gBACrD,YAAY,GAAG,IAAI,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAA;aAC5D;iBAAM;gBACL,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,SAAS,CAAC,CAAA;gBAC5D,YAAY,GAAG,SAAS,YAAY,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAA;aAC/E;YAED,IAAI,YAAY,YAAY,KAAK,EAAE;gBACjC,OAAO,IAAI,KAAK,CACd,IAAA,gBAAM,EACJ,2GAA2G,EAC3G,GAAG,CAAC,QAAQ,EACZ,aAAa,CAAC,QAAQ,EACtB,gBAAgB,EAChB,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAC1C,CACF,CAAA;aACF;YAED,sBAAsB;YACtB,YAAY,CAAC,IAAI,iCAAM,aAAa,KAAE,YAAY,IAAG,CAAA;SACtD;QAED,MAAM,SAAS,mCACV,GAAG,KACN,YAAY,EAAE,gBAAgB,EAC9B,UAAU,EACV,OAAO,EAAE,aAAa,EACtB,YAAY,GACb,CAAA;QAED,SAAS,CAAC,GAAG,EAAE,CAAA;QAEf,IAAI,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAA;QAEhD,IAAI,CAAC,KAAK,EAAE;YACV,KAAK,GAAG,IAAI,GAAG,EAAE,CAAA;YACjB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAA;SAC5C;QAED,sBAAsB;QACtB,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;QAElC,OAAO,SAAS,CAAA;IAClB,CAAC;CACF;AAtXD,wCAsXC;AAED;;;;GAIG;AACH,SAAgB,eAAe,CAAC,aAAsC;IACpE,MAAM,GAAG,GAAG,IAAI,KAAK,EAAgB,CAAA;IAErC,KAAK,MAAM,QAAQ,IAAI,aAAa,EAAE;QACpC,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,QAAQ,CAAC,YAAY,EAAE;YACjD,KAAK,MAAM,QAAQ,IAAI,KAAK,EAAE;gBAC5B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,KAAK,QAAQ,IAAI,GAAG,CAAC,iBAAiB,KAAK,IAAI,CAAC,EAAE;oBACnF,GAAG,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAA;iBAChD;aACF;SACF;QAED,KAAK,MAAM,QAAQ,IAAI,QAAQ,CAAC,UAAU,EAAE;YAC1C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,KAAK,QAAQ,IAAI,GAAG,CAAC,iBAAiB,KAAK,QAAQ,CAAC,gBAAgB,CAAC,EAAE;gBACxG,GAAG,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,CAAC,gBAAgB,EAAE,CAAC,CAAA;aACrE;SACF;KACF;IAED,OAAO,GAAG,CAAA;AACZ,CAAC;AApBD,0CAoBC;AAED;;;;GAIG;AACH,SAAgB,uBAAuB,CAAC,UAAsB;IAC5D,MAAM,SAAS,GAAG,IAAI,KAAK,EAAoB,CAAA;IAE/C,KAAK,MAAM,MAAM,IAAI,UAAU,CAAC,MAAM,EAAE,EAAE;QACxC,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE;YACxC,KAAK,MAAM,MAAM,IAAI,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE;gBAChD,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,MAAM,CAAA;gBAEvD,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;gBAEjC,IAAI,IAAI,EAAE;oBACR,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAA;iBACjC;gBAED,IAAI,KAAK,EAAE;oBACT,SAAS,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAA;iBAClC;gBAED,IAAI,CAAC,IAAI,EAAE;oBACT,SAAQ;iBACT;gBAED,IAAI,IAAI,CAAC,IAAI,EAAE;oBACb,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;iBAC1B;qBAAM;oBACL,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAA;iBACxC;aACF;SACF;KACF;IAED,OAAO,SAAS,CAAA;AAClB,CAAC;AAhCD,0DAgCC"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"extractor.js","sourceRoot":"","sources":["../../src/analyzer/extractor.ts"],"names":[],"mappings":"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"}

package/build/analyzer/methods.js

@@ -92,9 +92,7 @@ function analyzeMethods(controllerClass, controllerUriPrefix, filePath, absolute
         (0, logging_1.debug)('├─── Parsed URI name to route: {yellow}', (0, route_1.debugUri)(route, chalk_1.blue));
         // Analyze the method's arguments
         (0, logging_1.debug)('├─── Analyzing arguments...');
-        const params = (0, params_1.analyzeParams)(httpMethod, route, method.getParameters(), filePath, absoluteSrcPath);
-        if (params instanceof Error)
-            return params;
+        const params = (0, params_1.extractParams)({ controllerClass, httpMethod, route, method, filePath, absoluteSrcPath });
         // Get the method's return type
         (0, logging_1.debug)('├─── Resolving return type...');
         const returnType = (0, typedeps_1.resolveTypeDependencies)(method.getReturnType(), filePath, absoluteSrcPath);
@@ -112,4 +110,4 @@ function analyzeMethods(controllerClass, controllerUriPrefix, filePath, absolute
     return collected;
 }
 exports.analyzeMethods = analyzeMethods;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0aG9kcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hbmFseXplci9tZXRob2RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7R0FFRzs7O0FBRUgsaUNBQTRCO0FBQzVCLHVDQUFvRTtBQUNwRSx3Q0FBMEM7QUFDMUMscUNBQXlEO0FBQ3pELG1DQUFxRDtBQUNyRCx5Q0FBc0U7QUF5QnRFOztHQUVHO0FBQ0gsSUFBWSxhQU1YO0FBTkQsV0FBWSxhQUFhO0lBQ3ZCLDRCQUFXLENBQUE7SUFDWCw4QkFBYSxDQUFBO0lBQ2IsNEJBQVcsQ0FBQTtJQUNYLGdDQUFlLENBQUE7SUFDZixrQ0FBaUIsQ0FBQTtBQUNuQixDQUFDLEVBTlcsYUFBYSxHQUFiLHFCQUFhLEtBQWIscUJBQWEsUUFNeEI7QUFFRDs7Ozs7O0dBTUc7QUFDSCxTQUFnQixjQUFjLENBQzVCLGVBQWlDLEVBQ2pDLG1CQUFrQyxFQUNsQyxRQUFnQixFQUNoQixlQUF1QjtJQUV2QixrQkFBa0I7SUFDbEIsTUFBTSxTQUFTLEdBQUcsSUFBSSxLQUFLLEVBQWEsQ0FBQTtJQUV4Qyw4QkFBOEI7SUFDOUIsTUFBTSxPQUFPLEdBQUcsZUFBZSxDQUFDLG1CQUFtQixFQUFFLENBQUMsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLFlBQVksNEJBQWlCLENBQXdCLENBQUE7SUFFaEksS0FBSyxNQUFNLE1BQU0sSUFBSSxPQUFPLEVBQUU7UUFDNUIsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLE9BQU8sRUFBRSxDQUFBO1FBRW5DLElBQUEsZUFBSyxFQUFDLDJCQUEyQixFQUFFLFVBQVUsQ0FBQyxDQUFBO1FBRTlDLDBDQUEwQztRQUMxQyxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsYUFBYSxFQUFFLENBQUMsTUFBTSxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDLFFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWV0aG9kcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9hbmFseXplci9tZXRob2RzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQTs7R0FFRzs7O0FBRUgsaUNBQTRCO0FBQzVCLHVDQUFvRTtBQUNwRSx3Q0FBMEM7QUFDMUMscUNBQXlEO0FBQ3pELG1DQUFxRDtBQUNyRCx5Q0FBc0U7QUF5QnRFOztHQUVHO0FBQ0gsSUFBWSxhQU1YO0FBTkQsV0FBWSxhQUFhO0lBQ3ZCLDRCQUFXLENBQUE7SUFDWCw4QkFBYSxDQUFBO0lBQ2IsNEJBQVcsQ0FBQTtJQUNYLGdDQUFlLENBQUE7SUFDZixrQ0FBaUIsQ0FBQTtBQUNuQixDQUFDLEVBTlcsYUFBYSxHQUFiLHFCQUFhLEtBQWIscUJBQWEsUUFNeEI7QUFFRDs7Ozs7O0dBTUc7QUFDSCxTQUFnQixjQUFjLENBQzVCLGVBQWlDLEVBQ2pDLG1CQUFrQyxFQUNsQyxRQUFnQixFQUNoQixlQUF1QjtJQUV2QixrQkFBa0I7SUFDbEIsTUFBTSxTQUFTLEdBQUcsSUFBSSxLQUFLLEVBQWEsQ0FBQTtJQUV4Qyw4QkFBOEI7SUFDOUIsTUFBTSxPQUFPLEdBQUcsZUFBZSxDQUFDLG1CQUFtQixFQUFFLENBQUMsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxJQUFJLFlBQVksNEJBQWlCLENBQXdCLENBQUE7SUFFaEksS0FBSyxNQUFNLE1BQU0sSUFBSSxPQUFPLEVBQUU7UUFDNUIsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDLE9BQU8sRUFBRSxDQUFBO1FBRW5DLElBQUEsZUFBSyxFQUFDLDJCQUEyQixFQUFFLFVBQVUsQ0FBQyxDQUFBO1FBRTlDLDBDQUEwQztRQUMxQyxNQUFNLFVBQVUsR0FBRyxNQUFNLENBQUMsYUFBYSxFQUFFLENBQUMsTUFBTSxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDLFFB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

package/build/analyzer/params.d.ts

@@ -1,30 +1,66 @@
 /**
  * @file Analyzer for the source API's controllers' methods' parameters
  */
-import { ParameterDeclaration } from 'ts-morph';
+import { ClassDeclaration, Decorator, MethodDeclaration, ParameterDeclaration } from 'ts-morph';
 import { SdkHttpMethod } from './methods';
 import { Route } from './route';
 import { ResolvedTypeDeps } from './typedeps';
+/**
+ * Type of a parameter that must be passed to an SDK method: Body, Query or Route Param
+ * Supports accessing parameters individually by key or as a whole object
+ *
+ * EXAMPLE
+ *
+ * Controller Method:
+ *
+ * getStuff(@Query('email') email: string, @Query('companyId'): CompanyId)
+ *
+ * SDK Method Param:
+ * { email: string, companyId: CompanyId }
+ *
+ * OR
+ *
+ * Controller Method:
+ * type EmailAndCompanyId = { email: string, companyId: CompanyId }
+ * getStuff(@Query(): EmailAndCompanyId)
+ *
+ * SDK Method Param:
+ * EmailAndCompanyId
+ */
+export declare type SdkMethodParam = SdkMethodParamMap | ResolvedTypeDeps | null;
+export declare type SdkMethodParamMap = {
+    [key: string]: ResolvedTypeDeps;
+};
+export declare const isParamResolvedType: (param: SdkMethodParam) => param is ResolvedTypeDeps;
+export declare const getParamResolvedTypes: (param: SdkMethodParam) => ResolvedTypeDeps[];
 /**
  * SDK interface for a controller's method's parameters
  */
 export interface SdkMethodParams {
-    /** Route parameters */
-    parameters: Map<string, ResolvedTypeDeps> | null;
-    /** Query parameters */
-    query: Map<string, ResolvedTypeDeps> | null;
-    /** Body parameters */
-    body: SdkMethodBodyParam | null;
+    routeParams: SdkMethodParam;
+    queryParams: SdkMethodParam;
+    bodyParams: SdkMethodParam;
+    context: MethodContext;
 }
-/**
- * Single body parameter in a SDK's method
- */
-export declare type SdkMethodBodyParam = {
-    full: true;
-    type: ResolvedTypeDeps;
-} | {
-    full: false;
-    fields: Map<string, ResolvedTypeDeps>;
+export declare type MethodContext = {
+    controllerClass: ClassDeclaration;
+    method: MethodDeclaration;
+    httpMethod: SdkHttpMethod;
+    route: Route;
+    filePath: string;
+    absoluteSrcPath: string;
+};
+export declare enum ArgDecorator {
+    Param = "Param",
+    Query = "Query",
+    Body = "Body"
+}
+export declare type DecoratedArg = {
+    arg: ParameterDeclaration;
+    argParamKey: string | null;
+    decorator: Decorator;
+    decoratorType: ArgDecorator;
+    context: MethodContext;
 };
 /**
  * Generate a SDK interface for a controller's method's parameters
@@ -35,4 +71,10 @@ export declare type SdkMethodBodyParam = {
  * @param absoluteSrcPath Absolute path to the source directory
  * @returns A SDK interface for the method's parameters
  */
-export declare function analyzeParams(httpMethod: SdkHttpMethod, route: Route, args: ParameterDeclaration[], filePath: string, absoluteSrcPath: string): SdkMethodParams | Error;
+export declare function extractParams(context: MethodContext): SdkMethodParams;
+export declare function extractDecoratedArgs(context: MethodContext): Record<ArgDecorator, DecoratedArg[]>;
+export declare function extractArgParamKey(context: MethodContext & {
+    arg: ParameterDeclaration;
+    decorator: Decorator;
+}): string | null;
+export declare function mergeDecoratedArgs(decoratedArgs: DecoratedArg[]): SdkMethodParam;

package/build/analyzer/params.js

@@ -3,12 +3,34 @@
  * @file Analyzer for the source API's controllers' methods' parameters
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.analyzeParams = void 0;
+exports.mergeDecoratedArgs = exports.extractArgParamKey = exports.extractDecoratedArgs = exports.extractParams = exports.ArgDecorator = exports.getParamResolvedTypes = exports.isParamResolvedType = void 0;
+const ts_morph_1 = require("ts-morph");
 const logging_1 = require("../logging");
-const decorator_1 = require("./decorator");
-const methods_1 = require("./methods");
 const route_1 = require("./route");
 const typedeps_1 = require("./typedeps");
+const isParamResolvedType = (param) => {
+    if (param === null) {
+        return false;
+    }
+    return 'rawType' in param && 'resolvedType' in param && 'relativeFilePath' in param && 'dependencies' in param && 'localTypes' in param;
+};
+exports.isParamResolvedType = isParamResolvedType;
+const getParamResolvedTypes = (param) => {
+    if (param === null) {
+        return [];
+    }
+    if ((0, exports.isParamResolvedType)(param)) {
+        return [param];
+    }
+    return Object.values(param);
+};
+exports.getParamResolvedTypes = getParamResolvedTypes;
+var ArgDecorator;
+(function (ArgDecorator) {
+    ArgDecorator["Param"] = "Param";
+    ArgDecorator["Query"] = "Query";
+    ArgDecorator["Body"] = "Body";
+})(ArgDecorator = exports.ArgDecorator || (exports.ArgDecorator = {}));
 /**
  * Generate a SDK interface for a controller's method's parameters
  * @param httpMethod The method's HTTP method
@@ -18,146 +40,129 @@ const typedeps_1 = require("./typedeps");
  * @param absoluteSrcPath Absolute path to the source directory
  * @returns A SDK interface for the method's parameters
  */
-function analyzeParams(httpMethod, route, args, filePath, absoluteSrcPath) {
-    var _a, _b, _c, _d;
-    // The collected informations we will return
-    const collected = {
-        parameters: null,
-        query: null,
-        body: null,
+function extractParams(context) {
+    const { route, filePath } = context;
+    const { Param, Query, Body } = extractDecoratedArgs(context);
+    const resolvedParams = {
+        routeParams: mergeDecoratedArgs(Param),
+        queryParams: mergeDecoratedArgs(Query),
+        bodyParams: mergeDecoratedArgs(Body),
+        context,
     };
-    // Get the named parameters of the route
-    const routeParams = (0, route_1.paramsOfRoute)(route);
-    // Treat all arguments (to not confuse with the route's parameters)
+    /**
+     * Validate Route Params exist in route URL
+     */
+    const { routeParams } = resolvedParams;
+    if (routeParams) {
+        const allowedRouteParams = new Set((0, route_1.paramsFromRoute)(route));
+        const usedRouteParams = routeParams instanceof ts_morph_1.Type ?
+            // If routeParams was resolved to a single type, assume there's only one decorated argument
+            Param[0].arg.getType().getProperties().map((prop) => prop.getName()) :
+            // If routeParams was resolved to a map, assume the keys are the route params
+            Object.keys(routeParams);
+        for (const usedParam of usedRouteParams) {
+            if (!allowedRouteParams.has(usedParam)) {
+                panicWithContext(`Route param ${usedParam} does not appear in route URL`, context);
+            }
+        }
+    }
+    return resolvedParams;
+}
+exports.extractParams = extractParams;
+function extractDecoratedArgs(context) {
+    const decoratedArgs = {
+        [ArgDecorator.Param]: [],
+        [ArgDecorator.Query]: [],
+        [ArgDecorator.Body]: [],
+    };
+    const { method, filePath, controllerClass } = context;
+    const args = method.getParameters();
     for (const arg of args) {
-        const name = arg.getName();
-        (0, logging_1.debug)('├───── Detected argument: {yellow}', name);
+        const argName = arg.getName();
+        (0, logging_1.debug)('├───── Detected argument: {yellow}', argName);
         // Arguments are collected as soon as they have a decorator like @Query() or @Body()
-        const decs = arg.getDecorators();
-        if (decs.length === 0) {
+        const argDecorators = arg.getDecorators().filter((dec) => Object.values(ArgDecorator).includes(dec.getName()));
+        if (argDecorators.length === 0) {
             // If we have no argument, this is not an argument we are interested in, so we just skip it
             (0, logging_1.debug)('├───── Skipping this argument as it does not have a decorator');
             continue;
         }
-        else if (decs.length > 1) {
-            // If we have more than one decorator, this could mean we have for instance an @NotEmpty() @Query() or something like this,
-            //  which is currently not supported.
-            return new Error('Skipping this argument as it has multiple decorators, which is currently not supported');
+        else if (argDecorators.length > 1) {
+            (0, logging_1.panic)(`${controllerClass.getName()} ${method.getName()} has multiple decorators on argument ${argName} ${argDecorators.map((dec) => dec.getName()).join(', ')}`);
         }
         // Get the only decrator
-        const dec = decs[0];
-        const decName = dec.getName();
-        // Treat the @Param() decorator
-        if (decName === 'Param') {
-            (0, logging_1.debug)('├───── Detected decorator {blue}', '@Param');
-            // We expect a single string argument for this decorator,
-            // which is the route parameter's name
-            const paramName = (0, decorator_1.expectSingleStrLitDecorator)(dec);
-            if (paramName instanceof Error)
-                return paramName;
-            // If there is no argument, this argument is a global receiver which maps the full set of parameters
-            // We theorically *could* extract the type informations from this object type, but this would be insanely complex
-            // So, we just skip it as it's a lot more simple, and is not commonly used anyway as it has a set of downsides
-            if (paramName === null) {
-                (0, logging_1.warn)('├───── Skipping this argument as it is a generic parameters receiver, which is currently not supported');
-                continue;
-            }
-            // Ensure the specified parameter appears in the method's route
-            if (!routeParams.includes(paramName))
-                return new Error((0, logging_1.format)('├───── Cannot map unknown parameter {yellow}', paramName));
-            (0, logging_1.debug)('├───── Mapping argument to parameter: {yellow}', paramName);
-            // Get the route parameter's type
-            const typ = (0, typedeps_1.resolveTypeDependencies)(arg.getType(), filePath, absoluteSrcPath);
-            (0, logging_1.debug)('├───── Detected parameter type: {yellow} ({magentaBright} dependencies)', typ.resolvedType, typ.dependencies.size);
-            // Update the method's route parameters
-            if (paramName in {}) {
-                return new Error((0, logging_1.format)(`Detected @Param() field whose name {yellow} collides with a JavaScript's native object property`, paramName));
-            }
-            (_a = collected.parameters) !== null && _a !== void 0 ? _a : (collected.parameters = new Map());
-            collected.parameters.set(paramName, typ);
+        const decorator = argDecorators[0];
+        const decoratorType = decorator.getName();
+        const argParamKey = extractArgParamKey(Object.assign(Object.assign({}, context), { arg, decorator }));
+        const argType = arg.getType();
+        if (!argParamKey && !argType.isObject()) {
+            (0, logging_1.panic)(`${controllerClass.getName()} ${method.getName()} generic controller argument ${decoratorType}() ${argName} must be an object type`);
         }
-        // Treat the @Query() decorator
-        else if (decName === 'Query') {
-            (0, logging_1.debug)('├───── Detected decorator {blue}', '@Query');
-            // We expect a single string argument for this decorator,
-            // which is the query parameter's name
-            const queryName = (0, decorator_1.expectSingleStrLitDecorator)(dec);
-            if (queryName instanceof Error)
-                return queryName;
-            // If there is no argument, this argument is a global receiver which maps the full set of parameters
-            // We theorically *could* extract the type informations from this object type, but this would be insanely complex
-            // So, we just skip it as it's a lot more simple, and is not commonly used anyway as it has a set of downsides
-            if (queryName === null) {
-                (0, logging_1.warn)('├───── Skipping this argument as it is a generic query receiver');
-                continue;
-            }
-            (0, logging_1.debug)('├───── Mapping argument to query: {yellow}', queryName);
-            // Get the parameter's type
-            const typ = (0, typedeps_1.resolveTypeDependencies)(arg.getType(), filePath, absoluteSrcPath);
-            (0, logging_1.debug)(`├───── Detected query type: {yellow} ({magentaBright} dependencies)`, typ.resolvedType, typ.dependencies.size);
-            // Update the method's query parameter
-            if (queryName in {}) {
-                return new Error((0, logging_1.format)(`Detected @Query() field whose name {yellow} collides with a JavaScript's native object property`, queryName));
+        decoratedArgs[decoratorType].push({
+            arg,
+            argParamKey,
+            decorator,
+            decoratorType,
+            context,
+        });
+    }
+    return decoratedArgs;
+}
+exports.extractDecoratedArgs = extractDecoratedArgs;
+function extractArgParamKey(context) {
+    const { decorator, controllerClass, method, arg } = context;
+    const decoratorArgs = decorator.getArguments();
+    if (decoratorArgs.length > 1) {
+        (0, logging_1.panic)(`${controllerClass.getName()} ${method.getName()} ${decorator.getName()}() ${arg.getName()} argument decorator has multiple parameters`);
+    }
+    else if (decoratorArgs.length === 0) {
+        return null;
+    }
+    const decoratorArg = decoratorArgs[0];
+    if (!ts_morph_1.Node.isStringLiteral(decoratorArg)) {
+        (0, logging_1.panic)('The argument provided to the decorator is not a string literal:\n>>> {cyan}', arg.getText());
+    }
+    const paramKey = decoratorArg.getLiteralText();
+    if (paramKey in {}) {
+        panicWithContext(`${decorator.getName()}('${paramKey}') param name collides with JavaScript native object property`, context);
+    }
+    return paramKey;
+}
+exports.extractArgParamKey = extractArgParamKey;
+function mergeDecoratedArgs(decoratedArgs) {
+    let genericParam = null;
+    let paramMap = {};
+    for (const decoratedArg of decoratedArgs) {
+        const { argParamKey, decoratorType, arg, context } = decoratedArg;
+        const resolvedType = (0, typedeps_1.resolveTypeDependencies)(arg.getType(), context.filePath, context.absoluteSrcPath);
+        if (argParamKey) {
+            if (paramMap[argParamKey]) {
+                panicWithContext(`${decoratorType}('${argParamKey}') used twice in controller method`, decoratedArg.context);
             }
-            (_b = collected.query) !== null && _b !== void 0 ? _b : (collected.query = new Map());
-            collected.query.set(queryName, typ);
+            paramMap[argParamKey] = resolvedType;
         }
-        // Treat the @Body() decorator
-        else if (decName === 'Body') {
-            (0, logging_1.debug)('├───── Detected decorator {blue}', '@Body');
-            // GET requests cannot have a BODY
-            if (httpMethod === methods_1.SdkHttpMethod.Get) {
-                return new Error('GET requests cannot have a BODY!');
-            }
-            // We expect a single string argument for this decorator,
-            // which is the body field's name
-            const fieldName = (0, decorator_1.expectSingleStrLitDecorator)(dec);
-            if (fieldName instanceof Error)
-                return fieldName;
-            // Get the field's type
-            const typ = (0, typedeps_1.resolveTypeDependencies)(arg.getType(), filePath, absoluteSrcPath);
-            const depsCount = typ.dependencies.size;
-            (0, logging_1.debug)(`├───── Detected BODY type: {cyan} ({magentaBright} ${depsCount === 0 ? 'no dependency' : depsCount > 1 ? 'dependencies' : 'dependency'})`, typ.resolvedType, depsCount);
-            // If there no name was provided to the decorator, then the decorator is a generic receiver which means it maps to the full body type
-            // This also means we can map the BODY type to this argument's type
-            if (fieldName === null) {
-                const body = collected.body;
-                // If we previously had an @Body(<name>) decorator on another argument, we have an important risk of mistyping
-                // => e.g. `@Body("a") a: string, @Body() body: { a: number }` is invalid as the type for the `a` field mismatches
-                // => It's easy to make an error as the @Body() type is often hidden behind a DTO
-                // But that's extremely complex to check automatically, so we just display a warning instead
-                // Also, that's not the kind of thing we make on purpose very often, so it's more likely it's an error, which makes it even more important
-                //  to display a warning here.
-                if ((body === null || body === void 0 ? void 0 : body.full) === false)
-                    (0, logging_1.warn)('├───── Detected full @Body() decorator after a single parameter. This is considered a bad practice, avoid it if you can!');
-                // Having two generic @Body() decorators is meaningless and will likey lead to errors, so we return a precise error here
-                else if (body === null || body === void 0 ? void 0 : body.full) {
-                    return new Error((0, logging_1.format)(`Detected two @Body() decorators: found {yellow} previously, while method argument {yellow} indicates type {yellow}`, body.type.resolvedType, name, typ.resolvedType));
-                }
-                (0, logging_1.debug)("├───── Mapping argument to full request's body");
-                // Update the whole BODY type
-                collected.body = { full: true, type: typ };
-            }
-            else {
-                // Here we have an @Body(<string>) decorator
-                // If we previously had an @Body() decorator, this can lead to several types of errors (see the big comment above for more informations)
-                if ((_c = collected.body) === null || _c === void 0 ? void 0 : _c.full) {
-                    (0, logging_1.warn)('├───── Detected single @Body() decorator after a full parameter. This is considered a bad practice, avoid it if you can!');
-                }
-                else {
-                    (0, logging_1.debug)('├───── Mapping argument to BODY field: {yellow}', fieldName);
-                    // Update the BODY type by adding the current field to it
-                    if (fieldName in {}) {
-                        return new Error((0, logging_1.format)(`Detected @Body() field whose name {yellow} collides with a JavaScript's native object property`, fieldName));
-                    }
-                    (_d = collected.body) !== null && _d !== void 0 ? _d : (collected.body = { full: false, fields: new Map() });
-                    collected.body.fields.set(fieldName, typ);
-                }
+        else {
+            if (genericParam) {
+                panicWithContext(`${decoratorType}() used twice in controller method`, decoratedArg.context);
             }
+            genericParam = resolvedType;
         }
     }
-    // Success!
-    return collected;
+    const hasArgsByKey = Object.keys(paramMap).length > 0;
+    if (genericParam && hasArgsByKey) {
+        panicWithContext(`Cannot mix generic and specific ${decoratedArgs[0].decoratorType}()`, decoratedArgs[0].context);
+    }
+    return hasArgsByKey ? paramMap : genericParam;
 }
-exports.analyzeParams = analyzeParams;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyYW1zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FuYWx5emVyL3BhcmFtcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7O0dBRUc7OztBQUdILHdDQUFnRDtBQUNoRCwyQ0FBeUQ7QUFDekQsdUNBQXlDO0FBQ3pDLG1DQUE4QztBQUM5Qyx5Q0FBc0U7QUFxQnRFOzs7Ozs7OztHQVFHO0FBQ0gsU0FBZ0IsYUFBYSxDQUMzQixVQUF5QixFQUN6QixLQUFZLEVBQ1osSUFBNEIsRUFDNUIsUUFBZ0IsRUFDaEIsZUFBdUI7O0lBRXZCLDRDQUE0QztJQUM1QyxNQUFNLFNBQVMsR0FBb0I7UUFDakMsVUFBVSxFQUFFLElBQUk7UUFDaEIsS0FBSyxFQUFFLElBQUk7UUFDWCxJQUFJLEVBQUUsSUFBSTtLQUNYLENBQUE7SUFFRCx3Q0FBd0M7SUFDeEMsTUFBTSxXQUFXLEdBQUcsSUFBQSxxQkFBYSxFQUFDLEtBQUssQ0FBQyxDQUFBO0lBRXhDLG1FQUFtRTtJQUNuRSxLQUFLLE1BQU0sR0FBRyxJQUFJLElBQUksRUFBRTtRQUN0QixNQUFNLElBQUksR0FBRyxHQUFHLENBQUMsT0FBTyxFQUFFLENBQUE7UUFFMUIsSUFBQSxlQUFLLEVBQUMsb0NBQW9DLEVBQUUsSUFBSSxDQUFDLENBQUE7UUFFakQsb0ZBQW9GO1FBQ3BGLE1BQU0sSUFBSSxHQUFHLEdBQUcsQ0FBQyxhQUFhLEVBQUUsQ0FBQTtRQUVoQyxJQUFJLElBQUksQ0FBQyxNQUFNLEtBQUssQ0FBQyxFQUFFO1lBQ3JCLDJGQUEyRjtZQUMzRixJQUFBLGVBQUssRUFBQywrREFBK0QsQ0FBQyxDQUFBO1lBQ3RFLFNBQVE7U0FDVDthQUFNLElBQUksSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUU7WUFDMUIsMkhBQTJIO1lBQzNILHFDQUFxQztZQUNyQyxPQUFPLElBQUksS0FBSyxDQUFDLHdGQUF3RixDQUFDLENBQUE7U0FDM0c7UUFFRCx3QkFBd0I7UUFDeEIs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
+exports.mergeDecoratedArgs = mergeDecoratedArgs;
+const panicWithContext = (message, context) => {
+    const { controllerClass, httpMethod, method, filePath } = context;
+    const ctx = {
+        controller: controllerClass.getName(),
+        method: method.getName(),
+        httpMethod,
+        filePath,
+    };
+    (0, logging_1.panic)(`${message}\n${JSON.stringify(ctx, null, 2)}`);
+};
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyYW1zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2FuYWx5emVyL3BhcmFtcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUE7O0dBRUc7OztBQUVILHVDQUEyRztBQUMzRyx3Q0FBeUM7QUFFekMsbUNBQWdEO0FBQ2hELHlDQUFzRTtBQTZCL0QsTUFBTSxtQkFBbUIsR0FBRyxDQUFDLEtBQXFCLEVBQTZCLEVBQUU7SUFDdEYsSUFBSSxLQUFLLEtBQUssSUFBSSxFQUFFO1FBQ2xCLE9BQU8sS0FBSyxDQUFBO0tBQ2I7SUFDRCxPQUFPLFNBQVMsSUFBSSxLQUFLLElBQUksY0FBYyxJQUFJLEtBQUssSUFBSSxrQkFBa0IsSUFBSSxLQUFLLElBQUksY0FBYyxJQUFJLEtBQUssSUFBSSxZQUFZLElBQUksS0FBSyxDQUFBO0FBQ3pJLENBQUMsQ0FBQTtBQUxZLFFBQUEsbUJBQW1CLHVCQUsvQjtBQUVNLE1BQU0scUJBQXFCLEdBQUcsQ0FBQyxLQUFxQixFQUFzQixFQUFFO0lBQ2pGLElBQUksS0FBSyxLQUFLLElBQUksRUFBRTtRQUNsQixPQUFPLEVBQUUsQ0FBQTtLQUNWO0lBQ0QsSUFBSSxJQUFBLDJCQUFtQixFQUFDLEtBQUssQ0FBQyxFQUFFO1FBQzlCLE9BQU8sQ0FBQyxLQUFLLENBQUMsQ0FBQTtLQUNmO0lBQ0QsT0FBTyxNQUFNLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFBO0FBQzdCLENBQUMsQ0FBQTtBQVJZLFFBQUEscUJBQXFCLHlCQVFqQztBQXFCRCxJQUFZLFlBSVg7QUFKRCxXQUFZLFlBQVk7SUFDdEIsK0JBQWUsQ0FBQTtJQUNmLCtCQUFlLENBQUE7SUFDZiw2QkFBYSxDQUFBO0FBQ2YsQ0FBQyxFQUpXLFlBQVksR0FBWixvQkFBWSxLQUFaLG9CQUFZLFFBSXZCO0FBV0Q7Ozs7Ozs7O0dBUUc7QUFDSCxTQUFnQixhQUFhLENBQzNCLE9BQXNCO0lBRXRCLE1BQU0sRUFBRSxLQUFLLEVBQUUsUUFB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

package/build/analyzer/route.d.ts

@@ -27,7 +27,10 @@ export declare function analyzeUri(uriPath: string): Route | Error;
  * Get the named parameters of a parsed route
  * @param route
  */
-export declare function paramsOfRoute(route: Route): string[];
+export declare function routePartIsParam(part: RoutePart): part is {
+    readonly param: string;
+};
+export declare function paramsFromRoute(route: Route): string[];
 /**
  * Convert a route back to its original string
  * @param route