donobu 2.12.2 → 2.13.0

package/dist/utils/TemplateInterpolator.js

@@ -0,0 +1,211 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TEMPLATE_DATA_PATTERN = void 0;
+exports.resolveExpression = resolveExpression;
+exports.interpolateString = interpolateString;
+exports.interpolateObject = interpolateObject;
+const Logger_1 = require("./Logger");
+const jsonpath_1 = __importDefault(require("jsonpath"));
+/**
+ * Regular expression to match template JSON-path expressions inside of {{...}}
+ */
+exports.TEMPLATE_DATA_PATTERN = /\{\{([^}]+)\}\}/g;
+/**
+ * Regular expression to detect expressions that need to be handled specially
+ * Matches patterns like: $..path[?(@.condition)][0] or $..path[?(@.condition)][index] or $..path[?(@.condition)][n:m]
+ */
+const FILTER_WITH_INDEX_PATTERN = /(\[\?\(.*\)\])(\[-?\d+(\:\d+)?\])/;
+/**
+ * Regular expression to detect standalone negative indices that need to be
+ * handled specially since the jsonpath library doesn't support negative indices
+ * directly (when running queries, we will convert them to slice notation).
+ */
+const STANDALONE_NEGATIVE_INDEX_PATTERN = /(\$\.calls)\[(-\d+)\](?!\:)/;
+/**
+ * Parse and modify JSONPath expressions to handle indexing after filter expressions
+ * @param expression - The JSONPath expression to process
+ * @returns A processed expression that works with the jsonpath library
+ */
+function processJSONPathExpression(expression) {
+    // First check for filter followed by index pattern
+    const filterMatch = expression.match(FILTER_WITH_INDEX_PATTERN);
+    if (filterMatch) {
+        // Extract just the number from indexPart (remove the brackets)
+        const indexMatch = filterMatch[2].match(/\[(-?\d+)(\:\d+)?\]/);
+        if (indexMatch) {
+            // If it's a simple index (not a slice)
+            if (!indexMatch[2]) {
+                // Remove the index part from the expression
+                const baseExpression = expression.replace(filterMatch[2], '');
+                // Return the modified expression
+                return baseExpression;
+            }
+        }
+    }
+    // Check for standalone negative index pattern and convert it to slice notation
+    // since the jsonpath library doesn't support negative indices directly.
+    const negativeIndexMatch = expression.match(STANDALONE_NEGATIVE_INDEX_PATTERN);
+    if (negativeIndexMatch && negativeIndexMatch[2].startsWith('-')) {
+        // Convert the standalone negative index to slice notation
+        // For example: $.calls[-1] becomes $.calls[-1:]
+        const convertedExpression = expression.replace(`[${negativeIndexMatch[2]}]`, `[${negativeIndexMatch[2]}:]`);
+        return convertedExpression;
+    }
+    // If it doesn't match our patterns, return the original expression
+    return expression;
+}
+/**
+ * Format a value to string with special handling for objects and arrays
+ * @param value - The value to format
+ * @returns A string representation of the value
+ */
+function formatValue(value) {
+    if (value === undefined || value === null) {
+        return '';
+    }
+    // Handle arrays by joining their string representations
+    if (Array.isArray(value)) {
+        return value.map(formatValue).join(',');
+    }
+    // Handle objects with proper JSON formatting
+    if (typeof value === 'object' && value !== null) {
+        return JSON.stringify(value);
+    }
+    // Default case
+    return String(value);
+}
+/**
+ * Resolve a JSONPath expression against the context
+ * @param expression - The JSONPath expression to evaluate
+ * @param dataSource - The data context to evaluate against
+ * @returns The resolved value or undefined if not found
+ */
+function resolveExpression(expression, dataSource) {
+    try {
+        // Process the expression to handle special cases
+        const processedExpression = processJSONPathExpression(expression);
+        // Handle expressions with wildcards or recursive searches that might return arrays
+        const isWildcardOrRecursive = expression.includes('..') ||
+            expression.includes('*') ||
+            expression.includes('[:]');
+        // Use JSONPath to evaluate the expression against the context
+        const results = jsonpath_1.default.query(dataSource, processedExpression);
+        // Handle the indexing ourselves if needed
+        if (expression !== processedExpression) {
+            const match = expression.match(FILTER_WITH_INDEX_PATTERN);
+            if (match) {
+                const indexMatch = match[2].match(/\[(-?\d+)(\:\d+)?\]/);
+                if (indexMatch) {
+                    const index = parseInt(indexMatch[1], 10);
+                    // If we have results, handle both positive and negative indices
+                    if (results && results.length > 0) {
+                        // For negative indices, count from the end of the array
+                        const actualIndex = index < 0 ? results.length + index : index;
+                        // Return the result if the calculated index is valid
+                        if (actualIndex >= 0 && actualIndex < results.length) {
+                            return results[actualIndex];
+                        }
+                    }
+                    return undefined;
+                }
+            }
+        }
+        // Return the entire array for expressions that clearly want multiple values
+        if (isWildcardOrRecursive && results.length > 1) {
+            return results;
+        }
+        // Default case - return the first result if available
+        if (results && results.length > 0) {
+            return results[0];
+        }
+        return undefined;
+    }
+    catch (error) {
+        throw new Error(`Failed to evaluate JSONPath expression: ${expression}. Error: ${error}`);
+    }
+}
+/**
+ * Interpolate template strings using JSONPath expressions
+ * @param template - The template string with {{...}} expressions
+ * @param dataSource - The data context to interpolate from
+ * @returns The interpolated string
+ */
+function interpolateString(template, dataSource) {
+    return template.replace(exports.TEMPLATE_DATA_PATTERN, (match, expression) => {
+        try {
+            const value = resolveExpression(expression.trim(), dataSource);
+            // If the value is undefined or null, keep the original expression
+            if (value === undefined) {
+                return match; // Return the original {{expression}} string
+            }
+            return formatValue(value);
+        }
+        catch (error) {
+            Logger_1.appLogger.warn(`Error interpolating template: ${template}, expression: ${expression}, error: ${error}`);
+            return match; // Return the original {{expression}} string on error
+        }
+    });
+}
+/**
+ * Interpolate the parameters object using JSONPath expressions. Any string values
+ * and keys in the object will be replaced with the corresponding values from the data source.
+ * Nested objects and arrays will be processed recursively.
+ *
+ * @param parameters - The original parameters object
+ * @param dataSource - The data context to interpolate from
+ * @returns A new parameters object with interpolated string values and keys
+ */
+function interpolateObject(parameters, dataSource) {
+    if (!parameters || typeof parameters !== 'object') {
+        return parameters;
+    }
+    // Create appropriate result container
+    const result = Array.isArray(parameters) ? [] : {};
+    // Process each key-value pair
+    if (Array.isArray(parameters)) {
+        // Handle array case
+        for (let i = 0; i < parameters.length; i++) {
+            const value = parameters[i];
+            if (typeof value === 'string') {
+                // Interpolate string values
+                result[i] = interpolateString(value, dataSource);
+            }
+            else if (typeof value === 'object' && value !== null) {
+                // Recursively process nested objects
+                result[i] = interpolateObject(value, dataSource);
+            }
+            else {
+                // Keep non-string values as is
+                result[i] = value;
+            }
+        }
+    }
+    else {
+        // Handle object case
+        for (const key in parameters) {
+            const value = parameters[key];
+            // Interpolate the key if it's a string and contains a template pattern
+            let processedKey = key;
+            if (typeof key === 'string' && exports.TEMPLATE_DATA_PATTERN.test(key)) {
+                processedKey = interpolateString(key, dataSource);
+            }
+            if (typeof value === 'string') {
+                // Interpolate string values
+                result[processedKey] = interpolateString(value, dataSource);
+            }
+            else if (typeof value === 'object' && value !== null) {
+                // Recursively process nested objects
+                result[processedKey] = interpolateObject(value, dataSource);
+            }
+            else {
+                // Keep non-string values as is
+                result[processedKey] = value;
+            }
+        }
+    }
+    return result;
+}
+//# sourceMappingURL=TemplateInterpolator.js.map

package/dist/utils/TemplateInterpolator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TemplateInterpolator.js","sourceRoot":"","sources":["../../src/utils/TemplateInterpolator.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "donobu",
-  "version": "2.12.2",
+  "version": "2.13.0",
   "description": "Create browser automations with an LLM agent and replay them as Playwright scripts.",
   "main": "dist/main.js",
   "module": "dist/esm/main.js",