fix(utils): 修复 isNil 方法逻辑错误 KNXCloud#41

knight.chen · knight.chen · commit 2607a751b060 · 2022-11-15T23:33:31.000+08:00
diff --git a/packages/utils/src/check.ts b/packages/utils/src/check.ts
@@ -4,7 +4,7 @@ export type ESModule = {
 };
 
 export function isNil<T>(val: T | null | undefined): val is null | undefined {
-  return val === null && val === undefined;
+  return val === null || val === undefined;
 }
 
 export function isObject(val: unknown): val is Record<string, unknown> {
diff --git a/packages/vue-simulator-renderer/src/utils/check.ts b/packages/vue-simulator-renderer/src/utils/check.ts
@@ -1,7 +1,7 @@
 export function isNil<T = unknown>(val: T): val is NonNullable<T> {
-  return val !== null && val !== undefined;
+  return val === null || val === undefined;
 }
 
 export function isObject(el: unknown): el is Record<string | number | symbol, unknown> {
-  return isNil(el) && typeof el === 'object';
+  return !isNil(el) && typeof el === 'object';
 }
diff --git a/packages/vue-simulator-renderer/src/utils/comp-node.ts b/packages/vue-simulator-renderer/src/utils/comp-node.ts
@@ -1,8 +1,7 @@
 import type { ComponentInternalInstance, VNode } from 'vue';
 import type { ComponentInstance } from '../interface';
-import { isNil } from '@knxcloud/lowcode-utils';
 import { isProxy } from 'vue';
-import { isObject } from './check';
+import { isObject, isNil } from './check';
 
 const SYMBOL_VDID = Symbol('_LCDocId');
 const SYMBOL_VNID = Symbol('_LCNodeId');

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ export type ESModule = {`
`4`	`4`	`};`
`5`	`5`
`6`	`6`	`export function isNil<T>(val: T \| null \| undefined): val is null \| undefined {`
`7`		`- return val === null && val === undefined;`
	`7`	`+ return val === null \|\| val === undefined;`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`export function isObject(val: unknown): val is Record<string, unknown> {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`export function isNil<T = unknown>(val: T): val is NonNullable<T> {`
`2`		`- return val !== null && val !== undefined;`
	`2`	`+ return val === null \|\| val === undefined;`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`export function isObject(el: unknown): el is Record<string \| number \| symbol, unknown> {`
`6`		`- return isNil(el) && typeof el === 'object';`
	`6`	`+ return !isNil(el) && typeof el === 'object';`
`7`	`7`	`}`