vite-plugin-php 1.0.7 → 1.0.8

package/dist/index.cjs

@@ -5435,15 +5435,15 @@ var reusify_1 = reusify$1;
 
 var reusify = reusify_1;
 
-function fastqueue (context, worker, concurrency) {
+function fastqueue (context, worker, _concurrency) {
   if (typeof context === 'function') {
-    concurrency = worker;
+    _concurrency = worker;
     worker = context;
     context = null;
   }
 
-  if (concurrency < 1) {
-    throw new Error('fastqueue concurrency must be greater than 1')
+  if (!(_concurrency >= 1)) {
+    throw new Error('fastqueue concurrency must be equal to or greater than 1')
   }
 
   var cache = reusify(Task);
@@ -5458,7 +5458,23 @@ function fastqueue (context, worker, concurrency) {
     saturated: noop,
     pause: pause,
     paused: false,
-    concurrency: concurrency,
+
+    get concurrency () {
+      return _concurrency
+    },
+    set concurrency (value) {
+      if (!(value >= 1)) {
+        throw new Error('fastqueue concurrency must be equal to or greater than 1')
+      }
+      _concurrency = value;
+
+      if (self.paused) return
+      for (; queueHead && _running < _concurrency;) {
+        _running++;
+        release();
+      }
+    },
+
     running: running,
     resume: resume,
     idle: idle,
@@ -5508,7 +5524,12 @@ function fastqueue (context, worker, concurrency) {
   function resume () {
     if (!self.paused) return
     self.paused = false;
-    for (var i = 0; i < self.concurrency; i++) {
+    if (queueHead === null) {
+      _running++;
+      release();
+      return
+    }
+    for (; queueHead && _running < _concurrency;) {
       _running++;
       release();
     }
@@ -5527,7 +5548,7 @@ function fastqueue (context, worker, concurrency) {
     current.callback = done || noop;
     current.errorHandler = errorHandler;
 
-    if (_running === self.concurrency || self.paused) {
+    if (_running >= _concurrency || self.paused) {
       if (queueTail) {
         queueTail.next = current;
         queueTail = current;
@@ -5549,8 +5570,9 @@ function fastqueue (context, worker, concurrency) {
     current.release = release;
     current.value = value;
     current.callback = done || noop;
+    current.errorHandler = errorHandler;
 
-    if (_running === self.concurrency || self.paused) {
+    if (_running >= _concurrency || self.paused) {
       if (queueHead) {
         current.next = queueHead;
         queueHead = current;
@@ -5570,7 +5592,7 @@ function fastqueue (context, worker, concurrency) {
       cache.release(holder);
     }
     var next = queueHead;
-    if (next) {
+    if (next && _running <= _concurrency) {
       if (!self.paused) {
         if (queueTail === queueHead) {
           queueTail = null;
@@ -5633,9 +5655,9 @@ function Task () {
   };
 }
 
-function queueAsPromised (context, worker, concurrency) {
+function queueAsPromised (context, worker, _concurrency) {
   if (typeof context === 'function') {
-    concurrency = worker;
+    _concurrency = worker;
     worker = context;
     context = null;
   }
@@ -5647,7 +5669,7 @@ function queueAsPromised (context, worker, concurrency) {
       }, cb);
   }
 
-  var queue = fastqueue(context, asyncWrapper, concurrency);
+  var queue = fastqueue(context, asyncWrapper, _concurrency);
 
   var pushCb = queue.push;
   var unshiftCb = queue.unshift;
@@ -5697,6 +5719,12 @@ function queueAsPromised (context, worker, concurrency) {
   }
 
   function drained () {
+    if (queue.idle()) {
+      return new Promise(function (resolve) {
+        resolve();
+      })
+    }
+
     var previousDrain = queue.drain;
 
     var p = new Promise(function (resolve) {

package/dist/index.mjs

@@ -5422,15 +5422,15 @@ var reusify_1 = reusify$1;
 
 var reusify = reusify_1;
 
-function fastqueue (context, worker, concurrency) {
+function fastqueue (context, worker, _concurrency) {
   if (typeof context === 'function') {
-    concurrency = worker;
+    _concurrency = worker;
     worker = context;
     context = null;
   }
 
-  if (concurrency < 1) {
-    throw new Error('fastqueue concurrency must be greater than 1')
+  if (!(_concurrency >= 1)) {
+    throw new Error('fastqueue concurrency must be equal to or greater than 1')
   }
 
   var cache = reusify(Task);
@@ -5445,7 +5445,23 @@ function fastqueue (context, worker, concurrency) {
     saturated: noop,
     pause: pause,
     paused: false,
-    concurrency: concurrency,
+
+    get concurrency () {
+      return _concurrency
+    },
+    set concurrency (value) {
+      if (!(value >= 1)) {
+        throw new Error('fastqueue concurrency must be equal to or greater than 1')
+      }
+      _concurrency = value;
+
+      if (self.paused) return
+      for (; queueHead && _running < _concurrency;) {
+        _running++;
+        release();
+      }
+    },
+
     running: running,
     resume: resume,
     idle: idle,
@@ -5495,7 +5511,12 @@ function fastqueue (context, worker, concurrency) {
   function resume () {
     if (!self.paused) return
     self.paused = false;
-    for (var i = 0; i < self.concurrency; i++) {
+    if (queueHead === null) {
+      _running++;
+      release();
+      return
+    }
+    for (; queueHead && _running < _concurrency;) {
       _running++;
       release();
     }
@@ -5514,7 +5535,7 @@ function fastqueue (context, worker, concurrency) {
     current.callback = done || noop;
     current.errorHandler = errorHandler;
 
-    if (_running === self.concurrency || self.paused) {
+    if (_running >= _concurrency || self.paused) {
       if (queueTail) {
         queueTail.next = current;
         queueTail = current;
@@ -5536,8 +5557,9 @@ function fastqueue (context, worker, concurrency) {
     current.release = release;
     current.value = value;
     current.callback = done || noop;
+    current.errorHandler = errorHandler;
 
-    if (_running === self.concurrency || self.paused) {
+    if (_running >= _concurrency || self.paused) {
       if (queueHead) {
         current.next = queueHead;
         queueHead = current;
@@ -5557,7 +5579,7 @@ function fastqueue (context, worker, concurrency) {
       cache.release(holder);
     }
     var next = queueHead;
-    if (next) {
+    if (next && _running <= _concurrency) {
       if (!self.paused) {
         if (queueTail === queueHead) {
           queueTail = null;
@@ -5620,9 +5642,9 @@ function Task () {
   };
 }
 
-function queueAsPromised (context, worker, concurrency) {
+function queueAsPromised (context, worker, _concurrency) {
   if (typeof context === 'function') {
-    concurrency = worker;
+    _concurrency = worker;
     worker = context;
     context = null;
   }
@@ -5634,7 +5656,7 @@ function queueAsPromised (context, worker, concurrency) {
       }, cb);
   }
 
-  var queue = fastqueue(context, asyncWrapper, concurrency);
+  var queue = fastqueue(context, asyncWrapper, _concurrency);
 
   var pushCb = queue.push;
   var unshiftCb = queue.unshift;
@@ -5684,6 +5706,12 @@ function queueAsPromised (context, worker, concurrency) {
   }
 
   function drained () {
+    if (queue.idle()) {
+      return new Promise(function (resolve) {
+        resolve();
+      })
+    }
+
     var previousDrain = queue.drain;
 
     var p = new Promise(function (resolve) {

package/dist/router.php

@@ -11,5 +11,9 @@ $source = str_replace(
 );
 
 die((function ($__SOURCE) {
-	eval("?>$__SOURCE<?php");
+	try {
+		return eval("?> $__SOURCE <?php");
+	} catch (\Throwable $th) {
+		return $th->getMessage();
+	}
 })($source));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vite-plugin-php",
-	"version": "1.0.7",
+	"version": "1.0.8",
 	"description": "Precompile PHP-files with the speed of Vite",
 	"keywords": [
 		"vite",