@pikku/cli 0.6.12 → 0.6.13

package/src/pikku-cli-config.ts

@@ -1,6 +1,7 @@
 import { join, dirname, resolve, isAbsolute } from 'path'
 import { readdir, readFile } from 'fs/promises'
 import { OpenAPISpecInfo } from './openapi/openapi-spec-generator.js'
+import { InspectorFilters } from '@pikku/inspector'
 
 export interface PikkuCLICoreOutputFiles {
   outDir?: string
@@ -35,6 +36,8 @@ export type PikkuCLIConfig = {
     outputFile: string
     additionalInfo: OpenAPISpecInfo
   }
+
+  filters: InspectorFilters
 } & PikkuCLICoreOutputFiles
 
 const CONFIG_DIR_FILES = ['nextJSfile', 'fetchFile', 'websocketFile']
@@ -42,11 +45,13 @@ const CONFIG_DIR_FILES = ['nextJSfile', 'fetchFile', 'websocketFile']
 export const getPikkuCLIConfig = async (
   configFile: string | undefined = undefined,
   requiredFields: Array<keyof PikkuCLIConfig>,
+  tags: string[] = [],
   exitProcess: boolean = false
 ): Promise<PikkuCLIConfig> => {
   const config = await _getPikkuCLIConfig(
     configFile,
     requiredFields,
+    tags,
     exitProcess
   )
   return config
@@ -55,6 +60,7 @@ export const getPikkuCLIConfig = async (
 const _getPikkuCLIConfig = async (
   configFile: string | undefined = undefined,
   requiredFields: Array<keyof PikkuCLIConfig>,
+  tags: string[] = [],
   exitProcess: boolean = false
 ): Promise<PikkuCLIConfig> => {
   if (!configFile) {
@@ -82,6 +88,7 @@ const _getPikkuCLIConfig = async (
       const extendedConfig = await getPikkuCLIConfig(
         resolve(configDir, config.extends),
         [],
+        tags,
         exitProcess
       )
       result = {
@@ -154,6 +161,11 @@ const _getPikkuCLIConfig = async (
       }
     }
 
+    result.filters = result.filters || {}
+    if (tags.length > 0) {
+      result.filters.tags = tags
+    }
+
     if (!isAbsolute(result.tsconfig)) {
       result.tsconfig = join(result.rootDir, result.tsconfig)
     }

package/src/utils.ts

@@ -52,6 +52,7 @@ interface Meta {
 export type FilesAndMethods = {
   userSessionType: Meta
   sessionServicesType: Meta
+  singletonServicesType: Meta
   pikkuConfigFactory: Meta
   singletonServicesFactory: Meta
   sessionServicesFactory: Meta
@@ -63,6 +64,7 @@ export interface PikkuCLIOptions {
   userSessionType?: string
   singletonServicesFactoryType?: string
   sessionServicesFactoryType?: string
+  tags?: string[]
 }
 
 const getMetaTypes = (
@@ -102,7 +104,8 @@ const getMetaTypes = (
 
 export const getPikkuFilesAndMethods = async (
   {
-    sessionServicesTypeImportMap: httpSessionServicesTypeImportMap,
+    singletonServicesTypeImportMap,
+    sessionServicesTypeImportMap,
     userSessionTypeImportMap,
     sessionServicesFactories,
     singletonServicesFactories,
@@ -118,11 +121,13 @@ export const getPikkuFilesAndMethods = async (
   requires: Partial<{
     config: boolean
     sessionServiceType: boolean
+    singletonServicesType: boolean
     userSessionType: boolean
     singletonServicesFactory: boolean
     sessionServicesFactory: boolean
   }> = {
     config: false,
+    singletonServicesType: false,
     sessionServiceType: false,
     userSessionType: false,
     singletonServicesFactory: false,
@@ -138,10 +143,15 @@ export const getPikkuFilesAndMethods = async (
       userSessionTypeImportMap,
       configFileType
     ),
+    singletonServicesType: getMetaTypes(
+      'CoreSingletonServices',
+      requires.singletonServicesType ? errors : new Map(),
+      singletonServicesTypeImportMap
+    ),
     sessionServicesType: getMetaTypes(
       'CoreServices',
       requires.sessionServiceType ? errors : new Map(),
-      httpSessionServicesTypeImportMap
+      sessionServicesTypeImportMap
     ),
     pikkuConfigFactory: getMetaTypes(
       'CoreConfig',
@@ -210,7 +220,9 @@ export const logCommandInfoAndTime = async (
   callback: (...args: any[]) => Promise<unknown>
 ): Promise<boolean> => {
   if (skipCondition === true) {
-    logInfo(`• Skipping ${commandStart} since ${skipMessage}.`)
+    logInfo(
+      `• Skipping ${commandStart.charAt(0).toLocaleLowerCase()}${commandStart.slice(1)} since ${skipMessage}.`
+    )
     return false
   }