@contentstack/apps-cli 1.3.1 → 1.3.2

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g @contentstack/apps-cli
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/apps-cli/1.3.1 darwin-arm64 node-v18.20.2
+@contentstack/apps-cli/1.3.2 darwin-arm64 node-v18.20.2
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -69,7 +69,7 @@ EXAMPLES
   $ csdx app:update
 ```
 
-_See code: [src/commands/app/index.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/index.ts)_
+_See code: [src/commands/app/index.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/index.ts)_
 
 ## `csdx app:create`
 
@@ -109,7 +109,7 @@ EXAMPLES
   $ csdx app:create --name App-4 --app-type organization --org <UID> --boilerplate <Ecommerce App Boilerplate>
 ```
 
-_See code: [src/commands/app/create.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/create.ts)_
+_See code: [src/commands/app/create.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/create.ts)_
 
 ## `csdx app:delete`
 
@@ -134,7 +134,7 @@ EXAMPLES
   $ csdx app:delete --app-uid <value> --org <value> -d ./boilerplate
 ```
 
-_See code: [src/commands/app/delete.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/delete.ts)_
+_See code: [src/commands/app/delete.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/delete.ts)_
 
 ## `csdx app:deploy`
 
@@ -172,7 +172,7 @@ EXAMPLES
   $ csdx app:deploy --org <UID> --app-uid <APP-UID-1> --hosting-type <Hosting with Launch> --launch-project <new> --config <config-path>
 ```
 
-_See code: [src/commands/app/deploy.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/deploy.ts)_
+_See code: [src/commands/app/deploy.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/deploy.ts)_
 
 ## `csdx app:get`
 
@@ -202,7 +202,7 @@ EXAMPLES
   $ csdx app:get --org <value> --app-uid <value> --app-type organization
 ```
 
-_See code: [src/commands/app/get.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/get.ts)_
+_See code: [src/commands/app/get.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/get.ts)_
 
 ## `csdx app:install`
 
@@ -228,7 +228,7 @@ EXAMPLES
   $ csdx app:install --org <UID> --app-uid <APP-UID-1> --stack-api-key <STACK-API-KEY-1>
 ```
 
-_See code: [src/commands/app/install.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/install.ts)_
+_See code: [src/commands/app/install.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/install.ts)_
 
 ## `csdx app:reinstall`
 
@@ -254,7 +254,7 @@ EXAMPLES
   $ csdx app:reinstall --org <UID> --app-uid <APP-UID-1> --stack-api-key <STACK-API-KEY-1>
 ```
 
-_See code: [src/commands/app/reinstall.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/reinstall.ts)_
+_See code: [src/commands/app/reinstall.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/reinstall.ts)_
 
 ## `csdx app:uninstall`
 
@@ -281,7 +281,7 @@ EXAMPLES
   $ csdx app:uninstall --org <UID> --app-uid <APP-UID-1> --installation-uid <INSTALLATION-UID-1>
 ```
 
-_See code: [src/commands/app/uninstall.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/uninstall.ts)_
+_See code: [src/commands/app/uninstall.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/uninstall.ts)_
 
 ## `csdx app:update`
 
@@ -304,5 +304,5 @@ EXAMPLES
   $ csdx app:update --app-manifest ./boilerplate/manifest.json
 ```
 
-_See code: [src/commands/app/update.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/update.ts)_
+_See code: [src/commands/app/update.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/update.ts)_
 <!-- commandsstop -->

package/lib/commands/app/create.js

@@ -25,6 +25,7 @@ class Create extends base_command_1.BaseCommand {
         };
     }
     async run() {
+        var _a;
         this.sharedConfig.org = this.flags.org;
         this.sharedConfig.appName = this.flags.name;
         this.sharedConfig.boilerplateName = this.flags.boilerplate;
@@ -44,6 +45,15 @@ class Create extends base_command_1.BaseCommand {
                 await this.boilerplateFlow();
             }
             else {
+                if (this.sharedConfig.folderPath === undefined) {
+                    const dataDir = (_a = this.flags["data-dir"]) !== null && _a !== void 0 ? _a : process.cwd();
+                    let targetPath = (0, path_1.resolve)(dataDir, this.sharedConfig.defaultAppName);
+                    if ((0, fs_1.existsSync)(targetPath)) {
+                        this.log(this.messages.DIR_EXIST, "warn");
+                        targetPath = await (0, util_1.getDirName)(targetPath);
+                    }
+                    this.sharedConfig.folderPath = targetPath;
+                }
                 this.manageManifestToggeling();
                 await this.registerTheAppOnDeveloperHub(false);
             }

package/lib/commands/app/deploy.js

@@ -195,7 +195,10 @@ class Deploy extends app_cli_base_command_1.AppCLIBaseCommand {
             if (!this.flags["yes"]) {
                 throw new Error(messages_1.deployAppMsg.APP_UPDATE_TERMINATION_MSG);
             }
-            await (0, util_2.disconnectApp)(this.flags, this.sharedConfig.org, this.developerHubBaseUrl);
+            await (0, util_2.disconnectApp)(this.flags, this.sharedConfig.org, {
+                marketplaceSdk: this.marketplaceAppSdk,
+                log: this.log,
+            });
         }
     }
 }

package/lib/commands/app/reinstall.js

@@ -65,12 +65,9 @@ class Reinstall extends app_cli_base_command_1.AppCLIBaseCommand {
                 type: appType,
                 target: this.flags["stack-api-key"] || this.sharedConfig.org,
             }), "info");
-            await (0, util_1.reinstallApp)({
-                flags: this.flags,
-                type: appType,
-                developerHubBaseUrl: this.developerHubBaseUrl,
-                orgUid: this.sharedConfig.org,
-                manifestUid: this.flags["app-uid"],
+            await (0, util_1.reinstallApp)(this.flags, this.sharedConfig.org, appType, {
+                marketplaceSdk: this.marketplaceAppSdk,
+                log: this.log,
             });
             this.log((0, messages_1.$t)(messages_1.reinstallAppMsg.APP_REINSTALLED_SUCCESSFULLY, {
                 app: (app === null || app === void 0 ? void 0 : app.name) || this.flags["app-uid"],
@@ -80,7 +77,7 @@ class Reinstall extends app_cli_base_command_1.AppCLIBaseCommand {
         }
         catch (error) {
             this.log((error === null || error === void 0 ? void 0 : error.errorMessage) || (error === null || error === void 0 ? void 0 : error.message) || error, "error");
-            process.exit(1);
+            this.exit(1);
         }
     }
     displayStackUrl() {

package/lib/util/common-utils.d.ts

@@ -16,14 +16,8 @@ declare function fetchApp(flags: FlagInput, orgUid: string, options: MarketPlace
 declare function fetchAppInstallations(flags: FlagInput, orgUid: string, options: CommonOptions): Promise<import("@contentstack/management/types/contentstackCollection").ContentstackCollection<import("@contentstack/management/types/app/installation").Installation>>;
 declare function deleteApp(flags: FlagInput, orgUid: string, options: MarketPlaceOptions): Promise<import("@contentstack/cli-utilities").App>;
 declare function installApp(flags: FlagInput, orgUid: string, type: string, options: MarketPlaceOptions): Promise<import("@contentstack/cli-utilities").Installation>;
-declare function reinstallApp(params: {
-    flags: FlagInput;
-    type: string;
-    developerHubBaseUrl: string;
-    orgUid: string;
-    manifestUid: string;
-}): Promise<void>;
-declare function fetchStack(flags: FlagInput, options: CommonOptions): Promise<import("@contentstack/management/types/stack").Stack>;
+declare function reinstallApp(flags: FlagInput, orgUid: string, type: string, options: MarketPlaceOptions): Promise<import("@contentstack/cli-utilities").Installation>;
+declare function fetchStack(flags: FlagInput, options: CommonOptions): Promise<any>;
 declare function getStacks(options: CommonOptions, orgUid: string, skip?: number, stacks?: Stack[]): Promise<Stack[]>;
 declare function uninstallApp(flags: FlagInput, orgUid: string, options: CommonOptions, installationUid: string): Promise<import("@contentstack/management/types/utility/fields").AnyProperty>;
 declare function fetchInstalledApps(flags: FlagInput, orgUid: string, options: MarketPlaceOptions): Promise<Record<string, any>[]>;
@@ -32,7 +26,7 @@ declare function updateApp(flags: FlagInput, orgUid: string, options: CommonOpti
 declare function getProjects(apolloClient: ApolloClient<any>): Promise<LaunchProjectRes[]>;
 declare function getManifestDetails(flags: FlagInput, orgUid: string, options: CommonOptions): import("@contentstack/management/types/app/hosting").Hosting;
 declare function setupConfig(configPath: string): Record<string, string>;
-declare function disconnectApp(flags: FlagInput, orgUid: string, developerHubBaseUrl: string): Promise<any>;
+declare function disconnectApp(flags: FlagInput, orgUid: string, options: MarketPlaceOptions): Promise<any>;
 declare function formatUrl(url: string): string;
 declare const handleProjectNameConflict: (projectName: string, projects: any[], retry?: number) => Promise<string>;
 declare function fetchBoilerplateDetails(): Promise<Record<string, any>[]>;

package/lib/util/common-utils.js

@@ -5,7 +5,6 @@ const tslib_1 = require("tslib");
 const map_1 = tslib_1.__importDefault(require("lodash/map"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
 const queries_1 = require("../graphql/queries");
-const api_request_handler_1 = require("./api-request-handler");
 const types_1 = require("../types");
 const inquirer_1 = require("./inquirer");
 const messages_1 = require("../messages");
@@ -114,25 +113,15 @@ function installApp(flags, orgUid, type, options) {
     });
 }
 exports.installApp = installApp;
-async function reinstallApp(params) {
-    const { type, developerHubBaseUrl, flags, orgUid, manifestUid } = params;
-    const payload = {
-        target_type: type,
-        target_uid: flags["stack-api-key"] || orgUid,
-    };
-    const url = `https://${developerHubBaseUrl}/manifests/${manifestUid}/reinstall`;
-    try {
-        const result = await (0, api_request_handler_1.apiRequestHandler)({
-            orgUid,
-            payload,
-            url,
-            method: "PUT",
-        });
-        return result;
-    }
-    catch (err) {
-        throw err;
-    }
+function reinstallApp(flags, orgUid, type, options) {
+    const { marketplaceSdk } = options;
+    return marketplaceSdk
+        .marketplace(orgUid)
+        .app(flags["app-uid"])
+        .reinstall({
+        targetUid: flags["stack-api-key"] || orgUid,
+        targetType: type,
+    });
 }
 exports.reinstallApp = reinstallApp;
 function fetchStack(flags, options) {
@@ -265,21 +254,13 @@ function setupConfig(configPath) {
     return configDetails;
 }
 exports.setupConfig = setupConfig;
-async function disconnectApp(flags, orgUid, developerHubBaseUrl) {
-    const appUid = flags["app-uid"];
-    const url = `https://${developerHubBaseUrl}/manifests/${appUid}/hosting/disconnect`;
-    try {
-        const result = await (0, api_request_handler_1.apiRequestHandler)({
-            orgUid,
-            payload: { provider: "launch" },
-            url,
-            method: "PATCH",
-        });
-        return result;
-    }
-    catch (err) {
-        throw err;
-    }
+async function disconnectApp(flags, orgUid, options) {
+    const { marketplaceSdk } = options;
+    return marketplaceSdk
+        .marketplace(orgUid)
+        .app(flags["app-uid"])
+        .hosting()
+        .disconnect({ provider: "launch" });
 }
 exports.disconnectApp = disconnectApp;
 function formatUrl(url) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/apps-cli",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "App ClI",
   "author": "Contentstack CLI",
   "homepage": "https://github.com/contentstack/contentstack-apps-cli",