Merge remote-tracking branch 'origin/next' into bugfix/211-alt

Author: imranolas

README.md

@@ -14,7 +14,7 @@
   <a href="https://npmjs.com/package/storyblok" rel="nofollow">
     <img src="https://img.shields.io/npm/dt/storyblok.svg?style=appveyor&color=8d60ff" alt="npm">
   </a>
-  <a href="https://discord.gg/jKrbAMz">
+  <a href="https://storyblok.com/join-discord">
    <img src="https://img.shields.io/discord/700316478792138842?label=Join%20Our%20Discord%20Community&style=appveyor&logo=discord&color=8d60ff">
    </a>
   <a href="https://twitter.com/intent/follow?screen_name=storyblok">
@@ -103,7 +103,7 @@ For help, discussion about best practices, or any other conversation that would
 
 For community support, chatting with other users, please visit:
 
-- [Discuss Storyblok on Discord](https://discord.gg/jKrbAMz)
+- [Discuss Storyblok on Discord](https://storyblok.com/join-discord)
 
 ## Support
 
@@ -118,7 +118,7 @@ We understand that you might not be able to share your company's project code. P
 
 ### I only have a question
 
-If you have a question, please ask in the [Discuss Storyblok on Discord](https://discord.gg/jKrbAMz) channel.
+If you have a question, please ask in the [Discuss Storyblok on Discord](https://storyblok.com/join-discord) channel.
 
 ## Contributing
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "storyblok",
   "type": "module",
-  "version": "4.0.0-beta.4",
+  "version": "4.0.0-beta.5",
   "packageManager": "pnpm@10.10.0",
   "description": "Storyblok CLI",
   "author": "Alvaro Saburido <hola@alvarosaburido.dev> (https://github.com/alvarosabu/)",
@@ -25,6 +25,7 @@
   ],
   "scripts": {
     "build": "unbuild",
+    "typecheck": "tsc --noEmit",
     "release": "release-it",
     "dev": "pnpm run build && node dist/index.mjs",
     "lint": "eslint .",

src/commands/components/pull/index.test.ts

@@ -38,24 +38,7 @@ vi.mock('../../../session', () => {
   };
 });
 
-vi.mock('../../../utils', async () => {
-  const actualUtils = await vi.importActual('../../../utils');
-  return {
-    ...actualUtils,
-    isVitestRunning: true,
-    konsola: {
-      ok: vi.fn(),
-      title: vi.fn(),
-      warn: vi.fn(),
-      error: vi.fn(),
-      br: vi.fn(),
-    },
-    handleError: (error: unknown, header = false) => {
-      konsola.error(error as string, header);
-      // Optionally, prevent process.exit during tests
-    },
-  };
-});
+vi.mock('../../../utils/konsola');
 
 describe('pull', () => {
   beforeEach(() => {
@@ -157,9 +140,10 @@ describe('pull', () => {
       session().state = {
         isLoggedIn: false,
       };
-      const mockError = new CommandError(`You are currently not logged in. Please login first to get your user info.`);
       await componentsCommand.parseAsync(['node', 'test', 'pull', '--space', '12345']);
-      expect(konsola.error).toHaveBeenCalledWith(mockError, false);
+      expect(konsola.error).toHaveBeenCalledWith('You are currently not logged in. Please run storyblok login to authenticate, or storyblok signup to sign up.', null, {
+        header: true,
+      });
     });
 
     it('should throw an error if the space is not provided', async () => {
@@ -172,7 +156,9 @@ describe('pull', () => {
       const mockError = new CommandError(`Please provide the space as argument --space YOUR_SPACE_ID.`);
 
       await componentsCommand.parseAsync(['node', 'test', 'pull']);
-      expect(konsola.error).toHaveBeenCalledWith(mockError, false);
+      expect(konsola.error).toHaveBeenCalledWith(mockError.message, null, {
+        header: true,
+      });
     });
   });
 

src/commands/components/pull/index.ts

@@ -2,7 +2,7 @@ import type { PullComponentsOptions } from './constants';
 
 import { Spinner } from '@topcli/spinner';
 import { colorPalette, commands } from '../../../constants';
-import { CommandError, handleError, isVitest, konsola } from '../../../utils';
+import { CommandError, handleError, isVitest, konsola, requireAuthentication } from '../../../utils';
 import { session } from '../../../session';
 import { fetchComponent, fetchComponentGroups, fetchComponentInternalTags, fetchComponentPresets, fetchComponents, saveComponentsToFiles } from '../actions';
 import { componentsCommand } from '../command';
@@ -30,8 +30,7 @@ componentsCommand
     const { state, initializeSession } = session();
     await initializeSession();
 
-    if (!state.isLoggedIn || !state.password || !state.region) {
-      handleError(new CommandError(`You are currently not logged in. Please login first to get your user info.`), verbose);
+    if (!requireAuthentication(state, verbose)) {
       return;
     }
     if (!space) {

src/commands/components/push/actions.ts

@@ -85,6 +85,7 @@ export const updateComponentGroup = async (space: string, groupId: number, compo
       body: JSON.stringify(componentGroup),
     });
     return data.component_group;
+    return data.component_group;
   }
   catch (error) {
     handleAPIError('update_component_group', error as Error, `Failed to update component group ${componentGroup.name}`);

src/commands/components/push/index.ts

@@ -2,7 +2,7 @@ import type { PushComponentsOptions } from './constants';
 
 import { colorPalette, commands } from '../../../constants';
 import { getProgram } from '../../../program';
-import { CommandError, handleError, konsola } from '../../../utils';
+import { CommandError, handleError, konsola, requireAuthentication } from '../../../utils';
 import { session } from '../../../session';
 import { readComponentsFiles } from './actions';
 import { componentsCommand } from '../command';
@@ -35,8 +35,7 @@ componentsCommand
     const { state, initializeSession } = session();
     await initializeSession();
 
-    if (!state.isLoggedIn || !state.password || !state.region) {
-      handleError(new CommandError(`You are currently not logged in. Please login first to get your user info.`), verbose);
+    if (!requireAuthentication(state, verbose)) {
       return;
     }
 

src/commands/languages/index.test.ts

@@ -39,23 +39,7 @@ vi.mock('../../session', () => {
   };
 });
 
-vi.mock('../../utils', async () => {
-  const actualUtils = await vi.importActual('../../utils');
-  return {
-    ...actualUtils,
-    konsola: {
-      ok: vi.fn(),
-      title: vi.fn(),
-      warn: vi.fn(),
-      error: vi.fn(),
-      br: vi.fn(),
-    },
-    handleError: (error: Error, header = false) => {
-      konsola.error(error, header);
-      // Optionally, prevent process.exit during tests
-    },
-  };
-});
+vi.mock('../../utils/konsola');
 
 describe('languagesCommand', () => {
   describe('pull', () => {
@@ -102,9 +86,11 @@ describe('languagesCommand', () => {
         session().state = {
           isLoggedIn: false,
         };
-        const mockError = new CommandError(`You are currently not logged in. Please login first to get your user info.`);
+        const mockError = new CommandError(`You are currently not logged in. Please run storyblok login to authenticate, or storyblok signup to sign up.`);
         await languagesCommand.parseAsync(['node', 'test', 'pull', '--space', '12345']);
-        expect(konsola.error).toHaveBeenCalledWith(mockError, false);
+        expect(konsola.error).toHaveBeenCalledWith(mockError.message, null, {
+          header: true,
+        });
       });
 
       it('should throw an error if the space is not provided', async () => {
@@ -121,7 +107,9 @@ describe('languagesCommand', () => {
         catch (error) {
           console.log('TEST languages', error);
         }
-        expect(konsola.error).toHaveBeenCalledWith(mockError, false);
+        expect(konsola.error).toHaveBeenCalledWith(mockError.message, null, {
+          header: true,
+        });
       });
 
       it('should prompt a warning the user if no languages are found', async () => {

src/commands/languages/index.ts

@@ -1,5 +1,5 @@
 import { colorPalette, commands } from '../../constants';
-import { CommandError, handleError, isVitest, konsola } from '../../utils';
+import { CommandError, handleError, isVitest, konsola, requireAuthentication } from '../../utils';
 import { getProgram } from '../../program';
 import { session } from '../../session';
 import { fetchLanguages, saveLanguagesToFile } from './actions';
@@ -34,22 +34,23 @@ languagesCommand
     const { state, initializeSession } = session();
     await initializeSession();
 
-    if (!state.isLoggedIn || !state.password || !state.region) {
-      handleError(new CommandError(`You are currently not logged in. Please login first to get your user info.`), verbose);
+    if (!requireAuthentication(state, verbose)) {
       return;
     }
     if (!space) {
       handleError(new CommandError(`Please provide the space as argument --space YOUR_SPACE_ID.`), verbose);
       return;
     }
 
+    const { password, region } = state;
+
     const spinner = new Spinner({
       verbose: !isVitest,
     });
     try {
       spinner.start(`Fetching ${chalk.hex(colorPalette.LANGUAGES)('languages')}`);
 
-      const internationalization = await fetchLanguages(space, state.password, state.region);
+      const internationalization = await fetchLanguages(space, password, region);
 
       if (!internationalization || internationalization.languages?.length === 0) {
         spinner.failed();

src/commands/login/actions.ts

@@ -28,7 +28,7 @@ export const loginWithToken = async (token: string, region: RegionCode) => {
           throw new APIError('network_error', 'login_with_token', error);
       }
     }
-    throw new APIError('generic', 'login_with_token', error, 'The provided credentials are invalid');
+    throw new APIError('generic', 'login_with_token', error as FetchError, 'The provided credentials are invalid');
   }
 };
 

src/commands/migrations/generate/index.ts

@@ -4,11 +4,12 @@ import chalk from 'chalk';
 import type { MigrationsGenerateOptions } from './constants';
 import { colorPalette, commands } from '../../../constants';
 import { getProgram } from '../../../program';
-import { CommandError, handleError, isVitest, konsola } from '../../../utils';
+import { CommandError, handleError, isVitest, konsola, requireAuthentication } from '../../../utils';
 import { session } from '../../../session';
 import { fetchComponent } from '../../../commands/components';
 import { migrationsCommand } from '../command';
 import { generateMigration } from './actions';
+import { mapiClient } from '../../../api';
 
 const program = getProgram();
 
@@ -34,8 +35,7 @@ migrationsCommand
     const { state, initializeSession } = session();
     await initializeSession();
 
-    if (!state.isLoggedIn || !state.password || !state.region) {
-      handleError(new CommandError(`You are currently not logged in. Please login first to get your user info.`), verbose);
+    if (!requireAuthentication(state, verbose)) {
       return;
     }
     if (!space) {
@@ -45,11 +45,16 @@ migrationsCommand
 
     const { password, region } = state;
 
+    mapiClient({
+      token: password,
+      region,
+    });
+
     const spinner = new Spinner({
       verbose: !isVitest,
     }).start(`Generating migration for component ${componentName}...`);
     try {
-      const component = await fetchComponent(space, componentName, password, region);
+      const component = await fetchComponent(space, componentName);
 
       if (!component) {
         spinner.failed(`Failed to fetch component ${componentName}. Make sure the component exists in your space.`);