@opra/sqb 1.26.4 → 1.27.0

package/adapter-utils/prepare-filter.js

@@ -1,6 +1,6 @@
 import '@opra/core';
 import { OpraFilter } from '@opra/common';
-import * as sqb from '@sqb/builder';
+import { Operators, sql } from '@sqb/builder';
 import { vg } from 'valgen';
 /**
  * Prepares the SQB filter based on the provided filters and options.
@@ -26,7 +26,7 @@ export default function prepareFilter(filters) {
         if (ast)
             arr.push(ast);
     }
-    return arr.length > 1 ? sqb.And(...arr) : arr[0];
+    return arr.length > 1 ? sql.And(...arr) : arr[0];
 }
 const _isDate = vg.isDate({ trim: 'day' });
 const _isDateTime = vg.isDate();
@@ -43,12 +43,12 @@ function prepareFilterAst(ast) {
         return ast.items.map(prepareFilterAst);
     }
     if (ast instanceof OpraFilter.NegativeExpression) {
-        return sqb.Not(prepareFilterAst(ast.expression));
+        return sql.Not(prepareFilterAst(ast.expression));
     }
     if (ast instanceof OpraFilter.LogicalExpression) {
         if (ast.op === 'or')
-            return sqb.Or(...ast.items.map(prepareFilterAst));
-        return sqb.And(...ast.items.map(prepareFilterAst));
+            return sql.Or(...ast.items.map(prepareFilterAst));
+        return sql.And(...ast.items.map(prepareFilterAst));
     }
     if (ast instanceof OpraFilter.ParenthesizedExpression) {
         return prepareFilterAst(ast.expression);
@@ -67,33 +67,19 @@ function prepareFilterAst(ast) {
                 return x;
         }
         switch (ast.op) {
-            case '=':
-                return sqb.Eq(left, right);
-            case '!=':
-                return sqb.Ne(left, right);
-            case '>':
-                return sqb.Gt(left, right);
-            case '>=':
-                return sqb.Gte(left, right);
-            case '<':
-                return sqb.Lt(left, right);
-            case '<=':
-                return sqb.Lte(left, right);
-            case 'in':
-                return sqb.In(left, right);
-            case '!in':
-                return sqb.Nin(left, right);
             case 'like':
-                return sqb.Like(left, String(right).replace(/\*/g, '%'));
+                return sql.Like(left, String(right).replace(/\*/g, '%'));
             case 'ilike':
-                return sqb.Ilike(left, String(right).replace(/\*/g, '%'));
+                return sql.ILike(left, String(right).replace(/\*/g, '%'));
             case '!like':
-                return sqb.NotLike(left, String(right).replace(/\*/g, '%'));
+                return sql.NotLike(left, String(right).replace(/\*/g, '%'));
             case '!ilike':
-                return sqb.NotILike(left, String(right).replace(/\*/g, '%'));
-            default:
-                throw new Error(`ComparisonExpression operator (${ast.op}) not implemented yet`);
+                return sql.NotILike(left, String(right).replace(/\*/g, '%'));
         }
+        const fn = Operators[ast.op];
+        if (fn)
+            return fn(left, right);
+        throw new Error(`ComparisonExpression operator (${ast.op}) not implemented yet`);
     }
     if (ast instanceof OpraFilter.QualifiedIdentifier ||
         ast instanceof OpraFilter.Literal) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/sqb",
-  "version": "1.26.4",
+  "version": "1.27.0",
   "description": "Opra SQB adapter package",
   "author": "Panates",
   "license": "MIT",
@@ -10,8 +10,8 @@
     "valgen": "^6.0.3"
   },
   "peerDependencies": {
-    "@opra/core": "^1.26.4",
-    "@opra/http": "^1.26.4",
+    "@opra/core": "^1.27.0",
+    "@opra/http": "^1.27.0",
     "@sqb/builder": ">4.0.0 <5",
     "@sqb/connect": ">4.0.0 <5"
   },

package/sqb-entity-service.d.ts

@@ -163,9 +163,10 @@ export declare class SqbEntityService<T extends object = object> extends SqbServ
      * Called whenever a command throws. Useful for logging or transforming errors.
      *
      * @param error - The thrown error.
+     * @param command - The service command during which the error was thrown.
      * @param _this - The service instance.
      */
-    onError?: (error: unknown, _this: any) => void | Promise<void>;
+    onError?: (error: unknown, command: SqbEntityService.CommandInfo, _this: any) => void | Promise<void>;
     /**
      * Constructs a new instance.
      *

package/sqb-entity-service.js

@@ -1,5 +1,5 @@
 import { InternalServerError } from '@opra/common';
-import { op } from '@sqb/builder';
+import { sql } from '@sqb/builder';
 import { EntityMetadata } from '@sqb/connect';
 import { isNotNullish } from 'valgen';
 import { SQBAdapter } from './sqb-adapter.js';
@@ -35,6 +35,7 @@ export class SqbEntityService extends SqbServiceBase {
      * Called whenever a command throws. Useful for logging or transforming errors.
      *
      * @param error - The thrown error.
+     * @param command - The service command during which the error was thrown.
      * @param _this - The service instance.
      */
     onError;
@@ -121,6 +122,7 @@ export class SqbEntityService extends SqbServiceBase {
      * @param operation - The operation name.
      */
     getInputCodec(operation) {
+        const dataType = this.dataType;
         const cacheKey = operation + (this._dataTypeScope ? ':' + this._dataTypeScope : '');
         let validator = this._inputCodecs[cacheKey];
         if (validator)
@@ -131,7 +133,6 @@ export class SqbEntityService extends SqbServiceBase {
         };
         if (operation === 'update')
             options.partial = 'deep';
-        const dataType = this.dataType;
         validator = dataType.generateCodec('decode', options);
         this._inputCodecs[cacheKey] = validator;
         return validator;
@@ -142,6 +143,7 @@ export class SqbEntityService extends SqbServiceBase {
      * @param operation - The operation name.
      */
     getOutputCodec(operation) {
+        const dataType = this.dataType;
         const cacheKey = operation + (this._dataTypeScope ? ':' + this._dataTypeScope : '');
         let validator = this._outputCodecs[cacheKey];
         if (validator)
@@ -151,7 +153,6 @@ export class SqbEntityService extends SqbServiceBase {
             partial: 'deep',
             scope: this._dataTypeScope,
         };
-        const dataType = this.dataType;
         validator = dataType.generateCodec('decode', options);
         this._outputCodecs[cacheKey] = validator;
         return validator;
@@ -540,7 +541,7 @@ export class SqbEntityService extends SqbServiceBase {
             ? this.commonFilter
             : [this.commonFilter];
         const mapped = commonFilter.map(f => typeof f === 'function' ? f(command, this) : f);
-        return mapped.length > 1 ? op.and(...mapped) : mapped[0];
+        return mapped.length > 1 ? sql.And(...mapped) : mapped[0];
     }
     async _executeCommand(command, commandFn) {
         let proto;
@@ -594,7 +595,7 @@ export class SqbEntityService extends SqbServiceBase {
         }
         catch (e) {
             Error.captureStackTrace(e, this._executeCommand);
-            await this.onError?.(e, this);
+            await this.onError?.(e, command, this);
             throw e;
         }
     }