@nestia/sdk 3.10.0 → 3.11.0-dev.20240813

package/src/generates/internal/SdkHttpRouteProgrammer.ts

@@ -14,12 +14,12 @@ export namespace SdkHttpRouteProgrammer {
     (importer: ImportDictionary) =>
     (route: ITypedHttpRoute): ts.Statement[] => {
       const props = {
-        headers: route.parameters.find(
-          (p) => p.category === "headers" && p.field === undefined,
-        ),
-        query: route.parameters.find(
-          (p) => p.category === "query" && p.field === undefined,
-        ),
+        headers: route.parameters
+          .filter((p) => p.category === "headers")
+          .find((p) => p.field === undefined),
+        query: route.parameters
+          .filter((p) => p.category === "query")
+          .find((p) => p.field === undefined),
         input: route.parameters.find((p) => p.category === "body"),
       };
       return [
@@ -109,7 +109,7 @@ export namespace SdkHttpRouteProgrammer {
       ...(descriptionComments.length && tagComments.length ? [""] : []),
       ...tagComments,
       ...(descriptionComments.length && tagComments.length ? [""] : []),
-      `@controller ${route.controller.name}.${route.name}`,
+      `@controller ${route.controller.class.name}.${route.name}`,
       `@path ${route.method} ${route.path}`,
       `@nestia Generated by Nestia - https://github.com/samchon/nestia`,
     ].join("\n");

package/src/generates/internal/SdkHttpSimulationProgrammer.ts

@@ -7,10 +7,10 @@ import { TypeFactory } from "typia/lib/factories/TypeFactory";
 
 import { INestiaProject } from "../../structures/INestiaProject";
 import { ITypedHttpRoute } from "../../structures/ITypedHttpRoute";
+import { ITypedHttpRouteParameter } from "../../structures/ITypedHttpRouteParameter";
 import { ImportDictionary } from "./ImportDictionary";
 import { SdkAliasCollection } from "./SdkAliasCollection";
 import { SdkImportWizard } from "./SdkImportWizard";
-import { SdkTypeProgrammer } from "./SdkTypeProgrammer";
 
 export namespace SdkHttpSimulationProgrammer {
   export const random =
@@ -62,13 +62,13 @@ export namespace SdkHttpSimulationProgrammer {
     (
       route: ITypedHttpRoute,
       props: {
-        headers: ITypedHttpRoute.IParameter | undefined;
-        query: ITypedHttpRoute.IParameter | undefined;
-        input: ITypedHttpRoute.IParameter | undefined;
+        headers: ITypedHttpRouteParameter.IHeaders | undefined;
+        query: ITypedHttpRouteParameter.IQuery | undefined;
+        input: ITypedHttpRouteParameter.IBody | undefined;
       },
     ): ts.VariableStatement => {
       const output: boolean =
-        project.config.propagate === true || route.output.typeName !== "void";
+        project.config.propagate === true || route.success.type.name !== "void";
       const caller = () =>
         ts.factory.createCallExpression(
           ts.factory.createIdentifier("random"),
@@ -122,7 +122,7 @@ export namespace SdkHttpSimulationProgrammer {
                   [],
                   undefined,
                   p.name,
-                  p.optional
+                  p.metadata.optional
                     ? ts.factory.createToken(ts.SyntaxKind.QuestionToken)
                     : undefined,
                   project.config.primitive !== false &&
@@ -130,7 +130,7 @@ export namespace SdkHttpSimulationProgrammer {
                     ? ts.factory.createTypeReferenceNode(
                         `${route.name}.${p === props.query ? "Query" : "Input"}`,
                       )
-                    : getTypeName(project)(importer)(p),
+                    : SdkAliasCollection.name(p.type),
                 ),
               ),
           ],
@@ -150,14 +150,14 @@ export namespace SdkHttpSimulationProgrammer {
                         ts.factory.createPropertyAssignment(
                           "status",
                           ExpressionFactory.number(
-                            route.status ??
+                            route.success.status ??
                               (route.method === "POST" ? 201 : 200),
                           ),
                         ),
                         ts.factory.createPropertyAssignment(
                           "headers",
                           LiteralFactory.generate({
-                            "Content-Type": route.output.contentType,
+                            "Content-Type": route.success.contentType,
                           }),
                         ),
                         ts.factory.createPropertyAssignment("data", caller()),
@@ -222,7 +222,7 @@ export namespace SdkHttpSimulationProgrammer {
                 ts.factory.createPropertyAssignment(
                   "contentType",
                   ts.factory.createIdentifier(
-                    JSON.stringify(route.output.contentType),
+                    JSON.stringify(route.success.contentType),
                   ),
                 ),
               ],
@@ -256,11 +256,7 @@ export namespace SdkHttpSimulationProgrammer {
                     "assert",
                   ),
                   undefined,
-                  [
-                    ts.factory.createIdentifier(
-                      p.category === "headers" ? "connection.headers" : p.name,
-                    ),
-                  ],
+                  [ts.factory.createIdentifier(p.name)],
                 ),
               ),
             ],
@@ -353,11 +349,3 @@ const constant = (name: string) => (expression: ts.Expression) =>
       ts.NodeFlags.Const,
     ),
   );
-
-const getTypeName =
-  (project: INestiaProject) =>
-  (importer: ImportDictionary) =>
-  (p: ITypedHttpRoute.IParameter | ITypedHttpRoute.IOutput) =>
-    p.metadata
-      ? SdkTypeProgrammer.write(project)(importer)(p.metadata)
-      : ts.factory.createTypeReferenceNode(p.typeName);

package/src/generates/internal/SdkWebSocketNamespaceProgrammer.ts

@@ -3,15 +3,14 @@ import { ExpressionFactory } from "typia/lib/factories/ExpressionFactory";
 import { IdentifierFactory } from "typia/lib/factories/IdentifierFactory";
 import { TypeFactory } from "typia/lib/factories/TypeFactory";
 
-import { INestiaProject } from "../../structures/INestiaProject";
 import { ITypedWebSocketRoute } from "../../structures/ITypedWebSocketRoute";
+import { ITypedWebSocketRouteParameter } from "../../structures/ITypedWebSocketRouteParameter";
 import { FilePrinter } from "./FilePrinter";
 import { ImportDictionary } from "./ImportDictionary";
-import { SdkTypeProgrammer } from "./SdkTypeProgrammer";
+import { SdkAliasCollection } from "./SdkAliasCollection";
 
 export namespace SdkWebSocketNamespaceProgrammer {
   export const write =
-    (project: INestiaProject) =>
     (importer: ImportDictionary) =>
     (route: ITypedWebSocketRoute): ts.ModuleDeclaration =>
       ts.factory.createModuleDeclaration(
@@ -20,7 +19,7 @@ export namespace SdkWebSocketNamespaceProgrammer {
         ts.factory.createModuleBlock([
           ...writeTypes(importer)(route),
           FilePrinter.enter(),
-          writePath(project)(importer)(route),
+          writePath(route),
         ]),
         ts.NodeFlags.Namespace,
       );
@@ -75,264 +74,240 @@ export namespace SdkWebSocketNamespaceProgrammer {
         ]),
       );
 
-      const acceptor: ITypedWebSocketRoute.IAcceptorParameter =
-        route.parameters.find(
-          (x) => x.category === "acceptor",
-        ) as ITypedWebSocketRoute.IAcceptorParameter;
-      const query = route.parameters.find((x) => x.category === "query") as
-        | ITypedWebSocketRoute.IQueryParameter
-        | undefined;
-
+      const acceptor: ITypedWebSocketRouteParameter.IAcceptor =
+        route.parameters.find((x) => x.category === "acceptor")!;
+      const query: ITypedWebSocketRouteParameter.IQuery | undefined =
+        route.parameters.find((x) => x.category === "query");
       declare(
         "Header",
-        ts.factory.createTypeReferenceNode(
-          (
-            (route.parameters.find((x) => x.category === "header") as
-              | ITypedWebSocketRoute.IHeaderParameter
-              | undefined) ?? acceptor.header
-          ).typeName,
+        SdkAliasCollection.name(
+          (route.parameters.find((x) => x.category === "header")?.type ??
+            acceptor.type.typeArguments?.[0])!,
         ),
       );
       declare(
         "Provider",
-        ts.factory.createTypeReferenceNode(
-          (
-            (route.parameters.find((x) => x.category === "driver") as
-              | ITypedWebSocketRoute.IDriverParameter
-              | undefined) ?? acceptor.listener
-          ).typeName,
-        ),
+        SdkAliasCollection.name(acceptor.type.typeArguments?.[1]!),
       );
       declare(
         "Listener",
-        ts.factory.createTypeReferenceNode(acceptor.provider.typeName),
+        SdkAliasCollection.name(acceptor.type.typeArguments?.[2]!),
       );
-      if (query)
-        declare("Query", ts.factory.createTypeReferenceNode(query.typeName));
+      if (query) declare("Query", SdkAliasCollection.name(query.type));
       return output;
     };
 
-  const writePath =
-    (project: INestiaProject) =>
-    (importer: ImportDictionary) =>
-    (route: ITypedWebSocketRoute): ts.VariableStatement => {
-      const pathParams: ITypedWebSocketRoute.IPathParameter[] =
-        route.parameters.filter(
-          (p) => p.category === "param",
-        ) as ITypedWebSocketRoute.IPathParameter[];
-      const query: ITypedWebSocketRoute.IQueryParameter | undefined =
-        route.parameters.find((p) => p.category === "query") as
-          | ITypedWebSocketRoute.IQueryParameter
-          | undefined;
-      const total: Array<
-        | ITypedWebSocketRoute.IPathParameter
-        | ITypedWebSocketRoute.IQueryParameter
-      > = [...pathParams, ...(query ? [query] : [])];
-      const out = (body: ts.ConciseBody) =>
-        constant("path")(
-          ts.factory.createArrowFunction(
-            [],
-            [],
-            total.map((p) =>
-              IdentifierFactory.parameter(
-                p.name,
-                p === query
-                  ? ts.factory.createTypeReferenceNode(`${route.name}.Query`)
-                  : getType(project)(importer)(p),
-              ),
+  const writePath = (route: ITypedWebSocketRoute): ts.VariableStatement => {
+    const pathParams: ITypedWebSocketRouteParameter.IParam[] =
+      route.parameters.filter(
+        (p) => p.category === "param",
+      ) as ITypedWebSocketRouteParameter.IParam[];
+    const query: ITypedWebSocketRouteParameter.IQuery | undefined =
+      route.parameters.find((p) => p.category === "query");
+    const total: Array<
+      | ITypedWebSocketRouteParameter.IParam
+      | ITypedWebSocketRouteParameter.IQuery
+    > = [...pathParams, ...(query ? [query] : [])];
+    const out = (body: ts.ConciseBody) =>
+      constant("path")(
+        ts.factory.createArrowFunction(
+          [],
+          [],
+          total.map((p) =>
+            IdentifierFactory.parameter(
+              p.name,
+              p === query
+                ? ts.factory.createTypeReferenceNode(`${route.name}.Query`)
+                : SdkAliasCollection.name(p),
             ),
-            undefined,
-            undefined,
-            body,
           ),
-        );
-      if (total.length === 0)
-        return out(ts.factory.createStringLiteral(route.path));
+          undefined,
+          undefined,
+          body,
+        ),
+      );
+    if (total.length === 0)
+      return out(ts.factory.createStringLiteral(route.path));
 
-      const template = () => {
-        const splitted: string[] = route.path.split(":");
-        if (splitted.length === 1)
-          return ts.factory.createStringLiteral(route.path);
-        return ts.factory.createTemplateExpression(
-          ts.factory.createTemplateHead(splitted[0]),
-          splitted.slice(1).map((s, i, arr) => {
-            const name: string = s.split("/")[0];
-            return ts.factory.createTemplateSpan(
-              ts.factory.createCallExpression(
-                ts.factory.createIdentifier("encodeURIComponent"),
-                undefined,
-                [
-                  ts.factory.createBinaryExpression(
-                    ts.factory.createIdentifier(
-                      pathParams.find((p) => p.field === name)!.name,
-                    ),
-                    ts.factory.createToken(ts.SyntaxKind.QuestionQuestionToken),
-                    ts.factory.createStringLiteral("null"),
+    const template = () => {
+      const splitted: string[] = route.path.split(":");
+      if (splitted.length === 1)
+        return ts.factory.createStringLiteral(route.path);
+      return ts.factory.createTemplateExpression(
+        ts.factory.createTemplateHead(splitted[0]),
+        splitted.slice(1).map((s, i, arr) => {
+          const name: string = s.split("/")[0];
+          return ts.factory.createTemplateSpan(
+            ts.factory.createCallExpression(
+              ts.factory.createIdentifier("encodeURIComponent"),
+              undefined,
+              [
+                ts.factory.createBinaryExpression(
+                  ts.factory.createIdentifier(
+                    pathParams.find((p) => p.field === name)!.name,
                   ),
-                ],
-              ),
-              (i !== arr.length - 1
-                ? ts.factory.createTemplateMiddle
-                : ts.factory.createTemplateTail)(s.substring(name.length)),
-            );
-          }),
-        );
-      };
-      if (query === undefined) return out(template());
+                  ts.factory.createToken(ts.SyntaxKind.QuestionQuestionToken),
+                  ts.factory.createStringLiteral("null"),
+                ),
+              ],
+            ),
+            (i !== arr.length - 1
+              ? ts.factory.createTemplateMiddle
+              : ts.factory.createTemplateTail)(s.substring(name.length)),
+          );
+        }),
+      );
+    };
+    if (query === undefined) return out(template());
 
-      const block = (expr: ts.Expression) => {
-        const computeName = (str: string): string =>
-          total.find((p) => p.name === str) !== undefined
-            ? computeName("_" + str)
-            : str;
-        const variables: string = computeName("variables");
-        return ts.factory.createBlock(
-          [
-            local(variables)("URLSearchParams")(
-              ts.factory.createNewExpression(
-                ts.factory.createIdentifier("URLSearchParams"),
-                [],
-                [],
-              ),
+    const block = (expr: ts.Expression) => {
+      const computeName = (str: string): string =>
+        total.find((p) => p.name === str) !== undefined
+          ? computeName("_" + str)
+          : str;
+      const variables: string = computeName("variables");
+      return ts.factory.createBlock(
+        [
+          local(variables)("URLSearchParams")(
+            ts.factory.createNewExpression(
+              ts.factory.createIdentifier("URLSearchParams"),
+              [],
+              [],
             ),
-            ts.factory.createForOfStatement(
+          ),
+          ts.factory.createForOfStatement(
+            undefined,
+            ts.factory.createVariableDeclarationList(
+              [
+                ts.factory.createVariableDeclaration(
+                  ts.factory.createArrayBindingPattern([
+                    ts.factory.createBindingElement(
+                      undefined,
+                      undefined,
+                      ts.factory.createIdentifier("key"),
+                      undefined,
+                    ),
+                    ts.factory.createBindingElement(
+                      undefined,
+                      undefined,
+                      ts.factory.createIdentifier("value"),
+                      undefined,
+                    ),
+                  ]),
+                  undefined,
+                  undefined,
+                  undefined,
+                ),
+              ],
+              ts.NodeFlags.Const,
+            ),
+            ts.factory.createCallExpression(
+              ts.factory.createIdentifier("Object.entries"),
               undefined,
-              ts.factory.createVariableDeclarationList(
-                [
-                  ts.factory.createVariableDeclaration(
-                    ts.factory.createArrayBindingPattern([
-                      ts.factory.createBindingElement(
-                        undefined,
-                        undefined,
-                        ts.factory.createIdentifier("key"),
+              [ts.factory.createAsExpression(expr, TypeFactory.keyword("any"))],
+            ),
+            ts.factory.createIfStatement(
+              ts.factory.createStrictEquality(
+                ts.factory.createIdentifier("undefined"),
+                ts.factory.createIdentifier("value"),
+              ),
+              ts.factory.createContinueStatement(),
+              ts.factory.createIfStatement(
+                ts.factory.createCallExpression(
+                  ts.factory.createIdentifier("Array.isArray"),
+                  undefined,
+                  [ts.factory.createIdentifier("value")],
+                ),
+                ts.factory.createExpressionStatement(
+                  ts.factory.createCallExpression(
+                    ts.factory.createPropertyAccessExpression(
+                      ts.factory.createIdentifier("value"),
+                      ts.factory.createIdentifier("forEach"),
+                    ),
+                    undefined,
+                    [
+                      ts.factory.createArrowFunction(
                         undefined,
-                      ),
-                      ts.factory.createBindingElement(
                         undefined,
+                        [IdentifierFactory.parameter("elem")],
                         undefined,
-                        ts.factory.createIdentifier("value"),
                         undefined,
+                        ts.factory.createCallExpression(
+                          IdentifierFactory.access(
+                            ts.factory.createIdentifier(variables),
+                          )("append"),
+                          undefined,
+                          [
+                            ts.factory.createIdentifier("key"),
+                            ts.factory.createCallExpression(
+                              ts.factory.createIdentifier("String"),
+                              undefined,
+                              [ts.factory.createIdentifier("elem")],
+                            ),
+                          ],
+                        ),
                       ),
-                    ]),
-                    undefined,
-                    undefined,
-                    undefined,
+                    ],
                   ),
-                ],
-                ts.NodeFlags.Const,
-              ),
-              ts.factory.createCallExpression(
-                ts.factory.createIdentifier("Object.entries"),
-                undefined,
-                [
-                  ts.factory.createAsExpression(
-                    expr,
-                    TypeFactory.keyword("any"),
-                  ),
-                ],
-              ),
-              ts.factory.createIfStatement(
-                ts.factory.createStrictEquality(
-                  ts.factory.createIdentifier("undefined"),
-                  ts.factory.createIdentifier("value"),
                 ),
-                ts.factory.createContinueStatement(),
-                ts.factory.createIfStatement(
+                ts.factory.createExpressionStatement(
                   ts.factory.createCallExpression(
-                    ts.factory.createIdentifier("Array.isArray"),
+                    IdentifierFactory.access(
+                      ts.factory.createIdentifier(variables),
+                    )("set"),
                     undefined,
-                    [ts.factory.createIdentifier("value")],
-                  ),
-                  ts.factory.createExpressionStatement(
-                    ts.factory.createCallExpression(
-                      ts.factory.createPropertyAccessExpression(
-                        ts.factory.createIdentifier("value"),
-                        ts.factory.createIdentifier("forEach"),
+                    [
+                      ts.factory.createIdentifier("key"),
+                      ts.factory.createCallExpression(
+                        ts.factory.createIdentifier("String"),
+                        undefined,
+                        [ts.factory.createIdentifier("value")],
                       ),
-                      undefined,
-                      [
-                        ts.factory.createArrowFunction(
-                          undefined,
-                          undefined,
-                          [IdentifierFactory.parameter("elem")],
-                          undefined,
-                          undefined,
-                          ts.factory.createCallExpression(
-                            IdentifierFactory.access(
-                              ts.factory.createIdentifier(variables),
-                            )("append"),
-                            undefined,
-                            [
-                              ts.factory.createIdentifier("key"),
-                              ts.factory.createCallExpression(
-                                ts.factory.createIdentifier("String"),
-                                undefined,
-                                [ts.factory.createIdentifier("elem")],
-                              ),
-                            ],
-                          ),
-                        ),
-                      ],
-                    ),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ),
+          local("location")("string")(template()),
+          ts.factory.createReturnStatement(
+            ts.factory.createConditionalExpression(
+              ts.factory.createStrictEquality(
+                ExpressionFactory.number(0),
+                IdentifierFactory.access(
+                  ts.factory.createIdentifier(variables),
+                )("size"),
+              ),
+              undefined,
+              ts.factory.createIdentifier("location"),
+              undefined,
+              ts.factory.createTemplateExpression(
+                ts.factory.createTemplateHead(""),
+                [
+                  ts.factory.createTemplateSpan(
+                    ts.factory.createIdentifier("location"),
+                    ts.factory.createTemplateMiddle("?"),
                   ),
-                  ts.factory.createExpressionStatement(
+                  ts.factory.createTemplateSpan(
                     ts.factory.createCallExpression(
                       IdentifierFactory.access(
                         ts.factory.createIdentifier(variables),
-                      )("set"),
+                      )("toString"),
+                      undefined,
                       undefined,
-                      [
-                        ts.factory.createIdentifier("key"),
-                        ts.factory.createCallExpression(
-                          ts.factory.createIdentifier("String"),
-                          undefined,
-                          [ts.factory.createIdentifier("value")],
-                        ),
-                      ],
                     ),
+                    ts.factory.createTemplateTail(""),
                   ),
-                ),
-              ),
-            ),
-            local("location")("string")(template()),
-            ts.factory.createReturnStatement(
-              ts.factory.createConditionalExpression(
-                ts.factory.createStrictEquality(
-                  ExpressionFactory.number(0),
-                  IdentifierFactory.access(
-                    ts.factory.createIdentifier(variables),
-                  )("size"),
-                ),
-                undefined,
-                ts.factory.createIdentifier("location"),
-                undefined,
-                ts.factory.createTemplateExpression(
-                  ts.factory.createTemplateHead(""),
-                  [
-                    ts.factory.createTemplateSpan(
-                      ts.factory.createIdentifier("location"),
-                      ts.factory.createTemplateMiddle("?"),
-                    ),
-                    ts.factory.createTemplateSpan(
-                      ts.factory.createCallExpression(
-                        IdentifierFactory.access(
-                          ts.factory.createIdentifier(variables),
-                        )("toString"),
-                        undefined,
-                        undefined,
-                      ),
-                      ts.factory.createTemplateTail(""),
-                    ),
-                  ],
-                ),
+                ],
               ),
             ),
-          ],
-          true,
-        );
-      };
-      return out(block(ts.factory.createIdentifier(query.name)));
+          ),
+        ],
+        true,
+      );
     };
+    return out(block(ts.factory.createIdentifier(query.name)));
+  };
 }
 
 const local = (name: string) => (type: string) => (expression: ts.Expression) =>
@@ -365,14 +340,3 @@ const constant = (name: string) => (expression: ts.Expression) =>
       ts.NodeFlags.Const,
     ),
   );
-const getType =
-  (project: INestiaProject) =>
-  (importer: ImportDictionary) =>
-  (
-    p:
-      | ITypedWebSocketRoute.IPathParameter
-      | ITypedWebSocketRoute.IQueryParameter,
-  ) =>
-    p.metadata
-      ? SdkTypeProgrammer.write(project)(importer)(p.metadata)
-      : ts.factory.createTypeReferenceNode(p.typeName);