@nestia/sdk 3.11.0-dev.20240813-7 → 3.11.0-dev.20240813-9

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.
@@ -13,7 +13,8 @@ const ImportAnalyzer_1 = require("../analyses/ImportAnalyzer");
13
13
  var SdkMetadataProgrammer;
14
14
  (function (SdkMetadataProgrammer) {
15
15
  SdkMetadataProgrammer.write = (p) => {
16
- var _a;
16
+ var _a, _b;
17
+ const signature = p.context.checker.getSignatureFromDeclaration(p.node);
17
18
  return {
18
19
  parameters: p.node.parameters.map((parameter, index) => writeParameter({
19
20
  context: p.context,
@@ -26,13 +27,12 @@ var SdkMetadataProgrammer;
26
27
  generics: p.generics,
27
28
  type: getReturnType({
28
29
  checker: p.context.checker,
29
- type: p.context.checker.getTypeFromTypeNode((_a = p.node.type) !== null && _a !== void 0 ? _a : TypeFactory_1.TypeFactory.keyword("any")),
30
+ signature,
30
31
  }),
31
32
  }),
32
33
  exceptions: {}, // @todo
33
- description: getDescription(p.node),
34
- // jsDocTags: signature?.getJsDocTags() ?? [],
35
- jsDocTags: [], // @todo
34
+ description: (_a = (signature && getDescription(signature))) !== null && _a !== void 0 ? _a : null,
35
+ jsDocTags: (_b = signature === null || signature === void 0 ? void 0 : signature.getJsDocTags()) !== null && _b !== void 0 ? _b : [],
36
36
  };
37
37
  };
38
38
  const writeParameter = (props) => {
@@ -102,14 +102,14 @@ var SdkMetadataProgrammer;
102
102
  },
103
103
  };
104
104
  };
105
- const getReturnType = (props) => {
106
- var _a, _b;
107
- const type = props.type;
105
+ const getReturnType = (p) => {
106
+ var _a, _b, _c, _d;
107
+ const type = (_b = (_a = p.signature) === null || _a === void 0 ? void 0 : _a.getReturnType()) !== null && _b !== void 0 ? _b : null;
108
108
  if (type === null)
109
109
  return null;
110
- else if (((_a = type.symbol) === null || _a === void 0 ? void 0 : _a.name) === "Promise") {
111
- const generic = props.checker.getTypeArguments(type);
112
- return (_b = generic[0]) !== null && _b !== void 0 ? _b : null;
110
+ else if (((_c = type.symbol) === null || _c === void 0 ? void 0 : _c.name) === "Promise") {
111
+ const generic = p.checker.getTypeArguments(type);
112
+ return (_d = generic[0]) !== null && _d !== void 0 ? _d : null;
113
113
  }
114
114
  return type;
115
115
  };
@@ -150,22 +150,6 @@ const iterateVisited = (metdata) => {
150
150
  iterate(metdata);
151
151
  return names;
152
152
  };
153
- const getDescription = (node) => {
154
- const elements = typescript_1.default.getJSDocCommentsAndTags(node);
155
- if (elements.length === 0)
156
- return null;
157
- const content = [];
158
- for (const comment of elements)
159
- if (typescript_1.default.isJSDoc(comment)) {
160
- const parsed = typescript_1.default.getTextOfJSDocComment(comment.comment);
161
- if (!!(parsed === null || parsed === void 0 ? void 0 : parsed.length))
162
- content.push(parsed);
163
- }
164
- const output = content
165
- .map((line) => line.split("\r\n").join("\n"))
166
- .join("\n");
167
- return output.length ? output : null;
168
- };
169
153
  const join = ({ object, key, }) => {
170
154
  if (key === null)
171
155
  return object.name;
@@ -175,4 +159,13 @@ const join = ({ object, key, }) => {
175
159
  return `${object.name}.${key}`;
176
160
  return `${object.name}[${JSON.stringify(key)}]`;
177
161
  };
162
+ const getDescription = (signature) => {
163
+ const content = [];
164
+ const main = typescript_1.default.displayPartsToString(signature.getDocumentationComment(undefined));
165
+ if (main.length)
166
+ content.push(main);
167
+ return content.length
168
+ ? content.map((line) => line.split("\r\n").join("\n")).join("\n")
169
+ : null;
170
+ };
178
171
  //# sourceMappingURL=SdkMetadataProgrammer.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"SdkMetadataProgrammer.js","sourceRoot":"","sources":["../../src/transformers/SdkMetadataProgrammer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SdkMetadataProgrammer.js","sourceRoot":"","sources":["../../src/transformers/SdkMetadataProgrammer.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nestia/sdk",
3
- "version": "3.11.0-dev.20240813-7",
3
+ "version": "3.11.0-dev.20240813-9",
4
4
  "description": "Nestia SDK and Swagger generator",
5
5
  "main": "lib/index.js",
6
6
  "typings": "lib/index.d.ts",
@@ -32,8 +32,8 @@
32
32
  },
33
33
  "homepage": "https://nestia.io",
34
34
  "dependencies": {
35
- "@nestia/core": "^3.11.0-dev.20240813-7",
36
- "@nestia/fetcher": "^3.11.0-dev.20240813-7",
35
+ "@nestia/core": "^3.11.0-dev.20240813-9",
36
+ "@nestia/fetcher": "^3.11.0-dev.20240813-9",
37
37
  "@samchon/openapi": "^0.4.3",
38
38
  "@wrtnio/openai-function-schema": "^0.2.3",
39
39
  "cli": "^1.0.1",
@@ -48,8 +48,8 @@
48
48
  "typia": "^6.8.0-dev.20240812"
49
49
  },
50
50
  "peerDependencies": {
51
- "@nestia/core": ">=3.11.0-dev.20240813-7",
52
- "@nestia/fetcher": ">=3.11.0-dev.20240813-7",
51
+ "@nestia/core": ">=3.11.0-dev.20240813-9",
52
+ "@nestia/fetcher": ">=3.11.0-dev.20240813-9",
53
53
  "@nestjs/common": ">=7.0.1",
54
54
  "@nestjs/core": ">=7.0.1",
55
55
  "reflect-metadata": ">=0.1.12",
@@ -19,6 +19,8 @@ export namespace SdkMetadataProgrammer {
19
19
  node: ts.MethodDeclaration;
20
20
  }
21
21
  export const write = (p: IProps): IOperationMetadata => {
22
+ const signature: ts.Signature | undefined =
23
+ p.context.checker.getSignatureFromDeclaration(p.node);
22
24
  return {
23
25
  parameters: p.node.parameters.map((parameter, index) =>
24
26
  writeParameter({
@@ -33,15 +35,12 @@ export namespace SdkMetadataProgrammer {
33
35
  generics: p.generics,
34
36
  type: getReturnType({
35
37
  checker: p.context.checker,
36
- type: p.context.checker.getTypeFromTypeNode(
37
- p.node.type ?? TypeFactory.keyword("any"),
38
- ),
38
+ signature,
39
39
  }),
40
40
  }),
41
41
  exceptions: {}, // @todo
42
- description: getDescription(p.node),
43
- // jsDocTags: signature?.getJsDocTags() ?? [],
44
- jsDocTags: [], // @todo
42
+ description: (signature && getDescription(signature)) ?? null,
43
+ jsDocTags: signature?.getJsDocTags() ?? [],
45
44
  };
46
45
  };
47
46
 
@@ -160,14 +159,14 @@ export namespace SdkMetadataProgrammer {
160
159
  };
161
160
  };
162
161
 
163
- const getReturnType = (props: {
162
+ const getReturnType = (p: {
164
163
  checker: ts.TypeChecker;
165
- type: ts.Type | null;
164
+ signature: ts.Signature | undefined;
166
165
  }): ts.Type | null => {
167
- const type: ts.Type | null = props.type;
166
+ const type: ts.Type | null = p.signature?.getReturnType() ?? null;
168
167
  if (type === null) return null;
169
168
  else if (type.symbol?.name === "Promise") {
170
- const generic: readonly ts.Type[] = props.checker.getTypeArguments(
169
+ const generic: readonly ts.Type[] = p.checker.getTypeArguments(
171
170
  type as ts.TypeReference,
172
171
  );
173
172
  return generic[0] ?? null;
@@ -211,25 +210,6 @@ const iterateVisited = (metdata: Metadata): Set<string> => {
211
210
  return names;
212
211
  };
213
212
 
214
- const getDescription = (node: ts.Node): string | null => {
215
- const elements: readonly (ts.JSDoc | ts.JSDocTag)[] =
216
- ts.getJSDocCommentsAndTags(node);
217
- if (elements.length === 0) return null;
218
-
219
- const content: string[] = [];
220
- for (const comment of elements)
221
- if (ts.isJSDoc(comment)) {
222
- const parsed: string | undefined = ts.getTextOfJSDocComment(
223
- comment.comment,
224
- );
225
- if (!!parsed?.length) content.push(parsed);
226
- }
227
- const output: string = content
228
- .map((line) => line.split("\r\n").join("\n"))
229
- .join("\n");
230
- return output.length ? output : null;
231
- };
232
-
233
213
  const join = ({
234
214
  object,
235
215
  key,
@@ -242,3 +222,14 @@ const join = ({
242
222
  else if (Escaper.variable(key)) return `${object.name}.${key}`;
243
223
  return `${object.name}[${JSON.stringify(key)}]`;
244
224
  };
225
+
226
+ const getDescription = (signature: ts.Signature): string | null => {
227
+ const content: string[] = [];
228
+ const main: string = ts.displayPartsToString(
229
+ signature.getDocumentationComment(undefined),
230
+ );
231
+ if (main.length) content.push(main);
232
+ return content.length
233
+ ? content.map((line) => line.split("\r\n").join("\n")).join("\n")
234
+ : null;
235
+ };