@contentstack/cli-cm-import 1.25.0 → 1.25.1

package/README.md

@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import/1.25.0 linux-x64 node-v22.17.0
+@contentstack/cli-cm-import/1.25.1 linux-x64 node-v22.17.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/import/modules/base-class.js

@@ -9,6 +9,7 @@ const entries_1 = tslib_1.__importDefault(require("lodash/entries"));
 const isEqual_1 = tslib_1.__importDefault(require("lodash/isEqual"));
 const omit_1 = tslib_1.__importDefault(require("lodash/omit"));
 const utils_1 = require("../../utils");
+const cloneDeep_1 = tslib_1.__importDefault(require("lodash/cloneDeep"));
 class BaseClass {
     constructor({ importConfig, stackAPIClient }) {
         this.client = stackAPIClient;
@@ -197,9 +198,16 @@ class BaseClass {
                 return this.stack
                     .globalField(globalFieldUid, { api_version: '3.2' })
                     .fetch()
-                    .then(async (response) => {
-                    response.parent = (apiData === null || apiData === void 0 ? void 0 : apiData.uid) ? apiData : apiData.global_field;
-                    await response.update().then(onSuccess).catch(onReject);
+                    .then(async (gf) => {
+                    const _a = (0, cloneDeep_1.default)(apiData), { uid } = _a, updatePayload = tslib_1.__rest(_a, ["uid"]);
+                    Object.assign(gf, updatePayload);
+                    try {
+                        const response = await gf.update();
+                        return onSuccess(response);
+                    }
+                    catch (error) {
+                        return onReject(error);
+                    }
                 })
                     .catch(onReject);
             case 'create-environments':

package/lib/import/modules/content-types.js

@@ -74,6 +74,11 @@ class ContentTypesImport extends base_class_1.default {
         if (this.isExtensionsUpdate) {
             (0, utils_1.log)(this.importConfig, 'Successfully updated the extensions.', 'success');
         }
+        this.pendingGFs = utils_1.fsUtil.readFile(this.gFsPendingPath);
+        if (!this.pendingGFs || (0, lodash_1.isEmpty)(this.pendingGFs)) {
+            (0, utils_1.log)(this.importConfig, 'No pending global fields found to update', 'info');
+            return;
+        }
         await this.updatePendingGFs().catch((error) => {
             (0, utils_1.log)(this.importConfig, `Error while updating pending global field ${(0, utils_1.formatError)(error)}`, 'error');
         });
@@ -165,8 +170,9 @@ class ContentTypesImport extends base_class_1.default {
     }
     async updatePendingGFs() {
         this.pendingGFs = utils_1.fsUtil.readFile(this.gFsPendingPath);
+        (0, utils_1.log)(this.importConfig, `Found ${this.pendingGFs.length} pending global fields to update`, 'info');
         this.gFs = utils_1.fsUtil.readFile(path.resolve(this.gFsFolderPath, this.gFsConfig.fileName));
-        const onSuccess = ({ response: globalField, apiData: { uid } = undefined }) => {
+        const onSuccess = ({ response, apiData: { uid } = undefined }) => {
             (0, utils_1.log)(this.importConfig, `Updated the global field ${uid} with content type references`, 'info');
         };
         const onReject = ({ error, apiData: { uid } = undefined }) => {

package/lib/import/modules/global-fields.js

@@ -46,10 +46,10 @@ class ImportGlobalFields extends base_class_1.default {
         }
         this.installedExtensions = ((await utils_1.fsUtil.readFile(this.marketplaceAppMapperPath)) || { extension_uid: {} }).extension_uid;
         await this.seedGFs();
-        if ((_a = this.seedGFs) === null || _a === void 0 ? void 0 : _a.length)
-            utils_1.fsUtil.writeFile(this.gFsPendingPath, this.pendingGFs);
         (0, utils_1.log)(this.importConfig, 'Created Global Fields', 'success');
         await this.updateGFs();
+        if ((_a = this.pendingGFs) === null || _a === void 0 ? void 0 : _a.length)
+            utils_1.fsUtil.writeFile(this.gFsPendingPath, this.pendingGFs);
         (0, utils_1.log)(this.importConfig, 'Updated Global Fields', 'success');
         if (this.importConfig.replaceExisting && this.existingGFs.length > 0) {
             await this.replaceGFs().catch((error) => {
@@ -133,6 +133,8 @@ class ImportGlobalFields extends base_class_1.default {
             await (0, utils_1.removeReferenceFields)(globalField.schema, flag, this.stack);
             if (flag.supressed) {
                 this.pendingGFs.push(globalField.uid);
+                (0, utils_1.log)(this.importConfig, `Global field '${globalField.uid}' will be updated later`, 'info');
+                return resolve(true);
             }
             return this.stack
                 .globalField(globalField.uid, { api_version: '3.2' })

package/lib/utils/global-field-helper.js

@@ -24,6 +24,6 @@ exports.gfSchemaTemplate = {
                 "multiple": false
             }
         ],
-        "description": "Seed "
+        "description": ""
     }
 };

package/oclif.manifest.json

@@ -199,5 +199,5 @@
       ]
     }
   },
-  "version": "1.25.0"
+  "version": "1.25.1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.25.0",
+  "version": "1.25.1",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {