element-pe 1.0.2 → 1.0.6

package/packages/utils/dist/es/dom.js

@@ -1,7 +1,7 @@
 import isServer from './isServer';
 import { camelize, isObject } from './util';
-const trim = function (s) {
-    return (s || '').replace(/^[\s\uFEFF]+|[\s\uFEFF]+$/g, '');
+const trimArr = function (s) {
+    return (s || '').split(' ').filter((item) => !!item.trim());
 };
 export const on = function (element, event, handler, useCapture = false) {
     if (element && event && handler) {
@@ -31,54 +31,47 @@ export function hasClass(el, cls) {
         return el.classList.contains(cls);
     }
     else {
-        return ` ${el.className} `.indexOf(` ${cls} `) > -1;
+        const className = el.getAttribute('class') || '';
+        return className.split(' ').includes(cls);
     }
 }
 export function addClass(el, cls) {
     if (!el)
         return;
-    let curClass = el.className;
-    const classes = (cls || '').split(' ');
-    for (let i = 0, j = classes.length; i < j; i++) {
-        const clsName = classes[i];
-        if (!clsName)
-            continue;
-        if (el.classList) {
-            el.classList.add(clsName);
-        }
-        else if (!hasClass(el, clsName)) {
-            curClass += ` ${clsName}`;
-        }
+    let className = el.getAttribute('class') || '';
+    const curClass = trimArr(className);
+    const classes = (cls || '')
+        .split(' ')
+        .filter((item) => !curClass.includes(item) && !!item.trim());
+    if (el.classList) {
+        el.classList.add(...classes);
     }
-    if (!el.classList) {
-        el.className = curClass;
+    else {
+        className += ` ${classes.join(' ')}`;
+        el.setAttribute('class', className);
     }
 }
 export function removeClass(el, cls) {
     if (!el || !cls)
         return;
-    const classes = cls.split(' ');
-    let curClass = ` ${el.className} `;
-    for (let i = 0, j = classes.length; i < j; i++) {
-        const clsName = classes[i];
-        if (!clsName)
-            continue;
-        if (el.classList) {
-            el.classList.remove(clsName);
-        }
-        else if (hasClass(el, clsName)) {
-            curClass = curClass.replace(` ${clsName} `, ' ');
-        }
-    }
-    if (!el.classList) {
-        el.className = trim(curClass);
+    const classes = trimArr(cls);
+    let curClass = el.getAttribute('class') || '';
+    if (el.classList) {
+        el.classList.remove(...classes);
+        return;
     }
+    classes.forEach((item) => {
+        curClass = curClass.replace(` ${item} `, ' ');
+    });
+    const className = trimArr(curClass).join(' ');
+    el.setAttribute('class', className);
 }
 export const getStyle = function (element, styleName) {
+    var _a;
     if (isServer)
-        return;
+        return '';
     if (!element || !styleName)
-        return null;
+        return '';
     styleName = camelize(styleName);
     if (styleName === 'float') {
         styleName = 'cssFloat';
@@ -87,7 +80,7 @@ export const getStyle = function (element, styleName) {
         const style = element.style[styleName];
         if (style)
             return style;
-        const computed = document.defaultView.getComputedStyle(element, '');
+        const computed = (_a = document.defaultView) === null || _a === void 0 ? void 0 : _a.getComputedStyle(element, '');
         return computed ? computed[styleName] : '';
     }
     catch (e) {
@@ -121,7 +114,7 @@ export function removeStyle(element, style) {
 }
 export const isScroll = (el, isVertical) => {
     if (isServer)
-        return;
+        return null;
     const determinedDirection = isVertical === null || isVertical === undefined;
     const overflow = determinedDirection
         ? getStyle(el, 'overflow')
@@ -150,7 +143,10 @@ export const isInContainer = (el, container) => {
         return false;
     const elRect = el.getBoundingClientRect();
     let containerRect;
-    if ([window, document, document.documentElement, null, undefined].includes(container)) {
+    if (container instanceof Element) {
+        containerRect = container.getBoundingClientRect();
+    }
+    else {
         containerRect = {
             top: 0,
             right: window.innerWidth,
@@ -158,9 +154,6 @@ export const isInContainer = (el, container) => {
             left: 0,
         };
     }
-    else {
-        containerRect = container.getBoundingClientRect();
-    }
     return (elRect.top < containerRect.bottom &&
         elRect.bottom > containerRect.top &&
         elRect.right > containerRect.left &&

package/packages/utils/dist/es/props.d.ts

@@ -4,6 +4,7 @@ declare const wrapperKey: unique symbol;
 export declare type PropWrapper<T> = {
     [wrapperKey]: T;
 };
+export declare const propKey: unique symbol;
 declare type ResolveProp<T> = ExtractPropTypes<{
     key: {
         type: T;
@@ -14,27 +15,39 @@ declare type ResolvePropType<T> = ResolveProp<T> extends {
     type: infer V;
 } ? V : ResolveProp<T>;
 declare type ResolvePropTypeWithReadonly<T> = Readonly<T> extends Readonly<Array<infer A>> ? ResolvePropType<A[]> : ResolvePropType<T>;
-declare type BuildPropOption<T, D, R, V, C> = {
+declare type IfUnknown<T, V> = [unknown] extends [T] ? V : T;
+export declare type BuildPropOption<T, D extends BuildPropType<T, V, C>, R, V, C> = {
     type?: T;
     values?: readonly V[];
     required?: R;
-    default?: R extends true ? never : D extends Record<string, unknown> | Array<any> ? () => D : D;
+    default?: R extends true ? never : D extends Record<string, unknown> | Array<any> ? () => D : (() => D) | D;
     validator?: ((val: any) => val is C) | ((val: any) => boolean);
 };
-declare type IfUnknown<T, V> = [unknown] extends T ? V : T;
-declare type BuildPropType<T, V, C> = (T extends PropWrapper<unknown> ? T[typeof wrapperKey] : [V] extends [never] ? ResolvePropTypeWithReadonly<T> : never) | V | C;
-declare type BuildPropDefault<D, R> = R extends true ? {
+declare type _BuildPropType<T, V, C> = (T extends PropWrapper<unknown> ? T[typeof wrapperKey] : [V] extends [never] ? ResolvePropTypeWithReadonly<T> : never) | V | C;
+export declare type BuildPropType<T, V, C> = _BuildPropType<IfUnknown<T, never>, IfUnknown<V, never>, IfUnknown<C, never>>;
+declare type _BuildPropDefault<T, D> = [T] extends [
+    Record<string, unknown> | Array<any> | Function
+] ? D : D extends () => T ? ReturnType<D> : D;
+export declare type BuildPropDefault<T, D, R> = R extends true ? {
     readonly default?: undefined;
 } : {
-    readonly default: Exclude<D, undefined> extends never ? undefined : Exclude<D extends Record<string, unknown> | Array<any> ? () => D : D, undefined>;
+    readonly default: Exclude<D, undefined> extends never ? undefined : Exclude<_BuildPropDefault<T, D>, undefined>;
 };
-declare type BuildPropReturn<T, D, R, V, C> = {
-    readonly type: PropType<BuildPropType<IfUnknown<T, never>, IfUnknown<V, never>, IfUnknown<C, never>>>;
+export declare type BuildPropReturn<T, D, R, V, C> = {
+    readonly type: PropType<BuildPropType<T, V, C>>;
     readonly required: IfUnknown<R, false>;
     readonly validator: ((val: unknown) => boolean) | undefined;
-} & BuildPropDefault<IfUnknown<D, never>, IfUnknown<R, false>>;
-export declare function buildProp<T = never, D extends (T extends PropWrapper<any> ? T[typeof wrapperKey] : ResolvePropTypeWithReadonly<T>) | V = never, R extends boolean = false, V = never, C = never>(option?: BuildPropOption<T, D, R, V, C>): BuildPropReturn<T, D, R, V, C>;
-export declare const buildProps: <O extends Record<string, BuildPropOption<any, any, any, any, any>>>(options: O) => { [K in keyof O]: O[K] extends BuildPropOption<infer T, infer D, infer R, infer V, infer C> ? BuildPropReturn<T, D, R, V, C> : never; };
+    [propKey]: true;
+} & BuildPropDefault<BuildPropType<T, V, C>, IfUnknown<D, never>, IfUnknown<R, false>>;
+export declare function buildProp<T = never, D extends BuildPropType<T, V, C> = never, R extends boolean = false, V = never, C = never>(option: BuildPropOption<T, D, R, V, C>, key?: string): BuildPropReturn<T, D, R, V, C>;
+declare type NativePropType = [
+    ((...args: any) => any) | {
+        new (...args: any): any;
+    } | undefined | null
+];
+export declare const buildProps: <O extends { [K in keyof O]: O[K] extends BuildPropReturn<any, any, any, any, any> ? O[K] : [O[K]] extends NativePropType ? O[K] : O[K] extends BuildPropOption<infer T, infer D, infer R, infer V, infer C> ? D extends BuildPropType<T, V, C> ? BuildPropOption<T, D, R, V, C> : never : never; }>(props: O) => { [K_1 in keyof O]: O[K_1] extends {
+    [propKey]: boolean;
+} ? O[K_1] : [O[K_1]] extends NativePropType ? O[K_1] : O[K_1] extends BuildPropOption<infer T_1, infer _D, infer R_1, infer V_1, infer C_1> ? BuildPropReturn<T_1, O[K_1]["default"], R_1, V_1, C_1> : never; };
 export declare const definePropType: <T>(val: any) => PropWrapper<T>;
 export declare const keyOf: <T>(arr: T) => (keyof T)[];
 export declare const mutable: <T extends readonly any[] | Record<string, unknown>>(val: T) => Mutable<T>;

package/packages/utils/dist/es/props.js

@@ -1,8 +1,11 @@
-import mapValues from 'lodash/mapValues';
-import { debugWarn } from './error';
+import { warn } from 'vue';
+import { isObject } from '@vue/shared';
+import fromPairs from 'lodash/fromPairs';
 const wrapperKey = Symbol();
-export function buildProp(option = {}) {
-    var _a;
+export const propKey = Symbol();
+export function buildProp(option, key) {
+    if (!isObject(option) || !!option[propKey])
+        return option;
     const { values, required, default: defaultValue, type, validator } = option;
     const _validator = values || validator
         ? (val) => {
@@ -15,19 +18,29 @@ export function buildProp(option = {}) {
             if (validator)
                 valid || (valid = validator(val));
             if (!valid && allowedValues.length > 0) {
-                debugWarn(`Vue warn`, `Invalid prop: Expected one of (${allowedValues.join(', ')}), got value ${val}`);
+                const allowValuesText = [...new Set(allowedValues)]
+                    .map((value) => JSON.stringify(value))
+                    .join(', ');
+                warn(`Invalid prop: validation failed${key ? ` for prop "${key}"` : ''}. Expected one of [${allowValuesText}], got value ${JSON.stringify(val)}.`);
             }
             return valid;
         }
         : undefined;
     return {
-        type: ((_a = type) === null || _a === void 0 ? void 0 : _a[wrapperKey]) || type,
+        type: typeof type === 'object' &&
+            Object.getOwnPropertySymbols(type).includes(wrapperKey)
+            ? type[wrapperKey]
+            : type,
         required: !!required,
         default: defaultValue,
         validator: _validator,
+        [propKey]: true,
     };
 }
-export const buildProps = (options) => mapValues(options, (option) => buildProp(option));
+export const buildProps = (props) => fromPairs(Object.entries(props).map(([key, option]) => [
+    key,
+    buildProp(option, key),
+]));
 export const definePropType = (val) => ({ [wrapperKey]: val });
 export const keyOf = (arr) => Object.keys(arr);
 export const mutable = (val) => val;

package/packages/utils/dist/es/util.d.ts

@@ -1,6 +1,6 @@
 import { camelize, capitalize, extend, hasOwn, isArray, isObject, isString, looseEqual } from '@vue/shared';
 import type { ComponentPublicInstance, CSSProperties, Ref } from 'vue';
-import type { AnyFunction, TimeoutHandle, Nullable } from './types';
+import type { TimeoutHandle, Nullable } from './types';
 export declare const SCOPE = "Util";
 export declare function toObject<T>(arr: Array<T>): Record<string, T>;
 export declare const getValueByPath: (obj: any, paths?: string) => unknown;
@@ -17,10 +17,10 @@ export declare const autoprefixer: (style: CSSProperties) => CSSProperties;
 export declare const kebabCase: (str: string) => string;
 export { isVNode } from 'vue';
 export { hasOwn, isObject, isArray, isString, capitalize, camelize, looseEqual, extend, };
-export declare const isBool: (val: unknown) => boolean;
-export declare const isNumber: (val: unknown) => boolean;
+export declare const isBool: (val: unknown) => val is boolean;
+export declare const isNumber: (val: unknown) => val is number;
 export declare const isHTMLElement: (val: unknown) => boolean;
-export declare function rafThrottle<T extends AnyFunction<any>>(fn: T): AnyFunction<void>;
+export declare function rafThrottle<T extends (...args: any) => any>(fn: T): T;
 export declare const clearTimer: (timer: Ref<TimeoutHandle>) => void;
 export declare function getRandomInt(max: number): number;
 export declare function isUndefined(val: any): val is undefined;

package/packages/utils/dist/es/util.js

@@ -2,7 +2,7 @@ import { getCurrentInstance } from 'vue';
 import { camelize, capitalize, extend, hasOwn, hyphenate, isArray, isObject, isString, isFunction, looseEqual, toRawType, } from '@vue/shared';
 import isEqualWith from 'lodash/isEqualWith';
 import isServer from './isServer';
-import { debugWarn } from './error';
+import { debugWarn, throwError } from './error';
 export const SCOPE = 'Util';
 export function toObject(arr) {
     const res = {};
@@ -41,7 +41,7 @@ export function getPropByPath(obj, path, strict) {
             }
             else {
                 if (strict) {
-                    throw new Error('please transfer a valid prop path to form item!');
+                    throwError(SCOPE, 'Please transfer a valid prop path to form item!');
                 }
                 break;
             }
@@ -92,7 +92,7 @@ export function rafThrottle(fn) {
             return;
         locked = true;
         window.requestAnimationFrame(() => {
-            fn.apply(this, args);
+            Reflect.apply(fn, this, args);
             locked = false;
         });
     };

package/packages/utils/dist/es/vnode.d.ts

@@ -16,12 +16,16 @@ export declare enum PatchFlags {
     HOISTED = -1,
     BAIL = -2
 }
-export declare const isFragment: (node: VNodeChild) => boolean;
+export declare const isFragment: (node: unknown) => node is VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    [key: string]: any;
+}>;
 export declare const isText: (node: VNodeChild) => boolean;
 export declare const isComment: (node: VNodeChild) => boolean;
 export declare const isTemplate: (node: VNodeChild) => boolean;
 declare function getChildren(node: VNode, depth: number): undefined | VNode;
-export declare const isValidElementNode: (node: VNodeChild) => boolean;
+export declare const isValidElementNode: (node: unknown) => node is VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    [key: string]: any;
+}>;
 export declare const getFirstValidNode: (nodes: VNodeChild, maxDepth?: number) => ReturnType<typeof getChildren>;
 export declare function renderIf(condition: boolean, node: VNodeTypes, props: any, children?: Children, patchFlag?: number, patchProps?: string[]): VNode<import("vue").RendererNode, import("vue").RendererElement, {
     [key: string]: any;

package/packages/utils/dist/es/vnode.js

@@ -19,7 +19,7 @@ export var PatchFlags;
     PatchFlags[PatchFlags["HOISTED"] = -1] = "HOISTED";
     PatchFlags[PatchFlags["BAIL"] = -2] = "BAIL";
 })(PatchFlags || (PatchFlags = {}));
-export const isFragment = (node) => node.type === Fragment;
+export const isFragment = (node) => isVNode(node) && node.type === Fragment;
 export const isText = (node) => node.type === Text;
 export const isComment = (node) => node.type === Comment;
 export const isTemplate = (node) => node.type === TEMPLATE;
@@ -33,7 +33,7 @@ function getChildren(node, depth) {
     }
     return node;
 }
-export const isValidElementNode = (node) => !(isFragment(node) || isComment(node));
+export const isValidElementNode = (node) => isVNode(node) && !isFragment(node) && !isComment(node);
 export const getFirstValidNode = (nodes, maxDepth = 3) => {
     if (Array.isArray(nodes)) {
         return getChildren(nodes[0], maxDepth);

package/packages/utils/dist/lib/dom.d.ts

@@ -3,15 +3,15 @@ import type { Nullable } from './types';
 export declare const on: (element: HTMLElement | Document | Window, event: string, handler: EventListenerOrEventListenerObject, useCapture?: boolean) => void;
 export declare const off: (element: HTMLElement | Document | Window, event: string, handler: EventListenerOrEventListenerObject, useCapture?: boolean) => void;
 export declare const once: (el: HTMLElement, event: string, fn: EventListener) => void;
-export declare function hasClass(el: HTMLElement, cls: string): boolean;
-export declare function addClass(el: HTMLElement, cls: string): void;
-export declare function removeClass(el: HTMLElement, cls: string): void;
+export declare function hasClass(el: HTMLElement | Element, cls: string): boolean;
+export declare function addClass(el: HTMLElement | Element, cls: string): void;
+export declare function removeClass(el: HTMLElement | Element, cls: string): void;
 export declare const getStyle: (element: HTMLElement, styleName: string) => string;
 export declare function setStyle(element: HTMLElement, styleName: CSSProperties | string, value?: string): void;
 export declare function removeStyle(element: HTMLElement, style: CSSProperties | string): void;
-export declare const isScroll: (el: HTMLElement, isVertical?: Nullable<boolean>) => RegExpMatchArray;
-export declare const getScrollContainer: (el: HTMLElement, isVertical?: Nullable<boolean>) => Window | HTMLElement;
-export declare const isInContainer: (el: HTMLElement, container: HTMLElement) => boolean;
+export declare const isScroll: (el: HTMLElement, isVertical?: Nullable<boolean>) => RegExpMatchArray | null;
+export declare const getScrollContainer: (el: HTMLElement, isVertical?: Nullable<boolean>) => Window | HTMLElement | undefined;
+export declare const isInContainer: (el: Element | undefined, container: Element | Window | undefined) => boolean;
 export declare const getOffsetTop: (el: HTMLElement) => number;
 export declare const getOffsetTopDistance: (el: HTMLElement, containerEl: HTMLElement) => number;
 export declare const stop: (e: Event) => void;

package/packages/utils/dist/lib/dom.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.stop = exports.getOffsetTopDistance = exports.getOffsetTop = exports.isInContainer = exports.getScrollContainer = exports.isScroll = exports.removeStyle = exports.setStyle = exports.getStyle = exports.removeClass = exports.addClass = exports.hasClass = exports.once = exports.off = exports.on = void 0;
 const isServer_1 = __importDefault(require("./isServer"));
 const util_1 = require("./util");
-const trim = function (s) {
-    return (s || '').replace(/^[\s\uFEFF]+|[\s\uFEFF]+$/g, '');
+const trimArr = function (s) {
+    return (s || '').split(' ').filter((item) => !!item.trim());
 };
 const on = function (element, event, handler, useCapture = false) {
     if (element && event && handler) {
@@ -40,57 +40,50 @@ function hasClass(el, cls) {
         return el.classList.contains(cls);
     }
     else {
-        return ` ${el.className} `.indexOf(` ${cls} `) > -1;
+        const className = el.getAttribute('class') || '';
+        return className.split(' ').includes(cls);
     }
 }
 exports.hasClass = hasClass;
 function addClass(el, cls) {
     if (!el)
         return;
-    let curClass = el.className;
-    const classes = (cls || '').split(' ');
-    for (let i = 0, j = classes.length; i < j; i++) {
-        const clsName = classes[i];
-        if (!clsName)
-            continue;
-        if (el.classList) {
-            el.classList.add(clsName);
-        }
-        else if (!hasClass(el, clsName)) {
-            curClass += ` ${clsName}`;
-        }
+    let className = el.getAttribute('class') || '';
+    const curClass = trimArr(className);
+    const classes = (cls || '')
+        .split(' ')
+        .filter((item) => !curClass.includes(item) && !!item.trim());
+    if (el.classList) {
+        el.classList.add(...classes);
     }
-    if (!el.classList) {
-        el.className = curClass;
+    else {
+        className += ` ${classes.join(' ')}`;
+        el.setAttribute('class', className);
     }
 }
 exports.addClass = addClass;
 function removeClass(el, cls) {
     if (!el || !cls)
         return;
-    const classes = cls.split(' ');
-    let curClass = ` ${el.className} `;
-    for (let i = 0, j = classes.length; i < j; i++) {
-        const clsName = classes[i];
-        if (!clsName)
-            continue;
-        if (el.classList) {
-            el.classList.remove(clsName);
-        }
-        else if (hasClass(el, clsName)) {
-            curClass = curClass.replace(` ${clsName} `, ' ');
-        }
-    }
-    if (!el.classList) {
-        el.className = trim(curClass);
+    const classes = trimArr(cls);
+    let curClass = el.getAttribute('class') || '';
+    if (el.classList) {
+        el.classList.remove(...classes);
+        return;
     }
+    classes.forEach((item) => {
+        curClass = curClass.replace(` ${item} `, ' ');
+    });
+    const className = trimArr(curClass).join(' ');
+    el.setAttribute('class', className);
 }
 exports.removeClass = removeClass;
 const getStyle = function (element, styleName) {
+    var _a;
     if (isServer_1.default)
-        return;
+        return '';
     if (!element || !styleName)
-        return null;
+        return '';
     styleName = (0, util_1.camelize)(styleName);
     if (styleName === 'float') {
         styleName = 'cssFloat';
@@ -99,7 +92,7 @@ const getStyle = function (element, styleName) {
         const style = element.style[styleName];
         if (style)
             return style;
-        const computed = document.defaultView.getComputedStyle(element, '');
+        const computed = (_a = document.defaultView) === null || _a === void 0 ? void 0 : _a.getComputedStyle(element, '');
         return computed ? computed[styleName] : '';
     }
     catch (e) {
@@ -136,7 +129,7 @@ function removeStyle(element, style) {
 exports.removeStyle = removeStyle;
 const isScroll = (el, isVertical) => {
     if (isServer_1.default)
-        return;
+        return null;
     const determinedDirection = isVertical === null || isVertical === undefined;
     const overflow = determinedDirection
         ? (0, exports.getStyle)(el, 'overflow')
@@ -167,7 +160,10 @@ const isInContainer = (el, container) => {
         return false;
     const elRect = el.getBoundingClientRect();
     let containerRect;
-    if ([window, document, document.documentElement, null, undefined].includes(container)) {
+    if (container instanceof Element) {
+        containerRect = container.getBoundingClientRect();
+    }
+    else {
         containerRect = {
             top: 0,
             right: window.innerWidth,
@@ -175,9 +171,6 @@ const isInContainer = (el, container) => {
             left: 0,
         };
     }
-    else {
-        containerRect = container.getBoundingClientRect();
-    }
     return (elRect.top < containerRect.bottom &&
         elRect.bottom > containerRect.top &&
         elRect.right > containerRect.left &&

package/packages/utils/dist/lib/props.d.ts

@@ -4,6 +4,7 @@ declare const wrapperKey: unique symbol;
 export declare type PropWrapper<T> = {
     [wrapperKey]: T;
 };
+export declare const propKey: unique symbol;
 declare type ResolveProp<T> = ExtractPropTypes<{
     key: {
         type: T;
@@ -14,27 +15,39 @@ declare type ResolvePropType<T> = ResolveProp<T> extends {
     type: infer V;
 } ? V : ResolveProp<T>;
 declare type ResolvePropTypeWithReadonly<T> = Readonly<T> extends Readonly<Array<infer A>> ? ResolvePropType<A[]> : ResolvePropType<T>;
-declare type BuildPropOption<T, D, R, V, C> = {
+declare type IfUnknown<T, V> = [unknown] extends [T] ? V : T;
+export declare type BuildPropOption<T, D extends BuildPropType<T, V, C>, R, V, C> = {
     type?: T;
     values?: readonly V[];
     required?: R;
-    default?: R extends true ? never : D extends Record<string, unknown> | Array<any> ? () => D : D;
+    default?: R extends true ? never : D extends Record<string, unknown> | Array<any> ? () => D : (() => D) | D;
     validator?: ((val: any) => val is C) | ((val: any) => boolean);
 };
-declare type IfUnknown<T, V> = [unknown] extends T ? V : T;
-declare type BuildPropType<T, V, C> = (T extends PropWrapper<unknown> ? T[typeof wrapperKey] : [V] extends [never] ? ResolvePropTypeWithReadonly<T> : never) | V | C;
-declare type BuildPropDefault<D, R> = R extends true ? {
+declare type _BuildPropType<T, V, C> = (T extends PropWrapper<unknown> ? T[typeof wrapperKey] : [V] extends [never] ? ResolvePropTypeWithReadonly<T> : never) | V | C;
+export declare type BuildPropType<T, V, C> = _BuildPropType<IfUnknown<T, never>, IfUnknown<V, never>, IfUnknown<C, never>>;
+declare type _BuildPropDefault<T, D> = [T] extends [
+    Record<string, unknown> | Array<any> | Function
+] ? D : D extends () => T ? ReturnType<D> : D;
+export declare type BuildPropDefault<T, D, R> = R extends true ? {
     readonly default?: undefined;
 } : {
-    readonly default: Exclude<D, undefined> extends never ? undefined : Exclude<D extends Record<string, unknown> | Array<any> ? () => D : D, undefined>;
+    readonly default: Exclude<D, undefined> extends never ? undefined : Exclude<_BuildPropDefault<T, D>, undefined>;
 };
-declare type BuildPropReturn<T, D, R, V, C> = {
-    readonly type: PropType<BuildPropType<IfUnknown<T, never>, IfUnknown<V, never>, IfUnknown<C, never>>>;
+export declare type BuildPropReturn<T, D, R, V, C> = {
+    readonly type: PropType<BuildPropType<T, V, C>>;
     readonly required: IfUnknown<R, false>;
     readonly validator: ((val: unknown) => boolean) | undefined;
-} & BuildPropDefault<IfUnknown<D, never>, IfUnknown<R, false>>;
-export declare function buildProp<T = never, D extends (T extends PropWrapper<any> ? T[typeof wrapperKey] : ResolvePropTypeWithReadonly<T>) | V = never, R extends boolean = false, V = never, C = never>(option?: BuildPropOption<T, D, R, V, C>): BuildPropReturn<T, D, R, V, C>;
-export declare const buildProps: <O extends Record<string, BuildPropOption<any, any, any, any, any>>>(options: O) => { [K in keyof O]: O[K] extends BuildPropOption<infer T, infer D, infer R, infer V, infer C> ? BuildPropReturn<T, D, R, V, C> : never; };
+    [propKey]: true;
+} & BuildPropDefault<BuildPropType<T, V, C>, IfUnknown<D, never>, IfUnknown<R, false>>;
+export declare function buildProp<T = never, D extends BuildPropType<T, V, C> = never, R extends boolean = false, V = never, C = never>(option: BuildPropOption<T, D, R, V, C>, key?: string): BuildPropReturn<T, D, R, V, C>;
+declare type NativePropType = [
+    ((...args: any) => any) | {
+        new (...args: any): any;
+    } | undefined | null
+];
+export declare const buildProps: <O extends { [K in keyof O]: O[K] extends BuildPropReturn<any, any, any, any, any> ? O[K] : [O[K]] extends NativePropType ? O[K] : O[K] extends BuildPropOption<infer T, infer D, infer R, infer V, infer C> ? D extends BuildPropType<T, V, C> ? BuildPropOption<T, D, R, V, C> : never : never; }>(props: O) => { [K_1 in keyof O]: O[K_1] extends {
+    [propKey]: boolean;
+} ? O[K_1] : [O[K_1]] extends NativePropType ? O[K_1] : O[K_1] extends BuildPropOption<infer T_1, infer _D, infer R_1, infer V_1, infer C_1> ? BuildPropReturn<T_1, O[K_1]["default"], R_1, V_1, C_1> : never; };
 export declare const definePropType: <T>(val: any) => PropWrapper<T>;
 export declare const keyOf: <T>(arr: T) => (keyof T)[];
 export declare const mutable: <T extends readonly any[] | Record<string, unknown>>(val: T) => Mutable<T>;

package/packages/utils/dist/lib/props.js

@@ -3,12 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.componentSize = exports.mutable = exports.keyOf = exports.definePropType = exports.buildProps = exports.buildProp = void 0;
-const mapValues_1 = __importDefault(require("lodash/mapValues"));
-const error_1 = require("./error");
+exports.componentSize = exports.mutable = exports.keyOf = exports.definePropType = exports.buildProps = exports.buildProp = exports.propKey = void 0;
+const vue_1 = require("vue");
+const shared_1 = require("@vue/shared");
+const fromPairs_1 = __importDefault(require("lodash/fromPairs"));
 const wrapperKey = Symbol();
-function buildProp(option = {}) {
-    var _a;
+exports.propKey = Symbol();
+function buildProp(option, key) {
+    if (!(0, shared_1.isObject)(option) || !!option[exports.propKey])
+        return option;
     const { values, required, default: defaultValue, type, validator } = option;
     const _validator = values || validator
         ? (val) => {
@@ -21,20 +24,30 @@ function buildProp(option = {}) {
             if (validator)
                 valid || (valid = validator(val));
             if (!valid && allowedValues.length > 0) {
-                (0, error_1.debugWarn)(`Vue warn`, `Invalid prop: Expected one of (${allowedValues.join(', ')}), got value ${val}`);
+                const allowValuesText = [...new Set(allowedValues)]
+                    .map((value) => JSON.stringify(value))
+                    .join(', ');
+                (0, vue_1.warn)(`Invalid prop: validation failed${key ? ` for prop "${key}"` : ''}. Expected one of [${allowValuesText}], got value ${JSON.stringify(val)}.`);
             }
             return valid;
         }
         : undefined;
     return {
-        type: ((_a = type) === null || _a === void 0 ? void 0 : _a[wrapperKey]) || type,
+        type: typeof type === 'object' &&
+            Object.getOwnPropertySymbols(type).includes(wrapperKey)
+            ? type[wrapperKey]
+            : type,
         required: !!required,
         default: defaultValue,
         validator: _validator,
+        [exports.propKey]: true,
     };
 }
 exports.buildProp = buildProp;
-const buildProps = (options) => (0, mapValues_1.default)(options, (option) => buildProp(option));
+const buildProps = (props) => (0, fromPairs_1.default)(Object.entries(props).map(([key, option]) => [
+    key,
+    buildProp(option, key),
+]));
 exports.buildProps = buildProps;
 const definePropType = (val) => ({ [wrapperKey]: val });
 exports.definePropType = definePropType;

package/packages/utils/dist/lib/util.d.ts

@@ -1,6 +1,6 @@
 import { camelize, capitalize, extend, hasOwn, isArray, isObject, isString, looseEqual } from '@vue/shared';
 import type { ComponentPublicInstance, CSSProperties, Ref } from 'vue';
-import type { AnyFunction, TimeoutHandle, Nullable } from './types';
+import type { TimeoutHandle, Nullable } from './types';
 export declare const SCOPE = "Util";
 export declare function toObject<T>(arr: Array<T>): Record<string, T>;
 export declare const getValueByPath: (obj: any, paths?: string) => unknown;
@@ -17,10 +17,10 @@ export declare const autoprefixer: (style: CSSProperties) => CSSProperties;
 export declare const kebabCase: (str: string) => string;
 export { isVNode } from 'vue';
 export { hasOwn, isObject, isArray, isString, capitalize, camelize, looseEqual, extend, };
-export declare const isBool: (val: unknown) => boolean;
-export declare const isNumber: (val: unknown) => boolean;
+export declare const isBool: (val: unknown) => val is boolean;
+export declare const isNumber: (val: unknown) => val is number;
 export declare const isHTMLElement: (val: unknown) => boolean;
-export declare function rafThrottle<T extends AnyFunction<any>>(fn: T): AnyFunction<void>;
+export declare function rafThrottle<T extends (...args: any) => any>(fn: T): T;
 export declare const clearTimer: (timer: Ref<TimeoutHandle>) => void;
 export declare function getRandomInt(max: number): number;
 export declare function isUndefined(val: any): val is undefined;