postgresdk 0.9.7 → 0.9.8

package/dist/cli.js

@@ -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
@@ -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

package/package.json

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