is-kit 1.1.9 → 1.1.11

package/README.md

@@ -74,7 +74,7 @@ import {
   optional,
   isNumber,
   isString,
-  predicateToRefine,
+  predicateToRefine
 } from 'is-kit';
 
 // Define small guards
@@ -94,7 +94,7 @@ const isUser = struct({
   id: isPositive, // number > 0
   name: isString, // string
   role: isRole, // 'admin' | 'member'
-  nickname: optional(isShortString), // string <= 3 | undefined
+  nickname: optional(isShortString) // string <= 3 | undefined
 });
 
 // Use them
@@ -132,7 +132,7 @@ import {
   isNegative,
   isZero,
   isNaN,
-  isInfiniteNumber,
+  isInfiniteNumber
 } from 'is-kit';
 
 // Any primitive
@@ -177,7 +177,7 @@ type User = { id: string; age: number; role: 'admin' | 'guest' | 'trial' };
 const isUser = struct({
   id: isString,
   age: isNumber,
-  role: oneOfValues('admin', 'guest', 'trial'),
+  role: oneOfValues('admin', 'guest', 'trial')
 });
 
 const byRole = narrowKeyTo(isUser, 'role');

package/dist/index.js

@@ -297,9 +297,7 @@ function tupleOf(...guards) {
 
 // src/core/combinators/one-of.ts
 function oneOf(...guards) {
-  const predicates = toBooleanPredicates(
-    guards
-  );
+  const predicates = toBooleanPredicates(guards);
   return (input) => predicates.some((guard) => guard(input));
 }
 
@@ -318,44 +316,41 @@ function recordOf(keyFunction, valueFunction) {
 }
 
 // src/core/combinators/struct.ts
+var hasRequiredKeys = (obj, schema, keys) => keys.every((key) => key in obj && schema[key](obj[key]));
+var hasOnlyAllowedKeys = (obj, allowed) => Object.keys(obj).every((key) => allowed.has(key));
 function struct(schema, options) {
   const schemaKeys = Object.keys(schema);
   const allowed = options?.exact ? new Set(schemaKeys) : null;
   return (input) => {
     if (!isPlainObject(input)) return false;
     const obj = input;
-    for (const key of schemaKeys) {
-      if (!(key in obj)) return false;
-      const guard = schema[key];
-      if (!guard(obj[key])) return false;
-    }
-    if (allowed) {
-      for (const key of Object.keys(obj)) {
-        if (!allowed.has(key)) return false;
-      }
-    }
-    return true;
+    if (!hasRequiredKeys(obj, schema, schemaKeys)) return false;
+    if (!allowed) return true;
+    return hasOnlyAllowedKeys(obj, allowed);
   };
 }
 
 // src/core/combinators/one-of-values.ts
 var ONE_OF_VALUES_LINEAR_SCAN_MAX = 8;
-function oneOfValues(...args) {
-  const isSingleArrayArg = define((value) => {
-    if (!Array.isArray(value)) return false;
-    return value.length === 1 && Array.isArray(value[0]);
-  });
-  const items = isSingleArrayArg(args) ? args[0] : args;
-  if (items.length <= ONE_OF_VALUES_LINEAR_SCAN_MAX) {
-    return function(input) {
-      return items.some((value) => Object.is(value, input));
-    };
-  }
+var isSingleArrayArg = define(
+  (value) => Array.isArray(value) && value.length === 1 && Array.isArray(value[0])
+);
+var isZeroNumber = and(
+  isNumber,
+  predicateToRefine((value) => value === 0)
+);
+var normalizeValues = (args) => isSingleArrayArg(args) ? args[0] : args;
+var createLinearPredicate = (items) => {
+  return function(input) {
+    return items.some((value) => Object.is(value, input));
+  };
+};
+var createSetPredicate = (items) => {
   let hasPositiveZero = false;
   let hasNegativeZero = false;
   const valueSet = /* @__PURE__ */ new Set();
   for (const literalValue of items) {
-    if (typeof literalValue === "number" && (Object.is(literalValue, 0) || Object.is(literalValue, -0))) {
+    if (isZeroNumber(literalValue)) {
       if (Object.is(literalValue, -0)) hasNegativeZero = true;
       else hasPositiveZero = true;
     } else {
@@ -363,11 +358,15 @@ function oneOfValues(...args) {
     }
   }
   return function(input) {
-    if (typeof input === "number" && (Object.is(input, 0) || Object.is(input, -0))) {
+    if (isZeroNumber(input)) {
       return Object.is(input, -0) ? hasNegativeZero : hasPositiveZero;
     }
     return valueSet.has(input);
   };
+};
+function oneOfValues(...args) {
+  const items = normalizeValues(args);
+  return items.length <= ONE_OF_VALUES_LINEAR_SCAN_MAX ? createLinearPredicate(items) : createSetPredicate(items);
 }
 
 // src/core/key.ts

package/dist/index.mjs

@@ -211,9 +211,7 @@ function tupleOf(...guards) {
 
 // src/core/combinators/one-of.ts
 function oneOf(...guards) {
-  const predicates = toBooleanPredicates(
-    guards
-  );
+  const predicates = toBooleanPredicates(guards);
   return (input) => predicates.some((guard) => guard(input));
 }
 
@@ -232,44 +230,41 @@ function recordOf(keyFunction, valueFunction) {
 }
 
 // src/core/combinators/struct.ts
+var hasRequiredKeys = (obj, schema, keys) => keys.every((key) => key in obj && schema[key](obj[key]));
+var hasOnlyAllowedKeys = (obj, allowed) => Object.keys(obj).every((key) => allowed.has(key));
 function struct(schema, options) {
   const schemaKeys = Object.keys(schema);
   const allowed = options?.exact ? new Set(schemaKeys) : null;
   return (input) => {
     if (!isPlainObject(input)) return false;
     const obj = input;
-    for (const key of schemaKeys) {
-      if (!(key in obj)) return false;
-      const guard = schema[key];
-      if (!guard(obj[key])) return false;
-    }
-    if (allowed) {
-      for (const key of Object.keys(obj)) {
-        if (!allowed.has(key)) return false;
-      }
-    }
-    return true;
+    if (!hasRequiredKeys(obj, schema, schemaKeys)) return false;
+    if (!allowed) return true;
+    return hasOnlyAllowedKeys(obj, allowed);
   };
 }
 
 // src/core/combinators/one-of-values.ts
 var ONE_OF_VALUES_LINEAR_SCAN_MAX = 8;
-function oneOfValues(...args) {
-  const isSingleArrayArg = define((value) => {
-    if (!Array.isArray(value)) return false;
-    return value.length === 1 && Array.isArray(value[0]);
-  });
-  const items = isSingleArrayArg(args) ? args[0] : args;
-  if (items.length <= ONE_OF_VALUES_LINEAR_SCAN_MAX) {
-    return function(input) {
-      return items.some((value) => Object.is(value, input));
-    };
-  }
+var isSingleArrayArg = define(
+  (value) => Array.isArray(value) && value.length === 1 && Array.isArray(value[0])
+);
+var isZeroNumber = and(
+  isNumber,
+  predicateToRefine((value) => value === 0)
+);
+var normalizeValues = (args) => isSingleArrayArg(args) ? args[0] : args;
+var createLinearPredicate = (items) => {
+  return function(input) {
+    return items.some((value) => Object.is(value, input));
+  };
+};
+var createSetPredicate = (items) => {
   let hasPositiveZero = false;
   let hasNegativeZero = false;
   const valueSet = /* @__PURE__ */ new Set();
   for (const literalValue of items) {
-    if (typeof literalValue === "number" && (Object.is(literalValue, 0) || Object.is(literalValue, -0))) {
+    if (isZeroNumber(literalValue)) {
       if (Object.is(literalValue, -0)) hasNegativeZero = true;
       else hasPositiveZero = true;
     } else {
@@ -277,11 +272,15 @@ function oneOfValues(...args) {
     }
   }
   return function(input) {
-    if (typeof input === "number" && (Object.is(input, 0) || Object.is(input, -0))) {
+    if (isZeroNumber(input)) {
       return Object.is(input, -0) ? hasNegativeZero : hasPositiveZero;
     }
     return valueSet.has(input);
   };
+};
+function oneOfValues(...args) {
+  const items = normalizeValues(args);
+  return items.length <= ONE_OF_VALUES_LINEAR_SCAN_MAX ? createLinearPredicate(items) : createSetPredicate(items);
 }
 
 // src/core/key.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "is-kit",
-  "version": "1.1.9",
+  "version": "1.1.11",
   "description": "Make 'isXXX' easier. Let's make your code type safe and more readable!",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",