postgresdk 0.15.5 → 0.15.6

package/README.md

@@ -284,7 +284,6 @@ const sdk = new SDK({
 export default {
   connectionString: "...",
   auth: {
-    strategy: "jwt-hs256",
     jwt: {
       services: [
         { issuer: "my-app", secret: "env:JWT_SECRET" }  // Use "env:" prefix!
@@ -298,7 +297,6 @@ export default {
 export default {
   connectionString: "...",
   auth: {
-    strategy: "jwt-hs256",
     jwt: {
       services: [
         { issuer: "web-app", secret: "env:WEB_APP_SECRET" },
@@ -340,7 +338,6 @@ const token = sign({
 export default {
   connectionString: process.env.DATABASE_URL,
   auth: {
-    strategy: "jwt-hs256",
     jwt: {
       services: [
         { issuer: "web-app", secret: "env:WEB_SECRET" },

package/dist/cli.js

@@ -649,6 +649,31 @@ var init_emit_include_methods = __esm(() => {
   init_utils();
 });
 
+// src/types.ts
+function getAuthStrategy(auth) {
+  if (!auth)
+    return "none";
+  if (auth.jwt)
+    return "jwt-hs256";
+  if (auth.apiKeys && auth.apiKeys.length > 0)
+    return "api-key";
+  return "none";
+}
+function normalizeAuthConfig(input) {
+  if (!input)
+    return;
+  if ("jwt" in input || "apiKeys" in input) {
+    return input;
+  }
+  if ("apiKey" in input && input.apiKey) {
+    return {
+      apiKeyHeader: input.apiKeyHeader,
+      apiKeys: [input.apiKey, ...input.apiKeys || []]
+    };
+  }
+  return;
+}
+
 // src/emit-sdk-contract.ts
 var exports_emit_sdk_contract = {};
 __export(exports_emit_sdk_contract, {
@@ -722,7 +747,8 @@ const sdk = new SDK({
 }
 function generateSDKAuthExamples(auth) {
   const examples = [];
-  if (!auth || auth.strategy === "none" || !auth.strategy) {
+  const strategy = getAuthStrategy(auth);
+  if (strategy === "none") {
     examples.push({
       strategy: "none",
       description: "No authentication required",
@@ -731,7 +757,7 @@ function generateSDKAuthExamples(auth) {
 });`
     });
   }
-  if (auth?.strategy === "api-key") {
+  if (strategy === "api-key") {
     examples.push({
       strategy: "apiKey",
       description: "API Key authentication",
@@ -744,7 +770,7 @@ function generateSDKAuthExamples(auth) {
 });`
     });
   }
-  if (auth?.strategy === "jwt-hs256") {
+  if (strategy === "jwt-hs256") {
     examples.push({
       strategy: "jwt",
       description: "JWT Bearer token authentication",
@@ -1637,22 +1663,27 @@ function extractConfigFields(configContent) {
       isCommented: !!schemaMatch[1]
     });
   }
+  const outDirMatch = configContent.match(/^\s*(\/\/)?\s*outDir:\s*(.+)/m);
   const outServerMatch = configContent.match(/^\s*(\/\/)?\s*outServer:\s*"(.+)"/m);
-  if (outServerMatch) {
+  const outClientMatch = configContent.match(/^\s*(\/\/)?\s*outClient:\s*"(.+)"/m);
+  if (outDirMatch) {
+    let value = outDirMatch[2]?.trim() || "";
+    value = value.replace(/,\s*$/, "");
     fields.push({
-      key: "outServer",
-      value: outServerMatch[2],
-      description: "Output directory for server-side code",
-      isCommented: !!outServerMatch[1]
+      key: "outDir",
+      value,
+      description: "Output directory for generated code",
+      isCommented: !!outDirMatch[1]
     });
-  }
-  const outClientMatch = configContent.match(/^\s*(\/\/)?\s*outClient:\s*"(.+)"/m);
-  if (outClientMatch) {
+  } else if (outServerMatch || outClientMatch) {
+    const serverPath = outServerMatch?.[2] || "./api/server";
+    const clientPath = outClientMatch?.[2] || "./api/client";
+    const isCommented = !!(outServerMatch?.[1] && outClientMatch?.[1]);
     fields.push({
-      key: "outClient",
-      value: outClientMatch[2],
-      description: "Output directory for client SDK",
-      isCommented: !!outClientMatch[1]
+      key: "outDir",
+      value: `{ server: "${serverPath}", client: "${clientPath}" }`,
+      description: "Output directory for generated code",
+      isCommented
     });
   }
   const softDeleteMatch = configContent.match(/^\s*(\/\/)?\s*softDeleteColumn:\s*(.+),?$/m);
@@ -1808,18 +1839,19 @@ export default {
    * @default "public"
    */
   ${getFieldLine("schema", existingFields, mergeStrategy, '"public"', userChoices)}
-  
-  /**
-   * Output directory for server-side code (routes, validators, etc.)
-   * @default "./api/server"
-   */
-  ${getFieldLine("outServer", existingFields, mergeStrategy, '"./api/server"', userChoices)}
-  
+
   /**
-   * Output directory for client SDK
-   * @default "./api/client"
+   * Output directory for generated code
+   *
+   * Simple usage (same directory for both):
+   *   outDir: "./api"
+   *
+   * Separate directories for client and server:
+   *   outDir: { client: "./sdk", server: "./api" }
+   *
+   * @default { client: "./api/client", server: "./api/server" }
    */
-  ${getFieldLine("outClient", existingFields, mergeStrategy, '"./api/client"', userChoices)}
+  ${getFieldLine("outDir", existingFields, mergeStrategy, '"./api"', userChoices)}
   
   // ========== ADVANCED OPTIONS ==========
   
@@ -1920,7 +1952,10 @@ function getFieldLine(key, existingFields, mergeStrategy, defaultValue, userChoi
   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) {
-    const value = typeof existing.value === "string" && !existing.value.startsWith('"') ? `"${existing.value}"` : existing.value;
+    let value = existing.value;
+    if (typeof value === "string" && !value.startsWith('"') && !value.startsWith("{") && !value.startsWith("[")) {
+      value = `"${value}"`;
+    }
     return `${key}: ${value},`;
   }
   if (shouldUseNew) {
@@ -1950,9 +1985,6 @@ function getDefaultComplexBlock(key) {
   // },`;
     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
@@ -1963,8 +1995,8 @@ function getDefaultComplexBlock(key) {
   //   // For JWT (HS256) authentication
   //   jwt: {
   //     services: [                            // Array of services that can authenticate
-  //       { issuer: "web-app", secret: process.env.WEB_APP_SECRET },
-  //       { issuer: "mobile-app", secret: process.env.MOBILE_SECRET },
+  //       { issuer: "web-app", secret: "env:WEB_APP_SECRET" },
+  //       { issuer: "mobile-app", secret: "env:MOBILE_SECRET" },
   //     ],
   //     audience: "my-api",                    // Optional: validate 'aud' claim
   //   }
@@ -3933,7 +3965,7 @@ export type Where<T> = WhereFieldConditions<T> & {
 
 // src/emit-auth.ts
 function emitAuth(cfgAuth) {
-  const strategy = cfgAuth?.strategy ?? "none";
+  const strategy = getAuthStrategy(cfgAuth);
   const apiKeyHeader = cfgAuth?.apiKeyHeader ?? "x-api-key";
   const apiKeys = cfgAuth?.apiKeys ?? [];
   const jwtServices = cfgAuth?.jwt?.services ?? [];
@@ -5494,38 +5526,6 @@ function generateTestCases(table, sampleData, updateData, hasForeignKeys = false
 // src/index.ts
 init_emit_sdk_contract();
 init_utils();
-
-// src/types.ts
-function normalizeAuthConfig(input) {
-  if (!input)
-    return;
-  if ("strategy" in input && input.strategy) {
-    return input;
-  }
-  if ("apiKey" in input && input.apiKey) {
-    return {
-      strategy: "api-key",
-      apiKeyHeader: input.apiKeyHeader,
-      apiKeys: [input.apiKey, ...input.apiKeys || []]
-    };
-  }
-  if ("apiKeys" in input && input.apiKeys?.length) {
-    return {
-      strategy: "api-key",
-      apiKeyHeader: input.apiKeyHeader,
-      apiKeys: input.apiKeys
-    };
-  }
-  if ("jwt" in input && input.jwt) {
-    return {
-      strategy: "jwt-hs256",
-      jwt: input.jwt
-    };
-  }
-  return { strategy: "none" };
-}
-
-// src/index.ts
 async function generate(configPath) {
   if (!existsSync(configPath)) {
     throw new Error(`Config file not found: ${configPath}
@@ -5599,7 +5599,7 @@ async function generate(configPath) {
     content: emitIncludeLoader(graph, model, cfg.includeMethodsDepth || 2, cfg.useJsExtensions)
   });
   files.push({ path: join(serverDir, "logger.ts"), content: emitLogger() });
-  if (normalizedAuth?.strategy && normalizedAuth.strategy !== "none") {
+  if (getAuthStrategy(normalizedAuth) !== "none") {
     files.push({ path: join(serverDir, "auth.ts"), content: emitAuth(normalizedAuth) });
   }
   files.push({
@@ -5623,7 +5623,7 @@ async function generate(configPath) {
       routeContent = emitHonoRoutes(table, graph, {
         softDeleteColumn: cfg.softDeleteColumn || null,
         includeMethodsDepth: cfg.includeMethodsDepth || 2,
-        authStrategy: normalizedAuth?.strategy,
+        authStrategy: getAuthStrategy(normalizedAuth),
         useJsExtensions: cfg.useJsExtensions,
         apiPathPrefix: cfg.apiPathPrefix || "/v1"
       });
@@ -5650,7 +5650,7 @@ async function generate(configPath) {
   if (serverFramework === "hono") {
     files.push({
       path: join(serverDir, "router.ts"),
-      content: emitHonoRouter(Object.values(model.tables), !!normalizedAuth?.strategy && normalizedAuth.strategy !== "none", cfg.useJsExtensions)
+      content: emitHonoRouter(Object.values(model.tables), getAuthStrategy(normalizedAuth) !== "none", cfg.useJsExtensions)
     });
   }
   const { generateUnifiedContract: generateUnifiedContract2, generateUnifiedContractMarkdown: generateUnifiedContractMarkdown2 } = await Promise.resolve().then(() => (init_emit_sdk_contract(), exports_emit_sdk_contract));

package/dist/index.js

@@ -648,6 +648,31 @@ var init_emit_include_methods = __esm(() => {
   init_utils();
 });
 
+// src/types.ts
+function getAuthStrategy(auth) {
+  if (!auth)
+    return "none";
+  if (auth.jwt)
+    return "jwt-hs256";
+  if (auth.apiKeys && auth.apiKeys.length > 0)
+    return "api-key";
+  return "none";
+}
+function normalizeAuthConfig(input) {
+  if (!input)
+    return;
+  if ("jwt" in input || "apiKeys" in input) {
+    return input;
+  }
+  if ("apiKey" in input && input.apiKey) {
+    return {
+      apiKeyHeader: input.apiKeyHeader,
+      apiKeys: [input.apiKey, ...input.apiKeys || []]
+    };
+  }
+  return;
+}
+
 // src/emit-sdk-contract.ts
 var exports_emit_sdk_contract = {};
 __export(exports_emit_sdk_contract, {
@@ -721,7 +746,8 @@ const sdk = new SDK({
 }
 function generateSDKAuthExamples(auth) {
   const examples = [];
-  if (!auth || auth.strategy === "none" || !auth.strategy) {
+  const strategy = getAuthStrategy(auth);
+  if (strategy === "none") {
     examples.push({
       strategy: "none",
       description: "No authentication required",
@@ -730,7 +756,7 @@ function generateSDKAuthExamples(auth) {
 });`
     });
   }
-  if (auth?.strategy === "api-key") {
+  if (strategy === "api-key") {
     examples.push({
       strategy: "apiKey",
       description: "API Key authentication",
@@ -743,7 +769,7 @@ function generateSDKAuthExamples(auth) {
 });`
     });
   }
-  if (auth?.strategy === "jwt-hs256") {
+  if (strategy === "jwt-hs256") {
     examples.push({
       strategy: "jwt",
       description: "JWT Bearer token authentication",
@@ -3110,7 +3136,7 @@ export type Where<T> = WhereFieldConditions<T> & {
 
 // src/emit-auth.ts
 function emitAuth(cfgAuth) {
-  const strategy = cfgAuth?.strategy ?? "none";
+  const strategy = getAuthStrategy(cfgAuth);
   const apiKeyHeader = cfgAuth?.apiKeyHeader ?? "x-api-key";
   const apiKeys = cfgAuth?.apiKeys ?? [];
   const jwtServices = cfgAuth?.jwt?.services ?? [];
@@ -4671,38 +4697,6 @@ function generateTestCases(table, sampleData, updateData, hasForeignKeys = false
 // src/index.ts
 init_emit_sdk_contract();
 init_utils();
-
-// src/types.ts
-function normalizeAuthConfig(input) {
-  if (!input)
-    return;
-  if ("strategy" in input && input.strategy) {
-    return input;
-  }
-  if ("apiKey" in input && input.apiKey) {
-    return {
-      strategy: "api-key",
-      apiKeyHeader: input.apiKeyHeader,
-      apiKeys: [input.apiKey, ...input.apiKeys || []]
-    };
-  }
-  if ("apiKeys" in input && input.apiKeys?.length) {
-    return {
-      strategy: "api-key",
-      apiKeyHeader: input.apiKeyHeader,
-      apiKeys: input.apiKeys
-    };
-  }
-  if ("jwt" in input && input.jwt) {
-    return {
-      strategy: "jwt-hs256",
-      jwt: input.jwt
-    };
-  }
-  return { strategy: "none" };
-}
-
-// src/index.ts
 async function generate(configPath) {
   if (!existsSync(configPath)) {
     throw new Error(`Config file not found: ${configPath}
@@ -4776,7 +4770,7 @@ async function generate(configPath) {
     content: emitIncludeLoader(graph, model, cfg.includeMethodsDepth || 2, cfg.useJsExtensions)
   });
   files.push({ path: join(serverDir, "logger.ts"), content: emitLogger() });
-  if (normalizedAuth?.strategy && normalizedAuth.strategy !== "none") {
+  if (getAuthStrategy(normalizedAuth) !== "none") {
     files.push({ path: join(serverDir, "auth.ts"), content: emitAuth(normalizedAuth) });
   }
   files.push({
@@ -4800,7 +4794,7 @@ async function generate(configPath) {
       routeContent = emitHonoRoutes(table, graph, {
         softDeleteColumn: cfg.softDeleteColumn || null,
         includeMethodsDepth: cfg.includeMethodsDepth || 2,
-        authStrategy: normalizedAuth?.strategy,
+        authStrategy: getAuthStrategy(normalizedAuth),
         useJsExtensions: cfg.useJsExtensions,
         apiPathPrefix: cfg.apiPathPrefix || "/v1"
       });
@@ -4827,7 +4821,7 @@ async function generate(configPath) {
   if (serverFramework === "hono") {
     files.push({
       path: join(serverDir, "router.ts"),
-      content: emitHonoRouter(Object.values(model.tables), !!normalizedAuth?.strategy && normalizedAuth.strategy !== "none", cfg.useJsExtensions)
+      content: emitHonoRouter(Object.values(model.tables), getAuthStrategy(normalizedAuth) !== "none", cfg.useJsExtensions)
     });
   }
   const { generateUnifiedContract: generateUnifiedContract2, generateUnifiedContractMarkdown: generateUnifiedContractMarkdown2 } = await Promise.resolve().then(() => (init_emit_sdk_contract(), exports_emit_sdk_contract));

package/dist/types.d.ts

@@ -1,5 +1,4 @@
 export interface AuthConfig {
-    strategy?: "none" | "api-key" | "jwt-hs256";
     apiKeyHeader?: string;
     apiKeys?: string[];
     jwt?: {
@@ -10,6 +9,7 @@ export interface AuthConfig {
         audience?: string;
     };
 }
+export declare function getAuthStrategy(auth: AuthConfig | undefined): "none" | "api-key" | "jwt-hs256";
 export type AuthConfigInput = AuthConfig | {
     apiKey?: string;
     apiKeys?: string[];

package/package.json

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