@contentstack/cli-cm-import 1.7.1 → 1.8.0

package/lib/utils/entries-helper.js

@@ -3,7 +3,7 @@
  * Entries lookup
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lookupEntries = void 0;
+exports.restoreJsonRteEntryRefs = exports.removeEntryRefsFromJSONRTE = exports.removeUidsFromJsonRteFields = exports.lookupEntries = void 0;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
 const _ = tslib_1.__importStar(require("lodash"));
@@ -94,7 +94,7 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
             }
         }
     };
-    const find = function (schema, _entry) {
+    const find = function (schema = [], _entry) {
         for (let i = 0, _i = schema.length; i < _i; i++) {
             switch (schema[i].data_type) {
                 case 'reference':
@@ -250,3 +250,323 @@ function findUidsInNewRefFields(entry, uids) {
         }
     }
 }
+const removeUidsFromJsonRteFields = (entry, ctSchema) => {
+    for (const element of ctSchema) {
+        switch (element.data_type) {
+            case 'blocks': {
+                if (entry[element.uid]) {
+                    if (element.multiple) {
+                        entry[element.uid] = entry[element.uid].map((e) => {
+                            let key = Object.keys(e).pop();
+                            let subBlock = element.blocks.filter((block) => block.uid === key).pop();
+                            e[key] = (0, exports.removeUidsFromJsonRteFields)(e[key], subBlock.schema);
+                            return e;
+                        });
+                    }
+                }
+                break;
+            }
+            case 'global_field':
+            case 'group': {
+                if (entry[element.uid]) {
+                    if (element.multiple) {
+                        entry[element.uid] = entry[element.uid].map((e) => {
+                            e = (0, exports.removeUidsFromJsonRteFields)(e, element.schema);
+                            return e;
+                        });
+                    }
+                    else {
+                        entry[element.uid] = (0, exports.removeUidsFromJsonRteFields)(entry[element.uid], element.schema);
+                    }
+                }
+                break;
+            }
+            case 'json': {
+                if (entry[element.uid] && element.field_metadata.rich_text_type) {
+                    if (element.multiple) {
+                        entry[element.uid] = entry[element.uid].map((jsonRteData) => {
+                            delete jsonRteData.uid; // remove uid
+                            if (_.isObject(jsonRteData.attrs)) {
+                                jsonRteData.attrs.dirty = true;
+                            }
+                            if (!_.isEmpty(jsonRteData.children)) {
+                                jsonRteData.children = _.map(jsonRteData.children, (child) => removeUidsFromChildren(child));
+                            }
+                            return jsonRteData;
+                        });
+                    }
+                    else {
+                        delete entry[element.uid].uid; // remove uid
+                        if (entry[element.uid] && _.isObject(entry[element.uid].attrs)) {
+                            entry[element.uid].attrs.dirty = true;
+                        }
+                        if (entry[element.uid] && !_.isEmpty(entry[element.uid].children)) {
+                            entry[element.uid].children = _.map(entry[element.uid].children, (child) => removeUidsFromChildren(child));
+                        }
+                    }
+                }
+                break;
+            }
+        }
+    }
+    return entry;
+};
+exports.removeUidsFromJsonRteFields = removeUidsFromJsonRteFields;
+function removeUidsFromChildren(children) {
+    if (children.length && children.length > 0) {
+        return children.map((child) => {
+            if (child.type && child.type.length > 0) {
+                delete child.uid; // remove uid
+                if (_.isObject(child.attrs)) {
+                    child.attrs.dirty = true;
+                }
+            }
+            if (child.children && child.children.length > 0) {
+                child.children = removeUidsFromChildren(child.children);
+            }
+            return child;
+        });
+    }
+    else {
+        if (children.type && children.type.length > 0) {
+            delete children.uid; // remove uid
+            if (_.isObject(children.attrs)) {
+                children.attrs.dirty = true;
+            }
+        }
+        if (children.children && children.children.length > 0) {
+            children.children = removeUidsFromChildren(children.children);
+        }
+        return children;
+    }
+}
+const removeEntryRefsFromJSONRTE = (entry, ctSchema) => {
+    for (const element of ctSchema) {
+        switch (element.data_type) {
+            case 'blocks': {
+                if (entry[element.uid]) {
+                    if (element.multiple) {
+                        entry[element.uid] = entry[element.uid].map((e) => {
+                            let key = Object.keys(e).pop();
+                            let subBlock = element.blocks.filter((block) => block.uid === key).pop();
+                            e[key] = (0, exports.removeEntryRefsFromJSONRTE)(e[key], subBlock.schema);
+                            return e;
+                        });
+                    }
+                }
+                break;
+            }
+            case 'global_field':
+            case 'group': {
+                if (entry[element.uid]) {
+                    if (element.multiple) {
+                        entry[element.uid] = entry[element.uid].map((e) => {
+                            e = (0, exports.removeEntryRefsFromJSONRTE)(e, element.schema);
+                            return e;
+                        });
+                    }
+                    else {
+                        entry[element.uid] = (0, exports.removeEntryRefsFromJSONRTE)(entry[element.uid], element.schema);
+                    }
+                }
+                break;
+            }
+            case 'json': {
+                if (entry[element.uid] && element.field_metadata.rich_text_type) {
+                    if (element.multiple) {
+                        entry[element.uid] = entry[element.uid].map((jsonRteData) => {
+                            // repeated code from else block, will abstract later
+                            let entryReferences = jsonRteData.children.filter((e) => doEntryReferencesExist(e));
+                            if (entryReferences.length > 0) {
+                                jsonRteData.children = jsonRteData.children.filter((e) => !doEntryReferencesExist(e));
+                                return jsonRteData; // return jsonRteData without entry references
+                            }
+                            else {
+                                return jsonRteData; // return jsonRteData as it is, because there are no entry references
+                            }
+                        });
+                    }
+                    else {
+                        let entryReferences = entry[element.uid].children.filter((e) => doEntryReferencesExist(e));
+                        if (entryReferences.length > 0) {
+                            entry[element.uid].children = entry[element.uid].children.filter((e) => !doEntryReferencesExist(e));
+                        }
+                    }
+                }
+                break;
+            }
+        }
+    }
+    return entry;
+};
+exports.removeEntryRefsFromJSONRTE = removeEntryRefsFromJSONRTE;
+function doEntryReferencesExist(element) {
+    // checks if the children of p element contain any references
+    // only checking one level deep, not recursive
+    if (element.length) {
+        for (const item of element) {
+            if ((item.type === 'p' || item.type === 'a') && item.children && item.children.length > 0) {
+                return doEntryReferencesExist(item.children);
+            }
+            else if (isEntryRef(item)) {
+                return true;
+            }
+        }
+    }
+    else {
+        if (isEntryRef(element)) {
+            return true;
+        }
+        if ((element.type === 'p' || element.type === 'a') && element.children && element.children.length > 0) {
+            return doEntryReferencesExist(element.children);
+        }
+    }
+    return false;
+}
+function isEntryRef(element) {
+    return element.type === 'reference' && element.attrs.type === 'entry';
+}
+const restoreJsonRteEntryRefs = (entry, sourceStackEntry, ctSchema, { mappedAssetUids, mappedAssetUrls }) => {
+    // let mappedAssetUids = fileHelper.readFileSync(this.mappedAssetUidPath) || {};
+    // let mappedAssetUrls = fileHelper.readFileSync(this.mappedAssetUrlPath) || {};
+    for (const element of ctSchema) {
+        switch (element.data_type) {
+            case 'blocks': {
+                if (entry[element.uid]) {
+                    if (element.multiple) {
+                        entry[element.uid] = entry[element.uid].map((e, eIndex) => {
+                            let key = Object.keys(e).pop();
+                            let subBlock = element.blocks.filter((block) => block.uid === key).pop();
+                            let sourceStackElement = sourceStackEntry[element.uid][eIndex][key];
+                            e[key] = (0, exports.restoreJsonRteEntryRefs)(e[key], sourceStackElement, subBlock.schema, {
+                                mappedAssetUids,
+                                mappedAssetUrls,
+                            });
+                            return e;
+                        });
+                    }
+                }
+                break;
+            }
+            case 'global_field':
+            case 'group': {
+                if (entry[element.uid]) {
+                    if (element.multiple) {
+                        entry[element.uid] = entry[element.uid].map((e, eIndex) => {
+                            let sourceStackElement = sourceStackEntry[element.uid][eIndex];
+                            e = (0, exports.restoreJsonRteEntryRefs)(e, sourceStackElement, element.schema, { mappedAssetUids, mappedAssetUrls });
+                            return e;
+                        });
+                    }
+                    else {
+                        let sourceStackElement = sourceStackEntry[element.uid];
+                        entry[element.uid] = (0, exports.restoreJsonRteEntryRefs)(entry[element.uid], sourceStackElement, element.schema, {
+                            mappedAssetUids,
+                            mappedAssetUrls,
+                        });
+                    }
+                }
+                break;
+            }
+            case 'json': {
+                if (entry[element.uid] && element.field_metadata.rich_text_type) {
+                    if (element.multiple) {
+                        entry[element.uid] = entry[element.uid].map((field, index) => {
+                            // i am facing a Maximum call stack exceeded issue,
+                            // probably because of this loop operation
+                            let entryRefs = sourceStackEntry[element.uid][index].children
+                                .map((e, i) => {
+                                return { index: i, value: e };
+                            })
+                                .filter((e) => doEntryReferencesExist(e.value))
+                                .map((e) => {
+                                // commenting the line below resolved the maximum call stack exceeded issue
+                                // e.value = this.setDirtyTrue(e.value)
+                                setDirtyTrue(e.value);
+                                return e;
+                            })
+                                .map((e) => {
+                                // commenting the line below resolved the maximum call stack exceeded issue
+                                // e.value = this.resolveAssetRefsInEntryRefsForJsonRte(e, mappedAssetUids, mappedAssetUrls)
+                                resolveAssetRefsInEntryRefsForJsonRte(e.value, mappedAssetUids, mappedAssetUrls);
+                                return e;
+                            });
+                            if (entryRefs.length > 0) {
+                                entryRefs.forEach((entryRef) => {
+                                    field.children.splice(entryRef.index, 0, entryRef.value);
+                                });
+                            }
+                            return field;
+                        });
+                    }
+                    else {
+                        let entryRefs = sourceStackEntry[element.uid].children
+                            .map((e, index) => {
+                            return { index: index, value: e };
+                        })
+                            .filter((e) => doEntryReferencesExist(e.value))
+                            .map((e) => {
+                            setDirtyTrue(e.value);
+                            return e;
+                        })
+                            .map((e) => {
+                            resolveAssetRefsInEntryRefsForJsonRte(e.value, mappedAssetUids, mappedAssetUrls);
+                            return e;
+                        });
+                        if (entryRefs.length > 0) {
+                            entryRefs.forEach((entryRef) => {
+                                if (!_.isEmpty(entry[element.uid]) && entry[element.uid].children) {
+                                    entry[element.uid].children.splice(entryRef.index, 0, entryRef.value);
+                                }
+                            });
+                        }
+                    }
+                }
+                break;
+            }
+        }
+    }
+    return entry;
+};
+exports.restoreJsonRteEntryRefs = restoreJsonRteEntryRefs;
+function setDirtyTrue(jsonRteChild) {
+    // also removing uids in this function
+    if (jsonRteChild.type) {
+        if (_.isObject(jsonRteChild.attrs)) {
+            jsonRteChild.attrs['dirty'] = true;
+        }
+        delete jsonRteChild.uid;
+        if (jsonRteChild.children && jsonRteChild.children.length > 0) {
+            jsonRteChild.children = jsonRteChild.children.map((subElement) => this.setDirtyTrue(subElement));
+        }
+    }
+    return jsonRteChild;
+}
+function resolveAssetRefsInEntryRefsForJsonRte(jsonRteChild, mappedAssetUids, mappedAssetUrls) {
+    if (jsonRteChild.type) {
+        if (jsonRteChild.attrs.type === 'asset') {
+            let assetUrl;
+            if (mappedAssetUids[jsonRteChild.attrs['asset-uid']]) {
+                jsonRteChild.attrs['asset-uid'] = mappedAssetUids[jsonRteChild.attrs['asset-uid']];
+            }
+            if (jsonRteChild.attrs['display-type'] !== 'link') {
+                assetUrl = jsonRteChild.attrs['asset-link'];
+            }
+            else {
+                assetUrl = jsonRteChild.attrs['href'];
+            }
+            if (mappedAssetUrls[assetUrl]) {
+                if (jsonRteChild.attrs['display-type'] !== 'link') {
+                    jsonRteChild.attrs['asset-link'] = mappedAssetUrls[assetUrl];
+                }
+                else {
+                    jsonRteChild.attrs['href'] = mappedAssetUrls[assetUrl];
+                }
+            }
+        }
+        if (jsonRteChild.children && jsonRteChild.children.length > 0) {
+            jsonRteChild.children = jsonRteChild.children.map((subElement) => resolveAssetRefsInEntryRefsForJsonRte(subElement, mappedAssetUids, mappedAssetUrls));
+        }
+    }
+    return jsonRteChild;
+}

package/lib/utils/file-helper.d.ts

@@ -11,4 +11,5 @@ export declare const makeDirectory: (dir: string) => void;
 export declare const readdirSync: (dirPath: string) => any;
 export declare const isFolderExist: (folderPath: string) => Promise<any>;
 export declare const fileExistsSync: (path: string) => boolean;
+export declare const removeDirSync: (path: string) => void;
 export declare const fsUtil: FsUtility;

package/lib/utils/file-helper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fsUtil = exports.fileExistsSync = exports.isFolderExist = exports.readdirSync = exports.makeDirectory = exports.writeLargeFile = exports.writeFile = exports.writeFileSync = exports.readLargeFile = exports.readFile = exports.readFileSync = void 0;
+exports.fsUtil = exports.removeDirSync = exports.fileExistsSync = exports.isFolderExist = exports.readdirSync = exports.makeDirectory = exports.writeLargeFile = exports.writeFile = exports.writeFileSync = exports.readLargeFile = exports.readFile = exports.readFileSync = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs"));
 const path = tslib_1.__importStar(require("path"));
@@ -137,4 +137,8 @@ const fileExistsSync = function (path) {
     return fs.existsSync(path);
 };
 exports.fileExistsSync = fileExistsSync;
+const removeDirSync = function (path) {
+    fs.rmdirSync(path, { recursive: true });
+};
+exports.removeDirSync = removeDirSync;
 exports.fsUtil = new cli_utilities_1.FsUtility();

package/lib/utils/import-config-handler.js

@@ -53,7 +53,7 @@ const setupConfig = async (importCmdFlags) => {
     config.isAuthenticated = (0, cli_utilities_1.isAuthenticated)();
     //Note to support the old key
     config.source_stack = config.apiKey;
-    config.importWebhookStatus = importCmdFlags.importWebhookStatus;
+    config.importWebhookStatus = importCmdFlags['import-webhook-status'];
     config.forceStopMarketplaceAppsPrompt = importCmdFlags.yes;
     if (importCmdFlags['branch']) {
         config.branchName = importCmdFlags['branch'];

package/lib/utils/index.d.ts

@@ -5,8 +5,8 @@ export { fsUtil } from './file-helper';
 export { default as backupHandler } from './backup-handler';
 export { log, unlinkFileLogger } from './logger';
 export { uploadAssetHelper, lookupAssets } from './asset-helper';
-export { getDeveloperHubUrl, getOrgUid, getConfirmationToCreateApps, createPrivateApp, handleNameConflict, installApp, makeRedirectUrlCall, confirmToCloseProcess, getAllStackSpecificApps, ifAppAlreadyExist, updateAppConfig } from './marketplace-app-helper';
+export { getDeveloperHubUrl, getOrgUid, getConfirmationToCreateApps, createPrivateApp, handleNameConflict, installApp, makeRedirectUrlCall, confirmToCloseProcess, getAllStackSpecificApps, ifAppAlreadyExist, updateAppConfig, } from './marketplace-app-helper';
 export { schemaTemplate, suppressSchemaReference, removeReferenceFields } from './content-type-helper';
 export { lookupExtension } from './extension-helper';
-export { lookupEntries } from './entries-helper';
+export { lookupEntries, removeUidsFromJsonRteFields, removeEntryRefsFromJSONRTE, restoreJsonRteEntryRefs, } from './entries-helper';
 export * from './common-helper';

package/lib/utils/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lookupEntries = exports.lookupExtension = exports.removeReferenceFields = exports.suppressSchemaReference = exports.schemaTemplate = exports.updateAppConfig = exports.ifAppAlreadyExist = exports.getAllStackSpecificApps = exports.confirmToCloseProcess = exports.makeRedirectUrlCall = exports.installApp = exports.handleNameConflict = exports.createPrivateApp = exports.getConfirmationToCreateApps = exports.getOrgUid = exports.getDeveloperHubUrl = exports.lookupAssets = exports.uploadAssetHelper = exports.unlinkFileLogger = exports.log = exports.backupHandler = exports.fsUtil = exports.fileHelper = exports.setupImportConfig = exports.interactive = void 0;
+exports.restoreJsonRteEntryRefs = exports.removeEntryRefsFromJSONRTE = exports.removeUidsFromJsonRteFields = exports.lookupEntries = exports.lookupExtension = exports.removeReferenceFields = exports.suppressSchemaReference = exports.schemaTemplate = exports.updateAppConfig = exports.ifAppAlreadyExist = exports.getAllStackSpecificApps = exports.confirmToCloseProcess = exports.makeRedirectUrlCall = exports.installApp = exports.handleNameConflict = exports.createPrivateApp = exports.getConfirmationToCreateApps = exports.getOrgUid = exports.getDeveloperHubUrl = exports.lookupAssets = exports.uploadAssetHelper = exports.unlinkFileLogger = exports.log = exports.backupHandler = exports.fsUtil = exports.fileHelper = exports.setupImportConfig = exports.interactive = void 0;
 const tslib_1 = require("tslib");
 exports.interactive = tslib_1.__importStar(require("./interactive"));
 var import_config_handler_1 = require("./import-config-handler");
@@ -36,4 +36,7 @@ var extension_helper_1 = require("./extension-helper");
 Object.defineProperty(exports, "lookupExtension", { enumerable: true, get: function () { return extension_helper_1.lookupExtension; } });
 var entries_helper_1 = require("./entries-helper");
 Object.defineProperty(exports, "lookupEntries", { enumerable: true, get: function () { return entries_helper_1.lookupEntries; } });
+Object.defineProperty(exports, "removeUidsFromJsonRteFields", { enumerable: true, get: function () { return entries_helper_1.removeUidsFromJsonRteFields; } });
+Object.defineProperty(exports, "removeEntryRefsFromJSONRTE", { enumerable: true, get: function () { return entries_helper_1.removeEntryRefsFromJSONRTE; } });
+Object.defineProperty(exports, "restoreJsonRteEntryRefs", { enumerable: true, get: function () { return entries_helper_1.restoreJsonRteEntryRefs; } });
 tslib_1.__exportStar(require("./common-helper"), exports);

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.7.1",
+  "version": "1.8.0",
   "commands": {
     "cm:stacks:import": {
       "id": "cm:stacks:import",

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "^1.2.11",
-    "@contentstack/cli-utilities": "^1.5.1",
-    "@contentstack/management":  "~1.10.0",
+    "@contentstack/cli-command": "~1.2.11",
+    "@contentstack/cli-utilities": "~1.5.1",
+    "@contentstack/management": "~1.10.0",
     "@oclif/config": "^1.18.3",
     "@oclif/core": "^2.9.3",
     "big-json": "^3.2.0",
@@ -96,4 +96,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}