@contentstack/cli-variants 1.1.0 → 1.1.2

package/lib/import/variant-entries.js

@@ -62,9 +62,9 @@ class VariantEntries extends variant_api_adapter_1.default {
         };
         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.entriesMapperPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(config.backupDir), 'mapper', 'entries');
         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.entriesDirPath = (0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(config.backupDir), (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();
     }
@@ -81,7 +81,7 @@ class VariantEntries extends variant_api_adapter_1.default {
             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.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');
+                (0, utils_1.log)(this.config, this.messages.VARIANT_ENTRY_FILE_NOT_FOUND, 'info');
                 return;
             }
             if (!(0, fs_1.existsSync)(variantIdPath)) {
@@ -133,7 +133,7 @@ class VariantEntries extends variant_api_adapter_1.default {
             const ctConfig = this.config.modules['content-types'];
             const contentType = JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)((0, cli_utilities_1.sanitizePath)(this.config.backupDir), (0, cli_utilities_1.sanitizePath)(ctConfig.dirName), `${(0, cli_utilities_1.sanitizePath)(content_type)}.json`), 'utf8'));
             const variantEntryBasePath = (0, path_1.join)((0, cli_utilities_1.sanitizePath)(this.entriesDirPath), (0, cli_utilities_1.sanitizePath)(content_type), (0, cli_utilities_1.sanitizePath)(locale), (0, cli_utilities_1.sanitizePath)(variantEntry.dirName), (0, cli_utilities_1.sanitizePath)(entry_uid));
-            const fs = new cli_utilities_1.FsUtility({ basePath: variantEntryBasePath });
+            const fs = new cli_utilities_1.FsUtility({ basePath: variantEntryBasePath, createDirIfNotExist: false });
             for (const _ in fs.indexFileContent) {
                 try {
                     const variantEntries = (yield fs.readChunkFiles.next());
@@ -176,12 +176,12 @@ class VariantEntries extends variant_api_adapter_1.default {
                 const start = Date.now();
                 for (let [, variantEntry] of (0, entries_1.default)(batch)) {
                     const onSuccess = ({ response, apiData: { entryUid, variantUid }, log }) => {
-                        log(this.config, `Created entry variant: '${variantUid}' of entry uid ${entryUid}`, 'info');
+                        log(this.config, `Created entry variant: '${variantUid}' of entry uid ${entryUid} locale '${locale}'`, 'info');
                     };
                     const onReject = ({ error, apiData, log }) => {
                         const { entryUid, variantUid } = apiData;
                         this.failedVariantEntries.set(variantUid, apiData);
-                        log(this.config, `Failed to create entry variant: '${variantUid}' of entry uid ${entryUid}`, 'error');
+                        log(this.config, `Failed to create entry variant: '${variantUid}' of entry uid ${entryUid} locale '${locale}'`, 'error');
                         log(this.config, error, 'error');
                     };
                     // NOTE Find new variant Id by old Id
@@ -352,10 +352,10 @@ class VariantEntries extends variant_api_adapter_1.default {
                     return;
                 }
                 const onSuccess = ({ response, apiData: { entryUid, variantUid }, log }) => {
-                    log(this.config, `Entry variant: '${variantUid}' of entry uid ${entryUid} published successfully!`, 'info');
+                    log(this.config, `Entry variant: '${variantUid}' of entry '${entryUid}' published on locales '${locales.join(',')}'`, 'info');
                 };
                 const onReject = ({ error, apiData: { entryUid, variantUid }, log }) => {
-                    log(this.config, `Failed to publish entry variant: '${variantUid}' of entry uid ${entryUid}`, 'error');
+                    log(this.config, `Failed to publish entry variant: '${variantUid}' of entry uid ${entryUid} on locales '${locales.join(',')}'`, 'error');
                     log(this.config, (0, utils_1.formatError)(error), 'error');
                 };
                 const { environments, locales } = this.serializePublishEntries(variantEntry);

package/lib/messages/index.d.ts

@@ -8,6 +8,7 @@ declare const migrationMsg: {
     IMPORT_MSG: string;
 };
 declare const variantEntry: {
+    VARIANT_ENTRY_FILE_NOT_FOUND: string;
     IMPORT_ENTRY_NOT_FOUND: string;
     EMPTY_VARIANT_UID_DATA: string;
     VARIANT_ID_NOT_FOUND: string;

package/lib/messages/index.js

@@ -18,6 +18,7 @@ const migrationMsg = {
     IMPORT_MSG: 'Migrating {module}...',
 };
 const variantEntry = {
+    VARIANT_ENTRY_FILE_NOT_FOUND: 'Variant entry file not found!',
     IMPORT_ENTRY_NOT_FOUND: 'Entries data not found to import variant entries',
     EMPTY_VARIANT_UID_DATA: 'Empty variants entry mapper found!',
     VARIANT_ID_NOT_FOUND: 'Variant ID not found',

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

@@ -188,10 +188,10 @@ class VariantHttpClient extends adapter_helper_1.AdapterHelper {
             const { reject, resolve, log, variantUid } = apiParams;
             const { entry_uid, content_type_uid } = options;
             let endpoint = `content_types/${content_type_uid}/entries/${entry_uid}/publish`;
-            const onSuccess = (response) => resolve({ response, apiData: { entryUid: entry_uid, variantUid }, log });
+            const onSuccess = (response) => resolve({ response, apiData: { entryUid: entry_uid, variantUid, locales: input.entry.locales }, log });
             const onReject = (error) => reject({
                 error,
-                apiData: { entryUid: entry_uid, variantUid },
+                apiData: { entryUid: entry_uid, variantUid, locales: input.entry.locales },
                 log,
             });
             try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-variants",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Variants plugin",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/import/variant-entries.ts

@@ -54,18 +54,9 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
       },
     };
     super(Object.assign(omit(config, ['helpers']), conf));
-    this.entriesMapperPath = resolve(
-      sanitizePath(config.backupDir),
-      sanitizePath(config.branchName || ''),
-      'mapper',
-      'entries',
-    );
+    this.entriesMapperPath = resolve(sanitizePath(config.backupDir), 'mapper', 'entries');
     this.personalizeConfig = this.config.modules.personalize;
-    this.entriesDirPath = resolve(
-      sanitizePath(config.backupDir),
-      sanitizePath(config.branchName || ''),
-      sanitizePath(config.modules.entries.dirName),
-    );
+    this.entriesDirPath = resolve(sanitizePath(config.backupDir), sanitizePath(config.modules.entries.dirName));
     this.failedVariantPath = resolve(sanitizePath(this.entriesMapperPath), 'failed-entry-variants.json');
     this.failedVariantEntries = new Map();
   }
@@ -89,7 +80,7 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
     );
 
     if (!existsSync(filePath)) {
-      log(this.config, this.messages.IMPORT_ENTRY_NOT_FOUND, 'info');
+      log(this.config, this.messages.VARIANT_ENTRY_FILE_NOT_FOUND, 'info');
       return;
     }
 
@@ -171,7 +162,7 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
       sanitizePath(variantEntry.dirName),
       sanitizePath(entry_uid),
     );
-    const fs = new FsUtility({ basePath: variantEntryBasePath });
+    const fs = new FsUtility({ basePath: variantEntryBasePath, createDirIfNotExist: false });
 
     for (const _ in fs.indexFileContent) {
       try {
@@ -219,13 +210,21 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
 
       for (let [, variantEntry] of entries(batch)) {
         const onSuccess = ({ response, apiData: { entryUid, variantUid }, log }: any) => {
-          log(this.config, `Created entry variant: '${variantUid}' of entry uid ${entryUid}`, 'info');
+          log(
+            this.config,
+            `Created entry variant: '${variantUid}' of entry uid ${entryUid} locale '${locale}'`,
+            'info',
+          );
         };
 
         const onReject = ({ error, apiData, log }: any) => {
           const { entryUid, variantUid } = apiData;
           this.failedVariantEntries.set(variantUid, apiData);
-          log(this.config, `Failed to create entry variant: '${variantUid}' of entry uid ${entryUid}`, 'error');
+          log(
+            this.config,
+            `Failed to create entry variant: '${variantUid}' of entry uid ${entryUid} locale '${locale}'`,
+            'error',
+          );
           log(this.config, error, 'error');
         };
         // NOTE Find new variant Id by old Id
@@ -442,10 +441,18 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
       }
 
       const onSuccess = ({ response, apiData: { entryUid, variantUid }, log }: any) => {
-        log(this.config, `Entry variant: '${variantUid}' of entry uid ${entryUid} published successfully!`, 'info');
+        log(
+          this.config,
+          `Entry variant: '${variantUid}' of entry '${entryUid}' published on locales '${locales.join(',')}'`,
+          'info',
+        );
       };
       const onReject = ({ error, apiData: { entryUid, variantUid }, log }: any) => {
-        log(this.config, `Failed to publish entry variant: '${variantUid}' of entry uid ${entryUid}`, 'error');
+        log(
+          this.config,
+          `Failed to publish entry variant: '${variantUid}' of entry uid ${entryUid} on locales '${locales.join(',')}'`,
+          'error',
+        );
         log(this.config, formatError(error), 'error');
       };
 

package/src/messages/index.ts

@@ -13,6 +13,7 @@ const migrationMsg = {
 };
 
 const variantEntry = {
+  VARIANT_ENTRY_FILE_NOT_FOUND: 'Variant entry file not found!',
   IMPORT_ENTRY_NOT_FOUND: 'Entries data not found to import variant entries',
   EMPTY_VARIANT_UID_DATA: 'Empty variants entry mapper found!',
   VARIANT_ID_NOT_FOUND: 'Variant ID not found',

package/src/types/variant-entry.ts

@@ -54,7 +54,7 @@ export type PublishVariantEntryDto = {
       uid: string;
       version?: number;
     }[];
-  }
+  };
   locale: string;
   version?: number;
-} & AnyProperty;
+} & AnyProperty;

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

@@ -226,11 +226,12 @@ export class VariantHttpClient<C> extends AdapterHelper<C, HttpClient> implement
     const { entry_uid, content_type_uid } = options;
     let endpoint = `content_types/${content_type_uid}/entries/${entry_uid}/publish`;
 
-    const onSuccess = (response: any) => resolve({ response, apiData: { entryUid: entry_uid, variantUid }, log });
+    const onSuccess = (response: any) =>
+      resolve({ response, apiData: { entryUid: entry_uid, variantUid, locales: input.entry.locales }, log });
     const onReject = (error: any) =>
       reject({
         error,
-        apiData: { entryUid: entry_uid, variantUid },
+        apiData: { entryUid: entry_uid, variantUid, locales: input.entry.locales },
         log,
       });