nesties 1.1.10 → 1.1.13

package/dist/index.cjs

@@ -59,6 +59,7 @@ __export(index_exports, {
   MergePropertyDecorators: () => MergePropertyDecorators,
   PaginatedReturnMessageDto: () => PaginatedReturnMessageDto,
   PutLocale: () => PutLocale,
+  RenameClass: () => RenameClass,
   RequireToken: () => RequireToken,
   ReturnMessageDto: () => ReturnMessageDto,
   StringReturnMessageDto: () => StringReturnMessageDto,
@@ -77,9 +78,19 @@ module.exports = __toCommonJS(index_exports);
 
 // src/insert-field.ts
 var import_swagger = require("@nestjs/swagger");
+
+// src/utility/rename-class.ts
+function RenameClass(cls, name) {
+  Object.defineProperty(cls, "name", { value: name });
+  return cls;
+}
+
+// src/utility/class-types.ts
 function getClassFromClassOrArray(o) {
   return o instanceof Array ? o[0] : o;
 }
+
+// src/insert-field.ts
 function InsertField(cl, map, newName) {
   const extendedCl = class extends cl {
   };
@@ -89,10 +100,7 @@ function InsertField(cl, map, newName) {
       ...map[key].options || {}
     })(extendedCl.prototype, key);
   }
-  Object.defineProperty(extendedCl, "name", {
-    value: newName || cl.name
-  });
-  return extendedCl;
+  return RenameClass(extendedCl, newName || cl.name);
 }
 
 // src/merge.ts
@@ -598,251 +606,48 @@ var import_common9 = require("@nestjs/common");
 
 // src/i18n-module/i18n-token.ts
 var import_common8 = require("@nestjs/common");
-var I18nResolverToken = Symbol("I18nResolverToken");
 var { ConfigurableModuleClass, MODULE_OPTIONS_TOKEN } = new import_common8.ConfigurableModuleBuilder().build();
 var I18nModuleOptionsToken = MODULE_OPTIONS_TOKEN;
 
-// src/utility/parse-i18n.ts
-var parseI18n = (text) => {
-  const pieces = [];
-  if (!text) return pieces;
-  let i = 0;
-  const n = text.length;
-  while (i < n) {
-    const start = text.indexOf("#{", i);
-    if (start === -1) {
-      if (i < n) pieces.push({ type: "raw", value: text.slice(i) });
-      break;
-    }
-    let j = start + 2;
-    let depth = 1;
-    while (j < n && depth > 0) {
-      const ch = text.charCodeAt(j);
-      if (ch === 123) depth++;
-      else if (ch === 125) depth--;
-      j++;
-    }
-    if (depth !== 0) {
-      pieces.push({ type: "raw", value: text.slice(i) });
-      break;
-    }
-    if (start > i) {
-      pieces.push({ type: "raw", value: text.slice(i, start) });
-    }
-    const rawInner = text.slice(start + 2, j - 1);
-    const key = rawInner.trim();
-    pieces.push({ type: "ph", rawInner, key });
-    i = j;
-  }
-  return pieces;
-};
-
 // src/i18n-module/i18n.service.ts
 var import_core4 = require("@nestjs/core");
-var I18nService = class {
-  constructor(options, moduleRef) {
-    this.options = options;
+var import_nfkit2 = require("nfkit");
+var I18nService = class extends import_nfkit2.I18n {
+  constructor(i18nServiceOptions, moduleRef) {
+    super(i18nServiceOptions);
+    this.i18nServiceOptions = i18nServiceOptions;
     this.moduleRef = moduleRef;
-    this.resolver = createResolver(this.options.resolver);
-    this.locales = new Set(this.options.locales);
-    this.defaultLocale = this.options.defaultLocale ?? this.options.locales[0];
-    this.middlewares = [];
+    this._shadowMiddlewareMap = /* @__PURE__ */ new Map();
     this.logger = new import_common9.ConsoleLogger("I18nService");
+    this.resolver = createResolver(this.i18nServiceOptions.resolver);
   }
   middleware(mw, prior = false) {
-    if (prior) {
-      this.middlewares.unshift(mw);
-    } else {
-      this.middlewares.push(mw);
-    }
-  }
-  buildFallbackChain(locale) {
-    const best = this.getExactLocale(locale);
-    const parts = [];
-    const segs = best.split("-");
-    for (let i = segs.length; i > 1; i--)
-      parts.push(segs.slice(0, i).join("-"));
-    parts.push(segs[0]);
-    if (!parts.includes(this.defaultLocale)) parts.push(this.defaultLocale);
-    return Array.from(new Set(parts)).filter((p) => this.locales.has(p));
-  }
-  async applyMiddlewares(locale, text, ctx) {
-    const mws = this.middlewares;
-    const tryLocale = async (loc) => {
-      const dispatch = async (i) => {
-        if (i >= mws.length) return void 0;
-        const mw = mws[i];
-        let nextCalled = false;
-        const next = async () => {
-          nextCalled = true;
-          return dispatch(i + 1);
-        };
-        try {
-          const res = await mw(loc, text, next, ctx);
-          if (res == null && !nextCalled) {
-            return dispatch(i + 1);
-          }
-          return res;
-        } catch (e) {
-          if (e instanceof import_common9.HttpException) {
-            throw e;
-          }
-          this.logger.warn(`Middleware at index ${i} threw an error: ${e}`);
-          return dispatch(i + 1);
+    const wrappedMw = async (locale, text, next, ctx) => {
+      try {
+        return await mw(locale, text, next, ctx);
+      } catch (e) {
+        if (e instanceof import_common9.HttpException) {
+          throw e;
         }
-      };
-      return dispatch(0);
-    };
-    for (const loc of this.buildFallbackChain(locale)) {
-      const result = await tryLocale(loc);
-      if (result != null) {
-        return result;
+        this.logger.error(`Error in i18n middleware: ${e.message}`);
+        return next();
       }
+    };
+    this._shadowMiddlewareMap.set(mw, wrappedMw);
+    return super.middleware(wrappedMw, prior);
+  }
+  removeMiddleware(mw) {
+    const wrappedMw = this._shadowMiddlewareMap.get(mw);
+    if (wrappedMw) {
+      this._shadowMiddlewareMap.delete(mw);
+      return super.removeMiddleware(wrappedMw);
     }
-    return void 0;
-  }
-  getExactLocale(locale) {
-    const input = (locale ?? "").trim();
-    if (!input) return this.defaultLocale;
-    if (this.locales.has(input)) return input;
-    const entries = Array.from(this.locales).map((l) => ({
-      orig: l,
-      lower: l.toLowerCase()
-    }));
-    const lower = input.toLowerCase();
-    const exact = entries.find((e) => e.lower === lower);
-    if (exact) return exact.orig;
-    const parts = lower.split("-");
-    while (parts.length > 1) {
-      parts.pop();
-      const candidate = parts.join("-");
-      const hit = entries.find((e) => e.lower === candidate);
-      if (hit) return hit.orig;
-    }
-    return this.defaultLocale;
+    return this;
   }
   async getExactLocaleFromRequest(ctx) {
     const locale = await this.resolver(ctx, this.moduleRef);
     return this.getExactLocale(locale);
   }
-  async translateString(locale, text, ctx) {
-    if (!text) return text;
-    locale = this.getExactLocale(locale);
-    const pieces = parseI18n(text);
-    if (!pieces.some((p) => p.type === "ph")) {
-      return pieces.map((p) => p.type === "raw" ? p.value : `#{${p.rawInner}}`).join("");
-    }
-    const promises = [];
-    for (const p of pieces) {
-      if (p.type === "ph") {
-        promises.push(this.applyMiddlewares(locale, p.key, ctx));
-      }
-    }
-    const results = await Promise.all(promises);
-    let out = "";
-    let k = 0;
-    for (const p of pieces) {
-      if (p.type === "raw") {
-        out += p.value;
-      } else {
-        const r = results[k++];
-        out += r == null ? `#{${p.rawInner}}` : r;
-      }
-    }
-    return out;
-  }
-  async translate(locale, obj, ctx) {
-    const visited = /* @__PURE__ */ new WeakSet();
-    const isBuiltInObject = (v) => {
-      if (v == null || typeof v !== "object") return false;
-      if (v instanceof Date || v instanceof RegExp || v instanceof Map || v instanceof Set || v instanceof WeakMap || v instanceof WeakSet || v instanceof ArrayBuffer || v instanceof DataView || ArrayBuffer.isView(v))
-        return true;
-      const tag = Object.prototype.toString.call(v);
-      switch (tag) {
-        case "[object URL]":
-        case "[object URLSearchParams]":
-        case "[object Error]":
-        case "[object Blob]":
-        case "[object File]":
-        case "[object FormData]":
-          return true;
-        default:
-          return false;
-      }
-    };
-    const translateObjectPreservingProto = async (value) => {
-      const proto = Object.getPrototypeOf(value);
-      const out = Object.create(proto);
-      const keys = Reflect.ownKeys(value);
-      await Promise.all(
-        keys.map(async (key) => {
-          const desc = Object.getOwnPropertyDescriptor(value, key);
-          if (!desc) return;
-          if ("value" in desc) {
-            const newVal = await visit(desc.value);
-            Object.defineProperty(out, key, { ...desc, value: newVal });
-            return;
-          }
-          Object.defineProperty(out, key, desc);
-          let current = void 0;
-          if (typeof desc.get === "function") {
-            try {
-              current = desc.get.call(value);
-            } catch {
-            }
-          }
-          if (current === void 0) return;
-          try {
-            const newVal = await visit(current);
-            if (typeof desc.set === "function") {
-              try {
-                desc.set.call(out, newVal);
-              } catch {
-              }
-            }
-          } catch {
-          }
-        })
-      );
-      return out;
-    };
-    const isTranslatable = (v) => {
-      if (!v) return { ok: false };
-      const t = typeof v;
-      if (t === "number" || t === "bigint" || t === "symbol" || t === "function") {
-        return { ok: false };
-      }
-      if (t === "string") return { ok: true, kind: "string" };
-      if (t === "object") {
-        return { ok: true, kind: "object" };
-      }
-      return { ok: false };
-    };
-    const visit = async (value) => {
-      const check = isTranslatable(value);
-      if (!check.ok) {
-        return value;
-      }
-      if (check.kind === "string") {
-        return this.translateString(locale, value, ctx);
-      }
-      if (value instanceof Promise) {
-        return value.then((resolved) => visit(resolved));
-      }
-      if (typeof value === "object") {
-        if (!Array.isArray(value) && isBuiltInObject(value)) return value;
-        if (visited.has(value)) return value;
-        visited.add(value);
-        if (Array.isArray(value)) {
-          const out = await Promise.all(value.map((v) => visit(v)));
-          return out;
-        }
-        return translateObjectPreservingProto(value);
-      }
-      return value;
-    };
-    return visit(obj);
-  }
   async translateRequest(ctx, obj) {
     const locale = await this.resolver(ctx, this.moduleRef);
     return this.translate(locale, obj, ctx);
@@ -963,50 +768,8 @@ var createI18n = (options) => {
 };
 
 // src/i18n-module/middlewares/lookup.ts
-var I18nLookupMiddleware = (dict, options) => {
-  const matchType = options?.matchType ?? "exact";
-  const dictFactory = typeof dict === "function" ? dict : () => dict;
-  const pickBestByHierarchy = (input, locales) => {
-    if (!input) return void 0;
-    const entries = locales.map((l) => ({ orig: l, lower: l.toLowerCase() }));
-    const lower = input.toLowerCase();
-    const exact = entries.find((e) => e.lower === lower);
-    if (exact) return exact.orig;
-    const parts = lower.split("-");
-    while (parts.length > 1) {
-      parts.pop();
-      const candidate = parts.join("-");
-      const hit = entries.find((e) => e.lower === candidate);
-      if (hit) return hit.orig;
-    }
-    return void 0;
-  };
-  return async (locale, key, next, ctx) => {
-    const dictResolved = await dictFactory(locale, key, ctx);
-    let dictionary = dictResolved[locale];
-    if (!dictionary) {
-      if (matchType === "hierarchy") {
-        const best = pickBestByHierarchy(locale, Object.keys(dictResolved));
-        if (best) dictionary = dictResolved[best];
-      } else if (matchType === "startsWith") {
-        const keys = Object.keys(dictResolved).filter(
-          (k) => locale.startsWith(k)
-        );
-        if (keys.length) {
-          const best = keys.reduce((a, b) => b.length > a.length ? b : a);
-          dictionary = dictResolved[best];
-        }
-      }
-    }
-    if (dictionary && Object.prototype.hasOwnProperty.call(dictionary, key)) {
-      const val = dictionary[key];
-      if (val != null) {
-        return val;
-      }
-    }
-    return next();
-  };
-};
+var import_nfkit3 = require("nfkit");
+var I18nLookupMiddleware = (0, import_nfkit3.createI18nLookupMiddleware)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ABORT_SIGNAL,
@@ -1040,6 +803,7 @@ var I18nLookupMiddleware = (dict, options) => {
   MergePropertyDecorators,
   PaginatedReturnMessageDto,
   PutLocale,
+  RenameClass,
   RequireToken,
   ReturnMessageDto,
   StringReturnMessageDto,