@dooboostore/simple-boot-http-server 1.0.27 → 1.0.28

package/dist/umd-bundle/dooboostore-simple-boot-http-server.umd.js

@@ -14158,6 +14158,7 @@ var dooboostoreSimpleBootHttpServer = (() => {
     getUrlMapping: () => getUrlMapping,
     getUrlMappings: () => getUrlMappings,
     headMethod: () => headMethod,
+    injectRequestResponse: () => injectRequestResponse,
     isDataDist: () => isDataDist,
     isPathDist: () => isPathDist,
     makeIntentHeaderBySymbolFor: () => makeIntentHeaderBySymbolFor,
@@ -14458,6 +14459,12 @@ var dooboostoreSimpleBootHttpServer = (() => {
         return false;
       }
     };
+    ValidUtils22.isGenerator = (value) => {
+      return value !== null && typeof value === "object" && typeof value.next === "function" && typeof value[Symbol.iterator] === "function";
+    };
+    ValidUtils22.isAsyncGenerator = (value) => {
+      return value !== null && typeof value === "object" && typeof value.next === "function" && typeof value[Symbol.asyncIterator] === "function";
+    };
     ValidUtils22.isFrozen = (obj) => {
       return Object.isFrozen(obj);
     };
@@ -18902,87 +18909,64 @@ var dooboostoreSimpleBootHttpServer = (() => {
   // ../core/dist/esm/promise/AbortablePromise.js
   var AbortablePromise = class _AbortablePromise {
     constructor(executor, signal) {
-      this.steps = [];
-      this.initialExecutor = executor;
       this.signal = signal;
+      if (typeof executor !== "function") {
+        this.source = Promise.resolve(executor);
+      } else if (signal?.aborted) {
+        this.source = Promise.reject(signal.reason);
+      } else {
+        this.source = Promise.resolve().then(executor);
+      }
+    }
+    /**
+     * source 를 abort 와 경쟁시킨 promise. 실제로 소비될 때(then/toPromise) 한 번만 만든다 —
+     * await 는 then() 이 돌려준 새 인스턴스를 버리므로, 미리 만들면 아무도 안 받는 reject 가 unhandled 로 남는다.
+     */
+    get promise() {
+      if (this.guarded) return this.guarded;
+      const signal = this.signal;
+      if (!signal) return this.guarded = this.source;
+      if (signal.aborted) {
+        this.source.catch(() => {
+        });
+        return this.guarded = Promise.reject(signal.reason);
+      }
+      return this.guarded = new Promise((resolve2, reject) => {
+        const cleanup = () => signal.removeEventListener("abort", onAbort);
+        const onAbort = () => reject(signal.reason);
+        signal.addEventListener("abort", onAbort, { once: true });
+        this.source.then(
+          (value) => {
+            cleanup();
+            resolve2(value);
+          },
+          (reason) => {
+            cleanup();
+            reject(reason);
+          }
+        );
+      });
     }
     then(onfulfilled, onrejected) {
-      const newPromise = new _AbortablePromise(
-        this.initialExecutor,
-        this.signal
+      const signal = this.signal;
+      const next = this.promise.then(
+        onfulfilled ? (value) => {
+          if (signal?.aborted) throw signal.reason;
+          return onfulfilled(value);
+        } : void 0,
+        onrejected
       );
-      newPromise.steps = [...this.steps];
-      if (onfulfilled) {
-        newPromise.steps.push(onfulfilled);
-      }
-      if (onrejected) {
-        newPromise.errorHandler = onrejected;
-      } else if (this.errorHandler) {
-        newPromise.errorHandler = this.errorHandler;
-      }
-      return newPromise;
+      return new _AbortablePromise(next, signal);
     }
     catch(onrejected) {
       return this.then(void 0, onrejected);
     }
     finally(onfinally) {
-      return this.then(
-        (value) => {
-          onfinally?.();
-          return value;
-        },
-        (reason) => {
-          onfinally?.();
-          throw reason;
-        }
-      );
+      return new _AbortablePromise(this.promise.finally(onfinally), this.signal);
     }
-    async execute() {
-      try {
-        if (this.signal?.aborted) {
-          throw new Error(this.signal.reason || "Aborted");
-        }
-        const abortPromise = new Promise((_, reject) => {
-          if (this.signal?.aborted) {
-            return reject(new Error(this.signal.reason || "Aborted"));
-          }
-          const callback = (e) => {
-            const target = e.target;
-            this.signal?.removeEventListener("abort", callback);
-            reject(new Error(target.reason || "Aborted"));
-          };
-          this.signal?.addEventListener("abort", callback, { once: true });
-        });
-        const pipelineRunner = async () => {
-          let lastResult;
-          if (typeof this.initialExecutor === "function") {
-            if (this.signal?.aborted) {
-              throw new Error(this.signal.reason || "Aborted");
-            }
-            lastResult = await this.initialExecutor();
-          } else {
-            lastResult = await this.initialExecutor;
-          }
-          for (let i = 0; i < this.steps.length; i++) {
-            if (this.signal?.aborted) {
-              throw new Error(this.signal.reason || "Aborted");
-            }
-            const step = this.steps[i];
-            lastResult = await step(lastResult);
-          }
-          return lastResult;
-        };
-        return await Promise.race([pipelineRunner(), abortPromise]);
-      } catch (error) {
-        if (this.errorHandler) {
-          return await this.errorHandler(error);
-        }
-        throw error;
-      }
-    }
-    // Convert to native Promise
+    // 네이티브 Promise 로 변환 (그냥 await 해도 된다)
     toPromise() {
-      return this.execute();
+      return this.promise;
     }
   };
 
@@ -19855,11 +19839,15 @@ var dooboostoreSimpleBootHttpServer = (() => {
           resolve2(gdata);
         }).catch(async (e) => {
           this.error(config, pipe, e);
-          config?.error?.();
+          config?.error?.(e);
           if (config?.errorTransform) {
             e = await config.errorTransform(e);
           }
-          e = await this.errorTransform(e);
+          try {
+            e = await this.errorTransform(e);
+          } catch (ee) {
+            e = ee;
+          }
           reject(e);
         }).finally(() => {
           this.finally(config, pipe);
@@ -19876,41 +19864,30 @@ var dooboostoreSimpleBootHttpServer = (() => {
     return data instanceof HttpResponseError;
   };
   var HttpFetcher = class extends Fetcher {
+    // get/post/put/patch/head/delete가 전부 config.config.fetch.method를 세팅하려고 caller가
+    // 넘긴 config(.fetch) 객체를 직접 mutate했다 - 같은 config 객체를 여러 호출이 공유하면
+    // (예: Promise.all로 동시에 get/post) 서로의 method를 덮어쓰는 레이스가 생겼다. caller의
+    // 객체는 절대 건드리지 않고, 얕은 복사본 위에 method만 얹어서 반환한다.
+    withMethod(config, method) {
+      return { ...config, config: { ...config.config, fetch: { ...config.config?.fetch, method } } };
+    }
     get(config) {
-      config.config ?? (config.config = {});
-      config.config.fetch = config.config?.fetch ?? {};
-      config.config.fetch.method = "GET";
-      return this.fetch(config);
+      return this.fetch(this.withMethod(config, "GET"));
     }
     post(config) {
-      config.config ?? (config.config = {});
-      config.config.fetch = config.config?.fetch ?? {};
-      config.config.fetch.method = "POST";
-      return this.fetch(config);
+      return this.fetch(this.withMethod(config, "POST"));
     }
     patch(config) {
-      config.config ?? (config.config = {});
-      config.config.fetch = config.config?.fetch ?? {};
-      config.config.fetch.method = "PATCH";
-      return this.fetch(config);
+      return this.fetch(this.withMethod(config, "PATCH"));
     }
     put(config) {
-      config.config ?? (config.config = {});
-      config.config.fetch = config.config?.fetch ?? {};
-      config.config.fetch.method = "PUT";
-      return this.fetch(config);
+      return this.fetch(this.withMethod(config, "PUT"));
     }
     head(config) {
-      config.config ?? (config.config = {});
-      config.config.fetch = config.config?.fetch ?? {};
-      config.config.fetch.method = "HEAD";
-      return this.fetch(config);
+      return this.fetch(this.withMethod(config, "HEAD"));
     }
     delete(config) {
-      config.config ?? (config.config = {});
-      config.config.fetch = config.config?.fetch ?? {};
-      config.config.fetch.method = "DELETE";
-      return this.fetch(config);
+      return this.fetch(this.withMethod(config, "DELETE"));
     }
     async beforeProxyFetch(config) {
       return config;
@@ -19947,7 +19924,7 @@ var dooboostoreSimpleBootHttpServer = (() => {
         }
       } else {
         httpResponseError.body = e;
-        httpResponseError.message = e.message;
+        httpResponseError.message = e?.message;
       }
       return httpResponseError;
     }
@@ -19957,7 +19934,7 @@ var dooboostoreSimpleBootHttpServer = (() => {
       if (!(target instanceof URL) && typeof target !== "string") {
         const searchParams = ConvertUtils.toURLSearchParams(target.searchParams ?? {});
         try {
-          const url = typeof target.url === "string" ? new URL(target.url) : target.url;
+          const url = new URL(target.url);
           searchParams.forEach((value, key) => {
             url.searchParams.append(key, value);
           });
@@ -19972,43 +19949,30 @@ var dooboostoreSimpleBootHttpServer = (() => {
         }
       }
       const beforeProxyData = { requestInfo: target, init: config?.fetch };
-      let beforeData = config?.beforeProxyFetch ? await config?.beforeProxyFetch(config) : beforeProxyData.requestInfo;
-      beforeData = config?.skipGlobalBeforeProxyFetch ? beforeProxyData : await this.beforeProxyFetch(beforeProxyData);
+      let beforeData = config?.beforeProxyFetch ? await config?.beforeProxyFetch(beforeProxyData) : beforeProxyData;
+      beforeData = config?.skipGlobalBeforeProxyFetch ? beforeData : await this.beforeProxyFetch(beforeData);
       target = beforeData.requestInfo;
       if (beforeData.init) {
         config ?? (config = {});
         config.fetch = beforeData.init;
       }
-      let abortedTimeout;
+      let requestInit = config?.fetch;
       if (config?.fetch && "timeout" in config.fetch) {
-        const abortController = new AbortController();
-        abortedTimeout = setTimeout(() => {
-          if (config?.fetch?.signal) {
-            const inputSignal = config.fetch.signal;
-            const listener = () => {
-              if (!abortController.signal.aborted) {
-                abortController.abort();
-              }
-              inputSignal.removeEventListener("abort", listener);
-            };
-            inputSignal.addEventListener("abort", listener);
-          }
-          if (!abortController.signal.aborted) {
-            abortController.abort();
-          }
-        }, config.fetch.timeout);
-        config.fetch.signal = abortController.signal;
+        const timeoutSignal = AbortSignal.timeout(config.fetch.timeout);
+        const signal = config.fetch.signal ? AbortSignal.any([timeoutSignal, config.fetch.signal]) : timeoutSignal;
+        requestInit = { ...config.fetch, signal };
       }
-      this.beforeFetch({ target, requestInit: config?.fetch });
-      return (config.fetcher ?? fetch)(target, config?.fetch).then(async (it) => {
-        this.afterFetch({ target, requestInit: config?.fetch }, it);
+      this.beforeFetch({ target, requestInit });
+      return (config.fetcher ?? fetch)(target, requestInit).then(async (it) => {
+        this.afterFetch({ target, requestInit }, it);
         const afterProxyData = {
-          fetch: { target, requestInit: config.fetch },
+          fetch: { target, requestInit },
           config: beforeData,
           response: it
         };
-        it = config?.afterProxyFetch ? await config.afterProxyFetch(afterProxyData) : it;
-        it = config?.skipGlobalAfterProxyFetch ? it : await this.afterProxyFetch(afterProxyData);
+        afterProxyData.response = config?.afterProxyFetch ? await config.afterProxyFetch(afterProxyData) : it;
+        afterProxyData.response = config?.skipGlobalAfterProxyFetch ? afterProxyData.response : await this.afterProxyFetch(afterProxyData);
+        it = afterProxyData.response;
         config?.fetchResponseAfterCallBack?.(it, config);
         if (!config?.allowedResponseNotOk && !it.ok) {
           throw it;
@@ -20018,30 +19982,31 @@ var dooboostoreSimpleBootHttpServer = (() => {
           throw data;
         }
         return it;
-      }).finally(() => {
-        if (abortedTimeout) {
-          clearTimeout(abortedTimeout);
-        }
       });
     }
   };
 
   // ../core/dist/esm/fetch/HttpJsonFetcher.js
   var HttpJsonFetcher = class extends HttpFetcher {
+    // config.config/config.config.fetch를 직접 mutate하면(예전처럼) 같은 config 객체를 여러
+    // postJson/patchJson/putJson 호출이 동시에 공유할 때 서로의 headers/body를 덮어쓰는 레이스가
+    // 생긴다(HttpFetcher.get/post의 method 레이스랑 같은 문제). caller의 객체는 안 건드리고,
+    // 얕은 복사본을 만들어서 새 config 객체를 리턴한다.
     updateJsonFetchConfigAndData(config) {
-      var _a4, _b3;
       const headers = {
         "Content-Type": "application/json",
         Accept: "application/json, text/plain, */*"
       };
-      config.config ?? (config.config = {});
-      (_a4 = config.config).fetch ?? (_a4.fetch = {});
-      (_b3 = config.config.fetch).headers ?? (_b3.headers = {});
-      config.config.fetch.headers = { ...headers, ...config.config.fetch?.headers };
-      if (config.config?.fetch?.body && typeof config.config?.fetch?.body !== "string") {
-        config.config.fetch.body = JSON.stringify(config.config.fetch.body);
+      const fetchInit = { ...config.config?.fetch };
+      const merged = new Headers(headers);
+      if (fetchInit.headers) {
+        new Headers(fetchInit.headers).forEach((value, key) => merged.set(key, value));
       }
-      return config;
+      fetchInit.headers = merged;
+      if (fetchInit.body && typeof fetchInit.body !== "string") {
+        fetchInit.body = JSON.stringify(fetchInit.body);
+      }
+      return { ...config, config: { ...config.config, fetch: fetchInit } };
     }
     get(config) {
       return super.get(config);
@@ -21865,12 +21830,13 @@ var dooboostoreSimpleBootHttpServer = (() => {
     ReflectUtils2.findMetadata = (metadataKey, target, propertyKey) => {
       if (target == null) return void 0;
       let searchTarget = typeof target === "object" && typeof target !== "function" ? target.constructor : target;
-      while (searchTarget && searchTarget !== Object) {
+      const seen = /* @__PURE__ */ new Set();
+      while (searchTarget && searchTarget !== Object && !seen.has(searchTarget)) {
+        seen.add(searchTarget);
         const data = propertyKey ? Reflect.getOwnMetadata(metadataKey, searchTarget, propertyKey) : Reflect.getOwnMetadata(metadataKey, searchTarget);
         if (data !== void 0) return data;
         const proto = Object.getPrototypeOf(searchTarget);
         searchTarget = proto && typeof proto === "function" ? proto : proto?.constructor || null;
-        if (searchTarget === target) break;
       }
       return void 0;
     };
@@ -21878,12 +21844,13 @@ var dooboostoreSimpleBootHttpServer = (() => {
       const results = [];
       if (target == null) return results;
       let searchTarget = typeof target === "object" && typeof target !== "function" ? target.constructor : target;
-      while (searchTarget && searchTarget !== Object) {
+      const seen = /* @__PURE__ */ new Set();
+      while (searchTarget && searchTarget !== Object && !seen.has(searchTarget)) {
+        seen.add(searchTarget);
         const data = propertyKey ? Reflect.getOwnMetadata(metadataKey, searchTarget, propertyKey) : Reflect.getOwnMetadata(metadataKey, searchTarget);
         if (data !== void 0) results.unshift(data);
         const proto = Object.getPrototypeOf(searchTarget);
         searchTarget = proto && typeof proto === "function" ? proto : proto?.constructor || null;
-        if (searchTarget === target) break;
       }
       return results;
     };
@@ -25130,7 +25097,16 @@ ${indentStr}}`;
       }
       if (!this.value) {
         if (typeof this.type.targetKeyType === "symbol") {
-          this.value = this.simstanceManager.findFirstSim(this.type.targetKeyType)?.getValue();
+          const stored = this.simstanceManager.getStoreSet(this.type.targetKeyType);
+          if (ValidUtils.isArrowFunction(stored?.instance)) {
+            const fresh = stored.instance();
+            if (this.getConfig()?.scope === Lifecycle.Singleton) {
+              this.simstanceManager.setStoreSet(this.type.targetKeyType, fresh, stored.type);
+              this.value = fresh;
+            }
+            return fresh;
+          }
+          this.value = stored?.instance;
         } else {
           this.value = this.simstanceManager.getOrNewSim({ target: this.type.targetKeyType, originTypeTarget: this.type.originalType, newInstanceCarrier: config?.newInstanceCarrier });
         }
@@ -25685,7 +25661,7 @@ ${indentStr}}`;
     registerStore(targetKey, regTyps) {
       const itemMap = this.storage.get(targetKey) ?? /* @__PURE__ */ new Map();
       regTyps.forEach((it) => {
-        const { type, value } = typeof it === "object" ? { type: it.constructor, value: it } : { type: it, value: void 0 };
+        const { type, value } = ValidUtils.isArrowFunction(it) ? { type: it, value: it } : typeof it === "object" ? { type: it.constructor, value: it } : { type: it, value: void 0 };
         if (!itemMap.has(type) || value !== void 0 && itemMap.get(type) === void 0) {
           itemMap.set(type, value);
         }
@@ -25938,9 +25914,16 @@ ${indentStr}}`;
     }
     run(otherInstanceSim = /* @__PURE__ */ new Map()) {
       for (const [k, v] of Array.from(otherInstanceSim.entries())) {
-        const storageKey = typeof k === "object" && k !== null && "type" in k ? k.type : k;
-        this.registerStore(storageKey, /* @__PURE__ */ new Set([v]));
-        if (typeof k === "object" && k !== null && "symbol" in k && k.symbol) {
+        const hasType = typeof k === "object" && k !== null && "type" in k;
+        const hasSymbol = typeof k === "object" && k !== null && !!k.symbol;
+        const storageKey = hasType ? k.type : k;
+        if (hasType || !hasSymbol) {
+          this.registerStore(storageKey, /* @__PURE__ */ new Set([v]));
+        }
+        if (hasSymbol) {
+          if (!ReflectUtils.getMetadata(SimMetadataKey, v)) {
+            ReflectUtils.defineMetadata(SimMetadataKey, { ...k, scope: k.scope ?? Lifecycle.Singleton }, v);
+          }
           this.registerStore(k.symbol, /* @__PURE__ */ new Set([v]));
         }
       }
@@ -28069,7 +28052,7 @@ ${indentStr}}`;
                     fetch: {
                       credentials: "include",
                       headers,
-                      body: ConvertUtils.toFormData(userConfig?.body)
+                      body: userConfig?.body ? ConvertUtils.toFormData(userConfig.body) : void 0
                     }
                   }
                 });
@@ -28382,6 +28365,16 @@ ${indentStr}}`;
     };
   };
 
+  // src/proxy/RequestResponseInjectProxy.ts
+  var injectRequestResponse = (sim2, rr) => new Proxy(sim2, {
+    get(target, prop) {
+      const value = target[prop];
+      if (prop === "constructor" || typeof value !== "function") return value;
+      if (!rr) return value.bind(target);
+      return (...args) => value.apply(target, [...args, rr]);
+    }
+  });
+
   // src/inject/InjectSituationType.ts
   var InjectSituationType2;
   ((InjectSituationType3) => {
@@ -28406,6 +28399,7 @@ ${indentStr}}`;
 
   // src/models/RequestResponse.ts
   var import_node_gzip = __toESM(require_dist(), 1);
+  var import_zlib = __require("zlib");
   var import_node_buffer2 = __require("node:buffer");
   var RequestResponse = class _RequestResponse {
     constructor(req, res, config) {
@@ -28844,6 +28838,57 @@ ${indentStr}}`;
       this.createRequestResponseChain(this.res.writeHead(statusCode, headers));
       this.res.end();
     }
+    /**
+     * 헤더를 즉시 보내고, source 가 내놓는 값을 하나씩 바로 body 에 쓴 뒤 end.
+     * (SSE / 스트리밍 응답용. resWrite 는 버퍼링 후 resEnd 에서 한 번에 보내므로 스트리밍 불가)
+     * - 문자열/Buffer 는 그대로, 그 외는 JSON.stringify
+     * - Accept-Encoding 에 gzip 이 있으면 gzip 스트림으로 압축하고, 청크마다 Z_SYNC_FLUSH 로 바로 내보낸다
+     *   (flush 없이 쓰면 zlib 내부 버퍼에 모였다가 늦게 나가서 SSE 실시간성이 깨짐)
+     * - 클라이언트가 끊으면 source.return() 으로 제너레이터를 종료시켜 finally 가 돌게 한다
+     */
+    async resStream(source) {
+      const res = this.res;
+      const gz = this.reqHeaderFirst(HttpHeaders.AcceptEncoding)?.includes("gzip") ? (0, import_zlib.createGzip)() : void 0;
+      if (gz) {
+        res.setHeader(HttpHeaders.ContentEncoding, "gzip");
+        res.removeHeader(HttpHeaders.ContentLength);
+        gz.pipe(res);
+      }
+      const out = gz ?? res;
+      res.flushHeaders();
+      let closed = false;
+      const onClose = () => {
+        closed = true;
+        source.return?.();
+      };
+      res.once("close", onClose);
+      try {
+        for await (const chunk of source) {
+          if (closed) break;
+          const data = typeof chunk === "string" || import_buffer.Buffer.isBuffer(chunk) ? chunk : JSON.stringify(chunk);
+          const ok = out.write(data);
+          gz?.flush(import_zlib.constants.Z_SYNC_FLUSH);
+          if (!ok) await new Promise((resolve2) => {
+            out.once("drain", resolve2);
+            res.once("close", resolve2);
+          });
+        }
+      } catch (e) {
+        if (!closed) throw e;
+      } finally {
+        res.off("close", onClose);
+        if (closed) {
+          gz?.destroy();
+        } else if (!res.writableEnded) {
+          const finished = new Promise((resolve2) => {
+            res.once("finish", resolve2);
+            res.once("close", resolve2);
+          });
+          out.end();
+          await finished;
+        }
+      }
+    }
     resIsDone() {
       return this.res.finished || this.res.writableEnded || this.res.headersSent;
     }
@@ -29191,6 +29236,11 @@ ${indentStr}}`;
         otherStorage.set(RequestResponse, rr);
         otherStorage.set(import_http.IncomingMessage, req);
         otherStorage.set(import_http.ServerResponse, res);
+        const abortController = new AbortController();
+        res.once("close", () => {
+          if (!res.writableFinished) abortController.abort();
+        });
+        otherStorage.set(AbortSignal, abortController.signal);
         try {
           transactionManager?.try();
           if (this.option.requestEndPoints) {
@@ -29348,11 +29398,19 @@ ${indentStr}}`;
                   targetKey: it.propertyKey
                 }, otherStorage);
                 const resConfig = it.config?.res;
-                if (resConfig?.manual === true) {
+                if (resConfig === "manual") {
+                } else if (ValidUtils.isGenerator(data) || ValidUtils.isAsyncGenerator(data)) {
+                  const headers = resConfig?.header ?? {};
+                  if (resConfig?.contentType) {
+                    headers[HttpHeaders.ContentType] = resConfig.contentType;
+                  }
+                  rr.resSetHeaders(headers);
+                  rr.resSetStatusCode(resConfig?.status ?? 200 /* Ok */);
+                  await rr.resStream(data);
                 } else {
                   if (it.config?.resolver) {
                     const execute = typeof it.config.resolver === "function" ? this.simstanceManager.getOrNewSim({ target: it.config.resolver }) : it.config.resolver;
-                    data = await execute?.resolve?.(data, rr);
+                    data = await execute?.resolve?.(data, rr, resConfig);
                   }
                   const status = resConfig?.status ?? 200 /* Ok */;
                   const headers = resConfig?.header ?? {};
@@ -29664,7 +29722,7 @@ ${indentStr}}`;
   var ElementApply = class _ElementApply {
     constructor(el, config) {
       this.el = el;
-      this.window = this.el.ownerDocument.defaultView;
+      this.window = this.el.ownerDocument.defaultView ?? globalThis;
       this.document = this.el.ownerDocument;
       this.id = config?.id ?? el.id;
       this.variableWrap = config?.variableWrap ?? { start: "@", end: "@" };
@@ -29687,6 +29745,8 @@ ${indentStr}}`;
       let match;
       while ((match = regex.exec(script)) !== null) {
         variables.push(match[1]);
+        const root = match[1].split(/[.[(]/)[0].trim();
+        if (root && root !== match[1]) variables.push(root);
       }
       return variables;
     }
@@ -29791,10 +29851,15 @@ ${indentStr}}`;
             type.variables.forEach((v) => variables.add(v));
           });
         }
+        const bind = config?.bind;
+        const fromBind = (key) => bind != null && typeof key === "string" && !(key in (config?.context ?? {})) && _ElementApply.isUserMember(bind, key);
         const context = new Proxy(config?.context ?? {}, {
+          has(target, key) {
+            return key in target || fromBind(key);
+          },
           get(target, key) {
-            const value = target[key];
-            return typeof value === "function" ? value.bind(config?.bind ?? target) : value;
+            const value = key in target ? target[key] : fromBind(key) ? bind[key] : void 0;
+            return typeof value === "function" ? value.bind(bind ?? target) : value;
           }
         });
         if (!config?.targetVariableName || config?.targetVariableName && variables.has(config?.targetVariableName)) {
@@ -29819,7 +29884,6 @@ ${indentStr}}`;
                     }
                   }
               `)(context).bind(it.node);
-                console.log("------------------->", it, tit);
                 if (tit.type === "attribute" && !config?.exclude?.attribute) {
                   it.node.setAttribute(tit.name, data());
                 } else if (tit.type === "property" && !config?.exclude?.property) {
@@ -29839,6 +29903,15 @@ ${indentStr}}`;
         }
       }
     }
+    /** key 가 네이티브(DOM/내장) prototype 이 아니라 사용자 클래스나 인스턴스에 정의돼 있으면 true */
+    static isUserMember(obj, key) {
+      for (let p = obj; p; p = Object.getPrototypeOf(p)) {
+        if (!Object.prototype.hasOwnProperty.call(p, key)) continue;
+        const ctor = p === obj ? null : p.constructor;
+        return !(typeof ctor === "function" && /\[native code\]/.test(Function.prototype.toString.call(ctor)));
+      }
+      return false;
+    }
     removeAllEventListener() {
       const m = this.findAllTarget().filter((it) => it.nodeType === "element").flatMap((it) => it.types.map((sit) => ({ ...sit, node: it.node })).filter((it2) => it2.type === "event"));
       m.forEach((tit) => {
@@ -30216,15 +30289,21 @@ ${indentStr}}`;
       const slots = this.findSlots();
       return slots.map((s) => s.nodes());
     }
-    append(...args) {
-      let targetId;
-      let items = [];
-      if (typeof args[0] === "string" && args.length > 1) {
-        targetId = args[0];
-        items = args.slice(1);
-      } else {
-        items = args;
+    /**
+     * Shared disambiguation for the `(...items)` / `(targetId, ...items)` overload pair.
+     * Items are always Node instances (or strings meant as literal content) coming from
+     * callers; a leading string is therefore always treated as `targetId`, even when no
+     * items follow — this avoids misclassifying `targetId` itself as content when the
+     * caller has zero items to insert (e.g. a decorated method returning undefined).
+     */
+    static parseTargetArgs(args) {
+      if (typeof args[0] === "string") {
+        return { targetId: args[0], items: args.slice(1) };
       }
+      return { targetId: void 0, items: args };
+    }
+    append(...args) {
+      const { targetId, items } = _NodeSlot.parseTargetArgs(args);
       if (!items || items.length === 0) return;
       const slots = this.findSlots(targetId);
       if (!slots || slots.length === 0) return;
@@ -30233,38 +30312,17 @@ ${indentStr}}`;
       }
     }
     appendHtml(...args) {
-      let targetId;
-      let items = [];
-      if (typeof args[0] === "string" && args.length > 1) {
-        targetId = args[0];
-        items = args.slice(1);
-      } else {
-        items = args;
-      }
+      const { targetId, items } = _NodeSlot.parseTargetArgs(args);
       const slots = this.findSlots(targetId);
       for (const s of slots) s.appendHtml(...items);
     }
     appendText(...args) {
-      let targetId;
-      let items = [];
-      if (typeof args[0] === "string" && args.length > 1) {
-        targetId = args[0];
-        items = args.slice(1);
-      } else {
-        items = args;
-      }
+      const { targetId, items } = _NodeSlot.parseTargetArgs(args);
       const slots = this.findSlots(targetId);
       for (const s of slots) s.appendText(...items);
     }
     appendCopy(...args) {
-      let targetId;
-      let items = [];
-      if (typeof args[0] === "string" && args.length > 1) {
-        targetId = args[0];
-        items = args.slice(1);
-      } else {
-        items = args;
-      }
+      const { targetId, items } = _NodeSlot.parseTargetArgs(args);
       if (!items || items.length === 0) return;
       const slots = this.findSlots(targetId);
       if (!slots || slots.length === 0) return;
@@ -30273,14 +30331,7 @@ ${indentStr}}`;
       }
     }
     prepend(...args) {
-      let targetId;
-      let items = [];
-      if (typeof args[0] === "string" && args.length > 1) {
-        targetId = args[0];
-        items = args.slice(1);
-      } else {
-        items = args;
-      }
+      const { targetId, items } = _NodeSlot.parseTargetArgs(args);
       if (!items || items.length === 0) return;
       const slots = this.findSlots(targetId);
       if (!slots || slots.length === 0) return;
@@ -30289,38 +30340,17 @@ ${indentStr}}`;
       }
     }
     prependHtml(...args) {
-      let targetId;
-      let items = [];
-      if (typeof args[0] === "string" && args.length > 1) {
-        targetId = args[0];
-        items = args.slice(1);
-      } else {
-        items = args;
-      }
+      const { targetId, items } = _NodeSlot.parseTargetArgs(args);
       const slots = this.findSlots(targetId);
       for (const s of slots) s.prependHtml(...items);
     }
     prependText(...args) {
-      let targetId;
-      let items = [];
-      if (typeof args[0] === "string" && args.length > 1) {
-        targetId = args[0];
-        items = args.slice(1);
-      } else {
-        items = args;
-      }
+      const { targetId, items } = _NodeSlot.parseTargetArgs(args);
       const slots = this.findSlots(targetId);
       for (const s of slots) s.prependText(...items);
     }
     prependCopy(...args) {
-      let targetId;
-      let items = [];
-      if (typeof args[0] === "string" && args.length > 1) {
-        targetId = args[0];
-        items = args.slice(1);
-      } else {
-        items = args;
-      }
+      const { targetId, items } = _NodeSlot.parseTargetArgs(args);
       if (!items || items.length === 0) return;
       const slots = this.findSlots(targetId);
       if (!slots || slots.length === 0) return;
@@ -30340,14 +30370,7 @@ ${indentStr}}`;
       }
     }
     replaceChildren(...args) {
-      let targetId;
-      let items = [];
-      if (typeof args[0] === "string" && args.length > 1) {
-        targetId = args[0];
-        items = args.slice(1);
-      } else {
-        items = args;
-      }
+      const { targetId, items } = _NodeSlot.parseTargetArgs(args);
       const slots = this.findSlots(targetId);
       if (!slots || slots.length === 0) return;
       for (const s of slots) {
@@ -30355,14 +30378,7 @@ ${indentStr}}`;
       }
     }
     replaceChildrenHtml(...args) {
-      let targetId;
-      let items = [];
-      if (typeof args[0] === "string" && args.length > 1) {
-        targetId = args[0];
-        items = args.slice(1);
-      } else {
-        items = args;
-      }
+      const { targetId, items } = _NodeSlot.parseTargetArgs(args);
       const slots = this.findSlots(targetId);
       if (!slots || slots.length === 0) return;
       for (const s of slots) {
@@ -30370,14 +30386,7 @@ ${indentStr}}`;
       }
     }
     replaceChildrenText(...args) {
-      let targetId;
-      let items = [];
-      if (typeof args[0] === "string" && args.length > 1) {
-        targetId = args[0];
-        items = args.slice(1);
-      } else {
-        items = args;
-      }
+      const { targetId, items } = _NodeSlot.parseTargetArgs(args);
       const slots = this.findSlots(targetId);
       if (!slots || slots.length === 0) return;
       for (const s of slots) {
@@ -31068,6 +31077,7 @@ ${indentStr}}`;
   var ROUTER_NO_EVENT_MARKER = "__ROUTER_NO_EVENT__";
   var Router2 = class {
     constructor(config) {
+      this.leaveGuards = /* @__PURE__ */ new Set();
       this._config = config;
       let routeData;
       if (config?.firstUrl) {
@@ -31088,13 +31098,39 @@ ${indentStr}}`;
         this.behaviorSubject = new BehaviorSubject(routeData);
       }
       this.config.window.addEventListener("popstate", (event) => {
-        const routeData2 = { ...this.getRouteData(), triggerPoint: "end" };
-        this.behaviorSubject.next(routeData2);
+        const publish = () => this.behaviorSubject.next({ ...this.getRouteData(), triggerPoint: "end" });
+        if (!this.leaveGuards.size) return publish();
+        const from = this.value;
+        void this.canLeave(this.getRouteData(), from).then((ok) => {
+          if (ok) publish();
+          else this.config.window.history?.pushState(from.data ?? null, "", from.url);
+        });
       });
     }
     get value() {
       return this.behaviorSubject.getValue();
     }
+    /**
+     * 이동 전 가드 등록. go() 와 뒤로/앞으로 가기(popstate)에 적용된다 (pushState/replaceState 직접 호출은 제외).
+     * 리턴한 함수를 부르면 해제된다.
+     */
+    addLeaveGuard(guard) {
+      this.leaveGuards.add(guard);
+      return () => {
+        this.leaveGuards.delete(guard);
+      };
+    }
+    /** 가드가 하나라도 있는지 (없으면 호출자가 동기로 진행해도 된다) */
+    get hasLeaveGuards() {
+      return this.leaveGuards.size > 0;
+    }
+    /** 등록된 가드를 순서대로 평가. 하나라도 false 면 false */
+    async canLeave(to, from) {
+      for (const guard of [...this.leaveGuards]) {
+        if (await guard(to, from) === false) return false;
+      }
+      return true;
+    }
     get observable() {
       return this.behaviorSubject.asObservable();
     }
@@ -31225,17 +31261,24 @@ ${indentStr}}`;
       if (typeof config === "string") {
         config = { path: config };
       }
-      if (config?.replace) {
-        this.replace(config.path, config.state);
-      } else {
-        this.push(config.path, config.state);
-      }
-      if (config.scrollToTop !== false) {
-        try {
-          this._config.window?.scrollTo?.(0, 0);
-        } catch (e) {
+      const target = config;
+      const navigate = () => {
+        if (target?.replace) {
+          this.replace(target.path, target.state);
+        } else {
+          this.push(target.path, target.state);
         }
-      }
+        if (target.scrollToTop !== false) {
+          try {
+            this._config.window?.scrollTo?.(0, 0);
+          } catch (e) {
+          }
+        }
+      };
+      if (!this.leaveGuards.size) return navigate();
+      return this.canLeave(this.getRouteData({ pathOrUrl: this.toUrl(target.path) }), this.value).then((ok) => {
+        if (ok) navigate();
+      });
     }
     toUrl(data) {
       let targetPath;