@pikku/cli 0.9.6 → 0.9.7

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @pikku/cli
 
+## 0.9.7
+
+### Patch Changes
+
+- 4fd5e19: fix: removing rpcMeta and duplicate imports
+- d1babed: fix: pikkuVoidFunc should use a sessionless function -- Since its used mostly by scheduled tasks
+
 ## 0.9.6
 
 ### Patch Changes

package/bin/pikku-all.ts

@@ -115,7 +115,6 @@ const runAll = async (
   await pikkuRPCInternalMap(logger, cliConfig, visitState)
   await pikkuRPCExposedMap(logger, cliConfig, visitState)
   await pikkuRPCClient(logger, cliConfig)
-  allImports.push(cliConfig.rpcWiringMetaFile)
 
   const schemas = await pikkuSchemas(logger, cliConfig, visitState)
   if (schemas) {
@@ -127,7 +126,7 @@ const runAll = async (
     logger,
     cliConfig,
     cliConfig.bootstrapFiles.rpc,
-    [cliConfig.rpcWiringMetaFile],
+    [],
     schemas
   )
 

package/dist/bin/pikku-all.js

@@ -67,13 +67,12 @@ const runAll = async (logger, cliConfig, options) => {
     await pikkuRPCInternalMap(logger, cliConfig, visitState);
     await pikkuRPCExposedMap(logger, cliConfig, visitState);
     await pikkuRPCClient(logger, cliConfig);
-    allImports.push(cliConfig.rpcWiringMetaFile);
     const schemas = await pikkuSchemas(logger, cliConfig, visitState);
     if (schemas) {
         allImports.push(`${cliConfig.schemaDirectory}/register.gen.ts`);
     }
     // RPC bootstrap is always generated since RPC is always present
-    await generateBootstrapFile(logger, cliConfig, cliConfig.bootstrapFiles.rpc, [cliConfig.rpcWiringMetaFile], schemas);
+    await generateBootstrapFile(logger, cliConfig, cliConfig.bootstrapFiles.rpc, [], schemas);
     const http = await pikkuHTTP(logger, cliConfig, visitState);
     if (http) {
         await pikkuHTTPMap(logger, cliConfig, visitState);

package/dist/src/pikku-cli-config.d.ts

@@ -16,7 +16,6 @@ export interface PikkuCLICoreOutputFiles {
     channelsMapDeclarationFile: string;
     rpcInternalWiringMetaFile: string;
     rpcInternalMapDeclarationFile: string;
-    rpcWiringMetaFile: string;
     rpcMapDeclarationFile: string;
     schedulersWiringFile: string;
     schedulersWiringMetaFile: string;

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

@@ -111,9 +111,6 @@ const _getPikkuCLIConfig = async (configFile = undefined, requiredFields, filter
                 result.rpcInternalMapDeclarationFile = join(internalRPCDirectory, 'pikku-rpc-wirings-map.internal.gen.d.ts');
             }
             // External
-            if (!result.rpcWiringMetaFile) {
-                result.rpcWiringMetaFile = join(externalRPCDirectory, 'pikku-rpc-wirings-meta.gen.ts');
-            }
             if (!result.rpcMapDeclarationFile) {
                 result.rpcMapDeclarationFile = join(externalRPCDirectory, 'pikku-rpc-wirings-map.gen.d.ts');
             }

package/dist/src/serialize-import-map.js

@@ -72,11 +72,11 @@ export const serializeImportMap = (relativeToPath, packageMappings, typesMap, re
         if (uniqueName === '__object') {
             return;
         }
-        if (originalName === uniqueName) {
-            variables.push(originalName);
-        }
-        else {
-            variables.push(`${originalName} as ${uniqueName}`);
+        const importName = originalName === uniqueName
+            ? originalName
+            : `${originalName} as ${uniqueName}`;
+        if (!variables.includes(importName)) {
+            variables.push(importName);
         }
         paths.set(path, variables);
     });

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

@@ -340,7 +340,7 @@ export const pikkuChannelFunc = <In = unknown, Out = unknown, ChannelData = unkn
 export const pikkuVoidFunc = (
   func:
     | PikkuFunctionSessionless<void, void>
-    | CorePikkuFunctionConfig<PikkuFunction<void, void>, PikkuPermission<void>>
+    | CorePikkuFunctionConfig<PikkuFunctionSessionless<void, void>, PikkuPermission<void>>
 ) => {
   return typeof func === 'function' ? func : func.func
 }

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

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

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

@@ -1,11 +1,8 @@
 import { logCommandInfoAndTime, writeFileInDir } from '../../utils.js';
-export const pikkuRPC = async (logger, { rpcInternalWiringMetaFile, rpcWiringMetaFile }, { rpc }) => {
+export const pikkuRPC = async (logger, { rpcInternalWiringMetaFile }, { rpc }) => {
     return await logCommandInfoAndTime(logger, 'Finding RPCs tasks', 'Found RPCs', [false], async () => {
         if (rpc.internalFiles.size > 0) {
             await writeFileInDir(logger, rpcInternalWiringMetaFile, `import { pikkuState } from '@pikku/core'\npikkuState('rpc', 'meta', ${JSON.stringify(rpc.internalMeta, null, 2)})`);
         }
-        if (rpc.exposedFiles.size > 0) {
-            await writeFileInDir(logger, rpcWiringMetaFile, `import { pikkuState } from '@pikku/core'\npikkuState('rpc', 'meta', ${JSON.stringify(rpc.exposedFiles, null, 2)})`);
-        }
     });
 };

package/package.json

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

package/src/pikku-cli-config.ts

@@ -32,7 +32,6 @@ export interface PikkuCLICoreOutputFiles {
   rpcInternalMapDeclarationFile: string
 
   // RPC Exposed
-  rpcWiringMetaFile: string
   rpcMapDeclarationFile: string
 
   // Schedulers
@@ -253,12 +252,6 @@ const _getPikkuCLIConfig = async (
       }
 
       // External
-      if (!result.rpcWiringMetaFile) {
-        result.rpcWiringMetaFile = join(
-          externalRPCDirectory,
-          'pikku-rpc-wirings-meta.gen.ts'
-        )
-      }
       if (!result.rpcMapDeclarationFile) {
         result.rpcMapDeclarationFile = join(
           externalRPCDirectory,

package/src/serialize-import-map.ts

@@ -86,10 +86,12 @@ export const serializeImportMap = (
       return
     }
 
-    if (originalName === uniqueName) {
-      variables.push(originalName)
-    } else {
-      variables.push(`${originalName} as ${uniqueName}`)
+    const importName =
+      originalName === uniqueName
+        ? originalName
+        : `${originalName} as ${uniqueName}`
+    if (!variables.includes(importName)) {
+      variables.push(importName)
     }
     paths.set(path, variables)
   })

package/src/serialize-pikku-types.ts

@@ -348,7 +348,7 @@ export const pikkuChannelFunc = <In = unknown, Out = unknown, ChannelData = unkn
 export const pikkuVoidFunc = (
   func:
     | PikkuFunctionSessionless<void, void>
-    | CorePikkuFunctionConfig<PikkuFunction<void, void>, PikkuPermission<void>>
+    | CorePikkuFunctionConfig<PikkuFunctionSessionless<void, void>, PikkuPermission<void>>
 ) => {
   return typeof func === 'function' ? func : func.func
 }

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

@@ -8,12 +8,7 @@ import { PikkuCommandWithoutState } from '../../types.js'
 
 export const pikkuRPCClient: PikkuCommandWithoutState = async (
   logger,
-  {
-    rpcWiringsFile,
-    rpcMapDeclarationFile,
-    rpcInternalMapDeclarationFile,
-    packageMappings,
-  }
+  { rpcWiringsFile, rpcMapDeclarationFile, packageMappings }
 ) => {
   return await logCommandInfoAndTime(
     logger,

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

@@ -3,7 +3,7 @@ import { PikkuCommand } from '../../types.js'
 
 export const pikkuRPC: PikkuCommand = async (
   logger,
-  { rpcInternalWiringMetaFile, rpcWiringMetaFile },
+  { rpcInternalWiringMetaFile },
   { rpc }
 ) => {
   return await logCommandInfoAndTime(
@@ -19,14 +19,6 @@ export const pikkuRPC: PikkuCommand = async (
           `import { pikkuState } from '@pikku/core'\npikkuState('rpc', 'meta', ${JSON.stringify(rpc.internalMeta, null, 2)})`
         )
       }
-
-      if (rpc.exposedFiles.size > 0) {
-        await writeFileInDir(
-          logger,
-          rpcWiringMetaFile,
-          `import { pikkuState } from '@pikku/core'\npikkuState('rpc', 'meta', ${JSON.stringify(rpc.exposedFiles, null, 2)})`
-        )
-      }
     }
   )
 }