phecda-core 2.0.1-alpha.0 → 2.1.0-alpha.2

package/dist/index.d.ts

@@ -1,10 +1,6 @@
 interface NameSpace {
     [name: string]: Phecda;
 }
-interface UsePipeOptions {
-    transform?: boolean;
-    collectError?: boolean;
-}
 interface InjectData {
     [key: string]: any;
 }
@@ -28,61 +24,13 @@ type ClassValue<I> = {
 interface Events {
 }
 
-declare function getBind<M extends new (...args: any) => any>(Model: M): any;
-declare function plainToClass<M extends new (...args: any) => any, Data extends Record<PropertyKey, any>>(Model: M, input: Data, options?: UsePipeOptions): Promise<{
-    err: string[];
-    data: InstanceType<M>;
-}>;
-declare function classToValue<M>(instance: M): ClassValue<M>;
-declare function to<T extends (...args: any) => any>(task: T, oldTasks?: Function[]): {
-    to: <R extends (arg: ReturnType<T>) => any>(task: R) => {
-        to: <R_1 extends (arg: ReturnType<R>) => any>(task: R_1) => {
-            to: <R_2 extends (arg: ReturnType<R_1>) => any>(task: R_2) => {
-                to: <R_3 extends (arg: ReturnType<R_2>) => any>(task: R_3) => {
-                    to: <R_4 extends (arg: ReturnType<R_3>) => any>(task: R_4) => {
-                        to: <R_5 extends (arg: ReturnType<R_4>) => any>(task: R_5) => {
-                            to: <R_6 extends (arg: ReturnType<R_5>) => any>(task: R_6) => {
-                                to: <R_7 extends (arg: ReturnType<R_6>) => any>(task: R_7) => {
-                                    to: <R_8 extends (arg: ReturnType<R_7>) => any>(task: R_8) => {
-                                        to: <R_9 extends (arg: ReturnType<R_8>) => any>(task: R_9) => {
-                                            to: <R_10 extends (arg: ReturnType<R_9>) => any>(task: R_10) => any;
-                                            value: Function[];
-                                        };
-                                        value: Function[];
-                                    };
-                                    value: Function[];
-                                };
-                                value: Function[];
-                            };
-                            value: Function[];
-                        };
-                        value: Function[];
-                    };
-                    value: Function[];
-                };
-                value: Function[];
-            };
-            value: Function[];
-        };
-        value: Function[];
-    };
-    value: Function[];
-};
-declare function snapShot<T extends new (...args: any) => any>(data: InstanceType<T>): {
-    data: InstanceType<T>;
-    clear(): void;
-    apply(): void;
-};
-declare function addDecoToClass<M extends new (...args: any) => any>(c: M, key: keyof InstanceType<M> | string, handler: ((target: any, key: PropertyKey) => void), type?: 'static' | 'class' | 'normal'): void;
-
 declare function Init(target: any, key: PropertyKey): void;
 declare function Bind(value: any): (target: any, k: PropertyKey) => void;
-declare function Rule(rule: RegExp | string | ((arg: any) => boolean | 'ok') | number, info: string | ((k: string) => string), meta?: any): (obj: any, key: PropertyKey) => void;
 declare function Ignore(target: any, key: PropertyKey): void;
 declare function Clear(target: any, key: PropertyKey): void;
 declare function Err<Fn extends (...args: any) => any>(cb: Fn): (target: any, key: PropertyKey) => void;
 declare function Expose(target: any, key: PropertyKey): void;
-declare function Pipe(v: ReturnType<typeof to>): (obj: any, key: PropertyKey) => void;
+declare function To(cb: (arg: any, instance: any, key: string) => any): (obj: any, key: PropertyKey) => void;
 declare function Tag(tag: string): (target: any) => void;
 declare function Assign(cb: (instance?: any) => any): (target: any) => void;
 declare function Global(target: any): void;
@@ -90,9 +38,20 @@ declare function Empty(_target: any): void;
 declare const DataMap: InjectData;
 declare function Provide<K extends keyof InjectData>(key: K, value: InjectData[K]): void;
 declare function Inject<K extends keyof InjectData>(key: K): InjectData[K];
+declare function Nested<M extends new (...args: any) => any>(Model: M): (obj: any, key: PropertyKey) => void;
 
-declare function validate(p: RegExp | string | Function | Object | Number, v: any): Promise<any>;
 declare function getTag<M extends new (...args: any) => any>(Model: M): any;
+declare function getSymbol<M extends new (...args: any) => any>(instance: InstanceType<M>): any;
+declare function getBind<M extends new (...args: any) => any>(Model: M): any;
+declare function plainToClass<M extends new (...args: any) => any, Data extends Record<PropertyKey, any>>(Model: M, input: Data): InstanceType<M>;
+declare function transformClass<M extends new (...args: any) => any>(instance: InstanceType<M>, force?: boolean): Promise<string[]>;
+declare function classToValue<M>(instance: M): ClassValue<M>;
+declare function snapShot<T extends new (...args: any) => any>(data: InstanceType<T>): {
+    data: InstanceType<T>;
+    clear(): void;
+    apply(): void;
+};
+declare function addDecoToClass<M extends new (...args: any) => any>(c: M, key: keyof InstanceType<M> | string, handler: ((target: any, key: PropertyKey) => void), type?: 'static' | 'class' | 'normal'): void;
 
 declare function isPhecda(target: any): any;
 declare function init(target: Phecda): void;
@@ -126,24 +85,4 @@ declare function Watcher(eventName: keyof Events, options?: {
 declare function Effect(eventName: string, options?: any): (obj: any, key: string) => void;
 declare function Storage(storeKey?: string): (target: any, key?: PropertyKey) => void;
 
-declare function isOption(): (obj: any, key: PropertyKey) => void;
-declare function isArray(info?: string): (obj: any, key: PropertyKey) => void;
-declare function isBoolean(info?: string): (obj: any, key: PropertyKey) => void;
-declare function isNumber(info?: string): (obj: any, key: PropertyKey) => void;
-declare function isString(info?: string): (obj: any, key: PropertyKey) => void;
-declare function isObject(info?: string): (obj: any, key: PropertyKey) => void;
-declare function isMobile(info?: string): (obj: any, key: PropertyKey) => void;
-declare function isLandline(info?: string): (obj: any, key: PropertyKey) => void;
-declare function isMailBox(info?: string): (obj: any, key: PropertyKey) => void;
-declare function isIdCard(info?: string): (obj: any, key: PropertyKey) => void;
-declare function isCnName(info?: string): (obj: any, key: PropertyKey) => void;
-declare function isEnName(info?: string): (obj: any, key: PropertyKey) => void;
-declare function isDate(info?: string): (obj: any, key: PropertyKey) => void;
-declare function isWechat(info?: string): (obj: any, key: PropertyKey) => void;
-declare function isHexColor(info?: string): (obj: any, key: PropertyKey) => void;
-declare function isPostalCode(info?: string): (obj: any, key: PropertyKey) => void;
-
-declare function toNumber(): (obj: any, key: PropertyKey) => void;
-declare function toString(): (obj: any, key: PropertyKey) => void;
-
-export { Assign, Bind, ClassValue, Clear, DataMap, Effect, Empty, Err, Events, Expose, Global, Handler, Ignore, Init, Inject, InjectData, NameSpace, Phecda, Pipe, Provide, Rule, Storage, Tag, UsePipeOptions, Watcher, activeInstance, addDecoToClass, classToValue, getBind, getExposeKey, getHandler, getInitEvent, getModelState, getOwnExposeKey, getOwnHandler, getOwnIgnoreKey, getOwnInitEvent, getOwnModelState, getOwnState, getProperty, getState, getTag, init, injectProperty, isArray, isBoolean, isCnName, isDate, isEnName, isHexColor, isIdCard, isLandline, isMailBox, isMobile, isNumber, isObject, isOption, isPhecda, isPostalCode, isString, isWechat, plainToClass, regisHandler, regisInitEvent, register, registerAsync, setExposeKey, setIgnoreKey, setModelVar, setState, snapShot, to, toNumber, toString, validate };
+export { Assign, Bind, ClassValue, Clear, DataMap, Effect, Empty, Err, Events, Expose, Global, Handler, Ignore, Init, Inject, InjectData, NameSpace, Nested, Phecda, Provide, Storage, Tag, To, Watcher, activeInstance, addDecoToClass, classToValue, getBind, getExposeKey, getHandler, getInitEvent, getModelState, getOwnExposeKey, getOwnHandler, getOwnIgnoreKey, getOwnInitEvent, getOwnModelState, getOwnState, getProperty, getState, getSymbol, getTag, init, injectProperty, isPhecda, plainToClass, regisHandler, regisInitEvent, register, registerAsync, setExposeKey, setIgnoreKey, setModelVar, setState, snapShot, transformClass };

package/dist/index.js

@@ -8,13 +8,13 @@ var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __copyProps = (to2, from, except, desc) => {
+var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
     for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to2, key) && key !== except)
-        __defProp(to2, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return to2;
+  return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
@@ -33,11 +33,11 @@ __export(src_exports, {
   Ignore: () => Ignore,
   Init: () => Init,
   Inject: () => Inject,
-  Pipe: () => Pipe,
+  Nested: () => Nested,
   Provide: () => Provide,
-  Rule: () => Rule,
   Storage: () => Storage,
   Tag: () => Tag,
+  To: () => To,
   Watcher: () => Watcher,
   activeInstance: () => activeInstance,
   addDecoToClass: () => addDecoToClass,
@@ -55,26 +55,11 @@ __export(src_exports, {
   getOwnState: () => getOwnState,
   getProperty: () => getProperty,
   getState: () => getState,
+  getSymbol: () => getSymbol,
   getTag: () => getTag,
   init: () => init,
   injectProperty: () => injectProperty,
-  isArray: () => isArray,
-  isBoolean: () => isBoolean,
-  isCnName: () => isCnName,
-  isDate: () => isDate,
-  isEnName: () => isEnName,
-  isHexColor: () => isHexColor,
-  isIdCard: () => isIdCard,
-  isLandline: () => isLandline,
-  isMailBox: () => isMailBox,
-  isMobile: () => isMobile,
-  isNumber: () => isNumber,
-  isObject: () => isObject,
-  isOption: () => isOption,
   isPhecda: () => isPhecda,
-  isPostalCode: () => isPostalCode,
-  isString: () => isString,
-  isWechat: () => isWechat,
   plainToClass: () => plainToClass,
   regisHandler: () => regisHandler,
   regisInitEvent: () => regisInitEvent,
@@ -85,10 +70,7 @@ __export(src_exports, {
   setModelVar: () => setModelVar,
   setState: () => setState,
   snapShot: () => snapShot,
-  to: () => to,
-  toNumber: () => toNumber,
-  toString: () => toString,
-  validate: () => validate
+  transformClass: () => transformClass
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -274,6 +256,87 @@ async function registerAsync(instance) {
 }
 __name(registerAsync, "registerAsync");
 
+// src/helper.ts
+function getTag(Model) {
+  return Model.prototype?.__TAG__;
+}
+__name(getTag, "getTag");
+function getSymbol(instance) {
+  const Model = instance.constructor;
+  return getTag(Model) || Model.name;
+}
+__name(getSymbol, "getSymbol");
+function getBind(Model) {
+  const instance = new Model();
+  const keys = getModelState(instance);
+  const ret = {};
+  for (const item of keys) {
+    const state = getState(instance, item);
+    if (state.value)
+      ret[item] = state.value;
+  }
+  return ret;
+}
+__name(getBind, "getBind");
+function plainToClass(Model, input) {
+  const instance = new Model();
+  const keys = getExposeKey(instance);
+  for (const item of keys)
+    instance[item] = input[item];
+  return instance;
+}
+__name(plainToClass, "plainToClass");
+async function transformClass(instance, force = false) {
+  const err = [];
+  const stateVars = getModelState(instance);
+  for (const item of stateVars) {
+    const handlers = getHandler(instance, item);
+    if (handlers) {
+      for (const handler of handlers) {
+        const pipe = handler.pipe;
+        try {
+          await pipe(instance);
+        } catch (e) {
+          err.push(e.message);
+          if (!force)
+            return err;
+        }
+      }
+    }
+  }
+  return err;
+}
+__name(transformClass, "transformClass");
+function classToValue(instance) {
+  const data = {};
+  const exposeVars = getExposeKey(instance);
+  for (const item of exposeVars)
+    data[item] = instance[item];
+  return data;
+}
+__name(classToValue, "classToValue");
+function snapShot(data) {
+  const snap = {};
+  for (const i in data)
+    snap[i] = data[i];
+  return {
+    data,
+    clear() {
+      for (const i in snap)
+        delete data[i];
+    },
+    apply() {
+      for (const i in snap)
+        data[i] = snap[i];
+    }
+  };
+}
+__name(snapShot, "snapShot");
+function addDecoToClass(c, key, handler, type = "normal") {
+  handler(type === "normal" ? c.prototype : c, key);
+}
+__name(addDecoToClass, "addDecoToClass");
+
 // src/decorators.ts
 function Init(target, key) {
   setModelVar(target, key);
@@ -293,17 +356,6 @@ function Bind(value) {
   };
 }
 __name(Bind, "Bind");
-function Rule(rule, info, meta) {
-  return (obj, key) => {
-    setModelVar(obj, key);
-    regisHandler(obj, key, {
-      rule,
-      info,
-      meta
-    });
-  };
-}
-__name(Rule, "Rule");
 function Ignore(target, key) {
   setIgnoreKey(target, key);
 }
@@ -331,19 +383,17 @@ function Expose(target, key) {
   setExposeKey(target, key);
 }
 __name(Expose, "Expose");
-function Pipe(v) {
+function To(cb) {
   return (obj, key) => {
     setModelVar(obj, key);
     regisHandler(obj, key, {
       async pipe(instance) {
-        const tasks = v.value;
-        for (const task of tasks)
-          instance[key] = await task(instance[key]);
+        instance[key] = await cb(instance[key], instance, key);
       }
     });
   };
 }
-__name(Pipe, "Pipe");
+__name(To, "To");
 function Tag(tag) {
   return (target) => {
     init(target.prototype);
@@ -400,114 +450,16 @@ function Inject(key) {
   return DataMap[key] || EmptyProxy;
 }
 __name(Inject, "Inject");
-
-// src/utils.ts
-async function validate(p, v) {
-  if (typeof p === "string" || typeof p === "number") {
-    if (v === p)
-      return true;
-  }
-  if (typeof p === "function")
-    return p(v);
-  if (p instanceof RegExp)
-    return p.test(v);
-  return false;
-}
-__name(validate, "validate");
-function getTag(Model) {
-  return Model.prototype?.__TAG__;
-}
-__name(getTag, "getTag");
-
-// src/helper.ts
-function getBind(Model) {
-  const instance = new Model();
-  const keys = getModelState(instance);
-  const ret = {};
-  for (const item of keys) {
-    const state = getState(instance, item);
-    if (state.value)
-      ret[item] = state.value;
-  }
-  return ret;
-}
-__name(getBind, "getBind");
-async function plainToClass(Model, input, options = {}) {
-  const data = new Model();
-  const err = [];
-  const stateVars = getModelState(data);
-  for (const item of stateVars) {
-    data[item] = input[item];
-    const handlers = getHandler(data, item);
-    if (handlers) {
-      if (options.collectError !== false) {
-        for (const handler of handlers) {
-          const rule = handler.rule;
-          const ret = await validate(rule, data[item]);
-          if (ret === "ok")
-            break;
-          if (rule && !ret) {
-            err.push(typeof handler.info === "function" ? handler.info(item) : handler.info);
-            if (!options.collectError)
-              break;
-          }
-        }
-      }
-      if (err.length > 0 && !options.transform)
-        return {
-          err,
-          data
-        };
-      if (options.transform !== false) {
-        for (const handler of handlers)
-          await handler.pipe?.(data);
-      }
-    }
-  }
-  return {
-    data,
-    err
-  };
-}
-__name(plainToClass, "plainToClass");
-function classToValue(instance) {
-  const data = {};
-  const exposeVars = getExposeKey(instance);
-  for (const item of exposeVars)
-    data[item] = instance[item];
-  return data;
-}
-__name(classToValue, "classToValue");
-function to(task, oldTasks) {
-  const tasks = oldTasks || [];
-  tasks.push(task);
-  return {
-    to: (task2) => to(task2, tasks),
-    value: tasks
-  };
-}
-__name(to, "to");
-function snapShot(data) {
-  const snap = {};
-  for (const i in data)
-    snap[i] = data[i];
-  return {
-    data,
-    clear() {
-      for (const i in snap)
-        delete data[i];
-    },
-    apply() {
-      for (const i in snap)
-        data[i] = snap[i];
-    }
-  };
-}
-__name(snapShot, "snapShot");
-function addDecoToClass(c, key, handler, type = "normal") {
-  handler(type === "normal" ? c.prototype : c, key);
+function Nested(Model) {
+  return To(async (property) => {
+    const instance = plainToClass(Model, property);
+    const err = await transformClass(instance);
+    if (err.length > 0)
+      throw new Error(err[0]);
+    return instance;
+  });
 }
-__name(addDecoToClass, "addDecoToClass");
+__name(Nested, "Nested");
 
 // src/namespace.ts
 var activeInstance = {};
@@ -599,87 +551,6 @@ function Storage(storeKey) {
   };
 }
 __name(Storage, "Storage");
-
-// src/preset/rule.ts
-function isOption() {
-  return Rule((param) => param === void 0 ? "ok" : true, "");
-}
-__name(isOption, "isOption");
-function isArray(info) {
-  return Rule((param) => Array.isArray(param), info || ((k) => `'${k}' should be an array`));
-}
-__name(isArray, "isArray");
-function isBoolean(info) {
-  return Rule((param) => [
-    true,
-    false
-  ].includes(param), info || ((k) => `'${k}' should be boolean`));
-}
-__name(isBoolean, "isBoolean");
-function isNumber(info) {
-  return Rule((param) => typeof param === "number", info || ((k) => `'${k}' should be number`));
-}
-__name(isNumber, "isNumber");
-function isString(info) {
-  return Rule((param) => typeof param === "string", info || ((k) => `'${k}' should be a string`));
-}
-__name(isString, "isString");
-function isObject(info) {
-  return Rule((param) => {
-    return Object.prototype.toString.call(param) === "[object Object]";
-  }, info || ((k) => `'${k}' should be an object`));
-}
-__name(isObject, "isObject");
-function isMobile(info) {
-  return Rule(/^((\+|00)86)?1((3[\d])|(4[5,6,7,9])|(5[0-3,5-9])|(6[5-7])|(7[0-8])|(8[\d])|(9[1,8,9]))\d{8}$/, info || ((k) => `'${k}' should be a mobile phone number`));
-}
-__name(isMobile, "isMobile");
-function isLandline(info) {
-  return Rule(/\d{3}-\d{8}|\d{4}-\d{7}/, info || ((k) => `'${k}' should be a landline`));
-}
-__name(isLandline, "isLandline");
-function isMailBox(info) {
-  return Rule(/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/, info || ((k) => `'${k}' should be a mailbox`));
-}
-__name(isMailBox, "isMailBox");
-function isIdCard(info) {
-  return Rule(/(^\d{8}(0\d|10|11|12)([0-2]\d|30|31)\d{3}$)|(^\d{6}(18|19|20)\d{2}(0\d|10|11|12)([0-2]\d|30|31)\d{3}(\d|X|x)$)/, info || ((k) => `'${k}' should be an identity card number`));
-}
-__name(isIdCard, "isIdCard");
-function isCnName(info) {
-  return Rule(/^([\u4E00-\u9FA5·]{2,16})$/, info || ((k) => `'${k}' \u9700\u8981\u662F\u4E00\u4E2A\u5408\u7406\u7684\u4E2D\u6587\u540D\u5B57`));
-}
-__name(isCnName, "isCnName");
-function isEnName(info) {
-  return Rule(/(^[a-zA-Z]{1}[a-zA-Z\s]{0,20}[a-zA-Z]{1}$)/, info || ((k) => `'${k}' should be a valid en-name`));
-}
-__name(isEnName, "isEnName");
-function isDate(info) {
-  return Rule(/^(?:(?!0000)[0-9]{4}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[0-9]{2}(?:0[48]|[2468][048]|[13579][26])|(?:0[48]|[2468][048]|[13579][26])00)-02-29)$/, info || ((k) => `'${k}' should be a valid date`));
-}
-__name(isDate, "isDate");
-function isWechat(info) {
-  return Rule(/^[a-zA-Z]([-_a-zA-Z0-9]{5,19})+$/, info || ((k) => `'${k}' should be a valid wechat`));
-}
-__name(isWechat, "isWechat");
-function isHexColor(info) {
-  return Rule(/^#?([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$/, info || ((k) => `'${k}' should be a valid hex-color`));
-}
-__name(isHexColor, "isHexColor");
-function isPostalCode(info) {
-  return Rule(/^(0[1-7]|1[0-356]|2[0-7]|3[0-6]|4[0-7]|5[1-7]|6[1-7]|7[0-5]|8[013-6])\d{4}$/, info || ((k) => `'${k}' should be a valid postal code`));
-}
-__name(isPostalCode, "isPostalCode");
-
-// src/preset/pipe.ts
-function toNumber() {
-  return Pipe(to((param) => Number(param)));
-}
-__name(toNumber, "toNumber");
-function toString() {
-  return Pipe(to((param) => String(param)));
-}
-__name(toString, "toString");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Assign,
@@ -694,11 +565,11 @@ __name(toString, "toString");
   Ignore,
   Init,
   Inject,
-  Pipe,
+  Nested,
   Provide,
-  Rule,
   Storage,
   Tag,
+  To,
   Watcher,
   activeInstance,
   addDecoToClass,
@@ -716,26 +587,11 @@ __name(toString, "toString");
   getOwnState,
   getProperty,
   getState,
+  getSymbol,
   getTag,
   init,
   injectProperty,
-  isArray,
-  isBoolean,
-  isCnName,
-  isDate,
-  isEnName,
-  isHexColor,
-  isIdCard,
-  isLandline,
-  isMailBox,
-  isMobile,
-  isNumber,
-  isObject,
-  isOption,
   isPhecda,
-  isPostalCode,
-  isString,
-  isWechat,
   plainToClass,
   regisHandler,
   regisInitEvent,
@@ -746,8 +602,5 @@ __name(toString, "toString");
   setModelVar,
   setState,
   snapShot,
-  to,
-  toNumber,
-  toString,
-  validate
+  transformClass
 });

package/dist/index.mjs

@@ -183,6 +183,87 @@ async function registerAsync(instance) {
 }
 __name(registerAsync, "registerAsync");
 
+// src/helper.ts
+function getTag(Model) {
+  return Model.prototype?.__TAG__;
+}
+__name(getTag, "getTag");
+function getSymbol(instance) {
+  const Model = instance.constructor;
+  return getTag(Model) || Model.name;
+}
+__name(getSymbol, "getSymbol");
+function getBind(Model) {
+  const instance = new Model();
+  const keys = getModelState(instance);
+  const ret = {};
+  for (const item of keys) {
+    const state = getState(instance, item);
+    if (state.value)
+      ret[item] = state.value;
+  }
+  return ret;
+}
+__name(getBind, "getBind");
+function plainToClass(Model, input) {
+  const instance = new Model();
+  const keys = getExposeKey(instance);
+  for (const item of keys)
+    instance[item] = input[item];
+  return instance;
+}
+__name(plainToClass, "plainToClass");
+async function transformClass(instance, force = false) {
+  const err = [];
+  const stateVars = getModelState(instance);
+  for (const item of stateVars) {
+    const handlers = getHandler(instance, item);
+    if (handlers) {
+      for (const handler of handlers) {
+        const pipe = handler.pipe;
+        try {
+          await pipe(instance);
+        } catch (e) {
+          err.push(e.message);
+          if (!force)
+            return err;
+        }
+      }
+    }
+  }
+  return err;
+}
+__name(transformClass, "transformClass");
+function classToValue(instance) {
+  const data = {};
+  const exposeVars = getExposeKey(instance);
+  for (const item of exposeVars)
+    data[item] = instance[item];
+  return data;
+}
+__name(classToValue, "classToValue");
+function snapShot(data) {
+  const snap = {};
+  for (const i in data)
+    snap[i] = data[i];
+  return {
+    data,
+    clear() {
+      for (const i in snap)
+        delete data[i];
+    },
+    apply() {
+      for (const i in snap)
+        data[i] = snap[i];
+    }
+  };
+}
+__name(snapShot, "snapShot");
+function addDecoToClass(c, key, handler, type = "normal") {
+  handler(type === "normal" ? c.prototype : c, key);
+}
+__name(addDecoToClass, "addDecoToClass");
+
 // src/decorators.ts
 function Init(target, key) {
   setModelVar(target, key);
@@ -202,17 +283,6 @@ function Bind(value) {
   };
 }
 __name(Bind, "Bind");
-function Rule(rule, info, meta) {
-  return (obj, key) => {
-    setModelVar(obj, key);
-    regisHandler(obj, key, {
-      rule,
-      info,
-      meta
-    });
-  };
-}
-__name(Rule, "Rule");
 function Ignore(target, key) {
   setIgnoreKey(target, key);
 }
@@ -240,19 +310,17 @@ function Expose(target, key) {
   setExposeKey(target, key);
 }
 __name(Expose, "Expose");
-function Pipe(v) {
+function To(cb) {
   return (obj, key) => {
     setModelVar(obj, key);
     regisHandler(obj, key, {
       async pipe(instance) {
-        const tasks = v.value;
-        for (const task of tasks)
-          instance[key] = await task(instance[key]);
+        instance[key] = await cb(instance[key], instance, key);
       }
     });
   };
 }
-__name(Pipe, "Pipe");
+__name(To, "To");
 function Tag(tag) {
   return (target) => {
     init(target.prototype);
@@ -309,114 +377,16 @@ function Inject(key) {
   return DataMap[key] || EmptyProxy;
 }
 __name(Inject, "Inject");
-
-// src/utils.ts
-async function validate(p, v) {
-  if (typeof p === "string" || typeof p === "number") {
-    if (v === p)
-      return true;
-  }
-  if (typeof p === "function")
-    return p(v);
-  if (p instanceof RegExp)
-    return p.test(v);
-  return false;
-}
-__name(validate, "validate");
-function getTag(Model) {
-  return Model.prototype?.__TAG__;
-}
-__name(getTag, "getTag");
-
-// src/helper.ts
-function getBind(Model) {
-  const instance = new Model();
-  const keys = getModelState(instance);
-  const ret = {};
-  for (const item of keys) {
-    const state = getState(instance, item);
-    if (state.value)
-      ret[item] = state.value;
-  }
-  return ret;
-}
-__name(getBind, "getBind");
-async function plainToClass(Model, input, options = {}) {
-  const data = new Model();
-  const err = [];
-  const stateVars = getModelState(data);
-  for (const item of stateVars) {
-    data[item] = input[item];
-    const handlers = getHandler(data, item);
-    if (handlers) {
-      if (options.collectError !== false) {
-        for (const handler of handlers) {
-          const rule = handler.rule;
-          const ret = await validate(rule, data[item]);
-          if (ret === "ok")
-            break;
-          if (rule && !ret) {
-            err.push(typeof handler.info === "function" ? handler.info(item) : handler.info);
-            if (!options.collectError)
-              break;
-          }
-        }
-      }
-      if (err.length > 0 && !options.transform)
-        return {
-          err,
-          data
-        };
-      if (options.transform !== false) {
-        for (const handler of handlers)
-          await handler.pipe?.(data);
-      }
-    }
-  }
-  return {
-    data,
-    err
-  };
-}
-__name(plainToClass, "plainToClass");
-function classToValue(instance) {
-  const data = {};
-  const exposeVars = getExposeKey(instance);
-  for (const item of exposeVars)
-    data[item] = instance[item];
-  return data;
-}
-__name(classToValue, "classToValue");
-function to(task, oldTasks) {
-  const tasks = oldTasks || [];
-  tasks.push(task);
-  return {
-    to: (task2) => to(task2, tasks),
-    value: tasks
-  };
-}
-__name(to, "to");
-function snapShot(data) {
-  const snap = {};
-  for (const i in data)
-    snap[i] = data[i];
-  return {
-    data,
-    clear() {
-      for (const i in snap)
-        delete data[i];
-    },
-    apply() {
-      for (const i in snap)
-        data[i] = snap[i];
-    }
-  };
-}
-__name(snapShot, "snapShot");
-function addDecoToClass(c, key, handler, type = "normal") {
-  handler(type === "normal" ? c.prototype : c, key);
+function Nested(Model) {
+  return To(async (property) => {
+    const instance = plainToClass(Model, property);
+    const err = await transformClass(instance);
+    if (err.length > 0)
+      throw new Error(err[0]);
+    return instance;
+  });
 }
-__name(addDecoToClass, "addDecoToClass");
+__name(Nested, "Nested");
 
 // src/namespace.ts
 var activeInstance = {};
@@ -508,87 +478,6 @@ function Storage(storeKey) {
   };
 }
 __name(Storage, "Storage");
-
-// src/preset/rule.ts
-function isOption() {
-  return Rule((param) => param === void 0 ? "ok" : true, "");
-}
-__name(isOption, "isOption");
-function isArray(info) {
-  return Rule((param) => Array.isArray(param), info || ((k) => `'${k}' should be an array`));
-}
-__name(isArray, "isArray");
-function isBoolean(info) {
-  return Rule((param) => [
-    true,
-    false
-  ].includes(param), info || ((k) => `'${k}' should be boolean`));
-}
-__name(isBoolean, "isBoolean");
-function isNumber(info) {
-  return Rule((param) => typeof param === "number", info || ((k) => `'${k}' should be number`));
-}
-__name(isNumber, "isNumber");
-function isString(info) {
-  return Rule((param) => typeof param === "string", info || ((k) => `'${k}' should be a string`));
-}
-__name(isString, "isString");
-function isObject(info) {
-  return Rule((param) => {
-    return Object.prototype.toString.call(param) === "[object Object]";
-  }, info || ((k) => `'${k}' should be an object`));
-}
-__name(isObject, "isObject");
-function isMobile(info) {
-  return Rule(/^((\+|00)86)?1((3[\d])|(4[5,6,7,9])|(5[0-3,5-9])|(6[5-7])|(7[0-8])|(8[\d])|(9[1,8,9]))\d{8}$/, info || ((k) => `'${k}' should be a mobile phone number`));
-}
-__name(isMobile, "isMobile");
-function isLandline(info) {
-  return Rule(/\d{3}-\d{8}|\d{4}-\d{7}/, info || ((k) => `'${k}' should be a landline`));
-}
-__name(isLandline, "isLandline");
-function isMailBox(info) {
-  return Rule(/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/, info || ((k) => `'${k}' should be a mailbox`));
-}
-__name(isMailBox, "isMailBox");
-function isIdCard(info) {
-  return Rule(/(^\d{8}(0\d|10|11|12)([0-2]\d|30|31)\d{3}$)|(^\d{6}(18|19|20)\d{2}(0\d|10|11|12)([0-2]\d|30|31)\d{3}(\d|X|x)$)/, info || ((k) => `'${k}' should be an identity card number`));
-}
-__name(isIdCard, "isIdCard");
-function isCnName(info) {
-  return Rule(/^([\u4E00-\u9FA5·]{2,16})$/, info || ((k) => `'${k}' \u9700\u8981\u662F\u4E00\u4E2A\u5408\u7406\u7684\u4E2D\u6587\u540D\u5B57`));
-}
-__name(isCnName, "isCnName");
-function isEnName(info) {
-  return Rule(/(^[a-zA-Z]{1}[a-zA-Z\s]{0,20}[a-zA-Z]{1}$)/, info || ((k) => `'${k}' should be a valid en-name`));
-}
-__name(isEnName, "isEnName");
-function isDate(info) {
-  return Rule(/^(?:(?!0000)[0-9]{4}-(?:(?:0[1-9]|1[0-2])-(?:0[1-9]|1[0-9]|2[0-8])|(?:0[13-9]|1[0-2])-(?:29|30)|(?:0[13578]|1[02])-31)|(?:[0-9]{2}(?:0[48]|[2468][048]|[13579][26])|(?:0[48]|[2468][048]|[13579][26])00)-02-29)$/, info || ((k) => `'${k}' should be a valid date`));
-}
-__name(isDate, "isDate");
-function isWechat(info) {
-  return Rule(/^[a-zA-Z]([-_a-zA-Z0-9]{5,19})+$/, info || ((k) => `'${k}' should be a valid wechat`));
-}
-__name(isWechat, "isWechat");
-function isHexColor(info) {
-  return Rule(/^#?([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$/, info || ((k) => `'${k}' should be a valid hex-color`));
-}
-__name(isHexColor, "isHexColor");
-function isPostalCode(info) {
-  return Rule(/^(0[1-7]|1[0-356]|2[0-7]|3[0-6]|4[0-7]|5[1-7]|6[1-7]|7[0-5]|8[013-6])\d{4}$/, info || ((k) => `'${k}' should be a valid postal code`));
-}
-__name(isPostalCode, "isPostalCode");
-
-// src/preset/pipe.ts
-function toNumber() {
-  return Pipe(to((param) => Number(param)));
-}
-__name(toNumber, "toNumber");
-function toString() {
-  return Pipe(to((param) => String(param)));
-}
-__name(toString, "toString");
 export {
   Assign,
   Bind,
@@ -602,11 +491,11 @@ export {
   Ignore,
   Init,
   Inject,
-  Pipe,
+  Nested,
   Provide,
-  Rule,
   Storage,
   Tag,
+  To,
   Watcher,
   activeInstance,
   addDecoToClass,
@@ -624,26 +513,11 @@ export {
   getOwnState,
   getProperty,
   getState,
+  getSymbol,
   getTag,
   init,
   injectProperty,
-  isArray,
-  isBoolean,
-  isCnName,
-  isDate,
-  isEnName,
-  isHexColor,
-  isIdCard,
-  isLandline,
-  isMailBox,
-  isMobile,
-  isNumber,
-  isObject,
-  isOption,
   isPhecda,
-  isPostalCode,
-  isString,
-  isWechat,
   plainToClass,
   regisHandler,
   regisInitEvent,
@@ -654,8 +528,5 @@ export {
   setModelVar,
   setState,
   snapShot,
-  to,
-  toNumber,
-  toString,
-  validate
+  transformClass
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-core",
-  "version": "2.0.1-alpha.0",
+  "version": "2.1.0-alpha.2",
   "description": "provide base function and abstract limit to other phecda module ",
   "main": "dist/index.js",
   "module": "dist/index.mjs",