@pikku/cli 0.9.16-next.0 → 0.10.0

package/dist/src/utils/file-writer.js

@@ -1,8 +1,9 @@
 import { dirname } from 'path';
-import { mkdir, readFile, writeFile } from 'fs/promises';
-// TODO: add version back in once the ESM dust settles
+import { mkdir, readFile, writeFile, rm } from 'fs/promises';
+import { existsSync } from 'fs';
+import { getCLIVersion } from './get-cli-version.js';
 export const DO_NOT_MODIFY_COMMENT = `/**
- * This file was generated by the @pikku/cli
+ * This file was generated by @pikku/cli@${getCLIVersion()}
  */
 `;
 export const writeFileInDir = async (logger, path, content, { ignoreModifyComment = false, logWrite = true, } = {}) => {
@@ -38,3 +39,12 @@ export const writeFileInDir = async (logger, path, content, { ignoreModifyCommen
         }
     }
 };
+export const removeFileInDir = async (logger, path, { logRemove = true } = {}) => {
+    // Check if file exists before attempting removal
+    if (existsSync(path)) {
+        await rm(path, { force: true });
+        if (logRemove) {
+            logger.info({ message: `✓ File removed at ${path}`, type: 'success' });
+        }
+    }
+};

package/dist/src/utils/get-cli-version.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Returns the CLI version string
+ * Works from both src/ and dist/src/ locations
+ */
+export declare const getCLIVersion: () => string;

package/dist/src/utils/get-cli-version.js

@@ -0,0 +1,27 @@
+import { dirname, join } from 'path';
+import { readFile } from 'fs/promises';
+import { fileURLToPath } from 'url';
+// Get package version for generated file comments
+const __dirname = dirname(fileURLToPath(import.meta.url));
+let version = 'unknown';
+try {
+    // Try from src/ first (development), then from dist/src/ (built)
+    const pkgPath = join(__dirname, '..', '..', 'package.json');
+    const pkgJson = JSON.parse(await readFile(pkgPath, 'utf-8'));
+    version = pkgJson.version;
+}
+catch {
+    try {
+        const pkgPath = join(__dirname, '..', '..', '..', 'package.json');
+        const pkgJson = JSON.parse(await readFile(pkgPath, 'utf-8'));
+        version = pkgJson.version;
+    }
+    catch {
+        // Fallback to unknown if package.json can't be found
+    }
+}
+/**
+ * Returns the CLI version string
+ * Works from both src/ and dist/src/ locations
+ */
+export const getCLIVersion = () => version;

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

@@ -1,5 +1,4 @@
 import { PikkuCLIConfig } from '../../types/config.js';
-import { InspectorFilters } from '@pikku/inspector';
 import { CLILogger } from '../services/cli-logger.service.js';
-export declare const getPikkuCLIConfig: (logger: CLILogger, configFile: string | undefined, requiredFields: Array<keyof PikkuCLIConfig>, filters?: InspectorFilters, exitProcess?: boolean) => Promise<PikkuCLIConfig>;
+export declare const getPikkuCLIConfig: (logger: CLILogger, configFile: string | undefined, requiredFields: Array<keyof PikkuCLIConfig>, exitProcess?: boolean) => Promise<PikkuCLIConfig>;
 export declare const validateCLIConfig: (cliConfig: PikkuCLIConfig, required: Array<keyof PikkuCLIConfig>) => void;

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

@@ -1,6 +1,5 @@
 import { join, dirname, resolve, isAbsolute } from 'path';
 import { readdir, readFile } from 'fs/promises';
-import { PikkuWiringTypes } from '@pikku/core';
 const CONFIG_DIR_FILES = [
     'nextBackendFile',
     'nextHTTPFile',
@@ -10,11 +9,11 @@ const CONFIG_DIR_FILES = [
     'queueWiringsFile',
     'mcpJsonFile',
 ];
-export const getPikkuCLIConfig = async (logger, configFile = undefined, requiredFields, filters = {}, exitProcess = false) => {
-    const config = await _getPikkuCLIConfig(logger, configFile, requiredFields, filters, exitProcess);
+export const getPikkuCLIConfig = async (logger, configFile = undefined, requiredFields, exitProcess = false) => {
+    const config = await _getPikkuCLIConfig(logger, configFile, requiredFields, exitProcess);
     return config;
 };
-const _getPikkuCLIConfig = async (logger, configFile = undefined, requiredFields, filters = {}, exitProcess = false) => {
+const _getPikkuCLIConfig = async (logger, configFile = undefined, requiredFields, exitProcess = false) => {
     if (!configFile) {
         let execDirectory = process.cwd();
         const files = await readdir(execDirectory);
@@ -30,7 +29,7 @@ const _getPikkuCLIConfig = async (logger, configFile = undefined, requiredFields
         const configDir = dirname(configFile);
         const config = JSON.parse(file);
         if (config.extends) {
-            const extendedConfig = await getPikkuCLIConfig(logger, resolve(configDir, config.extends), [], filters, exitProcess);
+            const extendedConfig = await getPikkuCLIConfig(logger, resolve(configDir, config.extends), [], exitProcess);
             result = {
                 ...extendedConfig,
                 ...config,
@@ -151,6 +150,11 @@ const _getPikkuCLIConfig = async (logger, configFile = undefined, requiredFields
         if (!result.middlewareGroupsMetaFile) {
             result.middlewareGroupsMetaFile = join(middlewareDir, 'pikku-middleware-groups-meta.gen.ts');
         }
+        // Permissions
+        const permissionsDir = join(result.outDir, 'permissions');
+        if (!result.permissionsFile) {
+            result.permissionsFile = join(permissionsDir, 'pikku-permissions.gen.ts');
+        }
         // Bootstrap files
         if (!result.bootstrapFile) {
             result.bootstrapFile = join(result.outDir, 'pikku-bootstrap.gen.ts');
@@ -181,11 +185,6 @@ const _getPikkuCLIConfig = async (logger, configFile = undefined, requiredFields
         if (!result.cliTypesFile) {
             result.cliTypesFile = join(cliDir, 'pikku-cli-types.gen.ts');
         }
-        result.bootstrapFiles = result.bootstrapFiles || {};
-        for (const key of Object.keys(PikkuWiringTypes)) {
-            const eventDir = join(result.outDir, key.toLowerCase());
-            result.bootstrapFiles[key] = join(eventDir, `pikku-bootstrap-${key}.gen.ts`);
-        }
         if (requiredFields.length > 0) {
             validateCLIConfig(result, requiredFields);
         }
@@ -202,24 +201,6 @@ const _getPikkuCLIConfig = async (logger, configFile = undefined, requiredFields
                 }
             }
         }
-        // Separately normalize bootstrapFiles (Record<string, string>)
-        if (result.bootstrapFiles && typeof result.bootstrapFiles === 'object') {
-            for (const [key, value] of Object.entries(result.bootstrapFiles)) {
-                if (typeof value === 'string' && !isAbsolute(value)) {
-                    result.bootstrapFiles[key] = join(result.rootDir, value);
-                }
-            }
-        }
-        result.filters = result.filters || {};
-        if (filters.tags && filters.tags.length > 0) {
-            result.filters.tags = filters.tags;
-        }
-        if (filters.types && filters.types.length > 0) {
-            result.filters.types = filters.types;
-        }
-        if (filters.directories && filters.directories.length > 0) {
-            result.filters.directories = filters.directories;
-        }
         if (!isAbsolute(result.tsconfig)) {
             result.tsconfig = join(result.rootDir, result.tsconfig);
         }

package/dist/src/utils/schema-generator.js

@@ -1,6 +1,7 @@
 import { createGenerator, RootlessError } from 'ts-json-schema-generator';
 import { writeFileInDir } from './file-writer.js';
 import { mkdir, writeFile } from 'fs/promises';
+import { ErrorCode } from '@pikku/inspector';
 export async function generateSchemas(logger, tsconfig, typesMap, functionMeta, httpWiringsMeta, additionalTypes) {
     const schemasSet = new Set(typesMap.customTypes.keys());
     for (const { inputs, outputs } of Object.values(functionMeta)) {
@@ -51,10 +52,10 @@ export async function generateSchemas(logger, tsconfig, typesMap, functionMeta,
         catch (e) {
             // Ignore rootless errors
             if (e instanceof RootlessError) {
-                logger.error(`Error generating schema since it has no root: ${schema}`);
+                logger.error(`[${ErrorCode.SCHEMA_NO_ROOT}] Error generating schema since it has no root: ${schema}`);
                 return;
             }
-            logger.error(`Error generating schema: ${schema}`);
+            logger.error(`[${ErrorCode.SCHEMA_GENERATION_ERROR}] Error generating schema: ${schema}. Message: ${e.message}`);
         }
     });
     return schemas;

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

@@ -69,9 +69,6 @@ export const serializeImportMap = (relativeToPath, packageMappings, typesMap, re
             return;
         }
         const variables = paths.get(path) || [];
-        if (uniqueName === '__object') {
-            return;
-        }
         const importName = originalName === uniqueName
             ? originalName
             : `${originalName} as ${uniqueName}`;

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../bin/pikku.ts","../src/cli.wiring.ts","../src/serialize-pikku-types.ts","../src/services.ts","../src/functions/commands/all.ts","../src/functions/commands/watch.ts","../src/functions/runtimes/nextjs/pikku-command-nextjs.ts","../src/functions/runtimes/nextjs/serialize-nextjs-backend-wrapper.ts","../src/functions/runtimes/nextjs/serialize-nextjs-http-wrapper.ts","../src/functions/wirings/channels/pikku-channels.ts","../src/functions/wirings/channels/pikku-command-channel-types.ts","../src/functions/wirings/channels/pikku-command-channels-map.ts","../src/functions/wirings/channels/pikku-command-channels.ts","../src/functions/wirings/channels/pikku-command-websocket-typed.ts","../src/functions/wirings/channels/serialize-channel-types.ts","../src/functions/wirings/channels/serialize-typed-channel-map.ts","../src/functions/wirings/channels/serialize-websocket-wrapper.ts","../src/functions/wirings/cli/pikku-command-cli-entry.ts","../src/functions/wirings/cli/pikku-command-cli-types.ts","../src/functions/wirings/cli/pikku-command-cli.ts","../src/functions/wirings/cli/serialize-channel-cli-client.ts","../src/functions/wirings/cli/serialize-channel-cli.ts","../src/functions/wirings/cli/serialize-cli-types.ts","../src/functions/wirings/cli/serialize-local-cli-bootstrap.ts","../src/functions/wirings/fetch/index.ts","../src/functions/wirings/functions/pikku-command-function-types-split.ts","../src/functions/wirings/functions/pikku-command-function-types.ts","../src/functions/wirings/functions/pikku-command-functions.ts","../src/functions/wirings/functions/pikku-command-services.ts","../src/functions/wirings/functions/pikku-function-types.ts","../src/functions/wirings/functions/schemas.ts","../src/functions/wirings/functions/serialize-function-imports.ts","../src/functions/wirings/functions/serialize-function-types.ts","../src/functions/wirings/functions/serialize-pikku-types-hub.ts","../src/functions/wirings/http/openapi-spec-generator.ts","../src/functions/wirings/http/pikku-command-http-map.ts","../src/functions/wirings/http/pikku-command-http-routes.ts","../src/functions/wirings/http/pikku-command-http-types.ts","../src/functions/wirings/http/pikku-command-openapi.ts","../src/functions/wirings/http/pikku-http-routes.ts","../src/functions/wirings/http/serialize-fetch-wrapper.ts","../src/functions/wirings/http/serialize-http-types.ts","../src/functions/wirings/http/serialize-typed-http-map.ts","../src/functions/wirings/mcp/pikku-command-mcp-json.ts","../src/functions/wirings/mcp/pikku-command-mcp-types.ts","../src/functions/wirings/mcp/pikku-command-mcp.ts","../src/functions/wirings/mcp/serialize-mcp-json.ts","../src/functions/wirings/mcp/serialize-mcp-types.ts","../src/functions/wirings/middleware/pikku-command-middleware.ts","../src/functions/wirings/middleware/serialize-middleware-groups-meta.ts","../src/functions/wirings/middleware/serialize-middleware-imports.ts","../src/functions/wirings/queue/pikku-command-queue-map.ts","../src/functions/wirings/queue/pikku-command-queue-service.ts","../src/functions/wirings/queue/pikku-command-queue-types.ts","../src/functions/wirings/queue/pikku-command-queue.ts","../src/functions/wirings/queue/pikku-queue-map.ts","../src/functions/wirings/queue/pikku-queue.ts","../src/functions/wirings/queue/serialize-queue-map.ts","../src/functions/wirings/queue/serialize-queue-meta.ts","../src/functions/wirings/queue/serialize-queue-types.ts","../src/functions/wirings/queue/serialize-queue-wrapper.ts","../src/functions/wirings/rpc/pikku-command-rpc-client.ts","../src/functions/wirings/rpc/pikku-command-rpc-map.ts","../src/functions/wirings/rpc/pikku-command-rpc.ts","../src/functions/wirings/rpc/serialize-rpc-wrapper.ts","../src/functions/wirings/rpc/serialize-typed-rpc-map.ts","../src/functions/wirings/scheduler/pikku-command-scheduler-types.ts","../src/functions/wirings/scheduler/pikku-command-scheduler.ts","../src/functions/wirings/scheduler/serialize-scheduler-meta.ts","../src/functions/wirings/scheduler/serialize-scheduler-types.ts","../src/middleware/log-command-info-and-time.ts","../src/services/cli-logger-forwarder.service.ts","../src/services/cli-logger.service.ts","../src/utils/check-required-types.ts","../src/utils/custom-types-generator.ts","../src/utils/file-import-path.ts","../src/utils/file-imports-serializer.ts","../src/utils/file-writer.ts","../src/utils/generate-bootstrap-file.ts","../src/utils/pikku-cli-config.ts","../src/utils/pikku-files-and-methods.ts","../src/utils/schema-generator.ts","../src/utils/serialize-import-map.ts","../.pikku/pikku-bootstrap.gen.ts","../.pikku/pikku-services.gen.ts","../.pikku/pikku-types.gen.ts","../.pikku/channel/pikku-channel-types.gen.ts","../.pikku/cli/pikku-cli-types.gen.ts","../.pikku/cli/pikku-cli-wirings-meta.gen.ts","../.pikku/cli/pikku-cli-wirings.gen.ts","../.pikku/function/pikku-function-types.gen.ts","../.pikku/function/pikku-functions-meta.gen.ts","../.pikku/function/pikku-functions-meta.min.gen.ts","../.pikku/function/pikku-functions.gen.ts","../.pikku/http/pikku-http-types.gen.ts","../.pikku/mcp/pikku-mcp-types.gen.ts","../.pikku/queue/pikku-queue-types.gen.ts","../.pikku/rpc/pikku-rpc-wirings-map.gen.d.ts","../.pikku/rpc/pikku-rpc-wirings-map.internal.gen.d.ts","../.pikku/rpc/pikku-rpc-wirings-meta.internal.gen.ts","../.pikku/scheduler/pikku-scheduler-types.gen.ts","../.pikku/schemas/register.gen.ts","../types/application-types.d.ts","../types/config.d.ts"],"version":"5.9.2"}
+{"root":["../bin/pikku.ts","../src/cli.wiring.ts","../src/services.ts","../src/functions/commands/all.ts","../src/functions/commands/watch.ts","../src/functions/runtimes/nextjs/pikku-command-nextjs.ts","../src/functions/runtimes/nextjs/serialize-nextjs-backend-wrapper.ts","../src/functions/runtimes/nextjs/serialize-nextjs-http-wrapper.ts","../src/functions/wirings/channels/pikku-channels.ts","../src/functions/wirings/channels/pikku-command-channel-types.ts","../src/functions/wirings/channels/pikku-command-channels-map.ts","../src/functions/wirings/channels/pikku-command-channels.ts","../src/functions/wirings/channels/pikku-command-websocket-typed.ts","../src/functions/wirings/channels/serialize-channel-types.ts","../src/functions/wirings/channels/serialize-typed-channel-map.ts","../src/functions/wirings/channels/serialize-websocket-wrapper.ts","../src/functions/wirings/cli/pikku-command-cli-entry.ts","../src/functions/wirings/cli/pikku-command-cli-types.ts","../src/functions/wirings/cli/pikku-command-cli.ts","../src/functions/wirings/cli/serialize-channel-cli-client.ts","../src/functions/wirings/cli/serialize-channel-cli.ts","../src/functions/wirings/cli/serialize-cli-types.ts","../src/functions/wirings/cli/serialize-local-cli-bootstrap.ts","../src/functions/wirings/fetch/index.ts","../src/functions/wirings/functions/pikku-command-function-types-split.ts","../src/functions/wirings/functions/pikku-command-function-types.ts","../src/functions/wirings/functions/pikku-command-functions.ts","../src/functions/wirings/functions/pikku-command-services.ts","../src/functions/wirings/functions/pikku-function-types.ts","../src/functions/wirings/functions/schemas.ts","../src/functions/wirings/functions/serialize-function-imports.ts","../src/functions/wirings/functions/serialize-function-types.ts","../src/functions/wirings/functions/serialize-pikku-types-hub.ts","../src/functions/wirings/http/openapi-spec-generator.ts","../src/functions/wirings/http/pikku-command-http-map.ts","../src/functions/wirings/http/pikku-command-http-routes.ts","../src/functions/wirings/http/pikku-command-http-types.ts","../src/functions/wirings/http/pikku-command-openapi.ts","../src/functions/wirings/http/pikku-http-routes.ts","../src/functions/wirings/http/serialize-fetch-wrapper.ts","../src/functions/wirings/http/serialize-http-types.ts","../src/functions/wirings/http/serialize-typed-http-map.ts","../src/functions/wirings/mcp/pikku-command-mcp-json.ts","../src/functions/wirings/mcp/pikku-command-mcp-types.ts","../src/functions/wirings/mcp/pikku-command-mcp.ts","../src/functions/wirings/mcp/serialize-mcp-json.ts","../src/functions/wirings/mcp/serialize-mcp-types.ts","../src/functions/wirings/middleware/pikku-command-middleware.ts","../src/functions/wirings/middleware/serialize-middleware-groups-meta.ts","../src/functions/wirings/middleware/serialize-middleware-imports.ts","../src/functions/wirings/permissions/pikku-command-permissions.ts","../src/functions/wirings/permissions/serialize-permissions-imports.ts","../src/functions/wirings/queue/pikku-command-queue-map.ts","../src/functions/wirings/queue/pikku-command-queue-service.ts","../src/functions/wirings/queue/pikku-command-queue-types.ts","../src/functions/wirings/queue/pikku-command-queue.ts","../src/functions/wirings/queue/pikku-queue-map.ts","../src/functions/wirings/queue/pikku-queue.ts","../src/functions/wirings/queue/serialize-queue-map.ts","../src/functions/wirings/queue/serialize-queue-meta.ts","../src/functions/wirings/queue/serialize-queue-types.ts","../src/functions/wirings/queue/serialize-queue-wrapper.ts","../src/functions/wirings/rpc/pikku-command-rpc-client.ts","../src/functions/wirings/rpc/pikku-command-rpc-map.ts","../src/functions/wirings/rpc/pikku-command-rpc.ts","../src/functions/wirings/rpc/serialize-rpc-wrapper.ts","../src/functions/wirings/rpc/serialize-typed-rpc-map.ts","../src/functions/wirings/scheduler/pikku-command-scheduler-types.ts","../src/functions/wirings/scheduler/pikku-command-scheduler.ts","../src/functions/wirings/scheduler/serialize-scheduler-meta.ts","../src/functions/wirings/scheduler/serialize-scheduler-types.ts","../src/middleware/log-command-info-and-time.ts","../src/services/cli-logger-forwarder.service.ts","../src/services/cli-logger.service.ts","../src/utils/check-required-types.ts","../src/utils/custom-types-generator.ts","../src/utils/file-import-path.ts","../src/utils/file-imports-serializer.ts","../src/utils/file-writer.ts","../src/utils/generate-bootstrap-file.ts","../src/utils/get-cli-version.ts","../src/utils/pikku-cli-config.ts","../src/utils/pikku-files-and-methods.ts","../src/utils/schema-generator.ts","../src/utils/serialize-import-map.ts","../.pikku/pikku-bootstrap.gen.ts","../.pikku/pikku-services.gen.ts","../.pikku/pikku-types.gen.ts","../.pikku/pikku-websocket.gen.ts","../.pikku/channel/pikku-channel-types.gen.ts","../.pikku/channel/pikku-channels-map.gen.d.ts","../.pikku/channel/pikku-channels-meta.gen.ts","../.pikku/channel/pikku-channels.gen.ts","../.pikku/cli/pikku-cli-channel.gen.ts","../.pikku/cli/pikku-cli-client.gen.ts","../.pikku/cli/pikku-cli-types.gen.ts","../.pikku/cli/pikku-cli-wirings-meta.gen.ts","../.pikku/cli/pikku-cli-wirings.gen.ts","../.pikku/cli/pikku-cli.gen.ts","../.pikku/function/pikku-function-types.gen.ts","../.pikku/function/pikku-functions-meta.gen.ts","../.pikku/function/pikku-functions-meta.min.gen.ts","../.pikku/function/pikku-functions.gen.ts","../.pikku/http/pikku-http-types.gen.ts","../.pikku/http/pikku-http-wirings-map.gen.d.ts","../.pikku/http/pikku-http-wirings-meta.gen.ts","../.pikku/http/pikku-http-wirings.gen.ts","../.pikku/mcp/pikku-mcp-types.gen.ts","../.pikku/mcp/pikku-mcp-wirings-meta.gen.ts","../.pikku/mcp/pikku-mcp-wirings.gen.ts","../.pikku/queue/pikku-queue-types.gen.ts","../.pikku/queue/pikku-queue-workers-wirings-map.gen.d.ts","../.pikku/queue/pikku-queue-workers-wirings-meta.gen.ts","../.pikku/queue/pikku-queue-workers-wirings.gen.ts","../.pikku/rpc/pikku-rpc-wirings-map.gen.d.ts","../.pikku/rpc/pikku-rpc-wirings-map.internal.gen.d.ts","../.pikku/rpc/pikku-rpc-wirings-meta.internal.gen.ts","../.pikku/scheduler/pikku-scheduler-types.gen.ts","../.pikku/scheduler/pikku-schedulers-wirings-meta.gen.ts","../.pikku/scheduler/pikku-schedulers-wirings.gen.ts","../.pikku/schemas/register.gen.ts","../types/application-types.d.ts","../types/config.d.ts"],"version":"5.9.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikku/cli",
-  "version": "0.9.16-next.0",
+  "version": "0.10.0",
   "author": "yasser.fadl@gmail.com",
   "license": "MIT",
   "bin": {
@@ -21,22 +21,24 @@
     "test:coverage": "bash run-tests.sh --coverage"
   },
   "dependencies": {
-    "@openapi-contrib/json-schema-to-openapi-schema": "^4.0.2",
-    "@pikku/core": "^0.9.12-next.0",
-    "@pikku/inspector": "^0.9.6-next.0",
+    "@openapi-contrib/json-schema-to-openapi-schema": "^4.2.0",
+    "@pikku/core": "^0.10.0",
+    "@pikku/inspector": "^0.10.0",
     "@types/cookie": "^1.0.0",
-    "@types/uuid": "^10.0.0",
-    "chalk": "^5.5.0",
+    "@types/json-schema": "^7.0.15",
+    "@types/uuid": "^11.0.0",
+    "chalk": "^5.6.2",
     "chokidar": "^4.0.3",
     "commander": "^14",
-    "path-to-regexp": "^8.2.0",
+    "openapi-types": "^12.1.3",
+    "path-to-regexp": "^8.3.0",
     "tinyglobby": "^0.2.12",
     "ts-json-schema-generator": "^2.4.0",
     "typescript": "^5.9",
     "yaml": "^2.8.1"
   },
   "devDependencies": {
-    "@types/node": "^24.2.1"
+    "@types/node": "^24.9.1"
   },
   "engines": {
     "node": ">=18"

package/pikku.config.json

@@ -15,8 +15,10 @@
         ".pikku/cli/pikku-cli.gen.ts",
         {
           "type": "channel",
-          "wirePath": ".pikku/cli/pikku-channel.wire.gen.ts",
-          "path": ".pikku/cli/pikku-channel.client.gen.ts"
+          "wirePath": ".pikku/cli/pikku-cli-channel.gen.ts",
+          "path": ".pikku/cli/pikku-cli-client.gen.ts",
+          "name": "pikku-cli",
+          "route": "/cli/pikku"
         }
       ]
     }

package/src/cli.wiring.ts

@@ -1,75 +1,102 @@
-// import { pikkuSchemas } from './functions/wirings/functions/schemas.js'
-// import { pikkuFetch } from './functions/wirings/fetch/index.js'
-// import { pikkuWebSocketTyped } from './functions/wirings/channels/pikku-command-websocket-typed.js'
-// import { pikkuRPCClient } from './functions/wirings/rpc/pikku-command-rpc-client.js'
-// import { pikkuQueueService } from './functions/wirings/queue/pikku-command-queue-service.js'
-// import { pikkuOpenAPI } from './functions/wirings/http/pikku-command-openapi.js'
-// import { pikkuNext } from './functions/runtimes/nextjs/pikku-command-nextjs.js'
-// import { pikkuCLICommand, wireCLI } from '../.pikku/cli/pikku-cli-types.gen.js'
-// import { all } from './functions/commands/all.js'
-// import { defaultCLIRenderer } from './services.js'
+import { pikkuSchemas } from './functions/wirings/functions/schemas.js'
+import { pikkuFetch } from './functions/wirings/fetch/index.js'
+import { pikkuWebSocketTyped } from './functions/wirings/channels/pikku-command-websocket-typed.js'
+import { pikkuRPCClient } from './functions/wirings/rpc/pikku-command-rpc-client.js'
+import { pikkuQueueService } from './functions/wirings/queue/pikku-command-queue-service.js'
+import { pikkuOpenAPI } from './functions/wirings/http/pikku-command-openapi.js'
+import { pikkuNext } from './functions/runtimes/nextjs/pikku-command-nextjs.js'
+import { pikkuCLICommand, wireCLI } from '../.pikku/cli/pikku-cli-types.gen.js'
+import { all } from './functions/commands/all.js'
+import { clientCLIRenderer } from './services.js'
 
-// wireCLI({
-//   program: 'pikku',
-//   description:
-//     'Pikku CLI - Code generation tool for type-safe backend development',
-//   render: defaultCLIRenderer,
-//   options: {
-//     config: {
-//       description: 'Path to pikku.config.json file',
-//       short: 'c',
-//     },
-//     logLevel: {
-//       description: 'Set log level',
-//       default: 'info',
-//       short: 'l',
-//     },
-//   },
-//   commands: {
-//     all: pikkuCLICommand({
-//       func: all,
-//       description: 'Generate all Pikku files (types, schemas, wirings, etc.)',
-//       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',
-//         },
-//       },
-//     }),
-//     schemas: pikkuCLICommand({
-//       func: pikkuSchemas,
-//       description: 'Generate JSON schemas for function input/output types',
-//     }),
-//     fetch: pikkuCLICommand({
-//       func: pikkuFetch,
-//       description: 'Generate type-safe HTTP fetch client',
-//     }),
-//     websocket: pikkuCLICommand({
-//       func: pikkuWebSocketTyped,
-//       description: 'Generate type-safe WebSocket client',
-//     }),
-//     rpc: pikkuCLICommand({
-//       func: pikkuRPCClient,
-//       description: 'Generate RPC client wrappers',
-//     }),
-//     'queue-service': pikkuCLICommand({
-//       func: pikkuQueueService,
-//       description: 'Generate queue service wrapper',
-//     }),
-//     openapi: pikkuCLICommand({
-//       func: pikkuOpenAPI,
-//       description: 'Generate OpenAPI specification from HTTP routes',
-//     }),
-//     nextjs: pikkuCLICommand({
-//       func: pikkuNext,
-//       description: 'Generate Next.js backend and HTTP wrappers',
-//     }),
-//   },
-// })
+wireCLI({
+  program: 'pikku',
+  description:
+    'Pikku CLI - Code generation tool for type-safe backend development',
+  render: clientCLIRenderer,
+  options: {
+    config: {
+      description: 'Path to pikku.config.json file',
+      short: 'c',
+    },
+    logLevel: {
+      description: 'Set log level',
+      default: 'info' as const,
+      short: 'l',
+    },
+    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)',
+    },
+  },
+  commands: {
+    all: pikkuCLICommand({
+      func: all,
+      description: 'Generate all Pikku files (types, schemas, wirings, etc.)',
+      isDefault: true,
+      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',
+        },
+      },
+    }),
+    schemas: pikkuCLICommand({
+      func: pikkuSchemas,
+      description: 'Generate JSON schemas for function input/output types',
+    }),
+    fetch: pikkuCLICommand({
+      func: pikkuFetch,
+      description: 'Generate type-safe HTTP fetch client',
+    }),
+    websocket: pikkuCLICommand({
+      func: pikkuWebSocketTyped,
+      description: 'Generate type-safe WebSocket client',
+    }),
+    rpc: pikkuCLICommand({
+      func: pikkuRPCClient,
+      description: 'Generate RPC client wrappers',
+    }),
+    'queue-service': pikkuCLICommand({
+      func: pikkuQueueService,
+      description: 'Generate queue service wrapper',
+    }),
+    openapi: pikkuCLICommand({
+      func: pikkuOpenAPI,
+      description: 'Generate OpenAPI specification from HTTP routes',
+    }),
+    nextjs: pikkuCLICommand({
+      func: pikkuNext,
+      description: 'Generate Next.js backend and HTTP wrappers',
+    }),
+  },
+})

package/src/functions/commands/all.ts

@@ -38,6 +38,13 @@ export const all: any = pikkuVoidFunc({
       allImports.push(config.middlewareFile)
     }
 
+    // Generate and register permissions
+    const permissions = await rpc.invoke('pikkuPermissions', null)
+    // Permissions must be imported before functions meta to ensure registration happens first
+    if (permissions) {
+      allImports.push(config.permissionsFile)
+    }
+
     // Always import functions meta (needed for all function metadata)
     allImports.push(config.functionsMetaFile)
 
@@ -137,5 +144,10 @@ export const all: any = pikkuVoidFunc({
         .sort((to) => (to.includes('meta') ? -1 : 1)) // Ensure meta files are at the top
         .join('\n')
     )
+
+    // Check for critical errors and exit if any were logged
+    if (logger.hasCriticalErrors()) {
+      process.exit(1)
+    }
   },
 })

package/src/functions/runtimes/nextjs/pikku-command-nextjs.ts

@@ -14,16 +14,20 @@ export const pikkuNext: any = pikkuSessionlessFunc<void, void>({
       httpMapDeclarationFile,
       packageMappings,
       fetchFile,
-      bootstrapFiles,
     } = config
-    const visitState = await getInspectorState()
 
+    // If both files are undefined, clean up any existing files and return
     if (!nextBackendFile && !nextHTTPFile) {
-      throw new Error(
-        'nextBackendFile or nextHTTPFile is required in pikku config for nextJS'
-      )
+      logger.info({
+        message:
+          'Skipping generating nextjs wrapper since nextjs outfile is not defined.',
+        type: 'skip',
+      })
+      return
     }
 
+    const visitState = await getInspectorState()
+
     if (nextHTTPFile && !fetchFile) {
       throw new Error(
         'fetchFile is required in pikku config in order for nextJS http wrapper to work'
@@ -56,9 +60,9 @@ export const pikkuNext: any = pikkuSessionlessFunc<void, void>({
       const singletonServicesImport = `import { ${singletonServicesFactory.variable} as createSingletonServices } from '${getFileImportRelativePath(nextBackendFile, singletonServicesFactory.file, packageMappings)}'`
       const sessionServicesImport = `import { ${sessionServicesFactory.variable} as createSessionServices } from '${getFileImportRelativePath(nextBackendFile, sessionServicesFactory.file, packageMappings)}'`
 
-      const httpBootstrapPath = getFileImportRelativePath(
+      const bootstrapPath = getFileImportRelativePath(
         nextBackendFile,
-        bootstrapFiles.http,
+        config.bootstrapFile,
         packageMappings
       )
 
@@ -69,7 +73,7 @@ export const pikkuNext: any = pikkuSessionlessFunc<void, void>({
       )
 
       const content = serializeNextBackendWrapper(
-        httpBootstrapPath,
+        bootstrapPath,
         routesMapDeclarationPath,
         pikkuConfigImport,
         singletonServicesImport,
@@ -102,10 +106,6 @@ export const pikkuNext: any = pikkuSessionlessFunc<void, void>({
     logCommandInfoAndTime({
       commandStart: 'Generating nextjs wrapper',
       commandEnd: 'Generated nextjs wrapper',
-      skipCondition: ({ config }) =>
-        config.nextBackendFile === undefined &&
-        config.nextHTTPFile === undefined,
-      skipMessage: 'nextjs outfile is not defined',
     }),
   ],
 })

package/src/functions/runtimes/nextjs/serialize-nextjs-backend-wrapper.ts

@@ -1,5 +1,5 @@
 export const serializeNextJsBackendWrapper = (
-  httpBootstrapPath: string,
+  bootstrapPath: string,
   routesMapPath: string,
   configImport: string,
   singleServicesFactoryImport: string,
@@ -18,7 +18,7 @@ ${configImport}
 ${singleServicesFactoryImport}
 ${sessionServicesImport}
 
-import '${httpBootstrapPath}'
+import '${bootstrapPath}'
 
 let _pikku: PikkuNextJS | undefined
 

package/src/functions/wirings/channels/pikku-channels.ts

@@ -30,11 +30,6 @@ export const pikkuChannels: any = pikkuVoidFunc({
     logCommandInfoAndTime({
       commandStart: 'Finding Channels',
       commandEnd: 'Found channels',
-      skipCondition: async ({ getInspectorState }: any) => {
-        const visitState = await getInspectorState()
-        return visitState.channels.files.size === 0
-      },
-      skipMessage: 'none found',
     }),
   ],
 })

package/src/functions/wirings/channels/pikku-command-channel-types.ts

@@ -20,8 +20,6 @@ export const pikkuChannelTypes: any = pikkuSessionlessFunc<void, void>({
     logCommandInfoAndTime({
       commandStart: 'Creating channel types',
       commandEnd: 'Created channel types',
-      skipCondition: false,
-      skipMessage: '',
     }),
   ],
 })

package/src/functions/wirings/channels/pikku-command-channels-map.ts

@@ -21,11 +21,6 @@ export const pikkuChannelsMap: any = pikkuSessionlessFunc<void, void>({
     logCommandInfoAndTime({
       commandStart: 'Creating channels map',
       commandEnd: 'Created channels map',
-      skipCondition: async ({ getInspectorState }) => {
-        const state = await getInspectorState()
-        return state.channels.files.size === 0
-      },
-      skipMessage: 'none found',
     }),
   ],
 })

package/src/functions/wirings/channels/pikku-command-channels.ts

@@ -35,11 +35,6 @@ export const pikkuChannels: any = pikkuSessionlessFunc<
     logCommandInfoAndTime({
       commandStart: 'Finding Channels',
       commandEnd: 'Found channels',
-      skipCondition: async ({ getInspectorState }) => {
-        const visitState = await getInspectorState()
-        return visitState.channels.files.size === 0
-      },
-      skipMessage: 'none found',
     }),
   ],
 })

package/src/functions/wirings/channels/pikku-command-websocket-typed.ts

@@ -9,8 +9,14 @@ export const pikkuWebSocketTyped: any = pikkuSessionlessFunc<void, void>({
     const { websocketFile, channelsMapDeclarationFile, packageMappings } =
       config
 
+    // If websocketFile is not set, clean up any existing file and return
     if (!websocketFile) {
-      throw new Error("fetchFile is isn't set in the pikku config")
+      logger.info({
+        message:
+          "Skipping generating websocket wrapper since websocketFile isn't set in the pikku config.",
+        type: 'skip',
+      })
+      return
     }
 
     const channelsMapDeclarationPath = getFileImportRelativePath(
@@ -26,8 +32,6 @@ export const pikkuWebSocketTyped: any = pikkuSessionlessFunc<void, void>({
     logCommandInfoAndTime({
       commandStart: 'Generating websocket wrapper',
       commandEnd: 'Generated websocket wrapper',
-      skipCondition: ({ config }) => config.websocketFile === undefined,
-      skipMessage: "websocketFile isn't set in the pikku config",
     }),
   ],
 })