Merge tag 'v2.0.32' into loctusjs.sprintf

Release v2.0.32

Author: williamdes

LICENSE

@@ -1,20 +1,14 @@
-Copyright (c) 2007-2016 Kevin van Zonneveld (https://kvz.io) 
-and Contributors (https://locutus.io/authors)
+Copyright (c) 2007-2024 Kevin van Zonneveld (https://kvz.io) and Contributors (https://locutus.io/authors)
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+persons to whom the Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package.json

@@ -1,16 +1,16 @@
 {
   "name": "locutus.sprintf",
-  "version": "2.0.14-code-lts.2",
+  "version": "2.0.32-code-lts.2",
   "license": "MIT",
   "description": "Locutus sprintf and vsprintf for browsers and node",
-  "homepage": "https://locutus.io/php/strings/sprintf/",
   "author": "Kevin van Zonneveld <kevin@vanzonneveld.net>",
   "keywords": [
     "php",
     "js",
     "locutus",
     "sprintf"
   ],
+  "homepage": "https://locutus.io/php/strings/sprintf/",
   "bugs": {
     "url": "https://github.com/code-lts/locutus.sprintf/issues",
     "email": "williamdes@wdes.fr"
@@ -24,4 +24,4 @@
   },
   "readmeFilename": "README.md",
   "main": "src/php/index.js"
-}
+}

src/php/strings/sprintf.browser.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2007-2016 Kevin van Zonneveld (https://kvz.io)
+ * Copyright (c) 2007-2024 Kevin van Zonneveld (https://kvz.io)
  * and Contributors (https://locutus.io/authors)
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -61,7 +61,7 @@ function sprintf () {
     if (!chr) {
       chr = ' '
     }
-    var padding = (str.length >= len) ? '' : new Array(1 + len - str.length >>> 0).join(chr)
+    const padding = str.length >= len ? '' : new Array((1 + len - str.length) >>> 0).join(chr)
     return leftJustify ? str + padding : padding + str
   }
 
@@ -72,11 +72,7 @@ function sprintf () {
       // on the left side
       // keep sign (+ or -) in front
       if (!leftJustify && padChar === '0') {
-        value = [
-          value.slice(0, prefix.length),
-          _pad('', diff, '0', true),
-          value.slice(prefix.length)
-        ].join('')
+        value = [value.slice(0, prefix.length), _pad('', diff, '0', true), value.slice(prefix.length)].join('')
       } else {
         value = _pad(value, minWidth, padChar, leftJustify)
       }
@@ -145,7 +141,7 @@ function sprintf () {
     }
 
     if (!precision) {
-      precision = (specifier === 'd') ? 0 : 'fFeE'.indexOf(specifier) > -1 ? 6 : undefined
+      precision = specifier === 'd' ? 0 : 'fFeE'.indexOf(specifier) > -1 ? 6 : undefined
     } else {
       precision = +precision
     }
@@ -174,15 +170,14 @@ function sprintf () {
       case 'x':
         return _formatBaseX(value, 16, leftJustify, minWidth, precision, padChar)
       case 'X':
-        return _formatBaseX(value, 16, leftJustify, minWidth, precision, padChar)
-          .toUpperCase()
+        return _formatBaseX(value, 16, leftJustify, minWidth, precision, padChar).toUpperCase()
       case 'u':
         return _formatBaseX(value, 10, leftJustify, minWidth, precision, padChar)
       case 'i':
       case 'd':
         number = +value || 0
         // Plain Math.round doesn't just truncate
-        number = Math.round(number - number % 1)
+        number = Math.round(number - (number % 1))
         prefix = number < 0 ? '-' : positiveNumberPrefix
         value = prefix + _pad(String(Math.abs(number)), precision, '0', false)
 

src/php/strings/sprintf.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2007-2016 Kevin van Zonneveld (https://kvz.io)
+ * Copyright (c) 2007-2024 Kevin van Zonneveld (https://kvz.io)
  * and Contributors (https://locutus.io/authors)
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -61,7 +61,7 @@ module.exports = function sprintf () {
     if (!chr) {
       chr = ' '
     }
-    const padding = (str.length >= len) ? '' : new Array(1 + len - str.length >>> 0).join(chr)
+    const padding = str.length >= len ? '' : new Array((1 + len - str.length) >>> 0).join(chr)
     return leftJustify ? str + padding : padding + str
   }
 
@@ -72,11 +72,7 @@ module.exports = function sprintf () {
       // on the left side
       // keep sign (+ or -) in front
       if (!leftJustify && padChar === '0') {
-        value = [
-          value.slice(0, prefix.length),
-          _pad('', diff, '0', true),
-          value.slice(prefix.length)
-        ].join('')
+        value = [value.slice(0, prefix.length), _pad('', diff, '0', true), value.slice(prefix.length)].join('')
       } else {
         value = _pad(value, minWidth, padChar, leftJustify)
       }
@@ -145,7 +141,7 @@ module.exports = function sprintf () {
     }
 
     if (!precision) {
-      precision = (specifier === 'd') ? 0 : 'fFeE'.indexOf(specifier) > -1 ? 6 : undefined
+      precision = specifier === 'd' ? 0 : 'fFeE'.indexOf(specifier) > -1 ? 6 : undefined
     } else {
       precision = +precision
     }
@@ -174,15 +170,14 @@ module.exports = function sprintf () {
       case 'x':
         return _formatBaseX(value, 16, leftJustify, minWidth, precision, padChar)
       case 'X':
-        return _formatBaseX(value, 16, leftJustify, minWidth, precision, padChar)
-          .toUpperCase()
+        return _formatBaseX(value, 16, leftJustify, minWidth, precision, padChar).toUpperCase()
       case 'u':
         return _formatBaseX(value, 10, leftJustify, minWidth, precision, padChar)
       case 'i':
       case 'd':
         number = +value || 0
         // Plain Math.round doesn't just truncate
-        number = Math.round(number - number % 1)
+        number = Math.round(number - (number % 1))
         prefix = number < 0 ? '-' : positiveNumberPrefix
         value = prefix + _pad(String(Math.abs(number)), precision, '0', false)
 

src/php/strings/vsprintf.browser.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2007-2016 Kevin van Zonneveld (https://kvz.io)
+ * Copyright (c) 2007-2024 Kevin van Zonneveld (https://kvz.io)
  * and Contributors (https://locutus.io/authors)
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of

src/php/strings/vsprintf.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2007-2016 Kevin van Zonneveld (https://kvz.io)
+ * Copyright (c) 2007-2024 Kevin van Zonneveld (https://kvz.io)
  * and Contributors (https://locutus.io/authors)
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of