@naturalcycles/js-lib 14.115.1 → 14.115.2

package/dist/string/string.util.js

@@ -40,7 +40,9 @@ exports._removeWhitespace = _removeWhitespace;
 function _truncate(s, maxLen, omission = '...') {
     if (!s || s.length <= maxLen)
         return s;
-    return s.substr(0, maxLen - omission.length) + omission;
+    if (maxLen <= omission.length)
+        return omission;
+    return s.slice(0, maxLen - omission.length) + omission;
 }
 exports._truncate = _truncate;
 /**
@@ -50,30 +52,32 @@ exports._truncate = _truncate;
 function _truncateMiddle(s, maxLen, omission = '...') {
     if (!s || s.length <= maxLen)
         return s;
+    if (maxLen <= omission.length)
+        return omission;
     const mark1 = Math.round((maxLen - omission.length) / 2);
     const mark2 = s.length - Math.floor((maxLen - omission.length) / 2);
-    return s.substr(0, mark1) + omission + s.substr(mark2);
+    return s.slice(0, mark1) + omission + s.slice(mark2);
 }
 exports._truncateMiddle = _truncateMiddle;
 // These functions are modeled after Kotlin's String API
 function _substringBefore(s, delimiter) {
     const pos = s.indexOf(delimiter);
-    return s.substr(0, pos !== -1 ? pos : undefined);
+    return s.slice(0, pos !== -1 ? pos : undefined);
 }
 exports._substringBefore = _substringBefore;
 function _substringBeforeLast(s, delimiter) {
     const pos = s.lastIndexOf(delimiter);
-    return s.substr(0, pos !== -1 ? pos : undefined);
+    return s.slice(0, pos !== -1 ? pos : undefined);
 }
 exports._substringBeforeLast = _substringBeforeLast;
 function _substringAfter(s, delimiter) {
     const pos = s.indexOf(delimiter);
-    return pos !== -1 ? s.substr(pos + 1) : s;
+    return pos !== -1 ? s.slice(pos + 1) : s;
 }
 exports._substringAfter = _substringAfter;
 function _substringAfterLast(s, delimiter) {
     const pos = s.lastIndexOf(delimiter);
-    return pos !== -1 ? s.substr(pos + 1) : s;
+    return pos !== -1 ? s.slice(pos + 1) : s;
 }
 exports._substringAfterLast = _substringAfterLast;
 /**

package/dist-esm/string/string.util.js

@@ -32,7 +32,9 @@ export function _removeWhitespace(s) {
 export function _truncate(s, maxLen, omission = '...') {
     if (!s || s.length <= maxLen)
         return s;
-    return s.substr(0, maxLen - omission.length) + omission;
+    if (maxLen <= omission.length)
+        return omission;
+    return s.slice(0, maxLen - omission.length) + omission;
 }
 /**
  * _.truncateMiddle('abcdefghijklmnopqrstuvwxyz', 10)
@@ -41,26 +43,28 @@ export function _truncate(s, maxLen, omission = '...') {
 export function _truncateMiddle(s, maxLen, omission = '...') {
     if (!s || s.length <= maxLen)
         return s;
+    if (maxLen <= omission.length)
+        return omission;
     const mark1 = Math.round((maxLen - omission.length) / 2);
     const mark2 = s.length - Math.floor((maxLen - omission.length) / 2);
-    return s.substr(0, mark1) + omission + s.substr(mark2);
+    return s.slice(0, mark1) + omission + s.slice(mark2);
 }
 // These functions are modeled after Kotlin's String API
 export function _substringBefore(s, delimiter) {
     const pos = s.indexOf(delimiter);
-    return s.substr(0, pos !== -1 ? pos : undefined);
+    return s.slice(0, pos !== -1 ? pos : undefined);
 }
 export function _substringBeforeLast(s, delimiter) {
     const pos = s.lastIndexOf(delimiter);
-    return s.substr(0, pos !== -1 ? pos : undefined);
+    return s.slice(0, pos !== -1 ? pos : undefined);
 }
 export function _substringAfter(s, delimiter) {
     const pos = s.indexOf(delimiter);
-    return pos !== -1 ? s.substr(pos + 1) : s;
+    return pos !== -1 ? s.slice(pos + 1) : s;
 }
 export function _substringAfterLast(s, delimiter) {
     const pos = s.lastIndexOf(delimiter);
-    return pos !== -1 ? s.substr(pos + 1) : s;
+    return pos !== -1 ? s.slice(pos + 1) : s;
 }
 /**
  * Returns the substring between LAST `leftDelimiter` and then FIRST `rightDelimiter`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.115.1",
+  "version": "14.115.2",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",

package/src/string/string.util.ts

@@ -36,8 +36,8 @@ export function _removeWhitespace(s: string): string {
  */
 export function _truncate(s: string, maxLen: number, omission = '...'): string {
   if (!s || s.length <= maxLen) return s
-
-  return s.substr(0, maxLen - omission.length) + omission
+  if (maxLen <= omission.length) return omission
+  return s.slice(0, maxLen - omission.length) + omission
 }
 
 /**
@@ -46,32 +46,33 @@ export function _truncate(s: string, maxLen: number, omission = '...'): string {
  */
 export function _truncateMiddle(s: string, maxLen: number, omission = '...'): string {
   if (!s || s.length <= maxLen) return s
+  if (maxLen <= omission.length) return omission
 
   const mark1 = Math.round((maxLen - omission.length) / 2)
   const mark2 = s.length - Math.floor((maxLen - omission.length) / 2)
-  return s.substr(0, mark1) + omission + s.substr(mark2)
+  return s.slice(0, mark1) + omission + s.slice(mark2)
 }
 
 // These functions are modeled after Kotlin's String API
 
 export function _substringBefore(s: string, delimiter: string): string {
   const pos = s.indexOf(delimiter)
-  return s.substr(0, pos !== -1 ? pos : undefined)
+  return s.slice(0, pos !== -1 ? pos : undefined)
 }
 
 export function _substringBeforeLast(s: string, delimiter: string): string {
   const pos = s.lastIndexOf(delimiter)
-  return s.substr(0, pos !== -1 ? pos : undefined)
+  return s.slice(0, pos !== -1 ? pos : undefined)
 }
 
 export function _substringAfter(s: string, delimiter: string): string {
   const pos = s.indexOf(delimiter)
-  return pos !== -1 ? s.substr(pos + 1) : s
+  return pos !== -1 ? s.slice(pos + 1) : s
 }
 
 export function _substringAfterLast(s: string, delimiter: string): string {
   const pos = s.lastIndexOf(delimiter)
-  return pos !== -1 ? s.substr(pos + 1) : s
+  return pos !== -1 ? s.slice(pos + 1) : s
 }
 
 /**