@forsakringskassan/docs-generator 3.22.2 → 3.22.3

package/dist/markdown.mjs

@@ -2,8 +2,8 @@ import { createRequire as $createRequire } from "node:module";
 
 const require = $createRequire(import.meta.url);
 
-export { S as SoftError, c as createMarkdownRenderer } from './create-markdown-renderer-Bdz-A22S.mjs';
-import './vendor-D1q9wBug.mjs';
+export { S as SoftError, c as createMarkdownRenderer } from './create-markdown-renderer-DtRTTcqZ.mjs';
+import './vendor-DDcR0yPO.mjs';
 import 'node:url';
 import 'node:path';
 import 'fs';

package/dist/{vendor-D1q9wBug.mjs → vendor-DDcR0yPO.mjs}

@@ -15572,6 +15572,9 @@ const deepFind = (obj, path, keySeparator = '.') => {
       }
       nextPath += tokens[j];
       next = current[nextPath];
+      if ((typeof next === 'function' || nextPath === '__proto__') && !Object.prototype.hasOwnProperty.call(current, nextPath)) {
+        next = undefined;
+      }
       if (next !== undefined) {
         if (['string', 'number', 'boolean'].includes(typeof next) && j < tokens.length - 1) {
           continue;
@@ -15739,12 +15742,12 @@ class ResourceStore extends EventEmitter {
       }
     }
     const result = getPath(this.data, path);
-    if (!result && !ns && !key && lng.includes('.')) {
+    if (result == null && !ns && !key && lng.includes('.')) {
       lng = path[0];
       ns = path[1];
       key = path.slice(2).join('.');
     }
-    if (result || !ignoreJSONStructure || !isString(key)) return result;
+    if (result != null || !ignoreJSONStructure || !isString(key)) return result;
     return deepFind(this.data?.[lng]?.[ns], key, keySeparator);
   }
   addResource(lng, ns, key, value, options = {
@@ -16058,7 +16061,7 @@ class Translator extends EventEmitter {
       }
     } else if (handleAsObjectInI18nFormat && isString(joinArrays) && Array.isArray(res)) {
       res = res.join(joinArrays);
-      if (res) res = this.extendTranslation(res, keys, opt, lastKey);
+      if (res) res = this.extendTranslation(res, keys, opt, resolved, lastKey);
     } else {
       let usedDefault = false;
       let usedKey = false;
@@ -16383,7 +16386,6 @@ class LanguageUtil {
           if (supportedLng === lngOnly) return true;
           if (!supportedLng.includes('-') && !lngOnly.includes('-')) return false;
           if (supportedLng.includes('-') && !lngOnly.includes('-') && supportedLng.slice(0, supportedLng.indexOf('-')) === lngOnly) return true;
-          if (supportedLng.startsWith(lngOnly) && lngOnly.length > 1) return true;
           return false;
         });
       });
@@ -16536,7 +16538,6 @@ const deepFindWithDefaults = (data, defaultData, key, keySeparator = '.', ignore
   }
   return path;
 };
-const regexSafe = val => val.replace(/\$/g, '$$$$');
 class Interpolator {
   constructor(options = {}) {
     this.logger = baseLogger.create('interpolator');
@@ -16633,9 +16634,17 @@ class Interpolator {
       regex: this.regexp,
       safeValue: val => this.escapeValue ? this.escape(val) : val
     }];
+    const unescapedValues = [];
+    let shift = 0;
     todos.forEach(todo => {
       replaces = 0;
       while (match = todo.regex.exec(str)) {
+        const at = match.index - shift;
+        const written = unescapedValues.find(([start, end]) => at >= start && at < end);
+        if (written) {
+          todo.regex.lastIndex = written[1] + shift;
+          continue;
+        }
         const matchedVar = match[1].trim();
         value = handleFormat(matchedVar);
         if (value === undefined) {
@@ -16654,9 +16663,14 @@ class Interpolator {
         } else if (!isString(value) && !this.useRawValueToEscape) {
           value = makeString$1(value);
         }
-        const safeValue = todo.safeValue(value);
-        str = str.replace(match[0], regexSafe(safeValue));
+        const safeValue = makeString$1(todo.safeValue(value));
+        str = str.slice(0, match.index) + safeValue + str.slice(match.index + match[0].length);
         if (skipOnVariables) {
+          if (todo.regex === this.regexpUnescape) {
+            unescapedValues.push([match.index, match.index + safeValue.length]);
+          } else {
+            shift += safeValue.length - match[0].length;
+          }
           todo.regex.lastIndex += safeValue.length;
           todo.regex.lastIndex -= match[0].length;
         } else {
@@ -16777,7 +16791,12 @@ const createCachedFormatter = fn => {
         [o.interpolationkey]: undefined
       };
     }
-    const key = l + JSON.stringify(optForCache);
+    let key;
+    try {
+      key = l + JSON.stringify(optForCache);
+    } catch (e) {
+      return fn(getCleanedCode(l), o)(v);
+    }
     let frm = cache[key];
     if (!frm) {
       frm = fn(getCleanedCode(l), o);
@@ -17627,18 +17646,16 @@ class I18n extends EventEmitter {
       hasLoadedNamespace: clone.hasLoadedNamespace.bind(clone)
     };
     if (forkResourceStore) {
-      const clonedData = Object.keys(this.store.data).reduce((prev, l) => {
-        prev[l] = {
-          ...this.store.data[l]
+      const copyData = obj => {
+        const copied = Array.isArray(obj) ? [...obj] : {
+          ...obj
         };
-        prev[l] = Object.keys(prev[l]).reduce((acc, n) => {
-          acc[n] = {
-            ...prev[l][n]
-          };
-          return acc;
-        }, prev[l]);
-        return prev;
-      }, {});
+        Object.keys(copied).forEach(k => {
+          if (copied[k] && typeof copied[k] === 'object') copied[k] = copyData(copied[k]);
+        });
+        return copied;
+      };
+      const clonedData = copyData(this.store.data);
       clone.store = new ResourceStore(clonedData, mergedOptions);
       clone.services.resourceStore = clone.store;
     }
@@ -69512,4 +69529,4 @@ var yaml = /*#__PURE__*/Object.freeze({
 });
 
 export { HighlightJS as H, MarkdownItCallable as M, Ze$b as Z, resolveConfig as a, createTwoFilesPatch$1 as b, createSyncFn as c, dedent$1 as d, deflist_plugin as e, format2 as f, fm$3 as g, strFromU8 as h, closest as i, distance as j, isCI as k, cliProgress as l, moduleImporter as m, createInstance as n, fse as o, inter as p, runAsWorker as r, strToU8 as s, tinylr as t, watch$1 as w, zlibSync as z };
-//# sourceMappingURL=vendor-D1q9wBug.mjs.map
+//# sourceMappingURL=vendor-DDcR0yPO.mjs.map