17
18
import path from 'node:path';
19
import { Command, Options } from '@effect/cli';
20
-import { Console, Effect, Option, pipe, Array } from 'effect';
20
+import { Effect, Option, pipe, Array } from 'effect';
21
import { Match } from 'effect';
22
import { FileSystem } from '@effect/platform';
23
import { ComposioToolkitsRepository } from 'src/services/composio-clients';
39
type ToolkitVersionOverrides,
40
} from 'src/effects/toolkit-version-overrides';
41
import { validateToolkitVersionOverrides } from 'src/effects/validate-toolkit-versions';
42
+import { TerminalUI, type SpinnerHandle } from 'src/services/terminal-ui';
43
44
export const outputOpt = Options.optional(
45
Options.directory('output-dir', {
110
client: ComposioToolkitsRepository,
111
slugs: ReadonlyArray<string>,
112
typeTools: boolean,
112
- versionOverrides: ToolkitVersionOverrides
113
+ versionOverrides: ToolkitVersionOverrides,
114
+ spinner: SpinnerHandle
115
): Effect.Effect<FetchResult, Error, never> {
116
return Effect.gen(function* () {
115
- yield* Console.log(`Fetching data for ${slugs.length} toolkit(s): ${slugs.join(', ')}...`);
117
+ yield* spinner.message(`Fetching data for ${slugs.length} toolkit(s): ${slugs.join(', ')}...`);
118
119
// Build version specs for each requested toolkit
120
const versionSpecs = buildToolkitVersionSpecs(slugs, versionOverrides);
169
{ concurrency: 'unbounded' }
170
);
171
170
- yield* Console.log(
171
- `Filtering to ${filteredToolkits.length} toolkit(s): ${filteredToolkits.map(t => t.slug).join(', ')}`
172
+ yield* spinner.message(
173
+ `Found ${filteredToolkits.length} toolkit(s): ${filteredToolkits.map(t => t.slug).join(', ')}`
174
);
175
176
return {
188
*/
189
function fetchAllDataFastPath(
190
client: ComposioToolkitsRepository,
189
- typeTools: boolean
191
+ typeTools: boolean,
192
+ spinner: SpinnerHandle
193
): Effect.Effect<FetchResult, Error, never> {
194
return Effect.gen(function* () {
195
// Fetch all data in parallel
221
{ concurrency: 'unbounded' }
222
);
223
221
- yield* Console.log(`Found ${allToolkits.length} toolkit(s)`);
224
+ yield* spinner.message(`Found ${allToolkits.length} toolkit(s)`);
225
226
return {
227
toolkits: allToolkits,
239
function fetchAllDataWithOverrides(
240
client: ComposioToolkitsRepository,
241
typeTools: boolean,
239
- versionOverrides: ToolkitVersionOverrides
242
+ versionOverrides: ToolkitVersionOverrides,
243
+ spinner: SpinnerHandle
244
): Effect.Effect<FetchResult, Error, never> {
245
return Effect.gen(function* () {
246
// 1. First fetch all toolkit metadata to know what's available
281
{ concurrency: 'unbounded' }
282
);
283
280
- yield* Console.log(`Found ${allToolkits.length} toolkit(s)`);
284
+ yield* spinner.message(`Found ${allToolkits.length} toolkit(s)`);
285
286
return {
287
toolkits: allToolkits,
299
function fetchAllData(
300
client: ComposioToolkitsRepository,
301
typeTools: boolean,
298
- versionOverrides: ToolkitVersionOverrides
302
+ versionOverrides: ToolkitVersionOverrides,
303
+ spinner: SpinnerHandle
304
): Effect.Effect<FetchResult, Error, never> {
305
return Effect.gen(function* () {
301
- yield* Console.log('Fetching all toolkits, tools, and triggers from Composio API...');
306
+ yield* spinner.message('Fetching all toolkits, tools, and triggers...');
307
308
if (versionOverrides.size === 0) {
304
- return yield* fetchAllDataFastPath(client, typeTools);
309
+ return yield* fetchAllDataFastPath(client, typeTools, spinner);
310
}
311
307
- return yield* fetchAllDataWithOverrides(client, typeTools, versionOverrides);
312
+ return yield* fetchAllDataWithOverrides(client, typeTools, versionOverrides, spinner);
313
});
314
}
315
355
toolkitsOpt,
356
}: GetCmdParams<typeof _tsCmd$Generate> & { transpiled?: boolean }) {
357
return Effect.gen(function* () {
358
+ const ui = yield* TerminalUI;
359
const fs = yield* FileSystem.FileSystem;
360
const process = yield* NodeProcess;
361
const cwd = process.cwd;
362
const client = yield* ComposioToolkitsRepository;
363
364
+ yield* ui.intro('composio ts generate');
365
+
366
// Determine the actual output directory
367
const outputDir = yield* outputOpt.pipe(
368
Option.match({
393
client,
394
});
395
388
- // Fetch data using two distinct strategies based on whether --toolkits filter is provided
396
+ // Fetch data using a spinner for progress
397
+ const spinner = yield* ui.makeSpinner('Fetching data from Composio API...');
398
+
399
const { toolkits, triggerTypes, typeableTools, versionMap } = yield* toolkitSlugsFilter !== null
390
- ? fetchFilteredData(client, toolkitSlugsFilter, typeTools, validatedOverrides)
391
- : fetchAllData(client, typeTools, validatedOverrides);
400
+ ? fetchFilteredData(client, toolkitSlugsFilter, typeTools, validatedOverrides, spinner)
401
+ : fetchAllData(client, typeTools, validatedOverrides, spinner);
402
393
- yield* Console.log('Writing TypeScript type stubs to disk...');
403
+ yield* spinner.message('Generating TypeScript type stubs...');
404
const index = createToolkitIndex({ toolkits, typeableTools, triggerTypes, versionMap });
405
406
// Generate TypeScript sources
411
importExtension: 'js',
412
})(index);
413
414
+ yield* spinner.message('Writing files to disk...');
415
+
416
// Write all generated files
417
yield* pipe(
418
Effect.all(
428
429
// Compile TypeScript to JavaScript if needed
430
if (transpiled) {
431
+ yield* spinner.message('Transpiling to JavaScript...');
432
yield* pipe(
433
transpileTypeScriptSources({ sources, outputDir }),
434
Effect.catchAll(error =>
437
);
438
}
439
440
+ yield* spinner.stop('Type stubs generated successfully');
441
+
442
yield* Option.isNone(outputOpt)
428
- ? Console.log(
429
- '✅ Type stubs generated successfully.\n' +
430
- 'You can now import generated types via `import { Toolkits } from "@composio/core/generated"`'
443
+ ? ui.note(
444
+ 'import { Toolkits } from "@composio/core/generated"',
445
+ 'Import your generated types'
446
)
432
- : Console.log(
433
- `✅ Type stubs generated successfully.\n` +
434
- `Generated files are available at: ${outputDir}`
435
- );
447
+ : ui.log.info(`Generated files are available at: ${outputDir}`);
448
449
// Log API metrics
450
const metrics = yield* client.getMetrics();
451
yield* logMetrics(metrics);
452
453
+ yield* ui.outro('Done');
454
+
455
return outputDir;
456
});
457
}