Merge pull request #75 from Milly/function-object

`isObjectOf` allows function object
jsr-core · Apr 14, 2024 · 38607b0 · 38607b0
2 parents b89d255 + 51091e2
commit 38607b0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/is.ts b/is.ts
@@ -454,7 +454,7 @@ export function isOptionalOf<T>(
   }
   return Object.defineProperties(
     setPredicateFactoryMetadata(
-      (x: unknown): x is Predicate<T | undefined> => x === undefined || pred(x),
+      (x: unknown): x is T | undefined => x === undefined || pred(x),
       { name: "isOptionalOf", args: [pred] },
     ),
     { optional: { value: true as const } },
@@ -1157,7 +1157,11 @@ export function isObjectOf<
   }
   return setPredicateFactoryMetadata(
     (x: unknown): x is ObjectOf<T> => {
-      if (x == null || typeof x !== "object" || Array.isArray(x)) return false;
+      if (
+        x == null ||
+        typeof x !== "object" && typeof x !== "function" ||
+        Array.isArray(x)
+      ) return false;
       // Check each values
       for (const k in predObj) {
         if (!predObj[k]((x as T)[k])) return false;

diff --git a/is_test.ts b/is_test.ts
@@ -1137,6 +1137,13 @@ Deno.test("isObjectOf<T>", async (t) => {
       true,
       "Object have an unknown property",
     );
+    assertEquals(
+      isObjectOf(predObj)(
+        Object.assign(() => void 0, { a: 0, b: "a", c: true }),
+      ),
+      true,
+      "Function object",
+    );
   });
   await t.step("returns false on non T object", () => {
     const predObj = {