Byte-shave typeof utils

Author: markerikson

src/core/immerClass.ts

@@ -26,6 +26,13 @@ import {
 	current,
 	ImmerScope,
 	registerChildFinalizationCallback,
+	ArchType,
+	MapSetPlugin,
+	AnyMap,
+	AnySet,
+	isObjectish,
+	isFunction,
+	isBoolean
 } from "../internal"
 
 interface ProducersFns {
@@ -45,11 +52,10 @@ export class Immer implements ProducersFns {
 		useStrictShallowCopy?: StrictMode
 		useStrictIteration?: boolean
 	}) {
-		if (typeof config?.autoFreeze === "boolean")
-			this.setAutoFreeze(config!.autoFreeze)
-		if (typeof config?.useStrictShallowCopy === "boolean")
+		if (isBoolean(config?.autoFreeze)) this.setAutoFreeze(config!.autoFreeze)
+		if (isBoolean(config?.useStrictShallowCopy))
 			this.setUseStrictShallowCopy(config!.useStrictShallowCopy)
-		if (typeof config?.useStrictIteration === "boolean")
+		if (isBoolean(config?.useStrictIteration))
 			this.setUseStrictIteration(config!.useStrictIteration)
 	}
 
@@ -74,7 +80,7 @@ export class Immer implements ProducersFns {
 	 */
 	produce: IProduce = (base: any, recipe?: any, patchListener?: any) => {
 		// curried invocation
-		if (typeof base === "function" && typeof recipe !== "function") {
+		if (isFunction(base) && !isFunction(recipe)) {
 			const defaultBase = recipe
 			recipe = base
 
@@ -88,9 +94,8 @@ export class Immer implements ProducersFns {
 			}
 		}
 
-		if (typeof recipe !== "function") die(6)
-		if (patchListener !== undefined && typeof patchListener !== "function")
-			die(7)
+		if (!isFunction(recipe)) die(6)
+		if (patchListener !== undefined && !isFunction(patchListener)) die(7)
 
 		let result
 
@@ -109,7 +114,7 @@ export class Immer implements ProducersFns {
 			}
 			usePatchesInScope(scope, patchListener)
 			return processResult(result, scope)
-		} else if (!base || typeof base !== "object") {
+		} else if (!base || !isObjectish(base)) {
 			result = recipe(base)
 			if (result === undefined) result = base
 			if (result === NOTHING) result = undefined
@@ -129,7 +134,7 @@ export class Immer implements ProducersFns {
 
 	produceWithPatches: IProduceWithPatches = (base: any, recipe?: any): any => {
 		// curried invocation
-		if (typeof base === "function") {
+		if (isFunction(base)) {
 			return (state: any, ...args: any[]) =>
 				this.produceWithPatches(state, (draft: any) => base(draft, ...args))
 		}

src/plugins/patches.ts

@@ -23,7 +23,9 @@ import {
 	errors,
 	DRAFT_STATE,
 	getProxyDraft,
-	ImmerScope
+	ImmerScope,
+	isObjectish,
+	isFunction
 } from "../internal"
 
 export function enablePatches() {
@@ -112,7 +114,7 @@ export function enablePatches() {
 		for (let i = 0; i < path.length - 1; i++) {
 			const key = path[i]
 			current = get(current, key)
-			if (typeof current !== "object" || current === null) {
+			if (!isObjectish(current) || current === null) {
 				throw new Error(`Cannot resolve path at '${path.join("/")}'`)
 			}
 		}
@@ -333,10 +335,9 @@ export function enablePatches() {
 					(p === "__proto__" || p === "constructor")
 				)
 					die(errorOffset + 3)
-				if (typeof base === "function" && p === "prototype")
-					die(errorOffset + 3)
+				if (isFunction(base) && p === "prototype") die(errorOffset + 3)
 				base = get(base, p)
-				if (typeof base !== "object") die(errorOffset + 2, path.join("/"))
+				if (!isObjectish(base)) die(errorOffset + 2, path.join("/"))
 			}
 
 			const type = getArchtype(base)

src/utils/common.ts

@@ -38,15 +38,14 @@ const objectCtorString = Object.prototype.constructor.toString()
 const cachedCtorStrings = new WeakMap()
 /*#__PURE__*/
 export function isPlainObject(value: any): boolean {
-	if (!value || typeof value !== "object") return false
 	const proto = Object.getPrototypeOf(value)
 	if (proto === null || proto === Object.prototype) return true
 
 	const Ctor =
 		Object.hasOwnProperty.call(proto, "constructor") && proto.constructor
 	if (Ctor === Object) return true
 
-	if (typeof Ctor !== "function") return false
+	if (!isFunction(Ctor)) return false
 
 	let ctorString = cachedCtorStrings.get(Ctor)
 	if (ctorString === undefined) {
@@ -160,8 +159,20 @@ export function isSet(target: any): target is AnySet {
 	return target instanceof Set
 }
 
+export function isObjectish(target: any) {
+	return typeof target === "object"
+}
+
+export function isFunction(target: any): target is Function {
+	return typeof target === "function"
+}
+
+export function isBoolean(target: any): target is boolean {
+	return typeof target === "boolean"
+}
+
 export function getProxyDraft<T extends any>(value: T): ImmerState | null {
-	if (typeof value !== "object") return null
+	if (!isObjectish(value)) return null
 	return (value as {[DRAFT_STATE]: any})?.[DRAFT_STATE]
 }
 
@@ -268,6 +279,6 @@ const dontMutateMethodOverride = {
 
 export function isFrozen(obj: any): boolean {
 	// Fast path: primitives and null/undefined are always "frozen"
-	if (obj === null || typeof obj !== "object") return true
 	return Object.isFrozen(obj)
+	if (obj === null || !isObjectish(obj)) return true
 }

src/utils/errors.ts

@@ -1,3 +1,5 @@
+import {isFunction} from "../internal"
+
 export const errors =
 	process.env.NODE_ENV !== "production"
 		? [
@@ -39,7 +41,7 @@ export const errors =
 export function die(error: number, ...args: any[]): never {
 	if (process.env.NODE_ENV !== "production") {
 		const e = errors[error]
-		const msg = typeof e === "function" ? e.apply(null, args as any) : e
+		const msg = isFunction(e) ? e.apply(null, args as any) : e
 		throw new Error(`[Immer] ${msg}`)
 	}
 	throw new Error(