deep-guards 1.0.3 → 1.0.4

package/README.md

@@ -186,6 +186,8 @@ NOTE: This passes for empty records
 
 This is a function which takes in a structured object, containing keys of type `string | number | symbol`, and then values which are guard functions.
 
+This also takes in a second boolean parameter for if the guard should check that the keys exactly match the structured guard object's keys. It then doesn't let any "leaky" objects through, which have extra keys. This defaults to false.
+
 As seen in the example at the start of this readme, you can do all sorts of complex nesting, as this produces a guard in the end.
 
 NOTE: This throws an error if you give it an empty object.\
@@ -197,7 +199,8 @@ These are common use cases for guarding setups, where they are made entirely out
 
 ### isDiscriminatedObjectOf
 
-This takes in a string literal `type`, and an `isObjectOf` guard. This then combines the two, where the returned guard has the signature: `Guard<{ type: T } & O>`.
+This takes in a string literal for the discriminated value, and an `isObjectOf` guard, and then an optional key specifying which key is for the discriminated union. This then combines the object with the discriminator, where the returned guard has the signature: `Guard<{ [key]: T } & O>`.
+
 This is good for use cases where you don't have a discriminator on an individual type, but then do have it on the union type. For example:
 
 ```ts

package/dist/compound.d.ts

@@ -1,4 +1,5 @@
-import { Guard, GuardSchemaOf } from "./types";
+import { GuardSchemaOf } from "./helpers";
+import { Guard } from "./types";
 export declare function isOptional<T>(guard: Guard<T>): Guard<T | undefined>;
 export declare function isNullable<T>(guard: Guard<T>): Guard<T | null | undefined>;
 export declare function isNonNullable<T>(value: T | null | undefined): value is T;

package/dist/compound.js

@@ -1,3 +1,4 @@
+import { objectKeys } from "./helpers";
 export function isOptional(guard) {
     if (typeof guard !== "function") {
         throw new TypeError(`isOptional expects a guard parameter. Got instead: ${guard}`);
@@ -35,20 +36,29 @@ export function isIntersectionOf(...guards) {
     }
     return (value) => guards.every((guard) => guard(value));
 }
-function isEqual(a, b) {
-    return (a === b ||
-        (a != null &&
-            b != null &&
-            typeof a === "object" &&
-            typeof b === "object" &&
-            (Array.isArray(a)
-                ? Array.isArray(b) &&
-                    a.length === b.length &&
-                    a.every((v, i) => isEqual(v, b[i]))
-                : Object.keys(a).length === Object.keys(b).length &&
-                    Object.entries(a).every(([k, v]) => k in b && isEqual(v, b[k])))));
+function objectEntriesChecks(a, b) {
+    const aKeys = objectKeys(a);
+    const bKeySet = new Set(objectKeys(b));
+    return (aKeys.length === bKeySet.size &&
+        aKeys.every((k) => bKeySet.has(k) && isExact(a[k], true)(b[k])));
 }
 export function isExact(expected, deep = true) {
-    return (value) => deep ? isEqual(expected, value) : expected === value;
+    return (value) => 
+    // Shallow checks
+    expected === value ||
+        (Number.isNaN(expected) && Number.isNaN(value)) ||
+        (deep &&
+            (Array.isArray(expected)
+                ? // Array checks
+                    Array.isArray(value) &&
+                        expected.length === value.length &&
+                        expected.every((v, i) => isExact(v, true)(value[i]))
+                : // Object checks
+                    expected != null &&
+                        value != null &&
+                        typeof expected === "object" &&
+                        typeof value === "object" &&
+                        !Array.isArray(value) &&
+                        objectEntriesChecks(expected, value)));
 }
 //# sourceMappingURL=compound.js.map

package/dist/compound.js.map

@@ -1 +1 @@
-{"version":3,"file":"compound.js","sourceRoot":"src/","sources":["compound.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,UAAU,CAAI,KAAe;IAC3C,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;QAChC,MAAM,IAAI,SAAS,CACjB,sDAAsD,KAAK,EAAE,CAC9D,CAAC;IACJ,CAAC;IAED,OAAO,CAAC,KAAK,EAA0B,EAAE,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;AAChF,CAAC;AAED,MAAM,UAAU,UAAU,CAAI,KAAe;IAC3C,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;QAChC,MAAM,IAAI,SAAS,CACjB,sDAAsD,KAAK,EAAE,CAC9D,CAAC;IACJ,CAAC;IAED,OAAO,CAAC,KAAc,EAAiC,EAAE,CACvD,KAAK,IAAI,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,aAAa,CAAI,KAA2B;IAC1D,OAAO,KAAK,IAAI,IAAI,CAAC;AACvB,CAAC;AAED,MAAM,UAAU,KAAK,CAAU,KAAe;IAC5C,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE,CAAC;QAChC,MAAM,IAAI,SAAS,CACjB,iDAAiD,KAAK,EAAE,CACzD,CAAC;IACJ,CAAC;IAED,OAAO,CAAU,KAAY,EAAc,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,OAAO,CAErB,GAAG,MAAS;IACZ,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;IACjC,OAAO,CAAC,KAAc,EAAsB,EAAE,CAC5C,QAAQ,CAAC,GAAG,CAAC,KAAkB,CAAC,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,SAAS,CACvB,GAAG,MAAwB;IAE3B,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,UAAU,CAAC,EAAE,CAAC;QACzD,MAAM,IAAI,SAAS,CACjB,sDAAsD,MAAM,EAAE,CAC/D,CAAC;IACJ,CAAC;IAED,OAAO,CAAC,KAAK,EAAc,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;AACrE,CAAC;AASD,MAAM,UAAU,gBAAgB,CAC9B,GAAG,MAAwB;IAE3B,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,KAAK,UAAU,CAAC,EAAE,CAAC;QACzD,MAAM,IAAI,SAAS,CACjB,6DAA6D,MAAM,EAAE,CACtE,CAAC;IACJ,CAAC;IAED,OAAO,CAAC,KAAK,EAAmC,EAAE,CAChD,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,OAAO,CAAI,CAAI,EAAE,CAAU;IAClC,OAAO,CACL,CAAC,KAAK,CAAC;QACP,CAAC,CAAC,IAAI,IAAI;YACR,CAAC,IAAI,IAAI;YACT,OAAO,CAAC,KAAK,QAAQ;YACrB,OAAO,CAAC,KAAK,QAAQ;YACrB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;gBACf,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;oBAChB,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;oBACrB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACrC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM;oBAC/C,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CACrB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,CAAC,EAAG,CAA6B,CAAC,CAAC,CAAC,CAAC,CACpE,CAAC,CAAC,CACV,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,OAAO,CAAU,QAAW,EAAE,OAAgB,IAAI;IAChE,OAAO,CAAC,KAAK,EAAc,EAAE,CAC3B,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,KAAK,KAAK,CAAC;AACzD,CAAC"}
+{"version":3,"file":"compound.js","sourceRoot":"src/","sources":["compound.ts"],"names":[],"mappings":"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"}

package/dist/helpers.d.ts

@@ -0,0 +1,9 @@
+import { Guard } from "./types";
+export type GuardSchemaOf<O extends object> = {
+    [K in keyof O]: Guard<O[K]>;
+};
+export type ObjectKey = string | number | symbol;
+export declare const objectKeys: <K extends ObjectKey>(obj: Record<K, unknown>) => K[];
+export declare function omit<O extends object>(obj: O, key: keyof O): {
+    [K in keyof O as K extends typeof key ? never : K]: O[K];
+};

package/dist/helpers.js

@@ -0,0 +1,8 @@
+export const objectKeys = (obj) => Object.getOwnPropertyNames(obj).concat(Object.getOwnPropertySymbols(obj));
+export function omit(obj, key) {
+    const omitted = { ...obj };
+    // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+    delete omitted[key];
+    return omitted;
+}
+//# sourceMappingURL=helpers.js.map

package/dist/helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"helpers.js","sourceRoot":"src/","sources":["helpers.ts"],"names":[],"mappings":"AAQA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAsB,GAAuB,EAAO,EAAE,CAC7E,MAAM,CAAC,mBAAmB,CAAC,GAAG,CAAS,CAAC,MAAM,CAC7C,MAAM,CAAC,qBAAqB,CAAC,GAAG,CAAQ,CACzC,CAAC;AAEJ,MAAM,UAAU,IAAI,CAClB,GAAM,EACN,GAAY;IAEZ,MAAM,OAAO,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC;IAC3B,gEAAgE;IAChE,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC;IACpB,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/macros.d.ts

@@ -1,4 +1,8 @@
+import { ObjectKey } from "./helpers";
 import { Guard } from "./types";
-export declare const isDiscriminatedObjectOf: <T extends string, O extends object>(type: T, guard: Guard<O>) => Guard<{
+export declare function isDiscriminatedObjectOf<const T extends string, O extends object>(value: T, guard: Guard<O>): Guard<{
     type: T;
 } & O>;
+export declare function isDiscriminatedObjectOf<const T extends string, O extends object, const K extends ObjectKey>(value: T, guard: Guard<O>, key: K): Guard<{
+    [S in K]: T;
+} & O>;

package/dist/macros.js

@@ -1,4 +1,8 @@
-import { isExact, isIntersectionOf } from "./compound";
+import { isExact } from "./compound";
+import { omit } from "./helpers";
 import { isObjectOf } from "./structures";
-export const isDiscriminatedObjectOf = (type, guard) => isIntersectionOf(isObjectOf({ type: isExact(type) }), guard);
+export function isDiscriminatedObjectOf(value, guard, key = "type") {
+    const discriminatorGuard = isObjectOf({ [key]: isExact(value) });
+    return (value) => discriminatorGuard(value) && guard(omit(value, key));
+}
 //# sourceMappingURL=macros.js.map

package/dist/macros.js.map

@@ -1 +1 @@
-{"version":3,"file":"macros.js","sourceRoot":"src/","sources":["macros.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,IAAO,EACP,KAAe,EACS,EAAE,CAC1B,gBAAgB,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,KAAK,CAE1D,CAAC"}
+{"version":3,"file":"macros.js","sourceRoot":"src/","sources":["macros.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAa,IAAI,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAY1C,MAAM,UAAU,uBAAuB,CAIrC,KAAQ,EACR,KAAe,EACf,MAAiB,MAAM;IAEvB,MAAM,kBAAkB,GAAG,UAAU,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAE7D,CAAC;IACH,OAAO,CAAC,KAAK,EAAyC,EAAE,CACtD,kBAAkB,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;AACzD,CAAC"}

package/dist/structures.d.ts

@@ -1,10 +1,11 @@
-import { Guard, GuardSchemaOf } from "./types";
-type ObjectKey = string | number | symbol;
+import { GuardSchemaOf, ObjectKey } from "./helpers";
+import { Guard } from "./types";
 export declare const isAnyArray: Guard<unknown[]>;
 export declare const isAnyRecord: Guard<Record<ObjectKey, unknown>>;
 export declare function isArrayOf<T>(guard: Guard<T>): Guard<T[]>;
 export declare function isTupleOf<T extends readonly unknown[]>(...tupleGuards: GuardSchemaOf<T>): Guard<T>;
 export declare function isRecordOf<K extends ObjectKey>(keyGuard: Guard<K>): Guard<Record<K, unknown>>;
 export declare function isRecordOf<K extends ObjectKey, V>(keyGuard: Guard<K>, valueGuard: Guard<V>): Guard<Record<K, V>>;
-export declare function isObjectOf<O extends object>(schema: GuardSchemaOf<O>): O extends unknown[] ? never : {} extends O ? never : Guard<O>;
+type IsObjectOfGuard<O extends object> = O extends unknown[] ? never : {} extends O ? never : Guard<O>;
+export declare function isObjectOf<O extends object>(schema: GuardSchemaOf<O>, exactKeys?: boolean): IsObjectOfGuard<O>;
 export {};

package/dist/structures.js

@@ -1,6 +1,4 @@
-function objectKeys(obj) {
-    return Object.getOwnPropertyNames(obj).concat(Object.getOwnPropertySymbols(obj));
-}
+import { objectKeys } from "./helpers";
 export const isAnyArray = (value) => Array.isArray(value);
 export const isAnyRecord = (value) => value != null && typeof value === "object" && !Array.isArray(value);
 export function isArrayOf(guard) {
@@ -29,9 +27,10 @@ export function isRecordOf(keyGuard, valueGuard) {
         !Array.isArray(value) &&
         objectKeys(value).every((key) => keyGuard(key) && (valueGuard?.(value[key]) ?? true));
 }
-export function isObjectOf(schema) {
-    if (schema == null || typeof schema !== "object") {
-        throw new TypeError(`isObjectOf expects a guard schema object. Got instead: ${schema}`);
+export function isObjectOf(schema, exactKeys = false) {
+    const schemaUnknown = schema;
+    if (schemaUnknown == null || typeof schemaUnknown !== "object") {
+        throw new TypeError(`isObjectOf expects a guard schema object. Got instead: ${schemaUnknown}`);
     }
     const schemaKeys = objectKeys(schema);
     if (Array.isArray(schema) ||
@@ -44,6 +43,7 @@ export function isObjectOf(schema) {
     return ((value) => value != null &&
         typeof value === "object" &&
         !Array.isArray(value) &&
+        (!exactKeys || schemaKeys.length === objectKeys(value).length) &&
         schemaKeys.every((key) => key in value && schema[key](value[key])));
 }
 //# sourceMappingURL=structures.js.map

package/dist/structures.js.map

@@ -1 +1 @@
-{"version":3,"file":"structures.js","sourceRoot":"src/","sources":["structures.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"structures.js","sourceRoot":"src/","sources":["structures.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts

@@ -1,5 +1,2 @@
 export type Guard<T> = (value: unknown) => value is T;
-export type GuardSchemaOf<O extends object> = {
-    [K in keyof O]: Guard<O[K]>;
-};
 export type TypeFromGuard<G extends Guard<unknown>> = G extends Guard<infer T> ? T : never;

package/package.json

@@ -8,7 +8,7 @@
   "type": "module",
   "types": "dist/index.d.ts",
   "homepage": "https://github.com/eniallator/Deep-Guards",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "scripts": {
     "test": "jest",
     "build": "tsc",

package/src/compound.ts

@@ -1,4 +1,5 @@
-import { Guard, GuardSchemaOf } from "./types";
+import { GuardSchemaOf, objectKeys } from "./helpers";
+import { Guard } from "./types";
 
 export function isOptional<T>(guard: Guard<T>): Guard<T | undefined> {
   if (typeof guard !== "function") {
@@ -75,25 +76,31 @@ export function isIntersectionOf<T extends readonly unknown[]>(
     guards.every((guard) => guard(value));
 }
 
-function isEqual<T>(a: T, b: unknown): b is T {
+function objectEntriesChecks<T extends object>(a: T, b: object): b is T {
+  const aKeys = objectKeys(a);
+  const bKeySet = new Set(objectKeys(b));
   return (
-    a === b ||
-    (a != null &&
-      b != null &&
-      typeof a === "object" &&
-      typeof b === "object" &&
-      (Array.isArray(a)
-        ? Array.isArray(b) &&
-          a.length === b.length &&
-          a.every((v, i) => isEqual(v, b[i]))
-        : Object.keys(a).length === Object.keys(b).length &&
-          Object.entries(a).every(
-            ([k, v]) => k in b && isEqual(v, (b as Record<string, unknown>)[k])
-          )))
+    aKeys.length === bKeySet.size &&
+    aKeys.every((k) => bKeySet.has(k) && isExact(a[k], true)(b[k]))
   );
 }
 
 export function isExact<const T>(expected: T, deep: boolean = true): Guard<T> {
   return (value): value is T =>
-    deep ? isEqual(expected, value) : expected === value;
+    // Shallow checks
+    expected === value ||
+    (Number.isNaN(expected) && Number.isNaN(value)) ||
+    (deep &&
+      (Array.isArray(expected)
+        ? // Array checks
+          Array.isArray(value) &&
+          expected.length === value.length &&
+          expected.every((v, i) => isExact(v, true)(value[i]))
+        : // Object checks
+          expected != null &&
+          value != null &&
+          typeof expected === "object" &&
+          typeof value === "object" &&
+          !Array.isArray(value) &&
+          objectEntriesChecks(expected, value)));
 }

package/src/helpers.ts

@@ -0,0 +1,22 @@
+import { Guard } from "./types";
+
+export type GuardSchemaOf<O extends object> = {
+  [K in keyof O]: Guard<O[K]>;
+};
+
+export type ObjectKey = string | number | symbol;
+
+export const objectKeys = <K extends ObjectKey>(obj: Record<K, unknown>): K[] =>
+  (Object.getOwnPropertyNames(obj) as K[]).concat(
+    Object.getOwnPropertySymbols(obj) as K[]
+  );
+
+export function omit<O extends object>(
+  obj: O,
+  key: keyof O
+): { [K in keyof O as K extends typeof key ? never : K]: O[K] } {
+  const omitted = { ...obj };
+  // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+  delete omitted[key];
+  return omitted;
+}

package/src/macros.ts

@@ -1,11 +1,28 @@
-import { isExact, isIntersectionOf } from "./compound";
+import { isExact } from "./compound";
+import { ObjectKey, omit } from "./helpers";
 import { isObjectOf } from "./structures";
 import { Guard } from "./types";
 
-export const isDiscriminatedObjectOf = <T extends string, O extends object>(
-  type: T,
-  guard: Guard<O>
-): Guard<{ type: T } & O> =>
-  isIntersectionOf(isObjectOf({ type: isExact(type) }), guard) satisfies Guard<
-    { type: T } & O
-  >;
+export function isDiscriminatedObjectOf<
+  const T extends string,
+  O extends object
+>(value: T, guard: Guard<O>): Guard<{ type: T } & O>;
+export function isDiscriminatedObjectOf<
+  const T extends string,
+  O extends object,
+  const K extends ObjectKey
+>(value: T, guard: Guard<O>, key: K): Guard<{ [S in K]: T } & O>;
+export function isDiscriminatedObjectOf<
+  const T extends string,
+  O extends object
+>(
+  value: T,
+  guard: Guard<O>,
+  key: ObjectKey = "type"
+): Guard<{ [S in typeof key]: T } & O> {
+  const discriminatorGuard = isObjectOf({ [key]: isExact(value) }) as Guard<{
+    [S in typeof key]: T;
+  }>;
+  return (value): value is { [S in typeof key]: T } & O =>
+    discriminatorGuard(value) && guard(omit(value, key));
+}

package/src/structures.ts

@@ -1,12 +1,5 @@
-import { Guard, GuardSchemaOf } from "./types";
-
-type ObjectKey = string | number | symbol;
-
-function objectKeys<K extends ObjectKey>(obj: Record<K, unknown>): K[] {
-  return (Object.getOwnPropertyNames(obj) as K[]).concat(
-    Object.getOwnPropertySymbols(obj) as K[]
-  );
-}
+import { GuardSchemaOf, ObjectKey, objectKeys } from "./helpers";
+import { Guard } from "./types";
 
 export const isAnyArray: Guard<unknown[]> = (value) => Array.isArray(value);
 
@@ -72,12 +65,21 @@ export function isRecordOf<K extends ObjectKey, V>(
     );
 }
 
+type IsObjectOfGuard<O extends object> = O extends unknown[]
+  ? never
+  : // eslint-disable-next-line @typescript-eslint/no-empty-object-type
+  {} extends O
+  ? never
+  : Guard<O>;
+
 export function isObjectOf<O extends object>(
-  schema: GuardSchemaOf<O>
-): O extends unknown[] ? never : {} extends O ? never : Guard<O> {
-  if (schema == null || typeof schema !== "object") {
+  schema: GuardSchemaOf<O>,
+  exactKeys: boolean = false
+): IsObjectOfGuard<O> {
+  const schemaUnknown: unknown = schema;
+  if (schemaUnknown == null || typeof schemaUnknown !== "object") {
     throw new TypeError(
-      `isObjectOf expects a guard schema object. Got instead: ${schema}`
+      `isObjectOf expects a guard schema object. Got instead: ${schemaUnknown}`
     );
   }
 
@@ -99,7 +101,8 @@ export function isObjectOf<O extends object>(
     value != null &&
     typeof value === "object" &&
     !Array.isArray(value) &&
+    (!exactKeys || schemaKeys.length === objectKeys(value).length) &&
     schemaKeys.every(
       (key) => key in value && schema[key]((value as O)[key])
-    )) as O extends unknown[] ? never : {} extends O ? never : Guard<O>;
+    )) as IsObjectOfGuard<O>;
 }

package/src/types.ts

@@ -1,9 +1,5 @@
 export type Guard<T> = (value: unknown) => value is T;
 
-export type GuardSchemaOf<O extends object> = {
-  [K in keyof O]: Guard<O[K]>;
-};
-
 export type TypeFromGuard<G extends Guard<unknown>> = G extends Guard<infer T>
   ? T
   : never;

package/tests/macros.test.ts

@@ -1,15 +1,38 @@
 import { isDiscriminatedObjectOf, isObjectOf, isString } from "../src";
 
 describe("isDiscriminatedObjectOf", () => {
-  const guard = isDiscriminatedObjectOf("foo", isObjectOf({ bar: isString }));
+  describe("no key override", () => {
+    const guard = isDiscriminatedObjectOf(
+      "foo",
+      isObjectOf({ bar: isString }, true)
+    );
 
-  it("succeeds for an object of the value", () => {
-    expect(guard({ type: "foo", bar: "baz" })).toBe(true);
+    it("succeeds for an object of the value", () => {
+      expect(guard({ type: "foo", bar: "baz" })).toBe(true);
+    });
+
+    it("fails for any other value", () => {
+      expect(guard({ type: "foo" })).toBe(false);
+      expect(guard({ bar: "baz" })).toBe(false);
+      expect(guard(1)).toBe(false);
+    });
   });
 
-  it("fails for any other value", () => {
-    expect(guard({ type: "foo" })).toBe(false);
-    expect(guard({ bar: "baz" })).toBe(false);
-    expect(guard(1)).toBe(false);
+  describe("overriding key", () => {
+    const guard = isDiscriminatedObjectOf(
+      "foo",
+      isObjectOf({ bar: isString }, true),
+      "test"
+    );
+
+    it("succeeds for an object of the value", () => {
+      expect(guard({ test: "foo", bar: "baz" })).toBe(true);
+    });
+
+    it("fails for any other value", () => {
+      expect(guard({ test: "foo" })).toBe(false);
+      expect(guard({ bar: "baz" })).toBe(false);
+      expect(guard(1)).toBe(false);
+    });
   });
 });

package/tests/structures.test.ts

@@ -65,35 +65,80 @@ describe("isTupleOf", () => {
 });
 
 describe("isObjectOf", () => {
-  const barSymbol = Symbol("bar");
-  const guard = isObjectOf({
-    foo: isString,
-    [barSymbol]: isNumber,
-    baz: isObjectOf({
-      qux: isSymbol,
-    }),
-  });
+  describe("leaky", () => {
+    const barSymbol = Symbol("bar");
+    const guard = isObjectOf({
+      foo: isString,
+      [barSymbol]: isNumber,
+      baz: isObjectOf({
+        qux: isSymbol,
+      }),
+    });
+
+    it("succeeds for an object of the value", () => {
+      expect(
+        guard({
+          foo: "hello",
+          [barSymbol]: 1,
+          baz: { qux: Symbol("world!") },
+          quux: "this should not be checked",
+        })
+      ).toBe(true);
+    });
 
-  it("succeeds for an object of the value", () => {
-    expect(
-      guard({
-        foo: "hello",
-        [barSymbol]: 1,
-        baz: { qux: Symbol("world!") },
-        quux: "this should not be checked",
-      })
-    ).toBe(true);
+    it("fails for any other value", () => {
+      expect(
+        guard({
+          foo: "hello",
+          [barSymbol]: "FAIL",
+          baz: { qux: Symbol("world!") },
+        })
+      ).toBe(false);
+      expect(guard(1)).toBe(false);
+    });
   });
 
-  it("fails for any other value", () => {
-    expect(
-      guard({
-        foo: "hello",
-        [barSymbol]: "FAIL",
-        baz: { qux: Symbol("world!") },
-      })
-    ).toBe(false);
-    expect(guard(1)).toBe(false);
+  describe("exact keys", () => {
+    const barSymbol = Symbol("bar");
+    const guard = isObjectOf(
+      {
+        foo: isString,
+        [barSymbol]: isNumber,
+        baz: isObjectOf({
+          qux: isSymbol,
+        }),
+      },
+      true
+    );
+
+    it("succeeds for an object of the value", () => {
+      expect(
+        guard({
+          foo: "hello",
+          [barSymbol]: 1,
+          baz: { qux: Symbol("world!") },
+        })
+      ).toBe(true);
+    });
+
+    it("fails for any other value", () => {
+      expect(
+        guard({
+          foo: "hello",
+          [barSymbol]: 1,
+          baz: { qux: Symbol("world!") },
+          quux: "this should be checked",
+        })
+      ).toBe(false);
+      expect(
+        guard({
+          foo: "hello",
+          [barSymbol]: "FAIL",
+          baz: { qux: Symbol("world!") },
+        })
+      ).toBe(false);
+      expect(guard(1)).toBe(false);
+    });
   });
 });