@prorobotech/openapi-k8s-toolkit 1.2.0-alpha.1 → 1.2.0-alpha.2

package/dist/openapi-k8s-toolkit.es.js

@@ -34167,35 +34167,53 @@ const parseMutliqueryText = ({
 const parseJsonPathTemplate = ({
   text,
   multiQueryData,
-  customFallback
+  customFallback,
+  replaceValues
 }) => {
   if (!text) return "";
   const placeholderRegex = /\{reqsJsonPath\[(\d+)\]\s*\[\s*(['"])([\s\S]*?)\2\s*\](?:\s*\[\s*(['"])([\s\S]*?)\4\s*\])?\}/g;
-  return text.replace(
+  const resolve = (input) => input.replace(
     placeholderRegex,
-    (match, reqIndexStr, _quote, jsonPathExpr, _smth, fallback = "Undefined with no fallback") => {
+    (match, reqIndexStr, _quote, rawJsonPathExpr, _fallbackQuote, inlineFallback = "Undefined with no fallback") => {
       try {
-        const reqIndex = parseInt(reqIndexStr, 10);
+        const reqIndex = Number(reqIndexStr);
         const jsonRoot = multiQueryData[`req${reqIndex}`];
-        if (jsonRoot === void 0 && !customFallback) {
-          return fallback;
-        }
-        if (jsonRoot === void 0 && customFallback) {
-          return customFallback;
+        let jsonPathExpr = rawJsonPathExpr;
+        let previous2 = null;
+        let loopGuard = 0;
+        while (previous2 !== jsonPathExpr && loopGuard < 10) {
+          previous2 = jsonPathExpr;
+          jsonPathExpr = resolve(jsonPathExpr);
+          loopGuard++;
+        }
+        if (replaceValues) {
+          jsonPathExpr = prepareTemplate({
+            template: jsonPathExpr,
+            replaceValues
+          });
         }
-        const results = jp.query(jsonRoot || {}, `$${jsonPathExpr}`);
-        if (results.length === 0 || results[0] == null || results[0] === void 0) {
-          if (customFallback) {
-            return customFallback;
-          }
-          return fallback;
+        if (jsonRoot === void 0 && customFallback) return customFallback;
+        if (jsonRoot === void 0) return inlineFallback;
+        const results = jp.query(jsonRoot, `$${jsonPathExpr}`);
+        const value = results?.[0];
+        if (value == null) {
+          return customFallback ?? inlineFallback;
         }
-        return String(results[0]);
+        return String(value);
       } catch {
         return match;
       }
     }
   );
+  let result = text;
+  let previous = null;
+  let iterations = 0;
+  while (result !== previous && iterations < 10) {
+    previous = result;
+    result = resolve(result);
+    iterations++;
+  }
+  return result;
 };
 const parseWithoutPartsOfUrl = ({
   text,
@@ -34223,7 +34241,8 @@ const parseAll = ({
         text,
         multiQueryData
       }),
-      multiQueryData
+      multiQueryData,
+      replaceValues
     }),
     replaceValues
   });