@opra/common 0.17.1 → 0.17.3

package/cjs/document/data-type/complex-type.js

@@ -142,7 +142,7 @@ const proto = {
                         if (dataType && !dataType.additionalFields) {
                             if (silent)
                                 return { done: true, value: [] };
-                            throw new Error(`Invalid field definition "${curPath}"`);
+                            throw new Error(`Unknown or Invalid field (${curPath})`);
                         }
                     }
                 }

package/cjs/document/resource/collection.js

@@ -137,23 +137,29 @@ const proto = {
         });
         return normalized;
     },
-    normalizeFilter(ast) {
-        if (ast instanceof index_js_2.ComparisonExpression) {
+    normalizeFilter(filter) {
+        if (!filter)
+            return;
+        const ast = typeof filter === 'string' ? index_js_2.OpraFilter.parse(filter) : filter;
+        if (ast instanceof index_js_2.OpraFilter.ComparisonExpression) {
             this.normalizeFilter(ast.left);
+            if (!(ast.left instanceof index_js_2.OpraFilter.QualifiedIdentifier && ast.left.field))
+                throw new TypeError(`Invalid filter query. Left side should be a data field.`);
+            this.normalizeFilter(ast.right);
         }
-        else if (ast instanceof index_js_2.LogicalExpression) {
+        else if (ast instanceof index_js_2.OpraFilter.LogicalExpression) {
             ast.items.forEach(item => this.normalizeFilter(item));
         }
-        else if (ast instanceof index_js_2.ArithmeticExpression) {
+        else if (ast instanceof index_js_2.OpraFilter.ArithmeticExpression) {
             ast.items.forEach(item => this.normalizeFilter(item.expression));
         }
-        else if (ast instanceof index_js_2.ArrayExpression) {
+        else if (ast instanceof index_js_2.OpraFilter.ArrayExpression) {
             ast.items.forEach(item => this.normalizeFilter(item));
         }
-        else if (ast instanceof index_js_2.ParenthesesExpression) {
+        else if (ast instanceof index_js_2.OpraFilter.ParenthesizedExpression) {
             this.normalizeFilter(ast.expression);
         }
-        else if (ast instanceof index_js_2.QualifiedIdentifier) {
+        else if (ast instanceof index_js_2.OpraFilter.QualifiedIdentifier) {
             ast.field = this.type.findField(ast.value);
             ast.dataType = ast.field?.type || this.document.getDataType('any');
             ast.value = this.type.normalizeFieldPath(ast.value);