@pikku/cli 0.11.2 → 0.11.3

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

@@ -7,6 +7,10 @@ import {
   serializeSchedulerMetaTS,
 } from './serialize-scheduler-meta.js'
 import { getFileImportRelativePath } from '../../../utils/file-import-path.js'
+import {
+  stripVerboseFields,
+  hasVerboseFields,
+} from '../../../utils/strip-verbose-meta.js'
 
 export const pikkuScheduler: any = pikkuSessionlessFunc<
   void,
@@ -23,12 +27,29 @@ export const pikkuScheduler: any = pikkuSessionlessFunc<
     } = config
     const { scheduledTasks } = visitState
 
+    const fullMeta = serializeSchedulerMeta(scheduledTasks.meta)
+
+    // Write minimal JSON (runtime-only fields)
+    const minimalMeta = stripVerboseFields(fullMeta)
     await writeFileInDir(
       logger,
       schedulersWiringMetaJsonFile,
-      JSON.stringify(serializeSchedulerMeta(scheduledTasks.meta), null, 2)
+      JSON.stringify(minimalMeta, null, 2)
     )
 
+    // Write verbose JSON only if it has additional fields
+    if (hasVerboseFields(fullMeta)) {
+      const verbosePath = schedulersWiringMetaJsonFile.replace(
+        /\.gen\.json$/,
+        '-verbose.gen.json'
+      )
+      await writeFileInDir(
+        logger,
+        verbosePath,
+        JSON.stringify(fullMeta, null, 2)
+      )
+    }
+
     const jsonImportPath = getFileImportRelativePath(
       schedulersWiringMetaFile,
       schedulersWiringMetaJsonFile,

package/src/functions/wirings/scheduler/serialize-scheduler-meta.ts

@@ -23,7 +23,7 @@ export const serializeSchedulerMetaTS = (
   serializedOutput.push(importStatement)
   serializedOutput.push('')
   serializedOutput.push(
-    "pikkuState('scheduler', 'meta', metaData as ScheduledTasksMeta)"
+    "pikkuState(null, 'scheduler', 'meta', metaData as ScheduledTasksMeta)"
   )
   serializedOutput.push('')
 

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

@@ -1,16 +1,18 @@
 import { pikkuSessionlessFunc } from '../../../../.pikku/pikku-types.gen.js'
-import { ErrorCode } from '@pikku/inspector'
+import { convertDslToGraph, ErrorCode } from '@pikku/inspector'
+import type { WorkflowsMeta } from '@pikku/core/workflow'
 import { writeFileInDir } from '../../../utils/file-writer.js'
 import { logCommandInfoAndTime } from '../../../middleware/log-command-info-and-time.js'
-import {
-  serializeWorkflowMeta,
-  serializeWorkflowMetaTS,
-} from './serialize-workflow-meta.js'
 import { serializeWorkflowTypes } from './serialize-workflow-types.js'
+import { serializeWorkflowRegistration } from './serialize-workflow-registration.js'
 import { serializeWorkflowMap } from './serialize-workflow-map.js'
+import { serializeWorkflowMeta } from './serialize-workflow-meta.js'
 import { serializeWorkflowWorkers } from './serialize-workflow-workers.js'
-import { serializeWorkflowWirings } from './serialize-workflow-wirings.js'
 import { getFileImportRelativePath } from '../../../utils/file-import-path.js'
+import {
+  stripVerboseFields,
+  hasVerboseFields,
+} from '../../../utils/strip-verbose-meta.js'
 import { join } from 'path'
 
 export const pikkuWorkflow: any = pikkuSessionlessFunc<
@@ -22,7 +24,7 @@ export const pikkuWorkflow: any = pikkuSessionlessFunc<
     const {
       workflowsWiringFile,
       workflowsWiringMetaFile,
-      workflowsWiringMetaJsonFile,
+      workflowMetaDir,
       workflowMapDeclarationFile,
       workflowTypesFile,
       functionTypesFile,
@@ -33,8 +35,16 @@ export const pikkuWorkflow: any = pikkuSessionlessFunc<
     const { workflows, functions: functionState } = visitState
     const { typesMap } = functionState
 
-    // Validate that workflowService service is configured if workflows are defined
-    const hasWorkflows = Object.keys(workflows.meta).length > 0
+    // Get all workflow names (both DSL and graph-based)
+    const dslWorkflowNames = Object.keys(workflows.meta)
+    const graphWorkflowNames = Object.keys(workflows.graphMeta)
+    const allWorkflowNames = [
+      ...new Set([...dslWorkflowNames, ...graphWorkflowNames]),
+    ]
+
+    const hasWorkflows = allWorkflowNames.length > 0
+
+    // Validate that workflowService is configured if workflows are defined
     if (hasWorkflows) {
       const hasWorkflowState =
         visitState.serviceAggregation.allSingletonServices.includes(
@@ -51,48 +61,103 @@ export const pikkuWorkflow: any = pikkuSessionlessFunc<
       }
     }
 
-    await writeFileInDir(
-      logger,
-      workflowsWiringMetaJsonFile,
-      JSON.stringify(serializeWorkflowMeta(workflows.meta), null, 2)
-    )
+    // Generate individual JSON files for each workflow (convert DSL to graph format)
+    if (hasWorkflows && workflowMetaDir) {
+      // Write individual JSON files for DSL workflows
+      const dslMeta = workflows.meta as WorkflowsMeta
+      for (const [name, meta] of Object.entries(dslMeta)) {
+        const graphMeta = convertDslToGraph(name, meta)
 
-    const jsonImportPath = getFileImportRelativePath(
-      workflowsWiringMetaFile,
-      workflowsWiringMetaJsonFile,
-      packageMappings
-    )
+        // Write minimal version (runtime-only fields)
+        const minimalMeta = stripVerboseFields(graphMeta)
+        const minimalPath = join(workflowMetaDir, `${name}.gen.json`)
+        await writeFileInDir(
+          logger,
+          minimalPath,
+          JSON.stringify(minimalMeta, null, 2),
+          { ignoreModifyComment: true }
+        )
 
-    // Write workflow metadata TypeScript file that imports JSON
-    await writeFileInDir(
-      logger,
-      workflowsWiringMetaFile,
-      serializeWorkflowMetaTS(
-        workflows.meta,
-        jsonImportPath,
-        schema?.supportsImportAttributes ?? false
+        // Write verbose version only if it has additional fields
+        if (hasVerboseFields(graphMeta)) {
+          const verbosePath = join(workflowMetaDir, `${name}-verbose.gen.json`)
+          await writeFileInDir(
+            logger,
+            verbosePath,
+            JSON.stringify(graphMeta, null, 2),
+            { ignoreModifyComment: true }
+          )
+        }
+      }
+
+      // Write individual JSON files for graph workflows
+      for (const [name, graphMeta] of Object.entries(workflows.graphMeta)) {
+        // Write minimal version (runtime-only fields)
+        const minimalMeta = stripVerboseFields(graphMeta)
+        const minimalPath = join(workflowMetaDir, `${name}.gen.json`)
+        await writeFileInDir(
+          logger,
+          minimalPath,
+          JSON.stringify(minimalMeta, null, 2),
+          { ignoreModifyComment: true }
+        )
+
+        // Write verbose version only if it has additional fields
+        if (hasVerboseFields(graphMeta)) {
+          const verbosePath = join(workflowMetaDir, `${name}-verbose.gen.json`)
+          await writeFileInDir(
+            logger,
+            verbosePath,
+            JSON.stringify(graphMeta, null, 2),
+            { ignoreModifyComment: true }
+          )
+        }
+      }
+    }
+
+    // Generate workflow meta aggregation file
+    if (workflowsWiringMetaFile && workflowMetaDir) {
+      await writeFileInDir(
+        logger,
+        workflowsWiringMetaFile,
+        serializeWorkflowMeta(
+          workflowsWiringMetaFile,
+          workflowMetaDir,
+          allWorkflowNames,
+          packageMappings,
+          schema?.supportsImportAttributes ?? false,
+          config.externalPackageName
+        )
       )
+    }
+
+    // Generate workflow registration (meta + DSL workflow registrations)
+    const metaImportPath = getFileImportRelativePath(
+      workflowsWiringFile,
+      workflowsWiringMetaFile,
+      packageMappings
     )
 
-    // Write workflow wirings (imports and addWorkflow calls)
     await writeFileInDir(
       logger,
       workflowsWiringFile,
-      serializeWorkflowWirings(
+      serializeWorkflowRegistration(
         workflowsWiringFile,
+        metaImportPath,
+        allWorkflowNames,
         workflows.files,
-        packageMappings
+        workflows.graphFiles,
+        packageMappings,
+        config.externalPackageName
       )
     )
 
-    // Write workflow types
+    // Generate workflow types (DSL + graph helpers in one file)
     const functionTypesImportPath = getFileImportRelativePath(
       workflowTypesFile,
       functionTypesFile,
       packageMappings
     )
-
-    // Get RPC map import path
     const rpcMapImportPath = getFileImportRelativePath(
       workflowTypesFile,
       config.rpcInternalMapDeclarationFile,
@@ -105,7 +170,8 @@ export const pikkuWorkflow: any = pikkuSessionlessFunc<
       serializeWorkflowTypes(functionTypesImportPath, rpcMapImportPath)
     )
 
-    // Write workflow map (type-safe client API)
+    // Generate workflow map (I/O types for type-safe client)
+    // Always generate even if empty - RPC map imports WorkflowMap
     await writeFileInDir(
       logger,
       workflowMapDeclarationFile,
@@ -118,6 +184,7 @@ export const pikkuWorkflow: any = pikkuSessionlessFunc<
       )
     )
 
+    // Generate workflow workers if configured
     if (config.workflows) {
       if (config.workflows.singleQueue) {
         const workflowPath = join(config.rootDir, config.workflows.path)
@@ -140,12 +207,12 @@ export const pikkuWorkflow: any = pikkuSessionlessFunc<
       }
     }
 
-    return true
+    return hasWorkflows
   },
   middleware: [
     logCommandInfoAndTime({
-      commandStart: 'Finding Workflows',
-      commandEnd: 'Found Workflows',
+      commandStart: 'Generating Workflows',
+      commandEnd: 'Generated Workflows',
     }),
   ],
 })

package/src/functions/wirings/workflow/serialize-workflow-map.ts

@@ -1,3 +1,6 @@
+/**
+ * Generate workflow map type definitions for type-safe client API
+ */
 import type { WorkflowsMeta } from '@pikku/core/workflow'
 import { serializeImportMap } from '../../../utils/serialize-import-map.js'
 import { TypesMap } from '@pikku/inspector'
@@ -12,7 +15,8 @@ export const serializeWorkflowMap = (
   workflowsMeta: WorkflowsMeta
 ) => {
   const requiredTypes = new Set<string>()
-  const serializedCustomTypes = generateCustomTypes(typesMap, requiredTypes)
+
+  // First generate workflows to collect required types
   const serializedWorkflows = generateWorkflows(
     workflowsMeta,
     functionsMeta,
@@ -20,15 +24,23 @@ export const serializeWorkflowMap = (
     requiredTypes
   )
 
-  const serializedImportMap = serializeImportMap(
-    relativeToPath,
-    packageMappings,
-    typesMap,
-    requiredTypes
-  )
+  // Only generate custom types if we have workflows with types
+  const hasWorkflows = Object.keys(workflowsMeta).length > 0
+  const serializedCustomTypes = hasWorkflows
+    ? generateCustomTypes(typesMap, requiredTypes)
+    : ''
+
+  const serializedImportMap = hasWorkflows
+    ? serializeImportMap(
+        relativeToPath,
+        packageMappings,
+        typesMap,
+        requiredTypes
+      )
+    : ''
 
   return `/**
- * This provides the structure needed for TypeScript to be aware of workflows and their input/output types
+ * Workflow type map with input/output types for each workflow
  */
 
 ${serializedImportMap}
@@ -41,33 +53,16 @@ interface WorkflowHandler<I, O> {
 
 ${serializedWorkflows}
 
-/**
- * Type-safe workflow client API
- */
 export type WorkflowClient<Name extends keyof WorkflowMap> = {
-  /**
-   * Start a new workflow run
-   */
   start: (input: WorkflowMap[Name]['input']) => Promise<{ runId: string }>;
-
-  /**
-   * Get a workflow run by ID
-   */
   getRun: <output extends keyof WorkflowMap[Name]>(runId: string) => Promise<WorkflowMap[Name][output]>;
-
-  /**
-   * Cancel a running workflow
-   */
   cancelRun: (runId: string) => Promise<boolean>;
 }
 
-/**
- * Map of all registered workflows with type-safe client APIs
- */
 export type TypedWorkflowClients = {
   [Name in keyof WorkflowMap]: WorkflowClient<Name>;
 }
-  `
+`
 }
 
 function generateWorkflows(
@@ -76,13 +71,11 @@ function generateWorkflows(
   typesMap: TypesMap,
   requiredTypes: Set<string>
 ) {
-  // Initialize an object to collect workflows
   const workflowsObj: Record<
     string,
     { inputType: string; outputType: string }
   > = {}
 
-  // Iterate through workflow metadata
   for (const [workflowName, { pikkuFuncName }] of Object.entries(
     workflowsMeta
   )) {
@@ -96,27 +89,32 @@ function generateWorkflows(
     const input = functionMeta.inputs ? functionMeta.inputs[0] : undefined
     const output = functionMeta.outputs ? functionMeta.outputs[0] : undefined
 
-    // Store the input and output types for WorkflowHandler
-    const inputType = input ? typesMap.getTypeMeta(input).uniqueName : 'void'
-    const outputType = output ? typesMap.getTypeMeta(output).uniqueName : 'void'
+    let inputType = 'void'
+    if (input) {
+      try {
+        inputType = typesMap.getTypeMeta(input).uniqueName
+      } catch {
+        inputType = input
+      }
+    }
+    let outputType = 'void'
+    if (output) {
+      try {
+        outputType = typesMap.getTypeMeta(output).uniqueName
+      } catch {
+        outputType = output
+      }
+    }
 
     requiredTypes.add(inputType)
     requiredTypes.add(outputType)
-
-    // Add workflow entry
-    workflowsObj[workflowName] = {
-      inputType,
-      outputType,
-    }
+    workflowsObj[workflowName] = { inputType, outputType }
   }
 
-  // Build the Workflows object as a string
   let workflowsStr = 'export type WorkflowMap = {\n'
-
   for (const [workflowName, handler] of Object.entries(workflowsObj)) {
     workflowsStr += `  readonly '${workflowName}': WorkflowHandler<${handler.inputType}, ${handler.outputType}>,\n`
   }
-
   workflowsStr += '};\n'
 
   return workflowsStr

package/src/functions/wirings/workflow/serialize-workflow-meta.ts

@@ -1,33 +1,73 @@
-import { WorkflowsMeta } from '@pikku/core/workflow'
+/**
+ * Generate workflow meta aggregation file that imports individual workflow JSON files
+ * and registers them with pikkuState
+ */
+import { getFileImportRelativePath } from '../../../utils/file-import-path.js'
 
-export const serializeWorkflowMeta = (workflowsMeta: WorkflowsMeta) => {
-  return workflowsMeta
-}
-
-export const serializeWorkflowMetaTS = (
-  workflowsMeta: WorkflowsMeta,
-  jsonImportPath: string,
-  supportsImportAttributes: boolean
+export const serializeWorkflowMeta = (
+  outputPath: string,
+  metaDir: string,
+  workflowNames: string[],
+  packageMappings: Record<string, string>,
+  supportsImportAttributes: boolean,
+  packageName?: string
 ) => {
-  const importStatement = supportsImportAttributes
-    ? `import metaData from '${jsonImportPath}' with { type: 'json' }`
-    : `import metaData from '${jsonImportPath}'`
-
-  const serializedOutput: string[] = []
-  serializedOutput.push("import { pikkuState } from '@pikku/core'")
-  serializedOutput.push("import { WorkflowsMeta } from '@pikku/core/workflow'")
-  serializedOutput.push(importStatement)
-  serializedOutput.push('')
-  serializedOutput.push(
-    "pikkuState('workflows', 'meta', metaData as WorkflowsMeta)"
+  const lines: string[] = []
+
+  if (workflowNames.length === 0) {
+    // Empty meta file - still need to register empty meta
+    lines.push("import { pikkuState } from '@pikku/core'")
+    lines.push(
+      "import type { SerializedWorkflowGraphs } from '@pikku/inspector/workflow-graph'"
+    )
+    lines.push('')
+    lines.push('const workflowsMeta: SerializedWorkflowGraphs = {}')
+    lines.push('')
+    const packageNameValue = packageName ? `'${packageName}'` : 'null'
+    lines.push(
+      `pikkuState(${packageNameValue}, 'workflows', 'meta', workflowsMeta)`
+    )
+    return lines.join('\n')
+  }
+
+  // Imports
+  lines.push("import { pikkuState } from '@pikku/core'")
+  lines.push(
+    "import type { SerializedWorkflowGraphs } from '@pikku/inspector/workflow-graph'"
   )
-  serializedOutput.push('')
+  lines.push('')
 
-  const workflowsMetaValues = Object.values(workflowsMeta)
-  if (workflowsMetaValues.length > 0) {
-    serializedOutput.push(
-      `export type WorkflowNames = '${workflowsMetaValues.map((w) => w.workflowName).join("' | '")}'`
+  // Import each workflow meta JSON
+  const sortedNames = [...workflowNames].sort()
+  for (const name of sortedNames) {
+    const jsonPath = `${metaDir}/${name}.gen.json`
+    const importPath = getFileImportRelativePath(
+      outputPath,
+      jsonPath,
+      packageMappings
     )
+    const importStatement = supportsImportAttributes
+      ? `import ${name}Meta from '${importPath}' with { type: 'json' }`
+      : `import ${name}Meta from '${importPath}'`
+    lines.push(importStatement)
   }
-  return serializedOutput.join('\n')
+
+  lines.push('')
+
+  // Create aggregated meta object (cast JSON imports to proper types)
+  lines.push('const workflowsMeta = {')
+  for (const name of sortedNames) {
+    lines.push(`  '${name}': ${name}Meta,`)
+  }
+  lines.push('} as SerializedWorkflowGraphs')
+
+  lines.push('')
+
+  // Register meta with pikkuState
+  const packageNameValue = packageName ? `'${packageName}'` : 'null'
+  lines.push(
+    `pikkuState(${packageNameValue}, 'workflows', 'meta', workflowsMeta)`
+  )
+
+  return lines.join('\n')
 }

package/src/functions/wirings/workflow/serialize-workflow-registration.ts

@@ -0,0 +1,83 @@
+/**
+ * Generate workflow runtime registration
+ * Imports meta (which registers with pikkuState) and registers DSL workflows (addWorkflow) and graph workflows (addWorkflowGraph)
+ */
+import { getFileImportRelativePath } from '../../../utils/file-import-path.js'
+
+export const serializeWorkflowRegistration = (
+  outputPath: string,
+  metaImportPath: string,
+  workflowNames: string[],
+  workflowFiles: Map<string, { path: string; exportedName: string }>,
+  graphFiles: Map<string, { path: string; exportedName: string }>,
+  packageMappings: Record<string, string>,
+  _packageName?: string
+) => {
+  const lines: string[] = []
+  const hasWorkflows = workflowNames.length > 0
+  const hasDslWorkflows = workflowFiles.size > 0
+  const hasGraphWorkflows = graphFiles.size > 0
+
+  // Imports
+  const imports: string[] = []
+  if (hasDslWorkflows) {
+    imports.push('addWorkflow')
+  }
+  if (hasGraphWorkflows) {
+    imports.push('addWorkflowGraph')
+  }
+  if (imports.length > 0) {
+    lines.push(`import { ${imports.join(', ')} } from '@pikku/core/workflow'`)
+  }
+
+  // Import meta file (which registers meta with pikkuState)
+  if (hasWorkflows) {
+    lines.push(`import '${metaImportPath}'`)
+  }
+
+  // Import DSL workflow functions
+  const sortedWorkflows = Array.from(workflowFiles.entries()).sort((a, b) =>
+    a[0].localeCompare(b[0])
+  )
+  for (const [, { path, exportedName }] of sortedWorkflows) {
+    const importPath = getFileImportRelativePath(
+      outputPath,
+      path,
+      packageMappings
+    )
+    lines.push(`import { ${exportedName} } from '${importPath}'`)
+  }
+
+  // Import graph workflow definitions
+  const sortedGraphWorkflows = Array.from(graphFiles.entries()).sort((a, b) =>
+    a[0].localeCompare(b[0])
+  )
+  for (const [, { path, exportedName }] of sortedGraphWorkflows) {
+    const importPath = getFileImportRelativePath(
+      outputPath,
+      path,
+      packageMappings
+    )
+    lines.push(`import { ${exportedName} } from '${importPath}'`)
+  }
+
+  lines.push('')
+
+  // Register DSL workflows
+  for (const [pikkuFuncName, { exportedName }] of sortedWorkflows) {
+    lines.push(`addWorkflow('${pikkuFuncName}', ${exportedName})`)
+  }
+
+  // Register graph workflows
+  for (const [workflowName, { exportedName }] of sortedGraphWorkflows) {
+    lines.push(`addWorkflowGraph('${workflowName}', ${exportedName})`)
+  }
+
+  // Export workflow names type
+  if (hasWorkflows) {
+    lines.push('')
+    lines.push(`export type WorkflowNames = '${workflowNames.join("' | '")}'`)
+  }
+
+  return lines.join('\n')
+}