@contentstack/cli-utilities 1.4.3 → 1.4.5

package/lib/auth-handler.js

@@ -102,7 +102,40 @@ class AuthHandler {
                             cli_ux_1.default.print('Access token fetched using auth code successfully.');
                             cli_ux_1.default.print(`You can review the access permissions on the page - ${this.OAuthBaseURL}/#!/marketplace/authorized-apps`);
                             res.writeHead(200, { 'Content-Type': 'text/html' });
-                            res.end(`<h1>Successfully authorized!</h1><h2>You can close this window now.</h2><p>You can review the access permissions on - <a href="${this.OAuthBaseURL}/#!/marketplace/authorized-apps" target="_blank">Authorized Apps page</a></p>`);
+                            res.end(`<style>
+                body {
+                  font-family: Arial, sans-serif;
+                  text-align: center;
+                  margin-top: 100px;
+                }
+              
+                p {
+                  color: #475161;
+                  margin-bottom: 20px;
+                }
+                p button {
+                  background-color: #6c5ce7;
+                  color: #fff;
+                  border: 1px solid transparent;
+                  border-radius: 4px;
+                  font-weight: 600;
+                  line-height: 100%;
+                  text-align: center;
+                  min-height: 2rem;
+                  padding: 0.3125rem 1rem;
+                }
+              </style>
+              <h1 style="color: #6c5ce7">Successfully authorized!</h1>
+              <p style="color: #475161; font-size: 16px; font-weight: 600">You can close this window now.</p>
+              <p>
+                You can review the access permissions on the
+                <a
+                  style="color: #6c5ce7; text-decoration: none"
+                  href="${this.OAuthBaseURL}/#!/marketplace/authorized-apps"
+                  target="_blank"
+                  >Authorized Apps page</a
+                >.
+              </p>`);
                             stopServer();
                         })
                             .catch((error) => {

package/lib/cli-ux.d.ts

@@ -0,0 +1,27 @@
+import { Table } from '@oclif/core/lib/cli-ux';
+import { Args, Flags, Command } from '@oclif/core';
+import { Ora } from 'ora';
+import { PrintOptions, InquirePayload, CliUXPromptOptions } from './interfaces';
+/**
+ * CLI Interface
+ */
+declare class CLIInterface {
+    private loading;
+    constructor();
+    get uxTable(): typeof Table.table;
+    init(context: any): void;
+    registerSearchPlugin(): void;
+    print(message: string, opts?: PrintOptions): void;
+    success(message: string): void;
+    error(message: string, ...params: any): void;
+    loader(message?: string): void;
+    table(data: Record<string, unknown>[], columns: Table.table.Columns<Record<string, unknown>>, options?: Table.table.Options): void;
+    inquire<T>(inquirePayload: InquirePayload | Array<InquirePayload>): Promise<T>;
+    prompt(name: string, options?: CliUXPromptOptions): Promise<any>;
+    confirm(message?: string): Promise<boolean>;
+    progress(options?: any): any;
+    loaderV2(message?: string, spinner?: any): Ora | void;
+}
+declare const _default: CLIInterface;
+export default _default;
+export { Flags, Args, Command };

package/lib/config-handler.js

@@ -5,6 +5,8 @@ const conf_1 = tslib_1.__importDefault(require("conf"));
 const has_1 = tslib_1.__importDefault(require("lodash/has"));
 const uuid_1 = require("uuid");
 const fs_1 = require("fs");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const _1 = require(".");
 const ENC_KEY = process.env.ENC_KEY || 'encryptionKey';
 const ENCRYPT_CONF = (0, has_1.default)(process.env, 'ENCRYPT_CONF') ? process.env.ENCRYPT_CONF === 'true' : true;
 const CONFIG_NAME = process.env.CONFIG_NAME || 'contentstack_cli';
@@ -72,10 +74,10 @@ class Config {
     getObfuscationKey() {
         const obfuscationKeyName = 'obfuscation_key';
         const encConfig = new conf_1.default({ configName: ENC_CONFIG_NAME });
-        let obfuscationKey = encConfig.get(obfuscationKeyName);
+        let obfuscationKey = encConfig === null || encConfig === void 0 ? void 0 : encConfig.get(obfuscationKeyName);
         if (!obfuscationKey) {
             encConfig.set(obfuscationKeyName, (0, uuid_1.v4)());
-            obfuscationKey = encConfig.get(obfuscationKeyName);
+            obfuscationKey = encConfig === null || encConfig === void 0 ? void 0 : encConfig.get(obfuscationKeyName);
         }
         return obfuscationKey;
     }
@@ -108,7 +110,9 @@ class Config {
                     this.getEncryptedConfig(oldConfigData, true);
                 }
                 catch (_error) {
-                    // console.trace(error.message)
+                    _1.cliux.print(chalk_1.default.red("Error: Config file is corrupted"));
+                    _1.cliux.print(_error);
+                    process.exit(1);
                 }
             }
         };
@@ -154,24 +158,31 @@ class Config {
                 }
                 catch (__error) {
                     // console.trace(error.message)
+                    _1.cliux.print(chalk_1.default.red("Error: Config file is corrupted"));
+                    _1.cliux.print(_error);
+                    process.exit(1);
                 }
             }
         }
         return this.config;
     }
     get(key) {
-        return this.config.get(key);
+        var _a;
+        return (_a = this.config) === null || _a === void 0 ? void 0 : _a.get(key);
     }
     async set(key, value) {
-        this.config.set(key, value);
+        var _a;
+        (_a = this.config) === null || _a === void 0 ? void 0 : _a.set(key, value);
         return this.config;
     }
     delete(key) {
-        this.config.delete(key);
+        var _a;
+        (_a = this.config) === null || _a === void 0 ? void 0 : _a.delete(key);
         return this.config;
     }
     clear() {
-        this.config.clear();
+        var _a;
+        (_a = this.config) === null || _a === void 0 ? void 0 : _a.clear();
     }
 }
 exports.default = new Config();

package/lib/helpers.d.ts

@@ -0,0 +1,2 @@
+export declare const isAuthenticated: () => boolean;
+export declare const doesBranchExist: (stack: any, branchName: any) => Promise<any>;

package/lib/helpers.js

@@ -1,7 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAuthenticated = void 0;
+exports.doesBranchExist = exports.isAuthenticated = void 0;
 const tslib_1 = require("tslib");
 const auth_handler_1 = tslib_1.__importDefault(require("./auth-handler"));
 const isAuthenticated = () => auth_handler_1.default.isAuthenticated();
 exports.isAuthenticated = isAuthenticated;
+const doesBranchExist = async (stack, branchName) => {
+    return stack
+        .branch(branchName)
+        .fetch()
+        .catch((error) => {
+        return error;
+    });
+};
+exports.doesBranchExist = doesBranchExist;

package/lib/http-client/base-client-decorator.d.ts

@@ -0,0 +1,13 @@
+import { HttpClient } from './client';
+import { IHttpClient } from './client-interface';
+import { HttpResponse } from './http-response';
+export declare class BaseClientDecorator implements IHttpClient {
+    protected client: IHttpClient;
+    constructor(client: IHttpClient);
+    headers(headers: any): HttpClient;
+    contentType(contentType: string): HttpClient;
+    get<R>(url: string, queryParams?: object): Promise<HttpResponse<R>>;
+    post<R>(url: string, payload?: any): Promise<HttpResponse<R>>;
+    put<R>(url: string, payload?: any): Promise<HttpResponse<R>>;
+    delete<R>(url: string, queryParams?: object): Promise<HttpResponse<R>>;
+}

package/lib/http-client/client-interface.d.ts

@@ -0,0 +1,10 @@
+import { HttpClient } from './client';
+import { HttpResponse } from './http-response';
+export interface IHttpClient {
+    headers(headers: any): HttpClient;
+    contentType(contentType: string): HttpClient;
+    get<R>(url: string, queryParams: object): Promise<HttpResponse<R>>;
+    post<R>(url: string, payload?: any): Promise<HttpResponse<R>>;
+    put<R>(url: string, payload?: any): Promise<HttpResponse<R>>;
+    delete<R>(url: string, queryParams: object): Promise<HttpResponse<R>>;
+}

package/lib/http-client/http-client-decorator.d.ts

@@ -0,0 +1,14 @@
+import { BaseClientDecorator } from './base-client-decorator';
+import { HttpClient } from './client';
+import { IHttpClient } from './client-interface';
+import { HttpResponse } from './http-response';
+export declare class HttpClientDecorator extends BaseClientDecorator {
+    protected client: IHttpClient;
+    constructor(client: IHttpClient);
+    headers(headers: any): HttpClient;
+    contentType(contentType: string): HttpClient;
+    get<R>(url: string, queryParams?: object): Promise<HttpResponse<R>>;
+    post<R>(url: string, payload?: any): Promise<HttpResponse<R>>;
+    put<R>(url: string, payload?: any): Promise<HttpResponse<R>>;
+    delete<R>(url: string, queryParams?: object): Promise<HttpResponse<R>>;
+}

package/{types → lib}/http-client/http-response.d.ts

@@ -1,4 +1,4 @@
-import { AxiosResponse } from 'axios';
+import { AxiosResponse, AxiosResponseHeaders, RawAxiosResponseHeaders } from 'axios';
 export declare class HttpResponse<ResponseType = any> {
     /**
      * The Axios response object.
@@ -33,7 +33,5 @@ export declare class HttpResponse<ResponseType = any> {
      *
      * @returns {Object}
      */
-    get headers(): import("axios").AxiosResponseHeaders | Partial<Record<string, string> & {
-        "set-cookie"?: string[];
-    }>;
+    get headers(): RawAxiosResponseHeaders | AxiosResponseHeaders;
 }

package/lib/http-client/oauth-decorator.d.ts

@@ -0,0 +1,15 @@
+import { BaseClientDecorator } from './base-client-decorator';
+import { HttpClient } from './client';
+import { IHttpClient } from './client-interface';
+import { HttpResponse } from './http-response';
+export declare class OauthDecorator extends BaseClientDecorator {
+    protected client: IHttpClient;
+    constructor(client: IHttpClient);
+    preHeadersCheck(config: any): Promise<any>;
+    headers(headers: any): HttpClient;
+    contentType(contentType: string): HttpClient;
+    get<R>(url: string, queryParams: object): Promise<HttpResponse<R>>;
+    post<R>(url: string, payload?: object): Promise<HttpResponse<R>>;
+    put<R>(url: string, payload?: object): Promise<HttpResponse<R>>;
+    delete<R>(url: string, queryParams?: object): Promise<HttpResponse<R>>;
+}

package/{types → lib}/index.d.ts

@@ -10,5 +10,7 @@ export * from './http-client';
 export { default as NodeCrypto } from './encrypter';
 export { Args as args, Flags as flags, Command } from './cli-ux';
 export * from './helpers';
+export * from './interfaces';
 export { Args, CommandHelp, Config, Errors, Flags, loadHelpClass, Help, HelpBase, HelpSection, HelpSectionRenderer, HelpSectionKeyValueTable, Hook, Interfaces, Parser, Plugin, run, toCached, tsPath, toStandardizedId, toConfiguredId, settings, Settings, flush, ux, execute, stderr, stdout, } from '@oclif/core';
-export { FlagInput } from '@oclif/core/lib/interfaces/parser';
+export { FlagInput, ArgInput } from '@oclif/core/lib/interfaces/parser';
+export { default as TablePrompt } from './inquirer-table-prompt';

package/lib/index.js

@@ -27,6 +27,7 @@ Object.defineProperty(exports, "args", { enumerable: true, get: function () { re
 Object.defineProperty(exports, "flags", { enumerable: true, get: function () { return cli_ux_2.Flags; } });
 Object.defineProperty(exports, "Command", { enumerable: true, get: function () { return cli_ux_2.Command; } });
 tslib_1.__exportStar(require("./helpers"), exports);
+tslib_1.__exportStar(require("./interfaces"), exports);
 // NOTE Exporting all @oclif/core modules: So that all the module can be acessed through cli-utility
 var core_1 = require("@oclif/core");
 Object.defineProperty(exports, "Args", { enumerable: true, get: function () { return core_1.Args; } });

package/lib/inquirer-table-prompt.d.ts

@@ -0,0 +1,30 @@
+declare const Base: any;
+declare class TablePrompt extends Base {
+    /**
+     * Initialise the prompt
+     *
+     * @param  {Object} questions
+     * @param  {Object} rl
+     * @param  {Object} answers
+     */
+    constructor(questions: any, rl: any, answers: any);
+    /**
+     * Start the inquirer session
+     *
+     * @param  {Function} callback
+     * @return {TablePrompt}
+     */
+    _run(callback: any): this;
+    getCurrentValue(): any[];
+    onDownKey(): void;
+    onEnd(state: any): void;
+    onError(state: any): void;
+    onLeftKey(): void;
+    onRightKey(): void;
+    selectAllValues(value: any): void;
+    onSpaceKey(): void;
+    onUpKey(): void;
+    paginate(): number[];
+    render(error?: string): void;
+}
+export = TablePrompt;

package/lib/interfaces/index.d.ts

@@ -0,0 +1,57 @@
+import { IPromptOptions } from "@oclif/core/lib/cli-ux";
+export interface PrintOptions {
+    bold?: boolean;
+    color?: string;
+}
+export interface InquirePayload {
+    type: string;
+    name: string;
+    default?: any;
+    message: string;
+    choices?: Array<any>;
+    transformer?: Function;
+    validate?(input: any, answers?: any): boolean | string | Promise<boolean | string>;
+    selectAll?: boolean;
+    pageSize?: number;
+    columns?: Record<string, any>[];
+    rows?: Array<any>;
+}
+export interface Region {
+    name: string;
+    cma: string;
+    cda: string;
+}
+export interface Token {
+    token: string;
+    apiKey: string;
+}
+export interface Organization {
+    uid: string;
+    name: string;
+}
+export interface selectedOrganization {
+    orgUid: string;
+    orgName: string;
+}
+export interface Stack {
+    name: string;
+    api_key: string;
+}
+export interface ContentType {
+    uid: string;
+    title: string;
+}
+export interface Environment {
+    name: string;
+    uid: string;
+}
+export interface Entry {
+    uid: string;
+    title: string;
+}
+export interface Locale {
+    name: string;
+    code: string;
+}
+export interface CliUXPromptOptions extends IPromptOptions {
+}

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
-  "types": "./types/index.d.ts",
+  "types": "lib/index.d.ts",
   "scripts": {
     "prepack": "pnpm compile",
     "clean": "rm -rf ./lib ./node_modules tsconfig.build.tsbuildinfo",
@@ -13,7 +13,9 @@
     "test": "nyc --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
     "posttest": "npm run lint",
     "lint": "eslint src/**/*.ts",
-    "format": "eslint src/**/*.ts --fix"
+    "format": "eslint src/**/*.ts --fix",
+    "test:unit": "mocha --forbid-only \"test/unit/**/*.test.ts\"",
+    "test:unit:report": "nyc --extension .ts mocha --forbid-only \"test/unit/**/*.test.ts\""
   },
   "repository": {
     "type": "git",
@@ -25,8 +27,7 @@
   ],
   "files": [
     "/npm-shrinkwrap.json",
-    "/lib",
-    "/types"
+    "/lib"
   ],
   "author": "contentstack",
   "license": "MIT",
@@ -37,7 +38,7 @@
     "chalk": "^4.0.0",
     "cli-cursor": "^3.1.0",
     "cli-table": "^0.3.11",
-    "conf": "^10.1.2",
+    "conf": "^10.2.0",
     "debug": "^4.1.1",
     "figures": "^3.2.0",
     "inquirer": "8.2.4",
@@ -76,4 +77,4 @@
     "tslib": "^1.13.0",
     "typescript": "^4.9.3"
   }
-}
+}

package/types/cli-ux.d.ts

@@ -1,31 +0,0 @@
-import { Table } from '@oclif/core/lib/cli-ux';
-import { Args, Flags, Command } from '@oclif/core';
-import { Ora } from 'ora';
-import { PrintOptions, InquirePayload, CliUXPromptOptions } from './interfaces';
-/**
- * CLI Interface
- */
-declare class CLIInterface {
-  private loading;
-  constructor();
-  get uxTable(): typeof Table.table;
-  init(context: any): void;
-  registerSearchPlugin(): void;
-  print(message: string, opts?: PrintOptions): void;
-  success(message: string): void;
-  error(message: string, ...params: any): void;
-  loader(message?: string): void;
-  table(
-    data: Record<string, unknown>[],
-    columns: Table.table.Columns<Record<string, unknown>>,
-    options?: Table.table.Options,
-  ): void;
-  inquire<T>(inquirePayload: InquirePayload | Array<InquirePayload>): Promise<T>;
-  prompt(name: string, options?: CliUXPromptOptions): Promise<any>;
-  confirm(message?: string): Promise<boolean>;
-  progress(options?: any): any;
-  loaderV2(message?: string, spinner?: any): Ora | void;
-}
-declare const _default: CLIInterface;
-export default _default;
-export { Flags, Args, Command };

package/types/helpers.d.ts

@@ -1 +0,0 @@
-export declare const isAuthenticated: () => boolean;

package/types/interfaces/index.d.ts

@@ -1,56 +0,0 @@
-import { IPromptOptions } from '@oclif/core/lib/cli-ux';
-export interface PrintOptions {
-  bold?: boolean;
-  color?: string;
-}
-export interface InquirePayload {
-  type: string;
-  name: string;
-  default?: any;
-  message: string;
-  choices?: Array<any>;
-  transformer?: Function;
-  validate?(input: any, answers?: any): boolean | string | Promise<boolean | string>;
-  columns?: Array<any>;
-  rows?: Array<any>;
-  selectAll?: boolean;
-  pageSize?: number;
-}
-export interface Region {
-  name: string;
-  cma: string;
-  cda: string;
-}
-export interface Token {
-  token: string;
-  apiKey: string;
-}
-export interface Organization {
-  uid: string;
-  name: string;
-}
-export interface selectedOrganization {
-  orgUid: string;
-  orgName: string;
-}
-export interface Stack {
-  name: string;
-  api_key: string;
-}
-export interface ContentType {
-  uid: string;
-  title: string;
-}
-export interface Environment {
-  name: string;
-  uid: string;
-}
-export interface Entry {
-  uid: string;
-  title: string;
-}
-export interface Locale {
-  name: string;
-  code: string;
-}
-export interface CliUXPromptOptions extends IPromptOptions {}

package/types/node-abort-controller.d.ts

@@ -1,19 +0,0 @@
-declare class CustomAbortSignal {
-    aborted: any;
-    onabort: any;
-    eventEmitter: any;
-    constructor();
-    toString(): string;
-    get [Symbol.toStringTag](): string;
-    removeEventListener(name: any, handler: any): void;
-    addEventListener(name: any, handler: any): void;
-    dispatchEvent(type: any): void;
-}
-declare class CustomAbortController {
-    signal: any;
-    constructor();
-    abort(): void;
-    toString(): string;
-    get [Symbol.toStringTag](): string;
-}
-export { CustomAbortController, CustomAbortSignal };