storyblok 4.14.0 → 4.14.1

package/dist/index.mjs

@@ -13,9 +13,9 @@ import { MultiBar, Presets } from 'cli-progress';
 import { Spinner } from '@topcli/spinner';
 import fs, { mkdir, writeFile, readFile as readFile$1, appendFile, access, constants, readdir, unlink, stat } from 'node:fs/promises';
 import filenamify from 'filenamify';
-import { select, password, input, confirm } from '@inquirer/prompts';
 import { ManagementApiClient } from '@storyblok/management-api-client';
 import { RateLimit, Sema } from 'async-sema';
+import { select, password, input, confirm } from '@inquirer/prompts';
 import { exec, spawn } from 'node:child_process';
 import { promisify } from 'node:util';
 import { minimatch } from 'minimatch';
@@ -1579,6 +1579,174 @@ class ConsoleTransport {
   }
 }
 
+const getCredentials = async (filePath = join(getStoryblokGlobalPath(), "credentials.json")) => {
+  try {
+    await access(filePath);
+    const content = await readFile(filePath);
+    const parsedContent = JSON.parse(content);
+    if (Object.keys(parsedContent).length === 0) {
+      return null;
+    }
+    return parsedContent;
+  } catch (error) {
+    if (error.code === "ENOENT") {
+      await saveToFile(filePath, JSON.stringify({}, null, 2), { mode: 384 });
+      return null;
+    }
+    handleFileSystemError("read", error);
+    return null;
+  }
+};
+const addCredentials = async ({
+  filePath = join(getStoryblokGlobalPath(), "credentials.json"),
+  machineName,
+  login,
+  password,
+  region
+}) => {
+  const credentials = {
+    ...await getCredentials(filePath),
+    [machineName]: {
+      login,
+      password,
+      region
+    }
+  };
+  try {
+    await saveToFile(filePath, JSON.stringify(credentials, null, 2), { mode: 384 });
+  } catch (error) {
+    throw new FileSystemError("invalid_argument", "write", error, `Error adding/updating entry for machine ${machineName} in credentials.json file`);
+  }
+};
+const removeAllCredentials = async (filepath = getStoryblokGlobalPath()) => {
+  const filePath = join(filepath, "credentials.json");
+  await saveToFile(filePath, JSON.stringify({}, null, 2), { mode: 384 });
+};
+
+let sessionInstance = null;
+function createSession() {
+  const state = {
+    isLoggedIn: false
+  };
+  async function initializeSession() {
+    const envCredentials = getEnvCredentials();
+    if (envCredentials) {
+      state.isLoggedIn = true;
+      state.login = envCredentials.login;
+      state.password = envCredentials.password;
+      state.region = envCredentials.region;
+      state.envLogin = true;
+      return;
+    }
+    const credentials = await getCredentials();
+    if (credentials) {
+      const creds = Object.values(credentials)[0];
+      state.isLoggedIn = true;
+      state.login = creds.login;
+      state.password = creds.password;
+      state.region = creds.region;
+    } else {
+      state.isLoggedIn = false;
+      state.login = void 0;
+      state.password = void 0;
+      state.region = void 0;
+    }
+    state.envLogin = false;
+  }
+  function getEnvCredentials() {
+    const envLogin = process.env.STORYBLOK_LOGIN || process.env.TRAVIS_STORYBLOK_LOGIN;
+    const envPassword = process.env.STORYBLOK_TOKEN || process.env.TRAVIS_STORYBLOK_TOKEN;
+    const envRegion = process.env.STORYBLOK_REGION || process.env.TRAVIS_STORYBLOK_REGION;
+    if (envLogin && envPassword && envRegion) {
+      return {
+        login: envLogin,
+        password: envPassword,
+        region: envRegion
+      };
+    }
+    return null;
+  }
+  async function persistCredentials(region) {
+    if (state.isLoggedIn && state.login && state.password && state.region) {
+      await addCredentials({
+        machineName: regionsDomain[region] || "mapi.storyblok.com",
+        login: state.login,
+        password: state.password,
+        region: state.region
+      });
+    } else {
+      throw new Error("No credentials to save.");
+    }
+  }
+  function updateSession(login, password, region) {
+    state.isLoggedIn = true;
+    state.login = login;
+    state.password = password;
+    state.region = region;
+  }
+  function logout() {
+    state.isLoggedIn = false;
+    state.login = void 0;
+    state.password = void 0;
+    state.region = void 0;
+  }
+  return {
+    state,
+    initializeSession,
+    updateSession,
+    persistCredentials,
+    logout
+  };
+}
+function session() {
+  if (!sessionInstance) {
+    sessionInstance = createSession();
+  }
+  return sessionInstance;
+}
+
+let instance = null;
+let storedConfig = null;
+let currentLimiterCapacity = Math.max(1, getActiveConfig().api.maxConcurrency);
+let limiter = RateLimit(currentLimiterCapacity, { uniformDistribution: true });
+function resolveLimiter() {
+  const desiredCapacity = Math.max(1, getActiveConfig().api.maxConcurrency);
+  if (desiredCapacity !== currentLimiterCapacity) {
+    limiter = RateLimit(desiredCapacity, { uniformDistribution: true });
+    currentLimiterCapacity = desiredCapacity;
+  }
+  return limiter;
+}
+function configsAreEqual(config1, config2) {
+  return JSON.stringify(config1) === JSON.stringify(config2);
+}
+function applyRateLimit(client) {
+  if (getActiveConfig().api.maxConcurrency > 0) {
+    client.interceptors.request.use(async (request) => {
+      const limit = resolveLimiter();
+      await limit();
+      return request;
+    });
+  }
+}
+function creategetMapiClient(options) {
+  const client = new ManagementApiClient(options);
+  applyRateLimit(client);
+  return client;
+}
+function getMapiClient(options) {
+  if (!instance && options) {
+    instance = creategetMapiClient(options);
+    storedConfig = options;
+  } else if (!instance) {
+    throw new Error("MAPI client not initialized. Call getMapiClient with configuration first.");
+  } else if (options && storedConfig && !configsAreEqual(options, storedConfig)) {
+    instance = creategetMapiClient(options);
+    storedConfig = options;
+  }
+  return instance;
+}
+
 const packageJson = getPackageJson();
 let programInstance = null;
 function getProgram() {
@@ -1607,6 +1775,16 @@ function getProgram() {
       const resolvedConfig = await resolveConfig(targetCommand, ancestry);
       applyConfigToCommander(ancestry, resolvedConfig);
       setActiveConfig(resolvedConfig);
+      const { state, initializeSession } = session();
+      await initializeSession();
+      if (state.password) {
+        getMapiClient({
+          token: {
+            accessToken: state.password
+          },
+          region: state.region ?? resolvedConfig.region
+        });
+      }
       const options = targetCommand.optsWithGlobals();
       const commandPieces = [];
       for (let c = targetCommand; c; c = c.parent) {
@@ -1678,51 +1856,9 @@ const getStoryblokUrl = (region = "eu") => {
   return `https://${managementApiRegions[region]}/${API_VERSION}`;
 };
 
-let instance = null;
-let storedConfig = null;
-let currentLimiterCapacity = Math.max(1, getActiveConfig().api.maxConcurrency);
-let limiter = RateLimit(currentLimiterCapacity, { uniformDistribution: true });
-function resolveLimiter() {
-  const desiredCapacity = Math.max(1, getActiveConfig().api.maxConcurrency);
-  if (desiredCapacity !== currentLimiterCapacity) {
-    limiter = RateLimit(desiredCapacity, { uniformDistribution: true });
-    currentLimiterCapacity = desiredCapacity;
-  }
-  return limiter;
-}
-function configsAreEqual(config1, config2) {
-  return JSON.stringify(config1) === JSON.stringify(config2);
-}
-function mapiClient(options) {
-  if (!instance && options) {
-    instance = new ManagementApiClient(options);
-    if (getActiveConfig().api.maxConcurrency > 0) {
-      instance.interceptors.request.use(async (request) => {
-        const limit = resolveLimiter();
-        await limit();
-        return request;
-      });
-    }
-    storedConfig = options;
-  } else if (!instance) {
-    throw new Error("MAPI client not initialized. Call mapiClient with configuration first.");
-  } else if (options && storedConfig && !configsAreEqual(options, storedConfig)) {
-    instance = new ManagementApiClient(options);
-    if (getActiveConfig().api.maxConcurrency > 0) {
-      instance.interceptors.request.use(async (request) => {
-        const limit = resolveLimiter();
-        await limit();
-        return request;
-      });
-    }
-    storedConfig = options;
-  }
-  return instance;
-}
-
 const getUser = async (token, region) => {
   try {
-    const client = mapiClient({
+    const client = creategetMapiClient({
       token: {
         accessToken: token
       },
@@ -1807,132 +1943,6 @@ const loginWithOtp = async (email, password, otp, region) => {
   }
 };
 
-const getCredentials = async (filePath = join(getStoryblokGlobalPath(), "credentials.json")) => {
-  try {
-    await access(filePath);
-    const content = await readFile(filePath);
-    const parsedContent = JSON.parse(content);
-    if (Object.keys(parsedContent).length === 0) {
-      return null;
-    }
-    return parsedContent;
-  } catch (error) {
-    if (error.code === "ENOENT") {
-      await saveToFile(filePath, JSON.stringify({}, null, 2), { mode: 384 });
-      return null;
-    }
-    handleFileSystemError("read", error);
-    return null;
-  }
-};
-const addCredentials = async ({
-  filePath = join(getStoryblokGlobalPath(), "credentials.json"),
-  machineName,
-  login,
-  password,
-  region
-}) => {
-  const credentials = {
-    ...await getCredentials(filePath),
-    [machineName]: {
-      login,
-      password,
-      region
-    }
-  };
-  try {
-    await saveToFile(filePath, JSON.stringify(credentials, null, 2), { mode: 384 });
-  } catch (error) {
-    throw new FileSystemError("invalid_argument", "write", error, `Error adding/updating entry for machine ${machineName} in credentials.json file`);
-  }
-};
-const removeAllCredentials = async (filepath = getStoryblokGlobalPath()) => {
-  const filePath = join(filepath, "credentials.json");
-  await saveToFile(filePath, JSON.stringify({}, null, 2), { mode: 384 });
-};
-
-let sessionInstance = null;
-function createSession() {
-  const state = {
-    isLoggedIn: false
-  };
-  async function initializeSession() {
-    const envCredentials = getEnvCredentials();
-    if (envCredentials) {
-      state.isLoggedIn = true;
-      state.login = envCredentials.login;
-      state.password = envCredentials.password;
-      state.region = envCredentials.region;
-      state.envLogin = true;
-      return;
-    }
-    const credentials = await getCredentials();
-    if (credentials) {
-      const creds = Object.values(credentials)[0];
-      state.isLoggedIn = true;
-      state.login = creds.login;
-      state.password = creds.password;
-      state.region = creds.region;
-    } else {
-      state.isLoggedIn = false;
-      state.login = void 0;
-      state.password = void 0;
-      state.region = void 0;
-    }
-    state.envLogin = false;
-  }
-  function getEnvCredentials() {
-    const envLogin = process.env.STORYBLOK_LOGIN || process.env.TRAVIS_STORYBLOK_LOGIN;
-    const envPassword = process.env.STORYBLOK_TOKEN || process.env.TRAVIS_STORYBLOK_TOKEN;
-    const envRegion = process.env.STORYBLOK_REGION || process.env.TRAVIS_STORYBLOK_REGION;
-    if (envLogin && envPassword && envRegion) {
-      return {
-        login: envLogin,
-        password: envPassword,
-        region: envRegion
-      };
-    }
-    return null;
-  }
-  async function persistCredentials(region) {
-    if (state.isLoggedIn && state.login && state.password && state.region) {
-      await addCredentials({
-        machineName: regionsDomain[region] || "mapi.storyblok.com",
-        login: state.login,
-        password: state.password,
-        region: state.region
-      });
-    } else {
-      throw new Error("No credentials to save.");
-    }
-  }
-  function updateSession(login, password, region) {
-    state.isLoggedIn = true;
-    state.login = login;
-    state.password = password;
-    state.region = region;
-  }
-  function logout() {
-    state.isLoggedIn = false;
-    state.login = void 0;
-    state.password = void 0;
-    state.region = void 0;
-  }
-  return {
-    state,
-    initializeSession,
-    updateSession,
-    persistCredentials,
-    logout
-  };
-}
-function session() {
-  if (!sessionInstance) {
-    sessionInstance = createSession();
-  }
-  return sessionInstance;
-}
-
 async function performInteractiveLogin(options) {
   const { verbose = false, preSelectedRegion, showWelcomeMessage = true } = options || {};
   const spinner = new Spinner({
@@ -2051,8 +2061,7 @@ program$j.command(commands.LOGIN).description("Login to the Storyblok CLI").opti
   konsola.title(`${commands.LOGIN}`, colorPalette.LOGIN);
   const verbose = program$j.opts().verbose;
   const { token, region } = options;
-  const { state, updateSession, persistCredentials, initializeSession } = session();
-  await initializeSession();
+  const { state, updateSession, persistCredentials } = session();
   if (state.isLoggedIn && !state.envLogin) {
     konsola.ok(`You are already logged in. If you want to login with a different account, please logout first.`);
     return;
@@ -2113,8 +2122,7 @@ program$i.command(commands.LOGOUT).description("Logout from the Storyblok CLI").
   konsola.title(`${commands.LOGOUT}`, colorPalette.LOGOUT);
   const verbose = program$i.opts().verbose;
   try {
-    const { state, initializeSession } = session();
-    await initializeSession();
+    const { state } = session();
     if (!state.isLoggedIn || !state.password || !state.region) {
       konsola.warn(`You are already logged out. If you want to login, please use the login command.`);
       konsola.br();
@@ -2163,8 +2171,7 @@ const program$h = getProgram();
 program$h.command(commands.SIGNUP).description("Sign up for Storyblok").action(async () => {
   konsola.title(`${commands.SIGNUP}`, colorPalette.SIGNUP);
   const verbose = program$h.opts().verbose;
-  const { state, initializeSession } = session();
-  await initializeSession();
+  const { state } = session();
   if (state.isLoggedIn && !state.envLogin) {
     konsola.ok(`You are already logged in. If you want to signup with a different account, please logout first.`);
     return;
@@ -2188,8 +2195,7 @@ const program$g = getProgram();
 program$g.command(commands.USER).description("Get the current user").action(async () => {
   konsola.title(`${commands.USER}`, colorPalette.USER);
   const verbose = program$g.opts().verbose;
-  const { state, initializeSession } = session();
-  await initializeSession();
+  const { state } = session();
   if (!requireAuthentication(state)) {
     return;
   }
@@ -2226,7 +2232,7 @@ const DEFAULT_TAGS_FILENAME = "tags";
 
 const fetchComponents = async (spaceId) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.components.list({
       path: {
         space_id: spaceId
@@ -2240,7 +2246,7 @@ const fetchComponents = async (spaceId) => {
 };
 const fetchComponent = async (spaceId, componentName) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.components.list({
       path: {
         space_id: spaceId
@@ -2257,7 +2263,7 @@ const fetchComponent = async (spaceId, componentName) => {
 };
 const fetchComponentGroups = async (spaceId) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.componentFolders.list({
       path: {
         space_id: spaceId
@@ -2270,7 +2276,7 @@ const fetchComponentGroups = async (spaceId) => {
 };
 const fetchComponentPresets = async (spaceId) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.presets.list({
       path: {
         space_id: spaceId
@@ -2283,7 +2289,7 @@ const fetchComponentPresets = async (spaceId) => {
 };
 const fetchComponentInternalTags = async (spaceId) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.internalTags.list({
       path: {
         space_id: spaceId
@@ -2337,7 +2343,7 @@ const saveComponentsToFiles = async (space, spaceData, options) => {
 
 const pushComponent = async (space, component) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.components.create({
       path: {
         space_id: space
@@ -2353,7 +2359,7 @@ const pushComponent = async (space, component) => {
 };
 const updateComponent = async (space, componentId, component) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.components.update({
       path: {
         space_id: Number(space),
@@ -2378,7 +2384,7 @@ const upsertComponent = async (space, component, existingId) => {
 };
 const pushComponentGroup = async (space, componentGroup) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.componentFolders.create({
       path: {
         space_id: Number(space)
@@ -2395,7 +2401,7 @@ const pushComponentGroup = async (space, componentGroup) => {
 };
 const updateComponentGroup = async (space, groupId, componentGroup) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.componentFolders.update({
       path: {
         space_id: Number(space),
@@ -2420,7 +2426,7 @@ const upsertComponentGroup = async (space, group, existingId) => {
 };
 const pushComponentPreset = async (space, preset) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.presets.create({
       path: {
         space_id: Number(space)
@@ -2437,7 +2443,7 @@ const pushComponentPreset = async (space, preset) => {
 };
 const updateComponentPreset = async (space, presetId, preset) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.presets.update({
       path: {
         space_id: Number(space),
@@ -2462,7 +2468,7 @@ const upsertComponentPreset = async (space, preset, existingId) => {
 };
 const pushComponentInternalTag = async (space, componentInternalTag) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.internalTags.create({
       path: {
         space_id: Number(space)
@@ -2477,7 +2483,7 @@ const pushComponentInternalTag = async (space, componentInternalTag) => {
 };
 const updateComponentInternalTag = async (space, tagId, componentInternalTag) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.internalTags.update({
       path: {
         space_id: Number(space),
@@ -2614,8 +2620,7 @@ componentsCommand.command("pull [componentName]").option("-f, --filename <filena
   } = options;
   const actualFilename = filename ?? DEFAULT_COMPONENTS_FILENAME;
   const componentsOutputDir = resolveCommandPath(directories.components, space, path);
-  const { state, initializeSession } = session();
-  await initializeSession();
+  const { state } = session();
   if (!requireAuthentication(state, verbose)) {
     return;
   }
@@ -2623,13 +2628,6 @@ componentsCommand.command("pull [componentName]").option("-f, --filename <filena
     handleError(new CommandError(`Please provide the space as argument --space YOUR_SPACE_ID.`), verbose);
     return;
   }
-  const { password, region } = state;
-  mapiClient({
-    token: {
-      accessToken: password
-    },
-    region
-  });
   const spinnerGroups = new Spinner({
     verbose: !isVitest
   });
@@ -3654,8 +3652,7 @@ componentsCommand.command("push [componentName]").description(`Push your space's
   const { space, path } = componentsCommand.opts();
   const { filter } = options;
   const fromSpace = options.from || space;
-  const { state, initializeSession } = session();
-  await initializeSession();
+  const { state } = session();
   if (!requireAuthentication(state, verbose)) {
     return;
   }
@@ -3665,14 +3662,8 @@ componentsCommand.command("push [componentName]").description(`Push your space's
   }
   konsola.info(`Attempting to push components ${chalk.bold("from")} space ${chalk.hex(colorPalette.COMPONENTS)(fromSpace)} ${chalk.bold("to")} ${chalk.hex(colorPalette.COMPONENTS)(space)}`);
   konsola.br();
-  const { password, region } = state;
   let requestCount = 0;
-  const client = mapiClient({
-    token: {
-      accessToken: password
-    },
-    region
-  });
+  const client = getMapiClient();
   client.interceptors.request.use((config) => {
     requestCount++;
     return config;
@@ -3794,7 +3785,7 @@ const DEFAULT_LANGUAGES_FILENAME = "languages";
 
 const fetchSpace = async (spaceId) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.spaces.get({
       path: {
         space_id: spaceId
@@ -3808,7 +3799,7 @@ const fetchSpace = async (spaceId) => {
 };
 const createSpace = async (space) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.spaces.create({
       body: {
         space
@@ -3853,8 +3844,7 @@ languagesCommand.command("pull").description(`Download your space's languages sc
   const verbose = program$c.opts().verbose;
   const { space, path } = languagesCommand.opts();
   const { filename = "languages", suffix = options.space } = options;
-  const { state, initializeSession } = session();
-  await initializeSession();
+  const { state } = session();
   if (!requireAuthentication(state, verbose)) {
     return;
   }
@@ -3862,13 +3852,6 @@ languagesCommand.command("pull").description(`Download your space's languages sc
     handleError(new CommandError(`Please provide the space as argument --space YOUR_SPACE_ID.`), verbose);
     return;
   }
-  const { password, region } = state;
-  mapiClient({
-    token: {
-      accessToken: password
-    },
-    region
-  });
   const spinner = new Spinner({
     verbose: !isVitest
   });
@@ -3943,8 +3926,7 @@ migrationsCommand.command("generate [componentName]").description("Generate a mi
     handleError(new CommandError(`Please provide the component name as argument ${chalk.hex(colorPalette.MIGRATIONS)("storyblok migrations generate YOUR_COMPONENT_NAME.")}`), verbose);
     return;
   }
-  const { state, initializeSession } = session();
-  await initializeSession();
+  const { state } = session();
   if (!requireAuthentication(state, verbose)) {
     return;
   }
@@ -3952,13 +3934,6 @@ migrationsCommand.command("generate [componentName]").description("Generate a mi
     handleError(new CommandError(`Please provide the space as argument --space YOUR_SPACE_ID.`), verbose);
     return;
   }
-  const { password, region } = state;
-  mapiClient({
-    token: {
-      accessToken: password
-    },
-    region
-  });
   const spinner = ui.createSpinner(`Generating migration for component ${componentName}...`);
   try {
     const component = await fetchComponent(space, componentName);
@@ -3986,7 +3961,7 @@ migrationsCommand.command("generate [componentName]").description("Generate a mi
 
 const fetchStories = async (spaceId, params) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data, response } = await client.stories.list({
       path: {
         space_id: spaceId
@@ -4008,7 +3983,7 @@ const fetchStories = async (spaceId, params) => {
 };
 const fetchStory = async (spaceId, storyId) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.stories.get({
       path: {
         space_id: spaceId,
@@ -4023,7 +3998,7 @@ const fetchStory = async (spaceId, storyId) => {
 };
 const createStory = async (spaceId, payload) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.stories.create({
       path: {
         space_id: spaceId
@@ -4041,7 +4016,7 @@ const createStory = async (spaceId, payload) => {
 };
 const updateStory = async (spaceId, storyId, payload) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.stories.updateStory({
       path: {
         space_id: spaceId,
@@ -4693,8 +4668,7 @@ migrationsCommand.command("run [componentName]").description("Run migrations").o
   }
   const verbose = program.opts().verbose;
   const { space, path } = migrationsCommand.opts();
-  const { state, initializeSession } = session();
-  await initializeSession();
+  const { state } = session();
   if (!requireAuthentication(state, verbose)) {
     return;
   }
@@ -4703,13 +4677,6 @@ migrationsCommand.command("run [componentName]").description("Run migrations").o
     return;
   }
   const { filter, dryRun = false, query, startsWith, publish } = options;
-  const { password, region } = state;
-  mapiClient({
-    token: {
-      accessToken: password
-    },
-    region
-  });
   try {
     const spinner = ui.createSpinner(`Fetching migration files and stories...`);
     const migrationFiles = await readMigrationFiles({
@@ -4827,8 +4794,7 @@ migrationsCommand.command("rollback [migrationFile]").description("Rollback a mi
     space,
     path
   });
-  const { state, initializeSession } = session();
-  await initializeSession();
+  const { state } = session();
   if (!requireAuthentication(state, verbose)) {
     return;
   }
@@ -4836,13 +4802,6 @@ migrationsCommand.command("rollback [migrationFile]").description("Rollback a mi
     handleError(new CommandError(`Please provide the space as argument --space YOUR_SPACE_ID.`), verbose);
     return;
   }
-  const { password, region } = state;
-  mapiClient({
-    token: {
-      accessToken: password
-    },
-    region
-  });
   try {
     const rollbackData = await readRollbackFile({
       space,
@@ -5659,7 +5618,7 @@ const DEFAULT_DATASOURCES_FILENAME = "datasources";
 
 const pushDatasource = async (spaceId, datasource) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.datasources.create({
       path: {
         space_id: spaceId
@@ -5674,7 +5633,7 @@ const pushDatasource = async (spaceId, datasource) => {
 };
 const updateDatasource = async (spaceId, datasourceId, datasource) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.datasources.update({
       path: {
         space_id: spaceId,
@@ -5699,7 +5658,7 @@ const upsertDatasource = async (space, datasource, existingId) => {
 };
 const pushDatasourceEntry = async (spaceId, datasourceId, entry) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.datasourceEntries.create({
       path: {
         space_id: spaceId
@@ -5719,7 +5678,7 @@ const pushDatasourceEntry = async (spaceId, datasourceId, entry) => {
 };
 const updateDatasourceEntry = async (spaceId, entryId, entry) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     await client.datasourceEntries.updateDatasourceEntry({
       path: {
         space_id: spaceId,
@@ -5889,7 +5848,7 @@ async function fetchAllPages(fetchFunction, extractDataFunction, page = 1, colle
 }
 const fetchDatasourceEntries = async (spaceId, datasourceId) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     return await fetchAllPages(
       (page) => client.datasourceEntries.list({
         path: {
@@ -5909,7 +5868,7 @@ const fetchDatasourceEntries = async (spaceId, datasourceId) => {
 };
 const fetchDatasources = async (spaceId) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const datasources = await fetchAllPages(
       (page) => client.datasources.list({
         path: {
@@ -5938,7 +5897,7 @@ const fetchDatasources = async (spaceId) => {
 };
 const fetchDatasource = async (spaceId, datasourceName) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.datasources.list({
       path: {
         space_id: spaceId
@@ -5989,8 +5948,7 @@ datasourcesCommand.command("pull [datasourceName]").option("-f, --filename <file
   } = options;
   const actualFilename = filename ?? DEFAULT_DATASOURCES_FILENAME;
   const datasourcesOutputDir = resolveCommandPath(directories.datasources, space, path);
-  const { state, initializeSession } = session();
-  await initializeSession();
+  const { state } = session();
   if (!requireAuthentication(state, verbose)) {
     return;
   }
@@ -5998,13 +5956,6 @@ datasourcesCommand.command("pull [datasourceName]").option("-f, --filename <file
     handleError(new CommandError(`Please provide the space as argument --space YOUR_SPACE_ID.`), verbose);
     return;
   }
-  const { password, region } = state;
-  mapiClient({
-    token: {
-      accessToken: password
-    },
-    region
-  });
   const spinnerDatasources = new Spinner({
     verbose: !isVitest
   });
@@ -6065,8 +6016,7 @@ datasourcesCommand.command("push [datasourceName]").description(`Push your space
   const { space, path } = datasourcesCommand.opts();
   const { filter } = options;
   const fromSpace = options.from || space;
-  const { state, initializeSession } = session();
-  await initializeSession();
+  const { state } = session();
   if (!requireAuthentication(state, verbose)) {
     return;
   }
@@ -6076,13 +6026,6 @@ datasourcesCommand.command("push [datasourceName]").description(`Push your space
   }
   konsola.info(`Attempting to push datasources ${chalk.bold("from")} space ${chalk.hex(colorPalette.DATASOURCES)(fromSpace)} ${chalk.bold("to")} ${chalk.hex(colorPalette.DATASOURCES)(space)}`);
   konsola.br();
-  const { password, region } = state;
-  mapiClient({
-    token: {
-      accessToken: password
-    },
-    region
-  });
   try {
     const spaceState = {
       local: await readDatasourcesFiles({
@@ -6169,7 +6112,7 @@ datasourcesCommand.command("push [datasourceName]").description(`Push your space
 
 async function deleteDatasource(spaceId, id) {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     await client.datasources.delete({
       path: {
         space_id: spaceId,
@@ -6195,8 +6138,7 @@ datasourcesCommand.command("delete [name]").description("Delete a datasource fro
   }
   const { space } = datasourcesCommand.opts();
   const verbose = datasourcesCommand.parent?.opts().verbose;
-  const { state, initializeSession } = session();
-  await initializeSession();
+  const { state } = session();
   if (!requireAuthentication(state, verbose)) {
     return;
   }
@@ -6204,13 +6146,6 @@ datasourcesCommand.command("delete [name]").description("Delete a datasource fro
     handleError(new CommandError("Please provide the space as argument --space YOUR_SPACE_ID."), verbose);
     return;
   }
-  const { password, region } = state;
-  mapiClient({
-    token: {
-      accessToken: password
-    },
-    region
-  });
   const spinner = new Spinner({
     verbose: !isVitest
   });
@@ -6457,7 +6392,6 @@ program$5.command(`${commands.CREATE} [project-path]`).alias("c").description(`S
     konsola.warn(`Both --blueprint and --template provided. Using --template and ignoring --blueprint.`);
   }
   const { state, initializeSession } = session();
-  await initializeSession();
   let password;
   let region;
   if (state.region) {
@@ -6478,12 +6412,6 @@ program$5.command(`${commands.CREATE} [project-path]`).alias("c").description(`S
       handleError(new CommandError(`Cannot create space in region "${options.region}". Your account is configured for region "${region}". Space creation must use your account's region.`));
       return;
     }
-    mapiClient({
-      token: {
-        accessToken: password
-      },
-      region
-    });
   } else if (state.isLoggedIn && state.password) {
     password = state.password;
     if (state.region) {
@@ -6722,7 +6650,7 @@ const assetsCommand = program$2.command(commands.ASSETS).description(`Manage you
 
 const fetchAssets = async ({ spaceId, params }) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data, response } = await client.assets.list({
       path: {
         space_id: spaceId
@@ -6768,7 +6696,7 @@ const getSignedAssetUrl = async (filename, assetToken, region) => {
 };
 const fetchAssetFolders = async ({ spaceId }) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data, response } = await client.assetFolders.list({
       path: {
         space_id: spaceId
@@ -6788,7 +6716,7 @@ const createAssetFolder = async (folder, {
   spaceId
 }) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.assetFolders.create({
       path: {
         space_id: spaceId
@@ -6810,7 +6738,7 @@ const updateAssetFolder = async (folder, {
   spaceId
 }) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     await client.assetFolders.update({
       path: {
         asset_folder_id: folder.id,
@@ -6827,7 +6755,7 @@ const updateAssetFolder = async (folder, {
 };
 const requestAssetUpload = async (asset, { spaceId }) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     const { data } = await client.assets.upload({
       path: {
         space_id: spaceId
@@ -6877,7 +6805,7 @@ const finishAssetUpload = async (assetId, {
   spaceId
 }) => {
   try {
-    const client = mapiClient();
+    const client = getMapiClient();
     await client.assets.finalize({
       path: {
         space_id: spaceId,
@@ -6940,7 +6868,7 @@ const updateAsset = async (asset, fileBuffer, {
       assetWithNewFilename.filename = uploadedAsset.filename;
       assetWithNewFilename.short_filename = uploadedAsset.short_filename;
     }
-    const client = mapiClient();
+    const client = getMapiClient();
     await client.assets.update({
       path: {
         space_id: spaceId,
@@ -7301,7 +7229,7 @@ const makeCreateAssetFolderAPITransport = ({ spaceId }) => (folder) => createAss
 });
 const makeUpdateAssetFolderAPITransport = ({ spaceId }) => (folder) => updateAssetFolder(folder, { spaceId });
 const makeGetAssetFolderAPITransport = ({ spaceId }) => async (folderId) => {
-  const { data, response } = await mapiClient().assetFolders.get({
+  const { data, response } = await getMapiClient().assetFolders.get({
     path: {
       asset_folder_id: folderId,
       space_id: spaceId
@@ -7441,7 +7369,7 @@ const makeAppendAssetFolderManifestFSTransport = ({ manifestFile }) => async (lo
   }));
 };
 const makeGetAssetAPITransport = ({ spaceId }) => async (assetId) => {
-  const { data, response } = await mapiClient().assets.get({
+  const { data, response } = await getMapiClient().assets.get({
     path: {
       space_id: spaceId,
       asset_id: assetId
@@ -7607,8 +7535,7 @@ assetsCommand.command("pull").option("-d, --dry-run", "Preview changes without a
   }
   const { space, path: basePath, verbose } = command.optsWithGlobals();
   const assetToken = options.assetToken;
-  const { state, initializeSession } = session();
-  await initializeSession();
+  const { state } = session();
   if (!requireAuthentication(state, verbose)) {
     process.exitCode = 2;
     return;
@@ -7618,13 +7545,7 @@ assetsCommand.command("pull").option("-d, --dry-run", "Preview changes without a
     process.exitCode = 2;
     return;
   }
-  const { password, region } = state;
-  mapiClient({
-    token: {
-      accessToken: password
-    },
-    region
-  });
+  const { region } = state;
   const summary = {
     folderResults: { total: 0, succeeded: 0, failed: 0 },
     fetchAssetPages: { total: 0, succeeded: 0, failed: 0 },
@@ -8073,7 +7994,7 @@ const mapReferencesStream = ({
   });
 };
 const getRemoteStory = async ({ spaceId, storyId }) => {
-  const { data, response } = await mapiClient().stories.get({
+  const { data, response } = await getMapiClient().stories.get({
     path: {
       space_id: spaceId,
       story_id: storyId
@@ -8093,8 +8014,8 @@ const makeCreateStoryAPITransport = ({ spaceId }) => async (localStory) => {
     story: {
       ...newStoryData,
       content: {
-        // @ts-expect-error Our types are wrong.
-        component: content?.component
+        _uid: "",
+        component: "__tmp__"
       }
     },
     publish: 0
@@ -8471,8 +8392,7 @@ assetsCommand.command("push").argument("[asset]", "path or URL of a single asset
   const { space: targetSpace, path: basePath, verbose } = command.optsWithGlobals();
   const fromSpace = options.from || targetSpace;
   const assetToken = options.assetToken;
-  const { state, initializeSession } = session();
-  await initializeSession();
+  const { state } = session();
   if (!requireAuthentication(state, verbose)) {
     process.exitCode = 2;
     return;
@@ -8482,13 +8402,7 @@ assetsCommand.command("push").argument("[asset]", "path or URL of a single asset
     process.exitCode = 2;
     return;
   }
-  const { password, region } = state;
-  mapiClient({
-    token: {
-      accessToken: password
-    },
-    region
-  });
+  const { region } = state;
   const summaries = [];
   let fatalError = false;
   const manifestFile = join(resolveCommandPath(directories.assets, fromSpace, basePath), "manifest.jsonl");
@@ -8621,8 +8535,7 @@ storiesCommand.command("pull").option("-d, --dry-run", "Preview changes without
     logger.warn("Dry run mode enabled");
   }
   const { space, path: basePath, verbose } = command.optsWithGlobals();
-  const { state, initializeSession } = session();
-  await initializeSession();
+  const { state } = session();
   if (!requireAuthentication(state, verbose)) {
     return;
   }
@@ -8630,13 +8543,6 @@ storiesCommand.command("pull").option("-d, --dry-run", "Preview changes without
     handleError(new CommandError(`Please provide the space as argument --space YOUR_SPACE_ID.`), verbose);
     return;
   }
-  const { password, region } = state;
-  mapiClient({
-    token: {
-      accessToken: password
-    },
-    region
-  });
   const summary = {
     fetchStoryPages: { total: 0, succeeded: 0, failed: 0 },
     fetchStories: { total: 0, succeeded: 0, failed: 0 },
@@ -8739,8 +8645,7 @@ storiesCommand.command("push").option("-f, --from <from>", "source space id").op
   }
   const { space, path: basePath, verbose } = command.optsWithGlobals();
   const fromSpace = options.from || space;
-  const { state, initializeSession } = session();
-  await initializeSession();
+  const { state } = session();
   if (!requireAuthentication(state, verbose)) {
     return;
   }
@@ -8748,13 +8653,6 @@ storiesCommand.command("push").option("-f, --from <from>", "source space id").op
     handleError(new CommandError(`Please provide the space as argument --space YOUR_SPACE_ID.`), verbose);
     return;
   }
-  const { password, region } = state;
-  mapiClient({
-    token: {
-      accessToken: password
-    },
-    region
-  });
   const warnAboutCustomPlugins = (fields, story) => {
     const warnedPlugins = /* @__PURE__ */ new Set();
     for (const field of fields) {