postgresdk 0.18.15 → 0.18.17

package/dist/cli.js

@@ -2740,8 +2740,8 @@ async function introspect(connectionString, schema) {
         c.column_default,
         a.atttypmod
       FROM information_schema.columns c
-      LEFT JOIN pg_catalog.pg_class cl ON cl.relname = c.table_name
-      LEFT JOIN pg_catalog.pg_namespace n ON n.oid = cl.relnamespace AND n.nspname = c.table_schema
+      LEFT JOIN pg_catalog.pg_namespace n ON n.nspname = c.table_schema
+      LEFT JOIN pg_catalog.pg_class cl ON cl.relname = c.table_name AND cl.relnamespace = n.oid
       LEFT JOIN pg_catalog.pg_attribute a ON a.attrelid = cl.oid AND a.attname = c.column_name
       WHERE c.table_schema = $1
       ORDER BY c.table_name, c.ordinal_position
@@ -3128,8 +3128,9 @@ export const ${Type}ListParamsSchema = z.object({
   offset: z.number().int().nonnegative().optional(),
   where: z.any().optional(),
   vector: VectorSearchParamsSchema.optional(),
-  orderBy: z.enum([${columnNames}]).optional(),
-  order: z.enum(["asc", "desc"]).optional()
+  orderBy: z.union([z.enum([${columnNames}]), z.array(z.enum([${columnNames}]))]).optional(),
+  order: z.union([z.enum(["asc", "desc"]), z.array(z.enum(["asc", "desc"]))]).optional(),
+  distinctOn: z.union([z.enum([${columnNames}]), z.array(z.enum([${columnNames}]))]).optional()
 }).strict();
 
 // Schema for ordering parameters
@@ -3263,7 +3264,8 @@ const listSchema = z.object({
   limit: z.number().int().positive().max(1000).optional(),
   offset: z.number().int().min(0).optional(),
   orderBy: z.union([columnEnum, z.array(columnEnum)]).optional(),
-  order: z.union([z.enum(["asc", "desc"]), z.array(z.enum(["asc", "desc"]))]).optional(),${hasVectorColumns ? `
+  order: z.union([z.enum(["asc", "desc"]), z.array(z.enum(["asc", "desc"]))]).optional(),
+  distinctOn: z.union([columnEnum, z.array(columnEnum)]).optional(),${hasVectorColumns ? `
   vector: z.object({
     field: z.string(),
     query: z.array(z.number()),
@@ -3939,6 +3941,7 @@ ${hasJsonbColumns ? `  /**
     };` : ""}
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
   }): Promise<PaginatedResponse<Partial<Select${Type}<TJsonb>>${hasVectorColumns ? " & { _distance?: number }" : ""}>>;
   /**
    * List ${table.name} records with field exclusion
@@ -3959,6 +3962,7 @@ ${hasJsonbColumns ? `  /**
     };` : ""}
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
   }): Promise<PaginatedResponse<Partial<Select${Type}<TJsonb>>${hasVectorColumns ? " & { _distance?: number }" : ""}>>;
   /**
    * List ${table.name} records with pagination and filtering
@@ -3990,6 +3994,7 @@ ${hasJsonbColumns ? `  /**
     };` : ""}
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
   }): Promise<PaginatedResponse<${Type}WithIncludes<TInclude>${hasVectorColumns ? " & { _distance?: number }" : ""}>>;
   async list<TJsonb extends Partial<Select${Type}> = {}>(params?: {
     include?: ${Type}IncludeSpec;
@@ -4006,6 +4011,7 @@ ${hasJsonbColumns ? `  /**
     };` : ""}
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
   }): Promise<PaginatedResponse<Select${Type}<TJsonb> | Partial<Select${Type}<TJsonb>>>> {
     return this.post<PaginatedResponse<Select${Type}<TJsonb>${hasVectorColumns ? " & { _distance?: number }" : ""}>>(\`\${this.resource}/list\`, params ?? {});
   }` : `  /**
@@ -4027,6 +4033,7 @@ ${hasJsonbColumns ? `  /**
     };` : ""}
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
   }): Promise<PaginatedResponse<Partial<Select${Type}>${hasVectorColumns ? " & { _distance?: number }" : ""}>>;
   /**
    * List ${table.name} records with field exclusion
@@ -4047,6 +4054,7 @@ ${hasJsonbColumns ? `  /**
     };` : ""}
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
   }): Promise<PaginatedResponse<Partial<Select${Type}>${hasVectorColumns ? " & { _distance?: number }" : ""}>>;
   /**
    * List ${table.name} records with pagination and filtering
@@ -4072,6 +4080,7 @@ ${hasJsonbColumns ? `  /**
     };` : ""}
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
   }): Promise<PaginatedResponse<${Type}WithIncludes<TInclude>${hasVectorColumns ? " & { _distance?: number }" : ""}>>;
   async list(params?: {
     include?: ${Type}IncludeSpec;
@@ -4088,6 +4097,7 @@ ${hasJsonbColumns ? `  /**
     };` : ""}
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
   }): Promise<PaginatedResponse<Select${Type} | Partial<Select${Type}>>> {
     return this.post<PaginatedResponse<Select${Type}${hasVectorColumns ? " & { _distance?: number }" : ""}>>(\`\${this.resource}/list\`, params ?? {});
   }`}
@@ -6218,6 +6228,7 @@ export async function listRecords(
     include?: any;
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
     vector?: {
       field: string;
       query: number[];
@@ -6227,7 +6238,11 @@ export async function listRecords(
   }
 ): Promise<{ data?: any; total?: number; limit?: number; offset?: number; hasMore?: boolean; error?: string; issues?: any; needsIncludes?: boolean; includeSpec?: any; status: number }> {
   try {
-    const { where: whereClause, limit = 50, offset = 0, include, orderBy, order, vector } = params;
+    const { where: whereClause, limit = 50, offset = 0, include, orderBy, order, vector, distinctOn } = params;
+
+    // DISTINCT ON support
+    const distinctCols: string[] | null = distinctOn ? (Array.isArray(distinctOn) ? distinctOn : [distinctOn]) : null;
+    const _distinctOnColsSQL = distinctCols ? distinctCols.map(c => '"' + c + '"').join(', ') : '';
 
     // Get distance operator if vector search
     const distanceOp = vector ? getVectorDistanceOperator(vector.metric) : "";
@@ -6286,26 +6301,49 @@ export async function listRecords(
     }
 
     // Build SELECT clause
+    const _distinctOnPrefix = distinctCols ? 'DISTINCT ON (' + _distinctOnColsSQL + ') ' : '';
     const baseColumns = buildColumnList(ctx.select, ctx.exclude, ctx.allColumnNames);
     const selectClause = vector
-      ? \`\${baseColumns}, ("\${vector.field}" \${distanceOp} ($1)::vector) AS _distance\`
-      : baseColumns;
+      ? \`\${_distinctOnPrefix}\${baseColumns}, ("\${vector.field}" \${distanceOp} ($1)::vector) AS _distance\`
+      : \`\${_distinctOnPrefix}\${baseColumns}\`;
 
     // Build ORDER BY clause
     let orderBySQL = "";
     if (vector) {
       // For vector search, always order by distance
       orderBySQL = \`ORDER BY "\${vector.field}" \${distanceOp} ($1)::vector\`;
-    } else if (orderBy) {
-      const columns = Array.isArray(orderBy) ? orderBy : [orderBy];
-      const directions = Array.isArray(order) ? order : (order ? Array(columns.length).fill(order) : Array(columns.length).fill("asc"));
-
-      const orderParts = columns.map((col, i) => {
-        const dir = (directions[i] || "asc").toUpperCase();
-        return \`"\${col}" \${dir}\`;
-      });
+    } else {
+      const userCols = orderBy ? (Array.isArray(orderBy) ? orderBy : [orderBy]) : [];
+      const userDirs: ("asc" | "desc")[] = orderBy
+        ? (Array.isArray(order) ? order : (order ? Array(userCols.length).fill(order) : Array(userCols.length).fill("asc")))
+        : [];
+
+      const finalCols: string[] = [];
+      const finalDirs: string[] = [];
+
+      if (distinctCols) {
+        // DISTINCT ON requires its columns to be the leftmost ORDER BY prefix
+        for (const col of distinctCols) {
+          const userIdx = userCols.indexOf(col);
+          finalCols.push(col);
+          finalDirs.push(userIdx >= 0 ? (userDirs[userIdx] || "asc") : "asc");
+        }
+        // Append remaining user-specified cols not already covered by distinctOn
+        for (let i = 0; i < userCols.length; i++) {
+          if (!distinctCols.includes(userCols[i]!)) {
+            finalCols.push(userCols[i]!);
+            finalDirs.push(userDirs[i] || "asc");
+          }
+        }
+      } else {
+        finalCols.push(...userCols);
+        finalDirs.push(...userDirs.map(d => d || "asc"));
+      }
 
-      orderBySQL = \`ORDER BY \${orderParts.join(", ")}\`;
+      if (finalCols.length > 0) {
+        const orderParts = finalCols.map((c, i) => \`"\${c}" \${finalDirs[i]!.toUpperCase()}\`);
+        orderBySQL = \`ORDER BY \${orderParts.join(", ")}\`;
+      }
     }
 
     // Add limit and offset params
@@ -6314,7 +6352,9 @@ export async function listRecords(
     const allParams = [...queryParams, ...whereParams, limit, offset];
 
     // Get total count for pagination
-    const countText = \`SELECT COUNT(*) FROM "\${ctx.table}" \${countWhereSQL}\`;
+    const countText = distinctCols
+      ? \`SELECT COUNT(*) FROM (SELECT DISTINCT ON (\${_distinctOnColsSQL}) 1 FROM "\${ctx.table}" \${countWhereSQL} ORDER BY \${_distinctOnColsSQL}) __distinct_count\`
+      : \`SELECT COUNT(*) FROM "\${ctx.table}" \${countWhereSQL}\`;
     log.debug(\`LIST \${ctx.table} COUNT SQL:\`, countText, "params:", countParams);
     const countResult = await ctx.pg.query(countText, countParams);
     const total = parseInt(countResult.rows[0].count, 10);

package/dist/index.js

@@ -1779,8 +1779,8 @@ async function introspect(connectionString, schema) {
         c.column_default,
         a.atttypmod
       FROM information_schema.columns c
-      LEFT JOIN pg_catalog.pg_class cl ON cl.relname = c.table_name
-      LEFT JOIN pg_catalog.pg_namespace n ON n.oid = cl.relnamespace AND n.nspname = c.table_schema
+      LEFT JOIN pg_catalog.pg_namespace n ON n.nspname = c.table_schema
+      LEFT JOIN pg_catalog.pg_class cl ON cl.relname = c.table_name AND cl.relnamespace = n.oid
       LEFT JOIN pg_catalog.pg_attribute a ON a.attrelid = cl.oid AND a.attname = c.column_name
       WHERE c.table_schema = $1
       ORDER BY c.table_name, c.ordinal_position
@@ -2167,8 +2167,9 @@ export const ${Type}ListParamsSchema = z.object({
   offset: z.number().int().nonnegative().optional(),
   where: z.any().optional(),
   vector: VectorSearchParamsSchema.optional(),
-  orderBy: z.enum([${columnNames}]).optional(),
-  order: z.enum(["asc", "desc"]).optional()
+  orderBy: z.union([z.enum([${columnNames}]), z.array(z.enum([${columnNames}]))]).optional(),
+  order: z.union([z.enum(["asc", "desc"]), z.array(z.enum(["asc", "desc"]))]).optional(),
+  distinctOn: z.union([z.enum([${columnNames}]), z.array(z.enum([${columnNames}]))]).optional()
 }).strict();
 
 // Schema for ordering parameters
@@ -2302,7 +2303,8 @@ const listSchema = z.object({
   limit: z.number().int().positive().max(1000).optional(),
   offset: z.number().int().min(0).optional(),
   orderBy: z.union([columnEnum, z.array(columnEnum)]).optional(),
-  order: z.union([z.enum(["asc", "desc"]), z.array(z.enum(["asc", "desc"]))]).optional(),${hasVectorColumns ? `
+  order: z.union([z.enum(["asc", "desc"]), z.array(z.enum(["asc", "desc"]))]).optional(),
+  distinctOn: z.union([columnEnum, z.array(columnEnum)]).optional(),${hasVectorColumns ? `
   vector: z.object({
     field: z.string(),
     query: z.array(z.number()),
@@ -2978,6 +2980,7 @@ ${hasJsonbColumns ? `  /**
     };` : ""}
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
   }): Promise<PaginatedResponse<Partial<Select${Type}<TJsonb>>${hasVectorColumns ? " & { _distance?: number }" : ""}>>;
   /**
    * List ${table.name} records with field exclusion
@@ -2998,6 +3001,7 @@ ${hasJsonbColumns ? `  /**
     };` : ""}
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
   }): Promise<PaginatedResponse<Partial<Select${Type}<TJsonb>>${hasVectorColumns ? " & { _distance?: number }" : ""}>>;
   /**
    * List ${table.name} records with pagination and filtering
@@ -3029,6 +3033,7 @@ ${hasJsonbColumns ? `  /**
     };` : ""}
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
   }): Promise<PaginatedResponse<${Type}WithIncludes<TInclude>${hasVectorColumns ? " & { _distance?: number }" : ""}>>;
   async list<TJsonb extends Partial<Select${Type}> = {}>(params?: {
     include?: ${Type}IncludeSpec;
@@ -3045,6 +3050,7 @@ ${hasJsonbColumns ? `  /**
     };` : ""}
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
   }): Promise<PaginatedResponse<Select${Type}<TJsonb> | Partial<Select${Type}<TJsonb>>>> {
     return this.post<PaginatedResponse<Select${Type}<TJsonb>${hasVectorColumns ? " & { _distance?: number }" : ""}>>(\`\${this.resource}/list\`, params ?? {});
   }` : `  /**
@@ -3066,6 +3072,7 @@ ${hasJsonbColumns ? `  /**
     };` : ""}
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
   }): Promise<PaginatedResponse<Partial<Select${Type}>${hasVectorColumns ? " & { _distance?: number }" : ""}>>;
   /**
    * List ${table.name} records with field exclusion
@@ -3086,6 +3093,7 @@ ${hasJsonbColumns ? `  /**
     };` : ""}
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
   }): Promise<PaginatedResponse<Partial<Select${Type}>${hasVectorColumns ? " & { _distance?: number }" : ""}>>;
   /**
    * List ${table.name} records with pagination and filtering
@@ -3111,6 +3119,7 @@ ${hasJsonbColumns ? `  /**
     };` : ""}
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
   }): Promise<PaginatedResponse<${Type}WithIncludes<TInclude>${hasVectorColumns ? " & { _distance?: number }" : ""}>>;
   async list(params?: {
     include?: ${Type}IncludeSpec;
@@ -3127,6 +3136,7 @@ ${hasJsonbColumns ? `  /**
     };` : ""}
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
   }): Promise<PaginatedResponse<Select${Type} | Partial<Select${Type}>>> {
     return this.post<PaginatedResponse<Select${Type}${hasVectorColumns ? " & { _distance?: number }" : ""}>>(\`\${this.resource}/list\`, params ?? {});
   }`}
@@ -5257,6 +5267,7 @@ export async function listRecords(
     include?: any;
     orderBy?: string | string[];
     order?: "asc" | "desc" | ("asc" | "desc")[];
+    distinctOn?: string | string[];
     vector?: {
       field: string;
       query: number[];
@@ -5266,7 +5277,11 @@ export async function listRecords(
   }
 ): Promise<{ data?: any; total?: number; limit?: number; offset?: number; hasMore?: boolean; error?: string; issues?: any; needsIncludes?: boolean; includeSpec?: any; status: number }> {
   try {
-    const { where: whereClause, limit = 50, offset = 0, include, orderBy, order, vector } = params;
+    const { where: whereClause, limit = 50, offset = 0, include, orderBy, order, vector, distinctOn } = params;
+
+    // DISTINCT ON support
+    const distinctCols: string[] | null = distinctOn ? (Array.isArray(distinctOn) ? distinctOn : [distinctOn]) : null;
+    const _distinctOnColsSQL = distinctCols ? distinctCols.map(c => '"' + c + '"').join(', ') : '';
 
     // Get distance operator if vector search
     const distanceOp = vector ? getVectorDistanceOperator(vector.metric) : "";
@@ -5325,26 +5340,49 @@ export async function listRecords(
     }
 
     // Build SELECT clause
+    const _distinctOnPrefix = distinctCols ? 'DISTINCT ON (' + _distinctOnColsSQL + ') ' : '';
     const baseColumns = buildColumnList(ctx.select, ctx.exclude, ctx.allColumnNames);
     const selectClause = vector
-      ? \`\${baseColumns}, ("\${vector.field}" \${distanceOp} ($1)::vector) AS _distance\`
-      : baseColumns;
+      ? \`\${_distinctOnPrefix}\${baseColumns}, ("\${vector.field}" \${distanceOp} ($1)::vector) AS _distance\`
+      : \`\${_distinctOnPrefix}\${baseColumns}\`;
 
     // Build ORDER BY clause
     let orderBySQL = "";
     if (vector) {
       // For vector search, always order by distance
       orderBySQL = \`ORDER BY "\${vector.field}" \${distanceOp} ($1)::vector\`;
-    } else if (orderBy) {
-      const columns = Array.isArray(orderBy) ? orderBy : [orderBy];
-      const directions = Array.isArray(order) ? order : (order ? Array(columns.length).fill(order) : Array(columns.length).fill("asc"));
-
-      const orderParts = columns.map((col, i) => {
-        const dir = (directions[i] || "asc").toUpperCase();
-        return \`"\${col}" \${dir}\`;
-      });
+    } else {
+      const userCols = orderBy ? (Array.isArray(orderBy) ? orderBy : [orderBy]) : [];
+      const userDirs: ("asc" | "desc")[] = orderBy
+        ? (Array.isArray(order) ? order : (order ? Array(userCols.length).fill(order) : Array(userCols.length).fill("asc")))
+        : [];
+
+      const finalCols: string[] = [];
+      const finalDirs: string[] = [];
+
+      if (distinctCols) {
+        // DISTINCT ON requires its columns to be the leftmost ORDER BY prefix
+        for (const col of distinctCols) {
+          const userIdx = userCols.indexOf(col);
+          finalCols.push(col);
+          finalDirs.push(userIdx >= 0 ? (userDirs[userIdx] || "asc") : "asc");
+        }
+        // Append remaining user-specified cols not already covered by distinctOn
+        for (let i = 0; i < userCols.length; i++) {
+          if (!distinctCols.includes(userCols[i]!)) {
+            finalCols.push(userCols[i]!);
+            finalDirs.push(userDirs[i] || "asc");
+          }
+        }
+      } else {
+        finalCols.push(...userCols);
+        finalDirs.push(...userDirs.map(d => d || "asc"));
+      }
 
-      orderBySQL = \`ORDER BY \${orderParts.join(", ")}\`;
+      if (finalCols.length > 0) {
+        const orderParts = finalCols.map((c, i) => \`"\${c}" \${finalDirs[i]!.toUpperCase()}\`);
+        orderBySQL = \`ORDER BY \${orderParts.join(", ")}\`;
+      }
     }
 
     // Add limit and offset params
@@ -5353,7 +5391,9 @@ export async function listRecords(
     const allParams = [...queryParams, ...whereParams, limit, offset];
 
     // Get total count for pagination
-    const countText = \`SELECT COUNT(*) FROM "\${ctx.table}" \${countWhereSQL}\`;
+    const countText = distinctCols
+      ? \`SELECT COUNT(*) FROM (SELECT DISTINCT ON (\${_distinctOnColsSQL}) 1 FROM "\${ctx.table}" \${countWhereSQL} ORDER BY \${_distinctOnColsSQL}) __distinct_count\`
+      : \`SELECT COUNT(*) FROM "\${ctx.table}" \${countWhereSQL}\`;
     log.debug(\`LIST \${ctx.table} COUNT SQL:\`, countText, "params:", countParams);
     const countResult = await ctx.pg.query(countText, countParams);
     const total = parseInt(countResult.rows[0].count, 10);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postgresdk",
-  "version": "0.18.15",
+  "version": "0.18.17",
   "description": "Generate a typed server/client SDK from a Postgres schema (includes, Zod, Hono).",
   "type": "module",
   "bin": {