postgresdk 0.15.2 → 0.15.4

package/README.md

@@ -62,19 +62,6 @@ const filtered = await sdk.users.list({
 
 ## Getting Started
 
-### Installation
-
-```bash
-npm install -g postgresdk
-# or
-npx postgresdk generate
-
-# With Bun
-bun install -g postgresdk
-# or
-bunx postgresdk generate
-```
-
 > **Note:** Currently only generates **Hono** server code. See [Supported Frameworks](#supported-frameworks) for details.
 
 ### Quick Start
@@ -82,9 +69,11 @@ bunx postgresdk generate
 1. Initialize your project:
 
 ```bash
-npx postgresdk init
-# or with Bun
-bunx postgresdk init
+npx postgresdk@latest init
+# or
+bunx postgresdk@latest init
+# or
+pnpm dlx postgresdk@latest init
 ```
 
 This creates a `postgresdk.config.ts` file with all available options documented.
@@ -101,9 +90,11 @@ export default {
 3. Run the generator:
 
 ```bash
-postgresdk generate
-# or with Bun
-bunx postgresdk generate
+npx postgresdk@latest generate
+# or
+bunx postgresdk@latest generate
+# or
+pnpm dlx postgresdk@latest generate
 ```
 
 4. Set up your server:
@@ -498,23 +489,17 @@ When you run `postgresdk generate`, the client SDK is automatically bundled into
 
 **On client applications:**
 
-1. Install postgresdk in your client project:
+1. Pull the SDK from your API:
 
 ```bash
-npm install -D postgresdk
+npx postgresdk@latest pull --from=https://api.myapp.com --output=./src/sdk
 # or
-bun install -D postgresdk
-```
-
-2. Pull the SDK from your API:
-
-```bash
-npx postgresdk pull --from=https://api.myapp.com --output=./src/sdk
-# or with Bun
-bunx postgresdk pull --from=https://api.myapp.com --output=./src/sdk
+bunx postgresdk@latest pull --from=https://api.myapp.com --output=./src/sdk
+# or
+pnpm dlx postgresdk@latest pull --from=https://api.myapp.com --output=./src/sdk
 ```
 
-3. Use the generated SDK with full TypeScript types:
+2. Use the generated SDK with full TypeScript types:
 
 ```typescript
 import { SDK } from "./src/sdk";
@@ -538,9 +523,11 @@ export default {
 
 Then run:
 ```bash
-npx postgresdk pull
+npx postgresdk@latest pull
+# or
+bunx postgresdk@latest pull
 # or
-bunx postgresdk pull
+pnpm dlx postgresdk@latest pull
 ```
 
 The SDK files are written directly to your client project, giving you full TypeScript autocomplete and type safety.
@@ -588,9 +575,7 @@ const books = booksResult.data;
 const nestedResult = await sdk.authors.list({
   include: {
     books: {
-      include: {
-        tags: true
-      }
+      tags: true
     }
   }
 });
@@ -696,7 +681,9 @@ See the generated SDK documentation for all available operators: `$eq`, `$ne`, `
 ### CLI Commands
 
 ```bash
-postgresdk <command> [options]
+npx postgresdk@latest <command> [options]
+# or: bunx postgresdk@latest
+# or: pnpm dlx postgresdk@latest
 
 Commands:
   init                 Create a postgresdk.config.ts file
@@ -708,17 +695,18 @@ Commands:
 Options:
   -c, --config <path>  Path to config file (default: postgresdk.config.ts)
 
-Init flags:
-  --api                Generate API-side config (for database introspection)
-  --sdk                Generate SDK-side config (for consuming remote SDK)
+Init subcommands/flags:
+  init pull            Generate pull-only config (alias for --sdk)
+  init --api           Generate API-side config (for database introspection)
+  init --sdk           Generate SDK-side config (for consuming remote SDK)
 
 Examples:
-  postgresdk init                              # Interactive prompt
-  postgresdk init --api                        # API-side config
-  postgresdk init --sdk                        # SDK-side config
-  postgresdk generate
-  postgresdk generate -c custom.config.ts
-  postgresdk pull --from=https://api.com --output=./src/sdk
+  npx postgresdk@latest init                              # Interactive prompt
+  npx postgresdk@latest init pull                         # Pull-only config
+  npx postgresdk@latest init --api                        # API-side config
+  npx postgresdk@latest generate
+  npx postgresdk@latest generate -c custom.config.ts
+  npx postgresdk@latest pull --from=https://api.com --output=./src/sdk
 ```
 
 ### Generated Tests

package/dist/cli.js

@@ -1994,7 +1994,7 @@ async function initCommand(args) {
 `);
   const forceError = args.includes("--force-error");
   const isApiSide = args.includes("--api");
-  const isSdkSide = args.includes("--sdk");
+  const isSdkSide = args.includes("--sdk") || args[0] === "pull";
   const configPath = resolve(process.cwd(), "postgresdk.config.ts");
   if (existsSync2(configPath)) {
     if (forceError) {
@@ -2116,7 +2116,7 @@ async function initCommand(args) {
   }
   let projectType;
   if (isApiSide && isSdkSide) {
-    console.error("❌ Error: Cannot use both --api and --sdk flags");
+    console.error("❌ Error: Cannot use both --api and --sdk/pull options");
     process.exit(1);
   } else if (isApiSide) {
     projectType = "api";
@@ -2392,15 +2392,12 @@ async function pullCommand(args) {
     ...Object.fromEntries(Object.entries(cliConfig).filter(([_, v]) => v !== undefined))
   };
   if (!config.from) {
-    console.error("❌ Missing API URL. Specify via --from or in postgresdk.config.ts");
+    console.error("❌ Missing API URL");
     console.error(`
-Example config file:`);
-    console.error(`export default {
-  pull: {
-    from: "https://api.company.com",
-    output: "./src/sdk"
-  }
-}`);
+Options:`);
+    console.error("  1. Use CLI args:    npx postgresdk@latest pull --from=https://api.company.com --output=./src/sdk");
+    console.error("  2. Create config:   npx postgresdk@latest init pull");
+    console.error("                      (then edit postgresdk.config.ts and run 'postgresdk pull')");
     process.exit(1);
   }
   console.log(`\uD83D\uDD04 Pulling SDK from ${config.from}`);
@@ -2688,7 +2685,7 @@ export function buildWith(root: TableName, spec: any, maxDepth = ${maxDepth}) {
       const v = s[key];
       if (v === true) out[key] = true;
       else if (v && typeof v === "object") {
-        const child = "include" in v ? walk(rel.target, v.include, depth + 1) : undefined;
+        const child = walk(rel.target, v, depth + 1);
         out[key] = child ? { with: child } : true;
       }
     }
@@ -3581,7 +3578,7 @@ export async function loadIncludes(
           for (const r of rows) r[key] = [];
         }
         // Recurse if nested include specified
-        const childSpec = s[key] && typeof s[key] === "object" ? (s[key] as any).include : undefined;
+        const childSpec = s[key] && typeof s[key] === "object" ? s[key] : undefined;
         if (childSpec) {
           const children = rows.flatMap(r => (r[key] ?? []));
           try {
@@ -3601,7 +3598,7 @@ export async function loadIncludes(
           log.error("loadOneToMany failed", { table, key, target }, e?.message ?? e);
           for (const r of rows) r[key] = [];
         }
-        const childSpec = s[key] && typeof s[key] === "object" ? (s[key] as any).include : undefined;
+        const childSpec = s[key] && typeof s[key] === "object" ? s[key] : undefined;
         if (childSpec) {
           const children = rows.flatMap(r => (r[key] ?? []));
           try {
@@ -3630,7 +3627,7 @@ export async function loadIncludes(
             for (const r of rows) r[key] = null;
           }
         }
-        const childSpec = s[key] && typeof s[key] === "object" ? (s[key] as any).include : undefined;
+        const childSpec = s[key] && typeof s[key] === "object" ? s[key] : undefined;
         if (childSpec) {
           const children = rows.map(r => r[key]).filter(Boolean);
           try {

package/dist/index.js

@@ -1862,7 +1862,7 @@ export function buildWith(root: TableName, spec: any, maxDepth = ${maxDepth}) {
       const v = s[key];
       if (v === true) out[key] = true;
       else if (v && typeof v === "object") {
-        const child = "include" in v ? walk(rel.target, v.include, depth + 1) : undefined;
+        const child = walk(rel.target, v, depth + 1);
         out[key] = child ? { with: child } : true;
       }
     }
@@ -2755,7 +2755,7 @@ export async function loadIncludes(
           for (const r of rows) r[key] = [];
         }
         // Recurse if nested include specified
-        const childSpec = s[key] && typeof s[key] === "object" ? (s[key] as any).include : undefined;
+        const childSpec = s[key] && typeof s[key] === "object" ? s[key] : undefined;
         if (childSpec) {
           const children = rows.flatMap(r => (r[key] ?? []));
           try {
@@ -2775,7 +2775,7 @@ export async function loadIncludes(
           log.error("loadOneToMany failed", { table, key, target }, e?.message ?? e);
           for (const r of rows) r[key] = [];
         }
-        const childSpec = s[key] && typeof s[key] === "object" ? (s[key] as any).include : undefined;
+        const childSpec = s[key] && typeof s[key] === "object" ? s[key] : undefined;
         if (childSpec) {
           const children = rows.flatMap(r => (r[key] ?? []));
           try {
@@ -2804,7 +2804,7 @@ export async function loadIncludes(
             for (const r of rows) r[key] = null;
           }
         }
-        const childSpec = s[key] && typeof s[key] === "object" ? (s[key] as any).include : undefined;
+        const childSpec = s[key] && typeof s[key] === "object" ? s[key] : undefined;
         if (childSpec) {
           const children = rows.map(r => r[key]).filter(Boolean);
           try {

package/package.json

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