phecda-web 1.0.1-alpha.6 → 1.0.1-alpha.8

package/README.md

@@ -0,0 +1,5 @@
+# phecda-web
+
+Fulfill `phecda-core` standard (`Storage/Watcher`);
+
+Work for `phecda-vue`/`phecda-react`

package/dist/index.d.ts

@@ -3,10 +3,8 @@ export * from 'phecda-core';
 
 interface ActiveInstance {
     state: Record<string | symbol, any>;
-    _v: WeakMap<any, any>;
-    _r: WeakMap<any, any>;
-    _f: WeakMap<any, any>;
-    _c: WeakMap<any, any>;
+    origin: WeakMap<any, any>;
+    cache: WeakMap<any, any>;
     [key: string]: any;
 }
 interface PhecdaEmitter {
@@ -22,9 +20,7 @@ declare function waitUntilInit(...instances: InstanceType<Construct>[]): Promise
 declare function resetActiveInstance(instance?: ActiveInstance): void;
 declare function getActiveInstance(): ActiveInstance;
 declare function serializeState(): any;
+declare function isModuleLoad(module: Construct): boolean;
 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, defaultWebInject, emitter, getActiveInstance, isAsyncFunc, resetActiveInstance, serializeState, unmountModule, waitUntilInit, wrapError };
+export { ActiveInstance, PhecdaEmitter, defaultWebInject, emitter, getActiveInstance, isModuleLoad, resetActiveInstance, serializeState, unmountModule, waitUntilInit };

package/dist/index.js

@@ -31,12 +31,11 @@ __export(src_exports, {
   defaultWebInject: () => defaultWebInject,
   emitter: () => emitter,
   getActiveInstance: () => getActiveInstance,
-  isAsyncFunc: () => isAsyncFunc,
+  isModuleLoad: () => isModuleLoad,
   resetActiveInstance: () => resetActiveInstance,
   serializeState: () => serializeState,
   unmountModule: () => unmountModule,
-  waitUntilInit: () => waitUntilInit,
-  wrapError: () => wrapError
+  waitUntilInit: () => waitUntilInit
 });
 module.exports = __toCommonJS(src_exports);
 __reExport(src_exports, require("phecda-core"), module.exports);
@@ -62,12 +61,12 @@ function defaultWebInject() {
     });
   }
   if (!(0, import_phecda_core.getProperty)("storage")) {
-    (0, import_phecda_core.injectProperty)("storage", ({ tag, key, instance }) => {
+    (0, import_phecda_core.injectProperty)("storage", ({ tag, key, instance, toJSON, toString }) => {
       if (!tag)
         return;
       const initstr = localStorage.getItem(tag);
       if (initstr) {
-        const data = JSON.parse(initstr);
+        const data = toJSON(initstr);
         if (key) {
           instance[key] = data;
         } else {
@@ -78,7 +77,7 @@ function defaultWebInject() {
         }
       }
       globalThis.addEventListener("beforeunload", () => {
-        localStorage.setItem(tag, JSON.stringify(key ? instance[key] : instance));
+        localStorage.setItem(tag, toString(key ? instance[key] : instance));
       });
     });
   }
@@ -95,11 +94,8 @@ var activeInstance;
 function resetActiveInstance(instance) {
   activeInstance = instance || {
     state: {},
-    _o: /* @__PURE__ */ new WeakMap(),
-    _v: /* @__PURE__ */ new WeakMap(),
-    _r: /* @__PURE__ */ new WeakMap(),
-    _f: /* @__PURE__ */ new WeakMap(),
-    _c: /* @__PURE__ */ new WeakMap()
+    origin: /* @__PURE__ */ new WeakMap(),
+    cache: /* @__PURE__ */ new WeakMap()
   };
 }
 __name(resetActiveInstance, "resetActiveInstance");
@@ -111,45 +107,33 @@ function serializeState() {
   return JSON.parse(JSON.stringify(activeInstance.state));
 }
 __name(serializeState, "serializeState");
+function isModuleLoad(module2) {
+  const { origin, state } = getActiveInstance();
+  const tag = (0, import_phecda_core2.getTag)(module2);
+  if (tag in state) {
+    if (origin.get(state[tag]) !== module2)
+      throw new Error(`Synonym module: Module taged "${String(tag)}" (but not "${module2.name}") has been loaded before`);
+    return true;
+  }
+  return false;
+}
+__name(isModuleLoad, "isModuleLoad");
 async function unmountModule(module2) {
   if (typeof module2 === "object")
-    module2 = getTag(module2);
+    module2 = (0, import_phecda_core2.getTag)(module2);
   const { state } = getActiveInstance();
   await (0, import_phecda_core2.invokeHandler)("unmount", state[module2]);
   delete state[module2];
 }
 __name(unmountModule, "unmountModule");
-
-// src/utils.ts
-function wrapError(target, key, errorHandler) {
-  if (isAsyncFunc(target[key])) {
-    return (...args) => {
-      return target[key].apply(target, args).catch(errorHandler);
-    };
-  } else {
-    return (...args) => {
-      try {
-        return target[key].apply(target, args);
-      } catch (e) {
-        return errorHandler(e);
-      }
-    };
-  }
-}
-__name(wrapError, "wrapError");
-function isAsyncFunc(fn) {
-  return fn[Symbol.toStringTag] === "AsyncFunction";
-}
-__name(isAsyncFunc, "isAsyncFunc");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   defaultWebInject,
   emitter,
   getActiveInstance,
-  isAsyncFunc,
+  isModuleLoad,
   resetActiveInstance,
   serializeState,
   unmountModule,
-  waitUntilInit,
-  wrapError
+  waitUntilInit
 });

package/dist/index.mjs

@@ -25,12 +25,12 @@ function defaultWebInject() {
     });
   }
   if (!getProperty("storage")) {
-    injectProperty("storage", ({ tag, key, instance }) => {
+    injectProperty("storage", ({ tag, key, instance, toJSON, toString }) => {
       if (!tag)
         return;
       const initstr = localStorage.getItem(tag);
       if (initstr) {
-        const data = JSON.parse(initstr);
+        const data = toJSON(initstr);
         if (key) {
           instance[key] = data;
         } else {
@@ -41,7 +41,7 @@ function defaultWebInject() {
         }
       }
       globalThis.addEventListener("beforeunload", () => {
-        localStorage.setItem(tag, JSON.stringify(key ? instance[key] : instance));
+        localStorage.setItem(tag, toString(key ? instance[key] : instance));
       });
     });
   }
@@ -49,7 +49,7 @@ function defaultWebInject() {
 __name(defaultWebInject, "defaultWebInject");
 
 // src/core.ts
-import { invokeHandler } from "phecda-core";
+import { getTag, invokeHandler } from "phecda-core";
 function waitUntilInit(...instances) {
   return Promise.all(instances.map((i) => i._promise));
 }
@@ -58,11 +58,8 @@ var activeInstance;
 function resetActiveInstance(instance) {
   activeInstance = instance || {
     state: {},
-    _o: /* @__PURE__ */ new WeakMap(),
-    _v: /* @__PURE__ */ new WeakMap(),
-    _r: /* @__PURE__ */ new WeakMap(),
-    _f: /* @__PURE__ */ new WeakMap(),
-    _c: /* @__PURE__ */ new WeakMap()
+    origin: /* @__PURE__ */ new WeakMap(),
+    cache: /* @__PURE__ */ new WeakMap()
   };
 }
 __name(resetActiveInstance, "resetActiveInstance");
@@ -74,6 +71,17 @@ function serializeState() {
   return JSON.parse(JSON.stringify(activeInstance.state));
 }
 __name(serializeState, "serializeState");
+function isModuleLoad(module) {
+  const { origin, state } = getActiveInstance();
+  const tag = getTag(module);
+  if (tag in state) {
+    if (origin.get(state[tag]) !== module)
+      throw new Error(`Synonym module: Module taged "${String(tag)}" (but not "${module.name}") has been loaded before`);
+    return true;
+  }
+  return false;
+}
+__name(isModuleLoad, "isModuleLoad");
 async function unmountModule(module) {
   if (typeof module === "object")
     module = getTag(module);
@@ -82,36 +90,13 @@ async function unmountModule(module) {
   delete state[module];
 }
 __name(unmountModule, "unmountModule");
-
-// src/utils.ts
-function wrapError(target, key, errorHandler) {
-  if (isAsyncFunc(target[key])) {
-    return (...args) => {
-      return target[key].apply(target, args).catch(errorHandler);
-    };
-  } else {
-    return (...args) => {
-      try {
-        return target[key].apply(target, args);
-      } catch (e) {
-        return errorHandler(e);
-      }
-    };
-  }
-}
-__name(wrapError, "wrapError");
-function isAsyncFunc(fn) {
-  return fn[Symbol.toStringTag] === "AsyncFunction";
-}
-__name(isAsyncFunc, "isAsyncFunc");
 export {
   defaultWebInject,
   emitter,
   getActiveInstance,
-  isAsyncFunc,
+  isModuleLoad,
   resetActiveInstance,
   serializeState,
   unmountModule,
-  waitUntilInit,
-  wrapError
+  waitUntilInit
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-web",
-  "version": "1.0.1-alpha.6",
+  "version": "1.0.1-alpha.8",
   "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.9"
+    "phecda-core": "3.0.0-alpha.11"
   },
   "devDependencies": {
     "tsup": "^6.5.0"