@opra/sqb 0.32.6 → 0.33.0

package/cjs/sqb-entity-service-base.js

@@ -152,8 +152,8 @@ class SqbEntityServiceBase extends core_1.ApiService {
             throw e;
         }
     }
-    for(arg0, attributes) {
-        return super.for(arg0, attributes);
+    for(context, overwriteProperties, overwriteContext) {
+        return super.for(context, overwriteProperties, overwriteContext);
     }
     async _onError(error) {
         if (this.onError)
@@ -166,9 +166,5 @@ class SqbEntityServiceBase extends core_1.ApiService {
             throw new Error(`Database not set!`);
         return this.db;
     }
-    _instanceCompare(service, context, attributes) {
-        return super._instanceCompare(service, context, attributes) &&
-            (!attributes?.db || service.db === attributes.db);
-    }
 }
 exports.SqbEntityServiceBase = SqbEntityServiceBase;

package/esm/sqb-entity-service-base.js

@@ -149,8 +149,8 @@ export class SqbEntityServiceBase extends ApiService {
             throw e;
         }
     }
-    for(arg0, attributes) {
-        return super.for(arg0, attributes);
+    for(context, overwriteProperties, overwriteContext) {
+        return super.for(context, overwriteProperties, overwriteContext);
     }
     async _onError(error) {
         if (this.onError)
@@ -163,8 +163,4 @@ export class SqbEntityServiceBase extends ApiService {
             throw new Error(`Database not set!`);
         return this.db;
     }
-    _instanceCompare(service, context, attributes) {
-        return super._instanceCompare(service, context, attributes) &&
-            (!attributes?.db || service.db === attributes.db);
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/sqb",
-  "version": "0.32.6",
+  "version": "0.33.0",
   "description": "Opra SQB adapter package",
   "author": "Panates",
   "license": "MIT",
@@ -31,10 +31,10 @@
     "@sqb/connect": "^4.10.6",
     "@sqb/postgres": "^4.10.6",
     "postgresql-client": "^2.10.1",
-    "ts-gems": "^2.9.3"
+    "ts-gems": "^3.1.0"
   },
   "peerDependencies": {
-    "@opra/core": "^0.32.6",
+    "@opra/core": "^0.33.0",
     "@sqb/connect": ">= 4.10.6"
   },
   "type": "module",

package/types/sqb-entity-service-base.d.ts

@@ -1,4 +1,4 @@
-import { Type } from 'ts-gems';
+import { Nullish, Type } from 'ts-gems';
 import { DTO, PartialDTO, PatchDTO } from '@opra/common';
 import { ApiService, RequestContext } from '@opra/core';
 import { EntityInput, Repository, SqbClient, SqbConnection } from '@sqb/connect';
@@ -17,12 +17,9 @@ export declare class SqbEntityServiceBase<T> extends ApiService {
     protected _exists(options?: Repository.ExistsOptions): Promise<boolean>;
     protected _update(keyValue: any, data: EntityInput<T>, options?: Repository.UpdateOptions): Promise<PartialDTO<T> | undefined>;
     protected _updateMany(data: PatchDTO<T>, options?: Repository.UpdateManyOptions): Promise<number>;
-    for(context: RequestContext | ApiService): this;
-    for(context: RequestContext | ApiService, attributes?: SqbEntityServiceBase.ExtendOptions): this;
-    for<O extends ApiService.ExtendOptions>(attributes: O): this & O;
+    for<C extends RequestContext, P extends Partial<this>>(context: C, overwriteProperties?: Nullish<P>, overwriteContext?: Partial<C>): this & Required<P>;
     protected _onError(error: unknown): Promise<void>;
     protected getConnection(): SqbConnection | SqbClient | Promise<SqbConnection | SqbClient>;
-    protected _instanceCompare(service: ApiService, context: RequestContext, attributes?: any): boolean;
     protected onError?(error: unknown): void | Promise<void>;
     protected transformData?(row: PartialDTO<T>): PartialDTO<T>;
 }
@@ -31,7 +28,4 @@ export declare namespace SqbEntityServiceBase {
         db?: SqbClient | SqbConnection;
         defaultLimit?: number;
     }
-    interface ExtendOptions extends Options, ApiService.ExtendOptions {
-        db?: SqbClient | SqbConnection;
-    }
 }