Merge pull request #160 from zereight/feat/153-1

FIX string or number

Author: iwakitakuma33

customSchemas.ts

@@ -1,4 +1,17 @@
 import { z } from "zod";
+import { pino } from 'pino';
+
+const logger = pino({
+  level: process.env.LOG_LEVEL || 'info',
+  transport: {
+    target: 'pino-pretty',
+    options: {
+      colorize: true,
+      levelFirst: true,
+      destination: 2,
+    },
+  },
+});
 
 export const flexibleBoolean = z.preprocess((val) => {
     if (typeof val === 'string') {
@@ -7,21 +20,56 @@ export const flexibleBoolean = z.preprocess((val) => {
     return val;
 }, z.boolean());
 
-export const numericStringSchema = z.string().or(z.number()).transform((val, ctx) => {
-    let strValue: string;
-    if (typeof val === 'number') {
-      strValue = String(val);
-    } else {
-      strValue = val;
-    }
-    if (strValue.trim() === '' || isNaN(Number(strValue))) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: `Expected a numeric string or number, but received "${val}"`,
-      });
-      return z.NEVER;
-    }
-    return strValue;
-});
+
+export const numericStringSchemaNullable = z.coerce.string().or(z.number()).transform((val, ctx) => {
+  const strValue = String(val); 
+  const trimmedStrValue = strValue.trim();
+
+  if (trimmedStrValue === '') {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      message: `Expected a numeric string or number, but received an empty string or string with only whitespace.`,
+    });
+    return z.NEVER;
+  }
+  if (trimmedStrValue.toLowerCase() === 'null') {
+      return null;
+  }
+  if (isNaN(Number(trimmedStrValue))) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      message: `Expected a numeric string or number, but received ${trimmedStrValue}`,
+    });
+    return z.NEVER;
+  }
+  return String(trimmedStrValue);
+}).nullable();
+  
 
-  
+export const numericStringSchema = z.coerce.string().transform((val, ctx) => {
+  const strValue = String(val); 
+  const trimmedStrValue = strValue.trim();
+
+  if (trimmedStrValue === '') {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      message: `Expected a numeric string or number, but received an empty string or string with only whitespace.`,
+    });
+    return z.NEVER;
+  }
+  if (trimmedStrValue.toLowerCase() === 'null') {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      message: `Expected a numeric string or number, but received an null as string`,
+    });
+    return z.NEVER;
+  }
+  if (isNaN(Number(trimmedStrValue))) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      message: `Expected a numeric string or number, but received ${trimmedStrValue}`,
+    });
+    return z.NEVER;
+  }
+  return String(trimmedStrValue);
+});

index.ts

@@ -1076,11 +1076,11 @@ async function listIssues(
           value.forEach(label => {
             url.searchParams.append(`${key}[]`, label.toString());
           });
-        } else {
+        } else if (value) {
           url.searchParams.append(`${key}[]`, value.toString());
         }
       } else {
-        url.searchParams.append(key, value.toString());
+        url.searchParams.append(key, String(value));
       }
     }
   });
@@ -1115,7 +1115,7 @@ async function listMergeRequests(
         // Handle array of labels
         url.searchParams.append(key, value.join(","));
       } else {
-        url.searchParams.append(key, value.toString());
+        url.searchParams.append(key, String(value));
       }
     }
   });

schemas.ts

@@ -1,5 +1,5 @@
 import { z } from "zod";
-import {flexibleBoolean,numericStringSchema} from "./customSchemas.js"
+import {flexibleBoolean,numericStringSchema,numericStringSchemaNullable} from "./customSchemas.js"
 
 // Base schemas for common types
 export const GitLabAuthorSchema = z.object({
@@ -667,7 +667,7 @@ export const GitLabDiscussionNoteSchema = z.object({
   noteable_id: numericStringSchema,
   noteable_type: z.enum(["Issue", "MergeRequest", "Snippet", "Commit", "Epic"]),
   project_id: z.coerce.string().optional(),
-  noteable_iid: z.coerce.number().nullable(),
+  noteable_iid: numericStringSchemaNullable.optional(),
   resolvable: flexibleBoolean.optional(),
   resolved: flexibleBoolean.optional(),
   resolved_by: GitLabUserSchema.nullable().optional(),
@@ -917,14 +917,14 @@ export const CreateNoteSchema = z.object({
   noteable_type: z
     .enum(["issue", "merge_request"])
     .describe("Type of noteable (issue or merge_request)"),
-  noteable_iid: z.coerce.number().describe("IID of the issue or merge request"),
+  noteable_iid: numericStringSchema.describe("IID of the issue or merge request"),
   body: z.string().describe("Note content"),
 });
 
 // Issues API operation schemas
 export const ListIssuesSchema = z.object({
   project_id: z.coerce.string().describe("Project ID or URL-encoded path"),
-  assignee_id: numericStringSchema.optional().describe("Return issues assigned to the given user ID"),
+  assignee_id: z.coerce.string().optional().describe("Return issues assigned to the given user ID. user id or none or any"),
   assignee_username: z.array(z.string()).optional().describe("Return issues assigned to the given username"),
   author_id: numericStringSchema.optional().describe("Return issues created by the given user ID"),
   author_username: z.string().optional().describe("Return issues created by the given username"),
@@ -951,10 +951,7 @@ export const ListIssuesSchema = z.object({
 // Merge Requests API operation schemas
 export const ListMergeRequestsSchema = z.object({
   project_id: z.coerce.string().describe("Project ID or URL-encoded path"),
-  assignee_id: z
-    .number()
-    .optional()
-    .describe("Returns merge requests assigned to the given user ID"),
+  assignee_id: z.coerce.string().optional().describe("Return issues assigned to the given user ID. user id or none or any"),
   assignee_username: z
     .string()
     .optional()
@@ -964,10 +961,9 @@ export const ListMergeRequestsSchema = z.object({
     .string()
     .optional()
     .describe("Returns merge requests created by the given username"),
-  reviewer_id: z
-    .number()
+  reviewer_id: z.coerce.string()
     .optional()
-    .describe("Returns merge requests which have the user as a reviewer"),
+    .describe("Returns merge requests which have the user as a reviewer. user id or none or any"),
   reviewer_username: z
     .string()
     .optional()