feat(core): add isNullish guard and consolidate call sites

Author: logaretm

packages/core/src/shared-exports.ts

@@ -270,6 +270,7 @@ export {
   isErrorEvent,
   isEvent,
   isInstanceOf,
+  isNullish,
   isParameterizedString,
   isPlainObject,
   isPrimitive,

packages/core/src/utils/is.ts

@@ -220,3 +220,14 @@ export function isVueViewModel(wat: unknown): wat is VueViewModel | VNode {
 export function isRequest(request: unknown): request is Request {
   return typeof Request !== 'undefined' && isInstanceOf(request, Request);
 }
+
+/**
+ * Checks whether given value is `null` or `undefined`.
+ * {@link isNullish}.
+ *
+ * @param wat A value to be checked.
+ * @returns A boolean representing the result.
+ */
+export function isNullish(wat: unknown): wat is null | undefined {
+  return wat === null || wat === undefined;
+}

packages/core/test/lib/utils/is.test.ts

@@ -5,6 +5,7 @@ import {
   isError,
   isErrorEvent,
   isInstanceOf,
+  isNullish,
   isPlainObject,
   isPrimitive,
   isThenable,
@@ -192,3 +193,18 @@ describe('isPlainObject', () => {
     expect(isPlainObject(value)).toBe(expected);
   });
 });
+
+describe('isNullish()', () => {
+  test.each([
+    [null, true],
+    [undefined, true],
+    [0, false],
+    ['', false],
+    [false, false],
+    [NaN, false],
+    [{}, false],
+    [[], false],
+  ])('%s is %s', (value, expected) => {
+    expect(isNullish(value)).toBe(expected);
+  });
+});

packages/nitro/src/runtime/hooks/captureStorageEvents.ts

@@ -2,6 +2,7 @@ import * as dc from 'node:diagnostics_channel';
 import {
   flushIfServerless,
   GLOBAL_OBJ,
+  isNullish,
   SEMANTIC_ATTRIBUTE_CACHE_HIT,
   SEMANTIC_ATTRIBUTE_CACHE_KEY,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
@@ -99,10 +100,6 @@ function normalizeMethodName(methodName: string): string {
   return methodName.replace(/[A-Z]/g, letter => `_${letter.toLowerCase()}`);
 }
 
-function isEmptyValue(value: unknown): value is null | undefined {
-  return value === null || value === undefined;
-}
-
 interface CacheEntry<T = unknown> {
   value?: T;
   expires?: number;
@@ -116,7 +113,7 @@ interface ResponseCacheEntry {
 
 function isCacheHit(key: unknown, value: unknown): boolean {
   try {
-    const isEmpty = isEmptyValue(value);
+    const isEmpty = isNullish(value);
     if (isEmpty || typeof key !== 'string' || !CACHED_FN_HANDLERS_RE.test(key)) {
       return !isEmpty;
     }
@@ -133,7 +130,7 @@ function validateCacheEntry(
   key: string,
   entry: CacheEntry | CacheEntry<ResponseCacheEntry & { status: number }>,
 ): boolean {
-  if (isEmptyValue(entry.value)) {
+  if (isNullish(entry.value)) {
     return false;
   }
 

packages/nuxt/src/runtime/utils/instrumentStorage.ts

@@ -2,6 +2,7 @@ import {
   captureException,
   debug,
   flushIfServerless,
+  isNullish,
   SEMANTIC_ATTRIBUTE_CACHE_HIT,
   SEMANTIC_ATTRIBUTE_CACHE_KEY,
   SEMANTIC_ATTRIBUTE_SENTRY_OP,
@@ -209,13 +210,6 @@ function normalizeMethodName(methodName: string): string {
   return methodName.replace(/[A-Z]/g, letter => `_${letter.toLowerCase()}`);
 }
 
-/**
- * Checks if the value is empty, used for cache hit detection.
- */
-function isEmptyValue(value: unknown): value is null | undefined {
-  return value === null || value === undefined;
-}
-
 /**
  * Creates the span start options for the storage method.
  */
@@ -267,7 +261,7 @@ function normalizeKey(key: unknown, prefix: string): string {
     return `${prefix}${key.key}`;
   }
 
-  return `${prefix}${isEmptyValue(key) ? '' : String(key)}`;
+  return `${prefix}${isNullish(key) ? '' : String(key)}`;
 }
 
 const CACHED_FN_HANDLERS_RE = /^nitro:(functions|handlers):/i;
@@ -280,7 +274,7 @@ const CACHED_FN_HANDLERS_RE = /^nitro:(functions|handlers):/i;
  */
 function isCacheHit(key: unknown, value: unknown): boolean {
   try {
-    const isEmpty = isEmptyValue(value);
+    const isEmpty = isNullish(value);
     // Empty value means no cache hit either way
     // Or if key doesn't match the cached function or handler patterns, we can return the empty value check
     if (isEmpty || typeof key !== 'string' || !CACHED_FN_HANDLERS_RE.test(key)) {
@@ -301,7 +295,7 @@ function validateCacheEntry(
   key: string,
   entry: CacheEntry | CacheEntry<ResponseCacheEntry & { status: number }>,
 ): boolean {
-  if (isEmptyValue(entry.value)) {
+  if (isNullish(entry.value)) {
     return false;
   }