npm - phecda-core - Versions diffs - 1.0.5 → 1.0.6 - Mend

phecda-core 1.0.5 → 1.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/index.d.ts CHANGED Viewed

@@ -2,17 +2,11 @@ interface PhecdaNameSpace {
     [name: string]: Phecda;
 }
 interface UsePipeOptions {
-    transform: boolean;
-    collectError: boolean;
+    transform?: boolean;
+    collectError?: boolean;
 }
 interface PhecdaHandler {
-    init?: (instance: any) => any;
-    pipe?: (instance: any) => void;
-    rule?: RegExp | string | Function | number;
-    info?: string;
-    meta?: any;
-    error?: any;
-    http?: any;
+    [key: string]: any;
 }
 interface Phecda {
     _namespace: {
@@ -22,13 +16,14 @@ interface Phecda {
         __IGNORE_VAR__: Set<PropertyKey>;
         __STATE_VAR__: Set<PropertyKey>;
         __STATE_HANDLER__: Map<PropertyKey, PhecdaHandler[]>;
+        __STATE_NAMESPACE__: Map<PropertyKey, Object>;
     };
 }
 type ClassValue<I> = {
     [P in keyof I]: I[P] extends Function ? undefined : I[P];
 };
-declare function plainToClass<M extends new (...args: any) => any, Data extends Record<PropertyKey, any>>(Model: M, input: Data, options?: Partial<UsePipeOptions>): Promise<{
+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>;
 }>;
@@ -87,11 +82,13 @@ declare function Window(target: any): 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 mergeOptions(obj1: any, obj2?: any): any;
+declare function isPhecda(target: any): any;
 declare function init(target: Phecda): void;
 declare function regisInitEvent(target: Phecda, key: string): void;
 declare function getInitEvent(target: Phecda): string[];
-declare function setModalState(target: Phecda, key: PropertyKey): void;
+declare function setModalVar(target: Phecda, key: PropertyKey): void;
 declare function setExposeKey(target: Phecda, key: PropertyKey): void;
 declare function setIgnoreKey(target: Phecda, key: PropertyKey): void;
 declare function getModelState(target: Phecda): string[];
@@ -99,6 +96,8 @@ declare function getExposeKey(target: Phecda): string[];
 declare function getIgnoreKey(target: Phecda): string[];
 declare function regisHandler(target: Phecda, key: PropertyKey, handler: PhecdaHandler): void;
 declare function getHandler(target: Phecda, key: PropertyKey): PhecdaHandler[];
+declare function mergeState(target: Phecda, key: PropertyKey, state: any): void;
+declare function getState(target: Phecda, key: PropertyKey): Object | undefined;
 declare function register(instance: Phecda): void;
 declare function isArray(info?: string): (obj: any, key: PropertyKey) => void;
@@ -126,4 +125,4 @@ declare function getProperty(key: string): any;
 declare function Watcher(eventName: string): (obj: any, key: string) => void;
-export { ClassValue, Clear, Err, Get, Ignore, Init, Phecda, PhecdaHandler, PhecdaNameSpace, Pipe, Rule, Storage, Tag, UsePipeOptions, Watcher, Window, activeInstance, addDecoToClass, classToValue, getExposeKey, getHandler, getIgnoreKey, getInitEvent, getModelState, getProperty, getTag, init, injectProperty, isArray, isBoolean, isCnName, isDate, isEnName, isHexColor, isIdCard, isLandline, isMailBox, isMobile, isNumber, isObject, isPostalCode, isString, isWechat, plainToClass, regisHandler, regisInitEvent, register, setExposeKey, setIgnoreKey, setModalState, snapShot, to, toNumber, toString, validate };
+export { ClassValue, Clear, Err, Get, Ignore, Init, Phecda, PhecdaHandler, PhecdaNameSpace, Pipe, Rule, Storage, Tag, UsePipeOptions, Watcher, Window, activeInstance, addDecoToClass, classToValue, getExposeKey, getHandler, getIgnoreKey, getInitEvent, getModelState, getProperty, getState, getTag, init, injectProperty, isArray, isBoolean, isCnName, isDate, isEnName, isHexColor, isIdCard, isLandline, isMailBox, isMobile, isNumber, isObject, isPhecda, isPostalCode, isString, isWechat, mergeOptions, mergeState, plainToClass, regisHandler, regisInitEvent, register, setExposeKey, setIgnoreKey, setModalVar, snapShot, to, toNumber, toString, validate };

package/dist/index.js CHANGED Viewed

@@ -3,6 +3,7 @@ var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -40,6 +41,7 @@ __export(src_exports, {
   getInitEvent: () => getInitEvent,
   getModelState: () => getModelState,
   getProperty: () => getProperty,
+  getState: () => getState,
   getTag: () => getTag,
   init: () => init,
   injectProperty: () => injectProperty,
@@ -54,17 +56,20 @@ __export(src_exports, {
   isMailBox: () => isMailBox,
   isMobile: () => isMobile,
   isNumber: () => isNumber,
-  isObject: () => isObject,
+  isObject: () => isObject2,
+  isPhecda: () => isPhecda,
   isPostalCode: () => isPostalCode,
   isString: () => isString,
   isWechat: () => isWechat,
+  mergeOptions: () => mergeOptions,
+  mergeState: () => mergeState,
   plainToClass: () => plainToClass,
   regisHandler: () => regisHandler,
   regisInitEvent: () => regisInitEvent,
   register: () => register,
   setExposeKey: () => setExposeKey,
   setIgnoreKey: () => setIgnoreKey,
-  setModalState: () => setModalState,
+  setModalVar: () => setModalVar,
   snapShot: () => snapShot,
   to: () => to,
   toNumber: () => toNumber,
@@ -73,7 +78,50 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
+// 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?._namespace?.__TAG__;
+}
+__name(getTag, "getTag");
+function mergeOptions(obj1, obj2) {
+  if (!obj2)
+    return obj1;
+  for (const i in obj2) {
+    if (isObject(obj1[i]) && isObject(obj2[i])) {
+      mergeOptions(obj1[i], obj2[i]);
+      continue;
+    }
+    if (Array.isArray(obj1[i]) && Array.isArray(obj2[i])) {
+      obj1[i].push(...obj2[i].filter((item) => !obj1[i].includes(item)));
+      continue;
+    }
+    obj1[i] = obj2[i];
+  }
+  return obj1;
+}
+__name(mergeOptions, "mergeOptions");
+function isObject(obj) {
+  return Object.prototype.toString.call(obj) === "[object Object]";
+}
+__name(isObject, "isObject");
 // src/core.ts
+function isPhecda(target) {
+  return target && !!target.prototype._namespace;
+}
+__name(isPhecda, "isPhecda");
 function init(target) {
   if (!target._namespace) {
     target._namespace = {
@@ -82,53 +130,89 @@ function init(target) {
       __EXPOSE_VAR__: /* @__PURE__ */ new Set(),
       __IGNORE_VAR__: /* @__PURE__ */ new Set(),
       __STATE_VAR__: /* @__PURE__ */ new Set(),
-      __STATE_HANDLER__: /* @__PURE__ */ new Map()
+      __STATE_HANDLER__: /* @__PURE__ */ new Map(),
+      __STATE_NAMESPACE__: /* @__PURE__ */ new Map()
     };
   }
 }
+__name(init, "init");
 function regisInitEvent(target, key) {
   init(target);
   target._namespace.__INIT_EVENT__.add(key);
 }
+__name(regisInitEvent, "regisInitEvent");
 function getInitEvent(target) {
   init(target);
-  return [...target._namespace.__INIT_EVENT__];
+  return [
+    ...target._namespace.__INIT_EVENT__
+  ];
 }
-function setModalState(target, key) {
+__name(getInitEvent, "getInitEvent");
+function setModalVar(target, key) {
   init(target);
   target._namespace.__STATE_VAR__.add(key);
   setExposeKey(target, key);
 }
+__name(setModalVar, "setModalVar");
 function setExposeKey(target, key) {
   init(target);
   target._namespace.__EXPOSE_VAR__.add(key);
 }
+__name(setExposeKey, "setExposeKey");
 function setIgnoreKey(target, key) {
   init(target);
   target._namespace.__IGNORE_VAR__.add(key);
 }
+__name(setIgnoreKey, "setIgnoreKey");
 function getModelState(target) {
   init(target);
-  return [...target._namespace.__STATE_VAR__];
+  return [
+    ...target._namespace.__STATE_VAR__
+  ];
 }
+__name(getModelState, "getModelState");
 function getExposeKey(target) {
   init(target);
-  return [...target._namespace.__EXPOSE_VAR__];
+  return [
+    ...target._namespace.__EXPOSE_VAR__
+  ];
 }
+__name(getExposeKey, "getExposeKey");
 function getIgnoreKey(target) {
   init(target);
-  return [...target._namespace.__IGNORE_VAR__];
+  return [
+    ...target._namespace.__IGNORE_VAR__
+  ];
 }
+__name(getIgnoreKey, "getIgnoreKey");
 function regisHandler(target, key, handler) {
   init(target);
   if (!target._namespace.__STATE_HANDLER__.has(key))
-    target._namespace.__STATE_HANDLER__.set(key, [handler]);
+    target._namespace.__STATE_HANDLER__.set(key, [
+      handler
+    ]);
   else
     target._namespace.__STATE_HANDLER__.get(key).push(handler);
 }
+__name(regisHandler, "regisHandler");
 function getHandler(target, key) {
   return target._namespace.__STATE_HANDLER__.get(key) || [];
 }
+__name(getHandler, "getHandler");
+function mergeState(target, key, state) {
+  const namespace = target._namespace.__STATE_NAMESPACE__;
+  if (!namespace.has(key))
+    namespace.set(key, state);
+  else
+    mergeOptions(namespace.get(key), state);
+}
+__name(mergeState, "mergeState");
+function getState(target, key) {
+  const namespace = target._namespace.__STATE_NAMESPACE__;
+  if (namespace)
+    return namespace.get(key);
+}
+__name(getState, "getState");
 function register(instance) {
   const stateVars = getModelState(instance);
   for (const item of stateVars) {
@@ -137,19 +221,21 @@ function register(instance) {
       hanlder.init?.(instance);
   }
 }
+__name(register, "register");
 // src/decorators.ts
 function Init(target, key) {
-  setModalState(target, key);
+  setModalVar(target, key);
   regisHandler(target, key, {
     async init(instance) {
       instance[key]();
     }
   });
 }
+__name(Init, "Init");
 function Rule(rule, info, meta) {
   return (obj, key) => {
-    setModalState(obj, key);
+    setModalVar(obj, key);
     regisHandler(obj, key, {
       rule,
       info,
@@ -157,9 +243,11 @@ function Rule(rule, info, meta) {
     });
   };
 }
+__name(Rule, "Rule");
 function Ignore(target, key) {
   setIgnoreKey(target, key);
 }
+__name(Ignore, "Ignore");
 function Clear(target, key) {
   init(target);
   target._namespace.__INIT_EVENT__.delete(key);
@@ -168,20 +256,23 @@ function Clear(target, key) {
   target._namespace.__STATE_VAR__.delete(key);
   target._namespace.__STATE_HANDLER__.delete(key);
 }
+__name(Clear, "Clear");
 function Err(cb) {
   return (target, key) => {
-    setModalState(target, key);
+    setModalVar(target, key);
     regisHandler(target, key, {
       error: cb
     });
   };
 }
+__name(Err, "Err");
 function Get(target, key) {
   setExposeKey(target, key);
 }
+__name(Get, "Get");
 function Pipe(v) {
   return (obj, key) => {
-    setModalState(obj, key);
+    setModalVar(obj, key);
     regisHandler(obj, key, {
       async pipe(instance) {
         const tasks = v.value;
@@ -191,19 +282,21 @@ function Pipe(v) {
     });
   };
 }
+__name(Pipe, "Pipe");
 function Tag(tag) {
   return (target) => {
     init(target.prototype);
     target.prototype._namespace.__TAG__ = tag;
   };
 }
+__name(Tag, "Tag");
 function Storage(target) {
   init(target.prototype);
   const tag = target.prototype._namespace.__TAG__;
   if (tag === "")
     throw new Error("miss tag");
   const uniTag = Symbol(tag);
-  setModalState(target.prototype, uniTag);
+  setModalVar(target.prototype, uniTag);
   regisHandler(target.prototype, uniTag, {
     init: (instance) => {
       const { state } = instance;
@@ -219,6 +312,7 @@ function Storage(target) {
     }
   });
 }
+__name(Storage, "Storage");
 function Window(target) {
   if (!window.__PHECDA__)
     window.__PHECDA__ = {};
@@ -226,53 +320,44 @@ function Window(target) {
   if (tag)
     window.__PHECDA__[tag] = target;
 }
-// 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;
-}
-function getTag(Model) {
-  return Model.prototype?._namespace?.__TAG__;
-}
+__name(Window, "Window");
 // src/helper.ts
 async function plainToClass(Model, input, options = {}) {
   const data = new Model();
-  const resolvedOptions = {
-    collectError: true,
-    transform: false,
-    ...options
-  };
   const err = [];
   const stateVars = getModelState(data);
   for (const item of stateVars) {
     data[item] = input[item];
     const handlers = getHandler(data, item);
     if (handlers) {
-      for (const handler of handlers) {
-        const rule = handler.rule;
-        if (rule && !await validate(rule, data[item])) {
-          err.push(handler.info || "");
-          if (!resolvedOptions.collectError)
-            break;
+      if (options.collectError !== false) {
+        for (const handler of handlers) {
+          const rule = handler.rule;
+          if (rule && !await validate(rule, data[item])) {
+            err.push(handler.info || "");
+            if (!options.collectError)
+              break;
+          }
         }
       }
-      if (err.length > 0 && !resolvedOptions.transform)
-        return { err, data };
-      for (const handler of handlers)
-        await handler.pipe?.(data);
+      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 };
+  return {
+    data,
+    err
+  };
 }
+__name(plainToClass, "plainToClass");
 function classToValue(instance) {
   const data = {};
   const exposeVar = getExposeKey(instance);
@@ -284,11 +369,16 @@ function classToValue(instance) {
   }
   return data;
 }
+__name(classToValue, "classToValue");
 function to(task, oldTasks) {
   const tasks = oldTasks || [];
   tasks.push(task);
-  return { to: (task2) => to(task2, tasks), value: tasks };
+  return {
+    to: (task2) => to(task2, tasks),
+    value: tasks
+  };
 }
+__name(to, "to");
 function snapShot(data) {
   const snap = {};
   for (const i in data)
@@ -305,96 +395,88 @@ function snapShot(data) {
     }
   };
 }
+__name(snapShot, "snapShot");
 function addDecoToClass(c, key, handler, type = "normal") {
   handler(type === "normal" ? c.prototype : c, key);
 }
+__name(addDecoToClass, "addDecoToClass");
 // src/preset/rule.ts
 function isArray(info) {
   return Rule((param) => Array.isArray(param), info || "it should be an array");
 }
+__name(isArray, "isArray");
 function isBoolean(info) {
-  return Rule((param) => [true, false].includes(param), info || "it should be true or false");
+  return Rule((param) => [
+    true,
+    false
+  ].includes(param), info || "it should be true or false");
 }
+__name(isBoolean, "isBoolean");
 function isNumber(info) {
   return Rule((param) => typeof param === "number", info || "it should be true or false");
 }
+__name(isNumber, "isNumber");
 function isString(info) {
   return Rule((param) => typeof param === "string", info || "it should be a string");
 }
-function isObject(info) {
+__name(isString, "isString");
+function isObject2(info) {
   return Rule((param) => {
     return Object.prototype.toString.call(param) === "[object Object]";
   }, info || "it should be an object");
 }
+__name(isObject2, "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 || "it should be a mobile phone number"
-  );
+  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 || "it should be a mobile phone number");
 }
+__name(isMobile, "isMobile");
 function isLandline(info) {
-  return Rule(
-    /\d{3}-\d{8}|\d{4}-\d{7}/,
-    info || "it should be a mobile phone number"
-  );
+  return Rule(/\d{3}-\d{8}|\d{4}-\d{7}/, info || "it should be a mobile phone number");
 }
+__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 || "it should be a mailbox  number"
-  );
+  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 || "it should be a mailbox  number");
 }
+__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 || "it should be an identity card number"
-  );
+  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 || "it should be an identity card number");
 }
+__name(isIdCard, "isIdCard");
 function isCnName(info) {
-  return Rule(
-    /^([\u4E00-\u9FA5·]{2,16})$/,
-    info || "\u9700\u8981\u662F\u4E00\u4E2A\u5408\u7406\u7684\u4E2D\u6587\u540D\u5B57"
-  );
+  return Rule(/^([\u4E00-\u9FA5·]{2,16})$/, info || "\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 || "it should be a valid en-name"
-  );
+  return Rule(/(^[a-zA-Z]{1}[a-zA-Z\s]{0,20}[a-zA-Z]{1}$)/, info || "it 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 || "it should be a valid date"
-  );
+  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 || "it should be a valid date");
 }
+__name(isDate, "isDate");
 function isWechat(info) {
-  return Rule(
-    /^[a-zA-Z]([-_a-zA-Z0-9]{5,19})+$/,
-    info || "it should be a valid date"
-  );
+  return Rule(/^[a-zA-Z]([-_a-zA-Z0-9]{5,19})+$/, info || "it should be a valid date");
 }
+__name(isWechat, "isWechat");
 function isHexColor(info) {
-  return Rule(
-    /^#?([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$/,
-    info || "it should be a valid hex-color"
-  );
+  return Rule(/^#?([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$/, info || "it 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 || "it should be a valid postal code"
-  );
+  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 || "it 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");
 // src/namespace.ts
 var activeInstance = {};
@@ -402,21 +484,28 @@ function injectProperty(key, value) {
   activeInstance[key] = value;
   return activeInstance;
 }
+__name(injectProperty, "injectProperty");
 function getProperty(key) {
   return activeInstance[key];
 }
+__name(getProperty, "getProperty");
 // src/custom/decorator.ts
 function Watcher(eventName) {
   return (obj, key) => {
-    setModalState(obj, key);
+    setModalVar(obj, key);
     regisHandler(obj, key, {
       init(instance) {
-        getProperty("watcher")?.({ eventName, instance, key });
+        getProperty("watcher")?.({
+          eventName,
+          instance,
+          key
+        });
       }
     });
   };
 }
+__name(Watcher, "Watcher");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Clear,
@@ -439,6 +528,7 @@ function Watcher(eventName) {
   getInitEvent,
   getModelState,
   getProperty,
+  getState,
   getTag,
   init,
   injectProperty,
@@ -454,16 +544,19 @@ function Watcher(eventName) {
   isMobile,
   isNumber,
   isObject,
+  isPhecda,
   isPostalCode,
   isString,
   isWechat,
+  mergeOptions,
+  mergeState,
   plainToClass,
   regisHandler,
   regisInitEvent,
   register,
   setExposeKey,
   setIgnoreKey,
-  setModalState,
+  setModalVar,
   snapShot,
   to,
   toNumber,

package/dist/index.mjs CHANGED Viewed

@@ -1,4 +1,50 @@
+var __defProp = Object.defineProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+// 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?._namespace?.__TAG__;
+}
+__name(getTag, "getTag");
+function mergeOptions(obj1, obj2) {
+  if (!obj2)
+    return obj1;
+  for (const i in obj2) {
+    if (isObject(obj1[i]) && isObject(obj2[i])) {
+      mergeOptions(obj1[i], obj2[i]);
+      continue;
+    }
+    if (Array.isArray(obj1[i]) && Array.isArray(obj2[i])) {
+      obj1[i].push(...obj2[i].filter((item) => !obj1[i].includes(item)));
+      continue;
+    }
+    obj1[i] = obj2[i];
+  }
+  return obj1;
+}
+__name(mergeOptions, "mergeOptions");
+function isObject(obj) {
+  return Object.prototype.toString.call(obj) === "[object Object]";
+}
+__name(isObject, "isObject");
 // src/core.ts
+function isPhecda(target) {
+  return target && !!target.prototype._namespace;
+}
+__name(isPhecda, "isPhecda");
 function init(target) {
   if (!target._namespace) {
     target._namespace = {
@@ -7,53 +53,89 @@ function init(target) {
       __EXPOSE_VAR__: /* @__PURE__ */ new Set(),
       __IGNORE_VAR__: /* @__PURE__ */ new Set(),
       __STATE_VAR__: /* @__PURE__ */ new Set(),
-      __STATE_HANDLER__: /* @__PURE__ */ new Map()
+      __STATE_HANDLER__: /* @__PURE__ */ new Map(),
+      __STATE_NAMESPACE__: /* @__PURE__ */ new Map()
     };
   }
 }
+__name(init, "init");
 function regisInitEvent(target, key) {
   init(target);
   target._namespace.__INIT_EVENT__.add(key);
 }
+__name(regisInitEvent, "regisInitEvent");
 function getInitEvent(target) {
   init(target);
-  return [...target._namespace.__INIT_EVENT__];
+  return [
+    ...target._namespace.__INIT_EVENT__
+  ];
 }
-function setModalState(target, key) {
+__name(getInitEvent, "getInitEvent");
+function setModalVar(target, key) {
   init(target);
   target._namespace.__STATE_VAR__.add(key);
   setExposeKey(target, key);
 }
+__name(setModalVar, "setModalVar");
 function setExposeKey(target, key) {
   init(target);
   target._namespace.__EXPOSE_VAR__.add(key);
 }
+__name(setExposeKey, "setExposeKey");
 function setIgnoreKey(target, key) {
   init(target);
   target._namespace.__IGNORE_VAR__.add(key);
 }
+__name(setIgnoreKey, "setIgnoreKey");
 function getModelState(target) {
   init(target);
-  return [...target._namespace.__STATE_VAR__];
+  return [
+    ...target._namespace.__STATE_VAR__
+  ];
 }
+__name(getModelState, "getModelState");
 function getExposeKey(target) {
   init(target);
-  return [...target._namespace.__EXPOSE_VAR__];
+  return [
+    ...target._namespace.__EXPOSE_VAR__
+  ];
 }
+__name(getExposeKey, "getExposeKey");
 function getIgnoreKey(target) {
   init(target);
-  return [...target._namespace.__IGNORE_VAR__];
+  return [
+    ...target._namespace.__IGNORE_VAR__
+  ];
 }
+__name(getIgnoreKey, "getIgnoreKey");
 function regisHandler(target, key, handler) {
   init(target);
   if (!target._namespace.__STATE_HANDLER__.has(key))
-    target._namespace.__STATE_HANDLER__.set(key, [handler]);
+    target._namespace.__STATE_HANDLER__.set(key, [
+      handler
+    ]);
   else
     target._namespace.__STATE_HANDLER__.get(key).push(handler);
 }
+__name(regisHandler, "regisHandler");
 function getHandler(target, key) {
   return target._namespace.__STATE_HANDLER__.get(key) || [];
 }
+__name(getHandler, "getHandler");
+function mergeState(target, key, state) {
+  const namespace = target._namespace.__STATE_NAMESPACE__;
+  if (!namespace.has(key))
+    namespace.set(key, state);
+  else
+    mergeOptions(namespace.get(key), state);
+}
+__name(mergeState, "mergeState");
+function getState(target, key) {
+  const namespace = target._namespace.__STATE_NAMESPACE__;
+  if (namespace)
+    return namespace.get(key);
+}
+__name(getState, "getState");
 function register(instance) {
   const stateVars = getModelState(instance);
   for (const item of stateVars) {
@@ -62,19 +144,21 @@ function register(instance) {
       hanlder.init?.(instance);
   }
 }
+__name(register, "register");
 // src/decorators.ts
 function Init(target, key) {
-  setModalState(target, key);
+  setModalVar(target, key);
   regisHandler(target, key, {
     async init(instance) {
       instance[key]();
     }
   });
 }
+__name(Init, "Init");
 function Rule(rule, info, meta) {
   return (obj, key) => {
-    setModalState(obj, key);
+    setModalVar(obj, key);
     regisHandler(obj, key, {
       rule,
       info,
@@ -82,9 +166,11 @@ function Rule(rule, info, meta) {
     });
   };
 }
+__name(Rule, "Rule");
 function Ignore(target, key) {
   setIgnoreKey(target, key);
 }
+__name(Ignore, "Ignore");
 function Clear(target, key) {
   init(target);
   target._namespace.__INIT_EVENT__.delete(key);
@@ -93,20 +179,23 @@ function Clear(target, key) {
   target._namespace.__STATE_VAR__.delete(key);
   target._namespace.__STATE_HANDLER__.delete(key);
 }
+__name(Clear, "Clear");
 function Err(cb) {
   return (target, key) => {
-    setModalState(target, key);
+    setModalVar(target, key);
     regisHandler(target, key, {
       error: cb
     });
   };
 }
+__name(Err, "Err");
 function Get(target, key) {
   setExposeKey(target, key);
 }
+__name(Get, "Get");
 function Pipe(v) {
   return (obj, key) => {
-    setModalState(obj, key);
+    setModalVar(obj, key);
     regisHandler(obj, key, {
       async pipe(instance) {
         const tasks = v.value;
@@ -116,19 +205,21 @@ function Pipe(v) {
     });
   };
 }
+__name(Pipe, "Pipe");
 function Tag(tag) {
   return (target) => {
     init(target.prototype);
     target.prototype._namespace.__TAG__ = tag;
   };
 }
+__name(Tag, "Tag");
 function Storage(target) {
   init(target.prototype);
   const tag = target.prototype._namespace.__TAG__;
   if (tag === "")
     throw new Error("miss tag");
   const uniTag = Symbol(tag);
-  setModalState(target.prototype, uniTag);
+  setModalVar(target.prototype, uniTag);
   regisHandler(target.prototype, uniTag, {
     init: (instance) => {
       const { state } = instance;
@@ -144,6 +235,7 @@ function Storage(target) {
     }
   });
 }
+__name(Storage, "Storage");
 function Window(target) {
   if (!window.__PHECDA__)
     window.__PHECDA__ = {};
@@ -151,53 +243,44 @@ function Window(target) {
   if (tag)
     window.__PHECDA__[tag] = target;
 }
-// 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;
-}
-function getTag(Model) {
-  return Model.prototype?._namespace?.__TAG__;
-}
+__name(Window, "Window");
 // src/helper.ts
 async function plainToClass(Model, input, options = {}) {
   const data = new Model();
-  const resolvedOptions = {
-    collectError: true,
-    transform: false,
-    ...options
-  };
   const err = [];
   const stateVars = getModelState(data);
   for (const item of stateVars) {
     data[item] = input[item];
     const handlers = getHandler(data, item);
     if (handlers) {
-      for (const handler of handlers) {
-        const rule = handler.rule;
-        if (rule && !await validate(rule, data[item])) {
-          err.push(handler.info || "");
-          if (!resolvedOptions.collectError)
-            break;
+      if (options.collectError !== false) {
+        for (const handler of handlers) {
+          const rule = handler.rule;
+          if (rule && !await validate(rule, data[item])) {
+            err.push(handler.info || "");
+            if (!options.collectError)
+              break;
+          }
         }
       }
-      if (err.length > 0 && !resolvedOptions.transform)
-        return { err, data };
-      for (const handler of handlers)
-        await handler.pipe?.(data);
+      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 };
+  return {
+    data,
+    err
+  };
 }
+__name(plainToClass, "plainToClass");
 function classToValue(instance) {
   const data = {};
   const exposeVar = getExposeKey(instance);
@@ -209,11 +292,16 @@ function classToValue(instance) {
   }
   return data;
 }
+__name(classToValue, "classToValue");
 function to(task, oldTasks) {
   const tasks = oldTasks || [];
   tasks.push(task);
-  return { to: (task2) => to(task2, tasks), value: tasks };
+  return {
+    to: (task2) => to(task2, tasks),
+    value: tasks
+  };
 }
+__name(to, "to");
 function snapShot(data) {
   const snap = {};
   for (const i in data)
@@ -230,96 +318,88 @@ function snapShot(data) {
     }
   };
 }
+__name(snapShot, "snapShot");
 function addDecoToClass(c, key, handler, type = "normal") {
   handler(type === "normal" ? c.prototype : c, key);
 }
+__name(addDecoToClass, "addDecoToClass");
 // src/preset/rule.ts
 function isArray(info) {
   return Rule((param) => Array.isArray(param), info || "it should be an array");
 }
+__name(isArray, "isArray");
 function isBoolean(info) {
-  return Rule((param) => [true, false].includes(param), info || "it should be true or false");
+  return Rule((param) => [
+    true,
+    false
+  ].includes(param), info || "it should be true or false");
 }
+__name(isBoolean, "isBoolean");
 function isNumber(info) {
   return Rule((param) => typeof param === "number", info || "it should be true or false");
 }
+__name(isNumber, "isNumber");
 function isString(info) {
   return Rule((param) => typeof param === "string", info || "it should be a string");
 }
-function isObject(info) {
+__name(isString, "isString");
+function isObject2(info) {
   return Rule((param) => {
     return Object.prototype.toString.call(param) === "[object Object]";
   }, info || "it should be an object");
 }
+__name(isObject2, "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 || "it should be a mobile phone number"
-  );
+  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 || "it should be a mobile phone number");
 }
+__name(isMobile, "isMobile");
 function isLandline(info) {
-  return Rule(
-    /\d{3}-\d{8}|\d{4}-\d{7}/,
-    info || "it should be a mobile phone number"
-  );
+  return Rule(/\d{3}-\d{8}|\d{4}-\d{7}/, info || "it should be a mobile phone number");
 }
+__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 || "it should be a mailbox  number"
-  );
+  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 || "it should be a mailbox  number");
 }
+__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 || "it should be an identity card number"
-  );
+  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 || "it should be an identity card number");
 }
+__name(isIdCard, "isIdCard");
 function isCnName(info) {
-  return Rule(
-    /^([\u4E00-\u9FA5·]{2,16})$/,
-    info || "\u9700\u8981\u662F\u4E00\u4E2A\u5408\u7406\u7684\u4E2D\u6587\u540D\u5B57"
-  );
+  return Rule(/^([\u4E00-\u9FA5·]{2,16})$/, info || "\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 || "it should be a valid en-name"
-  );
+  return Rule(/(^[a-zA-Z]{1}[a-zA-Z\s]{0,20}[a-zA-Z]{1}$)/, info || "it 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 || "it should be a valid date"
-  );
+  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 || "it should be a valid date");
 }
+__name(isDate, "isDate");
 function isWechat(info) {
-  return Rule(
-    /^[a-zA-Z]([-_a-zA-Z0-9]{5,19})+$/,
-    info || "it should be a valid date"
-  );
+  return Rule(/^[a-zA-Z]([-_a-zA-Z0-9]{5,19})+$/, info || "it should be a valid date");
 }
+__name(isWechat, "isWechat");
 function isHexColor(info) {
-  return Rule(
-    /^#?([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$/,
-    info || "it should be a valid hex-color"
-  );
+  return Rule(/^#?([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$/, info || "it 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 || "it should be a valid postal code"
-  );
+  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 || "it 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");
 // src/namespace.ts
 var activeInstance = {};
@@ -327,21 +407,28 @@ function injectProperty(key, value) {
   activeInstance[key] = value;
   return activeInstance;
 }
+__name(injectProperty, "injectProperty");
 function getProperty(key) {
   return activeInstance[key];
 }
+__name(getProperty, "getProperty");
 // src/custom/decorator.ts
 function Watcher(eventName) {
   return (obj, key) => {
-    setModalState(obj, key);
+    setModalVar(obj, key);
     regisHandler(obj, key, {
       init(instance) {
-        getProperty("watcher")?.({ eventName, instance, key });
+        getProperty("watcher")?.({
+          eventName,
+          instance,
+          key
+        });
       }
     });
   };
 }
+__name(Watcher, "Watcher");
 export {
   Clear,
   Err,
@@ -363,6 +450,7 @@ export {
   getInitEvent,
   getModelState,
   getProperty,
+  getState,
   getTag,
   init,
   injectProperty,
@@ -377,17 +465,20 @@ export {
   isMailBox,
   isMobile,
   isNumber,
-  isObject,
+  isObject2 as isObject,
+  isPhecda,
   isPostalCode,
   isString,
   isWechat,
+  mergeOptions,
+  mergeState,
   plainToClass,
   regisHandler,
   regisInitEvent,
   register,
   setExposeKey,
   setIgnoreKey,
-  setModalState,
+  setModalVar,
   snapShot,
   to,
   toNumber,

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "phecda-core",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",