phecda-vue 3.0.0-beta.18 → 3.0.0-beta.20

package/dist/index.js

@@ -222,21 +222,31 @@ __name(createSharedReactive, "createSharedReactive");
 
 // src/composable.ts
 var REF_SYMBOL = Symbol("ref");
+function initInstance(model) {
+  const proxyFn = (0, import_phecda_web2.get)(model.prototype, "shallow") ? import_vue4.shallowReactive : import_vue4.reactive;
+  const instance = proxyFn(new model());
+  instance._promise = (0, import_phecda_web2.invokeHandler)("init", instance);
+  return instance;
+}
+__name(initInstance, "initInstance");
 function useO(model) {
   const { state, origin } = (0, import_phecda_web2.getActiveInstance)();
-  const proxyFn = (0, import_phecda_web2.get)(model.prototype, "shallow") ? import_vue4.shallowReactive : import_vue4.reactive;
-  if ((0, import_phecda_web2.get)(model.prototype, "isolate")) {
-    const instance = proxyFn(new model());
-    instance._promise = (0, import_phecda_web2.invokeHandler)("init", instance);
-    return instance;
-  }
+  if ((0, import_phecda_web2.get)(model.prototype, "isolate"))
+    return initInstance(model);
   const tag = (0, import_phecda_web2.getTag)(model);
-  if (!(tag in state)) {
-    const instance = proxyFn(new model());
-    instance._promise = (0, import_phecda_web2.invokeHandler)("init", instance);
-    state[tag] = instance;
-    origin.set(instance, model);
+  if (tag in state) {
+    if (process.env.NODE_ENV === "development") {
+      if (origin.get(state[tag]) === model)
+        return state[tag];
+    } else {
+      if (origin.get(state[tag]) !== model)
+        console.warn(`Synonym model: Module taged "${String(tag)}" has been loaded before, so won't load Module "${model.name}"`);
+      return state[tag];
+    }
   }
+  const instance = initInstance(model);
+  state[tag] = instance;
+  origin.set(instance, model);
   return state[tag];
 }
 __name(useO, "useO");

package/dist/index.mjs

@@ -182,21 +182,31 @@ __name(createSharedReactive, "createSharedReactive");
 
 // src/composable.ts
 var REF_SYMBOL = Symbol("ref");
+function initInstance(model) {
+  const proxyFn = get(model.prototype, "shallow") ? shallowReactive : reactive;
+  const instance = proxyFn(new model());
+  instance._promise = invokeHandler2("init", instance);
+  return instance;
+}
+__name(initInstance, "initInstance");
 function useO(model) {
   const { state, origin } = getActiveInstance2();
-  const proxyFn = get(model.prototype, "shallow") ? shallowReactive : reactive;
-  if (get(model.prototype, "isolate")) {
-    const instance = proxyFn(new model());
-    instance._promise = invokeHandler2("init", instance);
-    return instance;
-  }
+  if (get(model.prototype, "isolate"))
+    return initInstance(model);
   const tag = getTag(model);
-  if (!(tag in state)) {
-    const instance = proxyFn(new model());
-    instance._promise = invokeHandler2("init", instance);
-    state[tag] = instance;
-    origin.set(instance, model);
+  if (tag in state) {
+    if (process.env.NODE_ENV === "development") {
+      if (origin.get(state[tag]) === model)
+        return state[tag];
+    } else {
+      if (origin.get(state[tag]) !== model)
+        console.warn(`Synonym model: Module taged "${String(tag)}" has been loaded before, so won't load Module "${model.name}"`);
+      return state[tag];
+    }
   }
+  const instance = initInstance(model);
+  state[tag] = instance;
+  origin.set(instance, model);
   return state[tag];
 }
 __name(useO, "useO");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phecda-vue",
-  "version": "3.0.0-beta.18",
+  "version": "3.0.0-beta.20",
   "description": "provide phecda function to vue",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -13,7 +13,7 @@
   "license": "MIT",
   "dependencies": {
     "vue": "^3.2.45",
-    "phecda-web": "1.0.1-beta.11"
+    "phecda-web": "1.0.1-beta.13"
   },
   "devDependencies": {
     "tsup": "^6.5.0"