@pikku/cli 0.11.0 → 0.11.2

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

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.11.0
+ * This file was generated by @pikku/cli@0.11.2
  */
 /**
 
@@ -7,9 +7,8 @@
  */
 
 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'
 
 /**
  * Type definition for WebSocket channels with typed data exchange.
@@ -22,9 +21,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 +38,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,8 +53,8 @@ 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
 }
@@ -72,8 +71,8 @@ export const pikkuChannelDisconnectionFunc = (
  */
 export const 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'>
 ) => {
   return typeof func === 'function' ? { func } : func
 }

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

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.11.0
+ * This file was generated by @pikku/cli@0.11.2
  */
 /**
  * This provides the structure needed for TypeScript to be aware of channels
@@ -9,20 +9,20 @@
 
 // Custom types are those that are defined directly within generics
 // or are broken into simpler types
-export type PikkuChannelsOutput = false | true
-export type PikkuCLIOutput = false | true
-export type PikkuFunctionsOutput = false | true
 export type PikkuSchemasOutput = false | true
-export type PikkuHTTPOutput = false | true
-export type PikkuMCPOutput = false | true
+export type PikkuFunctionsOutput = 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
 
 interface ChannelHandler<I, O> {
     input: I;

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

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.11.0
+ * This file was generated by @pikku/cli@0.11.2
  */
 import { pikkuState } from '@pikku/core'
 pikkuState('channel', 'meta', {})

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

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

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

@@ -0,0 +1,92 @@
+/**
+ * This file was generated by @pikku/cli@0.11.2
+ */
+/**
+ * WebSocket channel backend for 'pikku' CLI commands
+ */
+import { wireChannel } from '../channel/pikku-channel-types.gen.js'
+import { pikkuMiddleware } from '../function/pikku-function-types.gen.js'
+import { all } from '../../src/functions/commands/all.js'
+import { bootstrap } from '../../src/functions/commands/bootstrap.js'
+import { watch } from '../../src/functions/commands/watch.js'
+import { pikkuSchemas } from '../../src/functions/wirings/functions/schemas.js'
+import { pikkuFetch } from '../../src/functions/wirings/fetch/index.js'
+import { pikkuWebSocketTyped } from '../../src/functions/wirings/channels/pikku-command-websocket-typed.js'
+import { pikkuRPCClient } from '../../src/functions/wirings/rpc/pikku-command-rpc-client.js'
+import { pikkuQueueService } from '../../src/functions/wirings/queue/pikku-command-queue-service.js'
+import { pikkuOpenAPI } from '../../src/functions/wirings/http/pikku-command-openapi.js'
+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 closeChannel = () => {
+    setTimeout(async () => {
+      try {
+        // This gives time for the response to be sent before closing
+        await channel?.close()
+      } catch (err) {
+        // Ignore errors on close
+      }
+    }, 200)
+  }
+  
+  try {
+    const result = await next()
+    closeChannel()
+    return result
+  } catch (error) {
+    closeChannel()
+    throw error
+  }
+})
+
+wireChannel({
+  name: 'pikku-cli',
+  route: '/cli/pikku',
+  auth: false,
+  onMessageWiring: {
+    command: {
+      'all': {
+        func: all,
+        middleware: [cliCloseOnComplete],
+      },
+      'bootstrap': {
+        func: bootstrap,
+        middleware: [cliCloseOnComplete],
+      },
+      'watch': {
+        func: watch,
+        middleware: [cliCloseOnComplete],
+      },
+      'schemas': {
+        func: pikkuSchemas,
+        middleware: [cliCloseOnComplete],
+      },
+      'fetch': {
+        func: pikkuFetch,
+        middleware: [cliCloseOnComplete],
+      },
+      'websocket': {
+        func: pikkuWebSocketTyped,
+        middleware: [cliCloseOnComplete],
+      },
+      'rpc': {
+        func: pikkuRPCClient,
+        middleware: [cliCloseOnComplete],
+      },
+      'queue-service': {
+        func: pikkuQueueService,
+        middleware: [cliCloseOnComplete],
+      },
+      'openapi': {
+        func: pikkuOpenAPI,
+        middleware: [cliCloseOnComplete],
+      },
+      'nextjs': {
+        func: pikkuNext,
+        middleware: [cliCloseOnComplete],
+      }
+    }
+  },
+  tags: ['cli', 'pikku']
+})

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

@@ -0,0 +1,54 @@
+/**
+ * This file was generated by @pikku/cli@0.11.2
+ */
+
+import { executeCLIViaChannel } from '@pikku/core/cli/channel'
+import { CorePikkuWebsocket } from '@pikku/websocket'
+import '../pikku-bootstrap.gen.js'
+
+/**
+ * Pikku CLI Client (via WebSocket Channel)
+ * Executes CLI commands over a WebSocket connection
+ */
+export async function PikkuCLIClient(
+  ws: WebSocket,
+  args?: string[]
+): Promise<void> {
+  // Create Pikku WebSocket wrapper
+  const pikkuWS = new CorePikkuWebsocket(ws)
+
+  // Register renderers for CLI commands
+  const renderers = {}
+
+  await executeCLIViaChannel({
+    programName: 'pikku',
+    pikkuWS,
+    args,
+    renderers,
+  })
+}
+
+// Export as default for easy importing
+export default PikkuCLIClient
+
+// For direct execution (if this file is run directly)
+if (import.meta.url === `file://${process.argv[1]}`) {
+  const url = process.env.PIKKU_WS_URL || 'ws://localhost:4002/cli/pikku'
+
+  // Create WebSocket instance
+  let WebSocketImpl: any
+  if (typeof WebSocket !== 'undefined') {
+    WebSocketImpl = WebSocket
+  } else {
+    // Node.js environment - dynamically import 'ws'
+    const wsModule = await import('ws')
+    WebSocketImpl = wsModule.default
+  }
+
+  const ws = new WebSocketImpl(url) as WebSocket
+  PikkuCLIClient(ws, process.argv.slice(2)).catch(error => {
+    console.error('Fatal channel CLI error:', error)
+    // TODO: We get an error code even when it exists cleanly, investigate
+    // process.exit(1)
+  })
+}

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

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.11.0
+ * This file was generated by @pikku/cli@0.11.2
  */
 /**
 
@@ -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,146 @@
+{
+  "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",
+          "workflowService",
+          "queueService",
+          "schedulerService"
+        ]
+      },
+      "filePath": "src/services.ts"
+    }
+  }
+}

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

@@ -1,37 +1,7 @@
 /**
- * This file was generated by @pikku/cli@0.11.0
+ * This file was generated by @pikku/cli@0.11.2
  */
 import { pikkuState } from '@pikku/core'
-pikkuState('cli', 'meta', {
-  "programs": {},
-  "renderers": {
-    "defaultCLIRenderer": {
-      "name": "defaultCLIRenderer",
-      "exportedName": "defaultCLIRenderer",
-      "services": {
-        "optimized": true,
-        "services": [
-          "logger",
-          "getInspectorState",
-          "schema",
-          "jwt",
-          "config",
-          "variables",
-          "workflowService",
-          "queueService",
-          "schedulerService"
-        ]
-      },
-      "filePath": "src/services.ts"
-    },
-    "clientCLIRenderer": {
-      "name": "clientCLIRenderer",
-      "exportedName": "clientCLIRenderer",
-      "services": {
-        "optimized": true,
-        "services": []
-      },
-      "filePath": "src/services.ts"
-    }
-  }
-})
+import { CLIMeta } from '@pikku/core/cli'
+import metaData from './pikku-cli-wirings-meta.gen.json' with { type: 'json' }
+pikkuState('cli', 'meta', metaData as CLIMeta)

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

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

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

@@ -0,0 +1,41 @@
+/**
+ * This file was generated by @pikku/cli@0.11.2
+ */
+
+import { executeCLI, CLIError } from '@pikku/core/cli'
+import { createConfig as createConfig } from '../../src/services.js'
+import { createSingletonServices as createSingletonServices } from '../../src/services.js'
+import { createWireServices as createWireServices } from '../../src/services.js'
+import '../pikku-bootstrap.gen.js'
+
+/**
+ * Pikku CLI function
+ * Handles command line arguments and executes the appropriate function
+ */
+export async function PikkuCLI(args: string[]): Promise<void> {
+  try {
+    await executeCLI({
+      programName: 'pikku',
+      args: args || process.argv.slice(2),
+      createConfig,
+      createSingletonServices,
+      createWireServices,
+    })
+  } catch (error) {
+    if (error instanceof CLIError) {
+      process.exit(error.exitCode)
+    }
+    throw error
+  }
+}
+
+// Export as default for easy importing
+export default PikkuCLI
+
+// For direct execution (if this file is run directly)
+if (import.meta.url === `file://${process.argv[1]}`) {
+  PikkuCLI(process.argv.slice(2)).catch(error => {
+    console.error('Fatal error:', error.message)
+    process.exit(1)
+  })
+}