jsfunx 1.2.4 → 1.3.0

package/jsfunx.cjs

@@ -282,6 +282,21 @@ const T = new Proxy(
   }
 );
 
+/** @type {Set<string | null | undefined>} */
+
+const setOfTypes = new Set([
+  bi,
+  bool,
+  fn,
+  null,
+  num,
+  obj,
+  str,
+  sym,
+  undef,
+  undefined,
+]);
+
 /**
  * Compares a value or a list of values against a given type (or list of types),
  * similar to using `typeof x === y`, but in a more flexible and readable way.
@@ -298,23 +313,6 @@ const T = new Proxy(
  */
 
 function checkType(data, dataType, logic, match, strict) {
-  /** @type {Set<string | null | undefined>} */
-
-  const setOfTypes = new Set([
-    and,
-    bi,
-    bool,
-    fn,
-    null,
-    num,
-    obj,
-    or,
-    str,
-    sym,
-    undef,
-    undefined,
-  ]);
-
   if (!(dataType instanceof Array)) {
     if (!setOfTypes.has(dataType))
       throw new TypeError(`type '${String(dataType)}' undefined !`);
@@ -761,9 +759,9 @@ function checkType(data, dataType, logic, match, strict) {
   }
 
   if (data.length !== dataType.length) {
-    if (strict)
+    if (!$(strict))
       throw new TypeError(
-        "length of array of dataTypes must match number of data"
+        "the length of the dataTypes array must match the number of data items"
       );
 
     /** @type {number} */
@@ -1294,9 +1292,9 @@ function isinstancesof(objs, type, logic, match, strict) {
   }
 
   if (objs.length !== type.length) {
-    if (strict)
+    if (!$(strict))
       throw new TypeError(
-        "length of constructor functions array must match the number of objects"
+        "the length of the constructor functions array must match the number of objects"
       );
 
     /** @type {number} */

package/jsfunx.mjs

@@ -286,6 +286,21 @@ export const T = new Proxy(
   }
 );
 
+/** @type {Set<string | null | undefined>} */
+
+const setOfTypes = new Set([
+  bi,
+  bool,
+  fn,
+  null,
+  num,
+  obj,
+  str,
+  sym,
+  undef,
+  undefined,
+]);
+
 /**
  * Compares a value or a list of values against a given type (or list of types),
  * similar to using `typeof x === y`, but in a more flexible and readable way.
@@ -302,23 +317,6 @@ export const T = new Proxy(
  */
 
 function checkType(data, dataType, logic, match, strict) {
-  /** @type {Set<string | null | undefined>} */
-
-  const setOfTypes = new Set([
-    and,
-    bi,
-    bool,
-    fn,
-    null,
-    num,
-    obj,
-    or,
-    str,
-    sym,
-    undef,
-    undefined,
-  ]);
-
   if (!(dataType instanceof Array)) {
     if (!setOfTypes.has(dataType))
       throw new TypeError(`type '${String(dataType)}' undefined !`);
@@ -765,9 +763,9 @@ function checkType(data, dataType, logic, match, strict) {
   }
 
   if (data.length !== dataType.length) {
-    if (strict)
+    if (!$(strict))
       throw new TypeError(
-        "length of array of dataTypes must match number of data"
+        "the length of the dataTypes array must match the number of data items"
       );
 
     /** @type {number} */
@@ -1298,9 +1296,9 @@ function isinstancesof(objs, type, logic, match, strict) {
   }
 
   if (objs.length !== type.length) {
-    if (strict)
+    if (!$(strict))
       throw new TypeError(
-        "length of constructor functions array must match the number of objects"
+        "the length of the constructor functions array must match the number of objects"
       );
 
     /** @type {number} */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsfunx",
-  "version": "1.2.4",
+  "version": "1.3.0",
   "description": "JavaScript utility functions for cleaner, more readable code",
   "main": "./jsfunx.cjs",
   "module": "./jsfunx.mjs",