@dooboostore/simple-web-component 1.0.55 → 1.0.56

package/dist/umd-bundle/dooboostore-simple-web-component.umd.js

@@ -32,9 +32,9 @@ var dooboostoreSimpleWebComponent = (() => {
   var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
   var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 
-  // ../../../node_modules/.pnpm/reflect-metadata@0.2.2/node_modules/reflect-metadata/Reflect.js
+  // ../../node_modules/.pnpm/reflect-metadata@0.2.2/node_modules/reflect-metadata/Reflect.js
   var require_Reflect = __commonJS({
-    "../../../node_modules/.pnpm/reflect-metadata@0.2.2/node_modules/reflect-metadata/Reflect.js"() {
+    "../../node_modules/.pnpm/reflect-metadata@0.2.2/node_modules/reflect-metadata/Reflect.js"() {
       var Reflect2;
       (function(Reflect3) {
         (function(factory) {
@@ -22473,26 +22473,45 @@ ${indentStr}}`;
         return registed.instance;
       }
       if (this.storage.has(targetKey) && void 0 === registed?.instance) {
-        newInstanceCarrier.depth++;
-        const newSim = this.newSim({
-          target: registed?.type ?? targetKey,
-          newInstanceCarrier,
-          simCreateAfter: (data) => {
-            if (getSim(registed?.type ?? target ?? targetKey)?.scope === Lifecycle.Singleton) {
-              this.setStoreSet(targetKey, data, target);
+        const resolving = newInstanceCarrier.resolving ?? (newInstanceCarrier.resolving = []);
+        if (resolving.includes(targetKey)) {
+          const nameOf = (t) => typeof t === "symbol" ? t.toString() : t?.name ?? String(t);
+          throw new Error(
+            `Circular dependency detected: ${[...resolving.map(nameOf), nameOf(targetKey)].join(" -> ")}`
+          );
+        }
+        resolving.push(targetKey);
+        let settled = false;
+        try {
+          newInstanceCarrier.depth++;
+          const newSim = this.newSim({
+            target: registed?.type ?? targetKey,
+            newInstanceCarrier,
+            simCreateAfter: (data) => {
+              if (getSim(registed?.type ?? target ?? targetKey)?.scope === Lifecycle.Singleton) {
+                this.setStoreSet(targetKey, data, target);
+              }
             }
-          }
-        });
-        newInstanceCarrier.depth--;
-        if (newInstanceCarrier.depth === 0) {
-          newInstanceCarrier.newInstances.forEach((it) => {
-            this.callBindPostConstruct(it);
           });
+          newInstanceCarrier.depth--;
+          resolving.pop();
+          settled = true;
+          if (newInstanceCarrier.depth === 0) {
+            newInstanceCarrier.newInstances.forEach((it) => {
+              this.callBindPostConstruct(it);
+            });
+          }
+          if (isOnSimCreate(newSim)) {
+            newSim.onSimCreate();
+          }
+          return newSim;
+        } finally {
+          if (!settled) {
+            newInstanceCarrier.depth--;
+            const idx = resolving.lastIndexOf(targetKey);
+            if (idx !== -1) resolving.splice(idx, 1);
+          }
         }
-        if (isOnSimCreate(newSim)) {
-          newSim.onSimCreate();
-        }
-        return newSim;
       }
       const simNoSuch = new SimNoSuch("SimNoSuch: no simple instance(resolve) name:" + targetKey?.prototype?.constructor?.name + "," + targetKey);
       console.error(simNoSuch);