phecda-web 2.0.4 → 2.0.6

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { Events, Construct } from 'phecda-core';
+import { Events, Construct, Base } from 'phecda-core';
 export * from 'phecda-core';
 import * as mitt from 'mitt';
 import { Handler, WildcardHandler } from 'mitt';
@@ -63,6 +63,7 @@ declare class WebPhecda {
     modelMap: WeakMap<object, any>;
     emitter: mitt.Emitter<InternalEvents>;
     constructor(namespace: string, parseModule: <Instance = any>(instance: Instance) => Instance);
+    private then;
     /**
    *   Initialize a module that has not been created yet, and return it directly if it is cached.
    */
@@ -82,17 +83,8 @@ declare class WebPhecda {
     on(type: '*', handler: WildcardHandler<InternalEvents>): void;
 }
 
-declare class Base {
-    private readonly __UNMOUNT_SYMBOL__;
-    private readonly __PROMISE_SYMBOL__;
-    constructor();
-    get tag(): PropertyKey;
-    then(cb: () => void, reject?: (e: any) => void): Promise<void>;
-    on<Key extends keyof Events>(type: Key, handler: (arg: Events[Key]) => void): void;
-    emit<Key extends keyof Events>(type: Key, param: Events[Key]): void;
-    off<Key extends keyof Events>(type: Key, handler?: (arg: Events[Key]) => void): void;
-    private onUnmount;
-    private _unmount;
+declare class WebBase extends Base {
+    emitter: PhecdaEmitter;
 }
 
-export { Base, type DeepPartial, type PhecdaEmitter, WebPhecda, bindMethod, defaultWebInject, delDefaultPhecda, emitter, getDefaultPhecda, phecdaNamespace, setDefaultPhecda, wait };
+export { type DeepPartial, type PhecdaEmitter, WebBase, WebPhecda, bindMethod, defaultWebInject, delDefaultPhecda, emitter, getDefaultPhecda, phecdaNamespace, setDefaultPhecda, wait };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Events, Construct } from 'phecda-core';
+import { Events, Construct, Base } from 'phecda-core';
 export * from 'phecda-core';
 import * as mitt from 'mitt';
 import { Handler, WildcardHandler } from 'mitt';
@@ -63,6 +63,7 @@ declare class WebPhecda {
     modelMap: WeakMap<object, any>;
     emitter: mitt.Emitter<InternalEvents>;
     constructor(namespace: string, parseModule: <Instance = any>(instance: Instance) => Instance);
+    private then;
     /**
    *   Initialize a module that has not been created yet, and return it directly if it is cached.
    */
@@ -82,17 +83,8 @@ declare class WebPhecda {
     on(type: '*', handler: WildcardHandler<InternalEvents>): void;
 }
 
-declare class Base {
-    private readonly __UNMOUNT_SYMBOL__;
-    private readonly __PROMISE_SYMBOL__;
-    constructor();
-    get tag(): PropertyKey;
-    then(cb: () => void, reject?: (e: any) => void): Promise<void>;
-    on<Key extends keyof Events>(type: Key, handler: (arg: Events[Key]) => void): void;
-    emit<Key extends keyof Events>(type: Key, param: Events[Key]): void;
-    off<Key extends keyof Events>(type: Key, handler?: (arg: Events[Key]) => void): void;
-    private onUnmount;
-    private _unmount;
+declare class WebBase extends Base {
+    emitter: PhecdaEmitter;
 }
 
-export { Base, type DeepPartial, type PhecdaEmitter, WebPhecda, bindMethod, defaultWebInject, delDefaultPhecda, emitter, getDefaultPhecda, phecdaNamespace, setDefaultPhecda, wait };
+export { type DeepPartial, type PhecdaEmitter, WebBase, WebPhecda, bindMethod, defaultWebInject, delDefaultPhecda, emitter, getDefaultPhecda, phecdaNamespace, setDefaultPhecda, wait };

package/dist/index.js

@@ -32,7 +32,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  Base: () => Base,
+  WebBase: () => WebBase,
   WebPhecda: () => WebPhecda,
   bindMethod: () => bindMethod,
   defaultWebInject: () => defaultWebInject,
@@ -142,7 +142,7 @@ function bindMethod(instance, wrapper) {
     const cache = /* @__PURE__ */ new WeakMap();
     bindCache.set(instance, new Proxy(instance, {
       get(target, p) {
-        if (typeof target[p] === "function" && !target[p].toString().startsWith("(")) {
+        if (typeof target[p] === "function" && p !== "constructor" && !target[p].toString().startsWith("(")) {
           if (!cache.has(target[p])) cache.set(target[p], wrapper ? wrapper(target, p) : target[p].bind(target));
           return cache.get(target[p]);
         }
@@ -178,6 +178,15 @@ var WebPhecda = class {
       setDefaultPhecda(namespace, this);
     }
   }
+  // @ts-expect-error internal
+  then(onfulfilled, onrejected) {
+    const then = this.then;
+    this.then = void 0;
+    wait(...Object.values(this.state)).then(() => onfulfilled?.(this), onrejected).then(() => {
+      this.then = then;
+    });
+    return this;
+  }
   /**
   *   Initialize a module that has not been created yet, and return it directly if it is cached.
   */
@@ -201,7 +210,7 @@ var WebPhecda = class {
         this.emit("Initialize", {
           tag
         });
-        instance2.__PROMISE_SYMBOL__ = (0, import_phecda_core2.invokeHandler)("init", instance2);
+        (0, import_phecda_core2.invokeHandler)("init", instance2);
       }
       return instance2;
     }, "initModel");
@@ -312,57 +321,15 @@ var WebPhecda = class {
 
 // src/base.ts
 var import_phecda_core3 = require("phecda-core");
-function _ts_decorate(decorators, target, key, desc) {
-  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-__name(_ts_decorate, "_ts_decorate");
-function _ts_metadata(k, v) {
-  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-}
-__name(_ts_metadata, "_ts_metadata");
-var Base = class {
+var WebBase = class extends import_phecda_core3.Base {
   static {
-    __name(this, "Base");
-  }
-  __UNMOUNT_SYMBOL__ = [];
-  __PROMISE_SYMBOL__;
-  constructor() {
-  }
-  get tag() {
-    return (0, import_phecda_core3.getTag)(this);
-  }
-  then(cb, reject) {
-    return this.__PROMISE_SYMBOL__.then(cb, reject);
-  }
-  on(type, handler) {
-    emitter.on(type, handler);
-    this.onUnmount(() => emitter.off(type, handler));
-  }
-  emit(type, param) {
-    emitter.emit(type, param);
-  }
-  off(type, handler) {
-    emitter.off(type, handler);
-  }
-  onUnmount(cb) {
-    this.__UNMOUNT_SYMBOL__.push(cb);
-  }
-  _unmount() {
-    return Promise.all(this.__UNMOUNT_SYMBOL__.map((fn) => fn()));
+    __name(this, "WebBase");
   }
+  emitter = emitter;
 };
-_ts_decorate([
-  import_phecda_core3.Unmount,
-  _ts_metadata("design:type", Function),
-  _ts_metadata("design:paramtypes", []),
-  _ts_metadata("design:returntype", void 0)
-], Base.prototype, "_unmount", null);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  Base,
+  WebBase,
   WebPhecda,
   bindMethod,
   defaultWebInject,

package/dist/index.mjs

@@ -100,7 +100,7 @@ function bindMethod(instance, wrapper) {
     const cache = /* @__PURE__ */ new WeakMap();
     bindCache.set(instance, new Proxy(instance, {
       get(target, p) {
-        if (typeof target[p] === "function" && !target[p].toString().startsWith("(")) {
+        if (typeof target[p] === "function" && p !== "constructor" && !target[p].toString().startsWith("(")) {
           if (!cache.has(target[p])) cache.set(target[p], wrapper ? wrapper(target, p) : target[p].bind(target));
           return cache.get(target[p]);
         }
@@ -136,6 +136,15 @@ var WebPhecda = class {
       setDefaultPhecda(namespace, this);
     }
   }
+  // @ts-expect-error internal
+  then(onfulfilled, onrejected) {
+    const then = this.then;
+    this.then = void 0;
+    wait(...Object.values(this.state)).then(() => onfulfilled?.(this), onrejected).then(() => {
+      this.then = then;
+    });
+    return this;
+  }
   /**
   *   Initialize a module that has not been created yet, and return it directly if it is cached.
   */
@@ -159,7 +168,7 @@ var WebPhecda = class {
         this.emit("Initialize", {
           tag
         });
-        instance2.__PROMISE_SYMBOL__ = invokeHandler("init", instance2);
+        invokeHandler("init", instance2);
       }
       return instance2;
     }, "initModel");
@@ -269,57 +278,15 @@ var WebPhecda = class {
 };
 
 // src/base.ts
-import { Unmount, getTag as getTag2 } from "phecda-core";
-function _ts_decorate(decorators, target, key, desc) {
-  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-__name(_ts_decorate, "_ts_decorate");
-function _ts_metadata(k, v) {
-  if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-}
-__name(_ts_metadata, "_ts_metadata");
-var Base = class {
+import { Base } from "phecda-core";
+var WebBase = class extends Base {
   static {
-    __name(this, "Base");
-  }
-  __UNMOUNT_SYMBOL__ = [];
-  __PROMISE_SYMBOL__;
-  constructor() {
-  }
-  get tag() {
-    return getTag2(this);
-  }
-  then(cb, reject) {
-    return this.__PROMISE_SYMBOL__.then(cb, reject);
-  }
-  on(type, handler) {
-    emitter.on(type, handler);
-    this.onUnmount(() => emitter.off(type, handler));
-  }
-  emit(type, param) {
-    emitter.emit(type, param);
-  }
-  off(type, handler) {
-    emitter.off(type, handler);
-  }
-  onUnmount(cb) {
-    this.__UNMOUNT_SYMBOL__.push(cb);
-  }
-  _unmount() {
-    return Promise.all(this.__UNMOUNT_SYMBOL__.map((fn) => fn()));
+    __name(this, "WebBase");
   }
+  emitter = emitter;
 };
-_ts_decorate([
-  Unmount,
-  _ts_metadata("design:type", Function),
-  _ts_metadata("design:paramtypes", []),
-  _ts_metadata("design:returntype", void 0)
-], Base.prototype, "_unmount", null);
 export {
-  Base,
+  WebBase,
   WebPhecda,
   bindMethod,
   defaultWebInject,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-web",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "using proxy, provide phecda function to web app",
   "author": "fgsreally",
   "license": "MIT",
@@ -18,7 +18,7 @@
   "dependencies": {
     "mitt": "^3.0.0",
     "reflect-metadata": "^0.1.13",
-    "phecda-core": "3.0.1"
+    "phecda-core": "3.1.0"
   },
   "devDependencies": {
     "tsup": "^8.1.0"