@pikku/cli 0.9.1 → 0.9.2

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @pikku/cli
 
+## 0.9.2
+
+### Patch Changes
+
+- 1256238: feat: pikkufunc in types extends function config to include all the different params
+- d3a9a09: refactor: change addMiddleware to addHTTPMiddleware due to route support'
+
+  chore: export addHTTPMiddleware from pikku-types for consistency
+
+- 840e078: refactor: change APIMiddleware type to PikkuMiddleware
+- a5905a9: chore: updating all dependencies
+- Updated dependencies [1256238]
+- Updated dependencies [6cf8efd]
+- Updated dependencies [d3a9a09]
+- Updated dependencies [840e078]
+- Updated dependencies [667d23c]
+- Updated dependencies [a5905a9]
+  - @pikku/core@0.9.2
+  - @pikku/inspector@0.9.2
+
 ## 0.9.1
 
 ### Patch Changes

package/bin/pikku-all.ts

@@ -319,13 +319,13 @@ export const all = (program: Command): void => {
   program
     .command('all', { isDefault: true })
     .description('Generate all the files used by pikku')
-    .option('-ct | --pikku-config-type', 'The type of your pikku config object')
+    .option('--pikku-config-type', 'The type of your pikku config object')
     .option(
-      '-ss | --singleton-services-factory-type',
+      '--singleton-services-factory-type',
       'The type of your singleton services factory'
     )
     .option(
-      '-se | --session-services-factory-type',
+      '--session-services-factory-type',
       'The type of your session services factory'
     )
     .option('-c | --config <string>', 'The path to pikku cli config file')

package/bin/pikku-nextjs.ts

@@ -30,13 +30,13 @@ export const nextjs = (program: Command): void => {
   program
     .command('nextjs')
     .description('generate nextjs wrapper')
-    .option('-ct | --pikku-config-type', 'The type of your pikku config object')
+    .option('--pikku-config-type', 'The type of your pikku config object')
     .option(
-      '-ss | --singleton-services-factory-type',
+      '--singleton-services-factory-type',
       'The type of your singleton services factory'
     )
     .option(
-      '-se | --session-services-factory-type',
+      '--session-services-factory-type',
       'The type of your session services factory'
     )
     .option('-c | --config <string>', 'The path to pikku cli config file')

package/dist/bin/pikku-all.js

@@ -177,9 +177,9 @@ export const all = (program) => {
     program
         .command('all', { isDefault: true })
         .description('Generate all the files used by pikku')
-        .option('-ct | --pikku-config-type', 'The type of your pikku config object')
-        .option('-ss | --singleton-services-factory-type', 'The type of your singleton services factory')
-        .option('-se | --session-services-factory-type', 'The type of your session services factory')
+        .option('--pikku-config-type', 'The type of your pikku config object')
+        .option('--singleton-services-factory-type', 'The type of your singleton services factory')
+        .option('--session-services-factory-type', 'The type of your session services factory')
         .option('-c | --config <string>', 'The path to pikku cli config file')
         .option('-t | --tags <tags...>', 'Which tags to filter by')
         .option('--types <types...>', 'Which types to filter by (http, channel, queue, scheduler, rpc, mcp)')

package/dist/bin/pikku-nextjs.js

@@ -16,9 +16,9 @@ export const nextjs = (program) => {
     program
         .command('nextjs')
         .description('generate nextjs wrapper')
-        .option('-ct | --pikku-config-type', 'The type of your pikku config object')
-        .option('-ss | --singleton-services-factory-type', 'The type of your singleton services factory')
-        .option('-se | --session-services-factory-type', 'The type of your session services factory')
+        .option('--pikku-config-type', 'The type of your pikku config object')
+        .option('--singleton-services-factory-type', 'The type of your singleton services factory')
+        .option('--session-services-factory-type', 'The type of your session services factory')
         .option('-c | --config <string>', 'The path to pikku cli config file')
         .action(action);
 };

package/dist/src/serialize-pikku-types.js

@@ -6,7 +6,7 @@ export const serializePikkuTypes = (userSessionTypeImport, userSessionTypeName,
 * This is used to provide the application types in the typescript project
 */
   
-import { CorePikkuPermission, PikkuMiddleware } from '@pikku/core'
+import { CorePikkuFunctionConfig, CorePikkuPermission, CorePikkuMiddleware, addHTTPMiddleware } from '@pikku/core'
 import { CorePikkuFunction, CorePikkuFunctionSessionless } from '@pikku/core/function'
 import { CoreHTTPFunctionWiring, AssertHTTPWiringParams, wireHTTP as wireHTTPCore } from '@pikku/core/http'
 import { CoreScheduledTask, wireScheduler as wireSchedulerCore } from '@pikku/core/scheduler'
@@ -34,7 +34,7 @@ export type PikkuPermission<In = unknown, RequiredServices extends ${singletonSe
  * 
  * @template RequiredServices - The services required for this middleware
  */
-export type APIMiddleware<RequiredServices extends ${singletonServicesTypeName} = ${singletonServicesTypeName}> = PikkuMiddleware<RequiredServices, ${userSessionTypeName}>
+export type PikkuMiddleware<RequiredServices extends ${singletonServicesTypeName} = ${singletonServicesTypeName}> = CorePikkuMiddleware<RequiredServices, ${userSessionTypeName}>
 
 /**
  * A sessionless API function that doesn't require user authentication.
@@ -96,7 +96,7 @@ type PikkuFunction<
  * @template Out - Output type for the HTTP wiring
  * @template Route - String literal type for the HTTP path (e.g., "/users/:id")
  */
-type HTTPWiring<In, Out, Route extends string> = CoreHTTPFunctionWiring<In, Out, Route, PikkuFunction<In, Out>, PikkuFunctionSessionless<In, Out>, PikkuPermission<In>, APIMiddleware>
+type HTTPWiring<In, Out, Route extends string> = CoreHTTPFunctionWiring<In, Out, Route, PikkuFunction<In, Out>, PikkuFunctionSessionless<In, Out>, PikkuPermission<In>, PikkuMiddleware>
 
 /**
  * Type definition for WebSocket channels with typed data exchange.
@@ -166,16 +166,7 @@ type MCPPromptWiring<In> = CoreMCPPrompt<PikkuFunctionSessionless<In, MCPPromptR
 export const pikkuFunc = <In, Out = unknown>(
   func:
     | PikkuFunction<In, Out>
-    | {
-        func: PikkuFunction<In, Out>
-        auth?: true
-        name?: string
-      }
-    | {
-        func: PikkuFunctionSessionless<In, Out>
-        auth: false
-        name?: string
-      }
+    | CorePikkuFunctionConfig<PikkuFunction<In, Out>, PikkuPermission<In>>
 ) => {
   return typeof func === 'function' ? func : func.func
 }
@@ -203,10 +194,7 @@ export const pikkuFunc = <In, Out = unknown>(
 export const pikkuSessionlessFunc = <In, Out = unknown>(
   func:
     | PikkuFunctionSessionless<In, Out>
-    | {
-        func: PikkuFunctionSessionless<In, Out>
-        name?: string
-      }
+    | CorePikkuFunctionConfig<PikkuFunctionSessionless<In, Out>, PikkuPermission<In>>
 ) => {
   return typeof func === 'function' ? func : func.func
 }
@@ -293,10 +281,7 @@ export const pikkuChannelDisconnectionFunc = <ChannelData = unknown>(
 export const pikkuChannelFunc = <In = unknown, Out = unknown, ChannelData = unknown>(
   func:
     | PikkuFunctionSessionless<In, Out, ChannelData>
-    | {
-        func: PikkuFunctionSessionless<In, Out, ChannelData>
-        name?: string
-      }
+    | CorePikkuFunctionConfig<PikkuFunction<In, Out, ChannelData>, PikkuPermission<In>>
 ) => {
   return typeof func === 'function' ? func : func.func
 }
@@ -320,10 +305,7 @@ export const pikkuChannelFunc = <In = unknown, Out = unknown, ChannelData = unkn
 export const pikkuVoidFunc = (
   func:
     | PikkuFunctionSessionless<void, void>
-    | {
-        func: PikkuFunctionSessionless<void, void>
-        name?: string
-      }
+    | CorePikkuFunctionConfig<PikkuFunction<void, void>, PikkuPermission<void>>
 ) => {
   return typeof func === 'function' ? func : func.func
 }
@@ -341,6 +323,27 @@ export const wireChannel = <ChannelData, Channel extends string>(
   wireChannelCore(channel as any) // TODO
 }
 
+/**
+ * Registers middleware either globally or for a specific route.
+ * 
+ * When a string route pattern is provided along with middleware, the middleware
+ * is applied only to that route. Otherwise, if an array is provided, it is treated
+ * as global middleware (applied to all routes).
+ * 
+ * @param routeOrMiddleware - Either a global middleware array or a route pattern string
+ * @param middleware - The middleware array to apply when a route pattern is specified
+ * 
+ * @example
+ * \`\`\`typescript
+ * // Add global middleware
+ * addHTTPMiddleware([authMiddleware, loggingMiddleware])
+ * 
+ * // Add route-specific middleware
+ * addHTTPMiddleware('/api/admin/*', [adminAuthMiddleware])
+ * \`\`\`
+ */
+export { addHTTPMiddleware }
+
 /**
  * Registers an HTTP wiring with the Pikku framework.
  * 

package/dist/src/wirings/rpc/pikku-command-rpc-client.js

@@ -2,7 +2,7 @@ import { serializeRPCWrapper } from './serialize-rpc-wrapper.js';
 import { getFileImportRelativePath, logCommandInfoAndTime, writeFileInDir, } from '../../utils.js';
 export const pikkuRPCClient = async (logger, { rpcWiringsFile, rpcMapDeclarationFile, packageMappings }) => {
     return await logCommandInfoAndTime(logger, 'Generating RPC wrapper', 'Generated RPC wrapper', [
-        rpcWiringsFile === undefined,
+        rpcWiringsFile === undefined || rpcWiringsFile === null,
         "rpcWiringsFile isn't set in the pikku config",
     ], async () => {
         if (!rpcWiringsFile) {

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../bin/pikku-all.ts","../bin/pikku-fetch.ts","../bin/pikku-nextjs.ts","../bin/pikku-openapi.ts","../bin/pikku-queue-service.ts","../bin/pikku-schemas.ts","../bin/pikku-websocket.ts","../bin/pikku.ts","../src/inspector-glob.ts","../src/pikku-cli-config.ts","../src/pikku-command-schemas.ts","../src/schema-generator.ts","../src/schemas.ts","../src/serialize-import-map.ts","../src/serialize-pikku-types.ts","../src/types.ts","../src/utils.ts","../src/runtimes/nextjs/pikku-command-nextjs.ts","../src/runtimes/nextjs/serialize-nextjs-backend-wrapper.ts","../src/runtimes/nextjs/serialize-nextjs-http-wrapper.ts","../src/wirings/channels/pikku-channels.ts","../src/wirings/channels/pikku-command-channels-map.ts","../src/wirings/channels/pikku-command-channels.ts","../src/wirings/channels/pikku-command-websocket-typed.ts","../src/wirings/channels/serialize-typed-channel-map.ts","../src/wirings/channels/serialize-websocket-wrapper.ts","../src/wirings/fetch/index.ts","../src/wirings/functions/pikku-command-function-types.ts","../src/wirings/functions/pikku-command-functions.ts","../src/wirings/functions/pikku-command-services.ts","../src/wirings/functions/pikku-function-types.ts","../src/wirings/functions/pikku-functions.ts","../src/wirings/http/openapi-spec-generator.ts","../src/wirings/http/pikku-command-http-map.ts","../src/wirings/http/pikku-command-http-routes.ts","../src/wirings/http/pikku-command-openapi.ts","../src/wirings/http/pikku-http-routes.ts","../src/wirings/http/serialize-fetch-wrapper.ts","../src/wirings/http/serialize-typed-http-map.ts","../src/wirings/mcp/pikku-command-mcp-json.ts","../src/wirings/mcp/pikku-command-mcp.ts","../src/wirings/mcp/serialize-mcp-json.ts","../src/wirings/queue/pikku-command-queue-map.ts","../src/wirings/queue/pikku-command-queue-service.ts","../src/wirings/queue/pikku-command-queue.ts","../src/wirings/queue/pikku-queue-map.ts","../src/wirings/queue/pikku-queue.ts","../src/wirings/queue/serialize-queue-map.ts","../src/wirings/queue/serialize-queue-meta.ts","../src/wirings/queue/serialize-queue-wrapper.ts","../src/wirings/rpc/pikku-command-rpc-client.ts","../src/wirings/rpc/pikku-command-rpc-map.ts","../src/wirings/rpc/pikku-command-rpc.ts","../src/wirings/rpc/pikku-rpc.ts","../src/wirings/rpc/serialize-rpc-wrapper.ts","../src/wirings/rpc/serialize-typed-rpc-map.ts","../src/wirings/scheduler/pikku-command-scheduler.ts","../src/wirings/scheduler/serialize-scheduler-meta.ts"],"version":"5.8.3"}
+{"root":["../bin/pikku-all.ts","../bin/pikku-fetch.ts","../bin/pikku-nextjs.ts","../bin/pikku-openapi.ts","../bin/pikku-queue-service.ts","../bin/pikku-schemas.ts","../bin/pikku-websocket.ts","../bin/pikku.ts","../src/inspector-glob.ts","../src/pikku-cli-config.ts","../src/pikku-command-schemas.ts","../src/schema-generator.ts","../src/schemas.ts","../src/serialize-import-map.ts","../src/serialize-pikku-types.ts","../src/types.ts","../src/utils.ts","../src/runtimes/nextjs/pikku-command-nextjs.ts","../src/runtimes/nextjs/serialize-nextjs-backend-wrapper.ts","../src/runtimes/nextjs/serialize-nextjs-http-wrapper.ts","../src/wirings/channels/pikku-channels.ts","../src/wirings/channels/pikku-command-channels-map.ts","../src/wirings/channels/pikku-command-channels.ts","../src/wirings/channels/pikku-command-websocket-typed.ts","../src/wirings/channels/serialize-typed-channel-map.ts","../src/wirings/channels/serialize-websocket-wrapper.ts","../src/wirings/fetch/index.ts","../src/wirings/functions/pikku-command-function-types.ts","../src/wirings/functions/pikku-command-functions.ts","../src/wirings/functions/pikku-command-services.ts","../src/wirings/functions/pikku-function-types.ts","../src/wirings/functions/pikku-functions.ts","../src/wirings/http/openapi-spec-generator.ts","../src/wirings/http/pikku-command-http-map.ts","../src/wirings/http/pikku-command-http-routes.ts","../src/wirings/http/pikku-command-openapi.ts","../src/wirings/http/pikku-http-routes.ts","../src/wirings/http/serialize-fetch-wrapper.ts","../src/wirings/http/serialize-typed-http-map.ts","../src/wirings/mcp/pikku-command-mcp-json.ts","../src/wirings/mcp/pikku-command-mcp.ts","../src/wirings/mcp/serialize-mcp-json.ts","../src/wirings/queue/pikku-command-queue-map.ts","../src/wirings/queue/pikku-command-queue-service.ts","../src/wirings/queue/pikku-command-queue.ts","../src/wirings/queue/pikku-queue-map.ts","../src/wirings/queue/pikku-queue.ts","../src/wirings/queue/serialize-queue-map.ts","../src/wirings/queue/serialize-queue-meta.ts","../src/wirings/queue/serialize-queue-wrapper.ts","../src/wirings/rpc/pikku-command-rpc-client.ts","../src/wirings/rpc/pikku-command-rpc-map.ts","../src/wirings/rpc/pikku-command-rpc.ts","../src/wirings/rpc/pikku-rpc.ts","../src/wirings/rpc/serialize-rpc-wrapper.ts","../src/wirings/rpc/serialize-typed-rpc-map.ts","../src/wirings/scheduler/pikku-command-scheduler.ts","../src/wirings/scheduler/serialize-scheduler-meta.ts"],"version":"5.9.2"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikku/cli",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "author": "yasser.fadl@gmail.com",
   "license": "MIT",
   "bin": {
@@ -21,22 +21,22 @@
     "test:coverage": "bash run-tests.sh --coverage"
   },
   "dependencies": {
-    "@openapi-contrib/json-schema-to-openapi-schema": "^3.0.2",
-    "@pikku/core": "^0.9.1",
-    "@pikku/inspector": "^0.9.1",
-    "@types/cookie": "^0.6.0",
+    "@openapi-contrib/json-schema-to-openapi-schema": "^4.0.2",
+    "@pikku/core": "^0.9.2",
+    "@pikku/inspector": "^0.9.2",
+    "@types/cookie": "^1.0.0",
     "@types/uuid": "^10.0.0",
-    "chalk": "^5.4.1",
+    "chalk": "^5.5.0",
     "chokidar": "^4.0.3",
-    "commander": "^12",
+    "commander": "^14",
     "path-to-regexp": "^8.2.0",
     "tinyglobby": "^0.2.12",
-    "ts-json-schema-generator": "^2.3.0",
-    "typescript": "^5.6",
-    "yaml": "^2.6.0"
+    "ts-json-schema-generator": "^2.4.0",
+    "typescript": "^5.9",
+    "yaml": "^2.8.1"
   },
   "devDependencies": {
-    "@types/node": "^22.7.8"
+    "@types/node": "^24.2.1"
   },
   "engines": {
     "node": ">=18"

package/src/serialize-pikku-types.ts

@@ -13,7 +13,7 @@ export const serializePikkuTypes = (
 * This is used to provide the application types in the typescript project
 */
   
-import { CorePikkuPermission, PikkuMiddleware } from '@pikku/core'
+import { CorePikkuFunctionConfig, CorePikkuPermission, CorePikkuMiddleware, addHTTPMiddleware } from '@pikku/core'
 import { CorePikkuFunction, CorePikkuFunctionSessionless } from '@pikku/core/function'
 import { CoreHTTPFunctionWiring, AssertHTTPWiringParams, wireHTTP as wireHTTPCore } from '@pikku/core/http'
 import { CoreScheduledTask, wireScheduler as wireSchedulerCore } from '@pikku/core/scheduler'
@@ -41,7 +41,7 @@ export type PikkuPermission<In = unknown, RequiredServices extends ${singletonSe
  * 
  * @template RequiredServices - The services required for this middleware
  */
-export type APIMiddleware<RequiredServices extends ${singletonServicesTypeName} = ${singletonServicesTypeName}> = PikkuMiddleware<RequiredServices, ${userSessionTypeName}>
+export type PikkuMiddleware<RequiredServices extends ${singletonServicesTypeName} = ${singletonServicesTypeName}> = CorePikkuMiddleware<RequiredServices, ${userSessionTypeName}>
 
 /**
  * A sessionless API function that doesn't require user authentication.
@@ -103,7 +103,7 @@ type PikkuFunction<
  * @template Out - Output type for the HTTP wiring
  * @template Route - String literal type for the HTTP path (e.g., "/users/:id")
  */
-type HTTPWiring<In, Out, Route extends string> = CoreHTTPFunctionWiring<In, Out, Route, PikkuFunction<In, Out>, PikkuFunctionSessionless<In, Out>, PikkuPermission<In>, APIMiddleware>
+type HTTPWiring<In, Out, Route extends string> = CoreHTTPFunctionWiring<In, Out, Route, PikkuFunction<In, Out>, PikkuFunctionSessionless<In, Out>, PikkuPermission<In>, PikkuMiddleware>
 
 /**
  * Type definition for WebSocket channels with typed data exchange.
@@ -173,16 +173,7 @@ type MCPPromptWiring<In> = CoreMCPPrompt<PikkuFunctionSessionless<In, MCPPromptR
 export const pikkuFunc = <In, Out = unknown>(
   func:
     | PikkuFunction<In, Out>
-    | {
-        func: PikkuFunction<In, Out>
-        auth?: true
-        name?: string
-      }
-    | {
-        func: PikkuFunctionSessionless<In, Out>
-        auth: false
-        name?: string
-      }
+    | CorePikkuFunctionConfig<PikkuFunction<In, Out>, PikkuPermission<In>>
 ) => {
   return typeof func === 'function' ? func : func.func
 }
@@ -210,10 +201,7 @@ export const pikkuFunc = <In, Out = unknown>(
 export const pikkuSessionlessFunc = <In, Out = unknown>(
   func:
     | PikkuFunctionSessionless<In, Out>
-    | {
-        func: PikkuFunctionSessionless<In, Out>
-        name?: string
-      }
+    | CorePikkuFunctionConfig<PikkuFunctionSessionless<In, Out>, PikkuPermission<In>>
 ) => {
   return typeof func === 'function' ? func : func.func
 }
@@ -300,10 +288,7 @@ export const pikkuChannelDisconnectionFunc = <ChannelData = unknown>(
 export const pikkuChannelFunc = <In = unknown, Out = unknown, ChannelData = unknown>(
   func:
     | PikkuFunctionSessionless<In, Out, ChannelData>
-    | {
-        func: PikkuFunctionSessionless<In, Out, ChannelData>
-        name?: string
-      }
+    | CorePikkuFunctionConfig<PikkuFunction<In, Out, ChannelData>, PikkuPermission<In>>
 ) => {
   return typeof func === 'function' ? func : func.func
 }
@@ -327,10 +312,7 @@ export const pikkuChannelFunc = <In = unknown, Out = unknown, ChannelData = unkn
 export const pikkuVoidFunc = (
   func:
     | PikkuFunctionSessionless<void, void>
-    | {
-        func: PikkuFunctionSessionless<void, void>
-        name?: string
-      }
+    | CorePikkuFunctionConfig<PikkuFunction<void, void>, PikkuPermission<void>>
 ) => {
   return typeof func === 'function' ? func : func.func
 }
@@ -348,6 +330,27 @@ export const wireChannel = <ChannelData, Channel extends string>(
   wireChannelCore(channel as any) // TODO
 }
 
+/**
+ * Registers middleware either globally or for a specific route.
+ * 
+ * When a string route pattern is provided along with middleware, the middleware
+ * is applied only to that route. Otherwise, if an array is provided, it is treated
+ * as global middleware (applied to all routes).
+ * 
+ * @param routeOrMiddleware - Either a global middleware array or a route pattern string
+ * @param middleware - The middleware array to apply when a route pattern is specified
+ * 
+ * @example
+ * \`\`\`typescript
+ * // Add global middleware
+ * addHTTPMiddleware([authMiddleware, loggingMiddleware])
+ * 
+ * // Add route-specific middleware
+ * addHTTPMiddleware('/api/admin/*', [adminAuthMiddleware])
+ * \`\`\`
+ */
+export { addHTTPMiddleware }
+
 /**
  * Registers an HTTP wiring with the Pikku framework.
  * 

package/src/wirings/rpc/pikku-command-rpc-client.ts

@@ -15,7 +15,7 @@ export const pikkuRPCClient: PikkuCommandWithoutState = async (
     'Generating RPC wrapper',
     'Generated RPC wrapper',
     [
-      rpcWiringsFile === undefined,
+      rpcWiringsFile === undefined || rpcWiringsFile === null,
       "rpcWiringsFile isn't set in the pikku config",
     ],
     async () => {