@contentstack/cli-utilities 1.5.2 → 1.5.4

package/lib/auth-handler.d.ts

@@ -22,8 +22,10 @@ declare class AuthHandler {
     private authorisationTypeOAUTHValue;
     private authorisationTypeAUTHValue;
     private allAuthConfigItems;
+    private logger;
     set host(contentStackHost: any);
     constructor();
+    initLog(): void;
     setOAuthBaseURL(): Promise<void>;
     oauth(): Promise<object>;
     createHTTPServer(): Promise<object>;

package/lib/auth-handler.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const cli_ux_1 = tslib_1.__importDefault(require("./cli-ux"));
-const logger_1 = tslib_1.__importDefault(require("./logger"));
 const http_client_1 = tslib_1.__importDefault(require("./http-client"));
 const config_handler_1 = tslib_1.__importDefault(require("./config-handler"));
 const ContentstackManagementSDK = tslib_1.__importStar(require("@contentstack/management"));
@@ -10,6 +9,7 @@ const message_handler_1 = tslib_1.__importDefault(require("./message-handler"));
 const http = require('http');
 const url = require('url');
 const open_1 = tslib_1.__importDefault(require("open"));
+const logger_1 = require("./logger");
 const crypto = require('crypto');
 /**
  * @class
@@ -56,6 +56,9 @@ class AuthHandler {
             ],
         };
     }
+    initLog() {
+        this.logger = new logger_1.LoggerService(process.cwd(), 'cli-log');
+    }
     async setOAuthBaseURL() {
         if (config_handler_1.default.get('region')['uiHost']) {
             this.OAuthBaseURL = config_handler_1.default.get('region')['uiHost'] || '';
@@ -71,6 +74,7 @@ class AuthHandler {
      */
     async oauth() {
         return new Promise((resolve, reject) => {
+            this.initLog();
             this.createHTTPServer()
                 .then(() => {
                 this.openOAuthURL()
@@ -79,12 +83,12 @@ class AuthHandler {
                     resolve({});
                 })
                     .catch((error) => {
-                    logger_1.default.error('OAuth login failed', error.message);
+                    this.logger.error('OAuth login failed', error.message);
                     reject(error);
                 });
             })
                 .catch((error) => {
-                logger_1.default.error('OAuth login failed', error.message);
+                this.logger.error('OAuth login failed', error.message);
                 reject(error);
             });
         });

package/lib/fs-utility/core.js

@@ -25,7 +25,7 @@ class FsUtility {
             hasPreviousPage: false,
             pageInfoUpdated: false,
         };
-        const { fileExt, omitKeys, basePath, moduleName, metaHandler, keepMetadata, metaPickKeys, chunkFileSize, indexFileName, defaultInitContent, createDirIfNotExist = true, } = options;
+        const { fileExt, omitKeys, basePath, moduleName, metaHandler, keepMetadata, metaPickKeys, chunkFileSize, indexFileName, defaultInitContent, useIndexer = false, createDirIfNotExist = true, } = options;
         this.metaHandler = metaHandler;
         this.basePath = basePath || '';
         this.omitKeys = omitKeys || [];
@@ -37,6 +37,9 @@ class FsUtility {
         this.indexFileName = indexFileName || 'index.json';
         this.pageInfo.hasNextPage = (0, keys_1.default)(this.indexFileContent).length > 0;
         this.defaultInitContent = defaultInitContent || (this.fileExt === 'json' ? '{' : '');
+        if (useIndexer) {
+            this.writeIndexer = this.indexFileContent;
+        }
         if (createDirIfNotExist) {
             this.createFolderIfNotExist(this.basePath);
         }
@@ -216,8 +219,8 @@ class FsUtility {
             if (this.fileExt === 'json') {
                 this.writableStream.write('}');
             }
-            this.closeFile(closeIndexer);
         }
+        this.closeFile(closeIndexer);
     }
     /**
      * @method closeFile

package/lib/fs-utility/types.d.ts

@@ -1,4 +1,4 @@
-type FileType = "json" | "txt";
+type FileType = 'json' | 'txt';
 type Chunk = Record<string, unknown>[] | Record<string, unknown> | Array<unknown> | string;
 type PageInfo = {
     after: number;
@@ -63,6 +63,7 @@ type FsConstructorOptions = {
      */
     metaPickKeys?: Array<string>;
     keepMetadata?: boolean;
+    useIndexer?: boolean;
     metaHandler?: (array: any) => any;
 };
 type ChunkFilesGetterType = Promise<Record<string, unknown> | Record<string, unknown>[] | Error>;

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-export { default as logger } from './logger';
+export { LoggerService } from './logger';
 export { default as cliux } from './cli-ux';
 export { default as CLIError } from './cli-error';
 export { default as messageHandler } from './message-handler';

package/lib/index.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+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.LoggerService = 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; } });
+Object.defineProperty(exports, "LoggerService", { enumerable: true, get: function () { return logger_1.LoggerService; } });
 var cli_ux_1 = require("./cli-ux");
 Object.defineProperty(exports, "cliux", { enumerable: true, get: function () { return tslib_1.__importDefault(cli_ux_1).default; } });
 var cli_error_1 = require("./cli-error");

package/lib/logger.d.ts

@@ -1,10 +1,10 @@
 import winston from 'winston';
-declare class LoggerService {
+export declare class LoggerService {
     name: string;
     data: object | null;
     logger: winston.Logger;
     static dateFormat(): string;
-    constructor(name: string);
+    constructor(pathToLog: string, name: string);
     init(context: any): void;
     set loggerName(name: string);
     setLogData(data: object): void;
@@ -13,5 +13,3 @@ declare class LoggerService {
     error(message: string, param?: any): Promise<any>;
     warn(message: string, param?: any): Promise<any>;
 }
-declare const _default: LoggerService;
-export default _default;

package/lib/logger.js

@@ -1,20 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.LoggerService = void 0;
 const tslib_1 = require("tslib");
 const winston_1 = tslib_1.__importDefault(require("winston"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const message_handler_1 = tslib_1.__importDefault(require("./message-handler"));
 class LoggerService {
     static dateFormat() {
         return new Date(Date.now()).toUTCString();
     }
-    constructor(name) {
+    constructor(pathToLog, name) {
         this.data = null;
         this.name = null;
         const logger = winston_1.default.createLogger({
             transports: [
                 // new winston.transports.Console(),
                 new winston_1.default.transports.File({
-                    filename: `./logs/${name}.log`,
+                    filename: path_1.default.resolve(process.env.CS_CLI_LOG_PATH || `${pathToLog}/logs`, `${name}.log`),
                 }),
             ],
             format: winston_1.default.format.combine(winston_1.default.format.colorize(), winston_1.default.format.printf((info) => {
@@ -27,14 +29,14 @@ class LoggerService {
                 }
                 // parse message
                 info.message = message_handler_1.default.parse(info.message);
-                let message = `${LoggerService.dateFormat()}:${name}:${info.level}:${info.message}`;
+                let message = `${LoggerService.dateFormat()} : ${name}: ${info.level} : ${info.message}`;
                 message = info.obj ? message + `:${stringifiedParam}` : message;
                 message = this.data ? message + `:${JSON.stringify(this.data)}` : message;
                 return message;
             })),
-            // level: (config.get('logger.level') as string) || 'error',
-            level: 'error',
-            silent: true
+            // // level: (config.get('logger.level') as string) || 'error',
+            // level: 'error',
+            // silent: true
             // silent: config.get('logger.enabled') && process.env.CLI_ENV !== 'TEST' ? false : false,
         });
         this.logger = logger;
@@ -89,4 +91,4 @@ class LoggerService {
         }
     }
 }
-exports.default = new LoggerService('cli');
+exports.LoggerService = LoggerService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-utilities",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "description": "Utilities for contentstack projects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -32,7 +32,7 @@
   "author": "contentstack",
   "license": "MIT",
   "dependencies": {
-    "@contentstack/management": "~1.10.0",
+    "@contentstack/management": "~1.10.2",
     "@oclif/core": "^2.9.3",
     "axios": "1.3.4",
     "chalk": "^4.0.0",