@naturalcycles/js-lib 14.166.0 → 14.167.0

package/dist/http/fetcher.js

@@ -524,6 +524,7 @@ class Fetcher {
             },
             init: (0, object_util_1._merge)({
                 ...this.cfg.init,
+                headers: { ...this.cfg.init.headers },
                 method: opt.method || this.cfg.init.method,
                 credentials: opt.credentials || this.cfg.init.credentials,
                 redirect: opt.redirect || this.cfg.init.redirect || 'follow',
@@ -549,6 +550,7 @@ class Fetcher {
             req.fullUrl += (req.fullUrl.includes('?') ? '&' : '?') + qs;
         }
         // setup request body
+        // Unless it's a well-defined input type (json, text) - content-type is set automatically by the native fetch
         if (opt.json !== undefined) {
             req.init.body = JSON.stringify(opt.json);
             req.init.headers['content-type'] = 'application/json';
@@ -563,8 +565,8 @@ class Fetcher {
             }
             else {
                 req.init.body = new URLSearchParams(opt.form);
+                req.init.headers['content-type'] = 'application/x-www-form-urlencoded';
             }
-            req.init.headers['content-type'] = 'application/x-www-form-urlencoded';
         }
         else if (opt.body !== undefined) {
             req.init.body = opt.body;

package/dist/object/deepEquals.d.ts

@@ -1,3 +1,10 @@
+/**
+ * deepEquals, but after JSON stringify/parse
+ * E.g if object A has extra properties with value `undefined` -
+ * it won't be _deepEquals true, but will be _deepJsonEquals true.
+ * (because JSON.stringify removes undefined properties).
+ */
+export declare function _deepJsonEquals(a: any, b: any): boolean;
 /**
  * Based on: https://github.com/epoberezkin/fast-deep-equal/
  */

package/dist/object/deepEquals.js

@@ -1,45 +1,60 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._deepEquals = void 0;
+exports._deepEquals = exports._deepJsonEquals = void 0;
 const isArray = Array.isArray;
 const keyList = Object.keys;
 const hasProp = Object.prototype.hasOwnProperty;
-/* eslint-disable eqeqeq */
+/**
+ * deepEquals, but after JSON stringify/parse
+ * E.g if object A has extra properties with value `undefined` -
+ * it won't be _deepEquals true, but will be _deepJsonEquals true.
+ * (because JSON.stringify removes undefined properties).
+ */
+function _deepJsonEquals(a, b) {
+    if (a === b)
+        return true;
+    const aj = JSON.stringify(a);
+    const bj = JSON.stringify(b);
+    if (aj === bj)
+        return true;
+    return _deepEquals(JSON.parse(aj), JSON.parse(bj));
+}
+exports._deepJsonEquals = _deepJsonEquals;
 /**
  * Based on: https://github.com/epoberezkin/fast-deep-equal/
  */
 function _deepEquals(a, b) {
     if (a === b)
         return true;
-    if (a && b && typeof a == 'object' && typeof b == 'object') {
+    if (a && b && typeof a === 'object' && typeof b === 'object') {
         const arrA = isArray(a);
         const arrB = isArray(b);
         let i;
         let length;
         let key;
+        if (arrA !== arrB)
+            return false;
         if (arrA && arrB) {
             length = a.length;
-            if (length != b.length)
+            if (length !== b.length)
                 return false;
             for (i = length; i-- !== 0;)
                 if (!_deepEquals(a[i], b[i]))
                     return false;
             return true;
         }
-        if (arrA != arrB)
-            return false;
         const dateA = a instanceof Date;
         const dateB = b instanceof Date;
-        if (dateA != dateB)
+        if (dateA !== dateB)
             return false;
         if (dateA && dateB)
-            return a.getTime() == b.getTime();
+            return a.getTime() === b.getTime();
         const regexpA = a instanceof RegExp;
         const regexpB = b instanceof RegExp;
-        if (regexpA != regexpB)
+        if (regexpA !== regexpB)
             return false;
         if (regexpA && regexpB)
-            return a.toString() == b.toString();
+            return a.toString() === b.toString();
         const keys = keyList(a);
         length = keys.length;
         if (length !== keyList(b).length)

package/dist-esm/http/fetcher.js

@@ -500,7 +500,7 @@ export class Fetcher {
             'logResponse',
             'logResponseBody',
             'debug',
-        ])), { started: Date.now() }), _omit(opt, ['method', 'headers', 'credentials'])), { inputUrl: opt.url || '', fullUrl: opt.url || '', retry: Object.assign(Object.assign({}, this.cfg.retry), _filterUndefinedValues(opt.retry || {})), init: _merge(Object.assign(Object.assign({}, this.cfg.init), { method: opt.method || this.cfg.init.method, credentials: opt.credentials || this.cfg.init.credentials, redirect: opt.redirect || this.cfg.init.redirect || 'follow' }), {
+        ])), { started: Date.now() }), _omit(opt, ['method', 'headers', 'credentials'])), { inputUrl: opt.url || '', fullUrl: opt.url || '', retry: Object.assign(Object.assign({}, this.cfg.retry), _filterUndefinedValues(opt.retry || {})), init: _merge(Object.assign(Object.assign({}, this.cfg.init), { headers: Object.assign({}, this.cfg.init.headers), method: opt.method || this.cfg.init.method, credentials: opt.credentials || this.cfg.init.credentials, redirect: opt.redirect || this.cfg.init.redirect || 'follow' }), {
                 headers: _mapKeys(opt.headers || {}, k => k.toLowerCase()),
             }) });
         // setup url
@@ -518,6 +518,7 @@ export class Fetcher {
             req.fullUrl += (req.fullUrl.includes('?') ? '&' : '?') + qs;
         }
         // setup request body
+        // Unless it's a well-defined input type (json, text) - content-type is set automatically by the native fetch
         if (opt.json !== undefined) {
             req.init.body = JSON.stringify(opt.json);
             req.init.headers['content-type'] = 'application/json';
@@ -532,8 +533,8 @@ export class Fetcher {
             }
             else {
                 req.init.body = new URLSearchParams(opt.form);
+                req.init.headers['content-type'] = 'application/x-www-form-urlencoded';
             }
-            req.init.headers['content-type'] = 'application/x-www-form-urlencoded';
         }
         else if (opt.body !== undefined) {
             req.init.body = opt.body;

package/dist-esm/object/deepEquals.js

@@ -1,42 +1,56 @@
 const isArray = Array.isArray;
 const keyList = Object.keys;
 const hasProp = Object.prototype.hasOwnProperty;
-/* eslint-disable eqeqeq */
+/**
+ * deepEquals, but after JSON stringify/parse
+ * E.g if object A has extra properties with value `undefined` -
+ * it won't be _deepEquals true, but will be _deepJsonEquals true.
+ * (because JSON.stringify removes undefined properties).
+ */
+export function _deepJsonEquals(a, b) {
+    if (a === b)
+        return true;
+    const aj = JSON.stringify(a);
+    const bj = JSON.stringify(b);
+    if (aj === bj)
+        return true;
+    return _deepEquals(JSON.parse(aj), JSON.parse(bj));
+}
 /**
  * Based on: https://github.com/epoberezkin/fast-deep-equal/
  */
 export function _deepEquals(a, b) {
     if (a === b)
         return true;
-    if (a && b && typeof a == 'object' && typeof b == 'object') {
+    if (a && b && typeof a === 'object' && typeof b === 'object') {
         const arrA = isArray(a);
         const arrB = isArray(b);
         let i;
         let length;
         let key;
+        if (arrA !== arrB)
+            return false;
         if (arrA && arrB) {
             length = a.length;
-            if (length != b.length)
+            if (length !== b.length)
                 return false;
             for (i = length; i-- !== 0;)
                 if (!_deepEquals(a[i], b[i]))
                     return false;
             return true;
         }
-        if (arrA != arrB)
-            return false;
         const dateA = a instanceof Date;
         const dateB = b instanceof Date;
-        if (dateA != dateB)
+        if (dateA !== dateB)
             return false;
         if (dateA && dateB)
-            return a.getTime() == b.getTime();
+            return a.getTime() === b.getTime();
         const regexpA = a instanceof RegExp;
         const regexpB = b instanceof RegExp;
-        if (regexpA != regexpB)
+        if (regexpA !== regexpB)
             return false;
         if (regexpA && regexpB)
-            return a.toString() == b.toString();
+            return a.toString() === b.toString();
         const keys = keyList(a);
         length = keys.length;
         if (length !== keyList(b).length)

package/package.json

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

package/src/http/fetcher.ts

@@ -637,13 +637,14 @@ export class Fetcher {
       init: _merge(
         {
           ...this.cfg.init,
+          headers: { ...this.cfg.init.headers }, // this avoids mutation
           method: opt.method || this.cfg.init.method,
           credentials: opt.credentials || this.cfg.init.credentials,
           redirect: opt.redirect || this.cfg.init.redirect || 'follow',
         },
         {
           headers: _mapKeys(opt.headers || {}, k => k.toLowerCase()),
-        } as RequestInit,
+        } satisfies RequestInit,
       ),
     }
     // setup url
@@ -667,6 +668,7 @@ export class Fetcher {
     }
 
     // setup request body
+    // Unless it's a well-defined input type (json, text) - content-type is set automatically by the native fetch
     if (opt.json !== undefined) {
       req.init.body = JSON.stringify(opt.json)
       req.init.headers['content-type'] = 'application/json'
@@ -678,9 +680,8 @@ export class Fetcher {
         req.init.body = opt.form
       } else {
         req.init.body = new URLSearchParams(opt.form)
+        req.init.headers['content-type'] = 'application/x-www-form-urlencoded'
       }
-
-      req.init.headers['content-type'] = 'application/x-www-form-urlencoded'
     } else if (opt.body !== undefined) {
       req.init.body = opt.body
     }

package/src/object/deepEquals.ts

@@ -2,7 +2,19 @@ const isArray = Array.isArray
 const keyList = Object.keys
 const hasProp = Object.prototype.hasOwnProperty
 
-/* eslint-disable eqeqeq */
+/**
+ * deepEquals, but after JSON stringify/parse
+ * E.g if object A has extra properties with value `undefined` -
+ * it won't be _deepEquals true, but will be _deepJsonEquals true.
+ * (because JSON.stringify removes undefined properties).
+ */
+export function _deepJsonEquals(a: any, b: any): boolean {
+  if (a === b) return true
+  const aj = JSON.stringify(a)
+  const bj = JSON.stringify(b)
+  if (aj === bj) return true
+  return _deepEquals(JSON.parse(aj), JSON.parse(bj))
+}
 
 /**
  * Based on: https://github.com/epoberezkin/fast-deep-equal/
@@ -10,31 +22,31 @@ const hasProp = Object.prototype.hasOwnProperty
 export function _deepEquals(a: any, b: any): boolean {
   if (a === b) return true
 
-  if (a && b && typeof a == 'object' && typeof b == 'object') {
+  if (a && b && typeof a === 'object' && typeof b === 'object') {
     const arrA = isArray(a)
     const arrB = isArray(b)
-    let i
-    let length
+    let i: number
+    let length: number
     let key: string
 
+    if (arrA !== arrB) return false
+
     if (arrA && arrB) {
       length = a.length
-      if (length != b.length) return false
+      if (length !== b.length) return false
       for (i = length; i-- !== 0; ) if (!_deepEquals(a[i], b[i])) return false
       return true
     }
 
-    if (arrA != arrB) return false
-
     const dateA = a instanceof Date
     const dateB = b instanceof Date
-    if (dateA != dateB) return false
-    if (dateA && dateB) return a.getTime() == b.getTime()
+    if (dateA !== dateB) return false
+    if (dateA && dateB) return a.getTime() === b.getTime()
 
     const regexpA = a instanceof RegExp
     const regexpB = b instanceof RegExp
-    if (regexpA != regexpB) return false
-    if (regexpA && regexpB) return a.toString() == b.toString()
+    if (regexpA !== regexpB) return false
+    if (regexpA && regexpB) return a.toString() === b.toString()
 
     const keys = keyList(a)
     length = keys.length