postgresdk 0.6.3 → 0.6.5

package/dist/cli.js

@@ -741,7 +741,7 @@ var init_cli_pull = () => {};
 
 // src/index.ts
 var import_config = __toESM(require_config(), 1);
-import { join } from "node:path";
+import { join, relative } from "node:path";
 import { pathToFileURL } from "node:url";
 
 // src/introspect.ts
@@ -2340,21 +2340,26 @@ export async function deleteRecord(
 }
 
 // src/emit-tests.ts
-function emitTableTest(table, framework = "vitest") {
+function emitTableTest(table, clientPath, framework = "vitest") {
   const Type = pascal(table.name);
   const tableName = table.name;
   const imports = getFrameworkImports(framework);
   const sampleData = generateSampleData(table);
   const updateData = generateUpdateData(table);
   return `${imports}
-import { SDK } from '../client';
-import type { Insert${Type}, Update${Type}, Select${Type} } from '../client/types/${tableName}';
+import { SDK } from '${clientPath}';
+import type { Insert${Type}, Update${Type}, Select${Type} } from '${clientPath}/types/${tableName}';
 
 /**
  * Basic tests for ${tableName} table operations
  * 
  * These tests demonstrate basic CRUD operations.
- * Add your own business logic tests in separate files.
+ * The test data is auto-generated and may need adjustment for your specific schema.
+ * 
+ * If tests fail due to validation errors:
+ * 1. Check which fields are required by your API
+ * 2. Update the test data below to match your schema requirements
+ * 3. Consider adding your own business logic tests in separate files
  */
 describe('${Type} SDK Operations', () => {
   let sdk: SDK;
@@ -2371,7 +2376,7 @@ describe('${Type} SDK Operations', () => {
 });
 `;
 }
-function emitTestSetup(framework = "vitest") {
+function emitTestSetup(clientPath, framework = "vitest") {
   return `/**
  * Test Setup and Utilities
  * 
@@ -2390,7 +2395,7 @@ export const TEST_API_KEY = process.env.TEST_API_KEY;
 
 // Utility to create SDK instance
 export function createTestSDK() {
-  const { SDK } = require('../client');
+  const { SDK } = require('${clientPath}');
   return new SDK({
     baseUrl: TEST_API_URL,
     auth: TEST_API_KEY ? { apiKey: TEST_API_KEY } : undefined
@@ -2417,6 +2422,38 @@ export function randomDate(): Date {
 }
 `;
 }
+function emitVitestConfig() {
+  return `import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+  test: {
+    globals: true,
+    environment: 'node',
+    testTimeout: 30000,
+    hookTimeout: 30000,
+    // The reporters are configured via CLI in the test script
+  },
+});
+`;
+}
+function emitTestGitignore() {
+  return `# Test results
+test-results/
+*.log
+
+# Node modules (if tests have their own dependencies)
+node_modules/
+
+# Environment files
+.env
+.env.local
+.env.test
+
+# Coverage reports
+coverage/
+*.lcov
+`;
+}
 function emitDockerCompose() {
   return `# Docker Compose for Test Database
 # 
@@ -2502,7 +2539,14 @@ echo ""
 # sleep 3
 
 echo "\uD83E\uDDEA Running tests..."
-${runCommand} "$@"
+TIMESTAMP=$(date +%Y%m%d_%H%M%S)
+TEST_RESULTS_DIR="$SCRIPT_DIR/test-results"
+mkdir -p "$TEST_RESULTS_DIR"
+
+# Run tests with appropriate reporter based on framework
+${getTestCommand(framework, runCommand)}
+
+TEST_EXIT_CODE=$?
 
 # Cleanup
 # if [ ! -z "\${SERVER_PID}" ]; then
@@ -2510,12 +2554,34 @@ ${runCommand} "$@"
 #   kill $SERVER_PID 2>/dev/null || true
 # fi
 
-echo "✅ Tests completed!"
+if [ $TEST_EXIT_CODE -eq 0 ]; then
+  echo "✅ Tests completed successfully!"
+else
+  echo "❌ Tests failed with exit code $TEST_EXIT_CODE"
+fi
+
+echo ""
+echo "\uD83D\uDCCA Test results saved to:"
+echo "  $TEST_RESULTS_DIR/"
 echo ""
 echo "To stop the test database, run:"
 echo "  cd $SCRIPT_DIR && docker-compose down"
+
+exit $TEST_EXIT_CODE
 `;
 }
+function getTestCommand(framework, baseCommand) {
+  switch (framework) {
+    case "vitest":
+      return `${baseCommand} --reporter=default --reporter=json --outputFile="$TEST_RESULTS_DIR/results-\${TIMESTAMP}.json" "$@"`;
+    case "jest":
+      return `${baseCommand} --json --outputFile="$TEST_RESULTS_DIR/results-\${TIMESTAMP}.json" "$@"`;
+    case "bun":
+      return `${baseCommand} "$@" 2>&1 | tee "$TEST_RESULTS_DIR/results-\${TIMESTAMP}.txt"`;
+    default:
+      return `${baseCommand} "$@"`;
+  }
+}
 function getFrameworkImports(framework) {
   switch (framework) {
     case "vitest":
@@ -2531,14 +2597,20 @@ function getFrameworkImports(framework) {
 function generateSampleData(table) {
   const fields = [];
   for (const col of table.columns) {
-    if (col.hasDefault || col.name === "id" || col.name === "created_at" || col.name === "updated_at") {
+    if (col.name === "id" && col.hasDefault) {
       continue;
     }
-    if (col.nullable) {
+    if ((col.name === "created_at" || col.name === "updated_at") && col.hasDefault) {
       continue;
     }
-    const value = getSampleValue(col.pgType, col.name);
-    fields.push(`    ${col.name}: ${value}`);
+    if (col.name === "deleted_at") {
+      continue;
+    }
+    const isImportant = col.name.endsWith("_id") || col.name.endsWith("_by") || col.name.includes("email") || col.name.includes("name") || col.name.includes("phone") || col.name.includes("address") || col.name.includes("description") || col.name.includes("color") || col.name.includes("type") || col.name.includes("status") || col.name.includes("subject");
+    if (!col.nullable || isImportant) {
+      const value = getSampleValue(col.pgType, col.name);
+      fields.push(`    ${col.name}: ${value}`);
+    }
   }
   return fields.length > 0 ? `{
 ${fields.join(`,
@@ -2564,15 +2636,51 @@ ${fields.join(`,
 }
 function getSampleValue(type, name, isUpdate = false) {
   const suffix = isUpdate ? ' + " (updated)"' : "";
+  if (name.endsWith("_id") || name.endsWith("_by")) {
+    return `'550e8400-e29b-41d4-a716-446655440000'`;
+  }
   if (name.includes("email")) {
     return `'test${isUpdate ? ".updated" : ""}@example.com'`;
   }
+  if (name === "color") {
+    return `'#${isUpdate ? "FF0000" : "0000FF"}'`;
+  }
+  if (name === "gender") {
+    return `'${isUpdate ? "F" : "M"}'`;
+  }
+  if (name.includes("phone")) {
+    return `'${isUpdate ? "555-0200" : "555-0100"}'`;
+  }
+  if (name.includes("address")) {
+    return `'123 ${isUpdate ? "Updated" : "Test"} Street'`;
+  }
+  if (name === "type" || name === "status") {
+    return `'${isUpdate ? "updated" : "active"}'`;
+  }
+  if (name === "subject") {
+    return `'Test Subject${isUpdate ? " Updated" : ""}'`;
+  }
   if (name.includes("name") || name.includes("title")) {
     return `'Test ${pascal(name)}'${suffix}`;
   }
   if (name.includes("description") || name.includes("bio") || name.includes("content")) {
     return `'Test description'${suffix}`;
   }
+  if (name.includes("preferences") || name.includes("settings")) {
+    return `'Test preferences'${suffix}`;
+  }
+  if (name.includes("restrictions") || name.includes("dietary")) {
+    return `['vegetarian']`;
+  }
+  if (name.includes("location") || name.includes("clinic")) {
+    return `'Test Location'${suffix}`;
+  }
+  if (name.includes("specialty")) {
+    return `'General'`;
+  }
+  if (name.includes("tier")) {
+    return `'Standard'`;
+  }
   switch (type) {
     case "text":
     case "varchar":
@@ -2601,7 +2709,10 @@ function getSampleValue(type, name, isUpdate = false) {
     case "jsonb":
       return `{ key: 'value' }`;
     case "uuid":
-      return `'${isUpdate ? "b" : "a"}0e0e0e0-e0e0-e0e0-e0e0-e0e0e0e0e0e0'`;
+      return `'${isUpdate ? "550e8400-e29b-41d4-a716-446655440001" : "550e8400-e29b-41d4-a716-446655440000"}'`;
+    case "text[]":
+    case "varchar[]":
+      return `['item1', 'item2']`;
     default:
       return `'test'`;
   }
@@ -2810,9 +2921,10 @@ async function generate(configPath) {
   });
   if (generateTests) {
     console.log("\uD83E\uDDEA Generating tests...");
+    const relativeClientPath = relative(testDir, clientDir);
     files.push({
       path: join(testDir, "setup.ts"),
-      content: emitTestSetup(testFramework)
+      content: emitTestSetup(relativeClientPath, testFramework)
     });
     files.push({
       path: join(testDir, "docker-compose.yml"),
@@ -2822,10 +2934,20 @@ async function generate(configPath) {
       path: join(testDir, "run-tests.sh"),
       content: emitTestScript(testFramework)
     });
+    files.push({
+      path: join(testDir, ".gitignore"),
+      content: emitTestGitignore()
+    });
+    if (testFramework === "vitest") {
+      files.push({
+        path: join(testDir, "vitest.config.ts"),
+        content: emitVitestConfig()
+      });
+    }
     for (const table of Object.values(model.tables)) {
       files.push({
         path: join(testDir, `${table.name}.test.ts`),
-        content: emitTableTest(table, testFramework)
+        content: emitTableTest(table, relativeClientPath, testFramework)
       });
     }
   }

package/dist/emit-tests.d.ts

@@ -2,11 +2,19 @@ import type { Table } from "./introspect";
 /**
  * Generate basic SDK tests for a table
  */
-export declare function emitTableTest(table: Table, framework?: "vitest" | "jest" | "bun"): string;
+export declare function emitTableTest(table: Table, clientPath: string, framework?: "vitest" | "jest" | "bun"): string;
 /**
  * Generate a test setup file
  */
-export declare function emitTestSetup(framework?: "vitest" | "jest" | "bun"): string;
+export declare function emitTestSetup(clientPath: string, framework?: "vitest" | "jest" | "bun"): string;
+/**
+ * Generate vitest config file
+ */
+export declare function emitVitestConfig(): string;
+/**
+ * Generate .gitignore for test directory
+ */
+export declare function emitTestGitignore(): string;
 /**
  * Generate docker-compose.yml for test database
  */

package/dist/index.js

@@ -471,7 +471,7 @@ var require_config = __commonJS(() => {
 
 // src/index.ts
 var import_config = __toESM(require_config(), 1);
-import { join } from "node:path";
+import { join, relative } from "node:path";
 import { pathToFileURL } from "node:url";
 
 // src/introspect.ts
@@ -2070,21 +2070,26 @@ export async function deleteRecord(
 }
 
 // src/emit-tests.ts
-function emitTableTest(table, framework = "vitest") {
+function emitTableTest(table, clientPath, framework = "vitest") {
   const Type = pascal(table.name);
   const tableName = table.name;
   const imports = getFrameworkImports(framework);
   const sampleData = generateSampleData(table);
   const updateData = generateUpdateData(table);
   return `${imports}
-import { SDK } from '../client';
-import type { Insert${Type}, Update${Type}, Select${Type} } from '../client/types/${tableName}';
+import { SDK } from '${clientPath}';
+import type { Insert${Type}, Update${Type}, Select${Type} } from '${clientPath}/types/${tableName}';
 
 /**
  * Basic tests for ${tableName} table operations
  * 
  * These tests demonstrate basic CRUD operations.
- * Add your own business logic tests in separate files.
+ * The test data is auto-generated and may need adjustment for your specific schema.
+ * 
+ * If tests fail due to validation errors:
+ * 1. Check which fields are required by your API
+ * 2. Update the test data below to match your schema requirements
+ * 3. Consider adding your own business logic tests in separate files
  */
 describe('${Type} SDK Operations', () => {
   let sdk: SDK;
@@ -2101,7 +2106,7 @@ describe('${Type} SDK Operations', () => {
 });
 `;
 }
-function emitTestSetup(framework = "vitest") {
+function emitTestSetup(clientPath, framework = "vitest") {
   return `/**
  * Test Setup and Utilities
  * 
@@ -2120,7 +2125,7 @@ export const TEST_API_KEY = process.env.TEST_API_KEY;
 
 // Utility to create SDK instance
 export function createTestSDK() {
-  const { SDK } = require('../client');
+  const { SDK } = require('${clientPath}');
   return new SDK({
     baseUrl: TEST_API_URL,
     auth: TEST_API_KEY ? { apiKey: TEST_API_KEY } : undefined
@@ -2147,6 +2152,38 @@ export function randomDate(): Date {
 }
 `;
 }
+function emitVitestConfig() {
+  return `import { defineConfig } from 'vitest/config';
+
+export default defineConfig({
+  test: {
+    globals: true,
+    environment: 'node',
+    testTimeout: 30000,
+    hookTimeout: 30000,
+    // The reporters are configured via CLI in the test script
+  },
+});
+`;
+}
+function emitTestGitignore() {
+  return `# Test results
+test-results/
+*.log
+
+# Node modules (if tests have their own dependencies)
+node_modules/
+
+# Environment files
+.env
+.env.local
+.env.test
+
+# Coverage reports
+coverage/
+*.lcov
+`;
+}
 function emitDockerCompose() {
   return `# Docker Compose for Test Database
 # 
@@ -2232,7 +2269,14 @@ echo ""
 # sleep 3
 
 echo "\uD83E\uDDEA Running tests..."
-${runCommand} "$@"
+TIMESTAMP=$(date +%Y%m%d_%H%M%S)
+TEST_RESULTS_DIR="$SCRIPT_DIR/test-results"
+mkdir -p "$TEST_RESULTS_DIR"
+
+# Run tests with appropriate reporter based on framework
+${getTestCommand(framework, runCommand)}
+
+TEST_EXIT_CODE=$?
 
 # Cleanup
 # if [ ! -z "\${SERVER_PID}" ]; then
@@ -2240,12 +2284,34 @@ ${runCommand} "$@"
 #   kill $SERVER_PID 2>/dev/null || true
 # fi
 
-echo "✅ Tests completed!"
+if [ $TEST_EXIT_CODE -eq 0 ]; then
+  echo "✅ Tests completed successfully!"
+else
+  echo "❌ Tests failed with exit code $TEST_EXIT_CODE"
+fi
+
+echo ""
+echo "\uD83D\uDCCA Test results saved to:"
+echo "  $TEST_RESULTS_DIR/"
 echo ""
 echo "To stop the test database, run:"
 echo "  cd $SCRIPT_DIR && docker-compose down"
+
+exit $TEST_EXIT_CODE
 `;
 }
+function getTestCommand(framework, baseCommand) {
+  switch (framework) {
+    case "vitest":
+      return `${baseCommand} --reporter=default --reporter=json --outputFile="$TEST_RESULTS_DIR/results-\${TIMESTAMP}.json" "$@"`;
+    case "jest":
+      return `${baseCommand} --json --outputFile="$TEST_RESULTS_DIR/results-\${TIMESTAMP}.json" "$@"`;
+    case "bun":
+      return `${baseCommand} "$@" 2>&1 | tee "$TEST_RESULTS_DIR/results-\${TIMESTAMP}.txt"`;
+    default:
+      return `${baseCommand} "$@"`;
+  }
+}
 function getFrameworkImports(framework) {
   switch (framework) {
     case "vitest":
@@ -2261,14 +2327,20 @@ function getFrameworkImports(framework) {
 function generateSampleData(table) {
   const fields = [];
   for (const col of table.columns) {
-    if (col.hasDefault || col.name === "id" || col.name === "created_at" || col.name === "updated_at") {
+    if (col.name === "id" && col.hasDefault) {
+      continue;
+    }
+    if ((col.name === "created_at" || col.name === "updated_at") && col.hasDefault) {
       continue;
     }
-    if (col.nullable) {
+    if (col.name === "deleted_at") {
       continue;
     }
-    const value = getSampleValue(col.pgType, col.name);
-    fields.push(`    ${col.name}: ${value}`);
+    const isImportant = col.name.endsWith("_id") || col.name.endsWith("_by") || col.name.includes("email") || col.name.includes("name") || col.name.includes("phone") || col.name.includes("address") || col.name.includes("description") || col.name.includes("color") || col.name.includes("type") || col.name.includes("status") || col.name.includes("subject");
+    if (!col.nullable || isImportant) {
+      const value = getSampleValue(col.pgType, col.name);
+      fields.push(`    ${col.name}: ${value}`);
+    }
   }
   return fields.length > 0 ? `{
 ${fields.join(`,
@@ -2294,15 +2366,51 @@ ${fields.join(`,
 }
 function getSampleValue(type, name, isUpdate = false) {
   const suffix = isUpdate ? ' + " (updated)"' : "";
+  if (name.endsWith("_id") || name.endsWith("_by")) {
+    return `'550e8400-e29b-41d4-a716-446655440000'`;
+  }
   if (name.includes("email")) {
     return `'test${isUpdate ? ".updated" : ""}@example.com'`;
   }
+  if (name === "color") {
+    return `'#${isUpdate ? "FF0000" : "0000FF"}'`;
+  }
+  if (name === "gender") {
+    return `'${isUpdate ? "F" : "M"}'`;
+  }
+  if (name.includes("phone")) {
+    return `'${isUpdate ? "555-0200" : "555-0100"}'`;
+  }
+  if (name.includes("address")) {
+    return `'123 ${isUpdate ? "Updated" : "Test"} Street'`;
+  }
+  if (name === "type" || name === "status") {
+    return `'${isUpdate ? "updated" : "active"}'`;
+  }
+  if (name === "subject") {
+    return `'Test Subject${isUpdate ? " Updated" : ""}'`;
+  }
   if (name.includes("name") || name.includes("title")) {
     return `'Test ${pascal(name)}'${suffix}`;
   }
   if (name.includes("description") || name.includes("bio") || name.includes("content")) {
     return `'Test description'${suffix}`;
   }
+  if (name.includes("preferences") || name.includes("settings")) {
+    return `'Test preferences'${suffix}`;
+  }
+  if (name.includes("restrictions") || name.includes("dietary")) {
+    return `['vegetarian']`;
+  }
+  if (name.includes("location") || name.includes("clinic")) {
+    return `'Test Location'${suffix}`;
+  }
+  if (name.includes("specialty")) {
+    return `'General'`;
+  }
+  if (name.includes("tier")) {
+    return `'Standard'`;
+  }
   switch (type) {
     case "text":
     case "varchar":
@@ -2331,7 +2439,10 @@ function getSampleValue(type, name, isUpdate = false) {
     case "jsonb":
       return `{ key: 'value' }`;
     case "uuid":
-      return `'${isUpdate ? "b" : "a"}0e0e0e0-e0e0-e0e0-e0e0-e0e0e0e0e0e0'`;
+      return `'${isUpdate ? "550e8400-e29b-41d4-a716-446655440001" : "550e8400-e29b-41d4-a716-446655440000"}'`;
+    case "text[]":
+    case "varchar[]":
+      return `['item1', 'item2']`;
     default:
       return `'test'`;
   }
@@ -2540,9 +2651,10 @@ async function generate(configPath) {
   });
   if (generateTests) {
     console.log("\uD83E\uDDEA Generating tests...");
+    const relativeClientPath = relative(testDir, clientDir);
     files.push({
       path: join(testDir, "setup.ts"),
-      content: emitTestSetup(testFramework)
+      content: emitTestSetup(relativeClientPath, testFramework)
     });
     files.push({
       path: join(testDir, "docker-compose.yml"),
@@ -2552,10 +2664,20 @@ async function generate(configPath) {
       path: join(testDir, "run-tests.sh"),
       content: emitTestScript(testFramework)
     });
+    files.push({
+      path: join(testDir, ".gitignore"),
+      content: emitTestGitignore()
+    });
+    if (testFramework === "vitest") {
+      files.push({
+        path: join(testDir, "vitest.config.ts"),
+        content: emitVitestConfig()
+      });
+    }
     for (const table of Object.values(model.tables)) {
       files.push({
         path: join(testDir, `${table.name}.test.ts`),
-        content: emitTableTest(table, testFramework)
+        content: emitTableTest(table, relativeClientPath, testFramework)
       });
     }
   }

package/package.json

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