dbgate-filterparser 7.0.6 → 7.1.0

package/lib/filterTool.js

@@ -19,8 +19,42 @@ function getFilterValueExpression(value, dataType) {
     var _a;
     if (value == null)
         return 'NULL';
-    if ((0, dbgate_tools_1.isTypeDateTime)(dataType))
+    if ((0, dbgate_tools_1.isTypeDateTime)(dataType)) {
+        // Check for year as number (GROUP:YEAR)
+        if (typeof value === 'number' && Number.isInteger(value) && value >= 1000 && value <= 9999) {
+            return value.toString();
+        }
+        if ((0, isString_1.default)(value)) {
+            // Year only
+            if (/^\d{4}$/.test(value)) {
+                return value;
+            }
+            // Year-month: validate month is in range 01-12
+            const yearMonthMatch = value.match(/^(\d{4})-(\d{1,2})$/);
+            if (yearMonthMatch) {
+                const month = parseInt(yearMonthMatch[2], 10);
+                if (month >= 1 && month <= 12) {
+                    return value;
+                }
+            }
+            // Year-month-day: validate month and day
+            const yearMonthDayMatch = value.match(/^(\d{4})-(\d{1,2})-(\d{1,2})$/);
+            if (yearMonthDayMatch) {
+                const month = parseInt(yearMonthDayMatch[2], 10);
+                const day = parseInt(yearMonthDayMatch[3], 10);
+                // Quick validation: month 1-12, day 1-31
+                if (month >= 1 && month <= 12 && day >= 1 && day <= 31) {
+                    // Construct a date to verify it's actually valid (e.g., reject 2024-02-30)
+                    const dateStr = `${yearMonthDayMatch[1]}-${String(month).padStart(2, '0')}-${String(day).padStart(2, '0')}`;
+                    const date = (0, date_fns_1.toDate)(dateStr);
+                    if (!isNaN(date.getTime())) {
+                        return value;
+                    }
+                }
+            }
+        }
         return (0, date_fns_1.format)((0, date_fns_1.toDate)(getDateStringWithoutTimeZone(value)), 'yyyy-MM-dd HH:mm:ss');
+    }
     if (value === true)
         return 'TRUE';
     if (value === false)

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "7.0.6",
+  "version": "7.1.0",
   "name": "dbgate-filterparser",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -17,7 +17,7 @@
     "lib"
   ],
   "devDependencies": {
-    "dbgate-types": "^7.0.6",
+    "dbgate-types": "^7.1.0",
     "@types/jest": "^25.1.4",
     "@types/node": "^13.7.0",
     "jest": "^28.1.3",
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@types/parsimmon": "^1.10.1",
-    "dbgate-tools": "^7.0.6",
+    "dbgate-tools": "^7.1.0",
     "lodash": "^4.17.21",
     "date-fns": "^4.1.0",
     "moment": "^2.24.0",