postgresdk 0.7.1 → 0.7.3

package/dist/cli.js

@@ -1688,6 +1688,57 @@ export const Update${Type}Schema = Insert${Type}Schema.partial();
 `;
 }
 
+// src/emit-params-zod.ts
+init_utils();
+function emitParamsZod(table, graph) {
+  const Type = pascal(table.name);
+  const columnNames = table.columns.map((c) => `"${c.name}"`).join(", ");
+  const pkCols = Array.isArray(table.pk) ? table.pk : table.pk ? [table.pk] : [];
+  const safePk = pkCols.length ? pkCols : ["id"];
+  const hasCompositePk = safePk.length > 1;
+  const includeSpecSchema = `z.any()`;
+  const pkSchema = hasCompositePk ? `z.object({ ${safePk.map((col) => `${col}: z.string().min(1)`).join(", ")} })` : `z.string().min(1)`;
+  return `import { z } from "zod";
+
+// Schema for primary key parameters
+export const ${Type}PkSchema = ${pkSchema};
+
+// Schema for list query parameters
+export const ${Type}ListParamsSchema = z.object({
+  include: ${includeSpecSchema}.optional(),
+  limit: z.number().int().positive().max(1000).optional(),
+  offset: z.number().int().nonnegative().optional(),
+  where: z.any().optional(),
+  orderBy: z.enum([${columnNames}]).optional(),
+  order: z.enum(["asc", "desc"]).optional()
+}).strict();
+
+// Schema for ordering parameters
+export const ${Type}OrderParamsSchema = z.object({
+  orderBy: z.enum([${columnNames}]).optional(),
+  order: z.enum(["asc", "desc"]).optional()
+}).strict();
+
+export type ${Type}Pk = z.infer<typeof ${Type}PkSchema>;
+export type ${Type}ListParams = z.infer<typeof ${Type}ListParamsSchema>;
+export type ${Type}OrderParams = z.infer<typeof ${Type}OrderParamsSchema>;
+`;
+}
+
+// src/emit-shared-params-zod.ts
+function emitSharedParamsZod() {
+  return `import { z } from "zod";
+
+// Shared pagination schema (used across all tables)
+export const PaginationParamsSchema = z.object({
+  limit: z.number().int().positive().max(1000).optional(),
+  offset: z.number().int().nonnegative().optional()
+}).strict();
+
+export type PaginationParams = z.infer<typeof PaginationParamsSchema>;
+`;
+}
+
 // src/emit-routes-hono.ts
 init_utils();
 function emitHonoRoutes(table, _graph, opts) {
@@ -1951,6 +2002,16 @@ export type { AuthConfig, HeaderMap, AuthHeadersProvider } from "./base-client${
 `;
   for (const t of tables) {
     out += `export { Insert${pascal(t.name)}Schema, Update${pascal(t.name)}Schema } from "./zod/${t.name}${ext}";
+`;
+  }
+  out += `
+// Zod schemas for query parameters
+`;
+  out += `export { PaginationParamsSchema } from "./params/shared${ext}";
+`;
+  for (const t of tables) {
+    const Type = pascal(t.name);
+    out += `export { ${Type}PkSchema, ${Type}ListParamsSchema, ${Type}OrderParamsSchema } from "./params/${t.name}${ext}";
 `;
   }
   return out;
@@ -3318,27 +3379,57 @@ else
 fi
 
 echo ""
-echo "\uD83D\uDE80 Starting API server..."
-echo "⚠️  TODO: Uncomment and customize the API server startup command below:"
+echo "\uD83D\uDE80 API Server Setup"
+echo "════════════════════════════════════════════════════════════════"
 echo ""
-echo "  # Example for Node.js/Bun using PROJECT_ROOT:"
-echo "  # cd \\$PROJECT_ROOT && npm run dev &"
-echo "  # SERVER_PID=\\$!"
+echo "⚠️  IMPORTANT: This script expects your API server to be running."
 echo ""
-echo "  # Example for custom server file:"
-echo "  # DATABASE_URL=\\$TEST_DATABASE_URL node \\$PROJECT_ROOT/src/server.js &"
-echo "  # SERVER_PID=\\$!"
+echo "   Option 1: Start manually (recommended for development)"
+echo "     - Start your API server in another terminal"
+echo "     - Make sure it uses TEST_DATABASE_URL: $TEST_DATABASE_URL"
+echo "     - Make sure it's accessible at: $TEST_API_URL"
 echo ""
-echo "  # Example for Bun:"
-echo "  # DATABASE_URL=\\$TEST_DATABASE_URL bun \\$PROJECT_ROOT/src/index.ts &"
-echo "  # SERVER_PID=\\$!"
+echo "   Option 2: Auto-start (edit this script)"
+echo "     - Uncomment and customize one of these commands:"
+echo "     # cd $PROJECT_ROOT && DATABASE_URL=$TEST_DATABASE_URL npm run dev &"
+echo "     # DATABASE_URL=$TEST_DATABASE_URL bun $PROJECT_ROOT/src/server.ts &"
+echo "     # SERVER_PID=$!  # (uncomment this line too)"
+echo "     # sleep 3        # (wait for server to start)"
 echo ""
-echo "  Please edit this script to start your API server."
+echo "════════════════════════════════════════════════════════════════"
 echo ""
-# cd $PROJECT_ROOT && npm run dev &
+
+# Uncomment these lines to auto-start your API server:
+# cd $PROJECT_ROOT && DATABASE_URL=$TEST_DATABASE_URL npm run dev &
 # SERVER_PID=$!
 # sleep 3
 
+# Check if API server is running before starting tests
+echo "\uD83D\uDD0D Checking if API server is running..."
+API_URL="\${TEST_API_URL:-http://localhost:3000}"
+
+# Simple health check - just try to connect to the port
+if ! curl -f -s --connect-timeout 3 "\${API_URL}/health" > /dev/null 2>&1; then
+  # Try a generic endpoint or just check if port is open
+  if ! nc -z localhost 3000 2>/dev/null; then
+    echo "❌ ERROR: API server is not running on \${API_URL}"
+    echo ""
+    echo "   The API server must be running before tests can execute."
+    echo "   Please:"
+    echo "   1. Start your API server manually, OR"
+    echo "   2. Edit this script to start the server automatically (see comments above)"
+    echo ""
+    echo "   Uncomment and customize one of these server startup commands:"
+    echo "   # cd $PROJECT_ROOT && npm run dev &"
+    echo "   # DATABASE_URL=$TEST_DATABASE_URL bun $PROJECT_ROOT/src/server.ts &"
+    echo ""
+    exit 1
+  fi
+fi
+
+echo "✅ API server is responding"
+echo ""
+
 echo "\uD83E\uDDEA Running tests..."
 TIMESTAMP=$(date +%Y%m%d_%H%M%S)
 TEST_RESULTS_DIR="$SCRIPT_DIR/test-results"
@@ -3361,8 +3452,14 @@ echo "  $TEST_RESULTS_DIR/"
 echo ""
 echo "\uD83D\uDCA1 Tips:"
 echo "  - Database will be stopped automatically on script exit"
+echo "  - API server (if started by this script) will also be stopped automatically"
 echo "  - To manually stop the database: docker-compose -f $SCRIPT_DIR/docker-compose.yml down"
 echo "  - To reset the database: docker-compose -f $SCRIPT_DIR/docker-compose.yml down -v"
+echo ""
+echo "\uD83D\uDD27 If tests failed due to server issues:"
+echo "  - Check that your API server is configured to use TEST_DATABASE_URL"
+echo "  - Verify your API server is accessible at $API_URL"
+echo "  - Make sure all required environment variables are set"
 
 exit $TEST_EXIT_CODE
 `;
@@ -3769,7 +3866,8 @@ async function generate(configPath) {
     join(serverDir, "routes"),
     clientDir,
     join(clientDir, "types"),
-    join(clientDir, "zod")
+    join(clientDir, "zod"),
+    join(clientDir, "params")
   ];
   if (generateTests) {
     dirs.push(testDir);
@@ -3779,6 +3877,7 @@ async function generate(configPath) {
   const includeSpec = emitIncludeSpec(graph);
   files.push({ path: join(serverDir, "include-spec.ts"), content: includeSpec });
   files.push({ path: join(clientDir, "include-spec.ts"), content: includeSpec });
+  files.push({ path: join(clientDir, "params", "shared.ts"), content: emitSharedParamsZod() });
   files.push({ path: join(clientDir, "base-client.ts"), content: emitBaseClient() });
   files.push({
     path: join(serverDir, "include-builder.ts"),
@@ -3806,6 +3905,8 @@ async function generate(configPath) {
     const zodSrc = emitZod(table, { numericMode: "string" });
     files.push({ path: join(serverDir, "zod", `${table.name}.ts`), content: zodSrc });
     files.push({ path: join(clientDir, "zod", `${table.name}.ts`), content: zodSrc });
+    const paramsZodSrc = emitParamsZod(table, graph);
+    files.push({ path: join(clientDir, "params", `${table.name}.ts`), content: paramsZodSrc });
     let routeContent;
     if (serverFramework === "hono") {
       routeContent = emitHonoRoutes(table, graph, {

package/dist/emit-params-zod.d.ts

@@ -0,0 +1,3 @@
+import type { Table } from "./introspect";
+import type { Graph } from "./rel-classify";
+export declare function emitParamsZod(table: Table, graph: Graph): string;

package/dist/emit-shared-params-zod.d.ts

@@ -0,0 +1 @@
+export declare function emitSharedParamsZod(): string;

package/dist/index.js

@@ -1425,6 +1425,57 @@ export const Update${Type}Schema = Insert${Type}Schema.partial();
 `;
 }
 
+// src/emit-params-zod.ts
+init_utils();
+function emitParamsZod(table, graph) {
+  const Type = pascal(table.name);
+  const columnNames = table.columns.map((c) => `"${c.name}"`).join(", ");
+  const pkCols = Array.isArray(table.pk) ? table.pk : table.pk ? [table.pk] : [];
+  const safePk = pkCols.length ? pkCols : ["id"];
+  const hasCompositePk = safePk.length > 1;
+  const includeSpecSchema = `z.any()`;
+  const pkSchema = hasCompositePk ? `z.object({ ${safePk.map((col) => `${col}: z.string().min(1)`).join(", ")} })` : `z.string().min(1)`;
+  return `import { z } from "zod";
+
+// Schema for primary key parameters
+export const ${Type}PkSchema = ${pkSchema};
+
+// Schema for list query parameters
+export const ${Type}ListParamsSchema = z.object({
+  include: ${includeSpecSchema}.optional(),
+  limit: z.number().int().positive().max(1000).optional(),
+  offset: z.number().int().nonnegative().optional(),
+  where: z.any().optional(),
+  orderBy: z.enum([${columnNames}]).optional(),
+  order: z.enum(["asc", "desc"]).optional()
+}).strict();
+
+// Schema for ordering parameters
+export const ${Type}OrderParamsSchema = z.object({
+  orderBy: z.enum([${columnNames}]).optional(),
+  order: z.enum(["asc", "desc"]).optional()
+}).strict();
+
+export type ${Type}Pk = z.infer<typeof ${Type}PkSchema>;
+export type ${Type}ListParams = z.infer<typeof ${Type}ListParamsSchema>;
+export type ${Type}OrderParams = z.infer<typeof ${Type}OrderParamsSchema>;
+`;
+}
+
+// src/emit-shared-params-zod.ts
+function emitSharedParamsZod() {
+  return `import { z } from "zod";
+
+// Shared pagination schema (used across all tables)
+export const PaginationParamsSchema = z.object({
+  limit: z.number().int().positive().max(1000).optional(),
+  offset: z.number().int().nonnegative().optional()
+}).strict();
+
+export type PaginationParams = z.infer<typeof PaginationParamsSchema>;
+`;
+}
+
 // src/emit-routes-hono.ts
 init_utils();
 function emitHonoRoutes(table, _graph, opts) {
@@ -1688,6 +1739,16 @@ export type { AuthConfig, HeaderMap, AuthHeadersProvider } from "./base-client${
 `;
   for (const t of tables) {
     out += `export { Insert${pascal(t.name)}Schema, Update${pascal(t.name)}Schema } from "./zod/${t.name}${ext}";
+`;
+  }
+  out += `
+// Zod schemas for query parameters
+`;
+  out += `export { PaginationParamsSchema } from "./params/shared${ext}";
+`;
+  for (const t of tables) {
+    const Type = pascal(t.name);
+    out += `export { ${Type}PkSchema, ${Type}ListParamsSchema, ${Type}OrderParamsSchema } from "./params/${t.name}${ext}";
 `;
   }
   return out;
@@ -3055,27 +3116,57 @@ else
 fi
 
 echo ""
-echo "\uD83D\uDE80 Starting API server..."
-echo "⚠️  TODO: Uncomment and customize the API server startup command below:"
+echo "\uD83D\uDE80 API Server Setup"
+echo "════════════════════════════════════════════════════════════════"
 echo ""
-echo "  # Example for Node.js/Bun using PROJECT_ROOT:"
-echo "  # cd \\$PROJECT_ROOT && npm run dev &"
-echo "  # SERVER_PID=\\$!"
+echo "⚠️  IMPORTANT: This script expects your API server to be running."
 echo ""
-echo "  # Example for custom server file:"
-echo "  # DATABASE_URL=\\$TEST_DATABASE_URL node \\$PROJECT_ROOT/src/server.js &"
-echo "  # SERVER_PID=\\$!"
+echo "   Option 1: Start manually (recommended for development)"
+echo "     - Start your API server in another terminal"
+echo "     - Make sure it uses TEST_DATABASE_URL: $TEST_DATABASE_URL"
+echo "     - Make sure it's accessible at: $TEST_API_URL"
 echo ""
-echo "  # Example for Bun:"
-echo "  # DATABASE_URL=\\$TEST_DATABASE_URL bun \\$PROJECT_ROOT/src/index.ts &"
-echo "  # SERVER_PID=\\$!"
+echo "   Option 2: Auto-start (edit this script)"
+echo "     - Uncomment and customize one of these commands:"
+echo "     # cd $PROJECT_ROOT && DATABASE_URL=$TEST_DATABASE_URL npm run dev &"
+echo "     # DATABASE_URL=$TEST_DATABASE_URL bun $PROJECT_ROOT/src/server.ts &"
+echo "     # SERVER_PID=$!  # (uncomment this line too)"
+echo "     # sleep 3        # (wait for server to start)"
 echo ""
-echo "  Please edit this script to start your API server."
+echo "════════════════════════════════════════════════════════════════"
 echo ""
-# cd $PROJECT_ROOT && npm run dev &
+
+# Uncomment these lines to auto-start your API server:
+# cd $PROJECT_ROOT && DATABASE_URL=$TEST_DATABASE_URL npm run dev &
 # SERVER_PID=$!
 # sleep 3
 
+# Check if API server is running before starting tests
+echo "\uD83D\uDD0D Checking if API server is running..."
+API_URL="\${TEST_API_URL:-http://localhost:3000}"
+
+# Simple health check - just try to connect to the port
+if ! curl -f -s --connect-timeout 3 "\${API_URL}/health" > /dev/null 2>&1; then
+  # Try a generic endpoint or just check if port is open
+  if ! nc -z localhost 3000 2>/dev/null; then
+    echo "❌ ERROR: API server is not running on \${API_URL}"
+    echo ""
+    echo "   The API server must be running before tests can execute."
+    echo "   Please:"
+    echo "   1. Start your API server manually, OR"
+    echo "   2. Edit this script to start the server automatically (see comments above)"
+    echo ""
+    echo "   Uncomment and customize one of these server startup commands:"
+    echo "   # cd $PROJECT_ROOT && npm run dev &"
+    echo "   # DATABASE_URL=$TEST_DATABASE_URL bun $PROJECT_ROOT/src/server.ts &"
+    echo ""
+    exit 1
+  fi
+fi
+
+echo "✅ API server is responding"
+echo ""
+
 echo "\uD83E\uDDEA Running tests..."
 TIMESTAMP=$(date +%Y%m%d_%H%M%S)
 TEST_RESULTS_DIR="$SCRIPT_DIR/test-results"
@@ -3098,8 +3189,14 @@ echo "  $TEST_RESULTS_DIR/"
 echo ""
 echo "\uD83D\uDCA1 Tips:"
 echo "  - Database will be stopped automatically on script exit"
+echo "  - API server (if started by this script) will also be stopped automatically"
 echo "  - To manually stop the database: docker-compose -f $SCRIPT_DIR/docker-compose.yml down"
 echo "  - To reset the database: docker-compose -f $SCRIPT_DIR/docker-compose.yml down -v"
+echo ""
+echo "\uD83D\uDD27 If tests failed due to server issues:"
+echo "  - Check that your API server is configured to use TEST_DATABASE_URL"
+echo "  - Verify your API server is accessible at $API_URL"
+echo "  - Make sure all required environment variables are set"
 
 exit $TEST_EXIT_CODE
 `;
@@ -3506,7 +3603,8 @@ async function generate(configPath) {
     join(serverDir, "routes"),
     clientDir,
     join(clientDir, "types"),
-    join(clientDir, "zod")
+    join(clientDir, "zod"),
+    join(clientDir, "params")
   ];
   if (generateTests) {
     dirs.push(testDir);
@@ -3516,6 +3614,7 @@ async function generate(configPath) {
   const includeSpec = emitIncludeSpec(graph);
   files.push({ path: join(serverDir, "include-spec.ts"), content: includeSpec });
   files.push({ path: join(clientDir, "include-spec.ts"), content: includeSpec });
+  files.push({ path: join(clientDir, "params", "shared.ts"), content: emitSharedParamsZod() });
   files.push({ path: join(clientDir, "base-client.ts"), content: emitBaseClient() });
   files.push({
     path: join(serverDir, "include-builder.ts"),
@@ -3543,6 +3642,8 @@ async function generate(configPath) {
     const zodSrc = emitZod(table, { numericMode: "string" });
     files.push({ path: join(serverDir, "zod", `${table.name}.ts`), content: zodSrc });
     files.push({ path: join(clientDir, "zod", `${table.name}.ts`), content: zodSrc });
+    const paramsZodSrc = emitParamsZod(table, graph);
+    files.push({ path: join(clientDir, "params", `${table.name}.ts`), content: paramsZodSrc });
     let routeContent;
     if (serverFramework === "hono") {
       routeContent = emitHonoRoutes(table, graph, {

package/package.json

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