@contentstack/cli-variants 2.0.0-beta.2 → 2.0.0-beta.4

package/lib/export/attributes.js

@@ -27,7 +27,7 @@ class ExportAttributes extends utils_1.PersonalizationAdapter {
         this.exportConfig = exportConfig;
         this.personalizeConfig = exportConfig.modules.personalize;
         this.attributesConfig = exportConfig.modules.attributes;
-        this.attributesFolderPath = (0, node_path_1.resolve)((0, cli_utilities_1.sanitizePath)(exportConfig.data), (0, cli_utilities_1.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName), (0, cli_utilities_1.sanitizePath)(this.attributesConfig.dirName));
+        this.attributesFolderPath = (0, node_path_1.resolve)((0, cli_utilities_1.sanitizePath)(exportConfig.exportDir), (0, cli_utilities_1.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName), (0, cli_utilities_1.sanitizePath)(this.attributesConfig.dirName));
         this.attributes = [];
         this.exportConfig.context.module = constants_1.MODULE_CONTEXTS.ATTRIBUTES;
     }

package/lib/export/audiences.js

@@ -27,7 +27,7 @@ class ExportAudiences extends utils_1.PersonalizationAdapter {
         this.exportConfig = exportConfig;
         this.personalizeConfig = exportConfig.modules.personalize;
         this.audiencesConfig = exportConfig.modules.audiences;
-        this.audiencesFolderPath = (0, node_path_1.resolve)((0, cli_utilities_1.sanitizePath)(exportConfig.data), (0, cli_utilities_1.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName), (0, cli_utilities_1.sanitizePath)(this.audiencesConfig.dirName));
+        this.audiencesFolderPath = (0, node_path_1.resolve)((0, cli_utilities_1.sanitizePath)(exportConfig.exportDir), (0, cli_utilities_1.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName), (0, cli_utilities_1.sanitizePath)(this.audiencesConfig.dirName));
         this.audiences = [];
         this.exportConfig.context.module = constants_1.MODULE_CONTEXTS.AUDIENCES;
     }
@@ -51,7 +51,7 @@ class ExportAudiences extends utils_1.PersonalizationAdapter {
                 }));
                 if (!((_a = this.audiences) === null || _a === void 0 ? void 0 : _a.length)) {
                     cli_utilities_1.log.debug('No audiences found, completing export', this.exportConfig.context);
-                    cli_utilities_1.log.info('No Audiences found with the given project!', this.exportConfig.context);
+                    cli_utilities_1.log.info('No audiences found for the given project.', this.exportConfig.context);
                     return;
                 }
                 let progress;

package/lib/export/events.js

@@ -27,7 +27,7 @@ class ExportEvents extends utils_1.PersonalizationAdapter {
         this.exportConfig = exportConfig;
         this.personalizeConfig = exportConfig.modules.personalize;
         this.eventsConfig = exportConfig.modules.events;
-        this.eventsFolderPath = (0, node_path_1.resolve)((0, cli_utilities_1.sanitizePath)(exportConfig.data), (0, cli_utilities_1.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName), (0, cli_utilities_1.sanitizePath)(this.eventsConfig.dirName));
+        this.eventsFolderPath = (0, node_path_1.resolve)((0, cli_utilities_1.sanitizePath)(exportConfig.exportDir), (0, cli_utilities_1.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName), (0, cli_utilities_1.sanitizePath)(this.eventsConfig.dirName));
         this.events = [];
         this.exportConfig.context.module = constants_1.MODULE_CONTEXTS.EVENTS;
     }

package/lib/export/experiences.js

@@ -59,7 +59,7 @@ class ExportExperiences extends utils_1.PersonalizationAdapter {
         });
         this.exportConfig = exportConfig;
         this.personalizeConfig = exportConfig.modules.personalize;
-        this.experiencesFolderPath = path.resolve((0, cli_utilities_1.sanitizePath)(exportConfig.data), (0, cli_utilities_1.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName), 'experiences');
+        this.experiencesFolderPath = path.resolve((0, cli_utilities_1.sanitizePath)(exportConfig.exportDir), (0, cli_utilities_1.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName), 'experiences');
         this.exportConfig.context.module = constants_1.MODULE_CONTEXTS.EXPERIENCES;
     }
     start() {
@@ -86,7 +86,7 @@ class ExportExperiences extends utils_1.PersonalizationAdapter {
                 }));
                 if (!experiences || (experiences === null || experiences === void 0 ? void 0 : experiences.length) < 1) {
                     cli_utilities_1.log.debug('No experiences found, completing export', this.exportConfig.context);
-                    cli_utilities_1.log.info('No Experiences found with the given project!', this.exportConfig.context);
+                    cli_utilities_1.log.info('No experiences found for the given project.', this.exportConfig.context);
                     return;
                 }
                 let progress;

package/lib/export/projects.js

@@ -22,7 +22,7 @@ class ExportProjects extends utils_1.PersonalizationAdapter {
         });
         this.exportConfig = exportConfig;
         this.personalizeConfig = exportConfig.modules.personalize;
-        this.projectsFolderPath = (0, node_path_1.resolve)((0, cli_utilities_1.sanitizePath)(exportConfig.data), (0, cli_utilities_1.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName), 'projects');
+        this.projectsFolderPath = (0, node_path_1.resolve)((0, cli_utilities_1.sanitizePath)(exportConfig.exportDir), (0, cli_utilities_1.sanitizePath)(exportConfig.branchName || ''), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName), 'projects');
         this.projectsData = [];
         this.exportConfig.context.module = constants_1.MODULE_CONTEXTS.PROJECTS;
     }

package/lib/export/variant-entries.js

@@ -68,7 +68,7 @@ class VariantEntries extends variant_api_adapter_1.default {
         this.processInitialized = false;
         this.totalVariantCount = 0;
         this.processedVariantCount = 0;
-        this.entriesDirPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(config.data), (0, cli_utilities_1.sanitizePath)(config.branchName || ''), (0, cli_utilities_1.sanitizePath)(config.modules.entries.dirName));
+        this.entriesDirPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(config.exportDir), (0, cli_utilities_1.sanitizePath)(config.branchName || ''), (0, cli_utilities_1.sanitizePath)(config.modules.entries.dirName));
         if (this.config && this.config.context) {
             this.config.context.module = 'variant-entries';
         }

package/lib/import/attribute.js

@@ -112,7 +112,7 @@ class Attribute extends utils_1.PersonalizationAdapter {
             return this.withLoadingSpinner('ATTRIBUTES: Analyzing import data...', () => __awaiter(this, void 0, void 0, function* () {
                 var _a;
                 const { dirName, fileName } = this.attributeConfig;
-                const attributesPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.config.data), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName), (0, cli_utilities_1.sanitizePath)(dirName), (0, cli_utilities_1.sanitizePath)(fileName));
+                const attributesPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.config.contentDir), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName), (0, cli_utilities_1.sanitizePath)(dirName), (0, cli_utilities_1.sanitizePath)(fileName));
                 cli_utilities_1.log.debug(`Checking for attributes file: ${attributesPath}`, this.config.context);
                 if (!(0, fs_1.existsSync)(attributesPath)) {
                     cli_utilities_1.log.warn(`Attributes file not found: ${attributesPath}`, this.config.context);

package/lib/import/audiences.js

@@ -118,7 +118,7 @@ class Audiences extends utils_1.PersonalizationAdapter {
             return this.withLoadingSpinner('AUDIENCES: Analyzing import data...', () => __awaiter(this, void 0, void 0, function* () {
                 var _a;
                 const { dirName, fileName } = this.audienceConfig;
-                const audiencesPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.config.data), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName), (0, cli_utilities_1.sanitizePath)(dirName), (0, cli_utilities_1.sanitizePath)(fileName));
+                const audiencesPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.config.contentDir), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName), (0, cli_utilities_1.sanitizePath)(dirName), (0, cli_utilities_1.sanitizePath)(fileName));
                 cli_utilities_1.log.debug(`Checking for audiences file: ${audiencesPath}`, this.config.context);
                 if (!(0, fs_1.existsSync)(audiencesPath)) {
                     cli_utilities_1.log.warn(`Audiences file not found: ${audiencesPath}`, this.config.context);

package/lib/import/events.js

@@ -115,7 +115,7 @@ class Events extends utils_1.PersonalizationAdapter {
             return this.withLoadingSpinner('EVENTS: Analyzing import data...', () => __awaiter(this, void 0, void 0, function* () {
                 var _a;
                 const { dirName, fileName } = this.eventConfig;
-                const eventsPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.config.data), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName), (0, cli_utilities_1.sanitizePath)(dirName), (0, cli_utilities_1.sanitizePath)(fileName));
+                const eventsPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.config.contentDir), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName), (0, cli_utilities_1.sanitizePath)(dirName), (0, cli_utilities_1.sanitizePath)(fileName));
                 cli_utilities_1.log.debug(`Checking for events file: ${eventsPath}`, this.config.context);
                 if (!(0, fs_1.existsSync)(eventsPath)) {
                     cli_utilities_1.log.warn(`Events file not found: ${eventsPath}`, this.config.context);

package/lib/import/experiences.js

@@ -45,7 +45,7 @@ class Experiences extends utils_1.PersonalizationAdapter {
         super(Object.assign(config, conf));
         this.config = config;
         this.personalizeConfig = this.config.modules.personalize;
-        this.experiencesDirPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.config.data), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.experiences.dirName));
+        this.experiencesDirPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.config.contentDir), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.experiences.dirName));
         this.experiencesPath = (0, path_1.join)((0, cli_utilities_1.sanitizePath)(this.experiencesDirPath), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.experiences.fileName));
         this.experienceConfig = this.personalizeConfig.experiences;
         this.audienceConfig = this.personalizeConfig.audiences;
@@ -59,7 +59,7 @@ class Experiences extends utils_1.PersonalizationAdapter {
         this.failedCmsExpPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.expMapperDirPath), 'failed-cms-experience.json');
         this.failedCmsExpPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.expMapperDirPath), 'failed-cms-experience.json');
         this.experienceCTsPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.experiencesDirPath), 'experiences-content-types.json');
-        this.experienceVariantsIdsPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.config.data), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName), (0, cli_utilities_1.sanitizePath)(this.experienceConfig.dirName), 'experiences-variants-ids.json');
+        this.experienceVariantsIdsPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.config.contentDir), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName), (0, cli_utilities_1.sanitizePath)(this.experienceConfig.dirName), 'experiences-variants-ids.json');
         this.variantUidMapperFilePath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.expMapperDirPath), 'variants-uid-mapping.json');
         this.experiencesUidMapper = {};
         this.cmsVariantGroups = {};

package/lib/import/project.js

@@ -117,7 +117,7 @@ class Project extends utils_1.PersonalizationAdapter {
                 var _a;
                 const personalize = this.config.modules.personalize;
                 const { dirName, fileName } = personalize.projects;
-                const projectPath = (0, path_1.join)((0, cli_utilities_1.sanitizePath)(this.config.data), (0, cli_utilities_1.sanitizePath)(personalize.dirName), (0, cli_utilities_1.sanitizePath)(dirName), (0, cli_utilities_1.sanitizePath)(fileName));
+                const projectPath = (0, path_1.join)((0, cli_utilities_1.sanitizePath)(this.config.contentDir), (0, cli_utilities_1.sanitizePath)(personalize.dirName), (0, cli_utilities_1.sanitizePath)(dirName), (0, cli_utilities_1.sanitizePath)(fileName));
                 cli_utilities_1.log.debug(`Checking for project file: ${projectPath}`, this.config.context);
                 if (!(0, fs_1.existsSync)(projectPath)) {
                     this.config.modules.personalize.importData = false;

package/lib/types/export-config.d.ts

@@ -4,7 +4,7 @@
  * Therefore, we are duplicating the following types from the export.
  */
 import { AnyProperty, Context } from './utils';
-export type Modules = 'stack' | 'assets' | 'locales' | 'environments' | 'extensions' | 'webhooks' | 'global-fields' | 'entries' | 'content-types' | 'custom-roles' | 'workflows' | 'labels' | 'marketplace-apps' | 'taxonomies' | 'personalize';
+export type Modules = 'stack' | 'assets' | 'locales' | 'environments' | 'extensions' | 'webhooks' | 'global-fields' | 'entries' | 'content-types' | 'custom-roles' | 'workflows' | 'labels' | 'marketplace-apps' | 'taxonomies' | 'personalize' | 'composable-studio';
 export type branch = {
     uid: string;
     source: string;
@@ -158,6 +158,11 @@ export interface DefaultConfig {
             fileName: string;
             dependencies?: Modules[];
         };
+        'composable-studio': {
+            dirName: string;
+            fileName: string;
+            apiBaseUrl: string;
+        };
         masterLocale: {
             dirName: string;
             fileName: string;

package/lib/types/utils.d.ts

@@ -6,7 +6,6 @@ export interface LogType {
     (config: any, message: any, type: 'info' | 'error' | 'success'): void;
 }
 export interface Context {
-    command: string;
     module: string;
     userId: string | undefined;
     email?: string | undefined;

package/lib/utils/logger.js

@@ -156,7 +156,7 @@ function init(_logPath, module) {
     };
 }
 const log = (config, message, type) => {
-    const logsPath = config.data;
+    const logsPath = 'exportDir' in config ? config.exportDir : 'contentDir' in config ? config.contentDir : config.data;
     // ignoring the type argument, as we are not using it to create a logfile anymore
     const module = config['backupDir'] ? 'import' : 'export';
     if (type !== 'error') {

package/lib/utils/variant-api-adapter.js

@@ -46,11 +46,11 @@ class VariantHttpClient extends adapter_helper_1.AdapterHelper {
             const token = cli_utilities_1.authenticationHandler.accessToken;
             cli_utilities_1.log.debug(`Authentication type: ${cli_utilities_1.authenticationHandler.isOauthEnabled ? 'OAuth' : 'Token'}`, (_b = this.exportConfig) === null || _b === void 0 ? void 0 : _b.context);
             if (cli_utilities_1.authenticationHandler.isOauthEnabled) {
-                cli_utilities_1.log.debug('Setting OAuth authorization header', (_c = this.exportConfig) === null || _c === void 0 ? void 0 : _c.context);
+                cli_utilities_1.log.debug('Setting OAuth authorization header...', (_c = this.exportConfig) === null || _c === void 0 ? void 0 : _c.context);
                 this.apiClient.headers({ authorization: token });
             }
             else {
-                cli_utilities_1.log.debug('Setting authtoken header', (_d = this.exportConfig) === null || _d === void 0 ? void 0 : _d.context);
+                cli_utilities_1.log.debug('Setting authtoken header...', (_d = this.exportConfig) === null || _d === void 0 ? void 0 : _d.context);
                 this.apiClient.headers({ authtoken: token });
             }
         });
@@ -83,7 +83,7 @@ class VariantHttpClient extends adapter_helper_1.AdapterHelper {
             cli_utilities_1.log.debug(`Fetching variant entries for content type: ${content_type_uid}, entry: ${entry_uid}, locale: ${locale}`, (_a = this.exportConfig) === null || _a === void 0 ? void 0 : _a.context);
             cli_utilities_1.log.debug(`Query parameters - skip: ${skip}, limit: ${limit}, include_variant: ${include_variant}, include_count: ${include_count}, include_publish_details: ${include_publish_details}`, (_b = this.exportConfig) === null || _b === void 0 ? void 0 : _b.context);
             if (variantConfig.serveMockData && callback) {
-                cli_utilities_1.log.debug('Using mock data for variant entries', (_c = this.exportConfig) === null || _c === void 0 ? void 0 : _c.context);
+                cli_utilities_1.log.debug('Using mock data for variant entries...', (_c = this.exportConfig) === null || _c === void 0 ? void 0 : _c.context);
                 let data = [];
                 if ((0, fs_1.existsSync)(variantConfig.mockDataPath)) {
                     cli_utilities_1.log.debug(`Loading mock data from: ${variantConfig.mockDataPath}`, (_d = this.exportConfig) === null || _d === void 0 ? void 0 : _d.context);
@@ -131,11 +131,11 @@ class VariantHttpClient extends adapter_helper_1.AdapterHelper {
                 cli_utilities_1.log.debug(`Received ${(_h = response.entries) === null || _h === void 0 ? void 0 : _h.length} variant entries out of total ${response.count}`, (_j = this.exportConfig) === null || _j === void 0 ? void 0 : _j.context);
             }
             if (callback) {
-                cli_utilities_1.log.debug('Executing callback with variant entries', (_k = this.exportConfig) === null || _k === void 0 ? void 0 : _k.context);
+                cli_utilities_1.log.debug('Executing callback with variant entries...', (_k = this.exportConfig) === null || _k === void 0 ? void 0 : _k.context);
                 callback(response.entries);
             }
             else {
-                cli_utilities_1.log.debug('Adding variant entries to collection', (_l = this.exportConfig) === null || _l === void 0 ? void 0 : _l.context);
+                cli_utilities_1.log.debug('Adding variant entries to collection...', (_l = this.exportConfig) === null || _l === void 0 ? void 0 : _l.context);
                 entries = entries.concat(response.entries);
             }
             if (getAllData && skip + limit < response.count) {
@@ -154,7 +154,7 @@ class VariantHttpClient extends adapter_helper_1.AdapterHelper {
                 return yield this.variantEntries(options, entries);
             }
             if (returnResult) {
-                cli_utilities_1.log.debug('Returning variant entries result', (_p = this.exportConfig) === null || _p === void 0 ? void 0 : _p.context);
+                cli_utilities_1.log.debug('Returning variant entries result...', (_p = this.exportConfig) === null || _p === void 0 ? void 0 : _p.context);
                 return { entries };
             }
         });
@@ -264,7 +264,7 @@ class VariantHttpClient extends adapter_helper_1.AdapterHelper {
             const { status, data } = res;
             cli_utilities_1.log.debug(`API response status: ${status}`, (_a = this.exportConfig) === null || _a === void 0 ? void 0 : _a.context);
             if (status >= 200 && status < 300) {
-                cli_utilities_1.log.debug('API request successful', (_b = this.exportConfig) === null || _b === void 0 ? void 0 : _b.context);
+                cli_utilities_1.log.debug('API request successful.', (_b = this.exportConfig) === null || _b === void 0 ? void 0 : _b.context);
                 return data;
             }
             cli_utilities_1.log.debug(`API request failed with status: ${status}`, (_c = this.exportConfig) === null || _c === void 0 ? void 0 : _c.context);
@@ -324,17 +324,17 @@ class VariantAdapter {
         this.currentModuleName = '';
         cli_utilities_1.log.debug('Initializing VariantAdapter...', (_a = this.exportConfig) === null || _a === void 0 ? void 0 : _a.context);
         if (config.httpClient) {
-            cli_utilities_1.log.debug('Using HTTP client variant instance', (_b = this.exportConfig) === null || _b === void 0 ? void 0 : _b.context);
+            cli_utilities_1.log.debug('Using HTTP client variant instance.', (_b = this.exportConfig) === null || _b === void 0 ? void 0 : _b.context);
             const { httpClient, Adapter } = config, restConfig = __rest(config, ["httpClient", "Adapter"]);
             this.variantInstance = new Adapter(restConfig, options);
         }
         else {
-            cli_utilities_1.log.debug('Using SDK variant instance', (_c = this.exportConfig) === null || _c === void 0 ? void 0 : _c.context);
+            cli_utilities_1.log.debug('Using SDK variant instance.', (_c = this.exportConfig) === null || _c === void 0 ? void 0 : _c.context);
             const { Adapter } = config, restConfig = __rest(config, ["Adapter"]);
             this.variantInstance = new Adapter(restConfig);
         }
         this.messages = messages_1.default;
-        cli_utilities_1.log.debug('VariantAdapter initialized successfully', (_d = this.exportConfig) === null || _d === void 0 ? void 0 : _d.context);
+        cli_utilities_1.log.debug('VariantAdapter initialized successfully.', (_d = this.exportConfig) === null || _d === void 0 ? void 0 : _d.context);
     }
     /**
      * Set parent progress manager for sub-module integration

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-variants",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.4",
   "description": "Variants plugin",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -27,7 +27,7 @@
     "typescript": "^5.8.3"
   },
   "dependencies": {
-    "@contentstack/cli-utilities": "~1.15.0",
+    "@contentstack/cli-utilities": "~1.17.0",
     "@oclif/core": "^4.3.0",
     "@oclif/plugin-help": "^6.2.28",
     "lodash": "^4.17.21",

package/src/export/attributes.ts

@@ -22,7 +22,7 @@ export default class ExportAttributes extends PersonalizationAdapter<ExportConfi
     this.personalizeConfig = exportConfig.modules.personalize;
     this.attributesConfig = exportConfig.modules.attributes;
     this.attributesFolderPath = pResolve(
-      sanitizePath(exportConfig.data),
+      sanitizePath(exportConfig.exportDir),
       sanitizePath(exportConfig.branchName || ''),
       sanitizePath(this.personalizeConfig.dirName),
       sanitizePath(this.attributesConfig.dirName),

package/src/export/audiences.ts

@@ -22,7 +22,7 @@ export default class ExportAudiences extends PersonalizationAdapter<ExportConfig
     this.personalizeConfig = exportConfig.modules.personalize;
     this.audiencesConfig = exportConfig.modules.audiences;
     this.audiencesFolderPath = pResolve(
-      sanitizePath(exportConfig.data),
+      sanitizePath(exportConfig.exportDir),
       sanitizePath(exportConfig.branchName || ''),
       sanitizePath(this.personalizeConfig.dirName),
       sanitizePath(this.audiencesConfig.dirName),
@@ -52,7 +52,7 @@ export default class ExportAudiences extends PersonalizationAdapter<ExportConfig
 
       if (!this.audiences?.length) {
         log.debug('No audiences found, completing export', this.exportConfig.context);
-        log.info('No Audiences found with the given project!', this.exportConfig.context);
+        log.info('No audiences found for the given project.', this.exportConfig.context);
         return;
       }
 

package/src/export/events.ts

@@ -22,7 +22,7 @@ export default class ExportEvents extends PersonalizationAdapter<ExportConfig> {
     this.personalizeConfig = exportConfig.modules.personalize;
     this.eventsConfig = exportConfig.modules.events;
     this.eventsFolderPath = pResolve(
-      sanitizePath(exportConfig.data),
+      sanitizePath(exportConfig.exportDir),
       sanitizePath(exportConfig.branchName || ''),
       sanitizePath(this.personalizeConfig.dirName),
       sanitizePath(this.eventsConfig.dirName),

package/src/export/experiences.ts

@@ -22,7 +22,7 @@ export default class ExportExperiences extends PersonalizationAdapter<ExportConf
     this.exportConfig = exportConfig;
     this.personalizeConfig = exportConfig.modules.personalize;
     this.experiencesFolderPath = path.resolve(
-      sanitizePath(exportConfig.data),
+      sanitizePath(exportConfig.exportDir),
       sanitizePath(exportConfig.branchName || ''),
       sanitizePath(this.personalizeConfig.dirName),
       'experiences',
@@ -61,7 +61,7 @@ export default class ExportExperiences extends PersonalizationAdapter<ExportConf
 
       if (!experiences || experiences?.length < 1) {
         log.debug('No experiences found, completing export', this.exportConfig.context);
-        log.info('No Experiences found with the given project!', this.exportConfig.context);
+        log.info('No experiences found for the given project.', this.exportConfig.context);
         return;
       }
 

package/src/export/projects.ts

@@ -19,7 +19,7 @@ export default class ExportProjects extends PersonalizationAdapter<ExportConfig>
     this.exportConfig = exportConfig;
     this.personalizeConfig = exportConfig.modules.personalize;
     this.projectsFolderPath = pResolve(
-      sanitizePath(exportConfig.data),
+      sanitizePath(exportConfig.exportDir),
       sanitizePath(exportConfig.branchName || ''),
       sanitizePath(this.personalizeConfig.dirName),
       'projects',

package/src/export/variant-entries.ts

@@ -31,7 +31,7 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Exp
     };
     super(Object.assign(config, conf));
     this.entriesDirPath = resolve(
-      sanitizePath(config.data),
+      sanitizePath(config.exportDir),
       sanitizePath(config.branchName || ''),
       sanitizePath(config.modules.entries.dirName),
     );

package/src/import/attribute.ts

@@ -124,7 +124,7 @@ export default class Attribute extends PersonalizationAdapter<ImportConfig> {
     return this.withLoadingSpinner('ATTRIBUTES: Analyzing import data...', async () => {
       const { dirName, fileName } = this.attributeConfig;
       const attributesPath = resolve(
-        sanitizePath(this.config.data),
+        sanitizePath(this.config.contentDir),
         sanitizePath(this.personalizeConfig.dirName),
         sanitizePath(dirName),
         sanitizePath(fileName),

package/src/import/audiences.ts

@@ -138,7 +138,7 @@ export default class Audiences extends PersonalizationAdapter<ImportConfig> {
     return this.withLoadingSpinner('AUDIENCES: Analyzing import data...', async () => {
       const { dirName, fileName } = this.audienceConfig;
       const audiencesPath = resolve(
-        sanitizePath(this.config.data),
+        sanitizePath(this.config.contentDir),
         sanitizePath(this.personalizeConfig.dirName),
         sanitizePath(dirName),
         sanitizePath(fileName),

package/src/import/events.ts

@@ -123,7 +123,7 @@ export default class Events extends PersonalizationAdapter<ImportConfig> {
     return this.withLoadingSpinner('EVENTS: Analyzing import data...', async () => {
       const { dirName, fileName } = this.eventConfig;
       const eventsPath = resolve(
-        sanitizePath(this.config.data),
+        sanitizePath(this.config.contentDir),
         sanitizePath(this.personalizeConfig.dirName),
         sanitizePath(dirName),
         sanitizePath(fileName),

package/src/import/experiences.ts

@@ -57,7 +57,7 @@ export default class Experiences extends PersonalizationAdapter<ImportConfig> {
 
     this.personalizeConfig = this.config.modules.personalize;
     this.experiencesDirPath = resolve(
-      sanitizePath(this.config.data),
+      sanitizePath(this.config.contentDir),
       sanitizePath(this.personalizeConfig.dirName),
       sanitizePath(this.personalizeConfig.experiences.dirName),
     );
@@ -86,7 +86,7 @@ export default class Experiences extends PersonalizationAdapter<ImportConfig> {
     this.failedCmsExpPath = resolve(sanitizePath(this.expMapperDirPath), 'failed-cms-experience.json');
     this.experienceCTsPath = resolve(sanitizePath(this.experiencesDirPath), 'experiences-content-types.json');
     this.experienceVariantsIdsPath = resolve(
-      sanitizePath(this.config.data),
+      sanitizePath(this.config.contentDir),
       sanitizePath(this.personalizeConfig.dirName),
       sanitizePath(this.experienceConfig.dirName),
       'experiences-variants-ids.json',

package/src/import/project.ts

@@ -133,7 +133,7 @@ export default class Project extends PersonalizationAdapter<ImportConfig> {
       const personalize = this.config.modules.personalize;
       const { dirName, fileName } = personalize.projects;
       const projectPath = join(
-        sanitizePath(this.config.data),
+        sanitizePath(this.config.contentDir),
         sanitizePath(personalize.dirName),
         sanitizePath(dirName),
         sanitizePath(fileName),

package/src/types/export-config.ts

@@ -20,7 +20,8 @@ export type Modules =
   | 'labels'
   | 'marketplace-apps'
   | 'taxonomies'
-  | 'personalize';
+  | 'personalize'
+  | 'composable-studio';
 
 export type branch = {
   uid: string;
@@ -182,6 +183,11 @@ export interface DefaultConfig {
       fileName: string;
       dependencies?: Modules[];
     };
+    'composable-studio': {
+      dirName: string;
+      fileName: string;
+      apiBaseUrl: string;
+    };
     masterLocale: {
       dirName: string;
       fileName: string;

package/src/types/utils.ts

@@ -8,7 +8,6 @@ export interface LogType {
 }
 
 export interface Context {
-  command: string;
   module: string;
   userId: string | undefined;
   email?: string | undefined;

package/src/utils/logger.ts

@@ -132,7 +132,7 @@ function init(_logPath: string, module: string) {
 }
 
 export const log = (config: ExportConfig | ImportConfig, message: any, type: 'info' | 'error' | 'success') => {
-  const logsPath = config.data;
+  const logsPath = 'exportDir' in config ? config.exportDir : 'contentDir' in config ? config.contentDir : (config as any).data;
   // ignoring the type argument, as we are not using it to create a logfile anymore
   const module = (config as ImportConfig)['backupDir'] ? 'import' : 'export';
   if (type !== 'error') {

package/src/utils/variant-api-adapter.ts

@@ -53,10 +53,10 @@ export class VariantHttpClient<C> extends AdapterHelper<C, HttpClient> implement
       this.exportConfig?.context,
     );
     if (authenticationHandler.isOauthEnabled) {
-      log.debug('Setting OAuth authorization header', this.exportConfig?.context);
+      log.debug('Setting OAuth authorization header...', this.exportConfig?.context);
       this.apiClient.headers({ authorization: token });
     } else {
-      log.debug('Setting authtoken header', this.exportConfig?.context);
+      log.debug('Setting authtoken header...', this.exportConfig?.context);
       this.apiClient.headers({ authtoken: token });
     }
   }
@@ -109,7 +109,7 @@ export class VariantHttpClient<C> extends AdapterHelper<C, HttpClient> implement
     );
 
     if (variantConfig.serveMockData && callback) {
-      log.debug('Using mock data for variant entries', this.exportConfig?.context);
+      log.debug('Using mock data for variant entries...', this.exportConfig?.context);
       let data = [] as Record<string, any>[];
 
       if (existsSync(variantConfig.mockDataPath)) {
@@ -174,10 +174,10 @@ export class VariantHttpClient<C> extends AdapterHelper<C, HttpClient> implement
     }
 
     if (callback) {
-      log.debug('Executing callback with variant entries', this.exportConfig?.context);
+      log.debug('Executing callback with variant entries...', this.exportConfig?.context);
       callback(response.entries);
     } else {
-      log.debug('Adding variant entries to collection', this.exportConfig?.context);
+      log.debug('Adding variant entries to collection...', this.exportConfig?.context);
       entries = entries.concat(response.entries);
     }
 
@@ -200,7 +200,7 @@ export class VariantHttpClient<C> extends AdapterHelper<C, HttpClient> implement
     }
 
     if (returnResult) {
-      log.debug('Returning variant entries result', this.exportConfig?.context );
+      log.debug('Returning variant entries result...', this.exportConfig?.context );
       return { entries };
     }
   }
@@ -329,7 +329,7 @@ export class VariantHttpClient<C> extends AdapterHelper<C, HttpClient> implement
     log.debug(`API response status: ${status}`, this.exportConfig?.context);
 
     if (status >= 200 && status < 300) {
-      log.debug('API request successful', this.exportConfig?.context);
+      log.debug('API request successful.', this.exportConfig?.context);
       return data;
     }
 
@@ -406,17 +406,17 @@ export class VariantAdapter<T> {
     log.debug('Initializing VariantAdapter...', this.exportConfig?.context);
 
     if (config.httpClient) {
-      log.debug('Using HTTP client variant instance', this.exportConfig?.context);
+      log.debug('Using HTTP client variant instance.', this.exportConfig?.context);
       const { httpClient, Adapter, ...restConfig } = config;
       this.variantInstance = new Adapter(restConfig, options);
     } else {
-      log.debug('Using SDK variant instance', this.exportConfig?.context);
+      log.debug('Using SDK variant instance.', this.exportConfig?.context);
       const { Adapter, ...restConfig } = config;
       this.variantInstance = new Adapter(restConfig);
     }
 
     this.messages = messages;
-    log.debug('VariantAdapter initialized successfully', this.exportConfig?.context);
+    log.debug('VariantAdapter initialized successfully.', this.exportConfig?.context);
   }
 
   /**