@contentstack/cli-utilities 1.4.0 → 1.4.2

package/lib/auth-handler.js

@@ -30,7 +30,7 @@ class AuthHandler {
         this.authEmailKeyName = 'email';
         this.oauthAccessTokenKeyName = 'oauthAccessToken';
         this.oauthDateTimeKeyName = 'oauthDateTime';
-        this.oauthUserUidKeyName = 'oauthUserUid';
+        this.oauthUserUidKeyName = 'userUid';
         this.oauthOrgUidKeyName = 'oauthOrgUid';
         this.oauthRefreshTokenKeyName = 'oauthRefreshToken';
         this.authorisationTypeKeyName = 'authorisationType';
@@ -338,7 +338,7 @@ class AuthHandler {
             }
         });
     }
-    async isAuthenticated() {
+    isAuthenticated() {
         const authorizationType = config_handler_1.default.get(this.authorisationTypeKeyName);
         return (authorizationType === this.authorisationTypeOAUTHValue || authorizationType === this.authorisationTypeAUTHValue);
     }

package/lib/cli-ux.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "Flags", { enumerable: true, get: function () { r
 Object.defineProperty(exports, "Command", { enumerable: true, get: function () { return core_1.Command; } });
 const ora_1 = tslib_1.__importDefault(require("ora"));
 const message_handler_1 = tslib_1.__importDefault(require("./message-handler"));
-inquirer_1.default.registerPrompt('table', require('inquirer-table-prompt'));
+inquirer_1.default.registerPrompt('table', require('./inquirer-table-prompt'));
 /**
  * CLI Interface
  */

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stdout = exports.stderr = exports.execute = exports.ux = exports.flush = exports.settings = exports.toConfiguredId = exports.toStandardizedId = exports.tsPath = exports.toCached = exports.run = exports.Plugin = exports.Parser = exports.Interfaces = exports.HelpBase = exports.Help = exports.loadHelpClass = exports.Flags = exports.Errors = exports.Config = exports.CommandHelp = exports.Args = exports.Command = exports.flags = exports.args = exports.NodeCrypto = exports.printFlagDeprecation = exports.managementSDKInitiator = exports.managementSDKClient = exports.configHandler = exports.authHandler = exports.messageHandler = exports.CLIError = exports.cliux = exports.logger = void 0;
+exports.TablePrompt = exports.stdout = exports.stderr = exports.execute = exports.ux = exports.flush = exports.settings = exports.toConfiguredId = exports.toStandardizedId = exports.tsPath = exports.toCached = exports.run = exports.Plugin = exports.Parser = exports.Interfaces = exports.HelpBase = exports.Help = exports.loadHelpClass = exports.Flags = exports.Errors = exports.Config = exports.CommandHelp = exports.Args = exports.Command = exports.flags = exports.args = exports.NodeCrypto = exports.printFlagDeprecation = exports.managementSDKInitiator = exports.managementSDKClient = exports.configHandler = exports.authHandler = exports.messageHandler = exports.CLIError = exports.cliux = exports.logger = void 0;
 const tslib_1 = require("tslib");
 var logger_1 = require("./logger");
 Object.defineProperty(exports, "logger", { enumerable: true, get: function () { return tslib_1.__importDefault(logger_1).default; } });
@@ -51,3 +51,5 @@ Object.defineProperty(exports, "ux", { enumerable: true, get: function () { retu
 Object.defineProperty(exports, "execute", { enumerable: true, get: function () { return core_1.execute; } });
 Object.defineProperty(exports, "stderr", { enumerable: true, get: function () { return core_1.stderr; } });
 Object.defineProperty(exports, "stdout", { enumerable: true, get: function () { return core_1.stdout; } });
+var inquirer_table_prompt_1 = require("./inquirer-table-prompt");
+Object.defineProperty(exports, "TablePrompt", { enumerable: true, get: function () { return tslib_1.__importDefault(inquirer_table_prompt_1).default; } });

package/lib/inquirer-table-prompt.js

@@ -0,0 +1,176 @@
+"use strict";
+const chalk = require('chalk');
+const figures = require('figures');
+const Table = require('cli-table');
+const cliCursor = require('cli-cursor');
+const Base = require('inquirer/lib/prompts/base');
+const observe = require('inquirer/lib/utils/events');
+const { map, takeUntil } = require('rxjs/operators');
+const Choices = require('inquirer/lib/objects/choices');
+class TablePrompt extends Base {
+    /**
+     * Initialise the prompt
+     *
+     * @param  {Object} questions
+     * @param  {Object} rl
+     * @param  {Object} answers
+     */
+    constructor(questions, rl, answers) {
+        super(questions, rl, answers);
+        this.selectAll = this.opt.selectAll || false;
+        const formattedRows = this.selectAll
+            ? [
+                {
+                    name: 'Select All',
+                    value: 'selectAll',
+                },
+                ...(this.opt.rows || []),
+            ]
+            : [];
+        this.columns = new Choices(this.opt.columns, []);
+        this.pointer = 0;
+        this.horizontalPointer = 0;
+        this.rows = new Choices(formattedRows, []);
+        this.values = this.columns.filter(() => true).map(() => undefined);
+        this.pageSize = this.opt.pageSize || 5;
+    }
+    /**
+     * Start the inquirer session
+     *
+     * @param  {Function} callback
+     * @return {TablePrompt}
+     */
+    _run(callback) {
+        this.done = callback;
+        const events = observe(this.rl);
+        const validation = this.handleSubmitEvents(events.line.pipe(map(this.getCurrentValue.bind(this))));
+        validation.success.forEach(this.onEnd.bind(this));
+        validation.error.forEach(this.onError.bind(this));
+        events.keypress.forEach(({ key }) => {
+            switch (key.name) {
+                case 'left':
+                    return this.onLeftKey();
+                case 'right':
+                    return this.onRightKey();
+            }
+        });
+        events.normalizedUpKey.pipe(takeUntil(validation.success)).forEach(this.onUpKey.bind(this));
+        events.normalizedDownKey.pipe(takeUntil(validation.success)).forEach(this.onDownKey.bind(this));
+        events.spaceKey.pipe(takeUntil(validation.success)).forEach(this.onSpaceKey.bind(this));
+        if (this.rl.line) {
+            this.onKeypress();
+        }
+        cliCursor.hide();
+        this.render();
+        return this;
+    }
+    getCurrentValue() {
+        const currentValue = [];
+        this.rows.forEach((row, rowIndex) => {
+            currentValue.push(this.values[rowIndex]);
+        });
+        return currentValue;
+    }
+    onDownKey() {
+        const length = this.rows.realLength;
+        this.pointer = this.pointer < length - 1 ? this.pointer + 1 : this.pointer;
+        this.render();
+    }
+    onEnd(state) {
+        this.status = 'answered';
+        this.spaceKeyPressed = true;
+        this.render();
+        this.screen.done();
+        cliCursor.show();
+        if (this.selectAll) {
+            // remove select all row
+            const [, ...truncatedValue] = state.value;
+            this.done(truncatedValue);
+        }
+        else {
+            this.done(state.value);
+        }
+    }
+    onError(state) {
+        this.render(state.isValid);
+    }
+    onLeftKey() {
+        const length = this.columns.realLength;
+        this.horizontalPointer = this.horizontalPointer > 0 ? this.horizontalPointer - 1 : length - 1;
+        this.render();
+    }
+    onRightKey() {
+        const length = this.columns.realLength;
+        this.horizontalPointer = this.horizontalPointer < length - 1 ? this.horizontalPointer + 1 : 0;
+        this.render();
+    }
+    selectAllValues(value) {
+        let values = [];
+        for (let i = 0; i < this.rows.length; i++) {
+            values.push(value);
+        }
+        this.values = values;
+    }
+    onSpaceKey() {
+        var _a;
+        const value = this.columns.get(this.horizontalPointer).value;
+        const rowValue = ((_a = this.rows.get(this.pointer)) === null || _a === void 0 ? void 0 : _a.value) || '';
+        if (rowValue === 'selectAll') {
+            this.selectAllValues(value);
+        }
+        else {
+            this.values[this.pointer] = value;
+        }
+        this.spaceKeyPressed = true;
+        this.render();
+    }
+    onUpKey() {
+        this.pointer = this.pointer > 0 ? this.pointer - 1 : this.pointer;
+        this.render();
+    }
+    paginate() {
+        const middleOfPage = Math.floor(this.pageSize / 2);
+        const firstIndex = Math.max(0, this.pointer - middleOfPage);
+        const lastIndex = Math.min(firstIndex + this.pageSize - 1, this.rows.realLength - 1);
+        const lastPageOffset = this.pageSize - 1 - lastIndex + firstIndex;
+        return [Math.max(0, firstIndex - lastPageOffset), lastIndex];
+    }
+    render(error) {
+        let message = this.getQuestion();
+        let bottomContent = '';
+        if (!this.spaceKeyPressed) {
+            message +=
+                '(Press ' +
+                    chalk.cyan.bold('<space>') +
+                    ' to select, ' +
+                    chalk.cyan.bold('<Up and Down>') +
+                    ' to move rows, ' +
+                    chalk.cyan.bold('<Left and Right>') +
+                    ' to move columns)';
+        }
+        const [firstIndex, lastIndex] = this.paginate();
+        const table = new Table({
+            head: [chalk.reset.dim(`${firstIndex + 1}-${lastIndex} of ${this.rows.realLength - 1}`)].concat(this.columns.pluck('name').map((name) => chalk.reset.bold(name))),
+        });
+        this.rows.forEach((row, rowIndex) => {
+            if (rowIndex < firstIndex || rowIndex > lastIndex)
+                return;
+            const columnValues = [];
+            this.columns.forEach((column, columnIndex) => {
+                const isSelected = this.status !== 'answered' && this.pointer === rowIndex && this.horizontalPointer === columnIndex;
+                const value = column.value === this.values[rowIndex] ? figures.radioOn : figures.radioOff;
+                columnValues.push(`${isSelected ? '[' : ' '} ${value} ${isSelected ? ']' : ' '}`);
+            });
+            const chalkModifier = this.status !== 'answered' && this.pointer === rowIndex ? chalk.reset.bold.cyan : chalk.reset;
+            table.push({
+                [chalkModifier(row.name)]: columnValues,
+            });
+        });
+        message += '\n\n' + table.toString();
+        if (error) {
+            bottomContent = chalk.red('>> ') + error;
+        }
+        this.screen.render(message, bottomContent);
+    }
+}
+module.exports = TablePrompt;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "./types/index.d.ts",
@@ -40,7 +40,6 @@
     "inquirer": "8.2.4",
     "inquirer-search-checkbox": "^1.0.0",
     "inquirer-search-list": "^1.2.6",
-    "inquirer-table-prompt": "git@github.com:kego1992/inquirer-table-prompt.git",
     "lodash": "^4.17.15",
     "open": "^8.4.2",
     "ora": "^5.4.0",

package/types/auth-handler.d.ts

@@ -3,43 +3,42 @@
  * Auth handler
  */
 declare class AuthHandler {
-  private _client;
-  private _host;
-  private _appHost;
-  private codeVerifier;
-  private OAuthBaseURL;
-  private OAuthAppId;
-  private OAuthClientId;
-  private OAuthRedirectURL;
-  private OAuthScope;
-  private OAuthResponseType;
-  private authTokenKeyName;
-  private authEmailKeyName;
-  private oauthAccessTokenKeyName;
-  private oauthDateTimeKeyName;
-  private oauthUserUidKeyName;
-  private oauthOrgUidKeyName;
-  private oauthRefreshTokenKeyName;
-  private authorisationTypeKeyName;
-  private authorisationTypeOAUTHValue;
-  private authorisationTypeAUTHValue;
-  private allAuthConfigItems;
-  set host(contentStackHost: any);
-  constructor();
-  oauth(): Promise<object>;
-  createHTTPServer(): Promise<object>;
-  openOAuthURL(): Promise<object>;
-  getAccessToken(code: string): Promise<object>;
-  setConfigData(type: string, userData?: any): Promise<object>;
-  unsetConfigData(type?: string): Promise<void>;
-  refreshToken(): Promise<object>;
-  getUserDetails(data: any): Promise<object>;
-  isAuthenticated(): Promise<boolean>;
-  checkExpiryAndRefresh: (force?: boolean) => Promise<void | object>;
-  compareOAuthExpiry(force?: boolean): Promise<void | object>;
-  getAuthorisationType(): Promise<boolean>;
-  isAuthorisationTypeBasic(): Promise<boolean>;
-  isAuthorisationTypeOAuth(): Promise<boolean>;
+    private _host;
+    private codeVerifier;
+    private OAuthBaseURL;
+    private OAuthAppId;
+    private OAuthClientId;
+    private OAuthRedirectURL;
+    private OAuthScope;
+    private OAuthResponseType;
+    private authTokenKeyName;
+    private authEmailKeyName;
+    private oauthAccessTokenKeyName;
+    private oauthDateTimeKeyName;
+    private oauthUserUidKeyName;
+    private oauthOrgUidKeyName;
+    private oauthRefreshTokenKeyName;
+    private authorisationTypeKeyName;
+    private authorisationTypeOAUTHValue;
+    private authorisationTypeAUTHValue;
+    private allAuthConfigItems;
+    set host(contentStackHost: any);
+    constructor();
+    setOAuthBaseURL(): Promise<void>;
+    oauth(): Promise<object>;
+    createHTTPServer(): Promise<object>;
+    openOAuthURL(): Promise<object>;
+    getAccessToken(code: string): Promise<object>;
+    setConfigData(type: string, userData?: any): Promise<object>;
+    unsetConfigData(type?: string): Promise<void>;
+    refreshToken(): Promise<object>;
+    getUserDetails(data: any): Promise<object>;
+    isAuthenticated(): boolean;
+    getAuthorisationType(): Promise<any>;
+    isAuthorisationTypeBasic(): Promise<boolean>;
+    isAuthorisationTypeOAuth(): Promise<boolean>;
+    checkExpiryAndRefresh: (force?: boolean) => Promise<void | object>;
+    compareOAuthExpiry(force?: boolean): Promise<void | object>;
 }
 declare const _default: AuthHandler;
 export default _default;

package/types/helpers.d.ts

@@ -1 +1 @@
-export declare const isAuthenticated: () => Promise<boolean>;
+export declare const isAuthenticated: () => boolean;

package/types/index.d.ts

@@ -4,74 +4,11 @@ export { default as CLIError } from './cli-error';
 export { default as messageHandler } from './message-handler';
 export { default as authHandler } from './auth-handler';
 export { default as configHandler } from './config-handler';
-export {
-  default as managementSDKClient,
-  managementSDKInitiator,
-  ContentstackClient,
-  ContentstackConfig,
-} from './contentstack-management-sdk';
+export { default as managementSDKClient, managementSDKInitiator, ContentstackClient, ContentstackConfig, } from './contentstack-management-sdk';
 export { default as printFlagDeprecation } from './flag-deprecation-check';
 export * from './http-client';
 export { default as NodeCrypto } from './encrypter';
 export { Args as args, Flags as flags, Command } from './cli-ux';
-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 * from './helpers';
-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 { 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';