@pikku/cli 0.11.3 → 0.12.0

package/dist/src/functions/wirings/scheduler/serialize-scheduler-types.js

@@ -22,7 +22,7 @@ type SchedulerWiring = CoreScheduledTask<PikkuFunctionConfig<void, void, 'sessio
  * @param task - Scheduled task definition with cron expression and handler
  */
 export const wireScheduler = (task: SchedulerWiring) => {
-  wireSchedulerCore(task as any) // TODO
+  wireSchedulerCore(task as any)
 }
 `;
 };

package/dist/src/functions/wirings/secrets/pikku-command-secrets.d.ts

@@ -0,0 +1 @@
+export declare const pikkuSecrets: import("#pikku").PikkuFunctionConfig<void, void, "session" | "rpc", import("#pikku").PikkuFunctionSessionless<void, void, "session" | "rpc", import("#pikku").Services> | import("#pikku").PikkuFunction<void, void, "session" | "rpc", import("#pikku").Services>, undefined, undefined>;

package/dist/src/functions/wirings/secrets/pikku-command-secrets.js

@@ -0,0 +1,31 @@
+import { pikkuSessionlessFunc } from '#pikku';
+import { writeFileInDir } from '../../../utils/file-writer.js';
+import { logCommandInfoAndTime } from '../../../middleware/log-command-info-and-time.js';
+import { serializeSecretsTypes } from './serialize-secrets-types.js';
+import { validateAndBuildSecretDefinitionsMeta } from '@pikku/core/secret';
+export const pikkuSecrets = pikkuSessionlessFunc({
+    func: async ({ logger, config, getInspectorState }) => {
+        const { secretsFile, secretsMetaJsonFile, packageMappings } = config;
+        if (!secretsFile) {
+            return;
+        }
+        const state = await getInspectorState();
+        const content = serializeSecretsTypes({
+            definitions: state.secrets.definitions,
+            schemaLookup: state.schemaLookup,
+            secretsFile,
+            packageMappings,
+        });
+        await writeFileInDir(logger, secretsFile, content);
+        if (secretsMetaJsonFile) {
+            const meta = validateAndBuildSecretDefinitionsMeta(state.secrets.definitions, state.schemaLookup);
+            await writeFileInDir(logger, secretsMetaJsonFile, JSON.stringify(meta, null, 2));
+        }
+    },
+    middleware: [
+        logCommandInfoAndTime({
+            commandStart: 'Creating PikkuSecrets types',
+            commandEnd: 'Created PikkuSecrets types',
+        }),
+    ],
+});

package/dist/src/functions/wirings/secrets/serialize-secrets-types.d.ts

@@ -0,0 +1,9 @@
+import { SecretDefinitions } from '@pikku/core/secret';
+import { SchemaRef } from '@pikku/inspector';
+export interface SerializeSecretsOptions {
+    definitions: SecretDefinitions;
+    schemaLookup: Map<string, SchemaRef>;
+    secretsFile: string;
+    packageMappings: Record<string, string>;
+}
+export declare const serializeSecretsTypes: ({ definitions, schemaLookup, secretsFile, packageMappings, }: SerializeSecretsOptions) => string;

package/dist/src/functions/wirings/secrets/serialize-secrets-types.js

@@ -0,0 +1,64 @@
+import { validateAndBuildSecretDefinitionsMeta } from '@pikku/core/secret';
+import { getFileImportRelativePath } from '../../../utils/file-import-path.js';
+export const serializeSecretsTypes = ({ definitions, schemaLookup, secretsFile, packageMappings, }) => {
+    const secrets = validateAndBuildSecretDefinitionsMeta(definitions, schemaLookup);
+    const credentialEntries = Object.entries(secrets);
+    const schemaImports = new Map();
+    let needsOAuth2Types = false;
+    let needsZod = false;
+    const mapEntries = [];
+    const metaEntries = [];
+    for (const [name, meta] of credentialEntries) {
+        if (meta.oauth2) {
+            needsOAuth2Types = true;
+            mapEntries.push(`  '${meta.secretId}': OAuth2AppCredential`);
+            mapEntries.push(`  '${meta.oauth2.tokenSecretId}': OAuth2Token`);
+            metaEntries.push(`  '${meta.secretId}': { name: '${name}', displayName: '${meta.displayName}', oauth2: { tokenSecretId: '${meta.oauth2.tokenSecretId}' } }`);
+            metaEntries.push(`  '${meta.oauth2.tokenSecretId}': { name: '${name}_tokens', displayName: '${meta.displayName} Tokens' }`);
+        }
+        else if (meta.schema && typeof meta.schema === 'string') {
+            const schemaRef = schemaLookup.get(meta.schema);
+            if (schemaRef) {
+                needsZod = true;
+                if (!schemaImports.has(schemaRef.sourceFile)) {
+                    schemaImports.set(schemaRef.sourceFile, new Set());
+                }
+                schemaImports.get(schemaRef.sourceFile).add(schemaRef.variableName);
+                mapEntries.push(`  '${meta.secretId}': z.infer<typeof ${schemaRef.variableName}>`);
+                metaEntries.push(`  '${meta.secretId}': { name: '${name}', displayName: '${meta.displayName}' }`);
+            }
+        }
+    }
+    const imports = [];
+    imports.push(`import { TypedSecretService as CoreTypedSecretService, type CredentialMeta } from '@pikku/core/services'`);
+    imports.push(`import type { SecretService } from '@pikku/core/services'`);
+    if (needsZod) {
+        imports.push(`import type { z } from 'zod'`);
+    }
+    if (needsOAuth2Types) {
+        imports.push(`import type { OAuth2AppCredential, OAuth2Token } from '@pikku/core/oauth2'`);
+    }
+    for (const [sourceFile, variableNames] of schemaImports) {
+        const importPath = getFileImportRelativePath(secretsFile, sourceFile, packageMappings);
+        const vars = Array.from(variableNames).join(', ');
+        imports.push(`import { ${vars} } from '${importPath}'`);
+    }
+    return `${imports.join('\n')}
+
+export interface CredentialsMap {
+${mapEntries.join('\n')}
+}
+
+export type SecretId = keyof CredentialsMap
+
+const CREDENTIALS_META: Record<string, CredentialMeta> = {
+${metaEntries.join(',\n')}
+}
+
+export class TypedSecretService extends CoreTypedSecretService<CredentialsMap> {
+  constructor(secrets: SecretService) {
+    super(secrets, CREDENTIALS_META)
+  }
+}
+`;
+};

package/dist/src/functions/wirings/triggers/pikku-command-trigger-types.d.ts

@@ -0,0 +1 @@
+export declare const pikkuTriggerTypes: import("#pikku").PikkuFunctionConfig<void, void, "session" | "rpc", import("#pikku").PikkuFunctionSessionless<void, void, "session" | "rpc", import("#pikku").Services> | import("#pikku").PikkuFunction<void, void, "session" | "rpc", import("#pikku").Services>, undefined, undefined>;

package/dist/src/functions/wirings/triggers/pikku-command-trigger-types.js

@@ -0,0 +1,24 @@
+import { pikkuSessionlessFunc } from '#pikku';
+import { writeFileInDir } from '../../../utils/file-writer.js';
+import { getFileImportRelativePath } from '../../../utils/file-import-path.js';
+import { logCommandInfoAndTime } from '../../../middleware/log-command-info-and-time.js';
+import { serializeTriggerTypes } from './serialize-trigger-types.js';
+export const pikkuTriggerTypes = pikkuSessionlessFunc({
+    func: async ({ logger, config, getInspectorState }) => {
+        const { triggersTypesFile, packageMappings } = config;
+        const visitState = await getInspectorState();
+        const { singletonServicesType } = visitState.filesAndMethods;
+        if (!singletonServicesType) {
+            throw new Error('SingletonServices type not found');
+        }
+        const singletonServicesTypeImport = `import type { ${singletonServicesType.type} } from '${getFileImportRelativePath(triggersTypesFile, singletonServicesType.typePath, packageMappings)}'`;
+        const content = serializeTriggerTypes(singletonServicesTypeImport, singletonServicesType.type);
+        await writeFileInDir(logger, triggersTypesFile, content);
+    },
+    middleware: [
+        logCommandInfoAndTime({
+            commandStart: 'Creating trigger types',
+            commandEnd: 'Created trigger types',
+        }),
+    ],
+});

package/dist/src/functions/wirings/triggers/pikku-command-trigger.d.ts

@@ -0,0 +1 @@
+export declare const pikkuTrigger: import("#pikku").PikkuFunctionConfig<void, boolean | undefined, "session" | "rpc", import("#pikku").PikkuFunctionSessionless<void, boolean | undefined, "session" | "rpc", import("#pikku").Services> | import("#pikku").PikkuFunction<void, boolean | undefined, "session" | "rpc", import("#pikku").Services>, undefined, undefined>;

package/dist/src/functions/wirings/triggers/pikku-command-trigger.js

@@ -0,0 +1,40 @@
+import { pikkuSessionlessFunc } from '#pikku';
+import { serializeFileImports } from '../../../utils/file-imports-serializer.js';
+import { writeFileInDir } from '../../../utils/file-writer.js';
+import { logCommandInfoAndTime } from '../../../middleware/log-command-info-and-time.js';
+import { serializeTriggerMeta, serializeTriggerMetaTS, serializeTriggerSourceMeta, serializeTriggerSourceMetaTS, } from './serialize-trigger-meta.js';
+import { getFileImportRelativePath } from '../../../utils/file-import-path.js';
+import { stripVerboseFields, hasVerboseFields, } from '../../../utils/strip-verbose-meta.js';
+export const pikkuTrigger = pikkuSessionlessFunc({
+    func: async ({ logger, config, getInspectorState }) => {
+        const visitState = await getInspectorState();
+        const { triggersWiringFile, triggersWiringMetaFile, triggersWiringMetaJsonFile, triggerSourcesMetaFile, triggerSourcesMetaJsonFile, packageMappings, schema, } = config;
+        const { triggers } = visitState;
+        if (Object.keys(triggers.meta).length === 0) {
+            return undefined;
+        }
+        const fullMeta = serializeTriggerMeta(triggers.meta);
+        // Write minimal JSON (runtime-only fields)
+        const minimalMeta = stripVerboseFields(fullMeta);
+        await writeFileInDir(logger, triggersWiringMetaJsonFile, JSON.stringify(minimalMeta, null, 2));
+        // Write verbose JSON only if it has additional fields
+        if (hasVerboseFields(fullMeta)) {
+            const verbosePath = triggersWiringMetaJsonFile.replace(/\.gen\.json$/, '-verbose.gen.json');
+            await writeFileInDir(logger, verbosePath, JSON.stringify(fullMeta, null, 2));
+        }
+        const jsonImportPath = getFileImportRelativePath(triggersWiringMetaFile, triggersWiringMetaJsonFile, packageMappings);
+        await writeFileInDir(logger, triggersWiringMetaFile, serializeTriggerMetaTS(triggers.meta, jsonImportPath, schema?.supportsImportAttributes ?? false));
+        await writeFileInDir(logger, triggersWiringFile, serializeFileImports('wireTrigger', triggersWiringFile, triggers.files, packageMappings));
+        const sourceMetaJson = serializeTriggerSourceMeta(triggers.sourceMeta);
+        await writeFileInDir(logger, triggerSourcesMetaJsonFile, JSON.stringify(sourceMetaJson, null, 2));
+        const sourceMetaJsonImportPath = getFileImportRelativePath(triggerSourcesMetaFile, triggerSourcesMetaJsonFile, packageMappings);
+        await writeFileInDir(logger, triggerSourcesMetaFile, serializeTriggerSourceMetaTS(triggers.sourceMeta, sourceMetaJsonImportPath, schema?.supportsImportAttributes ?? false));
+        return true;
+    },
+    middleware: [
+        logCommandInfoAndTime({
+            commandStart: 'Finding triggers',
+            commandEnd: 'Found triggers',
+        }),
+    ],
+});

package/dist/src/functions/wirings/triggers/serialize-trigger-meta.d.ts

@@ -0,0 +1,5 @@
+import { TriggerMeta, TriggerSourceMeta } from '@pikku/core/trigger';
+export declare const serializeTriggerMeta: (triggerMeta: TriggerMeta) => TriggerMeta;
+export declare const serializeTriggerMetaTS: (triggerMeta: TriggerMeta, jsonImportPath: string, supportsImportAttributes: boolean) => string;
+export declare const serializeTriggerSourceMeta: (sourceMeta: TriggerSourceMeta) => TriggerSourceMeta;
+export declare const serializeTriggerSourceMetaTS: (sourceMeta: TriggerSourceMeta, jsonImportPath: string, supportsImportAttributes: boolean) => string;

package/dist/src/functions/wirings/triggers/serialize-trigger-meta.js

@@ -0,0 +1,35 @@
+export const serializeTriggerMeta = (triggerMeta) => {
+    return triggerMeta;
+};
+export const serializeTriggerMetaTS = (triggerMeta, jsonImportPath, supportsImportAttributes) => {
+    const importStatement = supportsImportAttributes
+        ? `import metaData from '${jsonImportPath}' with { type: 'json' }`
+        : `import metaData from '${jsonImportPath}'`;
+    const serializedOutput = [];
+    serializedOutput.push("import { pikkuState } from '@pikku/core'");
+    serializedOutput.push("import { TriggerMeta } from '@pikku/core/trigger'");
+    serializedOutput.push(importStatement);
+    serializedOutput.push('');
+    serializedOutput.push("pikkuState(null, 'trigger', 'meta', metaData as TriggerMeta)");
+    serializedOutput.push('');
+    const triggerMetaValues = Object.values(triggerMeta);
+    if (triggerMetaValues.length > 0) {
+        serializedOutput.push(`export type TriggerNames = '${triggerMetaValues.map((t) => t.name).join("' | '")}'`);
+    }
+    return serializedOutput.join('\n');
+};
+export const serializeTriggerSourceMeta = (sourceMeta) => {
+    return sourceMeta;
+};
+export const serializeTriggerSourceMetaTS = (sourceMeta, jsonImportPath, supportsImportAttributes) => {
+    const importStatement = supportsImportAttributes
+        ? `import metaData from '${jsonImportPath}' with { type: 'json' }`
+        : `import metaData from '${jsonImportPath}'`;
+    const serializedOutput = [];
+    serializedOutput.push("import { pikkuState } from '@pikku/core'");
+    serializedOutput.push("import { TriggerSourceMeta } from '@pikku/core/trigger'");
+    serializedOutput.push(importStatement);
+    serializedOutput.push('');
+    serializedOutput.push("pikkuState(null, 'trigger', 'sourceMeta', metaData as TriggerSourceMeta)");
+    return serializedOutput.join('\n');
+};

package/dist/src/functions/wirings/triggers/serialize-trigger-types.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Generates type definitions for trigger wirings
+ */
+export declare const serializeTriggerTypes: (singletonServicesTypeImport: string, singletonServicesTypeName: string) => string;

package/dist/src/functions/wirings/triggers/serialize-trigger-types.js

@@ -0,0 +1,163 @@
+/**
+ * Generates type definitions for trigger wirings
+ */
+export const serializeTriggerTypes = (singletonServicesTypeImport, singletonServicesTypeName) => {
+    return `/**
+ * Trigger-specific type definitions for tree-shaking optimization
+ */
+
+import { CorePikkuTriggerFunction, CorePikkuTriggerFunctionConfig, CoreTrigger, wireTrigger as wireTriggerCore, wireTriggerSource as wireTriggerSourceCore } from '@pikku/core/trigger'
+import type { CoreNodeConfig } from '@pikku/core/node'
+${singletonServicesTypeImport}
+import type { StandardSchemaV1 } from '@standard-schema/spec'
+
+${singletonServicesTypeName !== 'SingletonServices' ? `type SingletonServices = ${singletonServicesTypeName}` : ''}
+
+/**
+ * A trigger function that sets up a subscription and returns a teardown function.
+ * The trigger is fired via wire.trigger.invoke(data).
+ *
+ * @template TInput - Input type (configuration passed when wired)
+ * @template TOutput - Output type produced when trigger fires
+ */
+export type PikkuTriggerFunction<
+  TInput = unknown,
+  TOutput = unknown
+> = CorePikkuTriggerFunction<TInput, TOutput, SingletonServices>
+
+/**
+ * Configuration object for creating a trigger function with metadata
+ */
+export type PikkuTriggerFunctionConfig<
+  TInput = unknown,
+  TOutput = unknown,
+  InputSchema extends StandardSchemaV1 | undefined = undefined,
+  OutputSchema extends StandardSchemaV1 | undefined = undefined
+> = CorePikkuTriggerFunctionConfig<TInput, TOutput, SingletonServices, InputSchema, OutputSchema>
+
+/**
+ * Helper type to infer the output type from a Standard Schema
+ */
+type InferSchemaOutput<T> = T extends StandardSchemaV1<any, infer Output> ? Output : never
+
+/**
+ * Configuration object for trigger functions with Zod schema validation.
+ * Use this when you want to define input/output schemas using Zod.
+ * Types are automatically inferred from the schemas.
+ */
+export type PikkuTriggerFunctionConfigWithSchema<
+  InputSchema extends StandardSchemaV1,
+  OutputSchema extends StandardSchemaV1 | undefined = undefined
+> = {
+  title?: string
+  description?: string
+  tags?: string[]
+  func: PikkuTriggerFunction<
+    InferSchemaOutput<InputSchema>,
+    OutputSchema extends StandardSchemaV1 ? InferSchemaOutput<OutputSchema> : unknown
+  >
+  input: InputSchema
+  output?: OutputSchema
+  node?: CoreNodeConfig
+}
+
+/**
+ * Type definition for trigger wirings.
+ * Declares a trigger name and its target pikku function.
+ */
+export type TriggerWiring = CoreTrigger
+
+/**
+ * A trigger source with the subscription function, using project-specific services.
+ *
+ * @template TInput - Input type passed to the trigger function
+ * @template TOutput - Output type produced when trigger fires
+ */
+export type TriggerSource<
+  TInput = unknown,
+  TOutput = unknown
+> = {
+  name: string
+  func: PikkuTriggerFunctionConfig<TInput, TOutput>
+} & (unknown extends TInput ? { input?: TInput } : { input: TInput })
+
+/**
+ * Creates a trigger function configuration.
+ * Use this to define trigger functions that set up subscriptions.
+ *
+ * @param triggerOrConfig - Function definition or configuration object
+ * @returns The normalized configuration object
+ *
+ * @example
+ * \`\`\`typescript
+ * export const redisSubscribeTrigger = pikkuTriggerFunc<
+ *   { channel: string },
+ *   { message: string }
+ * >(async ({ redis }, { channel }, { trigger }) => {
+ *   const subscriber = redis.duplicate()
+ *   await subscriber.subscribe(channel, (msg) => {
+ *     trigger.invoke({ message: msg })
+ *   })
+ *   return () => subscriber.unsubscribe()
+ * })
+ *
+ * export const redisSubscribeTrigger = pikkuTriggerFunc({
+ *   title: 'Redis Subscribe Trigger',
+ *   description: 'Listens to Redis pub/sub channel',
+ *   input: z.object({ channel: z.string() }),
+ *   output: z.object({ message: z.string() }),
+ *   func: async ({ redis }, { channel }, { trigger }) => {
+ *     const subscriber = redis.duplicate()
+ *     await subscriber.subscribe(channel, (msg) => {
+ *       trigger.invoke({ message: msg })
+ *     })
+ *     return () => subscriber.unsubscribe()
+ *   }
+ * })
+ * \`\`\`
+ */
+export function pikkuTriggerFunc<
+  InputSchema extends StandardSchemaV1,
+  OutputSchema extends StandardSchemaV1 | undefined = undefined
+>(
+  config: PikkuTriggerFunctionConfigWithSchema<InputSchema, OutputSchema>
+): PikkuTriggerFunctionConfig<InferSchemaOutput<InputSchema>, OutputSchema extends StandardSchemaV1 ? InferSchemaOutput<OutputSchema> : unknown, InputSchema, OutputSchema>
+export function pikkuTriggerFunc<TInput, TOutput = unknown>(
+  triggerOrConfig:
+    | PikkuTriggerFunction<TInput, TOutput>
+    | PikkuTriggerFunctionConfig<TInput, TOutput>
+): PikkuTriggerFunctionConfig<TInput, TOutput>
+export function pikkuTriggerFunc(triggerOrConfig: any) {
+  if (typeof triggerOrConfig === 'function') {
+    return { func: triggerOrConfig }
+  }
+  return triggerOrConfig
+}
+
+/**
+ * Registers a trigger with the Pikku framework.
+ * Declares a trigger name and its target pikku function.
+ * Runs everywhere — inspector extracts at build time.
+ *
+ * @param trigger - Trigger definition with name and function config
+ */
+export const wireTrigger = (
+  trigger: TriggerWiring
+) => {
+  wireTriggerCore(trigger as any)
+}
+
+/**
+ * Registers a trigger source with the Pikku framework.
+ * Provides the subscription function and input data.
+ * Only imported in the trigger worker process.
+ *
+ * @param source - Trigger source with name, func, and input
+ */
+export const wireTriggerSource = <TInput = unknown, TOutput = unknown>(
+  source: TriggerSource<TInput, TOutput>
+) => {
+  wireTriggerSourceCore(source as any)
+}
+`;
+};

package/dist/src/functions/wirings/variables/pikku-command-variables.d.ts

@@ -0,0 +1 @@
+export declare const pikkuVariables: import("#pikku").PikkuFunctionConfig<void, void, "session" | "rpc", import("#pikku").PikkuFunctionSessionless<void, void, "session" | "rpc", import("#pikku").Services> | import("#pikku").PikkuFunction<void, void, "session" | "rpc", import("#pikku").Services>, undefined, undefined>;

package/dist/src/functions/wirings/variables/pikku-command-variables.js

@@ -0,0 +1,31 @@
+import { pikkuSessionlessFunc } from '#pikku';
+import { writeFileInDir } from '../../../utils/file-writer.js';
+import { logCommandInfoAndTime } from '../../../middleware/log-command-info-and-time.js';
+import { serializeVariablesTypes } from './serialize-variables-types.js';
+import { validateAndBuildVariableDefinitionsMeta } from '@pikku/core/variable';
+export const pikkuVariables = pikkuSessionlessFunc({
+    func: async ({ logger, config, getInspectorState }) => {
+        const { variablesFile, variablesMetaJsonFile, packageMappings } = config;
+        if (!variablesFile) {
+            return;
+        }
+        const state = await getInspectorState();
+        const content = serializeVariablesTypes({
+            definitions: state.variables.definitions,
+            schemaLookup: state.schemaLookup,
+            variablesFile,
+            packageMappings,
+        });
+        await writeFileInDir(logger, variablesFile, content);
+        if (variablesMetaJsonFile) {
+            const meta = validateAndBuildVariableDefinitionsMeta(state.variables.definitions, state.schemaLookup);
+            await writeFileInDir(logger, variablesMetaJsonFile, JSON.stringify(meta, null, 2));
+        }
+    },
+    middleware: [
+        logCommandInfoAndTime({
+            commandStart: 'Creating PikkuVariables types',
+            commandEnd: 'Created PikkuVariables types',
+        }),
+    ],
+});

package/dist/src/functions/wirings/variables/serialize-variables-types.d.ts

@@ -0,0 +1,9 @@
+import { VariableDefinitions } from '@pikku/core/variable';
+import { SchemaRef } from '@pikku/inspector';
+export interface SerializeVariablesOptions {
+    definitions: VariableDefinitions;
+    schemaLookup: Map<string, SchemaRef>;
+    variablesFile: string;
+    packageMappings: Record<string, string>;
+}
+export declare const serializeVariablesTypes: ({ definitions, schemaLookup, variablesFile, packageMappings, }: SerializeVariablesOptions) => string;

package/dist/src/functions/wirings/variables/serialize-variables-types.js

@@ -0,0 +1,53 @@
+import { validateAndBuildVariableDefinitionsMeta } from '@pikku/core/variable';
+import { getFileImportRelativePath } from '../../../utils/file-import-path.js';
+export const serializeVariablesTypes = ({ definitions, schemaLookup, variablesFile, packageMappings, }) => {
+    const variables = validateAndBuildVariableDefinitionsMeta(definitions, schemaLookup);
+    const variableEntries = Object.entries(variables);
+    const schemaImports = new Map();
+    let needsZod = false;
+    const mapEntries = [];
+    const metaEntries = [];
+    for (const [name, meta] of variableEntries) {
+        if (meta.schema && typeof meta.schema === 'string') {
+            const schemaRef = schemaLookup.get(meta.schema);
+            if (schemaRef) {
+                needsZod = true;
+                if (!schemaImports.has(schemaRef.sourceFile)) {
+                    schemaImports.set(schemaRef.sourceFile, new Set());
+                }
+                schemaImports.get(schemaRef.sourceFile).add(schemaRef.variableName);
+                mapEntries.push(`  '${meta.variableId}': z.infer<typeof ${schemaRef.variableName}>`);
+                metaEntries.push(`  '${meta.variableId}': { name: '${name}', displayName: '${meta.displayName}' }`);
+            }
+        }
+    }
+    const imports = [];
+    imports.push(`import { TypedVariablesService as CoreTypedVariablesService, type VariableMeta } from '@pikku/core/services'`);
+    imports.push(`import type { VariablesService } from '@pikku/core/services'`);
+    if (needsZod) {
+        imports.push(`import type { z } from 'zod'`);
+    }
+    for (const [sourceFile, variableNames] of schemaImports) {
+        const importPath = getFileImportRelativePath(variablesFile, sourceFile, packageMappings);
+        const vars = Array.from(variableNames).join(', ');
+        imports.push(`import { ${vars} } from '${importPath}'`);
+    }
+    return `${imports.join('\n')}
+
+export interface VariablesMap {
+${mapEntries.join('\n')}
+}
+
+export type VariableId = keyof VariablesMap
+
+const VARIABLES_META: Record<string, VariableMeta> = {
+${metaEntries.join(',\n')}
+}
+
+export class TypedVariablesService extends CoreTypedVariablesService<VariablesMap> {
+  constructor(variables: VariablesService) {
+    super(variables, VARIABLES_META)
+  }
+}
+`;
+};

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

@@ -1 +1 @@
-export declare const pikkuWorkflow: any;
+export declare const pikkuWorkflow: import("#pikku").PikkuFunctionConfig<void, boolean | undefined, "session" | "rpc", import("#pikku").PikkuFunctionSessionless<void, boolean | undefined, "session" | "rpc", import("#pikku").Services> | import("#pikku").PikkuFunction<void, boolean | undefined, "session" | "rpc", import("#pikku").Services>, undefined, undefined>;

package/dist/src/functions/wirings/workflow/pikku-command-workflow.js

@@ -1,5 +1,5 @@
-import { pikkuSessionlessFunc } from '../../../../.pikku/pikku-types.gen.js';
-import { convertDslToGraph, ErrorCode } from '@pikku/inspector';
+import { pikkuSessionlessFunc } from '#pikku';
+import { ErrorCode } from '@pikku/inspector';
 import { writeFileInDir } from '../../../utils/file-writer.js';
 import { logCommandInfoAndTime } from '../../../middleware/log-command-info-and-time.js';
 import { serializeWorkflowTypes } from './serialize-workflow-types.js';
@@ -16,14 +16,8 @@ export const pikkuWorkflow = pikkuSessionlessFunc({
         const { workflowsWiringFile, workflowsWiringMetaFile, workflowMetaDir, workflowMapDeclarationFile, workflowTypesFile, functionTypesFile, typesDeclarationFile, packageMappings, schema, } = config;
         const { workflows, functions: functionState } = visitState;
         const { typesMap } = functionState;
-        // 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 allWorkflowNames = Object.keys(workflows.graphMeta);
         const hasWorkflows = allWorkflowNames.length > 0;
-        // Validate that workflowService is configured if workflows are defined
         if (hasWorkflows) {
             const hasWorkflowState = visitState.serviceAggregation.allSingletonServices.includes('workflowService');
             if (!hasWorkflowState) {
@@ -31,50 +25,27 @@ export const pikkuWorkflow = pikkuSessionlessFunc({
                 throw new Error('WorkflowState service not configured but workflows are defined');
             }
         }
-        // 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;
-            for (const [name, meta] of Object.entries(dslMeta)) {
-                const graphMeta = convertDslToGraph(name, meta);
-                // 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 });
-                }
-            }
-            // 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);
         await writeFileInDir(logger, workflowsWiringFile, serializeWorkflowRegistration(workflowsWiringFile, metaImportPath, allWorkflowNames, workflows.files, workflows.graphFiles, packageMappings, config.externalPackageName));
-        // Generate workflow types (DSL + graph helpers in one file)
         const functionTypesImportPath = getFileImportRelativePath(workflowTypesFile, functionTypesFile, packageMappings);
         const rpcMapImportPath = getFileImportRelativePath(workflowTypesFile, config.rpcInternalMapDeclarationFile, packageMappings);
-        await writeFileInDir(logger, workflowTypesFile, serializeWorkflowTypes(functionTypesImportPath, rpcMapImportPath));
-        // Generate workflow map (I/O types for type-safe client)
-        // Always generate even if empty - RPC map imports WorkflowMap
-        await writeFileInDir(logger, workflowMapDeclarationFile, serializeWorkflowMap(workflowMapDeclarationFile, packageMappings, typesMap, functionState.meta, workflows.meta));
-        // Generate workflow workers if configured
+        const workflowMapImportPath = getFileImportRelativePath(workflowTypesFile, workflowMapDeclarationFile, packageMappings);
+        await writeFileInDir(logger, workflowTypesFile, serializeWorkflowTypes(functionTypesImportPath, rpcMapImportPath, workflowMapImportPath));
+        await writeFileInDir(logger, workflowMapDeclarationFile, serializeWorkflowMap(logger, workflowMapDeclarationFile, packageMappings, typesMap, functionState.meta, workflows.meta, workflows.graphMeta));
         if (config.workflows) {
             if (config.workflows.singleQueue) {
                 const workflowPath = join(config.rootDir, config.workflows.path);

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

@@ -2,6 +2,8 @@
  * Generate workflow map type definitions for type-safe client API
  */
 import type { WorkflowsMeta } from '@pikku/core/workflow';
-import { TypesMap } from '@pikku/inspector';
+import { type TypesMap } from '@pikku/inspector';
+import type { SerializedWorkflowGraphs } from '@pikku/inspector/workflow-graph';
 import { FunctionsMeta } from '@pikku/core';
-export declare const serializeWorkflowMap: (relativeToPath: string, packageMappings: Record<string, string>, typesMap: TypesMap, functionsMeta: FunctionsMeta, workflowsMeta: WorkflowsMeta) => string;
+import { Logger } from '@pikku/core/services';
+export declare const serializeWorkflowMap: (logger: Logger, relativeToPath: string, packageMappings: Record<string, string>, typesMap: TypesMap, functionsMeta: FunctionsMeta, workflowsMeta: WorkflowsMeta, graphMeta: SerializedWorkflowGraphs) => string;