@pikku/cli 0.11.1 → 0.11.3

package/.pikku/channel/pikku-channel-types.gen.ts

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.11.1
+ * This file was generated by @pikku/cli@0.11.3
  */
 /**
 
@@ -7,9 +7,14 @@
  */
 
 import { CoreChannel, wireChannel as wireChannelCore } from '@pikku/core/channel'
-import { CorePikkuFunctionConfig } from '@pikku/core'
 import { AssertHTTPWiringParams } from '@pikku/core/http'
-import type { PikkuFunction, PikkuFunctionSessionless, PikkuPermission, PikkuMiddleware } from '../function/pikku-function-types.gen.js'
+import type { PikkuFunctionConfig, PikkuFunctionSessionless, PikkuPermission, PikkuMiddleware } from '../function/pikku-function-types.gen.js'
+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.
@@ -22,9 +27,9 @@ import type { PikkuFunction, PikkuFunctionSessionless, PikkuPermission, PikkuMid
 type ChannelWiring<ChannelData, Channel extends string> = CoreChannel<
   ChannelData,
   Channel,
-  CorePikkuFunctionConfig<PikkuFunctionSessionless<void, any, ChannelData>, PikkuPermission<void>, PikkuMiddleware>,
-  CorePikkuFunctionConfig<PikkuFunctionSessionless<void, void, ChannelData>, PikkuPermission<void>, PikkuMiddleware>,
-  CorePikkuFunctionConfig<PikkuFunctionSessionless<any, any, ChannelData> | PikkuFunction<any, any, ChannelData>, PikkuPermission<any>, PikkuMiddleware>,
+  PikkuFunctionConfig<void, any, 'channel' | 'session' | 'rpc'>,
+  PikkuFunctionConfig<void, void, 'channel' | 'session' | 'rpc'>,
+  PikkuFunctionConfig<any, any, 'channel' | 'session' | 'rpc'>,
   PikkuPermission,
   PikkuMiddleware
 >
@@ -39,8 +44,8 @@ type ChannelWiring<ChannelData, Channel extends string> = CoreChannel<
  */
 export const pikkuChannelConnectionFunc = <Out = unknown>(
   func:
-    | PikkuFunctionSessionless<void, Out, unknown>
-    | CorePikkuFunctionConfig<PikkuFunctionSessionless<void, Out, unknown>, PikkuPermission<void>, PikkuMiddleware>
+    | PikkuFunctionSessionless<void, Out, 'channel' | 'session' | 'rpc'>
+    | PikkuFunctionConfig<void, Out, 'channel' | 'session' | 'rpc'>
 ) => {
   return typeof func === 'function' ? { func } : func
 }
@@ -54,27 +59,78 @@ export const pikkuChannelConnectionFunc = <Out = unknown>(
  */
 export const pikkuChannelDisconnectionFunc = (
   func:
-    | PikkuFunctionSessionless<void, void, unknown>
-    | CorePikkuFunctionConfig<PikkuFunctionSessionless<void, void, unknown>, PikkuPermission<void>, PikkuMiddleware>
+    | PikkuFunctionSessionless<void, void, 'channel'>
+    | PikkuFunctionConfig<void, void, 'channel' | 'session' | 'rpc'>
 ) => {
   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, unknown>
-    | CorePikkuFunctionConfig<PikkuFunctionSessionless<In, Out, unknown>, PikkuPermission<In>, PikkuMiddleware>
-) => {
+    | 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/.pikku/channel/pikku-channels-map.gen.d.ts

@@ -1,28 +1,28 @@
 /**
- * This file was generated by @pikku/cli@0.11.1
+ * This file was generated by @pikku/cli@0.11.3
  */
 /**
  * This provides the structure needed for TypeScript to be aware of channels
  */
-    
 
 
-// Custom types are those that are defined directly within generics
-// or are broken into simpler types
+
 export type PikkuSchemasOutput = false | true
-export type PikkuChannelsOutput = false | true
-export type PikkuCLIOutput = false | true
 export type PikkuFunctionsOutput = false | true
-export type PikkuHTTPOutput = false | true
-export type PikkuMCPOutput = false | true
 export type PikkuMiddlewareOutput = false | true
 export type PikkuPermissionsOutput = false | true
-export type PikkuQueueOutput = false | true
-export type PikkuPublicRPCOutput = false | true
-export type PikkuRemoteRPCOutput = false | true
 export type PikkuRPCOutput = false | true
+export type PikkuPublicRPCOutput = false | true
+export type PikkuHTTPOutput = false | true
 export type PikkuSchedulerOutput = false | true
 export type PikkuWorkflowOutput = false | true
+export type PikkuRemoteRPCOutput = false | true
+export type PikkuQueueOutput = false | true
+export type PikkuChannelsOutput = false | true
+export type PikkuMCPOutput = false | true
+export type PikkuCLIOutput = false | true
+export type PikkuPackageOutput = false | true
+export type PikkuForgeNodesOutput = false | true
 
 interface ChannelHandler<I, O> {
     input: I;

package/.pikku/channel/pikku-channels-meta.gen.json

@@ -0,0 +1 @@
+{}

package/.pikku/channel/pikku-channels-meta.gen.ts

@@ -1,5 +1,7 @@
 /**
- * This file was generated by @pikku/cli@0.11.1
+ * This file was generated by @pikku/cli@0.11.3
  */
 import { pikkuState } from '@pikku/core'
-pikkuState('channel', 'meta', {})
+import type { ChannelsMeta } from '@pikku/core/channel'
+import metaData from './pikku-channels-meta.gen.json' with { type: 'json' }
+pikkuState(null, 'channel', 'meta', metaData as ChannelsMeta)

package/.pikku/channel/pikku-channels.gen.ts

@@ -1,4 +1,4 @@
 /**
- * This file was generated by @pikku/cli@0.11.1
+ * This file was generated by @pikku/cli@0.11.3
  */
 /* The files with an addChannel function call */

package/.pikku/cli/pikku-cli-channel.ts

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.11.1
+ * This file was generated by @pikku/cli@0.11.3
  */
 /**
  * WebSocket channel backend for 'pikku' CLI commands
@@ -18,7 +18,7 @@ import { pikkuOpenAPI } from '../../src/functions/wirings/http/pikku-command-ope
 import { pikkuNext } from '../../src/functions/runtimes/nextjs/pikku-command-nextjs.js'
 
 // Middleware to close the channel after CLI command completes
-const cliCloseOnComplete = pikkuMiddleware(async (services, { channel }, next) => {
+const cliCloseOnComplete = pikkuMiddleware(async (_services, { channel }, next) => {
   const closeChannel = () => {
     setTimeout(async () => {
       try {

package/.pikku/cli/pikku-cli-client.gen.ts

@@ -1,11 +1,10 @@
 /**
- * This file was generated by @pikku/cli@0.11.1
+ * This file was generated by @pikku/cli@0.11.3
  */
 
 import { executeCLIViaChannel } from '@pikku/core/cli/channel'
 import { CorePikkuWebsocket } from '@pikku/websocket'
 import '../pikku-bootstrap.gen.js'
-import { clientCLIRenderer } from '../../src/services.js'
 
 /**
  * Pikku CLI Client (via WebSocket Channel)
@@ -26,7 +25,6 @@ export async function PikkuCLIClient(
     pikkuWS,
     args,
     renderers,
-    defaultRenderer: clientCLIRenderer,
   })
 }
 

package/.pikku/cli/pikku-cli-types.gen.ts

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.11.1
+ * This file was generated by @pikku/cli@0.11.3
  */
 /**
 
@@ -49,7 +49,7 @@ export const pikkuCLIRender = <Data, RequiredServices extends SingletonServices
  * CLI command configuration with project-specific types.
  * Uses CoreCLICommandConfig from @pikku/core with local middleware and render types.
  */
-type CLICommandConfig<Func extends PikkuFunctionConfig<In, Out>, In = any, Out = any, Params extends string = string> = CoreCLICommandConfig<Func, PikkuMiddleware, PikkuCLIRender<any>, Params>
+type CLICommandConfig<Func extends PikkuFunctionConfig<In, Out, 'cli' | 'rpc' | 'session'>, In = any, Out = any, Params extends string = string> = CoreCLICommandConfig<Func, PikkuMiddleware, PikkuCLIRender<any>, Params>
 
 /**
  * Type definition for CLI applications with commands and global options.
@@ -83,7 +83,7 @@ export const wireCLI = <Commands extends Record<string, CoreCLICommandConfig<any
  * @returns CLI command configuration with inferred types
  */
 export const pikkuCLICommand = <
-  FuncConfig extends PikkuFunctionConfig<any, any>,
+  FuncConfig extends PikkuFunctionConfig<any, any, 'cli' | 'rpc' | 'session'>,
   Params extends string
 >(
   config: CLICommandConfig<FuncConfig, any, any, Params>

package/.pikku/cli/pikku-cli-wirings-meta.gen.json

@@ -0,0 +1,147 @@
+{
+  "programs": {
+    "pikku": {
+      "program": "pikku",
+      "commands": {
+        "all": {
+          "pikkuFuncName": "all",
+          "positionals": [],
+          "options": {
+            "tags": {
+              "description": "Filter functions by tags (comma-separated)",
+              "short": "t"
+            },
+            "types": {
+              "description": "Filter functions by types (comma-separated)"
+            },
+            "directories": {
+              "description": "Filter functions by directories (comma-separated)",
+              "short": "d"
+            },
+            "httpMethods": {
+              "description": "Filter HTTP routes by methods (comma-separated)"
+            },
+            "httpRoutes": {
+              "description": "Filter HTTP routes by route patterns (comma-separated)"
+            },
+            "names": {
+              "description": "Filter functions by name patterns (supports wildcards)",
+              "short": "n"
+            }
+          },
+          "description": "Generate all Pikku files (types, schemas, wirings, etc.)",
+          "isDefault": true
+        },
+        "bootstrap": {
+          "pikkuFuncName": "bootstrap",
+          "positionals": [],
+          "options": {},
+          "description": "Generate only type files (setup phase only)"
+        },
+        "watch": {
+          "pikkuFuncName": "watch",
+          "positionals": [],
+          "options": {},
+          "description": "Watch for file changes and regenerate automatically"
+        },
+        "schemas": {
+          "pikkuFuncName": "pikkuSchemas",
+          "positionals": [],
+          "options": {},
+          "description": "Generate JSON schemas for function input/output types"
+        },
+        "fetch": {
+          "pikkuFuncName": "pikkuFetch",
+          "positionals": [],
+          "options": {},
+          "description": "Generate type-safe HTTP fetch client"
+        },
+        "websocket": {
+          "pikkuFuncName": "pikkuWebSocketTyped",
+          "positionals": [],
+          "options": {},
+          "description": "Generate type-safe WebSocket client"
+        },
+        "rpc": {
+          "pikkuFuncName": "pikkuRPCClient",
+          "positionals": [],
+          "options": {},
+          "description": "Generate RPC client wrappers"
+        },
+        "queue-service": {
+          "pikkuFuncName": "pikkuQueueService",
+          "positionals": [],
+          "options": {},
+          "description": "Generate queue service wrapper"
+        },
+        "openapi": {
+          "pikkuFuncName": "pikkuOpenAPI",
+          "positionals": [],
+          "options": {},
+          "description": "Generate OpenAPI specification from HTTP routes"
+        },
+        "nextjs": {
+          "pikkuFuncName": "pikkuNext",
+          "positionals": [],
+          "options": {},
+          "description": "Generate Next.js backend and HTTP wrappers"
+        }
+      },
+      "options": {
+        "config": {
+          "description": "Path to pikku.config.json file",
+          "short": "c"
+        },
+        "logLevel": {
+          "description": "Set log level",
+          "short": "l",
+          "choices": [
+            "trace",
+            "debug",
+            "info",
+            "warn",
+            "error",
+            "critical"
+          ]
+        },
+        "userSessionType": {
+          "description": "Specify which UserSession type to use (when multiple exist)"
+        },
+        "singletonServicesFactoryType": {
+          "description": "Specify which singleton services factory to use"
+        },
+        "wireServicesFactoryType": {
+          "description": "Specify which wire services factory to use"
+        },
+        "stateOutput": {
+          "description": "Save inspector state to JSON file for reuse"
+        },
+        "stateInput": {
+          "description": "Load inspector state from JSON file (skips inspection)"
+        }
+      }
+    }
+  },
+  "renderers": {
+    "defaultCLIRenderer": {
+      "name": "defaultCLIRenderer",
+      "exportedName": "defaultCLIRenderer",
+      "services": {
+        "optimized": true,
+        "services": [
+          "logger",
+          "getInspectorState",
+          "schema",
+          "jwt",
+          "config",
+          "variables",
+          "secrets",
+          "workflowService",
+          "queueService",
+          "schedulerService"
+        ]
+      },
+      "filePath": "/home/runner/work/pikku/pikku/packages/cli/src/services.ts"
+    }
+  }
+}

package/.pikku/cli/pikku-cli-wirings-meta.gen.ts

@@ -1,160 +1,7 @@
 /**
- * This file was generated by @pikku/cli@0.11.1
+ * This file was generated by @pikku/cli@0.11.3
  */
 import { pikkuState } from '@pikku/core'
-pikkuState('cli', 'meta', {
-  "programs": {
-    "pikku": {
-      "program": "pikku",
-      "commands": {
-        "all": {
-          "pikkuFuncName": "all",
-          "positionals": [],
-          "options": {
-            "tags": {
-              "description": "Filter functions by tags (comma-separated)",
-              "short": "t"
-            },
-            "types": {
-              "description": "Filter functions by types (comma-separated)"
-            },
-            "directories": {
-              "description": "Filter functions by directories (comma-separated)",
-              "short": "d"
-            },
-            "httpMethods": {
-              "description": "Filter HTTP routes by methods (comma-separated)"
-            },
-            "httpRoutes": {
-              "description": "Filter HTTP routes by route patterns (comma-separated)"
-            },
-            "names": {
-              "description": "Filter functions by name patterns (supports wildcards)",
-              "short": "n"
-            }
-          },
-          "description": "Generate all Pikku files (types, schemas, wirings, etc.)",
-          "isDefault": true
-        },
-        "bootstrap": {
-          "pikkuFuncName": "bootstrap",
-          "positionals": [],
-          "options": {},
-          "description": "Generate only type files (setup phase only)"
-        },
-        "watch": {
-          "pikkuFuncName": "watch",
-          "positionals": [],
-          "options": {},
-          "description": "Watch for file changes and regenerate automatically"
-        },
-        "schemas": {
-          "pikkuFuncName": "pikkuSchemas",
-          "positionals": [],
-          "options": {},
-          "description": "Generate JSON schemas for function input/output types"
-        },
-        "fetch": {
-          "pikkuFuncName": "pikkuFetch",
-          "positionals": [],
-          "options": {},
-          "description": "Generate type-safe HTTP fetch client"
-        },
-        "websocket": {
-          "pikkuFuncName": "pikkuWebSocketTyped",
-          "positionals": [],
-          "options": {},
-          "description": "Generate type-safe WebSocket client"
-        },
-        "rpc": {
-          "pikkuFuncName": "pikkuRPCClient",
-          "positionals": [],
-          "options": {},
-          "description": "Generate RPC client wrappers"
-        },
-        "queue-service": {
-          "pikkuFuncName": "pikkuQueueService",
-          "positionals": [],
-          "options": {},
-          "description": "Generate queue service wrapper"
-        },
-        "openapi": {
-          "pikkuFuncName": "pikkuOpenAPI",
-          "positionals": [],
-          "options": {},
-          "description": "Generate OpenAPI specification from HTTP routes"
-        },
-        "nextjs": {
-          "pikkuFuncName": "pikkuNext",
-          "positionals": [],
-          "options": {},
-          "description": "Generate Next.js backend and HTTP wrappers"
-        }
-      },
-      "options": {
-        "config": {
-          "description": "Path to pikku.config.json file",
-          "short": "c"
-        },
-        "logLevel": {
-          "description": "Set log level",
-          "short": "l",
-          "choices": [
-            "trace",
-            "debug",
-            "info",
-            "warn",
-            "error",
-            "critical"
-          ]
-        },
-        "userSessionType": {
-          "description": "Specify which UserSession type to use (when multiple exist)"
-        },
-        "singletonServicesFactoryType": {
-          "description": "Specify which singleton services factory to use"
-        },
-        "sessionServicesFactoryType": {
-          "description": "Specify which session services factory to use"
-        },
-        "stateOutput": {
-          "description": "Save inspector state to JSON file for reuse"
-        },
-        "stateInput": {
-          "description": "Load inspector state from JSON file (skips inspection)"
-        }
-      },
-      "defaultRenderName": "clientCLIRenderer"
-    }
-  },
-  "renderers": {
-    "defaultCLIRenderer": {
-      "name": "defaultCLIRenderer",
-      "exportedName": "defaultCLIRenderer",
-      "services": {
-        "optimized": true,
-        "services": [
-          "logger",
-          "getInspectorState",
-          "schema",
-          "jwt",
-          "config",
-          "variables",
-          "workflowService",
-          "queueService",
-          "schedulerService"
-        ]
-      },
-      "filePath": "/home/runner/work/pikku/pikku/packages/cli/src/services.ts"
-    },
-    "clientCLIRenderer": {
-      "name": "clientCLIRenderer",
-      "exportedName": "clientCLIRenderer",
-      "services": {
-        "optimized": true,
-        "services": []
-      },
-      "filePath": "/home/runner/work/pikku/pikku/packages/cli/src/services.ts"
-    }
-  }
-})
+import { CLIMeta } from '@pikku/core/cli'
+import metaData from './pikku-cli-wirings-meta.gen.json' with { type: 'json' }
+pikkuState(null, 'cli', 'meta', metaData as CLIMeta)

package/.pikku/cli/pikku-cli-wirings.gen.ts

@@ -1,6 +1,6 @@
 /**
- * This file was generated by @pikku/cli@0.11.1
+ * This file was generated by @pikku/cli@0.11.3
  */
 /* The files with an wireCLI function call */
-import '../../src/services.js'
-import '../../src/cli.wiring.js'
+import '../../src/cli.wiring.js'
+import '../../src/services.js'

package/.pikku/cli/pikku-cli.gen.ts

@@ -1,11 +1,11 @@
 /**
- * This file was generated by @pikku/cli@0.11.1
+ * This file was generated by @pikku/cli@0.11.3
  */
 
 import { executeCLI, CLIError } from '@pikku/core/cli'
 import { createConfig as createConfig } from '../../src/services.js'
 import { createSingletonServices as createSingletonServices } from '../../src/services.js'
-import { createSessionServices as createSessionServices } from '../../src/services.js'
+import { createWireServices as createWireServices } from '../../src/services.js'
 import '../pikku-bootstrap.gen.js'
 
 /**
@@ -19,7 +19,7 @@ export async function PikkuCLI(args: string[]): Promise<void> {
       args: args || process.argv.slice(2),
       createConfig,
       createSingletonServices,
-      createSessionServices,
+      createWireServices,
     })
   } catch (error) {
     if (error instanceof CLIError) {