@contentstack/cli-variants 0.0.1-alpha → 1.1.0

package/lib/import/experiences.js

@@ -34,22 +34,22 @@ class Experiences extends utils_1.PersonalizationAdapter {
         var _a, _b, _c, _d;
         const conf = {
             config,
-            baseURL: config.modules.personalization.baseURL[config.region.name],
-            headers: { 'X-Project-Uid': config.modules.personalization.project_id, authtoken: config.auth_token },
+            baseURL: config.modules.personalize.baseURL[config.region.name],
+            headers: { 'X-Project-Uid': config.modules.personalize.project_id },
             cmaConfig: {
                 baseURL: config.region.cma + `/v3`,
-                headers: { authtoken: config.auth_token, api_key: config.apiKey },
+                headers: { api_key: config.apiKey },
             },
         };
         super(Object.assign(config, conf));
         this.config = config;
         this.log = log;
-        this.personalizationConfig = this.config.modules.personalization;
-        this.experiencesDirPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.config.data), (0, cli_utilities_1.sanitizePath)(this.personalizationConfig.dirName), (0, cli_utilities_1.sanitizePath)(this.personalizationConfig.experiences.dirName));
-        this.experiencesPath = (0, path_1.join)((0, cli_utilities_1.sanitizePath)(this.experiencesDirPath), (0, cli_utilities_1.sanitizePath)(this.personalizationConfig.experiences.fileName));
-        this.experienceConfig = this.personalizationConfig.experiences;
-        this.audienceConfig = this.personalizationConfig.audiences;
-        this.mapperDirPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.config.backupDir), 'mapper', (0, cli_utilities_1.sanitizePath)(this.personalizationConfig.dirName));
+        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.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;
+        this.mapperDirPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.config.backupDir), 'mapper', (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName));
         this.expMapperDirPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.mapperDirPath), (0, cli_utilities_1.sanitizePath)(this.experienceConfig.dirName));
         this.experiencesUidMapperPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.expMapperDirPath), 'uid-mapping.json');
         this.cmsVariantGroupPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.expMapperDirPath), 'cms-variant-groups.json');
@@ -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.personalizationConfig.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.data), (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 = {};
@@ -70,6 +70,8 @@ class Experiences extends utils_1.PersonalizationAdapter {
         this.pendingVariantAndVariantGrpForExperience = [];
         this.cTsSuccessPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.config.backupDir), 'mapper', 'content_types', 'success.json');
         this.createdCTs = [];
+        this.audiencesUid = utils_1.fsUtil.readFile(this.audiencesMapperPath, true) || {};
+        this.eventsUid = utils_1.fsUtil.readFile(this.eventsMapperPath, true) || {};
     }
     /**
      * The function asynchronously imports experiences from a JSON file and creates them in the system.
@@ -78,21 +80,28 @@ class Experiences extends utils_1.PersonalizationAdapter {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             this.log(this.config, this.$t(this.messages.IMPORT_MSG, { module: 'Experiences' }), 'info');
+            yield this.init();
             yield utils_1.fsUtil.makeDirectory(this.expMapperDirPath);
             if ((0, fs_1.existsSync)(this.experiencesPath)) {
                 try {
                     const experiences = utils_1.fsUtil.readFile(this.experiencesPath, true);
-                    const audiencesUid = utils_1.fsUtil.readFile(this.audiencesMapperPath, true) || {};
-                    const eventsUid = utils_1.fsUtil.readFile(this.eventsMapperPath, true) || {};
                     for (const experience of experiences) {
                         const { uid } = experience, restExperienceData = __rest(experience, ["uid"]);
                         //check whether reference audience exists or not that referenced in variations having __type equal to AudienceBasedVariation & targeting
-                        let experienceReqObj = (0, utils_1.lookUpAudiences)(restExperienceData, audiencesUid);
+                        let experienceReqObj = (0, utils_1.lookUpAudiences)(restExperienceData, this.audiencesUid);
                         //check whether events exists or not that referenced in metrics
-                        experienceReqObj = (0, utils_1.lookUpEvents)(experienceReqObj, eventsUid);
-                        const expRes = yield this.createExperience(experienceReqObj);
+                        experienceReqObj = (0, utils_1.lookUpEvents)(experienceReqObj, this.eventsUid);
+                        const expRes = (yield this.createExperience(experienceReqObj));
                         //map old experience uid to new experience uid
                         this.experiencesUidMapper[uid] = (_a = expRes === null || expRes === void 0 ? void 0 : expRes.uid) !== null && _a !== void 0 ? _a : '';
+                        try {
+                            // import versions of experience
+                            yield this.importExperienceVersions(expRes, uid);
+                        }
+                        catch (error) {
+                            this.log(this.config, `Error while importing experience versions of ${expRes.uid}`, 'error');
+                            this.log(this.config, error, 'error');
+                        }
                     }
                     utils_1.fsUtil.writeFile(this.experiencesUidMapperPath, this.experiencesUidMapper);
                     this.log(this.config, this.$t(this.messages.CREATE_SUCCESS, { module: 'Experiences' }), 'info');
@@ -103,9 +112,10 @@ class Experiences extends utils_1.PersonalizationAdapter {
                     utils_1.fsUtil.writeFile(this.cmsVariantGroupPath, this.cmsVariantGroups);
                     if (jobRes)
                         this.log(this.config, this.$t(this.messages.CREATE_SUCCESS, { module: 'Variant & Variant groups' }), 'info');
-                    if (this.personalizationConfig.importData) {
+                    if (this.personalizeConfig.importData) {
                         this.log(this.config, this.messages.UPDATING_CT_IN_EXP, 'info');
                         yield this.attachCTsInExperience();
+                        this.log(this.config, this.messages.UPDATED_CT_IN_EXP, 'info');
                     }
                     yield this.createVariantIdMapper();
                 }
@@ -117,9 +127,64 @@ class Experiences extends utils_1.PersonalizationAdapter {
         });
     }
     /**
-     * function to validate if all variant groups and variants have been created using personalization background job
-     * store the variant groups data in mapper/personalization/experiences/cms-variant-groups.json and the variants data
-     * in mapper/personalization/experiences/cms-variants.json. If not, invoke validateVariantGroupAndVariantsCreated after some delay.
+     * function import experience versions from a JSON file and creates them in the project.
+     */
+    importExperienceVersions(experience, oldExperienceUid) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const versionsPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.experiencesDirPath), 'versions', `${(0, cli_utilities_1.sanitizePath)(oldExperienceUid)}.json`);
+            if (!(0, fs_1.existsSync)(versionsPath)) {
+                return;
+            }
+            const versions = utils_1.fsUtil.readFile(versionsPath, true);
+            const versionMap = {
+                ACTIVE: undefined,
+                DRAFT: undefined,
+                PAUSE: undefined,
+            };
+            // Process each version and map them by status
+            versions.forEach((version) => {
+                let versionReqObj = (0, utils_1.lookUpAudiences)(version, this.audiencesUid);
+                versionReqObj = (0, utils_1.lookUpEvents)(version, this.eventsUid);
+                if (versionReqObj && versionReqObj.status) {
+                    versionMap[versionReqObj.status] = versionReqObj;
+                }
+            });
+            // Prioritize updating or creating versions based on the order: ACTIVE -> DRAFT -> PAUSE
+            return yield this.handleVersionUpdateOrCreate(experience, versionMap);
+        });
+    }
+    // Helper method to handle version update or creation logic
+    handleVersionUpdateOrCreate(experience, versionMap) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { ACTIVE, DRAFT, PAUSE } = versionMap;
+            let latestVersionUsed = false;
+            if (ACTIVE) {
+                yield this.updateExperienceVersion(experience.uid, experience.latestVersion, ACTIVE);
+                latestVersionUsed = true;
+            }
+            if (DRAFT) {
+                if (latestVersionUsed) {
+                    yield this.createExperienceVersion(experience.uid, DRAFT);
+                }
+                else {
+                    yield this.updateExperienceVersion(experience.uid, experience.latestVersion, DRAFT);
+                    latestVersionUsed = true;
+                }
+            }
+            if (PAUSE) {
+                if (latestVersionUsed) {
+                    yield this.createExperienceVersion(experience.uid, PAUSE);
+                }
+                else {
+                    yield this.updateExperienceVersion(experience.uid, experience.latestVersion, PAUSE);
+                }
+            }
+        });
+    }
+    /**
+     * function to validate if all variant groups and variants have been created using personalize background job
+     * store the variant groups data in mapper/personalize/experiences/cms-variant-groups.json and the variants data
+     * in mapper/personalize/experiences/cms-variants.json. If not, invoke validateVariantGroupAndVariantsCreated after some delay.
      * @param retryCount Counter to track the number of times the function has been called
      * @returns
      */
@@ -146,7 +211,7 @@ class Experiences extends utils_1.PersonalizationAdapter {
                         return this.validateVariantGroupAndVariantsCreated(retryCount);
                     }
                     else {
-                        this.log(this.config, this.messages.PERSONALIZATION_JOB_FAILURE, 'error');
+                        this.log(this.config, this.messages.PERSONALIZE_JOB_FAILURE, 'error');
                         utils_1.fsUtil.writeFile(this.failedCmsExpPath, this.pendingVariantAndVariantGrpForExperience);
                         return false;
                     }
@@ -174,7 +239,7 @@ class Experiences extends utils_1.PersonalizationAdapter {
                     var _b;
                     if ((_b = experienceCTsMap[oldExpUid]) === null || _b === void 0 ? void 0 : _b.length) {
                         // Filter content types that were created
-                        const updatedContentTypes = experienceCTsMap[oldExpUid].filter((ct) => this.createdCTs.includes(ct === null || ct === void 0 ? void 0 : ct.uid));
+                        const updatedContentTypes = experienceCTsMap[oldExpUid].filter((ct) => this.createdCTs.includes(ct === null || ct === void 0 ? void 0 : ct.uid) && ct.status === 'linked');
                         if (updatedContentTypes === null || updatedContentTypes === void 0 ? void 0 : updatedContentTypes.length) {
                             const { variant_groups: [variantGroup] = [] } = (yield this.getVariantGroup({ experienceUid: newExpUid })) || {};
                             variantGroup.content_types = updatedContentTypes;

package/lib/import/project.js

@@ -17,13 +17,13 @@ class Project extends utils_1.PersonalizationAdapter {
     constructor(config, log = console.log) {
         const conf = {
             config,
-            baseURL: config.modules.personalization.baseURL[config.region.name],
-            headers: { organization_uid: config.org_uid, authtoken: config.auth_token },
+            baseURL: config.modules.personalize.baseURL[config.region.name],
+            headers: { organization_uid: config.org_uid },
         };
         super(Object.assign(config, conf));
         this.config = config;
         this.log = log;
-        this.projectMapperFolderPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.config.backupDir), 'mapper', (0, cli_utilities_1.sanitizePath)(this.config.modules.personalization.dirName), 'projects');
+        this.projectMapperFolderPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.config.backupDir), 'mapper', (0, cli_utilities_1.sanitizePath)(this.config.modules.personalize.dirName), 'projects');
     }
     /**
      * The function asynchronously imports projects data from a file and creates projects based on the
@@ -31,16 +31,17 @@ class Project extends utils_1.PersonalizationAdapter {
      */
     import() {
         return __awaiter(this, void 0, void 0, function* () {
-            const personalization = this.config.modules.personalization;
-            const { dirName, fileName } = personalization.projects;
-            const projectPath = (0, path_1.join)((0, cli_utilities_1.sanitizePath)(this.config.data), (0, cli_utilities_1.sanitizePath)(personalization.dirName), (0, cli_utilities_1.sanitizePath)(dirName), (0, cli_utilities_1.sanitizePath)(fileName));
+            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));
             if ((0, fs_1.existsSync)(projectPath)) {
                 const projects = JSON.parse((0, fs_1.readFileSync)(projectPath, 'utf8'));
                 if (!projects || projects.length < 1) {
-                    this.config.modules.personalization.importData = false; // Stop personalization import if stack not connected to any project
+                    this.config.modules.personalize.importData = false; // Stop personalize import if stack not connected to any project
                     this.log(this.config, 'No project found!', 'info');
                     return;
                 }
+                yield this.init();
                 for (const project of projects) {
                     const createProject = (newName) => __awaiter(this, void 0, void 0, function* () {
                         return yield this.createProject({
@@ -48,7 +49,7 @@ class Project extends utils_1.PersonalizationAdapter {
                             description: project.description,
                             connectedStackApiKey: this.config.apiKey,
                         }).catch((error) => __awaiter(this, void 0, void 0, function* () {
-                            if (error === 'personalization.PROJECTS.DUPLICATE_NAME') {
+                            if (error.includes('personalization.PROJECTS.DUPLICATE_NAME') || error.includes('personalize.PROJECTS.DUPLICATE_NAME')) {
                                 const projectName = yield (0, utils_1.askProjectName)('Copy Of ' + (newName || project.name));
                                 return yield createProject(projectName);
                             }
@@ -57,15 +58,15 @@ class Project extends utils_1.PersonalizationAdapter {
                         }));
                     });
                     const projectRes = yield createProject(this.config.personalizeProjectName);
-                    this.config.modules.personalization.project_id = projectRes.uid;
-                    this.config.modules.personalization.importData = true;
+                    this.config.modules.personalize.project_id = projectRes.uid;
+                    this.config.modules.personalize.importData = true;
                     yield utils_1.fsUtil.makeDirectory(this.projectMapperFolderPath);
                     utils_1.fsUtil.writeFile((0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.projectMapperFolderPath), 'projects.json'), projectRes);
                     this.log(this.config, `Project Created Successfully: ${projectRes.uid}`, 'info');
                 }
             }
             else {
-                this.config.modules.personalization.importData = false; // Stop personalization import if stack not connected to any project
+                this.config.modules.personalize.importData = false; // Stop personalize import if stack not connected to any project
                 this.log(this.config, 'No project found!', 'info');
             }
         });

package/lib/import/variant-entries.d.ts

@@ -8,7 +8,7 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
     entriesMapperPath: string;
     variantEntryBasePath: string;
     variantIdList: Record<string, unknown>;
-    personalizationConfig: ImportConfig['modules']['personalization'];
+    personalizeConfig: ImportConfig['modules']['personalize'];
     taxonomies: Record<string, unknown>;
     assetUrlMapper: Record<string, any>;
     assetUidMapper: Record<string, any>;

package/lib/import/variant-entries.js

@@ -56,15 +56,14 @@ class VariantEntries extends variant_api_adapter_1.default {
             headers: {
                 api_key: config.apiKey,
                 branch: config.branchName,
-                authtoken: config.auth_token,
                 organization_uid: config.org_uid,
-                'X-Project-Uid': config.modules.personalization.project_id,
+                'X-Project-Uid': config.modules.personalize.project_id,
             },
         };
         super(Object.assign((0, omit_1.default)(config, ['helpers']), conf));
         this.config = config;
         this.entriesMapperPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(config.backupDir), (0, cli_utilities_1.sanitizePath)(config.branchName || ''), 'mapper', 'entries');
-        this.personalizationConfig = this.config.modules.personalization;
+        this.personalizeConfig = this.config.modules.personalize;
         this.entriesDirPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(config.backupDir), (0, cli_utilities_1.sanitizePath)(config.branchName || ''), (0, cli_utilities_1.sanitizePath)(config.modules.entries.dirName));
         this.failedVariantPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.entriesMapperPath), 'failed-entry-variants.json');
         this.failedVariantEntries = new Map();
@@ -80,7 +79,7 @@ class VariantEntries extends variant_api_adapter_1.default {
     import() {
         return __awaiter(this, void 0, void 0, function* () {
             const filePath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.entriesMapperPath), 'data-for-variant-entry.json');
-            const variantIdPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.config.backupDir), 'mapper', (0, cli_utilities_1.sanitizePath)(this.personalizationConfig.dirName), (0, cli_utilities_1.sanitizePath)(this.personalizationConfig.experiences.dirName), 'variants-uid-mapping.json');
+            const variantIdPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.config.backupDir), 'mapper', (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.dirName), (0, cli_utilities_1.sanitizePath)(this.personalizeConfig.experiences.dirName), 'variants-uid-mapping.json');
             if (!(0, fs_1.existsSync)(filePath)) {
                 (0, utils_1.log)(this.config, this.messages.IMPORT_ENTRY_NOT_FOUND, 'info');
                 return;
@@ -114,6 +113,8 @@ class VariantEntries extends variant_api_adapter_1.default {
             this.assetUidMapper = (utils_1.fsUtil.readFile(assetUidMapperPath, true) || {});
             this.assetUrlMapper = (utils_1.fsUtil.readFile(assetUrlMapperPath, true) || {});
             this.environments = (utils_1.fsUtil.readFile(envPath, true) || {});
+            // set the token
+            yield this.variantInstance.init();
             for (const entriesForVariant of entriesForVariants) {
                 yield this.importVariantEntries(entriesForVariant);
             }
@@ -184,21 +185,21 @@ class VariantEntries extends variant_api_adapter_1.default {
                         log(this.config, error, 'error');
                     };
                     // NOTE Find new variant Id by old Id
-                    const variant_id = this.variantIdList[variantEntry.variant_id];
+                    const variantId = this.variantIdList[variantEntry._variant._uid];
                     // NOTE Replace all the relation data UID's
                     variantEntry = this.handleVariantEntryRelationalData(contentType, variantEntry);
                     const changeSet = this.serializeChangeSet(variantEntry);
                     const createVariantReq = Object.assign({ _variant: variantEntry._variant }, changeSet);
-                    if (variant_id) {
+                    if (variantId) {
                         const promise = this.variantInstance.createVariantEntry(createVariantReq, {
                             locale,
                             entry_uid: entryUid,
-                            variant_id,
+                            variant_id: variantId,
                             content_type_uid: content_type,
                         }, {
                             reject: onReject.bind(this),
                             resolve: onSuccess.bind(this),
-                            variantUid: variantEntry.uid,
+                            variantUid: variantId,
                             log: utils_1.log,
                         });
                         allPromise.push(promise);
@@ -291,7 +292,7 @@ class VariantEntries extends variant_api_adapter_1.default {
      * @param variantEntry - The entry variant to update.
      */
     updateFileFields(variantEntry) {
-        var _a;
+        var _a, _b;
         const setValue = (currentObj, keys) => {
             if (!currentObj || keys.length === 0)
                 return;
@@ -304,7 +305,14 @@ class VariantEntries extends variant_api_adapter_1.default {
             else if (currentObj && typeof currentObj === 'object') {
                 if (firstKey in currentObj) {
                     if (keys.length === 1) {
-                        currentObj[firstKey] = { uid: currentObj[firstKey], filename: 'dummy.jpeg' };
+                        // Check if the current property is already an object with uid and filename
+                        const existingValue = currentObj[firstKey];
+                        if (existingValue && typeof existingValue === 'object' && existingValue.uid) {
+                            currentObj[firstKey] = { uid: existingValue.uid, filename: 'dummy.jpeg' };
+                        }
+                        else {
+                            currentObj[firstKey] = { uid: currentObj[firstKey], filename: 'dummy.jpeg' };
+                        }
                     }
                     else {
                         setValue(currentObj[firstKey], restKeys);
@@ -312,10 +320,8 @@ class VariantEntries extends variant_api_adapter_1.default {
                 }
             }
         };
-        const pathsToUpdate = (_a = variantEntry === null || variantEntry === void 0 ? void 0 : variantEntry._metadata) === null || _a === void 0 ? void 0 : _a.references.filter((ref) => ref._content_type_uid === 'sys_assets').map((ref) => ref.path);
-        if (pathsToUpdate) {
-            pathsToUpdate.forEach((path) => setValue(variantEntry, path.split('.')));
-        }
+        const pathsToUpdate = ((_b = (_a = variantEntry === null || variantEntry === void 0 ? void 0 : variantEntry._metadata) === null || _a === void 0 ? void 0 : _a.references) === null || _b === void 0 ? void 0 : _b.filter((ref) => ref._content_type_uid === 'sys_assets').map((ref) => ref.path)) || [];
+        pathsToUpdate.forEach((path) => setValue(variantEntry, path.split('.')));
     }
     /**
      * Publishes variant entries in batch for a given entry UID and content type.
@@ -328,16 +334,17 @@ class VariantEntries extends variant_api_adapter_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             const allPromise = [];
+            (0, utils_1.log)(this.config, `Publishing variant entries for entry uid '${entryUid}' of Content Type '${content_type}'`, 'info');
             for (let [, variantEntry] of (0, entries_1.default)(batch)) {
-                const variantUid = variantEntry.uid;
-                const oldVariantUid = variantEntry.variant_id || '';
+                const variantEntryUID = variantEntry.uid;
+                const oldVariantUid = variantEntry._variant._uid || '';
                 const newVariantUid = this.variantIdList[oldVariantUid];
                 if (!newVariantUid) {
-                    (0, utils_1.log)(this.config, `${this.messages.VARIANT_ID_NOT_FOUND}. Skipping entry variant publish for ${variantUid}`, 'info');
+                    (0, utils_1.log)(this.config, `${this.messages.VARIANT_ID_NOT_FOUND}. Skipping entry variant publish`, 'info');
                     continue;
                 }
-                if (this.failedVariantEntries.has(variantUid)) {
-                    (0, utils_1.log)(this.config, `${this.messages.VARIANT_UID_NOT_FOUND}. Skipping entry variant publish for ${variantUid}`, 'info');
+                if (this.failedVariantEntries.has(variantEntryUID)) {
+                    (0, utils_1.log)(this.config, `${this.messages.VARIANT_UID_NOT_FOUND}. Skipping entry variant publish for ${variantEntryUID}`, 'info');
                     continue;
                 }
                 if ((_a = this.environments) === null || _a === void 0 ? void 0 : _a.length) {
@@ -359,11 +366,9 @@ class VariantEntries extends variant_api_adapter_1.default {
                     entry: {
                         environments,
                         locales,
-                        publish_with_base_entry: false,
                         variants: [{ uid: newVariantUid, version: 1 }],
                     },
                     locale: variantEntry.locale,
-                    version: 1,
                 };
                 const promise = this.variantInstance.publishVariantEntry(publishReq, {
                     entry_uid: entryUid,
@@ -372,11 +377,12 @@ class VariantEntries extends variant_api_adapter_1.default {
                     reject: onReject.bind(this),
                     resolve: onSuccess.bind(this),
                     log: utils_1.log,
-                    variantUid,
+                    variantUid: newVariantUid,
                 });
                 allPromise.push(promise);
             }
             yield Promise.allSettled(allPromise);
+            (0, utils_1.log)(this.config, `Published variant entries for entry uid '${entryUid}' of Content Type '${content_type}'`, 'info');
         });
     }
     /**

package/lib/messages/index.d.ts

@@ -17,7 +17,7 @@ declare const expImportMsg: {
     UPDATING_CT_IN_EXP: string;
     UPDATED_CT_IN_EXP: string;
     VALIDATE_VARIANT_AND_VARIANT_GRP: string;
-    PERSONALIZATION_JOB_FAILURE: string;
+    PERSONALIZE_JOB_FAILURE: string;
 };
 declare const messages: typeof errors & typeof commonMsg & typeof migrationMsg & typeof variantEntry & typeof expImportMsg;
 /**

package/lib/messages/index.js

@@ -27,7 +27,7 @@ const expImportMsg = {
     UPDATING_CT_IN_EXP: 'Updating content types in experiences...',
     UPDATED_CT_IN_EXP: 'Successfully updated content types in experiences!',
     VALIDATE_VARIANT_AND_VARIANT_GRP: 'Validating variant group and variants creation...',
-    PERSONALIZATION_JOB_FAILURE: 'Something went wrong with personalization background job! Failed to fetch some variant & variant groups',
+    PERSONALIZE_JOB_FAILURE: 'Something went wrong! Failed to fetch some variant and variant groups.',
 };
 const messages = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, errors), commonMsg), migrationMsg), variantEntry), expImportMsg);
 /**
@@ -46,7 +46,8 @@ function $t(msg, args) {
             return '';
         for (const key of Object.keys(args)) {
             const escapedKey = key.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-            msg = msg.replace(new RegExp(`{${escapedKey}}`, 'g'), args[key] || escapedKey);
+            const placeholder = `{${escapedKey}}`;
+            msg = msg.split(placeholder).join(args[key]);
         }
         return msg;
     });

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

@@ -4,7 +4,7 @@
  * Therefore, we are duplicating the following types from the export.
  */
 import { AnyProperty } from './utils';
-export type Modules = 'stack' | 'assets' | 'locales' | 'environments' | 'extensions' | 'webhooks' | 'global-fields' | 'entries' | 'content-types' | 'custom-roles' | 'workflows' | 'labels' | 'marketplace-apps' | 'taxonomies' | 'personalization';
+export type Modules = 'stack' | 'assets' | 'locales' | 'environments' | 'extensions' | 'webhooks' | 'global-fields' | 'entries' | 'content-types' | 'custom-roles' | 'workflows' | 'labels' | 'marketplace-apps' | 'taxonomies' | 'personalize';
 export type branch = {
     uid: string;
     source: string;
@@ -131,7 +131,7 @@ export interface DefaultConfig {
                 include_publish_details: boolean;
             } & AnyProperty;
         } & AnyProperty;
-        personalization: {
+        personalize: {
             dirName: string;
             baseURL: Record<string, string>;
         } & AnyProperty;
@@ -243,7 +243,7 @@ export interface ExportConfig extends DefaultConfig {
     personalizationHost?: string;
     region: any;
 }
-export interface PersonalizationConfig {
+export interface PersonalizeConfig {
     dirName: string;
     baseURL: Record<string, string>;
 }

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

@@ -11,7 +11,7 @@ export interface ImportDefaultConfig extends AnyProperty {
             dirName: string;
             fileName: string;
         };
-        personalization: {
+        personalize: {
             baseURL: Record<string, string>;
             dirName: string;
             importData: boolean;

package/lib/types/personalization-api-adapter.d.ts

@@ -112,6 +112,18 @@ export type ExperienceStruct = {
     };
     content_types?: string[];
 } & AnyProperty;
+export interface CreateExperienceVersionInput {
+    name: string;
+    __type: string;
+    description: string;
+    targeting?: ExpTargeting;
+    variations: ExpVariations[];
+    variationSplit?: string;
+    metrics?: ExpMetric[];
+    status: string;
+    metadata?: object;
+    variants: Array<ExpVariations>;
+}
 export interface CreateExperienceInput {
     name: string;
     __type: string;
@@ -122,6 +134,7 @@ export interface CreateExperienceInput {
     metrics?: ExpMetric[];
     status: string;
     metadata?: object;
+    variants?: Array<ExpVariations>;
 }
 export interface UpdateExperienceInput {
     contentTypes: string[];
@@ -147,6 +160,6 @@ export interface Personalization<T> extends AdapterHelperInterface<T, HttpClient
     createExperience(experience: CreateExperienceInput): Promise<ExperienceStruct | void>;
     getCTsFromExperience(experienceUid: string): Promise<CMSExperienceStruct | void>;
     updateCTsInExperience(experience: UpdateExperienceInput, experienceUid: string): Promise<CMSExperienceStruct | void>;
-    handleVariantAPIRes(res: any): VariantAPIRes;
+    handleVariantAPIRes(res: any): Promise<VariantAPIRes>;
 }
 export {};

package/lib/types/variant-api-adapter.d.ts

@@ -35,6 +35,7 @@ export type VariantOptions = VariantsOption & {
     variant_uid: string;
 };
 export interface VariantInterface<T, ApiClient> extends AdapterHelperInterface<T, ApiClient> {
+    init(): Promise<void>;
     variantEntry(options: VariantOptions): Promise<{
         entry: Record<string, any>;
     }>;
@@ -42,8 +43,8 @@ export interface VariantInterface<T, ApiClient> extends AdapterHelperInterface<T
         entries?: Record<string, any>[] | unknown[];
     } | void>;
     createVariantEntry(input: CreateVariantEntryDto, options: CreateVariantEntryOptions, apiParams: Record<string, any>): Promise<VariantEntryStruct | string | void>;
-    handleVariantAPIRes(res: APIResponse): VariantEntryStruct | {
+    handleVariantAPIRes(res: APIResponse): Promise<VariantEntryStruct | {
         entries: VariantEntryStruct[];
         count: number;
-    } | string;
+    } | string>;
 }

package/lib/types/variant-entry.d.ts

@@ -2,11 +2,11 @@ import { AnyProperty } from './utils';
 export type VariantEntryStruct = {
     uid: string;
     title: string;
-    variant_id: string;
     locale: string;
     _version: number;
     _variant: {
-        uid: string;
+        _uid: string;
+        _instance_uid: string;
         _change_set: string[];
         _base_entry_version: number;
     };
@@ -36,7 +36,6 @@ export type PublishVariantEntryDto = {
     entry: {
         environments: string[];
         locales: string[];
-        publish_with_base_entry: boolean;
         variants: {
             uid: string;
             version?: number;

package/lib/utils/attributes-helper.js

@@ -15,8 +15,8 @@ const lookUpAttributes = (attributeRules, attributesUid) => {
             // Check if attribute reference exists in attributesUid
             const attributeRef = (_a = rule.attribute) === null || _a === void 0 ? void 0 : _a.ref;
             const attributeType = rule.attribute['__type'];
-            // check if type is UserAttributeReference
-            if (attributeType === 'UserAttributeReference') {
+            // check if type is CustomAttributeReference
+            if (attributeType === 'CustomAttributeReference') {
                 if (attributeRef && attributesUid.hasOwnProperty(attributeRef) && attributesUid[attributeRef]) {
                     rule.attribute.ref = attributesUid[attributeRef];
                 }

package/lib/utils/audiences-helper.js

@@ -24,7 +24,7 @@ function updateAudiences(audiences, audiencesUid) {
  * @returns
  */
 const lookUpAudiences = (experience, audiencesUid) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     // Update experience variations
     if ((_a = experience === null || experience === void 0 ? void 0 : experience.variations) === null || _a === void 0 ? void 0 : _a.length) {
         for (let index = experience.variations.length - 1; index >= 0; index--) {
@@ -37,8 +37,19 @@ const lookUpAudiences = (experience, audiencesUid) => {
             }
         }
     }
-    // Update targeting audiences
-    if (((_c = experience === null || experience === void 0 ? void 0 : experience.targeting) === null || _c === void 0 ? void 0 : _c.hasOwnProperty('audience')) && ((_f = (_e = (_d = experience === null || experience === void 0 ? void 0 : experience.targeting) === null || _d === void 0 ? void 0 : _d.audience) === null || _e === void 0 ? void 0 : _e.audiences) === null || _f === void 0 ? void 0 : _f.length)) {
+    else if (experience.variants) {
+        for (let index = experience.variants.length - 1; index >= 0; index--) {
+            const expVariations = experience.variants[index];
+            if (expVariations['__type'] === 'SegmentedVariant' && ((_c = expVariations === null || expVariations === void 0 ? void 0 : expVariations.audiences) === null || _c === void 0 ? void 0 : _c.length)) {
+                updateAudiences(expVariations.audiences, audiencesUid);
+                if (!expVariations.audiences.length) {
+                    experience.variants.splice(index, 1);
+                }
+            }
+        }
+    }
+    if (((_d = experience === null || experience === void 0 ? void 0 : experience.targeting) === null || _d === void 0 ? void 0 : _d.hasOwnProperty('audience')) && ((_g = (_f = (_e = experience === null || experience === void 0 ? void 0 : experience.targeting) === null || _e === void 0 ? void 0 : _e.audience) === null || _f === void 0 ? void 0 : _f.audiences) === null || _g === void 0 ? void 0 : _g.length)) {
+        // Update targeting audiences
         updateAudiences(experience.targeting.audience.audiences, audiencesUid);
         if (!experience.targeting.audience.audiences.length) {
             experience.targeting = {};

package/lib/utils/error-helper.js

@@ -11,17 +11,17 @@ function formatErrors(errors) {
     for (const errorKey in errors) {
         const errorValue = errors[errorKey];
         if (Array.isArray(errorValue)) {
-            errorMessages.push(...errorValue.map((error) => formatError(error)));
+            errorMessages.push(...errorValue.map((error) => formatError(errorKey, error)));
         }
         else {
-            errorMessages.push(formatError(errorValue));
+            errorMessages.push(formatError(errorKey, errorValue));
         }
     }
     return errorMessages.join(' ');
 }
-function formatError(error) {
-    if (typeof error === 'object') {
-        return Object.values(error).join(' ');
+function formatError(errorKey, error) {
+    if (typeof error === 'object' && error !== null) {
+        return `${errorKey}: ${Object.values(error).join(' ')}`;
     }
-    return String(error);
+    return `${errorKey}: ${error}`;
 }