@opra/sqb 1.19.0 → 1.19.2

package/cjs/adapter-utils/prepare-filter.js

@@ -33,15 +33,16 @@ function prepareFilter(filters) {
     }
     return arr.length > 1 ? sqb.And(...arr) : arr[0];
 }
+const _isDate = valgen_1.vg.isDate({ trim: 'day' });
+const _isDateTime = valgen_1.vg.isDate();
 function prepareFilterAst(ast) {
     if (!ast)
         return;
-    if (ast instanceof common_1.OpraFilter.QualifiedIdentifier ||
-        ast instanceof common_1.OpraFilter.Literal) {
-        return ast.value;
-    }
     if (ast instanceof common_1.OpraFilter.DateLiteral) {
-        return (0, valgen_1.isDate)(ast.value, { coerce: true });
+        return _isDate(ast.value, { coerce: true });
+    }
+    if (ast instanceof common_1.OpraFilter.DateTimeLiteral) {
+        return _isDateTime(ast.value, { coerce: true });
     }
     if (ast instanceof common_1.OpraFilter.ArrayExpression) {
         return ast.items.map(prepareFilterAst);
@@ -99,5 +100,9 @@ function prepareFilterAst(ast) {
                 throw new Error(`ComparisonExpression operator (${ast.op}) not implemented yet`);
         }
     }
+    if (ast instanceof common_1.OpraFilter.QualifiedIdentifier ||
+        ast instanceof common_1.OpraFilter.Literal) {
+        return ast.value;
+    }
     throw new Error(`${ast.kind} is not implemented yet`);
 }

package/esm/adapter-utils/prepare-filter.js

@@ -1,7 +1,7 @@
 import '@opra/core';
 import { OpraFilter } from '@opra/common';
 import * as sqb from '@sqb/builder';
-import { isDate } from 'valgen';
+import { vg } from 'valgen';
 /**
  * Prepare the SQB filter based on the provided filters and options.
  *
@@ -29,15 +29,16 @@ export default function prepareFilter(filters) {
     }
     return arr.length > 1 ? sqb.And(...arr) : arr[0];
 }
+const _isDate = vg.isDate({ trim: 'day' });
+const _isDateTime = vg.isDate();
 function prepareFilterAst(ast) {
     if (!ast)
         return;
-    if (ast instanceof OpraFilter.QualifiedIdentifier ||
-        ast instanceof OpraFilter.Literal) {
-        return ast.value;
-    }
     if (ast instanceof OpraFilter.DateLiteral) {
-        return isDate(ast.value, { coerce: true });
+        return _isDate(ast.value, { coerce: true });
+    }
+    if (ast instanceof OpraFilter.DateTimeLiteral) {
+        return _isDateTime(ast.value, { coerce: true });
     }
     if (ast instanceof OpraFilter.ArrayExpression) {
         return ast.items.map(prepareFilterAst);
@@ -95,5 +96,9 @@ function prepareFilterAst(ast) {
                 throw new Error(`ComparisonExpression operator (${ast.op}) not implemented yet`);
         }
     }
+    if (ast instanceof OpraFilter.QualifiedIdentifier ||
+        ast instanceof OpraFilter.Literal) {
+        return ast.value;
+    }
     throw new Error(`${ast.kind} is not implemented yet`);
 }

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@opra/sqb",
-  "version": "1.19.0",
+  "version": "1.19.2",
   "description": "Opra SQB adapter package",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
     "reflect-metadata": "^0.2.2",
     "tslib": "^2.8.1",
-    "valgen": "^5.17.1"
+    "valgen": "^5.17.2"
   },
   "peerDependencies": {
-    "@opra/core": "^1.19.0",
-    "@opra/http": "^1.19.0",
-    "@sqb/connect": "^4.19.6"
+    "@opra/core": "^1.19.2",
+    "@opra/http": "^1.19.2",
+    "@sqb/connect": "^4.20.0"
   },
   "type": "module",
   "exports": {