fix order of async echo when import view #1004

Author: jcubic

README.md

@@ -8,7 +8,7 @@
 [![npm](https://img.shields.io/badge/npm-DEV-blue.svg)](https://www.npmjs.com/package/jquery.terminal)
 ![bower](https://img.shields.io/badge/bower-DEV-yellow.svg)
 [![Build and test](https://github.com/jcubic/jquery.terminal/actions/workflows/build.yaml/badge.svg?branch=devel&event=push)](https://github.com/jcubic/jquery.terminal/actions/workflows/build.yaml)
-[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&1e8bbe7e144977411c2c22df5eaa33ac)](https://coveralls.io/github/jcubic/jquery.terminal?branch=devel)
+[![Coverage Status](https://coveralls.io/repos/github/jcubic/jquery.terminal/badge.svg?branch=devel&30337a9afb55435af852014140b95ef5)](https://coveralls.io/github/jcubic/jquery.terminal?branch=devel)
 ![NPM Downloads](https://img.shields.io/npm/dm/jquery.terminal.svg?style=flat)
 [![jsDelivr Downloads](https://data.jsdelivr.com/v1/package/npm/jquery.terminal/badge?style=rounded&n=1)](https://www.jsdelivr.com/package/npm/jquery.terminal)
 [![Paid Support](https://img.shields.io/badge/paid-support-354465.svg)](https://support.jcubic.pl/)

__tests__/terminal.spec.js

@@ -5266,7 +5266,7 @@ describe('Terminal plugin', function() {
                         term.clear();
                         term.import_view(view);
                         setTimeout(() => {
-                            expect(term.get_output()).toEqual('world\nhello');
+                            expect(term.get_output()).toEqual('hello\nworld');
                             done();
                         }, 200);
                     });

js/jquery.terminal-src.js

@@ -2059,6 +2059,35 @@
         this._output_buffer = [];
     };
     // -------------------------------------------------------------------------
+    // :: the buffer needs to be sorted when using import_view and async echo
+    // -------------------------------------------------------------------------
+    FormatBuffer.prototype.sort = function() {
+        var chunk = [];
+        var chunks = [];
+        for (var i = 0; i < this._output_buffer.length; i++) {
+            var item = this._output_buffer[i];
+            chunk.push(item);
+            if (item !== FormatBuffer.NEW_LINE && 'index' in item) {
+                chunks.push(chunk);
+                chunk = [];
+            }
+        }
+
+        // don't sort single chunk
+        if (chunks.lenght === 1) {
+            return;
+        }
+
+        chunks.sort(function(a, b) {
+            return a[2].index - b[2].index;
+        });
+
+        this._output_buffer = [];
+        chunks.forEach(function(chunk) {
+            this._output_buffer = this._output_buffer.concat(chunk);
+        }, this);
+    };
+    // -------------------------------------------------------------------------
     FormatBuffer.prototype.forEach = function(fn) {
         var i = 0;
         while (i < this._output_buffer.length) {
@@ -10858,6 +10887,7 @@
                         if (!options.update) {
                             partial = self.find('.partial');
                             snapshot = lines.get_partial();
+                            buffer.sort();
                         }
                         // TODO: refactor buffer.flush(), there is way
                         //       to many levels of abstractions in one place

js/jquery.terminal.js

@@ -41,7 +41,7 @@
  *
  * broken image by Sophia Bai from the Noun Project (CC-BY)
  *
- * Date: Tue, 14 Jan 2025 21:24:13 +0000
+ * Date: Tue, 14 Jan 2025 23:13:58 +0000
  */
 /* global define, Map, BigInt */
 /* eslint-disable */
@@ -2059,6 +2059,35 @@
         this._output_buffer = [];
     };
     // -------------------------------------------------------------------------
+    // :: the buffer needs to be sorted when using import_view and async echo
+    // -------------------------------------------------------------------------
+    FormatBuffer.prototype.sort = function() {
+        var chunk = [];
+        var chunks = [];
+        for (var i = 0; i < this._output_buffer.length; i++) {
+            var item = this._output_buffer[i];
+            chunk.push(item);
+            if (item !== FormatBuffer.NEW_LINE && 'index' in item) {
+                chunks.push(chunk);
+                chunk = [];
+            }
+        }
+
+        // don't sort single chunk
+        if (chunks.lenght === 1) {
+            return;
+        }
+
+        chunks.sort(function(a, b) {
+            return a[2].index - b[2].index;
+        });
+
+        this._output_buffer = [];
+        chunks.forEach(function(chunk) {
+            this._output_buffer = this._output_buffer.concat(chunk);
+        }, this);
+    };
+    // -------------------------------------------------------------------------
     FormatBuffer.prototype.forEach = function(fn) {
         var i = 0;
         while (i < this._output_buffer.length) {
@@ -5407,7 +5436,7 @@
     // -------------------------------------------------------------------------
     $.terminal = {
         version: 'DEV',
-        date: 'Tue, 14 Jan 2025 21:24:13 +0000',
+        date: 'Tue, 14 Jan 2025 23:13:58 +0000',
         // colors from https://www.w3.org/wiki/CSS/Properties/color/keywords
         color_names: [
             'transparent', 'currentcolor', 'black', 'silver', 'gray', 'white',
@@ -10858,6 +10887,7 @@
                         if (!options.update) {
                             partial = self.find('.partial');
                             snapshot = lines.get_partial();
+                            buffer.sort();
                         }
                         // TODO: refactor buffer.flush(), there is way
                         //       to many levels of abstractions in one place