@pikku/inspector 0.12.4 → 0.12.6

package/src/add/add-secret.ts

@@ -1,10 +1,3 @@
-import * as ts from 'typescript'
-import {
-  getPropertyValue,
-  getArrayPropertyValue,
-} from '../utils/get-property-value.js'
-import type { AddWiring } from '../types.js'
-import { ErrorCode } from '../error-codes.js'
 import { createAddKeyedWiring } from './add-keyed-wiring.js'
 
 export const addSecret = createAddKeyedWiring({
@@ -14,127 +7,3 @@ export const addSecret = createAddKeyedWiring({
   schemaPrefix: 'SecretSchema',
   getState: (state) => state.secrets,
 })
-
-export const addOAuth2Credential: AddWiring = (
-  logger,
-  node,
-  _checker,
-  state,
-  _options
-) => {
-  if (!ts.isCallExpression(node)) {
-    return
-  }
-
-  const args = node.arguments
-  const firstArg = args[0]
-  const expression = node.expression
-
-  if (
-    !ts.isIdentifier(expression) ||
-    expression.text !== 'wireOAuth2Credential'
-  ) {
-    return
-  }
-
-  if (!firstArg) {
-    return
-  }
-
-  if (ts.isObjectLiteralExpression(firstArg)) {
-    const obj = firstArg
-
-    const nameValue = getPropertyValue(obj, 'name') as string | null
-    const displayNameValue = getPropertyValue(obj, 'displayName') as
-      | string
-      | null
-    const descriptionValue = getPropertyValue(obj, 'description') as
-      | string
-      | null
-    const secretIdValue = getPropertyValue(obj, 'secretId') as string | null
-    const tokenSecretIdValue = getPropertyValue(obj, 'tokenSecretId') as
-      | string
-      | null
-    const authorizationUrlValue = getPropertyValue(obj, 'authorizationUrl') as
-      | string
-      | null
-    const tokenUrlValue = getPropertyValue(obj, 'tokenUrl') as string | null
-    const scopesValue = getArrayPropertyValue(obj, 'scopes')
-    const pkceValue = getPropertyValue(obj, 'pkce') as boolean | null
-
-    if (!nameValue) {
-      logger.critical(
-        ErrorCode.MISSING_NAME,
-        "OAuth2 Credential is missing the required 'name' property."
-      )
-      return
-    }
-
-    if (!displayNameValue) {
-      logger.critical(
-        ErrorCode.MISSING_NAME,
-        `OAuth2 Credential '${nameValue}' is missing the required 'displayName' property.`
-      )
-      return
-    }
-
-    if (!secretIdValue) {
-      logger.critical(
-        ErrorCode.MISSING_NAME,
-        `OAuth2 Credential '${nameValue}' is missing the required 'secretId' property.`
-      )
-      return
-    }
-
-    if (!tokenSecretIdValue) {
-      logger.critical(
-        ErrorCode.MISSING_NAME,
-        `OAuth2 Credential '${nameValue}' is missing the required 'tokenSecretId' property.`
-      )
-      return
-    }
-
-    if (!authorizationUrlValue) {
-      logger.critical(
-        ErrorCode.MISSING_NAME,
-        `OAuth2 Credential '${nameValue}' is missing the required 'authorizationUrl' property.`
-      )
-      return
-    }
-
-    if (!tokenUrlValue) {
-      logger.critical(
-        ErrorCode.MISSING_NAME,
-        `OAuth2 Credential '${nameValue}' is missing the required 'tokenUrl' property.`
-      )
-      return
-    }
-
-    if (!scopesValue || scopesValue.length === 0) {
-      logger.critical(
-        ErrorCode.MISSING_NAME,
-        `OAuth2 Credential '${nameValue}' is missing the required 'scopes' property.`
-      )
-      return
-    }
-
-    const sourceFile = node.getSourceFile().fileName
-
-    state.secrets.files.add(sourceFile)
-
-    state.secrets.definitions.push({
-      name: nameValue,
-      displayName: displayNameValue,
-      description: descriptionValue || undefined,
-      secretId: secretIdValue,
-      oauth2: {
-        tokenSecretId: tokenSecretIdValue,
-        authorizationUrl: authorizationUrlValue,
-        tokenUrl: tokenUrlValue,
-        scopes: scopesValue,
-        pkce: pkceValue || undefined,
-      },
-      sourceFile,
-    })
-  }
-}

package/src/add/add-wire-addon.ts

@@ -43,6 +43,7 @@ export function addWireAddon(
   let mcp: boolean | undefined
   let secretOverrides: Record<string, string> | undefined
   let variableOverrides: Record<string, string> | undefined
+  let credentialOverrides: Record<string, string> | undefined
 
   for (const prop of firstArg.properties) {
     if (!ts.isPropertyAssignment(prop) || !ts.isIdentifier(prop.name)) continue
@@ -70,6 +71,11 @@ export function addWireAddon(
       ts.isObjectLiteralExpression(prop.initializer)
     ) {
       variableOverrides = parseStringRecord(prop.initializer)
+    } else if (
+      key === 'credentialOverrides' &&
+      ts.isObjectLiteralExpression(prop.initializer)
+    ) {
+      credentialOverrides = parseStringRecord(prop.initializer)
     }
   }
 
@@ -82,6 +88,7 @@ export function addWireAddon(
     mcp,
     secretOverrides,
     variableOverrides,
+    credentialOverrides,
   })
   state.rpc.usedAddons.add(name)
   state.rpc.wireAddonFiles.add(node.getSourceFile().fileName)

package/src/inspector.ts

@@ -15,6 +15,7 @@ import {
   validateAgentOverrides,
   validateSecretOverrides,
   validateVariableOverrides,
+  validateCredentialOverrides,
   computeResolvedIOTypes,
   computeMiddlewareGroupsMeta,
   computePermissionsGroupsMeta,
@@ -148,6 +149,10 @@ export function getInitialInspectorState(rootDir: string): InspectorState {
       definitions: [],
       files: new Set(),
     },
+    credentials: {
+      definitions: [],
+      files: new Set(),
+    },
     variables: {
       definitions: [],
       files: new Set(),
@@ -352,6 +357,7 @@ export const inspect = async (
     validateAgentOverrides(logger, state, options.modelConfig)
     validateSecretOverrides(logger, state)
     validateVariableOverrides(logger, state)
+    validateCredentialOverrides(logger, state)
   }
 
   state.program = program

package/src/types.ts

@@ -15,6 +15,7 @@ import type { AIAgentMeta } from '@pikku/core/ai-agent'
 import type { CLIMeta } from '@pikku/core/cli'
 import type { NodesMeta } from '@pikku/core/node'
 import type { SecretDefinitions } from '@pikku/core/secret'
+import type { CredentialDefinitions } from '@pikku/core/credential'
 import type { VariableDefinitions } from '@pikku/core/variable'
 import type { TypesMap } from './types-map.js'
 import type {
@@ -353,6 +354,7 @@ export interface InspectorState {
         mcp?: boolean
         secretOverrides?: Record<string, string>
         variableOverrides?: Record<string, string>
+        credentialOverrides?: Record<string, string>
       }
     >
     wireAddonFiles: Set<string>
@@ -379,6 +381,10 @@ export interface InspectorState {
     definitions: SecretDefinitions
     files: Set<string>
   }
+  credentials: {
+    definitions: CredentialDefinitions
+    files: Set<string>
+  }
   variables: {
     definitions: VariableDefinitions
     files: Set<string>

package/src/utils/post-process.ts

@@ -247,6 +247,32 @@ export function validateSecretOverrides(
   }
 }
 
+export function validateCredentialOverrides(
+  logger: InspectorLogger,
+  state: InspectorState | Omit<InspectorState, 'typesLookup'>
+): void {
+  const { wireAddonDeclarations } = state.rpc
+  if (!wireAddonDeclarations || wireAddonDeclarations.size === 0) return
+
+  const credentialNames = new Set(
+    state.credentials?.definitions.map((d) => d.name) ?? []
+  )
+
+  for (const [namespace, addonDecl] of wireAddonDeclarations.entries()) {
+    if (!addonDecl.credentialOverrides) continue
+
+    for (const credentialKey of Object.keys(addonDecl.credentialOverrides)) {
+      if (!credentialNames.has(credentialKey)) {
+        const availableCredentials = Array.from(credentialNames)
+        logger.critical(
+          ErrorCode.INVALID_VALUE,
+          `Credential override '${credentialKey}' in addon '${namespace}' (${addonDecl.package}) does not exist. Available credentials: ${availableCredentials.join(', ') || 'none'}`
+        )
+      }
+    }
+  }
+}
+
 export function validateVariableOverrides(
   logger: InspectorLogger,
   state: InspectorState | Omit<InspectorState, 'typesLookup'>

package/src/utils/resolve-addon-package.ts

@@ -19,6 +19,7 @@ export const resolveAddonName = (
       rpcEndpoint?: string
       secretOverrides?: Record<string, string>
       variableOverrides?: Record<string, string>
+      credentialOverrides?: Record<string, string>
     }
   >
 ): string | null => {

package/src/utils/serialize-inspector-state.ts

@@ -156,6 +156,7 @@ export interface SerializableInspectorState {
           rpcEndpoint?: string
           secretOverrides?: Record<string, string>
           variableOverrides?: Record<string, string>
+          credentialOverrides?: Record<string, string>
         },
       ]
     >
@@ -183,6 +184,10 @@ export interface SerializableInspectorState {
     definitions: InspectorState['secrets']['definitions']
     files: string[]
   }
+  credentials: {
+    definitions: InspectorState['credentials']['definitions']
+    files: string[]
+  }
   variables: {
     definitions: InspectorState['variables']['definitions']
     files: string[]
@@ -380,6 +385,10 @@ export function serializeInspectorState(
       definitions: state.secrets.definitions,
       files: Array.from(state.secrets.files),
     },
+    credentials: {
+      definitions: state.credentials.definitions,
+      files: Array.from(state.credentials.files),
+    },
     variables: {
       definitions: state.variables.definitions,
       files: Array.from(state.variables.files),
@@ -548,6 +557,10 @@ export function deserializeInspectorState(
       definitions: data.secrets?.definitions || [],
       files: new Set(data.secrets?.files || []),
     },
+    credentials: {
+      definitions: data.credentials?.definitions || [],
+      files: new Set(data.credentials?.files || []),
+    },
     variables: {
       definitions: data.variables?.definitions || [],
       files: new Set(data.variables?.files || []),

package/src/visit.ts

@@ -22,7 +22,8 @@ import { addWireAddon } from './add/add-wire-addon.js'
 import { addMiddleware } from './add/add-middleware.js'
 import { addPermission } from './add/add-permission.js'
 import { addCLI, addCLIRenderers } from './add/add-cli.js'
-import { addSecret, addOAuth2Credential } from './add/add-secret.js'
+import { addSecret } from './add/add-secret.js'
+import { addCredential } from './add/add-credential.js'
 import { addVariable } from './add/add-variable.js'
 import { addWorkflowGraph } from './add/add-workflow-graph.js'
 import { addAIAgent } from './add/add-ai-agent.js'
@@ -105,7 +106,7 @@ export const visitRoutes = (
 ) => {
   addFunctions(logger, node, checker, state, options)
   addSecret(logger, node, checker, state, options)
-  addOAuth2Credential(logger, node, checker, state, options)
+  addCredential(logger, node, checker, state, options)
   addVariable(logger, node, checker, state, options)
 
   addHTTPRoute(logger, node, checker, state, options)