fix(cli): add missing separateFiles option

Author: alexjoverm

packages/cli/src/commands/types/generate/actions.ts

@@ -34,11 +34,10 @@ const getDatasourceTypeTitle = (slug: string) =>
 
 const getPropertyTypeAnnotation = (property: ComponentPropertySchema, prefix?: string, suffix?: string) => {
   // If a property type is one of the ones provided by Storyblok, return that type
-  // Casting as string[] to avoid TS error on using Array.includes on different narrowed types
   if (Array.from(storyblokSchemas.keys()).includes(property.type as StoryblokPropertyType)) {
     return { type: property.type };
   }
-  // Initialize property type as any (fallback type)
+
   let type: string | string[] = 'unknown';
 
   const options = property.options && property.options.length > 0 ? property.options.map((item: { value: string }) => item.value) : [];

packages/cli/src/commands/types/generate/index.ts

@@ -1,6 +1,6 @@
 import type { Command } from 'commander';
 import { colorPalette, commands } from '../../../constants';
-import { FileSystemError, handleError, isVitest, konsola } from '../../../utils';
+import { FileSystemError, handleError, konsola } from '../../../utils';
 import { Spinner } from '@topcli/spinner';
 import { type ComponentsData, readComponentsFiles } from '../../components/push/actions';
 import type { GenerateTypesOptions } from './constants';
@@ -30,18 +30,19 @@ generateCmd
   .action(async (options: GenerateTypesOptions, command: Command) => {
     konsola.title(`${commands.TYPES}`, colorPalette.TYPES, 'Generating types...');
 
-    const { space, path, verbose } = command.optsWithGlobals();
+    const { space, path, verbose, suffix, filename, separateFiles } = command.optsWithGlobals();
 
     const spinner = new Spinner({
-      verbose: !isVitest,
+      verbose,
     });
 
     try {
       spinner.start(`Generating types...`);
       const componentsData = await readComponentsFiles({
         from: space,
         path,
-        suffix: options.suffix,
+        separateFiles,
+        suffix,
         verbose,
       });
       // Try to read datasources, but make it optional
@@ -50,7 +51,8 @@ generateCmd
         dataSourceData = await readDatasourcesFiles({
           from: space,
           path,
-          suffix: options.suffix,
+          separateFiles,
+          suffix,
           verbose,
         });
       }
@@ -75,19 +77,18 @@ generateCmd
 
       const typedefData = await generateTypes(spaceDataWithComponentsAndDatasources, {
         ...options,
-        path,
       });
 
       if (typedefData) {
         await saveTypesToComponentsFile(space, typedefData, {
-          filename: options.filename,
+          filename,
           path,
-          separateFiles: options.separateFiles,
+          separateFiles,
         });
       }
 
       spinner.succeed();
-      if (options.separateFiles && options.filename) {
+      if (separateFiles && filename) {
         konsola.warn(`The --filename option is ignored when using --separate-files`);
       }