@resolveio/server-lib 22.1.14 → 22.1.15

package/methods/ai-terminal.js

@@ -9562,23 +9562,15 @@ function applyAssistantDisplayTableToResponse(value, display) {
         var rowCount = typeof normalizedDisplay.rowCount === 'number' && normalizedDisplay.rowCount > 0
             ? normalizedDisplay.rowCount
             : 0;
-        if (rowCount <= 0) {
-            if (!cleaned_1) {
-                return 'No rows matched your request.';
-            }
-            if (/\bno rows? matched\b/i.test(cleaned_1)) {
-                return cleaned_1;
-            }
-            return "".concat(cleaned_1.trim(), "\n\nNo rows matched your request.").trim();
-        }
         var fallbackColumns = Array.isArray(normalizedDisplay.columns) && normalizedDisplay.columns.length
             ? normalizedDisplay.columns
             : resolveAssistantEmptyDisplayColumns(cleaned_1 || value);
         var normalizedColumns = fallbackColumns.length === 1
             ? __spreadArray(__spreadArray([], __read(fallbackColumns), false), ['Value'], false) : fallbackColumns;
-        var rowSummary = rowCount > 0
-            ? [(_a = {}, _a[normalizedColumns[0]] = 'Rows matched', _a[normalizedColumns[1]] = rowCount, _a)]
-            : [];
+        var rowSummary = [(_a = {},
+                _a[normalizedColumns[0]] = rowCount > 0 ? 'Rows matched' : 'No rows matched',
+                _a[normalizedColumns[1]] = rowCount,
+                _a)];
         var tableDisplay = {
             columns: normalizedColumns,
             rows: rowSummary,
@@ -9590,10 +9582,19 @@ function applyAssistantDisplayTableToResponse(value, display) {
         if (!emptyTable) {
             return cleaned_1 || value;
         }
+        var noRowsNote = rowCount > 0 ? '' : 'No rows matched your request.';
+        var base = cleaned_1
+            ? (noRowsNote && !/\bno rows? matched\b/i.test(cleaned_1)
+                ? "".concat(cleaned_1.trim(), "\n\n").concat(noRowsNote).trim()
+                : cleaned_1.trim())
+            : noRowsNote;
         if (!cleaned_1) {
-            return emptyTable;
+            if (!base) {
+                return emptyTable;
+            }
+            return "".concat(base, "\n\n").concat(emptyTable).trim();
         }
-        return "".concat(cleaned_1.trim(), "\n\n").concat(emptyTable).trim();
+        return "".concat(base, "\n\n").concat(emptyTable).trim();
     }
     var table = formatDisplayTableMarkdown(normalizedDisplay);
     if (!table) {
@@ -10150,6 +10151,18 @@ function normalizeAssistantDateArithmeticArgs(expression) {
     if (expression instanceof Date || expression instanceof RegExp || isMongoObjectId(expression)) {
         return expression;
     }
+    var looksLikeDateOperand = function (candidate) {
+        if (candidate instanceof Date) {
+            return true;
+        }
+        if (typeof candidate === 'string') {
+            return candidate.startsWith('$$') || candidate.startsWith('$');
+        }
+        if (candidate && typeof candidate === 'object' && !Array.isArray(candidate)) {
+            return Object.keys(candidate).some(function (op) { return op.startsWith('$'); });
+        }
+        return false;
+    };
     var normalizeOperatorArgs = function (operator) {
         if (!Object.prototype.hasOwnProperty.call(expression, operator)) {
             return;
@@ -10325,6 +10338,54 @@ function normalizeAssistantDateArithmeticArgs(expression) {
         });
         expression.$dateTrunc = nextArgs;
     };
+    var normalizeDateToStringArgs = function () {
+        if (!Object.prototype.hasOwnProperty.call(expression, '$dateToString')) {
+            return;
+        }
+        var rawArgs = expression.$dateToString;
+        if (!rawArgs || typeof rawArgs !== 'object' || Array.isArray(rawArgs)) {
+            return;
+        }
+        if (rawArgs instanceof Date || rawArgs instanceof RegExp || isMongoObjectId(rawArgs)) {
+            return;
+        }
+        var nextArgs = __assign({}, rawArgs);
+        if (!Object.prototype.hasOwnProperty.call(nextArgs, 'date')) {
+            if (Object.prototype.hasOwnProperty.call(nextArgs, 'startDate')) {
+                nextArgs.date = nextArgs.startDate;
+            }
+            else if (Object.prototype.hasOwnProperty.call(nextArgs, 'start')) {
+                nextArgs.date = nextArgs.start;
+            }
+            else {
+                var dateCandidateKey = Object.keys(nextArgs).find(function (key) {
+                    if (key === 'format' || key === 'timezone' || key === 'onNull' || key === 'onError') {
+                        return false;
+                    }
+                    return looksLikeDateOperand(nextArgs[key]);
+                });
+                if (dateCandidateKey) {
+                    nextArgs.date = nextArgs[dateCandidateKey];
+                    delete nextArgs[dateCandidateKey];
+                }
+            }
+        }
+        delete nextArgs.startDate;
+        delete nextArgs.start;
+        if (!Object.prototype.hasOwnProperty.call(nextArgs, 'date')) {
+            nextArgs.date = '$$NOW';
+        }
+        if (!Object.prototype.hasOwnProperty.call(nextArgs, 'format')) {
+            nextArgs.format = '%Y-%m-%d';
+        }
+        var allowedKeys = new Set(['date', 'format', 'timezone', 'onNull']);
+        Object.keys(nextArgs).forEach(function (key) {
+            if (!allowedKeys.has(key)) {
+                delete nextArgs[key];
+            }
+        });
+        expression.$dateToString = nextArgs;
+    };
     var normalizeLetArgs = function () {
         if (!Object.prototype.hasOwnProperty.call(expression, '$let')) {
             return;
@@ -10362,18 +10423,6 @@ function normalizeAssistantDateArithmeticArgs(expression) {
     };
     var normalizeDatePartArgs = function () {
         var operators = ['$year', '$month', '$week', '$isoWeek', '$isoWeekYear', '$dayOfMonth', '$dayOfYear'];
-        var looksLikeDateOperand = function (candidate) {
-            if (candidate instanceof Date) {
-                return true;
-            }
-            if (typeof candidate === 'string') {
-                return candidate.startsWith('$$') || candidate.startsWith('$');
-            }
-            if (candidate && typeof candidate === 'object' && !Array.isArray(candidate)) {
-                return Object.keys(candidate).some(function (op) { return op.startsWith('$'); });
-            }
-            return false;
-        };
         operators.forEach(function (operator) {
             if (!Object.prototype.hasOwnProperty.call(expression, operator)) {
                 return;
@@ -10415,6 +10464,7 @@ function normalizeAssistantDateArithmeticArgs(expression) {
     normalizeOperatorArgs('$dateAdd');
     normalizeOperatorArgs('$dateSubtract');
     normalizeDateTruncArgs();
+    normalizeDateToStringArgs();
     normalizeLetArgs();
     normalizeDatePartArgs();
     return expression;
@@ -10449,6 +10499,7 @@ function isAssistantDateArithmeticArgumentError(error) {
     return message.includes('unrecognized argument to $datesubtract:')
         || message.includes('unrecognized argument to $dateadd:')
         || message.includes('unrecognized argument to $datetrunc:')
+        || message.includes('unrecognized argument to $datetostring:')
         || message.includes('unrecognized option to $year:')
         || message.includes('unrecognized option to $month:')
         || message.includes('unrecognized option to $week:')
@@ -10462,6 +10513,8 @@ function isAssistantDateArithmeticArgumentError(error) {
         || message.includes("missing 'date' parameter to $datetrunc")
         || message.includes("requires 'unit' parameter to $datetrunc")
         || message.includes("requires 'date' parameter to $datetrunc")
+        || message.includes("requires 'date' parameter to $datetostring")
+        || message.includes("missing 'date' parameter to $datetostring")
         || message.includes('$datesubtract requires startdate, unit, and amount to be present')
         || message.includes('$dateadd requires startdate, unit, and amount to be present')
         || message.includes('undefined variable: now_start_of_month')
@@ -10494,13 +10547,19 @@ function isAssistantDottedOutputFieldError(error) {
     if (!message) {
         return false;
     }
-    return message.includes("fieldpath field names may not contain '.'");
+    return message.includes("fieldpath field names may not contain '.'")
+        || (message.includes("field name '") && message.includes("cannot contain '.'"));
 }
 function extractAssistantDottedFieldPathFromError(error) {
     var message = normalizeOptionalString(error === null || error === void 0 ? void 0 : error.message);
     if (!message) {
         return null;
     }
+    var fieldNameMatch = message.match(/field name\s+'([^']+)'/i);
+    if (fieldNameMatch === null || fieldNameMatch === void 0 ? void 0 : fieldNameMatch[1]) {
+        var normalized = normalizeOptionalString(fieldNameMatch[1]);
+        return normalized.includes('.') ? normalized : null;
+    }
     var quotedMatch = message.match(/given\s+'([^']+)'/i);
     if (quotedMatch && quotedMatch[1]) {
         var normalized = normalizeOptionalString(quotedMatch[1]);