@dudousxd/nestjs-codegen 0.7.0 → 0.8.0

package/dist/cli/main.js

@@ -44,18 +44,23 @@ async function fileExists(filePath) {
   }
 }
 async function importTs(filePath) {
-  let tsImport;
+  const fileUrl = pathToFileURL(filePath).href;
   try {
-    const tsxEsm = await import("tsx/esm/api");
-    tsImport = tsxEsm.tsImport;
-  } catch {
-    throw new ConfigError(
-      "Failed to load config: `tsx` is required for loading TypeScript config files. Install it as a dev dependency: pnpm add -D tsx"
-    );
+    return await import(fileUrl);
+  } catch (nativeError) {
+    let tsImport;
+    try {
+      const tsxEsm = await import("tsx/esm/api");
+      tsImport = tsxEsm.tsImport;
+    } catch {
+      throw new ConfigError(
+        "Failed to load config: `tsx` is required for loading TypeScript config files. Install it as a dev dependency: pnpm add -D tsx",
+        { cause: nativeError }
+      );
+    }
+    const parentURL = pathToFileURL(`${filePath}__parent__`).href;
+    return tsImport(fileUrl, { parentURL });
   }
-  const parentURL = pathToFileURL(`${filePath}__parent__`).href;
-  const fileUrl = pathToFileURL(filePath).href;
-  return tsImport(fileUrl, { parentURL });
 }
 function resolveAbsolute(cwd, p) {
   if (isAbsolute(p)) return p;
@@ -3512,14 +3517,33 @@ function extractQueryType(method, sourceFile, project) {
   for (const param of method.getParameters()) {
     const queryDecorator = param.getDecorators().find((d) => d.getName() === "Query");
     if (!queryDecorator) continue;
-    const queryArgs = queryDecorator.getArguments();
-    if (queryArgs.length > 0) continue;
+    if (queryDecorator.getArguments().length > 0) continue;
     const typeNode = param.getTypeNode();
     if (typeNode) {
       return resolveTypeNodeToString(typeNode, sourceFile, project, 3);
     }
   }
-  return null;
+  const entries = [];
+  for (const param of method.getParameters()) {
+    const queryDecorator = param.getDecorators().find((d) => d.getName() === "Query");
+    if (!queryDecorator) continue;
+    const queryArgs = queryDecorator.getArguments();
+    const nameArg = queryArgs[0];
+    if (!nameArg || !Node6.isStringLiteral(nameArg)) continue;
+    const queryName = nameArg.getLiteralValue();
+    const typeNode = param.getTypeNode();
+    const queryType = typeNode ? resolveTypeNodeToString(typeNode, sourceFile, project, 3) : "string";
+    entries.push(`${queryName}${isParamOptional(param) ? "?" : ""}: ${queryType}`);
+  }
+  return entries.length > 0 ? `{ ${entries.join("; ")} }` : null;
+}
+function isParamOptional(param) {
+  if (param.hasQuestionToken() || param.hasInitializer()) return true;
+  const typeNode = param.getTypeNode();
+  if (typeNode && Node6.isUnionTypeNode(typeNode)) {
+    return typeNode.getTypeNodes().some((t) => t.getKind() === SyntaxKind3.UndefinedKeyword);
+  }
+  return false;
 }
 function extractParamsType(method, sourceFile, project) {
   const entries = [];
@@ -4457,7 +4481,7 @@ async function watch(config, onChange) {
 }
 
 // src/index.ts
-var VERSION = "0.7.0";
+var VERSION = "0.8.0";
 
 // src/cli/codegen.ts
 async function runCodegen(opts = {}) {