@pikku/inspector 0.9.5 → 0.9.6-next.0

package/src/{add-file-with-factory.ts → add/add-file-with-factory.ts}

@@ -1,5 +1,5 @@
 import * as ts from 'typescript'
-import { PathToNameAndType } from './types.js'
+import { PathToNameAndType } from '../types.js'
 
 export const addFileWithFactory = (
   node: ts.Node,
@@ -30,13 +30,13 @@ export const addFileWithFactory = (
           typeDeclarationPath = sourceFile.fileName // Get the path of the file where the type was declared
         }
 
-        const variables = methods[fileName] || []
+        const variables = methods.get(fileName) || []
         variables.push({
           variable: variableName,
           type: typeNameNode.getText(),
           typePath: typeDeclarationPath,
         })
-        methods[fileName] = variables
+        methods.set(fileName, variables)
       }
 
       // Handle qualified type names if necessary
@@ -51,13 +51,13 @@ export const addFileWithFactory = (
             typeDeclarationPath = sourceFile.fileName // Get the path of the file where the type was declared
           }
 
-          const variables = methods[fileName] || []
+          const variables = methods.get(fileName) || []
           variables.push({
             variable: variableName,
             type: typeNameNode.getText(),
             typePath: typeDeclarationPath,
           })
-          methods[fileName] = variables
+          methods.set(fileName, variables)
         }
       }
     }

package/src/{add-functions.ts → add/add-functions.ts}

@@ -1,12 +1,11 @@
 import * as ts from 'typescript'
-import { InspectorLogger, InspectorState } from './types.js'
-import { TypesMap } from './types-map.js'
-import {
-  extractFunctionName,
-  getPropertyAssignmentInitializer,
-} from './utils.js'
+import { AddWiring } from '../types.js'
+import { TypesMap } from '../types-map.js'
+import { extractFunctionName } from '../utils/extract-function-name.js'
+import { getPropertyAssignmentInitializer } from '../utils/type-utils.js'
 import { FunctionServicesMeta, PikkuDocs } from '@pikku/core'
-import { getPropertyValue } from './get-property-value.js'
+import { getPropertyValue } from '../utils/get-property-value.js'
+import { resolveMiddleware } from '../utils/middleware.js'
 
 const isValidVariableName = (name: string) => {
   const regex = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/
@@ -247,12 +246,7 @@ function unwrapPromise(checker: ts.TypeChecker, type: ts.Type): ts.Type {
  * Inspect pikkuFunc calls, extract input/output and first-arg destructuring,
  * then push into state.functions.meta.
  */
-export function addFunctions(
-  node: ts.Node,
-  checker: ts.TypeChecker,
-  state: InspectorState,
-  logger: InspectorLogger
-) {
+export const addFunctions: AddWiring = (logger, node, checker, state) => {
   if (!ts.isCallExpression(node)) return
 
   const { expression, arguments: args, typeArguments } = node
@@ -281,6 +275,7 @@ export function addFunctions(
   let tags: string[] | undefined
   let expose: boolean | undefined
   let docs: PikkuDocs | undefined
+  let objectNode: ts.ObjectLiteralExpression | undefined
 
   // determine the actual handler expression:
   // either the `func` prop or the first argument directly
@@ -289,6 +284,7 @@ export function addFunctions(
 
   if (ts.isObjectLiteralExpression(handlerNode)) {
     isDirectFunction = false // This is object format with func property
+    objectNode = handlerNode
     tags = (getPropertyValue(handlerNode, 'tags') as string[]) || undefined
     expose = getPropertyValue(handlerNode, 'expose') as boolean | undefined
     docs = getPropertyValue(handlerNode, 'docs') as PikkuDocs | undefined
@@ -347,7 +343,7 @@ export function addFunctions(
     .map((t) => unwrapPromise(checker, t))
 
   // --- Input Extraction ---
-  let { names: inputNames } = getNamesAndTypes(
+  let { names: inputNames, types: inputTypes } = getNamesAndTypes(
     checker,
     state.functions.typesMap,
     'Input',
@@ -391,6 +387,11 @@ export function addFunctions(
     )
   }
 
+  // --- resolve middleware ---
+  const middleware = objectNode
+    ? resolveMiddleware(state, objectNode, tags, checker)
+    : undefined
+
   state.functions.meta[pikkuFuncName] = {
     pikkuFuncName,
     name,
@@ -403,6 +404,20 @@ export function addFunctions(
     tags: tags || undefined,
     docs: docs || undefined,
     isDirectFunction,
+    middleware,
+  }
+
+  // Store the input type for later use
+  if (inputTypes.length > 0) {
+    state.typesLookup.set(pikkuFuncName, inputTypes)
+  }
+
+  // Store function file location for wiring generation
+  if (exportedName) {
+    state.functions.files.set(pikkuFuncName, {
+      path: node.getSourceFile().fileName,
+      exportedName,
+    })
   }
 
   if (exportedName || explicitName) {

package/src/{add-http-route.ts → add/add-http-route.ts}

@@ -1,14 +1,13 @@
 import * as ts from 'typescript'
-import { getPropertyValue } from './get-property-value.js'
+import { getPropertyValue } from '../utils/get-property-value.js'
 import { pathToRegexp } from 'path-to-regexp'
 import { HTTPMethod } from '@pikku/core/http'
 import { PikkuDocs, PikkuWiringTypes } from '@pikku/core'
-import {
-  extractFunctionName,
-  getPropertyAssignmentInitializer,
-  matchesFilters,
-} from './utils.js'
-import { InspectorState, InspectorFilters, InspectorLogger } from './types.js'
+import { extractFunctionName } from '../utils/extract-function-name.js'
+import { getPropertyAssignmentInitializer } from '../utils/type-utils.js'
+import { matchesFilters } from '../utils/filter-utils.js'
+import { AddWiring } from '../types.js'
+import { resolveHTTPMiddlewareFromObject } from '../utils/middleware.js'
 
 /**
  * Populate metaInputTypes for a given route based on method, input type,
@@ -39,12 +38,12 @@ export const getInputTypes = (
  * Simplified wireHTTP: re-uses function metadata from state.functions.meta
  * instead of re-inferring types here.
  */
-export const addHTTPRoute = (
-  node: ts.Node,
-  checker: ts.TypeChecker,
-  state: InspectorState,
-  filters: InspectorFilters,
-  logger: InspectorLogger
+export const addHTTPRoute: AddWiring = (
+  logger,
+  node,
+  checker,
+  state,
+  options
 ) => {
   // only look at calls
   if (!ts.isCallExpression(node)) return
@@ -74,7 +73,7 @@ export const addHTTPRoute = (
 
   if (
     !matchesFilters(
-      filters,
+      options.filters || {},
       { tags },
       { type: PikkuWiringTypes.http, name: route, filePath },
       logger
@@ -114,6 +113,15 @@ export const addHTTPRoute = (
     params
   )
 
+  // --- resolve middleware ---
+  const middleware = resolveHTTPMiddlewareFromObject(
+    state,
+    route,
+    obj,
+    tags,
+    checker
+  )
+
   // --- record route ---
   state.http.files.add(node.getSourceFile().fileName)
   state.http.meta[method][route] = {
@@ -125,5 +133,6 @@ export const addHTTPRoute = (
     inputTypes,
     docs,
     tags,
+    middleware,
   }
 }

package/src/{add-mcp-prompt.ts → add/add-mcp-prompt.ts}

@@ -1,19 +1,18 @@
 import * as ts from 'typescript'
-import { getPropertyValue } from './get-property-value.js'
+import { getPropertyValue } from '../utils/get-property-value.js'
 import { PikkuWiringTypes } from '@pikku/core'
-import { InspectorFilters, InspectorState, InspectorLogger } from './types.js'
-import {
-  extractFunctionName,
-  getPropertyAssignmentInitializer,
-  matchesFilters,
-} from './utils.js'
-
-export const addMCPPrompt = (
-  node: ts.Node,
-  checker: ts.TypeChecker,
-  state: InspectorState,
-  filters: InspectorFilters,
-  logger: InspectorLogger
+import { AddWiring } from '../types.js'
+import { extractFunctionName } from '../utils/extract-function-name.js'
+import { getPropertyAssignmentInitializer } from '../utils/type-utils.js'
+import { matchesFilters } from '../utils/filter-utils.js'
+import { resolveMiddleware } from '../utils/middleware.js'
+
+export const addMCPPrompt: AddWiring = (
+  logger,
+  node,
+  checker,
+  state,
+  options
 ) => {
   if (!ts.isCallExpression(node)) {
     return
@@ -71,7 +70,7 @@ export const addMCPPrompt = (
 
     if (
       !matchesFilters(
-        filters,
+        options.filters || {},
         { tags },
         { type: PikkuWiringTypes.mcp, name: nameValue, filePath },
         logger
@@ -89,6 +88,9 @@ export const addMCPPrompt = (
     const inputSchema = fnMeta.inputs?.[0] || null
     const outputSchema = fnMeta.outputs?.[0] || null
 
+    // --- resolve middleware ---
+    const middleware = resolveMiddleware(state, obj, tags, checker)
+
     state.mcpEndpoints.files.add(node.getSourceFile().fileName)
 
     state.mcpEndpoints.promptsMeta[nameValue] = {
@@ -99,6 +101,7 @@ export const addMCPPrompt = (
       inputSchema,
       outputSchema,
       arguments: [], // Will be populated by CLI during serialization
+      middleware,
     }
   }
 }

package/src/{add-mcp-resource.ts → add/add-mcp-resource.ts}

@@ -1,19 +1,18 @@
 import * as ts from 'typescript'
-import { getPropertyValue } from './get-property-value.js'
+import { getPropertyValue } from '../utils/get-property-value.js'
 import { PikkuWiringTypes } from '@pikku/core'
-import { InspectorFilters, InspectorState, InspectorLogger } from './types.js'
-import {
-  extractFunctionName,
-  getPropertyAssignmentInitializer,
-  matchesFilters,
-} from './utils.js'
-
-export const addMCPResource = (
-  node: ts.Node,
-  checker: ts.TypeChecker,
-  state: InspectorState,
-  filters: InspectorFilters,
-  logger: InspectorLogger
+import { AddWiring } from '../types.js'
+import { extractFunctionName } from '../utils/extract-function-name.js'
+import { getPropertyAssignmentInitializer } from '../utils/type-utils.js'
+import { matchesFilters } from '../utils/filter-utils.js'
+import { resolveMiddleware } from '../utils/middleware.js'
+
+export const addMCPResource: AddWiring = (
+  logger,
+  node,
+  checker,
+  state,
+  options
 ) => {
   if (!ts.isCallExpression(node)) {
     return
@@ -82,7 +81,7 @@ export const addMCPResource = (
 
     if (
       !matchesFilters(
-        filters,
+        options.filters || {},
         { tags },
         { type: PikkuWiringTypes.mcp, name: uriValue, filePath },
         logger
@@ -100,6 +99,9 @@ export const addMCPResource = (
     const inputSchema = fnMeta.inputs?.[0] || null
     const outputSchema = fnMeta.outputs?.[0] || null
 
+    // --- resolve middleware ---
+    const middleware = resolveMiddleware(state, obj, tags, checker)
+
     state.mcpEndpoints.files.add(node.getSourceFile().fileName)
 
     state.mcpEndpoints.resourcesMeta[uriValue] = {
@@ -111,6 +113,7 @@ export const addMCPResource = (
       tags,
       inputSchema,
       outputSchema,
+      middleware,
     }
   }
 }

package/src/{add-mcp-tool.ts → add/add-mcp-tool.ts}

@@ -1,19 +1,18 @@
 import * as ts from 'typescript'
-import { getPropertyValue } from './get-property-value.js'
+import { getPropertyValue } from '../utils/get-property-value.js'
 import { PikkuWiringTypes } from '@pikku/core'
-import { InspectorFilters, InspectorState, InspectorLogger } from './types.js'
-import {
-  extractFunctionName,
-  getPropertyAssignmentInitializer,
-  matchesFilters,
-} from './utils.js'
-
-export const addMCPTool = (
-  node: ts.Node,
-  checker: ts.TypeChecker,
-  state: InspectorState,
-  filters: InspectorFilters,
-  logger: InspectorLogger
+import { AddWiring } from '../types.js'
+import { extractFunctionName } from '../utils/extract-function-name.js'
+import { getPropertyAssignmentInitializer } from '../utils/type-utils.js'
+import { matchesFilters } from '../utils/filter-utils.js'
+import { resolveMiddleware } from '../utils/middleware.js'
+
+export const addMCPTool: AddWiring = (
+  logger,
+  node,
+  checker,
+  state,
+  options
 ) => {
   if (!ts.isCallExpression(node)) {
     return
@@ -73,7 +72,7 @@ export const addMCPTool = (
 
     if (
       !matchesFilters(
-        filters,
+        options.filters || {},
         { tags },
         { type: PikkuWiringTypes.mcp, name: nameValue, filePath },
         logger
@@ -91,6 +90,9 @@ export const addMCPTool = (
     const inputSchema = fnMeta.inputs?.[0] || null
     const outputSchema = fnMeta.outputs?.[0] || null
 
+    // --- resolve middleware ---
+    const middleware = resolveMiddleware(state, obj, tags, checker)
+
     state.mcpEndpoints.files.add(node.getSourceFile().fileName)
 
     state.mcpEndpoints.toolsMeta[nameValue] = {
@@ -102,6 +104,7 @@ export const addMCPTool = (
       tags,
       inputSchema,
       outputSchema,
+      middleware,
     }
   }
 }