postgresdk 0.9.6 → 0.9.8

package/README.md

@@ -88,7 +88,7 @@ export default {
   outServer: "./api/server",           // Server code output directory  
   outClient: "./api/client",           // Client SDK output directory
   softDeleteColumn: null,              // Column name for soft deletes (e.g., "deleted_at")
-  includeDepthLimit: 3,                 // Max depth for nested includes
+  includeMethodsDepth: 2,               // Max depth for nested includes
   dateType: "date",                    // "date" | "string" - How to handle timestamps
   serverFramework: "hono",             // Currently only hono is supported
   useJsExtensions: false,              // Add .js to imports (for Vercel Edge, Deno)

package/dist/cli.js

@@ -1355,11 +1355,11 @@ function extractConfigFields(configContent) {
       isCommented: !!softDeleteMatch[1]
     });
   }
-  const depthMatch = configContent.match(/^\s*(\/\/)?\s*includeDepthLimit:\s*(\d+)/m);
+  const depthMatch = configContent.match(/^\s*(\/\/)?\s*(includeMethodsDepth|includeDepthLimit):\s*(\d+)/m);
   if (depthMatch) {
     fields.push({
-      key: "includeDepthLimit",
-      value: parseInt(depthMatch[2]),
+      key: "includeMethodsDepth",
+      value: parseInt(depthMatch[3]),
       description: "Maximum depth for nested relationship includes",
       isCommented: !!depthMatch[1]
     });
@@ -1391,35 +1391,90 @@ function extractConfigFields(configContent) {
       isCommented: !!jsExtClientMatch[1]
     });
   }
-  const testsMatch = configContent.match(/^\s*(\/\/)?\s*tests:\s*\{/m);
-  if (testsMatch) {
+  const testsBlock = extractComplexBlock(configContent, "tests");
+  if (testsBlock) {
     fields.push({
       key: "tests",
-      value: "configured",
+      value: testsBlock.content,
       description: "Test generation configuration",
-      isCommented: !!testsMatch[1]
+      isCommented: testsBlock.isCommented
     });
   }
-  const authMatch = configContent.match(/^\s*(\/\/)?\s*auth:\s*\{/m);
-  if (authMatch) {
+  const authBlock = extractComplexBlock(configContent, "auth");
+  if (authBlock) {
     fields.push({
       key: "auth",
-      value: "configured",
+      value: authBlock.content,
       description: "Authentication configuration",
-      isCommented: !!authMatch[1]
+      isCommented: authBlock.isCommented
     });
   }
-  const pullMatch = configContent.match(/^\s*(\/\/)?\s*pull:\s*\{/m);
-  if (pullMatch) {
+  const pullBlock = extractComplexBlock(configContent, "pull");
+  if (pullBlock) {
     fields.push({
       key: "pull",
-      value: "configured",
+      value: pullBlock.content,
       description: "SDK distribution configuration",
-      isCommented: !!pullMatch[1]
+      isCommented: pullBlock.isCommented
     });
   }
   return fields;
 }
+function extractComplexBlock(configContent, blockName) {
+  const blockStartRegex = new RegExp(`^\\s*(//)?\\s*${blockName}:\\s*\\{`, "m");
+  const match = configContent.match(blockStartRegex);
+  if (!match)
+    return null;
+  const isCommented = !!match[1];
+  const startIndex = match.index;
+  let braceCount = 0;
+  let inString = false;
+  let inComment = false;
+  let stringChar = "";
+  let i = startIndex;
+  while (i < configContent.length && configContent[i] !== "{") {
+    i++;
+  }
+  const blockStart = i;
+  braceCount = 1;
+  i++;
+  while (i < configContent.length && braceCount > 0) {
+    const char = configContent[i];
+    const prevChar = i > 0 ? configContent[i - 1] : "";
+    if (!inComment && (char === '"' || char === "'" || char === "`")) {
+      if (!inString) {
+        inString = true;
+        stringChar = char;
+      } else if (char === stringChar && prevChar !== "\\") {
+        inString = false;
+        stringChar = "";
+      }
+    }
+    if (!inString && char === "/" && configContent[i + 1] === "/") {
+      inComment = true;
+    }
+    if (inComment && char === `
+`) {
+      inComment = false;
+    }
+    if (!inString && !inComment) {
+      if (char === "{") {
+        braceCount++;
+      } else if (char === "}") {
+        braceCount--;
+      }
+    }
+    i++;
+  }
+  if (braceCount === 0) {
+    const blockContent = configContent.slice(blockStart + 1, i - 1);
+    return {
+      content: `{${blockContent}}`,
+      isCommented
+    };
+  }
+  return null;
+}
 function generateMergedConfig(existingFields, mergeStrategy, userChoices = undefined) {
   const template = `/**
  * PostgreSDK Configuration
@@ -1469,9 +1524,9 @@ export default {
   
   /**
    * Maximum depth for nested relationship includes to prevent infinite loops
-   * @default 3
+   * @default 2
    */
-  ${getFieldLine("includeDepthLimit", existingFields, mergeStrategy, "3", userChoices)}
+  ${getFieldLine("includeMethodsDepth", existingFields, mergeStrategy, "2", userChoices)}
   
   
   /**
@@ -1501,11 +1556,7 @@ export default {
    * Generate basic SDK tests
    * Uncomment to enable test generation with Docker setup
    */
-  // tests: {
-  //   generate: true,
-  //   output: "./api/tests",
-  //   framework: "vitest"  // or "jest" or "bun"
-  // },
+  ${getComplexBlockLine("tests", existingFields, mergeStrategy, userChoices)}
   
   // ========== AUTHENTICATION ==========
   
@@ -1521,24 +1572,7 @@ export default {
    * 
    * Full syntax for advanced options:
    */
-  // auth: {
-  //   // Strategy: "none" | "api-key" | "jwt-hs256"
-  //   strategy: "none",
-  //   
-  //   // For API Key authentication
-  //   apiKeyHeader: "x-api-key",  // Header name for API key
-  //   apiKeys: [                  // List of valid API keys
-  //     process.env.API_KEY_1,
-  //     process.env.API_KEY_2,
-  //   ],
-  //   
-  //   // For JWT (HS256) authentication
-  //   jwt: {
-  //     sharedSecret: process.env.JWT_SECRET,  // Secret for signing/verifying
-  //     issuer: "my-app",                      // Optional: validate 'iss' claim
-  //     audience: "my-users",                  // Optional: validate 'aud' claim
-  //   }
-  // },
+  ${getComplexBlockLine("auth", existingFields, mergeStrategy, userChoices)}
   
   // ========== SDK DISTRIBUTION (Pull Configuration) ==========
   
@@ -1546,11 +1580,7 @@ export default {
    * Configuration for pulling SDK from a remote API
    * Used when running 'postgresdk pull' command
    */
-  // pull: {
-  //   from: "https://api.myapp.com",     // API URL to pull SDK from
-  //   output: "./src/sdk",                // Local directory for pulled SDK
-  //   token: process.env.API_TOKEN,       // Optional authentication token
-  // },
+  ${getComplexBlockLine("pull", existingFields, mergeStrategy, userChoices)}
 };
 `;
   return template;
@@ -1589,6 +1619,55 @@ function getFieldLine(key, existingFields, mergeStrategy, defaultValue, userChoi
   }
   return `// ${key}: ${defaultValue},`;
 }
+function getComplexBlockLine(key, existingFields, mergeStrategy, userChoices) {
+  const existing = existingFields.find((f) => f.key === key);
+  const shouldUseExisting = mergeStrategy === "keep-existing" && existing && !existing.isCommented || mergeStrategy === "interactive" && userChoices?.get(key) === "keep" && existing && !existing.isCommented;
+  const shouldUseNew = mergeStrategy === "use-defaults" || mergeStrategy === "interactive" && userChoices?.get(key) === "new";
+  if (shouldUseExisting && existing) {
+    return `${key}: ${existing.value},`;
+  }
+  if (shouldUseNew) {
+    return getDefaultComplexBlock(key);
+  }
+  return getDefaultComplexBlock(key);
+}
+function getDefaultComplexBlock(key) {
+  switch (key) {
+    case "tests":
+      return `// tests: {
+  //   generate: true,
+  //   output: "./api/tests",
+  //   framework: "vitest"  // or "jest" or "bun"
+  // },`;
+    case "auth":
+      return `// auth: {
+  //   // Strategy: "none" | "api-key" | "jwt-hs256"
+  //   strategy: "none",
+  //   
+  //   // For API Key authentication
+  //   apiKeyHeader: "x-api-key",  // Header name for API key
+  //   apiKeys: [                  // List of valid API keys
+  //     process.env.API_KEY_1,
+  //     process.env.API_KEY_2,
+  //   ],
+  //   
+  //   // For JWT (HS256) authentication
+  //   jwt: {
+  //     sharedSecret: process.env.JWT_SECRET,  // Secret for signing/verifying
+  //     issuer: "my-app",                      // Optional: validate 'iss' claim
+  //     audience: "my-users",                  // Optional: validate 'aud' claim
+  //   }
+  // },`;
+    case "pull":
+      return `// pull: {
+  //   from: "https://api.myapp.com",     // API URL to pull SDK from
+  //   output: "./src/sdk",                // Local directory for pulled SDK
+  //   token: process.env.API_TOKEN,       // Optional authentication token
+  // },`;
+    default:
+      return `// ${key}: {},`;
+  }
+}
 var init_cli_config_utils = () => {};
 
 // src/cli-init.ts
@@ -1793,9 +1872,9 @@ export default {
   
   /**
    * Maximum depth for nested relationship includes to prevent infinite loops
-   * @default 3
+   * @default 2
    */
-  // includeDepthLimit: 3,
+  // includeMethodsDepth: 2,
   
   
   /**
@@ -2359,7 +2438,7 @@ export function register${Type}Routes(app: Hono, deps: { pg: { query: (text: str
     table: "${fileTableName}",
     pkColumns: ${JSON.stringify(safePkCols)},
     softDeleteColumn: ${softDel ? `"${softDel}"` : "null"},
-    includeDepthLimit: ${opts.includeDepthLimit}
+    includeMethodsDepth: ${opts.includeMethodsDepth}
   };
 ${hasAuth ? `
   // \uD83D\uDD10 Auth: protect all routes for this table
@@ -2420,7 +2499,7 @@ ${hasAuth ? `
           result.data, 
           result.includeSpec, 
           deps.pg, 
-          ${opts.includeDepthLimit}
+          ${opts.includeMethodsDepth}
         );
         return c.json(stitched);
       } catch (e: any) {
@@ -3492,7 +3571,7 @@ export interface OperationContext {
   table: string;
   pkColumns: string[];
   softDeleteColumn?: string | null;
-  includeDepthLimit: number;
+  includeMethodsDepth: number;
 }
 
 const DEBUG = process.env.SDK_DEBUG === "1" || process.env.SDK_DEBUG === "true";
@@ -4535,7 +4614,7 @@ async function generate(configPath) {
     if (serverFramework === "hono") {
       routeContent = emitHonoRoutes(table, graph, {
         softDeleteColumn: cfg.softDeleteColumn || null,
-        includeDepthLimit: cfg.includeMethodsDepth || 2,
+        includeMethodsDepth: cfg.includeMethodsDepth || 2,
         authStrategy: normalizedAuth?.strategy,
         useJsExtensions: cfg.useJsExtensions
       });

package/dist/core/operations.d.ts

@@ -12,7 +12,7 @@ export interface OperationContext {
     table: string;
     pkColumns: string[];
     softDeleteColumn?: string | null;
-    includeDepthLimit: number;
+    includeMethodsDepth: number;
 }
 /**
  * CREATE operation - Insert a new record

package/dist/emit-routes-hono.d.ts

@@ -5,7 +5,7 @@ import type { Table } from "./introspect";
 import type { Graph } from "./rel-classify";
 export declare function emitHonoRoutes(table: Table, _graph: Graph, opts: {
     softDeleteColumn: string | null;
-    includeDepthLimit: number;
+    includeMethodsDepth: number;
     authStrategy?: string;
     useJsExtensions?: boolean;
 }): string;

package/dist/emit-routes.d.ts

@@ -16,6 +16,6 @@ import type { Graph } from "./rel-classify";
  */
 export declare function emitRoutes(table: Table, _graph: Graph, opts: {
     softDeleteColumn: string | null;
-    includeDepthLimit: number;
+    includeMethodsDepth: number;
     authStrategy?: string;
 }): string;

package/dist/index.js

@@ -1694,7 +1694,7 @@ export function register${Type}Routes(app: Hono, deps: { pg: { query: (text: str
     table: "${fileTableName}",
     pkColumns: ${JSON.stringify(safePkCols)},
     softDeleteColumn: ${softDel ? `"${softDel}"` : "null"},
-    includeDepthLimit: ${opts.includeDepthLimit}
+    includeMethodsDepth: ${opts.includeMethodsDepth}
   };
 ${hasAuth ? `
   // \uD83D\uDD10 Auth: protect all routes for this table
@@ -1755,7 +1755,7 @@ ${hasAuth ? `
           result.data, 
           result.includeSpec, 
           deps.pg, 
-          ${opts.includeDepthLimit}
+          ${opts.includeMethodsDepth}
         );
         return c.json(stitched);
       } catch (e: any) {
@@ -2827,7 +2827,7 @@ export interface OperationContext {
   table: string;
   pkColumns: string[];
   softDeleteColumn?: string | null;
-  includeDepthLimit: number;
+  includeMethodsDepth: number;
 }
 
 const DEBUG = process.env.SDK_DEBUG === "1" || process.env.SDK_DEBUG === "true";
@@ -3870,7 +3870,7 @@ async function generate(configPath) {
     if (serverFramework === "hono") {
       routeContent = emitHonoRoutes(table, graph, {
         softDeleteColumn: cfg.softDeleteColumn || null,
-        includeDepthLimit: cfg.includeMethodsDepth || 2,
+        includeMethodsDepth: cfg.includeMethodsDepth || 2,
         authStrategy: normalizedAuth?.strategy,
         useJsExtensions: cfg.useJsExtensions
       });

package/package.json

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