@tsoa-next/cli 7.1.0 → 7.2.1

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 (53) hide show
  1. package/README.MD +8 -2
  2. package/dist/cli.d.ts +4 -1
  3. package/dist/cli.js +91 -21
  4. package/dist/cli.js.map +1 -1
  5. package/dist/metadataGeneration/controllerGenerator.js +7 -7
  6. package/dist/metadataGeneration/controllerGenerator.js.map +1 -1
  7. package/dist/metadataGeneration/exceptions.js +8 -2
  8. package/dist/metadataGeneration/exceptions.js.map +1 -1
  9. package/dist/metadataGeneration/extension.js +25 -1
  10. package/dist/metadataGeneration/extension.js.map +1 -1
  11. package/dist/metadataGeneration/initializer-value.d.ts +8 -2
  12. package/dist/metadataGeneration/initializer-value.js +18 -9
  13. package/dist/metadataGeneration/initializer-value.js.map +1 -1
  14. package/dist/metadataGeneration/metadataGenerator.js +1 -1
  15. package/dist/metadataGeneration/metadataGenerator.js.map +1 -1
  16. package/dist/metadataGeneration/methodGenerator.d.ts +2 -0
  17. package/dist/metadataGeneration/methodGenerator.js +60 -21
  18. package/dist/metadataGeneration/methodGenerator.js.map +1 -1
  19. package/dist/metadataGeneration/parameterGenerator.js +46 -26
  20. package/dist/metadataGeneration/parameterGenerator.js.map +1 -1
  21. package/dist/metadataGeneration/transformer/propertyTransformer.js +2 -1
  22. package/dist/metadataGeneration/transformer/propertyTransformer.js.map +1 -1
  23. package/dist/metadataGeneration/transformer/referenceTransformer.js +4 -2
  24. package/dist/metadataGeneration/transformer/referenceTransformer.js.map +1 -1
  25. package/dist/metadataGeneration/typeResolver.d.ts +2 -2
  26. package/dist/metadataGeneration/typeResolver.js +27 -24
  27. package/dist/metadataGeneration/typeResolver.js.map +1 -1
  28. package/dist/module/generate-routes.js +1 -1
  29. package/dist/module/generate-routes.js.map +1 -1
  30. package/dist/routeGeneration/defaultRouteGenerator.js.map +1 -1
  31. package/dist/swagger/specGenerator.d.ts +3 -0
  32. package/dist/swagger/specGenerator.js +61 -3
  33. package/dist/swagger/specGenerator.js.map +1 -1
  34. package/dist/swagger/specGenerator2.d.ts +5 -1
  35. package/dist/swagger/specGenerator2.js +105 -61
  36. package/dist/swagger/specGenerator2.js.map +1 -1
  37. package/dist/swagger/specGenerator3.d.ts +7 -7
  38. package/dist/swagger/specGenerator3.js +55 -38
  39. package/dist/swagger/specGenerator3.js.map +1 -1
  40. package/dist/swagger/specGenerator31.d.ts +1 -0
  41. package/dist/swagger/specGenerator31.js +3 -0
  42. package/dist/swagger/specGenerator31.js.map +1 -1
  43. package/dist/utils/decoratorUtils.d.ts +9 -6
  44. package/dist/utils/decoratorUtils.js +162 -21
  45. package/dist/utils/decoratorUtils.js.map +1 -1
  46. package/dist/utils/jsDocUtils.js +6 -3
  47. package/dist/utils/jsDocUtils.js.map +1 -1
  48. package/dist/utils/jsonUtils.d.ts +1 -1
  49. package/dist/utils/pathUtils.js +32 -5
  50. package/dist/utils/pathUtils.js.map +1 -1
  51. package/dist/utils/validatorUtils.js +15 -8
  52. package/dist/utils/validatorUtils.js.map +1 -1
  53. package/package.json +4 -4
@@ -42,8 +42,11 @@ exports.isExistJSDocTag = isExistJSDocTag;
42
42
  exports.commentToString = commentToString;
43
43
  const ts = __importStar(require("typescript"));
44
44
  const exceptions_1 = require("../metadataGeneration/exceptions");
45
+ function getJsDocs(node) {
46
+ return node.jsDoc ?? [];
47
+ }
45
48
  function getJSDocDescription(node) {
46
- const jsDocs = node.jsDoc;
49
+ const jsDocs = getJsDocs(node);
47
50
  if (!jsDocs || !jsDocs.length) {
48
51
  return undefined;
49
52
  }
@@ -71,7 +74,7 @@ function getJSDocComments(node, tagName) {
71
74
  }
72
75
  function getJSDocTagNames(node, requireTagName = false) {
73
76
  let tags;
74
- if (node.kind === ts.SyntaxKind.Parameter) {
77
+ if (ts.isParameter(node) && ts.isIdentifier(node.name)) {
75
78
  const parameterName = node.name.text;
76
79
  tags = getJSDocTags(node.parent, tag => {
77
80
  if (ts.isJSDocParameterTag(tag)) {
@@ -93,7 +96,7 @@ function getJSDocTagNames(node, requireTagName = false) {
93
96
  });
94
97
  }
95
98
  function getJSDocTags(node, isMatching) {
96
- const jsDocs = node.jsDoc;
99
+ const jsDocs = getJsDocs(node);
97
100
  if (!jsDocs || jsDocs.length === 0) {
98
101
  return [];
99
102
  }
@@ -1 +1 @@
1
- {"version":3,"file":"jsDocUtils.js","sourceRoot":"","sources":["../../src/utils/jsDocUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"jsDocUtils.js","sourceRoot":"","sources":["../../src/utils/jsDocUtils.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- export declare function safeFromJson(json: string): any;
1
+ export declare function safeFromJson(json: string): unknown;
@@ -16,13 +16,10 @@ function normalisePath(path, withPrefix, withSuffix, skipPrefixAndSuffixIfEmpty
16
16
  if (!path || typeof path !== 'string') {
17
17
  path = '' + path;
18
18
  }
19
- // normalise beginning and end of the path
20
- let normalised = path.replace(/^[/\\\s]+|[/\\\s]+$/g, '');
19
+ let normalised = trimPathDelimiters(path);
21
20
  normalised = withPrefix ? withPrefix + normalised : normalised;
22
21
  normalised = withSuffix ? normalised + withSuffix : normalised;
23
- // normalise / signs amount in all path
24
- normalised = normalised.replace(/[/\\\s]+/g, '/');
25
- return normalised;
22
+ return collapsePathDelimiters(normalised);
26
23
  }
27
24
  function convertColonPathParams(path) {
28
25
  if (!path || typeof path !== 'string') {
@@ -34,4 +31,34 @@ function convertColonPathParams(path) {
34
31
  function convertBracesPathParams(path) {
35
32
  return path.replace(/{(\w*)}/g, ':$1');
36
33
  }
34
+ function trimPathDelimiters(path) {
35
+ let start = 0;
36
+ let end = path.length;
37
+ while (start < end && isPathDelimiter(path[start])) {
38
+ start++;
39
+ }
40
+ while (end > start && isPathDelimiter(path[end - 1])) {
41
+ end--;
42
+ }
43
+ return path.slice(start, end);
44
+ }
45
+ function collapsePathDelimiters(path) {
46
+ const normalisedChars = [];
47
+ let previousWasDelimiter = false;
48
+ for (const character of path) {
49
+ if (isPathDelimiter(character)) {
50
+ if (!previousWasDelimiter) {
51
+ normalisedChars.push('/');
52
+ previousWasDelimiter = true;
53
+ }
54
+ continue;
55
+ }
56
+ normalisedChars.push(character);
57
+ previousWasDelimiter = false;
58
+ }
59
+ return normalisedChars.join('');
60
+ }
61
+ function isPathDelimiter(character) {
62
+ return character === '/' || character === '\\' || character.trim() === '';
63
+ }
37
64
  //# sourceMappingURL=pathUtils.js.map
@@ -1 +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"}
1
+ {"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"}
@@ -9,6 +9,13 @@ exports.shouldIncludeValidatorInSchema = shouldIncludeValidatorInSchema;
9
9
  const validator_1 = __importDefault(require("validator"));
10
10
  const exceptions_1 = require("./../metadataGeneration/exceptions");
11
11
  const jsDocUtils_1 = require("./jsDocUtils");
12
+ function parseNumericValidatorValue(value, name) {
13
+ const numericValue = Number(value);
14
+ if (Number.isNaN(numericValue)) {
15
+ throw new exceptions_1.GenerateMetadataError(`${name} parameter use number.`);
16
+ }
17
+ return numericValue;
18
+ }
12
19
  function getParameterValidators(parameter, parameterName) {
13
20
  if (!parameter.parent) {
14
21
  return {};
@@ -53,16 +60,15 @@ function getParameterValidators(parameter, parameterName) {
53
60
  break;
54
61
  case 'minimum':
55
62
  case 'maximum':
63
+ case 'exclusiveMinimum':
64
+ case 'exclusiveMaximum':
56
65
  case 'minItems':
57
66
  case 'maxItems':
58
67
  case 'minLength':
59
68
  case 'maxLength':
60
- if (isNaN(value)) {
61
- throw new exceptions_1.GenerateMetadataError(`${name} parameter use number.`);
62
- }
63
69
  validateObj[name] = {
64
70
  errorMsg: getErrorMsg(comment),
65
- value: Number(value),
71
+ value: parseNumericValidatorValue(value, name),
66
72
  };
67
73
  break;
68
74
  case 'minDate':
@@ -148,16 +154,15 @@ function getPropertyValidators(property) {
148
154
  break;
149
155
  case 'minimum':
150
156
  case 'maximum':
157
+ case 'exclusiveMinimum':
158
+ case 'exclusiveMaximum':
151
159
  case 'minItems':
152
160
  case 'maxItems':
153
161
  case 'minLength':
154
162
  case 'maxLength':
155
- if (isNaN(value)) {
156
- throw new exceptions_1.GenerateMetadataError(`${name} parameter use number.`);
157
- }
158
163
  validateObj[name] = {
159
164
  errorMsg: getErrorMsg((0, jsDocUtils_1.commentToString)(comment)),
160
- value: Number(value),
165
+ value: parseNumericValidatorValue(value, name),
161
166
  };
162
167
  break;
163
168
  case 'minDate':
@@ -221,6 +226,8 @@ function getParameterTagSupport() {
221
226
  'pattern',
222
227
  'minimum',
223
228
  'maximum',
229
+ 'exclusiveMinimum',
230
+ 'exclusiveMaximum',
224
231
  'minDate',
225
232
  'maxDate',
226
233
  'title',
@@ -1 +1 @@
1
- {"version":3,"file":"validatorUtils.js","sourceRoot":"","sources":["../../src/utils/validatorUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"validatorUtils.js","sourceRoot":"","sources":["../../src/utils/validatorUtils.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tsoa-next/cli",
3
- "version": "7.1.0",
3
+ "version": "7.2.1",
4
4
  "description": "Build swagger-compliant REST APIs using TypeScript and Node",
5
5
  "main": "./dist/index.js",
6
6
  "typings": "./dist/index.d.ts",
@@ -33,7 +33,7 @@
33
33
  "author": "Vanna DiCatania <vanna@dicatania.me> (http://www.dicatania.me)",
34
34
  "license": "MIT",
35
35
  "dependencies": {
36
- "@tsoa-next/runtime": "7.1.0",
36
+ "@tsoa-next/runtime": "7.2.1",
37
37
  "@types/multer": "^2.1.0",
38
38
  "fs-extra": "^11.3.4",
39
39
  "glob": "^13.0.6",
@@ -59,8 +59,8 @@
59
59
  "url": "https://github.com/vannadii/tsoa-next.git"
60
60
  },
61
61
  "engines": {
62
- "node": ">=24.14.0",
63
- "npm": ">=11.0.0"
62
+ "node": ">=22.0.0",
63
+ "npm": ">=10.0.0"
64
64
  },
65
65
  "engineStrict": true,
66
66
  "publishConfig": {