@pikku/cli 0.11.2 → 0.11.3

package/src/functions/runtimes/nextjs/serialize-nextjs-http-wrapper.ts

@@ -11,7 +11,7 @@ export const serializeNextJsHTTPWrapper = (
  */
 import { CorePikkuFetchOptions } from '@pikku/fetch'
 import type { HTTPWiringsMap, HTTPWiringHandlerOf, HTTPWiringsWithMethod } from '${routesMapPath}'
-import type { RPCMap } from '${rpcMapPath}'
+import type { FlattenedRPCMap } from '${rpcMapPath}'
 import { PikkuFetch } from '${pikkuFetchImport}'
 
 let _pikku: PikkuFetch | undefined
@@ -64,14 +64,16 @@ export const pikku = (options?: CorePikkuFetchOptions) => {
    *
    * @template Route - The route key with the POST method.
    * @param route - The route identifier.
-   * @param data - The input data for the POST request, defaults to null.
+   * @param data - The input data for the POST request (required if input type is defined).
    * @returns A promise that resolves to the output of the POST handler.
    */
   const dynamicPost = <Route extends HTTPWiringsWithMethod<'POST'>>(
     route: Route,
-    data: HTTPWiringHandlerOf<Route, 'POST'>['input'] = null
+    ...args: HTTPWiringHandlerOf<Route, 'POST'>['input'] extends null | undefined
+      ? [data?: HTTPWiringHandlerOf<Route, 'POST'>['input']]
+      : [data: NonNullable<HTTPWiringHandlerOf<Route, 'POST'>['input']>]
   ): Promise<HTTPWiringHandlerOf<Route, 'POST'>['output']> => {
-    return dynamicActionRequest(route, 'POST', data)
+    return dynamicActionRequest(route, 'POST', args[0] ?? null)
   }
 
   /**
@@ -79,14 +81,16 @@ export const pikku = (options?: CorePikkuFetchOptions) => {
    *
    * @template Route - The route key with the GET method.
    * @param route - The route identifier.
-   * @param data - The input data for the GET request, defaults to null.
+   * @param data - The input data for the GET request (required if input type is defined).
    * @returns A promise that resolves to the output of the GET handler.
    */
   const dynamicGet = <Route extends HTTPWiringsWithMethod<'GET'>>(
     route: Route,
-    data: HTTPWiringHandlerOf<Route, 'GET'>['input'] = null
+    ...args: HTTPWiringHandlerOf<Route, 'GET'>['input'] extends null | undefined
+      ? [data?: HTTPWiringHandlerOf<Route, 'GET'>['input']]
+      : [data: NonNullable<HTTPWiringHandlerOf<Route, 'GET'>['input']>]
   ): Promise<HTTPWiringHandlerOf<Route, 'GET'>['output']> => {
-    return dynamicActionRequest(route, 'GET', data)
+    return dynamicActionRequest(route, 'GET', args[0] ?? null)
   }
 
   /**
@@ -94,14 +98,16 @@ export const pikku = (options?: CorePikkuFetchOptions) => {
    *
    * @template Route - The route key with the PATCH method.
    * @param route - The route identifier.
-   * @param data - The input data for the PATCH request, defaults to null.
+   * @param data - The input data for the PATCH request (required if input type is defined).
    * @returns A promise that resolves to the output of the PATCH handler.
    */
   const dynamicPatch = <Route extends HTTPWiringsWithMethod<'PATCH'>>(
     route: Route,
-    data: HTTPWiringHandlerOf<Route, 'PATCH'>['input'] = null
+    ...args: HTTPWiringHandlerOf<Route, 'PATCH'>['input'] extends null | undefined
+      ? [data?: HTTPWiringHandlerOf<Route, 'PATCH'>['input']]
+      : [data: NonNullable<HTTPWiringHandlerOf<Route, 'PATCH'>['input']>]
   ): Promise<HTTPWiringHandlerOf<Route, 'PATCH'>['output']> => {
-    return dynamicActionRequest(route, 'PATCH', data)
+    return dynamicActionRequest(route, 'PATCH', args[0] ?? null)
   }
 
   /**
@@ -109,14 +115,16 @@ export const pikku = (options?: CorePikkuFetchOptions) => {
    *
    * @template Route - The route key with the DELETE method.
    * @param route - The route identifier.
-   * @param data - The input data for the DELETE request, defaults to null.
+   * @param data - The input data for the DELETE request (required if input type is defined).
    * @returns A promise that resolves to the output of the DELETE handler.
    */
   const dynamicDel = <Route extends HTTPWiringsWithMethod<'DELETE'>>(
     route: Route,
-    data: HTTPWiringHandlerOf<Route, 'DELETE'>['input'] = null
+    ...args: HTTPWiringHandlerOf<Route, 'DELETE'>['input'] extends null | undefined
+      ? [data?: HTTPWiringHandlerOf<Route, 'DELETE'>['input']]
+      : [data: NonNullable<HTTPWiringHandlerOf<Route, 'DELETE'>['input']>]
   ): Promise<HTTPWiringHandlerOf<Route, 'DELETE'>['output']> => {
-    return dynamicActionRequest(route, 'DELETE', data)
+    return dynamicActionRequest(route, 'DELETE', args[0] ?? null)
   }
 
   // Static Requests
@@ -126,14 +134,16 @@ export const pikku = (options?: CorePikkuFetchOptions) => {
    *
    * @template Route - The route key with the POST method.
    * @param route - The route identifier.
-   * @param data - The input data for the POST request, defaults to null.
+   * @param data - The input data for the POST request (required if input type is defined).
    * @returns A promise that resolves to the output of the POST handler.
    */
   const staticPost = <Route extends HTTPWiringsWithMethod<'POST'>>(
     route: Route,
-    data: HTTPWiringHandlerOf<Route, 'POST'>['input'] = null
+    ...args: HTTPWiringHandlerOf<Route, 'POST'>['input'] extends null | undefined
+      ? [data?: HTTPWiringHandlerOf<Route, 'POST'>['input']]
+      : [data: NonNullable<HTTPWiringHandlerOf<Route, 'POST'>['input']>]
   ): Promise<HTTPWiringHandlerOf<Route, 'POST'>['output']> => {
-    return staticActionRequest(route, 'POST', data)
+    return staticActionRequest(route, 'POST', args[0] ?? null)
   }
 
   /**
@@ -141,49 +151,53 @@ export const pikku = (options?: CorePikkuFetchOptions) => {
    *
    * @template Route - The route key with the GET method.
    * @param route - The route identifier.
-   * @param data - The input data for the GET request, defaults to null.
+   * @param data - The input data for the GET request (required if input type is defined).
    * @returns A promise that resolves to the output of the GET handler.
    */
   const staticGet = <Route extends HTTPWiringsWithMethod<'GET'>>(
     route: Route,
-    data: HTTPWiringHandlerOf<Route, 'GET'>['input'] = null
+    ...args: HTTPWiringHandlerOf<Route, 'GET'>['input'] extends null | undefined
+      ? [data?: HTTPWiringHandlerOf<Route, 'GET'>['input']]
+      : [data: NonNullable<HTTPWiringHandlerOf<Route, 'GET'>['input']>]
   ): Promise<HTTPWiringHandlerOf<Route, 'GET'>['output']> => {
-    return staticActionRequest(route, 'GET', data)
+    return staticActionRequest(route, 'GET', args[0] ?? null)
   }
 
   // RPC Requests
 
-  /**
-   * Type definition for RPC invocation.
-   */
-  type RPCInvoke = <Name extends keyof RPCMap>(
-    name: Name,
-    data: RPCMap[Name]['input']
-  ) => Promise<RPCMap[Name]['output']>
-
   /**
    * Makes a dynamic RPC request.
    *
-   * @template Name - The RPC function name from the RPCMap.
+   * @template Name - The RPC function name from the FlattenedRPCMap.
    * @param name - The RPC function identifier.
-   * @param data - The input data for the RPC request.
+   * @param data - The input data for the RPC request (required if input type is defined).
    * @returns A promise that resolves to the output of the RPC handler.
    */
-  const rpc: RPCInvoke = async (rpcName, data) => {
-    return dynamicActionRequest(\`/rpc/\${rpcName}\` as any, 'POST', { data }) as any
+  const rpc = async <Name extends keyof FlattenedRPCMap>(
+    rpcName: Name,
+    ...args: FlattenedRPCMap[Name]['input'] extends null | undefined
+      ? [data?: FlattenedRPCMap[Name]['input']]
+      : [data: NonNullable<FlattenedRPCMap[Name]['input']>]
+  ): Promise<FlattenedRPCMap[Name]['output']> => {
+    return dynamicActionRequest('/rpc/:rpcName' as '/rpc/:rpcName', 'POST', { rpcName, data: args[0] ?? null }) as unknown as FlattenedRPCMap[Name]['output']
   }
 
   /**
    * Makes a static RPC request.
    * Note: In HTTP wrapper context, both rpc and rpcStatic behave the same way.
    *
-   * @template Name - The RPC function name from the RPCMap.
+   * @template Name - The RPC function name from the FlattenedRPCMap.
    * @param name - The RPC function identifier.
-   * @param data - The input data for the RPC request.
+   * @param data - The input data for the RPC request (required if input type is defined).
    * @returns A promise that resolves to the output of the RPC handler.
    */
-  const staticRPC: RPCInvoke = async (rpcName, data) => {
-    return staticActionRequest(\`/rpc/\${rpcName}\` as any, 'POST', { data }) as any
+  const staticRPC = async <Name extends keyof FlattenedRPCMap>(
+    rpcName: Name,
+    ...args: FlattenedRPCMap[Name]['input'] extends null | undefined
+      ? [data?: FlattenedRPCMap[Name]['input']]
+      : [data: NonNullable<FlattenedRPCMap[Name]['input']>]
+  ): Promise<FlattenedRPCMap[Name]['output']> => {
+    return staticActionRequest('/rpc/:rpcName' as '/rpc/:rpcName', 'POST', { rpcName, data: args[0] ?? null }) as unknown as FlattenedRPCMap[Name]['output']
   }
 
   return {

package/src/functions/wirings/channels/pikku-channels.ts

@@ -47,7 +47,7 @@ export const pikkuChannels: any = pikkuVoidFunc({
     await writeFileInDir(
       logger,
       channelsWiringMetaFile,
-      `import { pikkuState } from '@pikku/core'\nimport { ChannelsMeta } from '@pikku/core/channel'\n${importStatement}\npikkuState('channel', 'meta', metaData as ChannelsMeta)`
+      `import { pikkuState } from '@pikku/core'\nimport { ChannelsMeta } from '@pikku/core/channel'\n${importStatement}\npikkuState(null, 'channel', 'meta', metaData as ChannelsMeta)`
     )
   },
   middleware: [

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

@@ -2,6 +2,11 @@ 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 { getFileImportRelativePath } from '../../../utils/file-import-path.js'
+import {
+  stripVerboseFields,
+  hasVerboseFields,
+} from '../../../utils/strip-verbose-meta.js'
 
 export const pikkuChannels: any = pikkuSessionlessFunc<
   void,
@@ -9,8 +14,13 @@ export const pikkuChannels: any = pikkuSessionlessFunc<
 >({
   func: async ({ logger, config, getInspectorState }) => {
     const visitState = await getInspectorState()
-    const { channelsWiringFile, channelsWiringMetaFile, packageMappings } =
-      config
+    const {
+      channelsWiringFile,
+      channelsWiringMetaFile,
+      channelsWiringMetaJsonFile,
+      packageMappings,
+      schema,
+    } = config
     const { channels } = visitState
 
     await writeFileInDir(
@@ -23,10 +33,43 @@ export const pikkuChannels: any = pikkuSessionlessFunc<
         packageMappings
       )
     )
+
+    // Write minimal JSON (runtime-only fields)
+    const minimalMeta = stripVerboseFields(channels.meta)
+    await writeFileInDir(
+      logger,
+      channelsWiringMetaJsonFile,
+      JSON.stringify(minimalMeta, null, 2)
+    )
+
+    // Write verbose JSON only if it has additional fields
+    if (hasVerboseFields(channels.meta)) {
+      const verbosePath = channelsWiringMetaJsonFile.replace(
+        /\.gen\.json$/,
+        '-verbose.gen.json'
+      )
+      await writeFileInDir(
+        logger,
+        verbosePath,
+        JSON.stringify(channels.meta, null, 2)
+      )
+    }
+
+    // Generate TypeScript file that imports the minimal JSON
+    const jsonImportPath = getFileImportRelativePath(
+      channelsWiringMetaFile,
+      channelsWiringMetaJsonFile,
+      packageMappings
+    )
+    const supportsImportAttributes = schema?.supportsImportAttributes ?? false
+    const importStatement = supportsImportAttributes
+      ? `import metaData from '${jsonImportPath}' with { type: 'json' }`
+      : `import metaData from '${jsonImportPath}'`
+
     await writeFileInDir(
       logger,
       channelsWiringMetaFile,
-      `import { pikkuState } from '@pikku/core'\npikkuState('channel', 'meta', ${JSON.stringify(channels.meta, null, 2)})`
+      `import { pikkuState } from '@pikku/core'\nimport type { ChannelsMeta } from '@pikku/core/channel'\n${importStatement}\npikkuState(null, 'channel', 'meta', metaData as ChannelsMeta)`
     )
 
     return true

package/src/functions/wirings/channels/serialize-channel-types.ts

@@ -10,6 +10,12 @@ export const serializeChannelTypes = (functionTypesImportPath: string) => {
 import { CoreChannel, wireChannel as wireChannelCore } from '@pikku/core/channel'
 import { AssertHTTPWiringParams } from '@pikku/core/http'
 import type { PikkuFunctionConfig, PikkuFunctionSessionless, PikkuPermission, PikkuMiddleware } from '${functionTypesImportPath}'
+import type { ZodLike, CorePermissionGroup } from '@pikku/core'
+
+/**
+ * Helper type to infer the output type from a Zod schema
+ */
+type InferZodOutput<T> = T extends ZodLike<infer U> ? U : never
 
 /**
  * Type definition for WebSocket channels with typed data exchange.
@@ -60,21 +66,72 @@ export const pikkuChannelDisconnectionFunc = (
   return typeof func === 'function' ? { func } : func
 }
 
+/**
+ * Configuration object for channel functions with Zod schema validation.
+ */
+type PikkuChannelFuncConfigWithSchema<
+  InputSchema extends ZodLike,
+  OutputSchema extends ZodLike | undefined = undefined
+> = {
+  name?: string
+  tags?: string[]
+  expose?: boolean
+  internal?: boolean
+  func: PikkuFunctionSessionless<
+    InferZodOutput<InputSchema>,
+    OutputSchema extends ZodLike ? InferZodOutput<OutputSchema> : unknown,
+    'channel' | 'session' | 'rpc'
+  >
+  auth?: boolean
+  permissions?: CorePermissionGroup<PikkuPermission<InferZodOutput<InputSchema>>>
+  middleware?: PikkuMiddleware[]
+  input: InputSchema
+  output?: OutputSchema
+}
+
 /**
  * Creates a function that handles WebSocket channel messages.
  * Called when a message is received on a channel.
- * This is the same as pikkuSessionlessFunc but with ChannelData = unknown by default.
  *
- * @template In - Input type for channel messages
- * @template Out - Output type for channel responses
+ * Supports two patterns:
+ * 1. Generic types: \`pikkuChannelFunc<Input, Output>({ func: ... })\`
+ * 2. Zod schemas: \`pikkuChannelFunc({ input: z.object(...), func: ... })\`
+ *
+ * @template In - Input type for channel messages (inferred from schema if provided)
+ * @template Out - Output type for channel responses (inferred from schema if provided)
  * @param func - Function definition, either direct function or configuration object
  * @returns The normalized configuration object
+ *
+ * @example
+ * \`\`\`typescript
+ * // Pattern 1: Using generic types
+ * const handleMessage = pikkuChannelFunc<{text: string}, {received: boolean}>({
+ *   func: async (_services, { text }) => ({ received: true })
+ * })
+ *
+ * // Pattern 2: Using Zod schemas
+ * const messageInput = z.object({ text: z.string() })
+ * const messageOutput = z.object({ received: z.boolean() })
+ *
+ * const handleMessage = pikkuChannelFunc({
+ *   input: messageInput,
+ *   output: messageOutput,
+ *   func: async (_services, { text }) => ({ received: true })
+ * })
+ * \`\`\`
  */
-export const pikkuChannelFunc = <In, Out = unknown>(
+export function pikkuChannelFunc<
+  InputSchema extends ZodLike,
+  OutputSchema extends ZodLike | undefined = undefined
+>(
+  config: PikkuChannelFuncConfigWithSchema<InputSchema, OutputSchema>
+): PikkuFunctionConfig<InferZodOutput<InputSchema>, OutputSchema extends ZodLike ? InferZodOutput<OutputSchema> : unknown, 'channel' | 'session' | 'rpc'>
+export function pikkuChannelFunc<In, Out = unknown>(
   func:
     | PikkuFunctionSessionless<In, Out, 'channel' | 'session' | 'rpc'>
     | PikkuFunctionConfig<In, Out, 'channel' | 'session' | 'rpc'>
-) => {
+): PikkuFunctionConfig<In, Out, 'channel' | 'session' | 'rpc'>
+export function pikkuChannelFunc(func: any) {
   return typeof func === 'function' ? { func } : func
 }
 

package/src/functions/wirings/channels/serialize-typed-channel-map.ts

@@ -17,12 +17,12 @@ export const serializeTypedChannelsMap = (
   )
   typesMap.customTypes.forEach(({ references }) => {
     for (const reference of references) {
-      // Skip __object types (placeholder types for invalid/broken functions)
       if (reference !== '__object' && !reference.startsWith('__object_')) {
         requiredTypes.add(reference)
       }
     }
   })
+
   const imports = serializeImportMap(
     relativeToPath,
     packageMappings,
@@ -30,10 +30,11 @@ export const serializeTypedChannelsMap = (
     requiredTypes
   )
   const serializedCustomTypes = generateCustomTypes(typesMap, requiredTypes)
+
   return `/**
  * This provides the structure needed for TypeScript to be aware of channels
  */
-    
+
 ${imports}
 ${serializedCustomTypes}
 

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

@@ -3,6 +3,10 @@ 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 { getFileImportRelativePath } from '../../../utils/file-import-path.js'
+import {
+  stripVerboseFields,
+  hasVerboseFields,
+} from '../../../utils/strip-verbose-meta.js'
 
 export const pikkuCLI: any = pikkuSessionlessFunc<void, boolean | undefined>({
   func: async ({ logger, config, getInspectorState }) => {
@@ -28,12 +32,27 @@ export const pikkuCLI: any = pikkuSessionlessFunc<void, boolean | undefined>({
       )
     )
 
+    // Write minimal JSON (runtime-only fields)
+    const minimalMeta = stripVerboseFields(cli.meta)
     await writeFileInDir(
       logger,
       cliWiringMetaJsonFile,
-      JSON.stringify(cli.meta, null, 2)
+      JSON.stringify(minimalMeta, null, 2)
     )
 
+    // Write verbose JSON only if it has additional fields
+    if (hasVerboseFields(cli.meta)) {
+      const verbosePath = cliWiringMetaJsonFile.replace(
+        /\.gen\.json$/,
+        '-verbose.gen.json'
+      )
+      await writeFileInDir(
+        logger,
+        verbosePath,
+        JSON.stringify(cli.meta, null, 2)
+      )
+    }
+
     const jsonImportPath = getFileImportRelativePath(
       cliWiringMetaFile,
       cliWiringMetaJsonFile,
@@ -48,7 +67,7 @@ export const pikkuCLI: any = pikkuSessionlessFunc<void, boolean | undefined>({
     await writeFileInDir(
       logger,
       cliWiringMetaFile,
-      `import { pikkuState } from '@pikku/core'\nimport { CLIMeta } from '@pikku/core/cli'\n${importStatement}\npikkuState('cli', 'meta', metaData as CLIMeta)`
+      `import { pikkuState } from '@pikku/core'\nimport { CLIMeta } from '@pikku/core/cli'\n${importStatement}\npikkuState(null, 'cli', 'meta', metaData as CLIMeta)`
     )
 
     return true

package/src/functions/wirings/forge/pikku-command-forge-nodes.ts

@@ -0,0 +1,135 @@
+import { pikkuSessionlessFunc } from '../../../../.pikku/pikku-types.gen.js'
+import { ErrorCode } from '@pikku/inspector'
+import { writeFileInDir } from '../../../utils/file-writer.js'
+import { logCommandInfoAndTime } from '../../../middleware/log-command-info-and-time.js'
+import { readFile } from 'fs/promises'
+import { join, isAbsolute } from 'path'
+import {
+  stripVerboseFields,
+  hasVerboseFields,
+} from '../../../utils/strip-verbose-meta.js'
+
+/**
+ * Load and sanitize an SVG icon file.
+ * Returns the SVG content as a string, or undefined if not found.
+ */
+const loadIcon = async (
+  iconPath: string | undefined,
+  rootDir: string,
+  logger: any
+): Promise<string | undefined> => {
+  if (!iconPath) return undefined
+
+  // Resolve the full path to the icon
+  const fullPath = isAbsolute(iconPath) ? iconPath : join(rootDir, iconPath)
+
+  try {
+    const content = await readFile(fullPath, 'utf-8')
+
+    // Basic SVG validation - must start with <svg
+    const trimmed = content.trim()
+    if (!trimmed.startsWith('<svg') && !trimmed.startsWith('<?xml')) {
+      logger.warn(`Icon file is not a valid SVG: ${fullPath}`)
+      return undefined
+    }
+
+    // Return the sanitized SVG (remove XML declaration if present)
+    return trimmed.replace(/<\?xml[^?]*\?>\s*/g, '').trim()
+  } catch (e) {
+    logger.warn(`Could not load icon: ${fullPath}`)
+    return undefined
+  }
+}
+
+export const pikkuForgeNodes: any = pikkuSessionlessFunc<
+  void,
+  boolean | undefined
+>({
+  func: async ({ logger, config, getInspectorState }) => {
+    const { forgeNodes, forgeCredentials } = await getInspectorState()
+    const { forgeNodesMetaJsonFile, forge, rootDir } = config
+
+    const hasNodes = Object.keys(forgeNodes.meta).length > 0
+    const hasCredentials = Object.keys(forgeCredentials.meta).length > 0
+
+    // Only generate if there are forge nodes or credentials
+    if (!hasNodes && !hasCredentials) {
+      return undefined
+    }
+
+    // Validate categories if configured
+    const allowedCategories = forge?.node?.categories
+    if (allowedCategories && allowedCategories.length > 0) {
+      for (const [name, meta] of Object.entries(forgeNodes.meta) as [
+        string,
+        any,
+      ][]) {
+        if (!allowedCategories.includes(meta.category)) {
+          logger.critical(
+            ErrorCode.INVALID_VALUE,
+            `Forge node '${name}' has invalid category '${meta.category}'. ` +
+              `Allowed categories: ${allowedCategories.join(', ')}`
+          )
+        }
+      }
+    }
+
+    // Build the output metadata - remove per-node icon field
+    const outputMeta: Record<string, any> = {}
+    for (const [name, meta] of Object.entries(forgeNodes.meta) as [
+      string,
+      any,
+    ][]) {
+      // Remove icon from node meta - only package-level icon is used
+      const { icon: _icon, ...nodeMetaWithoutIcon } = meta
+      outputMeta[name] = nodeMetaWithoutIcon
+    }
+
+    // Load package-level icon
+    const packageIcon = await loadIcon(forge?.node?.icon, rootDir, logger)
+
+    const metaData = {
+      nodes: outputMeta,
+      credentials: forgeCredentials.meta,
+      package: {
+        displayName: forge?.node?.displayName,
+        description: forge?.node?.description,
+        icon: packageIcon,
+        categories: forge?.node?.categories,
+      },
+    }
+
+    if (forgeNodesMetaJsonFile) {
+      // Write minimal JSON (runtime-only fields)
+      const minimalMeta = stripVerboseFields(metaData)
+      await writeFileInDir(
+        logger,
+        forgeNodesMetaJsonFile,
+        JSON.stringify(minimalMeta, null, 2),
+        { ignoreModifyComment: true }
+      )
+
+      // Write verbose JSON only if it has additional fields
+      if (hasVerboseFields(metaData)) {
+        const verbosePath = forgeNodesMetaJsonFile.replace(
+          /\.gen\.json$/,
+          '-verbose.gen.json'
+        )
+        await writeFileInDir(
+          logger,
+          verbosePath,
+          JSON.stringify(metaData, null, 2),
+          { ignoreModifyComment: true }
+        )
+      }
+    }
+
+    return true
+  },
+  middleware: [
+    logCommandInfoAndTime({
+      commandStart: 'Generating Forge nodes metadata',
+      commandEnd: 'Generated Forge nodes metadata',
+    }),
+  ],
+})

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

@@ -0,0 +1,38 @@
+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 { serializeForgeTypes } from './serialize-forge-types.js'
+
+export const pikkuForgeTypes: any = pikkuSessionlessFunc<void, void>({
+  func: async ({ logger, config }) => {
+    const {
+      forgeTypesFile,
+      rpcInternalMapDeclarationFile,
+      packageMappings,
+      forge,
+    } = config
+
+    // Get the import path for the RPC map declaration file
+    // The declaration file ends in .d.ts, but we need to import from .js
+    // getFileImportRelativePath converts .ts -> .js, so .d.ts -> .d.js
+    // We need to remove the extra .d extension
+    let rpcMapImportPath = getFileImportRelativePath(
+      forgeTypesFile,
+      rpcInternalMapDeclarationFile,
+      packageMappings
+    )
+    // Fix: .d.ts files should be imported as .js (TypeScript resolves types from .d.ts)
+    rpcMapImportPath = rpcMapImportPath.replace('.d.js', '.js')
+
+    const categories = forge?.node?.categories
+    const content = serializeForgeTypes(rpcMapImportPath, categories)
+    await writeFileInDir(logger, forgeTypesFile, content)
+  },
+  middleware: [
+    logCommandInfoAndTime({
+      commandStart: 'Creating Forge types',
+      commandEnd: 'Created Forge types',
+    }),
+  ],
+})