awesome-logging - npm Package Compare versions

Comparing version 0.4.0 to 0.5.0

lib/logger/logger-base.d.ts

@@ -5,2 +5,3 @@ export declare abstract class AwesomeLoggerBase {
     protected _hasChanges: boolean;
+    fixedLineCount: number;
     private _clean;
@@ -7,0 +8,0 @@ constructor(type: string);

lib/logger/logger-base.js

@@ -12,2 +12,3 @@ "use strict";
         this._hasChanges = true;
+        this.fixedLineCount = 0;
         this._clean = false;
@@ -14,0 +15,0 @@ this.type = type;

lib/logger/logger-manager.js

@@ -104,3 +104,3 @@ "use strict";
         }
-        const trimmedLines = string_trimmer_1.StringTrimmer.ensureConsoleFit(renderedLines, true, this._activeLogger.scrollAmount);
+        const trimmedLines = string_trimmer_1.StringTrimmer.ensureConsoleFit(renderedLines, true, this._activeLogger.scrollAmount, this._activeLogger.fixedLineCount);
         string_renderer_1.StringRenderer.renderString(trimmedLines, false, false, false);
@@ -118,3 +118,3 @@ }
         const renderedLines = logger.render();
-        const trimmedLines = string_trimmer_1.StringTrimmer.ensureConsoleFit(renderedLines, true, logger.scrollAmount);
+        const trimmedLines = string_trimmer_1.StringTrimmer.ensureConsoleFit(renderedLines, true, logger.scrollAmount, logger.fixedLineCount);
         string_renderer_1.StringRenderer.renderString(trimmedLines, false, true, true);
@@ -144,3 +144,3 @@ this._activeLogger = logger;
         if (activeLoggerText) {
-            const trimmedLines = string_trimmer_1.StringTrimmer.ensureConsoleFit(activeLoggerText, true, this._activeLogger.scrollAmount);
+            const trimmedLines = string_trimmer_1.StringTrimmer.ensureConsoleFit(activeLoggerText, true, this._activeLogger.scrollAmount, this._activeLogger.fixedLineCount);
             string_renderer_1.StringRenderer.renderString(trimmedLines, false, false, true);
@@ -147,0 +147,0 @@ }

lib/prompt/models/choice-prompt.d.ts

@@ -6,2 +6,3 @@ import { AwesomePromptChoiceConfig, AwesomePromptChoiceControl } from './config/choice';
     private readonly _options;
+    private readonly _text?;
     private readonly _lines;
@@ -8,0 +9,0 @@ constructor(config: Partial<AwesomePromptChoiceConfig>);

lib/prompt/models/choice-prompt.js

@@ -20,3 +20,4 @@ "use strict";
         })) !== null && _b !== void 0 ? _b : [];
-        const multi = awesome_logger_1.AwesomeLogger.create('multi', { children: lines });
+        const textLogger = config.text ? new text_logger_1.AwesomeTextLogger({ text: config.text }) : undefined;
+        const multi = awesome_logger_1.AwesomeLogger.create('multi', { children: textLogger ? [textLogger, ...lines] : lines });
         super(multi);
@@ -26,5 +27,6 @@ this._lines = lines;
         this._options = (_c = config.options) !== null && _c !== void 0 ? _c : [];
+        this.fixedLineCount = config.text ? 1 : 0;
     }
     adjustLine(lineText, line, highlighted) {
-        const newText = `${chalk_1.default.gray(' - ')} ${(highlighted ? chalk_1.default.blue : chalk_1.default.white)(lineText)}`;
+        const newText = `${chalk_1.default.gray(' - ')}${(highlighted ? chalk_1.default.blue : chalk_1.default.white)(lineText)}`;
         line.setText(newText);
@@ -58,3 +60,3 @@ }
                 this._currentHighlightedRow++;
-                if (this._currentHighlightedRow - this.scrollAmount > terminal_size_1.TerminalSize.terminalHeight - 2) {
+                if (this._currentHighlightedRow - this.scrollAmount > terminal_size_1.TerminalSize.terminalHeight - 2 - this.fixedLineCount) {
                     this.scrollAmount++;
@@ -61,0 +63,0 @@ }

lib/prompt/models/config/choice.d.ts

 import { AwesomePromptBaseControl } from './base';
 export interface AwesomePromptChoiceConfig {
     options: string[];
+    text?: string;
 }
 export interface AwesomePromptChoiceControl extends AwesomePromptBaseControl<string> {
 }

lib/render/string-trimmer.js

@@ -12,8 +12,8 @@ "use strict";
 class StringTrimmer {
-    static ensureConsoleFit(val, limitRowCount, scollAmount) {
+    static ensureConsoleFit(val, limitRowCount, scollAmount, fixedLineCount) {
         const rowsTrimmed = this.ensureRowsLength(val);
-        const rowCount = limitRowCount ? this.ensureRowsCount(rowsTrimmed, scollAmount) : rowsTrimmed;
+        const rowCount = limitRowCount ? this.ensureRowsCount(rowsTrimmed, scollAmount, fixedLineCount) : rowsTrimmed;
         return rowCount.join('\n');
     }
-    static ensureRowsCount(rowsTrimmed, scrollAmount) {
+    static ensureRowsCount(rowsTrimmed, scrollAmount, fixedLineCount) {
         const maxRowCount = terminal_size_1.TerminalSize.terminalHeight;
@@ -30,7 +30,10 @@ const actualRowCount = rowsTrimmed.length;
         }
-        const visibleRows = rowsTrimmed.slice(scrollAmount, scrollAmount + maxRowCount);
+        const remainingScrollRows = maxRowCount - fixedLineCount;
+        const fixedRows = rowsTrimmed.splice(0, fixedLineCount);
+        const dynamicRows = rowsTrimmed.splice(scrollAmount, remainingScrollRows);
+        const visibleRows = [...fixedRows, ...dynamicRows];
         const visibleRowsWithScrollPrefix = [];
         for (let i = 0; i < visibleRows.length; i++) {
             let visibleRow = visibleRows[i];
-            if (i === 0 && scrollAmount > 0) {
+            if (i === fixedRows.length && scrollAmount > 0) {
                 visibleRow = `↑ ${visibleRow}`;
@@ -41,3 +44,3 @@ }
             }
-            else {
+            else if (i >= fixedRows.length) {
                 visibleRow = `| ${visibleRow}`;
@@ -44,0 +47,0 @@ }

lib/test.js

@@ -92,3 +92,9 @@ "use strict";
 // c.result.then(r => {});
-awesome_logger_1.AwesomeLogger.prompt('confirm', { text: 'Are you really sure?' }).result.then(r => {
+// AwesomeLogger.prompt('confirm', { text: 'Are you really sure?' }).result.then(r => {
+//   console.log(r);
+// });
+awesome_logger_1.AwesomeLogger.prompt('choice', {
+    text: 'Are you really sure?',
+    options: ['Option1', 'Option2', 'Option3', 'Option4', 'Option5', 'Option6', 'Option7', 'Option8', 'Option9', 'Option10']
+}).result.then(r => {
     console.log(r);
@@ -95,0 +101,0 @@ });

package.json

 {
   "name": "awesome-logging",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "Advanced logging messages, interactive prompts, loading animations and more in TypeScript",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

No alert changes

Improved metrics

Total package byte prevSize

148104

increased by1.21%

Lines of code

2103

increased by0.72%

No dependency changes