phecda-web 2.0.0 → 2.0.2

package/README.md

@@ -4,4 +4,4 @@ Fulfill `phecda-core` standard (`Storage/Watcher`);
 
 Work for `phecda-vue`/`phecda-react`
 
-using `Proxy`
+Using `Proxy` and `emitDecoratorMetadata`

package/dist/index.d.ts

@@ -14,13 +14,15 @@ declare const emitter: PhecdaEmitter;
 declare function defaultWebInject(): void;
 
 declare function wait(...instances: InstanceType<Construct>[]): Promise<any[]>;
+declare function setDefaultPhecda(phecda: WebPhecda): void;
+declare function getDefaultPhecda(): WebPhecda;
 declare function bindMethod(instance: any): any;
 declare class WebPhecda {
-    protected proxyFn: Function;
+    protected parseModule: <Instance = any>(instance: Instance) => Instance;
     origin: Record<string, any>;
     state: Record<string | symbol, any>;
     modelMap: WeakMap<object, any>;
-    constructor(proxyFn: Function);
+    constructor(parseModule: <Instance = any>(instance: Instance) => Instance);
     init<Model extends Construct>(model: Model): InstanceType<Model>;
     patch<Model extends Construct>(model: Model, data: DeepPartial<InstanceType<Model>>): void;
     wait(...modelOrTag: (Construct | PropertyKey)[]): Promise<any[]>;
@@ -46,4 +48,4 @@ declare class Base {
     private _unmount;
 }
 
-export { Base, DeepPartial, PhecdaEmitter, WebPhecda, bindMethod, defaultWebInject, emitter, wait };
+export { Base, DeepPartial, PhecdaEmitter, WebPhecda, bindMethod, defaultWebInject, emitter, getDefaultPhecda, setDefaultPhecda, wait };

package/dist/index.js

@@ -37,18 +37,18 @@ __export(src_exports, {
   bindMethod: () => bindMethod,
   defaultWebInject: () => defaultWebInject,
   emitter: () => emitter,
+  getDefaultPhecda: () => getDefaultPhecda,
+  setDefaultPhecda: () => setDefaultPhecda,
   wait: () => wait
 });
 module.exports = __toCommonJS(src_exports);
 __reExport(src_exports, require("phecda-core"), module.exports);
 
-// src/plugin.ts
+// src/inject.ts
 var import_phecda_core = require("phecda-core");
 var import_mitt = __toESM(require("mitt"));
 var emitter = (0, import_mitt.default)();
 function defaultWebInject() {
-  if (typeof window === "undefined")
-    return;
   if (!(0, import_phecda_core.getInject)("watcher")) {
     (0, import_phecda_core.setInject)("watcher", ({ eventName, instance, key, options }) => {
       const fn = typeof instance[key] === "function" ? instance[key].bind(instance) : (v) => instance[key] = v;
@@ -122,32 +122,49 @@ function getParamtypes(Model, key) {
   return Reflect.getMetadata("design:paramtypes", Model, key);
 }
 __name(getParamtypes, "getParamtypes");
+var defaultPhecda;
+function setDefaultPhecda(phecda) {
+  defaultPhecda = phecda;
+}
+__name(setDefaultPhecda, "setDefaultPhecda");
+function getDefaultPhecda() {
+  return defaultPhecda;
+}
+__name(getDefaultPhecda, "getDefaultPhecda");
+var bindCache = /* @__PURE__ */ new WeakMap();
 function bindMethod(instance) {
-  const cache = /* @__PURE__ */ new WeakMap();
-  return new Proxy(instance, {
-    get(target, p) {
-      if (typeof target[p] === "function" && !target[p].toString().startsWith("(")) {
-        if (!cache.has(target[p]))
-          cache.set(target[p], target[p].bind(target));
-        return cache.get(target[p]);
+  if (!bindCache.has(instance)) {
+    const cache = /* @__PURE__ */ new WeakMap();
+    bindCache.set(instance, new Proxy(instance, {
+      get(target, p) {
+        if (typeof target[p] === "function" && !target[p].toString().startsWith("(")) {
+          if (!cache.has(target[p]))
+            cache.set(target[p], target[p].bind(target));
+          return cache.get(target[p]);
+        }
+        return target[p];
       }
-      return target[p];
-    }
-  });
+    }));
+  }
+  return bindCache.get(instance);
 }
 __name(bindMethod, "bindMethod");
 var WebPhecda = class {
-  proxyFn;
+  parseModule;
   origin;
   state;
   modelMap;
-  constructor(proxyFn) {
-    this.proxyFn = proxyFn;
+  constructor(parseModule) {
+    this.parseModule = parseModule;
     this.origin = {};
     this.state = {};
     this.modelMap = /* @__PURE__ */ new WeakMap();
-    defaultWebInject();
+    if (typeof window !== "undefined") {
+      defaultWebInject();
+      setDefaultPhecda(this);
+    }
   }
+  // Initialize a module that has not been created yet, and return it directly if it is cached.
   init(model) {
     const tag = (0, import_phecda_core2.getTag)(model);
     const initModel = /* @__PURE__ */ __name(() => {
@@ -157,9 +174,9 @@ var WebPhecda = class {
         const paramtypesInstances = [];
         for (const i in paramtypes)
           paramtypesInstances[i] = this.init(paramtypes[i]);
-        instance2 = this.proxyFn(new model(...paramtypesInstances));
+        instance2 = this.parseModule(new model(...paramtypesInstances));
       } else {
-        instance2 = this.proxyFn(new model());
+        instance2 = this.parseModule(new model());
       }
       if (tag in this.origin) {
         Object.assign(instance2, this.origin[tag]);
@@ -167,7 +184,7 @@ var WebPhecda = class {
       }
       if (typeof window !== "undefined")
         instance2._promise = (0, import_phecda_core2.invokeHandler)("init", instance2);
-      return bindMethod(instance2);
+      return instance2;
     }, "initModel");
     const { state, modelMap: map } = this;
     if ((0, import_phecda_core2.get)(model.prototype, "isolate"))
@@ -310,6 +327,8 @@ _ts_decorate([
   bindMethod,
   defaultWebInject,
   emitter,
+  getDefaultPhecda,
+  setDefaultPhecda,
   wait,
   ...require("phecda-core")
 });

package/dist/index.mjs

@@ -4,13 +4,11 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 // src/index.ts
 export * from "phecda-core";
 
-// src/plugin.ts
+// src/inject.ts
 import { getInject, setInject } from "phecda-core";
 import mitt from "mitt";
 var emitter = mitt();
 function defaultWebInject() {
-  if (typeof window === "undefined")
-    return;
   if (!getInject("watcher")) {
     setInject("watcher", ({ eventName, instance, key, options }) => {
       const fn = typeof instance[key] === "function" ? instance[key].bind(instance) : (v) => instance[key] = v;
@@ -84,32 +82,49 @@ function getParamtypes(Model, key) {
   return Reflect.getMetadata("design:paramtypes", Model, key);
 }
 __name(getParamtypes, "getParamtypes");
+var defaultPhecda;
+function setDefaultPhecda(phecda) {
+  defaultPhecda = phecda;
+}
+__name(setDefaultPhecda, "setDefaultPhecda");
+function getDefaultPhecda() {
+  return defaultPhecda;
+}
+__name(getDefaultPhecda, "getDefaultPhecda");
+var bindCache = /* @__PURE__ */ new WeakMap();
 function bindMethod(instance) {
-  const cache = /* @__PURE__ */ new WeakMap();
-  return new Proxy(instance, {
-    get(target, p) {
-      if (typeof target[p] === "function" && !target[p].toString().startsWith("(")) {
-        if (!cache.has(target[p]))
-          cache.set(target[p], target[p].bind(target));
-        return cache.get(target[p]);
+  if (!bindCache.has(instance)) {
+    const cache = /* @__PURE__ */ new WeakMap();
+    bindCache.set(instance, new Proxy(instance, {
+      get(target, p) {
+        if (typeof target[p] === "function" && !target[p].toString().startsWith("(")) {
+          if (!cache.has(target[p]))
+            cache.set(target[p], target[p].bind(target));
+          return cache.get(target[p]);
+        }
+        return target[p];
       }
-      return target[p];
-    }
-  });
+    }));
+  }
+  return bindCache.get(instance);
 }
 __name(bindMethod, "bindMethod");
 var WebPhecda = class {
-  proxyFn;
+  parseModule;
   origin;
   state;
   modelMap;
-  constructor(proxyFn) {
-    this.proxyFn = proxyFn;
+  constructor(parseModule) {
+    this.parseModule = parseModule;
     this.origin = {};
     this.state = {};
     this.modelMap = /* @__PURE__ */ new WeakMap();
-    defaultWebInject();
+    if (typeof window !== "undefined") {
+      defaultWebInject();
+      setDefaultPhecda(this);
+    }
   }
+  // Initialize a module that has not been created yet, and return it directly if it is cached.
   init(model) {
     const tag = getTag(model);
     const initModel = /* @__PURE__ */ __name(() => {
@@ -119,9 +134,9 @@ var WebPhecda = class {
         const paramtypesInstances = [];
         for (const i in paramtypes)
           paramtypesInstances[i] = this.init(paramtypes[i]);
-        instance2 = this.proxyFn(new model(...paramtypesInstances));
+        instance2 = this.parseModule(new model(...paramtypesInstances));
       } else {
-        instance2 = this.proxyFn(new model());
+        instance2 = this.parseModule(new model());
       }
       if (tag in this.origin) {
         Object.assign(instance2, this.origin[tag]);
@@ -129,7 +144,7 @@ var WebPhecda = class {
       }
       if (typeof window !== "undefined")
         instance2._promise = invokeHandler("init", instance2);
-      return bindMethod(instance2);
+      return instance2;
     }, "initModel");
     const { state, modelMap: map } = this;
     if (get(model.prototype, "isolate"))
@@ -271,5 +286,7 @@ export {
   bindMethod,
   defaultWebInject,
   emitter,
+  getDefaultPhecda,
+  setDefaultPhecda,
   wait
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-web",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "using proxy, provide phecda function to web app",
   "author": "fgsreally",
   "license": "MIT",