@contentstack/cli-variants 1.1.1 → 1.1.3

package/lib/export/experiences.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {

package/lib/export/projects.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {

package/lib/export/variant-entries.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {

package/lib/import/variant-entries.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -133,7 +143,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 +186,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 +362,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/utils/adapter-helper.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

package/lib/utils/logger.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };

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

@@ -162,7 +162,7 @@ class VariantHttpClient extends adapter_helper_1.AdapterHelper {
             try {
                 this.apiClient.headers({ api_version: undefined });
                 const res = yield this.apiClient.put(endpoint, { entry: input });
-                const data = this.handleVariantAPIRes(res);
+                const data = yield this.handleVariantAPIRes(res);
                 if (res.status >= 200 && res.status < 300) {
                     onSuccess(data);
                 }
@@ -188,16 +188,16 @@ 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 {
                 this.apiClient.headers({ api_version: 3.2 });
                 const res = yield this.apiClient.post(endpoint, input);
-                const data = this.handleVariantAPIRes(res);
+                const data = yield this.handleVariantAPIRes(res);
                 if (res.status >= 200 && res.status < 300) {
                     onSuccess(data);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-variants",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Variants plugin",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,21 +18,21 @@
   "license": "MIT",
   "devDependencies": {
     "@contentstack/cli-dev-dependencies": "^1.2.4",
-    "@oclif/test": "^2.5.6",
-    "@types/chai": "^4.3.14",
-    "@types/node": "^20.12.7",
-    "chai": "^4.4.1",
-    "mocha": "^10.4.0",
+    "@oclif/test": "^4.1.0",
+    "@types/chai": "^4.3.20",
+    "@types/node": "^20.17.6",
+    "chai": "^4.5.0",
+    "mocha": "^10.8.2",
     "nyc": "^15.1.0",
-    "sinon": "^17.0.1",
+    "sinon": "^19.0.2",
     "ts-node": "^10.9.2",
-    "tslib": "^2.6.2",
-    "typescript": "^5.4.2"
+    "tslib": "^2.8.1",
+    "typescript": "^5.6.3"
   },
   "dependencies": {
     "@contentstack/cli-utilities": "^1.8.0",
     "lodash": "^4.17.21",
     "mkdirp": "^1.0.4",
-    "winston": "^3.7.2"
+    "winston": "^3.17.0"
   }
 }

package/src/import/variant-entries.ts

@@ -54,16 +54,9 @@ export default class VariantEntries extends VariantAdapter<VariantHttpClient<Imp
       },
     };
     super(Object.assign(omit(config, ['helpers']), conf));
-    this.entriesMapperPath = resolve(
-      sanitizePath(config.backupDir),
-      'mapper',
-      'entries',
-    );
+    this.entriesMapperPath = resolve(sanitizePath(config.backupDir), 'mapper', 'entries');
     this.personalizeConfig = this.config.modules.personalize;
-    this.entriesDirPath = resolve(
-      sanitizePath(config.backupDir),
-      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();
   }
@@ -169,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 {
@@ -217,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
@@ -440,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/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

@@ -197,7 +197,7 @@ export class VariantHttpClient<C> extends AdapterHelper<C, HttpClient> implement
     try {
       this.apiClient.headers({ api_version: undefined });
       const res = await this.apiClient.put<VariantEntryStruct>(endpoint, { entry: input });
-      const data = this.handleVariantAPIRes(res);
+      const data = await this.handleVariantAPIRes(res);
 
       if (res.status >= 200 && res.status < 300) {
         onSuccess(data);
@@ -226,18 +226,19 @@ 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,
       });
 
     try {
       this.apiClient.headers({ api_version: 3.2 });
       const res = await this.apiClient.post<any>(endpoint, input);
-      const data = this.handleVariantAPIRes(res);
+      const data = await this.handleVariantAPIRes(res);
 
       if (res.status >= 200 && res.status < 300) {
         onSuccess(data);