@nestia/sdk 7.0.0-dev.20250605-3 → 7.0.0-dev.20250607

package/src/generates/internal/SdkHttpSimulationProgrammer.ts

@@ -7,9 +7,9 @@ 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 { SdkHttpParameterProgrammer } from "./SdkHttpParameterProgrammer";
 import { SdkImportWizard } from "./SdkImportWizard";
 
 export namespace SdkHttpSimulationProgrammer {
@@ -60,14 +60,7 @@ export namespace SdkHttpSimulationProgrammer {
   export const simulate =
     (project: INestiaProject) =>
     (importer: ImportDictionary) =>
-    (
-      route: ITypedHttpRoute,
-      props: {
-        headers: ITypedHttpRouteParameter.IHeaders | undefined;
-        query: ITypedHttpRouteParameter.IQuery | undefined;
-        body: ITypedHttpRouteParameter.IBody | undefined;
-      },
-    ): ts.VariableStatement => {
+    (route: ITypedHttpRoute): ts.VariableStatement => {
       const output: boolean =
         project.config.propagate === true ||
         route.success.metadata.size() !== 0;
@@ -96,7 +89,6 @@ export namespace SdkHttpSimulationProgrammer {
             ),
           ],
         );
-
       return constant("simulate")(
         ts.factory.createArrowFunction(
           undefined,
@@ -106,9 +98,7 @@ export namespace SdkHttpSimulationProgrammer {
               "connection",
               ts.factory.createTypeReferenceNode(
                 SdkImportWizard.IConnection(importer),
-                route.parameters.some(
-                  (p) => p.category === "headers" && p.field === null,
-                )
+                route.headerObject
                   ? [
                       ts.factory.createTypeReferenceNode(
                         `${route.name}.Headers`,
@@ -117,42 +107,15 @@ export namespace SdkHttpSimulationProgrammer {
                   : [],
               ),
             ),
-            ...(project.config.keyword === true &&
-            route.parameters.filter((p) => p.category !== "headers").length !==
-              0
-              ? [
-                  ts.factory.createParameterDeclaration(
-                    [],
-                    undefined,
-                    "props",
-                    undefined,
-                    ts.factory.createTypeReferenceNode("IProps"),
-                  ),
-                ]
-              : route.parameters
-                  .filter((p) => p.category !== "headers")
-                  .map((p) =>
-                    ts.factory.createParameterDeclaration(
-                      [],
-                      undefined,
-                      p.name,
-                      p.metadata.optional
-                        ? ts.factory.createToken(ts.SyntaxKind.QuestionToken)
-                        : undefined,
-                      project.config.primitive !== false &&
-                        (p === props.query || p === props.body)
-                        ? ts.factory.createTypeReferenceNode(
-                            `${route.name}.${p === props.query ? "Query" : "Body"}`,
-                          )
-                        : project.config.clone === true
-                          ? SdkAliasCollection.from(project)(importer)(
-                              p.metadata,
-                            )
-                          : SdkAliasCollection.name(p),
-                    ),
-                  )),
+            ...SdkHttpParameterProgrammer.getParameterDeclarations({
+              project,
+              importer,
+              route,
+              body: true,
+              prefix: false,
+            }),
           ],
-          ts.factory.createTypeReferenceNode(output ? "Response" : "void"),
+          ts.factory.createTypeReferenceNode(output ? "Output" : "void"),
           undefined,
           ts.factory.createBlock(
             [
@@ -183,7 +146,7 @@ export namespace SdkHttpSimulationProgrammer {
                         ],
                         true,
                       ),
-                      ts.factory.createTypeReferenceNode("Response"),
+                      ts.factory.createTypeReferenceNode("Output"),
                     )
                   : caller(),
               ),
@@ -198,15 +161,9 @@ export namespace SdkHttpSimulationProgrammer {
     (project: INestiaProject) =>
     (importer: ImportDictionary) =>
     (route: ITypedHttpRoute): ts.Statement[] => {
-      const parameters = route.parameters.filter(
-        (p) => p.category !== "headers",
-      );
+      const parameters = SdkHttpParameterProgrammer.getSignificant(route, true);
       if (parameters.length === 0) return [];
 
-      const access = (key: string) =>
-        project.config.keyword === true
-          ? IdentifierFactory.access(ts.factory.createIdentifier("props"), key)
-          : ts.factory.createIdentifier(key);
       const typia = SdkImportWizard.typia(importer);
       const validator = StatementFactory.constant({
         name: "assert",
@@ -238,17 +195,11 @@ export namespace SdkHttpSimulationProgrammer {
                   ts.factory.createCallExpression(
                     ts.factory.createIdentifier("path"),
                     undefined,
-                    project.config.keyword === true &&
-                      route.parameters.filter(
-                        (p) => p.category === "param" || p.category === "query",
-                      ).length !== 0
-                      ? [ts.factory.createIdentifier("props")]
-                      : route.parameters
-                          .filter(
-                            (p) =>
-                              p.category === "param" || p.category === "query",
-                          )
-                          .map((p) => ts.factory.createIdentifier(p.name)),
+                    SdkHttpParameterProgrammer.getArguments({
+                      project,
+                      route,
+                      body: false,
+                    }),
                   ),
                 ),
                 ts.factory.createPropertyAssignment(
@@ -290,14 +241,17 @@ export namespace SdkHttpSimulationProgrammer {
                     "assert",
                   ),
                   undefined,
-                  [access(p.name)],
+                  [
+                    project.config.keyword === true
+                      ? ts.factory.createIdentifier(`props.${p.name}`)
+                      : ts.factory.createIdentifier(p.name),
+                  ],
                 ),
               ),
             ],
           ),
         )
         .map(ts.factory.createExpressionStatement);
-
       return [
         validator,
         ...(project.config.propagate !== true

package/src/generates/internal/SdkTypeProgrammer.ts

@@ -75,19 +75,16 @@ export namespace SdkTypeProgrammer {
     (object: MetadataObjectType): ts.TypeNode => {
       const regular = object.properties.filter((p) => p.key.isSoleLiteral());
       const dynamic = object.properties.filter((p) => !p.key.isSoleLiteral());
-      return FilePrinter.description(
-        regular.length && dynamic.length
-          ? ts.factory.createIntersectionTypeNode([
-              write_regular_property(project)(importer)(regular),
-              ...dynamic.map(write_dynamic_property(project)(importer)),
-            ])
-          : dynamic.length
-            ? ts.factory.createIntersectionTypeNode(
-                dynamic.map(write_dynamic_property(project)(importer)),
-              )
-            : write_regular_property(project)(importer)(regular),
-        writeComment([])(object.description ?? null, object.jsDocTags),
-      );
+      return regular.length && dynamic.length
+        ? ts.factory.createIntersectionTypeNode([
+            write_regular_property(project)(importer)(regular),
+            ...dynamic.map(write_dynamic_property(project)(importer)),
+          ])
+        : dynamic.length
+          ? ts.factory.createIntersectionTypeNode(
+              dynamic.map(write_dynamic_property(project)(importer)),
+            )
+          : write_regular_property(project)(importer)(regular);
     };
 
   const write_escaped =
@@ -238,25 +235,35 @@ export namespace SdkTypeProgrammer {
     (importer: ImportDictionary) =>
     (properties: MetadataProperty[]): ts.TypeLiteralNode =>
       ts.factory.createTypeLiteralNode(
-        properties.map((p) =>
-          FilePrinter.description(
-            ts.factory.createPropertySignature(
-              undefined,
-              Escaper.variable(String(p.key.constants[0].values[0].value))
-                ? ts.factory.createIdentifier(
-                    String(p.key.constants[0].values[0].value),
-                  )
-                : ts.factory.createStringLiteral(
-                    String(p.key.constants[0].values[0].value),
-                  ),
-              p.value.isRequired() === false
-                ? ts.factory.createToken(ts.SyntaxKind.QuestionToken)
-                : undefined,
-              SdkTypeProgrammer.write(project)(importer)(p.value),
-            ),
-            writeComment(p.value.atomics)(p.description, p.jsDocTags),
-          ),
-        ),
+        properties
+          .map((p) => {
+            const description: string = writeComment(p.value.atomics)(
+              p.description,
+              p.jsDocTags,
+            );
+            const signature: ts.PropertySignature =
+              ts.factory.createPropertySignature(
+                undefined,
+                Escaper.variable(String(p.key.constants[0].values[0].value))
+                  ? ts.factory.createIdentifier(
+                      String(p.key.constants[0].values[0].value),
+                    )
+                  : ts.factory.createStringLiteral(
+                      String(p.key.constants[0].values[0].value),
+                    ),
+                p.value.isRequired() === false
+                  ? ts.factory.createToken(ts.SyntaxKind.QuestionToken)
+                  : undefined,
+                SdkTypeProgrammer.write(project)(importer)(p.value),
+              );
+            return !!description.length
+              ? [
+                  ts.factory.createIdentifier("\n") as any,
+                  FilePrinter.description(signature, description),
+                ]
+              : signature;
+          })
+          .flat(),
       );
 
   const write_dynamic_property =