Skip to content

isObjectOf allows function object #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 14, 2024
Merged

isObjectOf allows function object #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
748257e
:bug: Remove unnecessary generics
Milly Apr 14, 2024
51091e2
:+1: `isObjectOf` allows function object
Milly Apr 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions is.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 } },
Expand Down Expand Up @@ -1145,7 +1145,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;
Expand Down
7 changes: 7 additions & 0 deletions is_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down