@contentstack/cli-variants 1.0.0 → 1.1.0

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

@@ -5,6 +5,7 @@ import { AdapterHelper } from './adapter-helper';
 export declare class VariantHttpClient<C> extends AdapterHelper<C, HttpClient> implements VariantInterface<C, HttpClient> {
     baseURL: string;
     constructor(config: APIConfig, options?: HttpClientOptions);
+    init(): Promise<void>;
     variantEntry(options: VariantOptions): Promise<{
         entry: {};
     }>;
@@ -48,10 +49,10 @@ export declare class VariantHttpClient<C> extends AdapterHelper<C, HttpClient> i
      * @returns The variant API response data.
      * @throws If the API response status is not within the success range, an error message is thrown.
      */
-    handleVariantAPIRes(res: APIResponse): VariantEntryStruct | {
+    handleVariantAPIRes(res: APIResponse): Promise<VariantEntryStruct | {
         entries: VariantEntryStruct[];
         count: number;
-    } | string | any;
+    } | string | any>;
 }
 export declare class VariantManagementSDK<T> extends AdapterHelper<T, ContentstackClient> implements VariantInterface<T, ContentstackClient> {
     apiClient: ContentstackClient;
@@ -63,10 +64,10 @@ export declare class VariantManagementSDK<T> extends AdapterHelper<T, Contentsta
         entries: {}[];
     }>;
     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>;
     constructQuery(query: Record<string, any>): string | void;
     delay(ms: number): Promise<void>;
 }

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

@@ -37,6 +37,18 @@ class VariantHttpClient extends adapter_helper_1.AdapterHelper {
         this.baseURL = ((_a = config.baseURL) === null || _a === void 0 ? void 0 : _a.includes('http')) ? `${config.baseURL}/v3` : `https://${config.baseURL}/v3`;
         this.apiClient.baseUrl(this.baseURL);
     }
+    init() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield cli_utilities_1.authenticationHandler.getAuthDetails();
+            const token = cli_utilities_1.authenticationHandler.accessToken;
+            if (cli_utilities_1.authenticationHandler.isOauthEnabled) {
+                this.apiClient.headers({ authorization: token });
+            }
+            else {
+                this.apiClient.headers({ authtoken: token });
+            }
+        });
+    }
     variantEntry(options) {
         return __awaiter(this, void 0, void 0, function* () {
             // TODO single entry variant
@@ -99,7 +111,7 @@ class VariantHttpClient extends adapter_helper_1.AdapterHelper {
                 endpoint = endpoint.concat(query);
             }
             const data = yield this.apiClient.get(endpoint);
-            const response = this.handleVariantAPIRes(data);
+            const response = (yield this.handleVariantAPIRes(data));
             if (callback) {
                 callback(response.entries);
             }
@@ -205,14 +217,18 @@ class VariantHttpClient extends adapter_helper_1.AdapterHelper {
      * @throws If the API response status is not within the success range, an error message is thrown.
      */
     handleVariantAPIRes(res) {
-        const { status, data } = res;
-        if (status >= 200 && status < 300) {
-            return data;
-        }
-        const errorMsg = (data === null || data === void 0 ? void 0 : data.errors)
-            ? (0, error_helper_1.formatErrors)(data.errors)
-            : (data === null || data === void 0 ? void 0 : data.error_message) || (data === null || data === void 0 ? void 0 : data.message) || 'Something went wrong while processing entry variant request!';
-        throw errorMsg;
+        return __awaiter(this, void 0, void 0, function* () {
+            const { status, data } = res;
+            if (status >= 200 && status < 300) {
+                return data;
+            }
+            // Refresh the access token if the response status is 401
+            yield cli_utilities_1.authenticationHandler.refreshAccessToken(res);
+            const errorMsg = (data === null || data === void 0 ? void 0 : data.errors)
+                ? (0, error_helper_1.formatErrors)(data.errors)
+                : (data === null || data === void 0 ? void 0 : data.error_message) || (data === null || data === void 0 ? void 0 : data.message) || 'Something went wrong while processing entry variant request!';
+            throw errorMsg;
+        });
     }
 }
 exports.VariantHttpClient = VariantHttpClient;
@@ -239,7 +255,9 @@ class VariantManagementSDK extends adapter_helper_1.AdapterHelper {
         return Promise.resolve({});
     }
     handleVariantAPIRes(res) {
-        return res.data;
+        return __awaiter(this, void 0, void 0, function* () {
+            return res.data;
+        });
     }
     constructQuery(query) { }
     delay(ms) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-variants",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Variants plugin",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -30,7 +30,7 @@
     "typescript": "^5.4.2"
   },
   "dependencies": {
-    "@contentstack/cli-utilities": "^1.5.12",
+    "@contentstack/cli-utilities": "^1.8.0",
     "lodash": "^4.17.21",
     "mkdirp": "^1.0.4",
     "winston": "^3.7.2"

package/src/export/attributes.ts

@@ -14,7 +14,7 @@ export default class ExportAttributes extends PersonalizationAdapter<ExportConfi
     super({
       config: exportConfig,
       baseURL: exportConfig.modules.personalize.baseURL[exportConfig.region.name],
-      headers: { authtoken: exportConfig.auth_token, 'X-Project-Uid': exportConfig.project_id },
+      headers: { 'X-Project-Uid': exportConfig.project_id },
     });
     this.personalizeConfig = exportConfig.modules.personalize;
     this.attributesConfig = exportConfig.modules.attributes;
@@ -30,6 +30,7 @@ export default class ExportAttributes extends PersonalizationAdapter<ExportConfi
   async start() {
     try {
       log(this.exportConfig, 'Starting attributes export', 'info');
+      await this.init();
       await fsUtil.makeDirectory(this.attributesFolderPath);
       this.attributes = (await this.getAttributes()) as AttributeStruct[];
 
@@ -37,7 +38,10 @@ export default class ExportAttributes extends PersonalizationAdapter<ExportConfi
         log(this.exportConfig, 'No Attributes found with the given project!', 'info');
       } else {
         this.sanitizeAttribs();
-        fsUtil.writeFile(pResolve(sanitizePath(this.attributesFolderPath), sanitizePath(this.attributesConfig.fileName)), this.attributes);
+        fsUtil.writeFile(
+          pResolve(sanitizePath(this.attributesFolderPath), sanitizePath(this.attributesConfig.fileName)),
+          this.attributes,
+        );
         log(this.exportConfig, 'All the attributes have been exported successfully!', 'success');
       }
     } catch (error) {

package/src/export/audiences.ts

@@ -14,7 +14,7 @@ export default class ExportAudiences extends PersonalizationAdapter<ExportConfig
     super({
       config: exportConfig,
       baseURL: exportConfig.modules.personalize.baseURL[exportConfig.region.name],
-      headers: { authtoken: exportConfig.auth_token, 'X-Project-Uid': exportConfig.project_id },
+      headers: { 'X-Project-Uid': exportConfig.project_id },
     });
     this.personalizeConfig = exportConfig.modules.personalize;
     this.audiencesConfig = exportConfig.modules.audiences;
@@ -30,6 +30,7 @@ export default class ExportAudiences extends PersonalizationAdapter<ExportConfig
   async start() {
     try {
       log(this.exportConfig, 'Starting audiences export', 'info');
+      await this.init();
       await fsUtil.makeDirectory(this.audiencesFolderPath);
       this.audiences = (await this.getAudiences()) as AudienceStruct[];
 

package/src/export/events.ts

@@ -14,7 +14,7 @@ export default class ExportEvents extends PersonalizationAdapter<ExportConfig> {
     super({
       config: exportConfig,
       baseURL: exportConfig.modules.personalize.baseURL[exportConfig.region.name],
-      headers: { authtoken: exportConfig.auth_token, 'X-Project-Uid': exportConfig.project_id },
+      headers: { 'X-Project-Uid': exportConfig.project_id },
     });
     this.personalizeConfig = exportConfig.modules.personalize;
     this.eventsConfig = exportConfig.modules.events;
@@ -30,6 +30,7 @@ export default class ExportEvents extends PersonalizationAdapter<ExportConfig> {
   async start() {
     try {
       log(this.exportConfig, 'Starting events export', 'info');
+      await this.init();
       await fsUtil.makeDirectory(this.eventsFolderPath);
       this.events = (await this.getEvents()) as EventStruct[];
 

package/src/export/experiences.ts

@@ -11,10 +11,10 @@ export default class ExportExperiences extends PersonalizationAdapter<ExportConf
     super({
       config: exportConfig,
       baseURL: exportConfig.modules.personalize.baseURL[exportConfig.region.name],
-      headers: { authtoken: exportConfig.auth_token, 'X-Project-Uid': exportConfig.project_id },
+      headers: { 'X-Project-Uid': exportConfig.project_id },
       cmaConfig: {
         baseURL: exportConfig.region.cma + `/v3`,
-        headers: { authtoken: exportConfig.auth_token, api_key: exportConfig.apiKey },
+        headers: { api_key: exportConfig.apiKey },
       },
     });
     this.exportConfig = exportConfig;
@@ -33,6 +33,7 @@ export default class ExportExperiences extends PersonalizationAdapter<ExportConf
       // loop through experiences and get content types attached to it
       // write experiences in to a file
       log(this.exportConfig, 'Starting experiences export', 'info');
+      await this.init();
       await fsUtil.makeDirectory(this.experiencesFolderPath);
       await fsUtil.makeDirectory(path.resolve(sanitizePath(this.experiencesFolderPath), 'versions'));
       const experiences: Array<ExperienceStruct> = (await this.getExperiences()) || [];

package/src/export/projects.ts

@@ -11,7 +11,7 @@ export default class ExportProjects extends PersonalizationAdapter<ExportConfig>
     super({
       config: exportConfig,
       baseURL: exportConfig.modules.personalize.baseURL[exportConfig.region.name],
-      headers: { authtoken: exportConfig.auth_token, organization_uid: exportConfig.org_uid },
+      headers: { organization_uid: exportConfig.org_uid },
     });
     this.exportConfig = exportConfig;
     this.personalizeConfig = exportConfig.modules.personalize;
@@ -26,6 +26,7 @@ export default class ExportProjects extends PersonalizationAdapter<ExportConfig>
   async start() {
     try {
       log(this.exportConfig, 'Starting projects export', 'info');
+      await this.init();
       await fsUtil.makeDirectory(this.projectFolderPath);
       const project = await this.projects({ connectedStackApiKey: this.exportConfig.apiKey });
       if (!project || project?.length < 1) {

package/src/export/variant-entries.ts

@@ -19,7 +19,6 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Exp
       headers: {
         api_key: config.apiKey,
         branch: config.branchName,
-        authtoken: config.auth_token,
         organization_uid: config.org_uid,
         'X-Project-Uid': config.project_id,
       },
@@ -36,7 +35,7 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Exp
   async exportVariantEntry(options: { locale: string; contentTypeUid: string; entries: Record<string, any>[] }) {
     const variantEntry = this.config.modules.variantEntry;
     const { entries, locale, contentTypeUid: content_type_uid } = options;
-
+    await this.variantInstance.init();
     for (let index = 0; index < entries.length; index++) {
       const entry = entries[index];
       const variantEntryBasePath = join(sanitizePath(this.entriesDirPath), sanitizePath(content_type_uid), sanitizePath(locale), sanitizePath(variantEntry.dirName), sanitizePath(entry.uid));

package/src/import/attribute.ts

@@ -16,7 +16,7 @@ export default class Attribute extends PersonalizationAdapter<ImportConfig> {
     const conf: APIConfig = {
       config,
       baseURL: config.modules.personalize.baseURL[config.region.name],
-      headers: { 'X-Project-Uid': config.modules.personalize.project_id, authtoken: config.auth_token },
+      headers: { 'X-Project-Uid': config.modules.personalize.project_id },
     };
     super(Object.assign(config, conf));
     this.personalizeConfig = this.config.modules.personalize;
@@ -36,7 +36,7 @@ export default class Attribute extends PersonalizationAdapter<ImportConfig> {
    */
   async import() {
     this.log(this.config, this.$t(this.messages.IMPORT_MSG, { module: 'Attributes' }), 'info');
-
+    await this.init();
     await fsUtil.makeDirectory(this.attrMapperDirPath);
     const { dirName, fileName } = this.attributeConfig;
     const attributesPath = resolve(

package/src/import/audiences.ts

@@ -18,7 +18,7 @@ export default class Audiences extends PersonalizationAdapter<ImportConfig> {
     const conf: APIConfig = {
       config,
       baseURL: config.modules.personalize.baseURL[config.region.name],
-      headers: { 'X-Project-Uid': config.modules.personalize.project_id, authtoken: config.auth_token },
+      headers: { 'X-Project-Uid': config.modules.personalize.project_id },
     };
     super(Object.assign(config, conf));
     this.personalizeConfig = this.config.modules.personalize;
@@ -44,7 +44,7 @@ export default class Audiences extends PersonalizationAdapter<ImportConfig> {
    */
   async import() {
     this.log(this.config, this.$t(this.messages.IMPORT_MSG, { module: 'Audiences' }), 'info');
-
+    await this.init();
     await fsUtil.makeDirectory(this.audienceMapperDirPath);
     const { dirName, fileName } = this.audienceConfig;
     const audiencesPath = resolve(

package/src/import/events.ts

@@ -16,7 +16,7 @@ export default class Events extends PersonalizationAdapter<ImportConfig> {
     const conf: APIConfig = {
       config,
       baseURL: config.modules.personalize.baseURL[config.region.name],
-      headers: { 'X-Project-Uid': config.modules.personalize.project_id, authtoken: config.auth_token },
+      headers: { 'X-Project-Uid': config.modules.personalize.project_id },
     };
     super(Object.assign(config, conf));
     this.personalizeConfig = this.config.modules.personalize;
@@ -36,7 +36,7 @@ export default class Events extends PersonalizationAdapter<ImportConfig> {
    */
   async import() {
     this.log(this.config, this.$t(this.messages.IMPORT_MSG, { module: 'Events' }), 'info');
-
+    await this.init();
     await fsUtil.makeDirectory(this.eventMapperDirPath);
     const { dirName, fileName } = this.eventsConfig;
     const eventsPath = resolve(

package/src/import/experiences.ts

@@ -45,10 +45,10 @@ export default class Experiences extends PersonalizationAdapter<ImportConfig> {
     const conf: APIConfig = {
       config,
       baseURL: config.modules.personalize.baseURL[config.region.name],
-      headers: { 'X-Project-Uid': config.modules.personalize.project_id, authtoken: config.auth_token },
+      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));
@@ -107,7 +107,7 @@ export default class Experiences extends PersonalizationAdapter<ImportConfig> {
    */
   async import() {
     this.log(this.config, this.$t(this.messages.IMPORT_MSG, { module: 'Experiences' }), 'info');
-
+    await this.init();
     await fsUtil.makeDirectory(this.expMapperDirPath);
 
     if (existsSync(this.experiencesPath)) {

package/src/import/project.ts

@@ -10,7 +10,7 @@ export default class Project extends PersonalizationAdapter<ImportConfig> {
     const conf: APIConfig = {
       config,
       baseURL: config.modules.personalize.baseURL[config.region.name],
-      headers: { organization_uid: config.org_uid, authtoken: config.auth_token },
+      headers: { organization_uid: config.org_uid },
     };
     super(Object.assign(config, conf));
     this.projectMapperFolderPath = pResolve(
@@ -29,7 +29,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(personalize.dirName), sanitizePath(dirName), sanitizePath(fileName));
-
+    
     if (existsSync(projectPath)) {
       const projects = JSON.parse(readFileSync(projectPath, 'utf8')) as CreateProjectInput[];
 
@@ -38,7 +38,7 @@ export default class Project extends PersonalizationAdapter<ImportConfig> {
         this.log(this.config, 'No project found!', 'info');
         return;
       }
-
+      await this.init();
       for (const project of projects) {
         const createProject = async (newName: void | string): Promise<ProjectStruct> => {
           return await this.createProject({
@@ -46,7 +46,7 @@ export default class Project extends PersonalizationAdapter<ImportConfig> {
             description: project.description,
             connectedStackApiKey: this.config.apiKey,
           }).catch(async (error) => {
-            if (error === 'personalization.PROJECTS.DUPLICATE_NAME' || error === 'personalize.PROJECTS.DUPLICATE_NAME') {
+            if (error.includes('personalization.PROJECTS.DUPLICATE_NAME') || error.includes('personalize.PROJECTS.DUPLICATE_NAME')) {
               const projectName = await askProjectName('Copy Of ' + (newName || project.name));
               return await createProject(projectName);
             }

package/src/import/variant-entries.ts

@@ -49,7 +49,6 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
       headers: {
         api_key: config.apiKey,
         branch: config.branchName,
-        authtoken: config.auth_token,
         organization_uid: config.org_uid,
         'X-Project-Uid': config.modules.personalize.project_id,
       },
@@ -138,7 +137,8 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
     this.assetUidMapper = (fsUtil.readFile(assetUidMapperPath, true) || {}) as Record<string, any>;
     this.assetUrlMapper = (fsUtil.readFile(assetUrlMapperPath, true) || {}) as Record<string, any>;
     this.environments = (fsUtil.readFile(envPath, true) || {}) as Record<string, any>;
-
+    // set the token
+    await this.variantInstance.init();
     for (const entriesForVariant of entriesForVariants) {
       await this.importVariantEntries(entriesForVariant);
     }
@@ -368,7 +368,7 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
    * @param variantEntry - The entry variant to update.
    */
   updateFileFields(variantEntry: VariantEntryStruct) {
-    const setValue = (currentObj: VariantEntryStruct, keys: Array<string>) => {
+    const setValue = (currentObj: VariantEntryStruct, keys: string[]) => {
       if (!currentObj || keys.length === 0) return;
 
       const [firstKey, ...restKeys] = keys;
@@ -380,7 +380,14 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
       } 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);
           }
@@ -388,13 +395,12 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
       }
     };
 
-    const pathsToUpdate = variantEntry?._metadata?.references
-      .filter((ref: any) => ref._content_type_uid === 'sys_assets')
-      .map((ref: any) => ref.path);
+    const pathsToUpdate =
+      variantEntry?._metadata?.references
+        ?.filter((ref: any) => ref._content_type_uid === 'sys_assets')
+        .map((ref: any) => ref.path) || [];
 
-    if (pathsToUpdate) {
-      pathsToUpdate.forEach((path: string) => setValue(variantEntry, path.split('.')));
-    }
+    pathsToUpdate.forEach((path: string) => setValue(variantEntry, path.split('.')));
   }
 
   /**
@@ -406,6 +412,11 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
    */
   async publishVariantEntries(batch: VariantEntryStruct[], entryUid: string, content_type: string) {
     const allPromise = [];
+    log(
+      this.config,
+      `Publishing variant entries for entry uid '${entryUid}' of Content Type '${content_type}'`,
+      'info',
+    );
     for (let [, variantEntry] of entries(batch)) {
       const variantEntryUID = variantEntry.uid;
       const oldVariantUid = variantEntry._variant._uid || '';
@@ -446,11 +457,9 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
         entry: {
           environments,
           locales,
-          publish_with_base_entry: false,
           variants: [{ uid: newVariantUid, version: 1 }],
         },
         locale: variantEntry.locale,
-        version: 1,
       };
 
       const promise = this.variantInstance.publishVariantEntry(
@@ -470,6 +479,7 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
       allPromise.push(promise);
     }
     await Promise.allSettled(allPromise);
+    log(this.config, `Published variant entries for entry uid '${entryUid}' of Content Type '${content_type}'`, 'info');
   }
 
   /**

package/src/messages/index.ts

@@ -23,7 +23,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...',
-  PERSONALIZE_JOB_FAILURE: 'Something went wrong with personalize 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: typeof errors & typeof commonMsg & typeof migrationMsg & typeof variantEntry & typeof expImportMsg = {

package/src/types/personalization-api-adapter.ts

@@ -206,5 +206,5 @@ export interface Personalization<T> extends AdapterHelperInterface<T, HttpClient
 
   updateCTsInExperience(experience: UpdateExperienceInput, experienceUid: string): Promise<CMSExperienceStruct | void>;
 
-  handleVariantAPIRes(res: any): VariantAPIRes;
+  handleVariantAPIRes(res: any): Promise<VariantAPIRes>;
 }

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

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

package/src/types/variant-entry.ts

@@ -50,7 +50,6 @@ export type PublishVariantEntryDto = {
   entry: {
     environments: string[];
     locales: string[];
-    publish_with_base_entry: boolean;
     variants: {
       uid: string;
       version?: number;

package/src/utils/attributes-helper.ts

@@ -12,8 +12,8 @@ export const lookUpAttributes = (attributeRules: Record<string, any>[], attribut
       // Check if attribute reference exists in attributesUid
       const attributeRef = rule.attribute?.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];
         } else {

package/src/utils/error-helper.ts

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

package/src/utils/logger.ts

@@ -51,9 +51,9 @@ let errorLogger: winston.Logger;
 let successTransport;
 let errorTransport;
 
-function init(_logPath: string) {
+function init(_logPath: string, module: string) {
   if (!logger || !errorLogger) {
-    const logsDir = path.resolve(sanitizePath(_logPath), 'logs', 'export');
+    const logsDir = path.resolve(sanitizePath(_logPath), 'logs', sanitizePath(module));
     // Create dir if doesn't already exist
     mkdirp.sync(logsDir);
 
@@ -131,11 +131,12 @@ function init(_logPath: string) {
 export const log = (config: ExportConfig | ImportConfig, message: any, type: 'info' | 'error' | 'success') => {
   const logsPath = config.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') {
     // removed type argument from init method
-    init(logsPath).log(message);
+    init(logsPath, module).log(message);
   } else {
-    init(logsPath).error(message);
+    init(logsPath, module).error(message);
   }
 };