@contentstack/cli-cm-import 1.12.1 → 1.12.2

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.12.1 linux-x64 node-v18.19.0
+@contentstack/cli-cm-import/1.12.2 linux-x64 node-v18.19.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -82,6 +82,7 @@ FLAGS
   --import-webhook-status=<option>  [default: disable] [optional] Webhook state
                                     <options: disable|current>
   --replace-existing                Replaces the existing module in the target stack.
+  --skip-app-recreation             [optional] Skip private apps recreation if already exist
   --skip-existing                   Skips the module exists warning messages.
 
 DESCRIPTION
@@ -129,6 +130,7 @@ FLAGS
   --import-webhook-status=<option>  [default: disable] [optional] Webhook state
                                     <options: disable|current>
   --replace-existing                Replaces the existing module in the target stack.
+  --skip-app-recreation             [optional] Skip private apps recreation if already exist
   --skip-existing                   Skips the module exists warning messages.
 
 DESCRIPTION

package/lib/commands/cm/stacks/import.js

@@ -108,6 +108,9 @@ ImportCommand.flags = {
         required: false,
         description: '[optional] Override marketplace prompts',
     }),
+    'skip-app-recreation': cli_utilities_1.flags.boolean({
+        description: '[optional] Skip private apps recreation if already exist',
+    }),
     'replace-existing': cli_utilities_1.flags.boolean({
         required: false,
         description: 'Replaces the existing module in the target stack.',

package/lib/import/modules/index.js

@@ -1,18 +1,31 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : 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 _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const cli_utilities_1 = require("@contentstack/cli-utilities");
-const node_path_1 = require("node:path");
-const modules_js_1 = tslib_1.__importDefault(require("../modules-js"));
 async function startModuleImport(modulePayload) {
-    var _a;
-    // Todo: Remove below code when auto detect mechanism implemented for old and new module
-    if (modulePayload.moduleName === 'assets' &&
-        !new cli_utilities_1.FsUtility({ basePath: (0, node_path_1.join)((_a = modulePayload.importConfig) === null || _a === void 0 ? void 0 : _a.backupDir, 'assets') }).isNewFsStructure) {
-        return (0, modules_js_1.default)(modulePayload);
-    }
-    const { default: ModuleRunner } = await (_a = `./${modulePayload.moduleName}`, Promise.resolve().then(() => tslib_1.__importStar(require(_a))));
+    const { default: ModuleRunner } = await (_a = `./${modulePayload.moduleName}`, Promise.resolve().then(() => __importStar(require(_a))));
     const moduleRunner = new ModuleRunner(modulePayload);
     return moduleRunner.start();
 }

package/lib/import/modules/marketplace-apps.d.ts

@@ -1,43 +1,113 @@
-import { NodeCrypto, ContentstackClient } from '@contentstack/cli-utilities';
-import BaseClass from './base-class';
-import { ModuleClassParams } from '../../types';
-export default class ImportMarketplaceApps extends BaseClass {
+import { NodeCrypto, ContentstackMarketplaceClient } from '@contentstack/cli-utilities';
+import { ModuleClassParams, ImportConfig, Installation, Manifest } from '../../types';
+export default class ImportMarketplaceApps {
+    importConfig: ImportConfig;
     private mapperDirPath;
     private marketPlaceFolderPath;
     private marketPlaceUidMapperPath;
     private marketPlaceAppConfig;
     private marketplaceApps;
-    private httpClient;
     private appNameMapping;
     private appUidMapping;
     private installationUidMapping;
     private installedApps;
     private appOriginalName;
     developerHubBaseUrl: string;
-    sdkClient: ContentstackClient;
     nodeCrypto: NodeCrypto;
-    appSdkAxiosInstance: any;
-    constructor({ importConfig, stackAPIClient }: ModuleClassParams);
+    appSdk: ContentstackMarketplaceClient;
+    constructor({ importConfig }: ModuleClassParams);
     /**
-     * @method start
-     * @returns {Promise<void>} Promise<void>
+     * This function starts the process of importing marketplace apps.
+     * @returns The function `start()` returns a `Promise<void>`.
      */
     start(): Promise<void>;
-    setHttpClient(): Promise<void>;
     /**
-     * @method startInstallation
-     * @returns {Promise<void>}
+     * The function `importMarketplaceApps` installs marketplace apps, handles private app creation,
+     * validates app installation, and generates a UID mapper.
+     */
+    importMarketplaceApps(): Promise<void>;
+    /**
+     * The function `generateUidMapper` generates a mapping of extension UIDs from old metadata to new
+     * metadata based on the installed and marketplace apps.
+     * @returns The function `generateUidMapper` returns a Promise that resolves to a `Record<string,
+     * unknown>`.
      */
-    startInstallation(): Promise<void>;
     generateUidMapper(): Promise<Record<string, unknown>>;
+    /**
+     * The function `getAndValidateEncryptionKey` retrieves and validates an encryption key, with the
+     * option to retry a specified number of times.
+     * @param {string} defaultValue - The defaultValue parameter is a string that represents the default
+     * encryption key value to use if no valid encryption key is found in the marketplaceApps
+     * configuration.
+     * @param [retry=1] - The `retry` parameter is an optional parameter that specifies the number of
+     * times the function should retry getting and validating the encryption key if it fails. The default
+     * value is 1, meaning that if the function fails to get and validate the encryption key on the first
+     * attempt, it will not retry.
+     * @returns The function `getAndValidateEncryptionKey` returns a Promise that resolves to the
+     * encryption key.
+     */
     getAndValidateEncryptionKey(defaultValue: string, retry?: number): Promise<any>;
     /**
-     * @method handleAllPrivateAppsCreationProcess
-     * @returns {Promise<void>}
+     * The function `handleAllPrivateAppsCreationProcess` handles the creation process for all private
+     * apps in a developer hub, including checking for existing apps, getting confirmation from the user,
+     * and creating the apps if necessary.
+     * @returns a Promise that resolves to void.
      */
     handleAllPrivateAppsCreationProcess(): Promise<void>;
-    createPrivateApps(app: any, uidCleaned?: boolean, appSuffix?: number): Promise<any>;
-    updateManifestUILocations(locations: any, type?: string, appSuffix?: number): Promise<any[]>;
+    /**
+     * The function checks if a private app exists in the developer hub.
+     * @param {App} app - The `app` parameter is an object representing an application. It likely has
+     * properties such as `uid` which is a unique identifier for the app.
+     * @returns a boolean value. It returns true if the installation object is not empty, and false if
+     * the installation object is empty.
+     */
+    isPrivateAppExistInDeveloperHub(app: Installation): Promise<boolean>;
+    /**
+     * The function creates a private app in a marketplace, with an optional suffix for the app name and
+     * an option to update the UI location.
+     * @param {Manifest} app - The `app` parameter is an object that represents the manifest of the app
+     * being created. It contains various properties such as `name`, `ui_location`, and `uid`.
+     * @param [appSuffix=1] - The appSuffix parameter is an optional parameter that specifies a suffix to
+     * be added to the app's UI location. It is used when updating the UI location of the app.
+     * @param [updateUiLocation=false] - A boolean value indicating whether to update the UI location of
+     * the app.
+     * @returns the result of the `appCreationCallback` function, which takes in the `app`, `response`,
+     * and `appSuffix` as arguments.
+     */
+    createPrivateApp(app: Manifest, appSuffix?: number, updateUiLocation?: boolean): Promise<any>;
+    /**
+     * The function installs an app from a marketplace onto a target stack.
+     * @param {ImportConfig} config - The `config` parameter is an object that contains the configuration
+     * for the installation. It likely includes information such as the target stack UID and other
+     * relevant details.
+     * @param {string} [appManifestUid] - The `appManifestUid` parameter is the unique identifier of the
+     * app manifest. It is used to specify which app to install from the marketplace.
+     * @returns a Promise that resolves to an object.
+     */
+    installApp(config: ImportConfig, appManifestUid?: string): Promise<any>;
+    /**
+     * The function updates the names of locations in a manifest UI based on a given app suffix.
+     * @param {any} locations - An array of objects representing different locations in a manifest file.
+     * Each object has a "meta" property which is an array of objects representing metadata for that
+     * location.
+     * @param [appSuffix=1] - The `appSuffix` parameter is an optional parameter that specifies a suffix
+     * to be added to the app name. It is set to 1 by default.
+     * @returns The function `updateManifestUILocations` returns an updated array of `locations`.
+     */
+    updateManifestUILocations(locations: any, appSuffix?: number): any[];
+    /**
+     * The function `appCreationCallback` handles the creation of a new app and handles any conflicts or
+     * errors that may occur during the process.
+     * @param {any} app - The `app` parameter is an object representing the app that is being created. It
+     * contains various properties such as `uid` (unique identifier), `name`, and other app-specific
+     * details.
+     * @param {any} response - The `response` parameter is an object that contains the response received
+     * from an API call. It may have properties such as `statusText` and `message`.
+     * @param {number} appSuffix - The `appSuffix` parameter is a number that is used to generate a
+     * unique suffix for the app name in case of a name conflict. It is incremented each time a name
+     * conflict occurs to ensure that the new app name is unique.
+     * @returns a Promise.
+     */
     appCreationCallback(app: any, response: any, appSuffix: number): Promise<any>;
     /**
      * @method installApps
@@ -48,8 +118,10 @@ export default class ImportMarketplaceApps extends BaseClass {
      */
     installApps(app: any): Promise<void>;
     /**
-     * @method updateAppsConfig
-     * @returns {Promise<void>}
+     * The `updateAppsConfig` function updates the configuration and server configuration of an app in a
+     * marketplace.
+     * @param {Installation} app - The `app` parameter is an object that represents an installation of an
+     * app. It contains the following properties:
      */
-    updateAppsConfig(app: any): Promise<void>;
+    updateAppsConfig(app: Installation): Promise<void>;
 }

package/lib/import/modules/marketplace-apps.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const map_1 = tslib_1.__importDefault(require("lodash/map"));
-const find_1 = tslib_1.__importDefault(require("lodash/find"));
 const omit_1 = tslib_1.__importDefault(require("lodash/omit"));
+const find_1 = tslib_1.__importDefault(require("lodash/find"));
 const pick_1 = tslib_1.__importDefault(require("lodash/pick"));
 const first_1 = tslib_1.__importDefault(require("lodash/first"));
 const split_1 = tslib_1.__importDefault(require("lodash/split"));
@@ -13,18 +13,16 @@ const filter_1 = tslib_1.__importDefault(require("lodash/filter"));
 const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const toLower_1 = tslib_1.__importDefault(require("lodash/toLower"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
-const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 const log_1 = require("../../utils/log");
 const interactive_1 = require("../../utils/interactive");
 const utils_1 = require("../../utils");
-class ImportMarketplaceApps extends base_class_1.default {
-    constructor({ importConfig, stackAPIClient }) {
-        super({ importConfig, stackAPIClient });
+class ImportMarketplaceApps {
+    constructor({ importConfig }) {
+        this.importConfig = importConfig;
         this.marketPlaceAppConfig = importConfig.modules.marketplace_apps;
         this.mapperDirPath = (0, node_path_1.join)(this.importConfig.backupDir, 'mapper', 'marketplace_apps');
         this.marketPlaceFolderPath = (0, node_path_1.join)(this.importConfig.backupDir, this.marketPlaceAppConfig.dirName);
         this.marketPlaceUidMapperPath = (0, node_path_1.join)(this.mapperDirPath, 'uid-mapping.json');
-        this.httpClient = new cli_utilities_1.HttpClient();
         this.appNameMapping = {};
         this.appUidMapping = {};
         this.appOriginalName = undefined;
@@ -32,8 +30,8 @@ class ImportMarketplaceApps extends base_class_1.default {
         this.installationUidMapping = {};
     }
     /**
-     * @method start
-     * @returns {Promise<void>} Promise<void>
+     * This function starts the process of importing marketplace apps.
+     * @returns The function `start()` returns a `Promise<void>`.
      */
     async start() {
         (0, utils_1.log)(this.importConfig, 'Migrating marketplace apps', 'info');
@@ -53,37 +51,23 @@ class ImportMarketplaceApps extends base_class_1.default {
         }
         await utils_1.fsUtil.makeDirectory(this.mapperDirPath);
         this.developerHubBaseUrl = this.importConfig.developerHubBaseUrl || (await (0, utils_1.getDeveloperHubUrl)(this.importConfig));
-        this.sdkClient = await (0, cli_utilities_1.managementSDKClient)({ endpoint: this.developerHubBaseUrl });
-        this.appSdkAxiosInstance = await (0, cli_utilities_1.managementSDKClient)({
-            host: this.developerHubBaseUrl.split('://').pop(),
-        });
+        this.importConfig.developerHubBaseUrl = this.developerHubBaseUrl;
+        // NOTE init marketplace app sdk
+        const host = this.developerHubBaseUrl.split('://').pop();
+        this.appSdk = await (0, cli_utilities_1.marketplaceSDKClient)({ host });
         this.importConfig.org_uid = await (0, utils_1.getOrgUid)(this.importConfig);
-        await this.setHttpClient();
-        await this.startInstallation();
+        // NOTE start the marketplace import process
+        await this.importMarketplaceApps();
         (0, utils_1.log)(this.importConfig, 'Marketplace apps have been imported successfully!', 'success');
     }
-    async setHttpClient() {
-        if (!this.importConfig.auth_token) {
-            this.httpClient = new cli_utilities_1.OauthDecorator(this.httpClient);
-            const headers = await this.httpClient.preHeadersCheck(this.importConfig);
-            this.httpClient = this.httpClient.headers(headers);
-        }
-        else {
-            this.httpClient = new cli_utilities_1.HttpClientDecorator(this.httpClient);
-            this.httpClient.headers(this.importConfig);
-        }
-    }
     /**
-     * @method startInstallation
-     * @returns {Promise<void>}
+     * The function `importMarketplaceApps` installs marketplace apps, handles private app creation,
+     * validates app installation, and generates a UID mapper.
      */
-    async startInstallation() {
-        const cryptoArgs = { encryptionKey: '' };
-        if (this.importConfig.marketplaceAppEncryptionKey) {
-            cryptoArgs['encryptionKey'] = this.importConfig.marketplaceAppEncryptionKey;
-        }
+    async importMarketplaceApps() {
+        // NOTE set default encryptionKey
+        const cryptoArgs = { encryptionKey: this.importConfig.marketplaceAppEncryptionKey };
         if (this.importConfig.forceStopMarketplaceAppsPrompt) {
-            cryptoArgs['encryptionKey'] = this.importConfig.marketplaceAppEncryptionKey;
             this.nodeCrypto = new cli_utilities_1.NodeCrypto(cryptoArgs);
         }
         else {
@@ -91,7 +75,8 @@ class ImportMarketplaceApps extends base_class_1.default {
         }
         // NOTE install all private apps which is not available for stack.
         await this.handleAllPrivateAppsCreationProcess();
-        this.installedApps = await (0, utils_1.getAllStackSpecificApps)(this.developerHubBaseUrl, this.httpClient, this.importConfig);
+        // NOTE getting all apps to validate if it's already installed in the stack to manage conflict
+        this.installedApps = await (0, utils_1.getAllStackSpecificApps)(this.importConfig);
         (0, utils_1.log)(this.importConfig, 'Starting marketplace app installation', 'success');
         for (let app of this.marketplaceApps) {
             await this.installApps(app);
@@ -103,29 +88,46 @@ class ImportMarketplaceApps extends base_class_1.default {
             installation_uid: this.installationUidMapping,
         });
     }
+    /**
+     * The function `generateUidMapper` generates a mapping of extension UIDs from old metadata to new
+     * metadata based on the installed and marketplace apps.
+     * @returns The function `generateUidMapper` returns a Promise that resolves to a `Record<string,
+     * unknown>`.
+     */
     async generateUidMapper() {
         var _a, _b;
         const listOfNewMeta = [];
         const listOfOldMeta = [];
         const extensionUidMap = {};
-        this.installedApps =
-            (await (0, utils_1.getAllStackSpecificApps)(this.developerHubBaseUrl, this.httpClient, this.importConfig)) || [];
+        // NOTE After installation getting all apps to create mapper.
+        this.installedApps = (await (0, utils_1.getAllStackSpecificApps)(this.importConfig)) || [];
         for (const app of this.marketplaceApps) {
             listOfOldMeta.push(...(0, map_1.default)((_a = app === null || app === void 0 ? void 0 : app.ui_location) === null || _a === void 0 ? void 0 : _a.locations, 'meta').flat());
         }
         for (const app of this.installedApps) {
             listOfNewMeta.push(...(0, map_1.default)((_b = app === null || app === void 0 ? void 0 : app.ui_location) === null || _b === void 0 ? void 0 : _b.locations, 'meta').flat());
         }
-        for (const { extension_uid, name, path, uid, data_type } of (0, filter_1.default)(listOfOldMeta, 'name')) {
-            const meta = (0, find_1.default)(listOfNewMeta, { name, path }) ||
-                (0, find_1.default)(listOfNewMeta, { name: this.appNameMapping[name], path }) ||
-                (0, find_1.default)(listOfNewMeta, { name, uid, data_type });
+        for (const { extension_uid, uid } of (0, filter_1.default)(listOfOldMeta, 'name')) {
+            const meta = (0, find_1.default)(listOfNewMeta, { uid });
             if (meta) {
                 extensionUidMap[extension_uid] = meta.extension_uid;
             }
         }
         return extensionUidMap;
     }
+    /**
+     * The function `getAndValidateEncryptionKey` retrieves and validates an encryption key, with the
+     * option to retry a specified number of times.
+     * @param {string} defaultValue - The defaultValue parameter is a string that represents the default
+     * encryption key value to use if no valid encryption key is found in the marketplaceApps
+     * configuration.
+     * @param [retry=1] - The `retry` parameter is an optional parameter that specifies the number of
+     * times the function should retry getting and validating the encryption key if it fails. The default
+     * value is 1, meaning that if the function fails to get and validate the encryption key on the first
+     * attempt, it will not retry.
+     * @returns The function `getAndValidateEncryptionKey` returns a Promise that resolves to the
+     * encryption key.
+     */
     async getAndValidateEncryptionKey(defaultValue, retry = 1) {
         let appConfig = (0, find_1.default)(this.marketplaceApps, ({ configuration, server_configuration }) => !(0, isEmpty_1.default)(configuration) || !(0, isEmpty_1.default)(server_configuration));
         if (!appConfig) {
@@ -151,8 +153,10 @@ class ImportMarketplaceApps extends base_class_1.default {
         return encryptionKey;
     }
     /**
-     * @method handleAllPrivateAppsCreationProcess
-     * @returns {Promise<void>}
+     * The function `handleAllPrivateAppsCreationProcess` handles the creation process for all private
+     * apps in a developer hub, including checking for existing apps, getting confirmation from the user,
+     * and creating the apps if necessary.
+     * @returns a Promise that resolves to void.
      */
     async handleAllPrivateAppsCreationProcess() {
         const privateApps = (0, filter_1.default)(this.marketplaceApps, { manifest: { visibility: 'private' } });
@@ -162,66 +166,137 @@ class ImportMarketplaceApps extends base_class_1.default {
         await (0, utils_1.getConfirmationToCreateApps)(privateApps, this.importConfig);
         (0, utils_1.log)(this.importConfig, 'Starting developer hub private apps re-creation', 'success');
         for (let app of privateApps) {
+            if (this.importConfig.skipPrivateAppRecreationIfExist && (await this.isPrivateAppExistInDeveloperHub(app))) {
+                // NOTE Found app already exist in the same org
+                this.appUidMapping[app.uid] = app.uid;
+                cli_utilities_1.cliux.print(`App '${app.manifest.name}' already exist. skipping app recreation.!`, { color: 'yellow' });
+                continue;
+            }
             // NOTE keys can be passed to install new app in the developer hub
-            app.manifest = (0, pick_1.default)(app.manifest, ['uid', 'name', 'description', 'icon', 'target_type', 'webhook', 'oauth']);
-            this.appOriginalName = app.manifest.name;
-            const obj = {
-                oauth: app.oauth,
-                webhook: app.webhook,
-                ui_location: app.ui_location,
-            };
-            await this.createPrivateApps(Object.assign(Object.assign({}, obj), app.manifest));
+            const validKeys = [
+                'uid',
+                'name',
+                'icon',
+                'oauth',
+                'webhook',
+                'visibility',
+                'target_type',
+                'description',
+                'ui_location',
+                'framework_version',
+            ];
+            const manifest = (0, pick_1.default)(app.manifest, validKeys);
+            this.appOriginalName = manifest.name;
+            await this.createPrivateApp(manifest);
         }
         this.appOriginalName = undefined;
     }
-    async createPrivateApps(app, uidCleaned = false, appSuffix = 1) {
-        var _a;
-        let locations = (_a = app === null || app === void 0 ? void 0 : app.ui_location) === null || _a === void 0 ? void 0 : _a.locations;
-        if (!uidCleaned && !(0, isEmpty_1.default)(locations)) {
-            app.ui_location.locations = await this.updateManifestUILocations(locations, 'uid');
-        }
-        else if (uidCleaned && !(0, isEmpty_1.default)(locations)) {
-            app.ui_location.locations = await this.updateManifestUILocations(locations, 'name', appSuffix);
+    /**
+     * The function checks if a private app exists in the developer hub.
+     * @param {App} app - The `app` parameter is an object representing an application. It likely has
+     * properties such as `uid` which is a unique identifier for the app.
+     * @returns a boolean value. It returns true if the installation object is not empty, and false if
+     * the installation object is empty.
+     */
+    async isPrivateAppExistInDeveloperHub(app) {
+        const installation = await this.appSdk
+            .marketplace(this.importConfig.org_uid)
+            .installation(app.uid)
+            .fetch()
+            .catch(() => { }); // NOTE Keeping this to avoid Unhandled exception
+        return !(0, isEmpty_1.default)(installation);
+    }
+    /**
+     * The function creates a private app in a marketplace, with an optional suffix for the app name and
+     * an option to update the UI location.
+     * @param {Manifest} app - The `app` parameter is an object that represents the manifest of the app
+     * being created. It contains various properties such as `name`, `ui_location`, and `uid`.
+     * @param [appSuffix=1] - The appSuffix parameter is an optional parameter that specifies a suffix to
+     * be added to the app's UI location. It is used when updating the UI location of the app.
+     * @param [updateUiLocation=false] - A boolean value indicating whether to update the UI location of
+     * the app.
+     * @returns the result of the `appCreationCallback` function, which takes in the `app`, `response`,
+     * and `appSuffix` as arguments.
+     */
+    async createPrivateApp(app, appSuffix = 1, updateUiLocation = false) {
+        var _a, _b;
+        if (updateUiLocation && !(0, isEmpty_1.default)((_a = app === null || app === void 0 ? void 0 : app.ui_location) === null || _a === void 0 ? void 0 : _a.locations)) {
+            app.ui_location.locations = this.updateManifestUILocations((_b = app === null || app === void 0 ? void 0 : app.ui_location) === null || _b === void 0 ? void 0 : _b.locations, appSuffix);
         }
-        if (app.name > 20) {
+        if (app.name.length > 20) {
             app.name = app.name.slice(0, 20);
         }
-        const response = await (0, utils_1.createPrivateApp)(this.sdkClient, this.importConfig, app);
+        const response = await this.appSdk
+            .marketplace(this.importConfig.org_uid)
+            .app()
+            .create((0, omit_1.default)(app, ['uid']))
+            .catch((error) => error);
         return this.appCreationCallback(app, response, appSuffix);
     }
-    async updateManifestUILocations(locations, type = 'uid', appSuffix = 1) {
-        switch (type) {
-            case 'uid':
-                return (0, map_1.default)(locations, (location) => {
-                    if (location.meta) {
-                        location.meta = (0, map_1.default)(location.meta, (meta) => (0, omit_1.default)(meta, ['uid']));
+    /**
+     * The function installs an app from a marketplace onto a target stack.
+     * @param {ImportConfig} config - The `config` parameter is an object that contains the configuration
+     * for the installation. It likely includes information such as the target stack UID and other
+     * relevant details.
+     * @param {string} [appManifestUid] - The `appManifestUid` parameter is the unique identifier of the
+     * app manifest. It is used to specify which app to install from the marketplace.
+     * @returns a Promise that resolves to an object.
+     */
+    async installApp(config, appManifestUid) {
+        return await this.appSdk
+            .marketplace(this.importConfig.org_uid)
+            .app(appManifestUid)
+            .install({ targetUid: config.target_stack, targetType: 'stack' })
+            .catch((error) => error);
+    }
+    /**
+     * The function updates the names of locations in a manifest UI based on a given app suffix.
+     * @param {any} locations - An array of objects representing different locations in a manifest file.
+     * Each object has a "meta" property which is an array of objects representing metadata for that
+     * location.
+     * @param [appSuffix=1] - The `appSuffix` parameter is an optional parameter that specifies a suffix
+     * to be added to the app name. It is set to 1 by default.
+     * @returns The function `updateManifestUILocations` returns an updated array of `locations`.
+     */
+    updateManifestUILocations(locations, appSuffix = 1) {
+        return (0, map_1.default)(locations, (location, index) => {
+            if (location.meta) {
+                location.meta = (0, map_1.default)(location.meta, (meta) => {
+                    if (meta.name && this.appOriginalName == meta.name) {
+                        const name = (0, interactive_1.getAppName)((0, first_1.default)((0, split_1.default)(meta.name, '◈')), appSuffix);
+                        if (!this.appNameMapping[this.appOriginalName]) {
+                            this.appNameMapping[this.appOriginalName] = name;
+                        }
+                        meta.name = name;
                     }
-                    return location;
-                });
-            case 'name':
-                return (0, map_1.default)(locations, (location) => {
-                    if (location.meta) {
-                        location.meta = (0, map_1.default)(location.meta, (meta) => {
-                            if (meta.name) {
-                                const name = `${(0, first_1.default)((0, split_1.default)(meta.name, '◈'))}◈${appSuffix}`;
-                                if (!this.appNameMapping[this.appOriginalName]) {
-                                    this.appNameMapping[this.appOriginalName] = name;
-                                }
-                                meta.name = name;
-                            }
-                            return meta;
-                        });
+                    else if (meta.name) {
+                        meta.name = (0, interactive_1.getAppName)((0, first_1.default)((0, split_1.default)(meta.name, '◈')), appSuffix + (+index + 1));
                     }
-                    return location;
+                    return meta;
                 });
-        }
+            }
+            return location;
+        });
     }
+    /**
+     * The function `appCreationCallback` handles the creation of a new app and handles any conflicts or
+     * errors that may occur during the process.
+     * @param {any} app - The `app` parameter is an object representing the app that is being created. It
+     * contains various properties such as `uid` (unique identifier), `name`, and other app-specific
+     * details.
+     * @param {any} response - The `response` parameter is an object that contains the response received
+     * from an API call. It may have properties such as `statusText` and `message`.
+     * @param {number} appSuffix - The `appSuffix` parameter is a number that is used to generate a
+     * unique suffix for the app name in case of a name conflict. It is incremented each time a name
+     * conflict occurs to ensure that the new app name is unique.
+     * @returns a Promise.
+     */
     async appCreationCallback(app, response, appSuffix) {
         const { statusText, message } = response || {};
         if (message) {
             if ((0, toLower_1.default)(statusText) === 'conflict') {
                 const updatedApp = await (0, utils_1.handleNameConflict)(app, appSuffix, this.importConfig);
-                return this.createPrivateApps(updatedApp, true, appSuffix + 1);
+                return this.createPrivateApp(updatedApp, appSuffix + 1, true);
             }
             else {
                 (0, log_1.trace)(response, 'error', true);
@@ -251,19 +326,19 @@ class ImportMarketplaceApps extends base_class_1.default {
      * @returns {Promise<void>}
      */
     async installApps(app) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         let updateParam;
         const { configuration, server_configuration } = app;
         const currentStackApp = (0, find_1.default)(this.installedApps, { manifest: { uid: (_a = app === null || app === void 0 ? void 0 : app.manifest) === null || _a === void 0 ? void 0 : _a.uid } });
         if (!currentStackApp) {
             // NOTE install new app
-            const mappedUid = this.appUidMapping[(_b = app === null || app === void 0 ? void 0 : app.manifest) === null || _b === void 0 ? void 0 : _b.uid];
-            const installation = await (0, utils_1.installApp)(this.sdkClient, this.importConfig, (_c = app === null || app === void 0 ? void 0 : app.manifest) === null || _c === void 0 ? void 0 : _c.uid, mappedUid);
+            const installation = await this.installApp(this.importConfig, 
+            // NOTE if it's private app it should get uid from mapper else will use manifest uid
+            this.appUidMapping[app.manifest.uid] || app.manifest.uid);
             if (installation.installation_uid) {
-                const appManifestName = (_d = app === null || app === void 0 ? void 0 : app.manifest) === null || _d === void 0 ? void 0 : _d.name;
-                const appName = this.appNameMapping[appManifestName] ? this.appNameMapping[appManifestName] : appManifestName;
+                const appName = (_b = this.appNameMapping[app.manifest.name]) !== null && _b !== void 0 ? _b : app.manifest.name;
                 (0, utils_1.log)(this.importConfig, `${appName} app installed successfully.!`, 'success');
-                await (0, utils_1.makeRedirectUrlCall)(installation, appManifestName, this.importConfig);
+                await (0, utils_1.makeRedirectUrlCall)(installation, appName, this.importConfig);
                 this.installationUidMapping[app.uid] = installation.installation_uid;
                 updateParam = Object.assign(Object.assign({ manifest: app.manifest }, installation), { configuration, server_configuration });
             }
@@ -285,42 +360,51 @@ class ImportMarketplaceApps extends base_class_1.default {
         }
     }
     /**
-     * @method updateAppsConfig
-     * @returns {Promise<void>}
+     * The `updateAppsConfig` function updates the configuration and server configuration of an app in a
+     * marketplace.
+     * @param {Installation} app - The `app` parameter is an object that represents an installation of an
+     * app. It contains the following properties:
      */
     async updateAppsConfig(app) {
-        const payload = { configuration: {}, server_configuration: {} };
-        const { uid, configuration, server_configuration } = app;
+        const { installation_uid, configuration, server_configuration } = app;
         if (!(0, isEmpty_1.default)(configuration)) {
-            payload['configuration'] = this.nodeCrypto.decrypt(configuration);
+            await this.appSdk
+                .marketplace(this.importConfig.org_uid)
+                .installation(installation_uid)
+                .setConfiguration(this.nodeCrypto.decrypt(configuration))
+                .then(({ data }) => {
+                if (data === null || data === void 0 ? void 0 : data.message) {
+                    (0, log_1.trace)(data, 'error', true);
+                    (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(data.message), 'success');
+                }
+                else {
+                    (0, utils_1.log)(this.importConfig, `${app.manifest.name} app config updated successfully.!`, 'success');
+                }
+            })
+                .catch((error) => {
+                (0, log_1.trace)(error, 'error', true);
+                (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(error), 'error');
+            });
         }
         if (!(0, isEmpty_1.default)(server_configuration)) {
-            payload['server_configuration'] = this.nodeCrypto.decrypt(server_configuration);
-        }
-        if ((0, isEmpty_1.default)(app) || (0, isEmpty_1.default)(payload) || !uid) {
-            return Promise.resolve();
+            await this.appSdk
+                .marketplace(this.importConfig.org_uid)
+                .installation(installation_uid)
+                .setServerConfig(this.nodeCrypto.decrypt(server_configuration))
+                .then(({ data }) => {
+                if (data === null || data === void 0 ? void 0 : data.message) {
+                    (0, log_1.trace)(data, 'error', true);
+                    (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(data.message), 'error');
+                }
+                else {
+                    (0, utils_1.log)(this.importConfig, `${app.manifest.name} app server config updated successfully.!`, 'info');
+                }
+            })
+                .catch((error) => {
+                (0, log_1.trace)(error, 'error', true);
+                (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(error), 'error');
+            });
         }
-        // TODO migrate this HTTP API call into SDK
-        // NOTE Use updateAppConfig(this.sdkClient, this.importConfig, app, payload) utility when migrating to SDK call;
-        return this.appSdkAxiosInstance.axiosInstance
-            .put(`${this.developerHubBaseUrl}/installations/${uid}`, payload, {
-            headers: {
-                organization_uid: this.importConfig.org_uid,
-            },
-        })
-            .then(({ data }) => {
-            if (data === null || data === void 0 ? void 0 : data.message) {
-                (0, log_1.trace)(data, 'error', true);
-                (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(data.message), 'success');
-            }
-            else {
-                (0, utils_1.log)(this.importConfig, `${app.manifest.name} app config updated successfully.!`, 'success');
-            }
-        })
-            .catch((error) => {
-            (0, log_1.trace)(error, 'error', true);
-            (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(error), 'error');
-        });
     }
 }
 exports.default = ImportMarketplaceApps;

package/lib/import/modules/workflows.js

@@ -147,6 +147,7 @@ class ImportWorkflows extends base_class_1.default {
             name: workflow.name,
             branches: workflow.branches,
             workflow_stages: newWorkflowStages,
+            content_types: workflow.content_types
         });
         return updateWorkflow.update();
     }

package/lib/import/modules-js/marketplace-apps.js

@@ -38,6 +38,7 @@ module.exports = class ImportMarketplaceApps {
             return Promise.resolve();
         }
         this.developerHubBaseUrl = this.config.developerHubBaseUrl || (await getDeveloperHubUrl(this.config));
+        this.config.developerHubBaseUrl = this.developerHubBaseUrl;
         this.client = await managementSDKClient({ endpoint: this.developerHubBaseUrl });
         this.appSdkAxiosInstance = await managementSDKClient({
             host: this.developerHubBaseUrl.split('://').pop()
@@ -122,7 +123,7 @@ module.exports = class ImportMarketplaceApps {
         }
         // NOTE install all private apps which is not available for stack.
         await this.handleAllPrivateAppsCreationProcess();
-        const installedApps = await getAllStackSpecificApps(this.developerHubBaseUrl, this.httpClient, this.config);
+        const installedApps = await getAllStackSpecificApps(this.config);
         log(this.config, 'Starting marketplace app installation', 'success');
         for (let app of this.marketplaceApps) {
             await this.installApps(app, installedApps);
@@ -139,7 +140,7 @@ module.exports = class ImportMarketplaceApps {
         const listOfNewMeta = [];
         const listOfOldMeta = [];
         const extensionUidMap = {};
-        const allInstalledApps = (await getAllStackSpecificApps(this.developerHubBaseUrl, this.httpClient, this.config)) || [];
+        const allInstalledApps = (await getAllStackSpecificApps(this.config)) || [];
         for (const app of this.marketplaceApps) {
             listOfOldMeta.push(..._.map((_a = app === null || app === void 0 ? void 0 : app.ui_location) === null || _a === void 0 ? void 0 : _a.locations, 'meta').flat());
         }

package/lib/import/modules-js/workflows.js

@@ -163,6 +163,7 @@ module.exports = class importWorkflows {
             name: workflow.name,
             branches: workflow.branches,
             workflow_stages: newWorkflowStages,
+            content_types: workflow.content_types
         });
         return updateWorkflow.update();
     }

package/lib/types/import-config.d.ts

@@ -14,6 +14,7 @@ export default interface ImportConfig extends DefaultConfig, ExternalConfig {
     management_token?: string;
     apiKey: string;
     forceStopMarketplaceAppsPrompt: boolean;
+    skipPrivateAppRecreationIfExist: boolean;
     auth_token?: string;
     branchName?: string;
     securedAssets?: boolean;

package/lib/types/index.d.ts

@@ -73,3 +73,4 @@ export interface TermsConfig {
 export { default as DefaultConfig } from './default-config';
 export { default as ImportConfig } from './import-config';
 export * from './entries';
+export * from './marketplace-app';

package/lib/types/index.js

@@ -2,3 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./entries"), exports);
+tslib_1.__exportStar(require("./marketplace-app"), exports);

package/lib/types/marketplace-app.d.ts

@@ -0,0 +1,54 @@
+type AppLocation = 'cs.cm.stack.config' | 'cs.cm.stack.dashboard' | 'cs.cm.stack.sidebar' | 'cs.cm.stack.custom_field' | 'cs.cm.stack.rte' | 'cs.cm.stack.asset_sidebar' | 'cs.org.config';
+interface ExtensionMeta {
+    uid?: string;
+    name?: string;
+    description?: string;
+    path?: string;
+    signed: boolean;
+    extension_uid?: string;
+    data_type?: string;
+    enabled?: boolean;
+    width?: number;
+    blur?: boolean;
+    default_width?: 'full' | 'half';
+}
+interface Extension {
+    type: AppLocation;
+    meta: ExtensionMeta[];
+}
+interface LocationConfiguration {
+    signed: boolean;
+    base_url: string;
+    locations: Extension[];
+}
+interface AnyProperty {
+    [propName: string]: any;
+}
+type Manifest = {
+    uid: string;
+    name: string;
+    icon?: string;
+    hosting?: any;
+    version?: number;
+    description: string;
+    organization_uid: string;
+    framework_version?: string;
+    oauth?: any;
+    webhook?: any;
+    ui_location: LocationConfiguration;
+    target_type: 'stack' | 'organization';
+    visibility: 'private' | 'public' | 'public_unlisted';
+} & AnyProperty;
+type Installation = {
+    uid: string;
+    status: string;
+    manifest: Manifest;
+    configuration: any;
+    server_configuration: any;
+    target: {
+        type: string;
+        uid: string;
+    };
+    ui_location: LocationConfiguration;
+} & AnyProperty;
+export { Installation, Manifest };

package/lib/types/marketplace-app.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/utils/asset-helper.js

@@ -234,7 +234,8 @@ const lookupAssets = function (data, mappedAssetUids, mappedAssetUrls, assetUidM
     assetUrls.forEach(function (assetUrl) {
         let mappedAssetUrl = mappedAssetUrls[assetUrl];
         if (typeof mappedAssetUrl !== 'undefined') {
-            entry = entry.replace(new RegExp(assetUrl, 'img'), mappedAssetUrl);
+            const escapedAssetUrl = assetUrl.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+            entry = entry.replace(new RegExp(escapedAssetUrl, 'img'), mappedAssetUrl);
             matchedUrls.push(mappedAssetUrl);
         }
         else {
@@ -244,7 +245,8 @@ const lookupAssets = function (data, mappedAssetUids, mappedAssetUrls, assetUidM
     assetUids.forEach(function (assetUid) {
         let uid = mappedAssetUids[assetUid];
         if (typeof uid !== 'undefined') {
-            entry = entry.replace(new RegExp(assetUid, 'img'), uid);
+            const escapedAssetUid = assetUid.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+            entry = entry.replace(new RegExp(escapedAssetUid, 'img'), uid);
             matchedUids.push(assetUid);
         }
         else {

package/lib/utils/entries-helper.js

@@ -198,10 +198,8 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
     let entry = JSON.stringify(data.entry);
     uids.forEach(function (uid) {
         if (mappedUids.hasOwnProperty(uid)) {
-            // NOTE g: matches the pattern multiple times
-            // NOTE i: makes the regex case insensitive
-            // NOTE m: enables multi-line mode. Where ^ and $ match the start and end of the entire string. Without this, multi-line strings match the beginning and end of each line.
-            entry = entry.replace(new RegExp(uid, 'img'), mappedUids[uid]);
+            const escapedUid = uid.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+            entry = entry.replace(new RegExp(escapedUid, 'img'), mappedUids[uid]);
             mapped.push(uid);
         }
         else {

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

@@ -62,6 +62,7 @@ const setupConfig = async (importCmdFlags) => {
     config.source_stack = config.apiKey;
     config.importWebhookStatus = importCmdFlags['import-webhook-status'];
     config.forceStopMarketplaceAppsPrompt = importCmdFlags.yes;
+    config.skipPrivateAppRecreationIfExist = importCmdFlags['skip-app-recreation'];
     if (importCmdFlags['branch']) {
         config.branchName = importCmdFlags['branch'];
         config.branchDir = path.join(config.contentDir, config.branchName);

package/lib/utils/index.d.ts

@@ -5,7 +5,7 @@ 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, handleNameConflict, makeRedirectUrlCall, confirmToCloseProcess, getAllStackSpecificApps, ifAppAlreadyExist, } from './marketplace-app-helper';
 export { schemaTemplate, suppressSchemaReference, removeReferenceFields } from './content-type-helper';
 export { lookupExtension } from './extension-helper';
 export { lookupEntries, removeUidsFromJsonRteFields, removeEntryRefsFromJSONRTE, restoreJsonRteEntryRefs, } from './entries-helper';

package/lib/utils/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lookUpTerms = exports.lookUpTaxonomy = 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;
+exports.lookUpTerms = exports.lookUpTaxonomy = exports.restoreJsonRteEntryRefs = exports.removeEntryRefsFromJSONRTE = exports.removeUidsFromJsonRteFields = exports.lookupEntries = exports.lookupExtension = exports.removeReferenceFields = exports.suppressSchemaReference = exports.schemaTemplate = exports.ifAppAlreadyExist = exports.getAllStackSpecificApps = exports.confirmToCloseProcess = exports.makeRedirectUrlCall = exports.handleNameConflict = 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");
@@ -20,14 +20,11 @@ var marketplace_app_helper_1 = require("./marketplace-app-helper");
 Object.defineProperty(exports, "getDeveloperHubUrl", { enumerable: true, get: function () { return marketplace_app_helper_1.getDeveloperHubUrl; } });
 Object.defineProperty(exports, "getOrgUid", { enumerable: true, get: function () { return marketplace_app_helper_1.getOrgUid; } });
 Object.defineProperty(exports, "getConfirmationToCreateApps", { enumerable: true, get: function () { return marketplace_app_helper_1.getConfirmationToCreateApps; } });
-Object.defineProperty(exports, "createPrivateApp", { enumerable: true, get: function () { return marketplace_app_helper_1.createPrivateApp; } });
 Object.defineProperty(exports, "handleNameConflict", { enumerable: true, get: function () { return marketplace_app_helper_1.handleNameConflict; } });
-Object.defineProperty(exports, "installApp", { enumerable: true, get: function () { return marketplace_app_helper_1.installApp; } });
 Object.defineProperty(exports, "makeRedirectUrlCall", { enumerable: true, get: function () { return marketplace_app_helper_1.makeRedirectUrlCall; } });
 Object.defineProperty(exports, "confirmToCloseProcess", { enumerable: true, get: function () { return marketplace_app_helper_1.confirmToCloseProcess; } });
 Object.defineProperty(exports, "getAllStackSpecificApps", { enumerable: true, get: function () { return marketplace_app_helper_1.getAllStackSpecificApps; } });
 Object.defineProperty(exports, "ifAppAlreadyExist", { enumerable: true, get: function () { return marketplace_app_helper_1.ifAppAlreadyExist; } });
-Object.defineProperty(exports, "updateAppConfig", { enumerable: true, get: function () { return marketplace_app_helper_1.updateAppConfig; } });
 var content_type_helper_1 = require("./content-type-helper");
 Object.defineProperty(exports, "schemaTemplate", { enumerable: true, get: function () { return content_type_helper_1.schemaTemplate; } });
 Object.defineProperty(exports, "suppressSchemaReference", { enumerable: true, get: function () { return content_type_helper_1.suppressSchemaReference; } });

package/lib/utils/marketplace-app-helper.d.ts

@@ -1,16 +1,9 @@
-import { HttpClient, ContentstackClient } from '@contentstack/cli-utilities';
-import { ImportConfig } from '../types';
-export declare const getAllStackSpecificApps: (developerHubBaseUrl: string, httpClient: HttpClient, config: ImportConfig) => Promise<any>;
+import { ImportConfig, Installation } from '../types';
+export declare const getAllStackSpecificApps: (config: ImportConfig, skip?: number, listOfApps?: Installation[]) => Promise<Installation[]>;
 export declare const getDeveloperHubUrl: (config: ImportConfig) => Promise<string>;
 export declare const getOrgUid: (config: ImportConfig) => Promise<string>;
 export declare const getConfirmationToCreateApps: (privateApps: any, config: ImportConfig) => Promise<boolean>;
-export declare const createPrivateApp: (client: ContentstackClient, config: ImportConfig, app: any) => Promise<any>;
-export declare const installApp: (client: ContentstackClient, config: ImportConfig, appManifestUid?: string, mappedUid?: string) => Promise<any>;
 export declare const handleNameConflict: (app: any, appSuffix: number, config: ImportConfig) => Promise<any>;
 export declare const makeRedirectUrlCall: (response: any, appName: string, config: ImportConfig) => Promise<void>;
 export declare const confirmToCloseProcess: (installation: any, config: ImportConfig) => Promise<void>;
 export declare const ifAppAlreadyExist: (app: any, currentStackApp: any, config: ImportConfig) => Promise<{}>;
-export declare const updateAppConfig: (client: ContentstackClient, config: ImportConfig, app: any, payload: {
-    configuration: Record<string, unknown>;
-    server_configuration: Record<string, unknown>;
-}) => Promise<any>;

package/lib/utils/marketplace-app-helper.js

@@ -1,33 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateAppConfig = exports.ifAppAlreadyExist = exports.confirmToCloseProcess = exports.makeRedirectUrlCall = exports.handleNameConflict = exports.installApp = exports.createPrivateApp = exports.getConfirmationToCreateApps = exports.getOrgUid = exports.getDeveloperHubUrl = exports.getAllStackSpecificApps = void 0;
+exports.ifAppAlreadyExist = exports.confirmToCloseProcess = exports.makeRedirectUrlCall = exports.handleNameConflict = exports.getConfirmationToCreateApps = exports.getOrgUid = exports.getDeveloperHubUrl = exports.getAllStackSpecificApps = void 0;
 const tslib_1 = require("tslib");
-const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const map_1 = tslib_1.__importDefault(require("lodash/map"));
-const omit_1 = tslib_1.__importDefault(require("lodash/omit"));
+const omitBy_1 = tslib_1.__importDefault(require("lodash/omitBy"));
+const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const includes_1 = tslib_1.__importDefault(require("lodash/includes"));
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const logger_1 = require("./logger");
 const log_1 = require("../utils/log");
 const utils_1 = require("../utils");
 const interactive_1 = require("./interactive");
 const interactive_2 = require("../utils/interactive");
-const getAllStackSpecificApps = async (developerHubBaseUrl, httpClient, config) => {
-    const appSdkAxiosInstance = await (0, cli_utilities_1.managementSDKClient)({
-        host: developerHubBaseUrl.split('://').pop(),
+const getAllStackSpecificApps = async (config, skip = 0, listOfApps = []) => {
+    const appSdk = await (0, cli_utilities_1.marketplaceSDKClient)({
+        host: config.developerHubBaseUrl.split('://').pop(),
     });
-    return await appSdkAxiosInstance.axiosInstance
-        .get(`${developerHubBaseUrl}/installations?target_uids=${config.target_stack}`, {
-        headers: {
-            organization_uid: config.org_uid,
-        },
-    })
-        .then(({ data }) => data.data)
+    const collection = await appSdk
+        .marketplace(config.org_uid)
+        .installation()
+        .fetchAll({ target_uids: config.target_stack, skip })
         .catch((error) => {
         (0, log_1.trace)(error, 'error', true);
         (0, logger_1.log)(config, `Failed to export marketplace-apps ${(0, utils_1.formatError)(error)}`, 'error');
     });
+    if (collection) {
+        const { items: apps, count } = collection;
+        // NOTE Remove all the chain functions
+        const installation = (0, map_1.default)(apps, (app) => (0, omitBy_1.default)(app, (val, _key) => {
+            if (val instanceof Function)
+                return true;
+            return false;
+        }));
+        listOfApps = listOfApps.concat(installation);
+        if (count - (skip + 50) > 0) {
+            return await (0, exports.getAllStackSpecificApps)(config, skip + 50, listOfApps);
+        }
+    }
+    return listOfApps;
 };
 exports.getAllStackSpecificApps = getAllStackSpecificApps;
 const getDeveloperHubUrl = async (config) => {
@@ -64,24 +75,6 @@ const getConfirmationToCreateApps = async (privateApps, config) => {
     }
 };
 exports.getConfirmationToCreateApps = getConfirmationToCreateApps;
-const createPrivateApp = async (client, config, app) => {
-    const privateApp = (0, omit_1.default)(app, ['uid']);
-    return await client
-        .organization(config.org_uid)
-        .app()
-        .create(privateApp)
-        .catch((error) => error);
-};
-exports.createPrivateApp = createPrivateApp;
-const installApp = async (client, config, appManifestUid, mappedUid) => {
-    const appUid = mappedUid || appManifestUid;
-    return await client
-        .organization(config.org_uid)
-        .app(appUid)
-        .install({ targetUid: config.target_stack, targetType: 'stack' })
-        .catch((error) => error);
-};
-exports.installApp = installApp;
 const handleNameConflict = async (app, appSuffix, config) => {
     const appName = config.forceStopMarketplaceAppsPrompt
         ? (0, interactive_2.getAppName)(app.name, appSuffix)
@@ -142,19 +135,3 @@ const ifAppAlreadyExist = async (app, currentStackApp, config) => {
     return updateParam;
 };
 exports.ifAppAlreadyExist = ifAppAlreadyExist;
-const updateAppConfig = async (client, config, app, payload) => {
-    var _a;
-    let installation = client.organization(config.org_uid).app((_a = app === null || app === void 0 ? void 0 : app.manifest) === null || _a === void 0 ? void 0 : _a.uid).installation(app === null || app === void 0 ? void 0 : app.uid);
-    installation = Object.assign(installation, payload);
-    return await installation
-        .update()
-        .then((data) => {
-        var _a;
-        (0, logger_1.log)(config, `${(_a = app === null || app === void 0 ? void 0 : app.manifest) === null || _a === void 0 ? void 0 : _a.name} app config updated successfully.!`, 'success');
-    })
-        .catch((error) => {
-        (0, log_1.trace)(error, 'error', true);
-        (0, logger_1.log)(config, `Failed to update app config.${(0, utils_1.formatError)(error)}`, 'error');
-    });
-};
-exports.updateAppConfig = updateAppConfig;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.12.1",
+  "version": "1.12.2",
   "commands": {
     "cm:stacks:import": {
       "id": "cm:stacks:import",
@@ -123,6 +123,12 @@
           "required": false,
           "allowNo": false
         },
+        "skip-app-recreation": {
+          "name": "skip-app-recreation",
+          "type": "boolean",
+          "description": "[optional] Skip private apps recreation if already exist",
+          "allowNo": false
+        },
         "replace-existing": {
           "name": "replace-existing",
           "type": "boolean",

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.12.1",
+  "version": "1.12.2",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.2.16",
-    "@contentstack/cli-utilities": "~1.5.8",
-    "@contentstack/management": "~1.12.0",
+    "@contentstack/cli-utilities": "~1.5.9",
+    "@contentstack/management": "~1.13.0",
     "@oclif/core": "^2.9.3",
     "axios": "^1.6.0",
     "big-json": "^3.2.0",