phecda-web 1.0.1-alpha.2 → 1.0.1-alpha.4

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import { Events, Construct } from 'phecda-core';
 export * from 'phecda-core';
 
 interface ActiveInstance {
-    state: Record<string, any>;
+    state: Record<string | symbol, any>;
     _v: WeakMap<any, any>;
     _r: WeakMap<any, any>;
     _f: WeakMap<any, any>;
@@ -14,21 +14,17 @@ interface PhecdaEmitter {
     off<N extends keyof Events>(eventName: N, cb?: (args: Events[N]) => void): void;
     emit<N extends keyof Events>(eventName: N, param: Events[N]): void;
 }
-interface Plugin {
-    setup(instance: ActiveInstance): void;
-    unmount?(instance: ActiveInstance): void;
-}
 
 declare const emitter: PhecdaEmitter;
-declare const storagePlugin: () => Plugin;
-declare const watchPlugin: () => Plugin;
+declare function defaultWebInject(): void;
 
 declare function waitUntilInit(...instances: InstanceType<Construct>[]): Promise<any[]>;
 declare function resetActiveInstance(instance?: ActiveInstance): void;
 declare function getActiveInstance(): ActiveInstance;
 declare function serializeState(): any;
+declare function unmountModule(module: Construct | PropertyKey): Promise<void>;
 
 declare function wrapError(target: any, key: PropertyKey, errorHandler: Function): (...args: any) => any;
 declare function isAsyncFunc(fn: Function): boolean;
 
-export { ActiveInstance, PhecdaEmitter, Plugin, emitter, getActiveInstance, isAsyncFunc, resetActiveInstance, serializeState, storagePlugin, waitUntilInit, watchPlugin, wrapError };
+export { ActiveInstance, PhecdaEmitter, defaultWebInject, emitter, getActiveInstance, isAsyncFunc, resetActiveInstance, serializeState, unmountModule, waitUntilInit, wrapError };

package/dist/index.js

@@ -28,14 +28,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
+  defaultWebInject: () => defaultWebInject,
   emitter: () => emitter,
   getActiveInstance: () => getActiveInstance,
   isAsyncFunc: () => isAsyncFunc,
   resetActiveInstance: () => resetActiveInstance,
   serializeState: () => serializeState,
-  storagePlugin: () => storagePlugin,
+  unmountModule: () => unmountModule,
   waitUntilInit: () => waitUntilInit,
-  watchPlugin: () => watchPlugin,
   wrapError: () => wrapError
 });
 module.exports = __toCommonJS(src_exports);
@@ -45,63 +45,48 @@ __reExport(src_exports, require("phecda-core"), module.exports);
 var import_phecda_core = require("phecda-core");
 var import_mitt = __toESM(require("mitt"));
 var emitter = (0, import_mitt.default)();
-var storagePlugin = /* @__PURE__ */ __name(() => {
-  return {
-    setup() {
-      (0, import_phecda_core.injectProperty)("storage", ({ tag, key, instance }) => {
-        if (!tag)
-          return;
-        const initstr = localStorage.getItem(tag);
-        if (initstr) {
-          const data = JSON.parse(initstr);
-          if (key) {
-            instance[key] = data;
-          } else {
-            for (const i in data) {
-              if (i)
-                instance[i] = data[i];
-            }
-          }
-        }
-        globalThis.addEventListener("beforeunload", () => {
-          localStorage.setItem(tag, JSON.stringify(key ? instance[key] : instance));
-        });
-      });
-    }
-  };
-}, "storagePlugin");
-var watchPlugin = /* @__PURE__ */ __name(() => {
-  const eventRecord = [];
-  return {
-    setup() {
-      (0, import_phecda_core.injectProperty)("watcher", ({ eventName, instance, key, options }) => {
-        const fn = typeof instance[key] === "function" ? instance[key].bind(instance) : (v) => instance[key] = v;
-        if (options?.once) {
-          const handler = /* @__PURE__ */ __name((...args) => {
-            fn(...args);
-            emitter.off(eventName, handler);
-          }, "handler");
-          emitter.on(eventName, handler);
-          eventRecord.push([
-            eventName,
-            handler
-          ]);
+function defaultWebInject() {
+  if (!(0, import_phecda_core.getProperty)("watcher")) {
+    (0, import_phecda_core.injectProperty)("watcher", ({ eventName, instance, key, options }) => {
+      const fn = typeof instance[key] === "function" ? instance[key].bind(instance) : (v) => instance[key] = v;
+      if (options?.once) {
+        const handler = /* @__PURE__ */ __name(() => {
+          fn();
+          emitter.off(eventName);
+        }, "handler");
+        emitter.on(eventName, handler);
+      } else {
+        emitter.on(eventName, fn);
+      }
+      return () => emitter.off(eventName);
+    });
+  }
+  if (!(0, import_phecda_core.getProperty)("storage")) {
+    (0, import_phecda_core.injectProperty)("storage", ({ tag, key, instance }) => {
+      if (!tag)
+        return;
+      const initstr = localStorage.getItem(tag);
+      if (initstr) {
+        const data = JSON.parse(initstr);
+        if (key) {
+          instance[key] = data;
         } else {
-          eventRecord.push([
-            eventName,
-            fn
-          ]);
-          emitter.on(eventName, fn);
+          for (const i in data) {
+            if (i)
+              instance[i] = data[i];
+          }
         }
+      }
+      globalThis.addEventListener("beforeunload", () => {
+        localStorage.setItem(tag, JSON.stringify(key ? instance[key] : instance));
       });
-    },
-    unmount() {
-      eventRecord.forEach(([eventName, handler]) => emitter.off(eventName, handler));
-    }
-  };
-}, "watchPlugin");
+    });
+  }
+}
+__name(defaultWebInject, "defaultWebInject");
 
 // src/core.ts
+var import_phecda_core2 = require("phecda-core");
 function waitUntilInit(...instances) {
   return Promise.all(instances.map((i) => i._promise));
 }
@@ -110,6 +95,7 @@ var activeInstance;
 function resetActiveInstance(instance) {
   activeInstance = instance || {
     state: {},
+    _o: /* @__PURE__ */ new WeakMap(),
     _v: /* @__PURE__ */ new WeakMap(),
     _r: /* @__PURE__ */ new WeakMap(),
     _f: /* @__PURE__ */ new WeakMap(),
@@ -125,6 +111,14 @@ function serializeState() {
   return JSON.parse(JSON.stringify(activeInstance.state));
 }
 __name(serializeState, "serializeState");
+async function unmountModule(module2) {
+  if (typeof module2 === "object")
+    module2 = getTag(module2);
+  const { state } = getActiveInstance();
+  await (0, import_phecda_core2.unmountParallel)(state[module2]);
+  delete state[module2];
+}
+__name(unmountModule, "unmountModule");
 
 // src/utils.ts
 function wrapError(target, key, errorHandler) {
@@ -149,13 +143,13 @@ function isAsyncFunc(fn) {
 __name(isAsyncFunc, "isAsyncFunc");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  defaultWebInject,
   emitter,
   getActiveInstance,
   isAsyncFunc,
   resetActiveInstance,
   serializeState,
-  storagePlugin,
+  unmountModule,
   waitUntilInit,
-  watchPlugin,
   wrapError
 });

package/dist/index.mjs

@@ -5,66 +5,51 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
 export * from "phecda-core";
 
 // src/plugin.ts
-import { injectProperty } from "phecda-core";
+import { getProperty, injectProperty } from "phecda-core";
 import mitt from "mitt";
 var emitter = mitt();
-var storagePlugin = /* @__PURE__ */ __name(() => {
-  return {
-    setup() {
-      injectProperty("storage", ({ tag, key, instance }) => {
-        if (!tag)
-          return;
-        const initstr = localStorage.getItem(tag);
-        if (initstr) {
-          const data = JSON.parse(initstr);
-          if (key) {
-            instance[key] = data;
-          } else {
-            for (const i in data) {
-              if (i)
-                instance[i] = data[i];
-            }
-          }
-        }
-        globalThis.addEventListener("beforeunload", () => {
-          localStorage.setItem(tag, JSON.stringify(key ? instance[key] : instance));
-        });
-      });
-    }
-  };
-}, "storagePlugin");
-var watchPlugin = /* @__PURE__ */ __name(() => {
-  const eventRecord = [];
-  return {
-    setup() {
-      injectProperty("watcher", ({ eventName, instance, key, options }) => {
-        const fn = typeof instance[key] === "function" ? instance[key].bind(instance) : (v) => instance[key] = v;
-        if (options?.once) {
-          const handler = /* @__PURE__ */ __name((...args) => {
-            fn(...args);
-            emitter.off(eventName, handler);
-          }, "handler");
-          emitter.on(eventName, handler);
-          eventRecord.push([
-            eventName,
-            handler
-          ]);
+function defaultWebInject() {
+  if (!getProperty("watcher")) {
+    injectProperty("watcher", ({ eventName, instance, key, options }) => {
+      const fn = typeof instance[key] === "function" ? instance[key].bind(instance) : (v) => instance[key] = v;
+      if (options?.once) {
+        const handler = /* @__PURE__ */ __name(() => {
+          fn();
+          emitter.off(eventName);
+        }, "handler");
+        emitter.on(eventName, handler);
+      } else {
+        emitter.on(eventName, fn);
+      }
+      return () => emitter.off(eventName);
+    });
+  }
+  if (!getProperty("storage")) {
+    injectProperty("storage", ({ tag, key, instance }) => {
+      if (!tag)
+        return;
+      const initstr = localStorage.getItem(tag);
+      if (initstr) {
+        const data = JSON.parse(initstr);
+        if (key) {
+          instance[key] = data;
         } else {
-          eventRecord.push([
-            eventName,
-            fn
-          ]);
-          emitter.on(eventName, fn);
+          for (const i in data) {
+            if (i)
+              instance[i] = data[i];
+          }
         }
+      }
+      globalThis.addEventListener("beforeunload", () => {
+        localStorage.setItem(tag, JSON.stringify(key ? instance[key] : instance));
       });
-    },
-    unmount() {
-      eventRecord.forEach(([eventName, handler]) => emitter.off(eventName, handler));
-    }
-  };
-}, "watchPlugin");
+    });
+  }
+}
+__name(defaultWebInject, "defaultWebInject");
 
 // src/core.ts
+import { unmountParallel } from "phecda-core";
 function waitUntilInit(...instances) {
   return Promise.all(instances.map((i) => i._promise));
 }
@@ -73,6 +58,7 @@ var activeInstance;
 function resetActiveInstance(instance) {
   activeInstance = instance || {
     state: {},
+    _o: /* @__PURE__ */ new WeakMap(),
     _v: /* @__PURE__ */ new WeakMap(),
     _r: /* @__PURE__ */ new WeakMap(),
     _f: /* @__PURE__ */ new WeakMap(),
@@ -88,6 +74,14 @@ function serializeState() {
   return JSON.parse(JSON.stringify(activeInstance.state));
 }
 __name(serializeState, "serializeState");
+async function unmountModule(module) {
+  if (typeof module === "object")
+    module = getTag(module);
+  const { state } = getActiveInstance();
+  await unmountParallel(state[module]);
+  delete state[module];
+}
+__name(unmountModule, "unmountModule");
 
 // src/utils.ts
 function wrapError(target, key, errorHandler) {
@@ -111,13 +105,13 @@ function isAsyncFunc(fn) {
 }
 __name(isAsyncFunc, "isAsyncFunc");
 export {
+  defaultWebInject,
   emitter,
   getActiveInstance,
   isAsyncFunc,
   resetActiveInstance,
   serializeState,
-  storagePlugin,
+  unmountModule,
   waitUntilInit,
-  watchPlugin,
   wrapError
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-web",
-  "version": "1.0.1-alpha.2",
+  "version": "1.0.1-alpha.4",
   "description": "provide web function for phecda",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -13,7 +13,7 @@
   "license": "MIT",
   "dependencies": {
     "mitt": "^3.0.0",
-    "phecda-core": "3.0.0-alpha.5"
+    "phecda-core": "3.0.0-alpha.7"
   },
   "devDependencies": {
     "tsup": "^6.5.0"