@pikku/openapi-parser 0.12.6 → 0.12.8

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @pikku/openapi-parser
 
+## 0.12.8
+
+### Patch Changes
+
+- 94ceecd: Fix duplicate property error in generated code when body and path/query/header params share the same name. Skips the body property with a warning.
+
+## 0.12.7
+
+### Patch Changes
+
+- 5dd1996: Fix credentials command crash when state.credentials is undefined, and add --credential flag to `pikku new addon` for per-user credential wiring (apikey, bearer, oauth2).
+
 ## 0.12.6
 
 ### Patch Changes

package/dist/codegen.d.ts

@@ -14,6 +14,7 @@ interface AddonVars {
 interface CodegenFlags {
     oauth: boolean;
     secret: boolean;
+    credential?: 'apikey' | 'bearer' | 'oauth2';
     mcp?: boolean;
 }
 export declare function generateAddonFromOpenAPI(spec: ParsedSpec, vars: AddonVars, flags: CodegenFlags): Record<string, string>;

package/dist/codegen.js

@@ -179,11 +179,21 @@ function buildInputSchema(parsed, ctx) {
     }
     if (parsed.requestBody) {
         if (parsed.requestBody.properties) {
+            const paramNames = new Set([
+                ...parsed.pathParams.map((p) => p.name),
+                ...parsed.queryParams.map((p) => p.name),
+                ...parsed.headerParams.map((p) => p.name),
+            ]);
             const requiredSet = new Set(parsed.requestBody.required ?? []);
             for (const [key, propSchema] of Object.entries(parsed.requestBody.properties)) {
                 // Skip readOnly properties from input
                 if (propSchema.readOnly)
                     continue;
+                // Skip body properties that collide with path/query/header params
+                if (paramNames.has(key)) {
+                    console.warn(`[openapi] Skipping body property '${key}' — collides with path/query/header param`);
+                    continue;
+                }
                 const isOptional = !requiredSet.has(key);
                 const zodCode = schemaToZod(propSchema, ctx, { optional: isOptional });
                 props.push(`  ${safeKey(key)}: ${zodCode},`);
@@ -235,7 +245,10 @@ function generateServiceFile(spec, opPairs, vars, flags) {
     const lines = [];
     // Always import all error classes used in the switch statement
     const allErrorClasses = new Set(Object.values(STATUS_TO_ERROR));
-    if (flags.oauth) {
+    if (flags.credential && flags.credential !== 'oauth2') {
+        // Per-user credential: no special imports needed, creds passed via constructor
+    }
+    else if (flags.oauth || flags.credential === 'oauth2') {
         lines.push("import { OAuth2Client } from '@pikku/core/oauth2'");
         lines.push("import type { TypedSecretService } from '#pikku/secrets/pikku-secrets.gen.js'");
     }
@@ -286,7 +299,14 @@ function generateServiceFile(spec, opPairs, vars, flags) {
     // Class declaration
     lines.push(`export class ${pascalName}Service {`);
     lines.push('  private baseUrl: string');
-    if (flags.oauth) {
+    if (flags.credential && flags.credential !== 'oauth2') {
+        const credField = flags.credential === 'bearer' ? 'token' : 'apiKey';
+        lines.push('');
+        lines.push(`  constructor(private creds: { ${credField}: string }, variables: TypedVariablesService) {`);
+        lines.push(`    this.baseUrl = variables.get('${screamingName}_BASE_URL') as string`);
+        lines.push('  }');
+    }
+    else if (flags.oauth || flags.credential === 'oauth2') {
         lines.push('  private oauth: OAuth2Client');
         lines.push('');
         lines.push(`  constructor(secrets: TypedSecretService, variables: TypedVariablesService) {`);
@@ -359,7 +379,29 @@ function generateServiceFile(spec, opPairs, vars, flags) {
     lines.push('      url.searchParams.set(key, value)');
     lines.push('    }');
     lines.push('');
-    if (flags.oauth) {
+    if (flags.credential && flags.credential !== 'oauth2') {
+        // Per-user credential: use creds from wire.getCredentials()
+        if (flags.credential === 'bearer') {
+            lines.push('    headers.Authorization = `Bearer ${this.creds.token}`');
+        }
+        else {
+            // apikey: check spec for custom header name
+            const apiKeyScheme = Object.values(spec.securitySchemes).find((s) => s.type === 'apiKey');
+            if (apiKeyScheme?.name && apiKeyScheme?.in === 'header') {
+                lines.push(`    headers[${JSON.stringify(apiKeyScheme.name)}] = this.creds.apiKey`);
+            }
+            else {
+                lines.push('    headers.Authorization = `Bearer ${this.creds.apiKey}`');
+            }
+        }
+        lines.push('');
+        lines.push('    const response = await fetch(url.toString(), {');
+        lines.push('      method,');
+        lines.push('      headers,');
+        lines.push('      body: body ? JSON.stringify(body) : undefined,');
+        lines.push('    })');
+    }
+    else if (flags.oauth || flags.credential === 'oauth2') {
         lines.push('    const response = await this.oauth.request(url.toString(), {');
         lines.push('      method,');
         lines.push('      headers,');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikku/openapi-parser",
-  "version": "0.12.6",
+  "version": "0.12.8",
   "description": "OpenAPI spec parser and code generator for Pikku",
   "author": "yasser.fadl@gmail.com",
   "license": "MIT",

package/src/codegen.ts

@@ -32,6 +32,7 @@ interface AddonVars {
 interface CodegenFlags {
   oauth: boolean
   secret: boolean
+  credential?: 'apikey' | 'bearer' | 'oauth2'
   mcp?: boolean
 }
 
@@ -296,12 +297,24 @@ function buildInputSchema(
 
   if (parsed.requestBody) {
     if (parsed.requestBody.properties) {
+      const paramNames = new Set([
+        ...parsed.pathParams.map((p) => p.name),
+        ...parsed.queryParams.map((p) => p.name),
+        ...parsed.headerParams.map((p) => p.name),
+      ])
       const requiredSet = new Set(parsed.requestBody.required ?? [])
       for (const [key, propSchema] of Object.entries(
         parsed.requestBody.properties
       )) {
         // Skip readOnly properties from input
         if (propSchema.readOnly) continue
+        // Skip body properties that collide with path/query/header params
+        if (paramNames.has(key)) {
+          console.warn(
+            `[openapi] Skipping body property '${key}' — collides with path/query/header param`
+          )
+          continue
+        }
         const isOptional = !requiredSet.has(key)
         const zodCode = schemaToZod(propSchema, ctx, { optional: isOptional })
         props.push(`  ${safeKey(key)}: ${zodCode},`)
@@ -386,7 +399,9 @@ function generateServiceFile(
   // Always import all error classes used in the switch statement
   const allErrorClasses = new Set<string>(Object.values(STATUS_TO_ERROR))
 
-  if (flags.oauth) {
+  if (flags.credential && flags.credential !== 'oauth2') {
+    // Per-user credential: no special imports needed, creds passed via constructor
+  } else if (flags.oauth || flags.credential === 'oauth2') {
     lines.push("import { OAuth2Client } from '@pikku/core/oauth2'")
     lines.push(
       "import type { TypedSecretService } from '#pikku/secrets/pikku-secrets.gen.js'"
@@ -458,7 +473,17 @@ function generateServiceFile(
   lines.push(`export class ${pascalName}Service {`)
   lines.push('  private baseUrl: string')
 
-  if (flags.oauth) {
+  if (flags.credential && flags.credential !== 'oauth2') {
+    const credField = flags.credential === 'bearer' ? 'token' : 'apiKey'
+    lines.push('')
+    lines.push(
+      `  constructor(private creds: { ${credField}: string }, variables: TypedVariablesService) {`
+    )
+    lines.push(
+      `    this.baseUrl = variables.get('${screamingName}_BASE_URL') as string`
+    )
+    lines.push('  }')
+  } else if (flags.oauth || flags.credential === 'oauth2') {
     lines.push('  private oauth: OAuth2Client')
     lines.push('')
     lines.push(
@@ -548,7 +573,30 @@ function generateServiceFile(
   lines.push('    }')
   lines.push('')
 
-  if (flags.oauth) {
+  if (flags.credential && flags.credential !== 'oauth2') {
+    // Per-user credential: use creds from wire.getCredentials()
+    if (flags.credential === 'bearer') {
+      lines.push('    headers.Authorization = `Bearer ${this.creds.token}`')
+    } else {
+      // apikey: check spec for custom header name
+      const apiKeyScheme = Object.values(spec.securitySchemes).find(
+        (s) => s.type === 'apiKey'
+      )
+      if (apiKeyScheme?.name && apiKeyScheme?.in === 'header') {
+        lines.push(
+          `    headers[${JSON.stringify(apiKeyScheme.name)}] = this.creds.apiKey`
+        )
+      } else {
+        lines.push('    headers.Authorization = `Bearer ${this.creds.apiKey}`')
+      }
+    }
+    lines.push('')
+    lines.push('    const response = await fetch(url.toString(), {')
+    lines.push('      method,')
+    lines.push('      headers,')
+    lines.push('      body: body ? JSON.stringify(body) : undefined,')
+    lines.push('    })')
+  } else if (flags.oauth || flags.credential === 'oauth2') {
     lines.push(
       '    const response = await this.oauth.request(url.toString(), {'
     )