@pikku/cli 0.9.12 → 0.9.14

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @pikku/cli
 
+## 0.9.14
+
+### Patch Changes
+
+- 798d52c: refactor: move all rpc generated info into rpc and removing rpc-internal
+
+## 0.9.13
+
+### Patch Changes
+
+- ccd2a45: fix: adding functions should always be using func config and not pure functions
+
 ## 0.9.12
 
 ### Patch Changes

package/cli.schema.json

@@ -39,7 +39,9 @@
               "type": "string"
             }
           },
-          "required": ["url"],
+          "required": [
+            "url"
+          ],
           "type": "object"
         },
         "info": {
@@ -73,7 +75,9 @@
                   "type": "string"
                 }
               },
-              "required": ["name"],
+              "required": [
+                "name"
+              ],
               "type": "object"
             },
             "termsOfService": {
@@ -86,7 +90,11 @@
               "type": "string"
             }
           },
-          "required": ["title", "version", "description"],
+          "required": [
+            "title",
+            "version",
+            "description"
+          ],
           "type": "object"
         },
         "security": {
@@ -113,7 +121,9 @@
                 "type": "string"
               }
             },
-            "required": ["url"],
+            "required": [
+              "url"
+            ],
             "type": "object"
           },
           "type": "array"
@@ -129,13 +139,18 @@
                 "type": "string"
               }
             },
-            "required": ["name"],
+            "required": [
+              "name"
+            ],
             "type": "object"
           },
           "type": "array"
         }
       },
-      "required": ["info", "servers"],
+      "required": [
+        "info",
+        "servers"
+      ],
       "type": "object"
     },
     "PikkuCLIConfig": {
@@ -169,7 +184,14 @@
               "type": "string"
             }
           },
-          "required": ["http", "scheduler", "channel", "rpc", "queue", "mcp"],
+          "required": [
+            "http",
+            "scheduler",
+            "channel",
+            "rpc",
+            "queue",
+            "mcp"
+          ],
           "type": "object"
         },
         "channelsMapDeclarationFile": {
@@ -242,7 +264,10 @@
               "type": "string"
             }
           },
-          "required": ["outputFile", "additionalInfo"],
+          "required": [
+            "outputFile",
+            "additionalInfo"
+          ],
           "type": "object"
         },
         "outDir": {
@@ -354,4 +379,4 @@
       "type": "object"
     }
   }
-}
+}

package/dist/src/pikku-cli-config.js

@@ -61,8 +61,7 @@ const _getPikkuCLIConfig = async (configFile = undefined, requiredFields, filter
             const functionDir = join(result.outDir, 'function');
             const httpDir = join(result.outDir, 'http');
             const channelDir = join(result.outDir, 'channel');
-            const internalRPCDirectory = join(result.outDir, 'rpc-internal');
-            const externalRPCDirectory = join(result.outDir, 'rpc');
+            const rpcDir = join(result.outDir, 'rpc');
             const schedulerDir = join(result.outDir, 'scheduler');
             const queueDir = join(result.outDir, 'queue');
             const mcpDir = join(result.outDir, 'mcp');
@@ -103,16 +102,15 @@ const _getPikkuCLIConfig = async (configFile = undefined, requiredFields, filter
             if (!result.channelsMapDeclarationFile) {
                 result.channelsMapDeclarationFile = join(channelDir, 'pikku-channels-map.gen.d.ts');
             }
-            // Internal
+            // RPC (internal and exposed)
             if (!result.rpcInternalWiringMetaFile) {
-                result.rpcInternalWiringMetaFile = join(internalRPCDirectory, 'pikku-rpc-wirings-meta.internal.gen.ts');
+                result.rpcInternalWiringMetaFile = join(rpcDir, 'pikku-rpc-wirings-meta.internal.gen.ts');
             }
             if (!result.rpcInternalMapDeclarationFile) {
-                result.rpcInternalMapDeclarationFile = join(internalRPCDirectory, 'pikku-rpc-wirings-map.internal.gen.d.ts');
+                result.rpcInternalMapDeclarationFile = join(rpcDir, 'pikku-rpc-wirings-map.internal.gen.d.ts');
             }
-            // External
             if (!result.rpcMapDeclarationFile) {
-                result.rpcMapDeclarationFile = join(externalRPCDirectory, 'pikku-rpc-wirings-map.gen.d.ts');
+                result.rpcMapDeclarationFile = join(rpcDir, 'pikku-rpc-wirings-map.gen.d.ts');
             }
             // Scheduler
             if (!result.schedulersWiringFile) {

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

@@ -204,7 +204,7 @@ export const pikkuFunc = <In, Out = unknown>(
     | PikkuFunction<In, Out>
     | CorePikkuFunctionConfig<PikkuFunction<In, Out>, PikkuPermission<In>>
 ) => {
-  return typeof func === 'function' ? func : func.func
+  return typeof func === 'function' ? { func } : func
 }
 
 /**
@@ -232,7 +232,7 @@ export const pikkuSessionlessFunc = <In, Out = unknown>(
     | PikkuFunctionSessionless<In, Out>
     | CorePikkuFunctionConfig<PikkuFunctionSessionless<In, Out>, PikkuPermission<In>, PikkuMiddleware>
 ) => {
-  return typeof func === 'function' ? func : func.func
+  return typeof func === 'function' ? { func } : func
 }
 
 /**
@@ -263,7 +263,7 @@ export const pikkuChannelConnectionFunc = <Out = unknown, ChannelData = unknown>
         name?: string
       }
 ) => {
-  return typeof func === 'function' ? func : func.func
+  return typeof func === 'function' ? { func } : func
 }
 
 /**
@@ -292,7 +292,7 @@ export const pikkuChannelDisconnectionFunc = <ChannelData = unknown>(
         name?: string
       }
 ) => {
-  return typeof func === 'function' ? func : func.func
+  return typeof func === 'function' ? { func } : func
 }
 
 /**
@@ -319,7 +319,7 @@ export const pikkuChannelFunc = <In = unknown, Out = unknown, ChannelData = unkn
     | PikkuFunctionSessionless<In, Out, ChannelData>
     | CorePikkuFunctionConfig<PikkuFunction<In, Out, ChannelData>, PikkuPermission<In>>
 ) => {
-  return typeof func === 'function' ? func : func.func
+  return typeof func === 'function' ? { func } : func
 }
 
 /**
@@ -343,7 +343,7 @@ export const pikkuVoidFunc = (
     | PikkuFunctionSessionless<void, void>
     | CorePikkuFunctionConfig<PikkuFunctionSessionless<void, void>, PikkuPermission<void>>
 ) => {
-  return typeof func === 'function' ? func : func.func
+  return typeof func === 'function' ? { func } : func
 }
    
 /**
@@ -534,7 +534,7 @@ export const pikkuMCPPromptFunc = <In>(
         name?: string
       }
 ) => {
-  return typeof func === 'function' ? func : func.func
+  return typeof func === 'function' ? { func } : func
 }
 
 /**
@@ -566,7 +566,7 @@ export const pikkuMCPToolFunc = <In>(
       name?: string
     }
 ) => {
-  return typeof func === 'function' ? func : func.func
+  return typeof func === 'function' ? { func } : func
 }
 
 /**
@@ -599,7 +599,7 @@ export const pikkuMCPResourceFunc = <In>(
       name?: string
     }
 ) => {
-  return typeof func === 'function' ? func : func.func
+  return typeof func === 'function' ? { func } : func
 }
 `;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikku/cli",
-  "version": "0.9.12",
+  "version": "0.9.14",
   "author": "yasser.fadl@gmail.com",
   "license": "MIT",
   "bin": {

package/src/pikku-cli-config.ts

@@ -172,8 +172,7 @@ const _getPikkuCLIConfig = async (
       const functionDir = join(result.outDir, 'function')
       const httpDir = join(result.outDir, 'http')
       const channelDir = join(result.outDir, 'channel')
-      const internalRPCDirectory = join(result.outDir, 'rpc-internal')
-      const externalRPCDirectory = join(result.outDir, 'rpc')
+      const rpcDir = join(result.outDir, 'rpc')
       const schedulerDir = join(result.outDir, 'scheduler')
       const queueDir = join(result.outDir, 'queue')
       const mcpDir = join(result.outDir, 'mcp')
@@ -238,25 +237,24 @@ const _getPikkuCLIConfig = async (
         )
       }
 
-      // Internal
+      // RPC (internal and exposed)
       if (!result.rpcInternalWiringMetaFile) {
         result.rpcInternalWiringMetaFile = join(
-          internalRPCDirectory,
+          rpcDir,
           'pikku-rpc-wirings-meta.internal.gen.ts'
         )
       }
 
       if (!result.rpcInternalMapDeclarationFile) {
         result.rpcInternalMapDeclarationFile = join(
-          internalRPCDirectory,
+          rpcDir,
           'pikku-rpc-wirings-map.internal.gen.d.ts'
         )
       }
 
-      // External
       if (!result.rpcMapDeclarationFile) {
         result.rpcMapDeclarationFile = join(
-          externalRPCDirectory,
+          rpcDir,
           'pikku-rpc-wirings-map.gen.d.ts'
         )
       }

package/src/serialize-pikku-types.ts

@@ -212,7 +212,7 @@ export const pikkuFunc = <In, Out = unknown>(
     | PikkuFunction<In, Out>
     | CorePikkuFunctionConfig<PikkuFunction<In, Out>, PikkuPermission<In>>
 ) => {
-  return typeof func === 'function' ? func : func.func
+  return typeof func === 'function' ? { func } : func
 }
 
 /**
@@ -240,7 +240,7 @@ export const pikkuSessionlessFunc = <In, Out = unknown>(
     | PikkuFunctionSessionless<In, Out>
     | CorePikkuFunctionConfig<PikkuFunctionSessionless<In, Out>, PikkuPermission<In>, PikkuMiddleware>
 ) => {
-  return typeof func === 'function' ? func : func.func
+  return typeof func === 'function' ? { func } : func
 }
 
 /**
@@ -271,7 +271,7 @@ export const pikkuChannelConnectionFunc = <Out = unknown, ChannelData = unknown>
         name?: string
       }
 ) => {
-  return typeof func === 'function' ? func : func.func
+  return typeof func === 'function' ? { func } : func
 }
 
 /**
@@ -300,7 +300,7 @@ export const pikkuChannelDisconnectionFunc = <ChannelData = unknown>(
         name?: string
       }
 ) => {
-  return typeof func === 'function' ? func : func.func
+  return typeof func === 'function' ? { func } : func
 }
 
 /**
@@ -327,7 +327,7 @@ export const pikkuChannelFunc = <In = unknown, Out = unknown, ChannelData = unkn
     | PikkuFunctionSessionless<In, Out, ChannelData>
     | CorePikkuFunctionConfig<PikkuFunction<In, Out, ChannelData>, PikkuPermission<In>>
 ) => {
-  return typeof func === 'function' ? func : func.func
+  return typeof func === 'function' ? { func } : func
 }
 
 /**
@@ -351,7 +351,7 @@ export const pikkuVoidFunc = (
     | PikkuFunctionSessionless<void, void>
     | CorePikkuFunctionConfig<PikkuFunctionSessionless<void, void>, PikkuPermission<void>>
 ) => {
-  return typeof func === 'function' ? func : func.func
+  return typeof func === 'function' ? { func } : func
 }
    
 /**
@@ -542,7 +542,7 @@ export const pikkuMCPPromptFunc = <In>(
         name?: string
       }
 ) => {
-  return typeof func === 'function' ? func : func.func
+  return typeof func === 'function' ? { func } : func
 }
 
 /**
@@ -574,7 +574,7 @@ export const pikkuMCPToolFunc = <In>(
       name?: string
     }
 ) => {
-  return typeof func === 'function' ? func : func.func
+  return typeof func === 'function' ? { func } : func
 }
 
 /**
@@ -607,7 +607,7 @@ export const pikkuMCPResourceFunc = <In>(
       name?: string
     }
 ) => {
-  return typeof func === 'function' ? func : func.func
+  return typeof func === 'function' ? { func } : func
 }
 `
 }