@pikku/cli 0.11.3 → 0.12.1

package/src/functions/wirings/http/serialize-typed-http-map.ts

@@ -1,178 +0,0 @@
-import { HTTPWiringsMeta } from '@pikku/core/http'
-import { serializeImportMap } from '../../../utils/serialize-import-map.js'
-import { MetaInputTypes, TypesMap } from '@pikku/inspector'
-import { FunctionsMeta } from '@pikku/core'
-import { generateCustomTypes } from '../../../utils/custom-types-generator.js'
-
-export const serializeTypedHTTPWiringsMap = (
-  relativeToPath: string,
-  packageMappings: Record<string, string>,
-  typesMap: TypesMap,
-  functionsMeta: FunctionsMeta,
-  wiringsMeta: HTTPWiringsMeta,
-  metaTypes: MetaInputTypes
-) => {
-  const requiredTypes = new Set<string>()
-  const serializedCustomTypes = generateCustomTypes(typesMap, requiredTypes)
-  const serializedMetaTypes = generateMetaTypes(metaTypes, typesMap)
-  const serializedHTTPWirings = generateHTTPWirings(
-    wiringsMeta,
-    functionsMeta,
-    typesMap,
-    requiredTypes
-  )
-
-  const serializedImportMap = serializeImportMap(
-    relativeToPath,
-    packageMappings,
-    typesMap,
-    requiredTypes
-  )
-
-  return `/**
- * This provides the structure needed for typescript to be aware of routes and their return types
- */
-
-${serializedImportMap}
-${serializedCustomTypes}
-${serializedMetaTypes}
-
-interface HTTPWiringHandler<I, O> {
-    input: I;
-    output: O;
-}
-
-${serializedHTTPWirings}
-
-export type HTTPWiringHandlerOf<HTTPWiring extends keyof HTTPWiringsMap, Method extends keyof HTTPWiringsMap[HTTPWiring]> =
-    HTTPWiringsMap[HTTPWiring][Method] extends { input: infer I; output: infer O }
-        ? HTTPWiringHandler<I, O>
-        : never;
-
-export type HTTPWiringsWithMethod<Method extends string> = {
-  [HTTPWiring in keyof HTTPWiringsMap]: Method extends keyof HTTPWiringsMap[HTTPWiring] ? HTTPWiring : never;
-}[keyof HTTPWiringsMap];
-  `
-}
-
-function generateHTTPWirings(
-  routesMeta: HTTPWiringsMeta,
-  functionsMeta: FunctionsMeta,
-  typesMap: TypesMap,
-  requiredTypes: Set<string>
-) {
-  // Initialize an object to collect routes
-  const routesObj: Record<
-    string,
-    Record<string, { inputType: string; outputType: string }>
-  > = {}
-
-  for (const methods of Object.values(routesMeta)) {
-    for (const meta of Object.values(methods)) {
-      const { route, method, pikkuFuncName } = meta
-
-      // Skip workflow-triggered routes (they don't have a function)
-      if (meta.workflow) {
-        continue
-      }
-
-      const functionMeta = functionsMeta[pikkuFuncName]
-      if (!functionMeta) {
-        throw new Error(
-          `Function ${pikkuFuncName} not found in functionsMeta. Please check your configuration.`
-        )
-      }
-      const input = functionMeta.inputs ? functionMeta.inputs[0] : undefined
-      const output = functionMeta.outputs ? functionMeta.outputs[0] : undefined
-
-      if (!routesObj[route]) {
-        routesObj[route] = {}
-      }
-
-      // For zod-derived schemas, the type might not be in typesMap, so use the schema name directly
-      let inputType = 'null'
-      if (input) {
-        try {
-          inputType = typesMap.getTypeMeta(input).uniqueName
-        } catch {
-          inputType = input
-        }
-      }
-      let outputType = 'null'
-      if (output) {
-        try {
-          outputType = typesMap.getTypeMeta(output).uniqueName
-        } catch {
-          // Zod-derived schema - use the schema name directly
-          outputType = output
-        }
-      }
-
-      requiredTypes.add(inputType)
-      requiredTypes.add(outputType)
-
-      // Add method entry
-      routesObj[route][method] = {
-        inputType,
-        outputType,
-      }
-    }
-  }
-
-  // Build the routes object as a string
-  let routesStr = 'export type HTTPWiringsMap = {\n'
-
-  for (const [routePath, methods] of Object.entries(routesObj)) {
-    routesStr += `  readonly '${routePath}': {\n`
-    for (const [method, handler] of Object.entries(methods)) {
-      routesStr += `    readonly ${method.toUpperCase()}: HTTPWiringHandler<${handler.inputType}, ${handler.outputType}>,\n`
-    }
-    routesStr += '  },\n'
-  }
-
-  routesStr += '};'
-
-  return routesStr
-}
-
-const generateMetaTypes = (metaTypes: MetaInputTypes, typesMap: TypesMap) => {
-  const nameToTypeMap = Array.from(metaTypes.entries()).reduce<
-    Map<string, string>
-  >((result, [_name, { query, body, params }]) => {
-    let uniqueName: string
-    try {
-      uniqueName = typesMap.getTypeMeta(_name).uniqueName
-    } catch {
-      // Zod-derived schema - use the name directly
-      uniqueName = _name
-    }
-    const queryType =
-      query && query.length > 0
-        ? `Pick<${uniqueName}, '${query?.join("' | '")}'>`
-        : undefined
-    if (queryType) {
-      result.set(`${uniqueName}Query`, queryType)
-    }
-    const paramsType =
-      params && params.length > 0
-        ? `Pick<${uniqueName}, '${params.join("' | '")}'>`
-        : undefined
-    if (paramsType) {
-      result.set(`${uniqueName}Params`, paramsType)
-    }
-    const bodyType =
-      (body && body.length > 0) || (params && params.length > 0)
-        ? `Omit<${uniqueName}, '${[...new Set([...(query || []), ...(params || [])])].join("' | '")}'>`
-        : uniqueName!
-    if (bodyType) {
-      result.set(`${uniqueName}Body`, bodyType)
-    }
-    return result
-  }, new Map())
-
-  return `
-// The '& {}' is a workaround for not directly refering to a type since it confuses typescript
-${Array.from(nameToTypeMap.entries())
-  .map(([name, type]) => `export type ${name} = ${type} & {}`)
-  .join('\n')}`
-}

package/src/functions/wirings/mcp/pikku-command-mcp-json.ts

@@ -1,33 +0,0 @@
-import { pikkuSessionlessFunc } from '../../../../.pikku/pikku-types.gen.js'
-import { writeFileInDir } from '../../../utils/file-writer.js'
-import { logCommandInfoAndTime } from '../../../middleware/log-command-info-and-time.js'
-import { serializeMCPJson } from './serialize-mcp-json.js'
-
-export const pikkuMCPJSON: any = pikkuSessionlessFunc<void, void>({
-  func: async ({ logger, config, getInspectorState }) => {
-    const { mcpEndpoints, functions } = await getInspectorState()
-    const { mcpJsonFile, schemaDirectory } = config
-
-    // Generate MCP JSON file
-    if (mcpJsonFile) {
-      const mcpJson = await serializeMCPJson(
-        logger,
-        schemaDirectory,
-        functions.meta,
-        functions.typesMap,
-        mcpEndpoints.resourcesMeta,
-        mcpEndpoints.toolsMeta,
-        mcpEndpoints.promptsMeta
-      )
-      await writeFileInDir(logger, mcpJsonFile, mcpJson, {
-        ignoreModifyComment: true,
-      })
-    }
-  },
-  middleware: [
-    logCommandInfoAndTime({
-      commandStart: 'Generating MCP JSON',
-      commandEnd: 'Generated MCP JSON',
-    }),
-  ],
-})

package/src/functions/wirings/mcp/pikku-command-mcp-types.ts

@@ -1,25 +0,0 @@
-import { pikkuSessionlessFunc } from '../../../../.pikku/pikku-types.gen.js'
-import { writeFileInDir } from '../../../utils/file-writer.js'
-import { getFileImportRelativePath } from '../../../utils/file-import-path.js'
-import { logCommandInfoAndTime } from '../../../middleware/log-command-info-and-time.js'
-import { serializeMCPTypes } from './serialize-mcp-types.js'
-
-export const pikkuMCPTypes: any = pikkuSessionlessFunc<void, void>({
-  func: async ({ logger, config }) => {
-    const { mcpTypesFile, functionTypesFile, packageMappings } = config
-
-    const functionTypesImportPath = getFileImportRelativePath(
-      mcpTypesFile,
-      functionTypesFile,
-      packageMappings
-    )
-    const content = serializeMCPTypes(functionTypesImportPath)
-    await writeFileInDir(logger, mcpTypesFile, content)
-  },
-  middleware: [
-    logCommandInfoAndTime({
-      commandStart: 'Creating MCP types',
-      commandEnd: 'Created MCP types',
-    }),
-  ],
-})

package/src/functions/wirings/mcp/pikku-command-mcp.ts

@@ -1,162 +0,0 @@
-import { pikkuSessionlessFunc } from '../../../../.pikku/pikku-types.gen.js'
-import { serializeFileImports } from '../../../utils/file-imports-serializer.js'
-import { writeFileInDir } from '../../../utils/file-writer.js'
-import { logCommandInfoAndTime } from '../../../middleware/log-command-info-and-time.js'
-import { readFile } from 'fs/promises'
-import { join } from 'path'
-import { getFileImportRelativePath } from '../../../utils/file-import-path.js'
-import {
-  stripVerboseFields,
-  hasVerboseFields,
-} from '../../../utils/strip-verbose-meta.js'
-
-// Helper function to generate arguments from schema
-const generateArgumentsFromSchema = async (
-  inputSchema: string | null,
-  schemaDirectory: string,
-  typesMap: any,
-  logger: any
-): Promise<Array<{ name: string; description: string; required: boolean }>> => {
-  if (!inputSchema) return []
-
-  if (
-    ['boolean', 'string', 'number', 'null', 'undefined', 'void'].includes(
-      inputSchema
-    )
-  ) {
-    return []
-  }
-
-  const uniqueName = typesMap.getUniqueName(inputSchema)
-  if (!uniqueName) return []
-
-  const schemaPath = join(
-    schemaDirectory,
-    'schemas',
-    `${uniqueName}.schema.json`
-  )
-
-  try {
-    const schemaContent = await readFile(schemaPath, 'utf-8')
-    const schema = JSON.parse(schemaContent)
-
-    const argumentsArray: Array<{
-      name: string
-      description: string
-      required: boolean
-    }> = []
-    if (schema && typeof schema === 'object' && schema.properties) {
-      const properties = schema.properties as Record<string, any>
-      const required = (schema.required as string[]) || []
-
-      for (const [propName, propSchema] of Object.entries(properties)) {
-        argumentsArray.push({
-          name: propName,
-          description: propSchema.description || `${propName} parameter`,
-          required: required.includes(propName),
-        })
-      }
-    }
-    return argumentsArray
-  } catch (e) {
-    logger.warn(`Command MCP: Could not load schema for type: ${uniqueName} from ${schemaPath}`)
-    console.error(e)
-    return []
-  }
-}
-
-export const pikkuMCP: any = pikkuSessionlessFunc<void, boolean | undefined>({
-  func: async ({ logger, config, getInspectorState }) => {
-    const { mcpEndpoints, functions } = await getInspectorState()
-    const {
-      mcpWiringsFile,
-      mcpWiringsMetaFile,
-      packageMappings,
-      schemaDirectory,
-      schema,
-    } = config
-
-    await writeFileInDir(
-      logger,
-      mcpWiringsFile,
-      serializeFileImports(
-        'wireMCPResource or wireMCPTool',
-        mcpWiringsFile,
-        mcpEndpoints.files,
-        packageMappings
-      )
-    )
-
-    // Populate arguments for prompts meta before serializing
-    const promptsMetaWithArguments = { ...mcpEndpoints.promptsMeta }
-    for (const promptMeta of Object.values(promptsMetaWithArguments) as any[]) {
-      const functionMeta = functions.meta[promptMeta.pikkuFuncName]
-      if (functionMeta) {
-        const inputType = functionMeta.inputs?.[0]
-        promptMeta.arguments = await generateArgumentsFromSchema(
-          inputType || null,
-          schemaDirectory || '',
-          functions.typesMap,
-          logger
-        )
-      }
-    }
-
-    const metaData = {
-      resourcesMeta: mcpEndpoints.resourcesMeta,
-      toolsMeta: mcpEndpoints.toolsMeta,
-      promptsMeta: promptsMetaWithArguments,
-    }
-
-    // Write minimal JSON (runtime-only fields)
-    const minimalMeta = stripVerboseFields(metaData)
-    await writeFileInDir(
-      logger,
-      config.mcpWiringsMetaJsonFile,
-      JSON.stringify(minimalMeta, null, 2)
-    )
-
-    // Write verbose JSON only if it has additional fields
-    if (hasVerboseFields(metaData)) {
-      const verbosePath = config.mcpWiringsMetaJsonFile.replace(
-        /\.gen\.json$/,
-        '-verbose.gen.json'
-      )
-      await writeFileInDir(
-        logger,
-        verbosePath,
-        JSON.stringify(metaData, null, 2)
-      )
-    }
-
-    const jsonImportPath = getFileImportRelativePath(
-      mcpWiringsMetaFile,
-      config.mcpWiringsMetaJsonFile,
-      packageMappings
-    )
-
-    const supportsImportAttributes = schema?.supportsImportAttributes ?? false
-    const importStatement = supportsImportAttributes
-      ? `import metaData from '${jsonImportPath}' with { type: 'json' }`
-      : `import metaData from '${jsonImportPath}'`
-
-    await writeFileInDir(
-      logger,
-      mcpWiringsMetaFile,
-      `import { pikkuState } from '@pikku/core'
-import type { MCPResourceMeta, MCPToolMeta, MCPPromptMeta } from '@pikku/core/mcp'
-${importStatement}
-pikkuState(null, 'mcp', 'resourcesMeta', metaData.resourcesMeta as MCPResourceMeta)
-pikkuState(null, 'mcp', 'toolsMeta', metaData.toolsMeta as MCPToolMeta)
-pikkuState(null, 'mcp', 'promptsMeta', metaData.promptsMeta as MCPPromptMeta)`
-    )
-
-    return true
-  },
-  middleware: [
-    logCommandInfoAndTime({
-      commandStart: 'Finding MCP endpoints',
-      commandEnd: 'Found MCP endpoints',
-    }),
-  ],
-})

package/src/functions/wirings/mcp/serialize-mcp-json.ts

@@ -1,161 +0,0 @@
-import { readFile } from 'fs/promises'
-import { join } from 'path'
-import { MCPResourceMeta, MCPToolMeta, MCPPromptMeta } from '@pikku/core/mcp'
-import { FunctionsMeta, JSONValue } from '@pikku/core'
-import { TypesMap } from '@pikku/inspector'
-import { CLILogger } from '../../../services/cli-logger.service.js'
-
-interface MCPEndpoint {
-  name: string
-  description?: string
-  parameters?: JSONValue
-  returns?: JSONValue
-  streaming?: boolean
-}
-
-export const serializeMCPJson = async (
-  logger: CLILogger,
-  schemaDirectory: string,
-  functionsMeta: FunctionsMeta,
-  typesMap: TypesMap,
-  mcpResourceMeta: MCPResourceMeta,
-  mcpToolMeta: MCPToolMeta,
-  mcpPromptMeta: MCPPromptMeta
-): Promise<string> => {
-  const tools: MCPEndpoint[] = []
-  const resources: MCPEndpoint[] = []
-  const prompts: any[] = []
-
-  // Helper function to load schema from file
-  const loadSchema = async (
-    typeName: string | undefined
-  ): Promise<JSONValue | undefined> => {
-    if (
-      !typeName ||
-      ['boolean', 'string', 'number', 'null', 'undefined', 'void'].includes(
-        typeName
-      )
-    ) {
-      return undefined
-    }
-
-    const uniqueName = typesMap.getUniqueName(typeName)
-    if (!uniqueName) {
-      return undefined
-    }
-
-    const schemaPath = join(
-      schemaDirectory,
-      'schemas',
-      `${uniqueName}.schema.json`
-    )
-
-    try {
-      const schemaContent = await readFile(schemaPath, 'utf-8')
-      return JSON.parse(schemaContent)
-    } catch (e) {
-      logger.warn(`Serialize MCP: Could not load schema for type: ${uniqueName} from ${schemaPath}`)
-      console.error(e)
-      return undefined
-    }
-  }
-
-  // Process MCP resources
-  for (const [name, endpointMeta] of Object.entries(mcpResourceMeta)) {
-    const functionMeta = functionsMeta[endpointMeta.pikkuFuncName]
-    if (!functionMeta) {
-      logger.warn(
-        `Function ${endpointMeta.pikkuFuncName} not found in functionsMeta. Skipping resource ${name}.`
-      )
-      continue
-    }
-
-    const inputType = functionMeta.inputs?.[0]
-    const outputType = functionMeta.outputs?.[0]
-
-    const parameters = await loadSchema(inputType)
-    const returns = await loadSchema(outputType)
-
-    const endpoint = {
-      uri: name,
-      name,
-      description: endpointMeta.description,
-      ...(parameters && { parameters }),
-      ...(returns && { returns }),
-      ...(endpointMeta.streaming && { streaming: true }),
-    }
-
-    resources.push(endpoint)
-  }
-
-  // Process MCP tools
-  for (const [name, endpointMeta] of Object.entries(mcpToolMeta)) {
-    const functionMeta = functionsMeta[endpointMeta.pikkuFuncName]
-    if (!functionMeta) {
-      logger.warn(
-        `Function ${endpointMeta.pikkuFuncName} not found in functionsMeta. Skipping tool ${name}.`
-      )
-      continue
-    }
-
-    const inputType = functionMeta.inputs?.[0]
-    const outputType = functionMeta.outputs?.[0]
-
-    const parameters = await loadSchema(inputType)
-    const returns = await loadSchema(outputType)
-
-    const endpoint = {
-      name,
-      description: endpointMeta.description,
-      ...(parameters && { parameters }),
-      ...(returns && { returns }),
-      ...(endpointMeta.streaming && { streaming: true }),
-    }
-
-    tools.push(endpoint)
-  }
-
-  // Process MCP prompts
-  for (const [name, endpointMeta] of Object.entries(mcpPromptMeta)) {
-    const functionMeta = functionsMeta[endpointMeta.pikkuFuncName]
-    if (!functionMeta) {
-      logger.warn(
-        `Function ${endpointMeta.pikkuFuncName} not found in functionsMeta. Skipping prompt ${name}.`
-      )
-      continue
-    }
-
-    const inputType = functionMeta.inputs?.[0]
-    // TODO: this needs to be a json schema type, not any
-    const inputSchema: any = await loadSchema(inputType)
-
-    // Generate arguments from input schema
-    const argumentsArray: any[] = []
-    if (
-      inputSchema &&
-      typeof inputSchema === 'object' &&
-      inputSchema.properties
-    ) {
-      const properties = inputSchema.properties as Record<string, any>
-      const required = (inputSchema.required as string[]) || []
-
-      for (const [propName, propSchema] of Object.entries(properties)) {
-        argumentsArray.push({
-          name: propName,
-          description: propSchema.description || `${propName} parameter`,
-          required: required.includes(propName),
-        })
-      }
-    }
-
-    const prompt = {
-      name,
-      description: endpointMeta.description,
-      arguments: argumentsArray,
-    }
-
-    prompts.push(prompt)
-  }
-
-  return JSON.stringify({ tools, resources, prompts }, null, 2)
-}