sqlite-executor 4.0.7 → 4.0.9

package/dist/cjs/index.cjs

@@ -2126,6 +2126,7 @@ function buildBatchPayload(batch) {
             for(var _iterator = batch[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
                 var task = _step.value;
                 parts.push(task.sql, "\n");
+                parts.push("SELECT '".concat(task.token, "' AS ").concat(TOKEN_COLUMN, ";\n"));
             }
         } catch (err) {
             _didIteratorError = true;
@@ -2138,41 +2139,25 @@ function buildBatchPayload(batch) {
             }
         }
         parts.push("COMMIT;\n");
-        var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
-        try {
-            for(var _iterator1 = batch[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
-                var task1 = _step1.value;
-                parts.push("SELECT '".concat(task1.token, "' AS ").concat(TOKEN_COLUMN, ";\n"));
-            }
-        } catch (err) {
-            _didIteratorError1 = true;
-            _iteratorError1 = err;
-        } finally{
-            try {
-                if (!_iteratorNormalCompletion1 && null != _iterator1["return"]) _iterator1["return"]();
-            } finally{
-                if (_didIteratorError1) throw _iteratorError1;
-            }
-        }
         return parts.join("");
     }
     var parts1 = [];
-    var _iteratorNormalCompletion2 = true, _didIteratorError2 = false, _iteratorError2 = void 0;
+    var _iteratorNormalCompletion1 = true, _didIteratorError1 = false, _iteratorError1 = void 0;
     try {
-        for(var _iterator2 = batch[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true){
-            var task2 = _step2.value;
-            parts1.push(buildPayload(task2.sql, task2.token, {
+        for(var _iterator1 = batch[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
+            var task1 = _step1.value;
+            parts1.push(buildPayload(task1.sql, task1.token, {
                 skipNormalize: true
             }));
         }
     } catch (err) {
-        _didIteratorError2 = true;
-        _iteratorError2 = err;
+        _didIteratorError1 = true;
+        _iteratorError1 = err;
     } finally{
         try {
-            if (!_iteratorNormalCompletion2 && null != _iterator2["return"]) _iterator2["return"]();
+            if (!_iteratorNormalCompletion1 && null != _iterator1["return"]) _iterator1["return"]();
         } finally{
-            if (_didIteratorError2) throw _iteratorError2;
+            if (_didIteratorError1) throw _iteratorError1;
         }
     }
     return parts1.join("");
@@ -2339,12 +2324,20 @@ function createFinalizeScheduler(param) {
     check.cancel = cancel;
     return check;
 }
+function advanceNextInflightStartTime(inflight) {
+    var next = inflight.first;
+    if (next && next.startTime > 0) {
+        var now = performance.now();
+        if (now > next.startTime) next.startTime = now;
+    }
+}
 function handleParsedValue(raw, inflight, param) {
     var afterSentinel = param.afterSentinel, rejectAll = param.rejectAll;
     var task = inflight.first;
     if (!task) return;
     if (isSentinelRaw(raw, task.token)) {
         inflight.shift();
+        advanceNextInflightStartTime(inflight);
         afterSentinel(task);
         return;
     }
@@ -2358,6 +2351,7 @@ function handleParsedValue(raw, inflight, param) {
     }
     if (isSentinelRow(parsed, task.token)) {
         inflight.shift();
+        advanceNextInflightStartTime(inflight);
         afterSentinel(task);
         return;
     }
@@ -2422,7 +2416,7 @@ function handleSentinelTask(task, param) {
     pumpQueue();
 }
 function handleStderrChunk(chunk, param) {
-    var inflight = param.inflight, pendingFinalizeTasks = param.pendingFinalizeTasks, logger = param.logger, pendingStderr = param.pendingStderr;
+    var inflight = param.inflight, pendingFinalizeTasks = param.pendingFinalizeTasks, logger = param.logger, pendingStderr = param.pendingStderr, hasFinalizedZeroRowQuery = param.hasFinalizedZeroRowQuery;
     var inflightFirst = inflight.first;
     var firstPending = pendingFinalizeTasks.values().next().value;
     var zeroRowMatch = false;
@@ -2506,11 +2500,15 @@ function handleStderrChunk(chunk, param) {
             else if ("query" === task.kind && task.rows.length > 0) {
                 var _logger_error1;
                 null == logger || null == (_logger_error1 = logger.error) || _logger_error1.call(logger, chunk.trim());
-            } else task.stderrText += chunk;
+            } else if ("query" === task.kind && 0 === task.rows.length) if (hasFinalizedZeroRowQuery) null == pendingStderr || pendingStderr.push(chunk);
+            else task.stderrText += chunk;
+            else task.stderrText += chunk;
         } else if ("query" === task.kind && task.rows.length > 0) {
             var _logger_error2;
             null == logger || null == (_logger_error2 = logger.error) || _logger_error2.call(logger, chunk.trim());
-        } else task.stderrText += chunk;
+        } else if ("query" === task.kind && 0 === task.rows.length) if (hasFinalizedZeroRowQuery) null == pendingStderr || pendingStderr.push(chunk);
+        else task.stderrText += chunk;
+        else task.stderrText += chunk;
         return;
     }
     var _iteratorNormalCompletion3 = true, _didIteratorError3 = false, _iteratorError3 = void 0;
@@ -3592,7 +3590,7 @@ function pipelineEngine_create_class(Constructor, protoProps, staticProps) {
     if (staticProps) pipelineEngine_defineProperties(Constructor, staticProps);
     return Constructor;
 }
-var _queue = /*#__PURE__*/ new WeakMap(), pipelineEngine_inflight = /*#__PURE__*/ new WeakMap(), pipelineEngine_pendingFinalizeTasks = /*#__PURE__*/ new WeakMap(), _sharedValueParser = /*#__PURE__*/ new WeakMap(), pipelineEngine_processManager = /*#__PURE__*/ new WeakMap(), pipelineEngine_metrics = /*#__PURE__*/ new WeakMap(), pipelineEngine_statementTimeout = /*#__PURE__*/ new WeakMap(), pipelineEngine_logger = /*#__PURE__*/ new WeakMap(), pipelineEngine_batchSize = /*#__PURE__*/ new WeakMap(), pipelineEngine_maxInflight = /*#__PURE__*/ new WeakMap(), _onTaskTimeout = /*#__PURE__*/ new WeakMap(), _active = /*#__PURE__*/ new WeakMap(), pipelineEngine_sweeper = /*#__PURE__*/ new WeakMap(), pipelineEngine_scheduleFinalizeCheck = /*#__PURE__*/ new WeakMap(), pipelineEngine_pump = /*#__PURE__*/ new WeakMap(), pipelineEngine_pendingStderr = /*#__PURE__*/ new WeakMap(), core_pipelineEngine_pumpQueue = /*#__PURE__*/ new WeakSet(), core_pipelineEngine_afterSentinel = /*#__PURE__*/ new WeakSet(), pipelineEngine_settleTask = /*#__PURE__*/ new WeakSet();
+var _queue = /*#__PURE__*/ new WeakMap(), pipelineEngine_inflight = /*#__PURE__*/ new WeakMap(), pipelineEngine_pendingFinalizeTasks = /*#__PURE__*/ new WeakMap(), _sharedValueParser = /*#__PURE__*/ new WeakMap(), pipelineEngine_processManager = /*#__PURE__*/ new WeakMap(), pipelineEngine_metrics = /*#__PURE__*/ new WeakMap(), pipelineEngine_statementTimeout = /*#__PURE__*/ new WeakMap(), pipelineEngine_logger = /*#__PURE__*/ new WeakMap(), pipelineEngine_batchSize = /*#__PURE__*/ new WeakMap(), pipelineEngine_maxInflight = /*#__PURE__*/ new WeakMap(), _onTaskTimeout = /*#__PURE__*/ new WeakMap(), _active = /*#__PURE__*/ new WeakMap(), pipelineEngine_sweeper = /*#__PURE__*/ new WeakMap(), pipelineEngine_scheduleFinalizeCheck = /*#__PURE__*/ new WeakMap(), pipelineEngine_pump = /*#__PURE__*/ new WeakMap(), pipelineEngine_pendingStderr = /*#__PURE__*/ new WeakMap(), _hasFinalizedZeroRowQuery = /*#__PURE__*/ new WeakMap(), core_pipelineEngine_pumpQueue = /*#__PURE__*/ new WeakSet(), core_pipelineEngine_afterSentinel = /*#__PURE__*/ new WeakSet(), pipelineEngine_settleTask = /*#__PURE__*/ new WeakSet();
 var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
     "use strict";
     function PipelineEngine(processManager, param) {
@@ -3667,6 +3665,10 @@ var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
             writable: true,
             value: []
         });
+        pipelineEngine_class_private_field_init(this, _hasFinalizedZeroRowQuery, {
+            writable: true,
+            value: false
+        });
         pipelineEngine_class_private_field_set(this, pipelineEngine_processManager, processManager);
         pipelineEngine_class_private_field_set(this, pipelineEngine_metrics, metrics);
         pipelineEngine_class_private_field_set(this, pipelineEngine_statementTimeout, statementTimeout);
@@ -3792,7 +3794,8 @@ var pipelineEngine_PipelineEngine = /*#__PURE__*/ function() {
                     inflight: pipelineEngine_class_private_field_get(this, pipelineEngine_inflight),
                     pendingFinalizeTasks: pipelineEngine_class_private_field_get(this, pipelineEngine_pendingFinalizeTasks),
                     logger: pipelineEngine_class_private_field_get(this, pipelineEngine_logger),
-                    pendingStderr: pipelineEngine_class_private_field_get(this, pipelineEngine_pendingStderr)
+                    pendingStderr: pipelineEngine_class_private_field_get(this, pipelineEngine_pendingStderr),
+                    hasFinalizedZeroRowQuery: pipelineEngine_class_private_field_get(this, _hasFinalizedZeroRowQuery)
                 });
             }
         },
@@ -3845,6 +3848,8 @@ function pipelineEngine_afterSentinel(task) {
     });
 }
 function pipelineEngine_settleTask1(task, error, value) {
+    var _task_rows;
+    if ("query" === task.kind && (null == (_task_rows = task.rows) ? void 0 : _task_rows.length) === 0) pipelineEngine_class_private_field_set(this, _hasFinalizedZeroRowQuery, true);
     settleUtils_settleTask(task, error, value, pipelineEngine_class_private_field_get(this, pipelineEngine_metrics), {
         resetRowParser: true
     });