@opra/sqb 0.31.4 → 0.31.6

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

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

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/sqb",
-  "version": "0.31.4",
+  "version": "0.31.6",
   "description": "Opra SQB adapter package",
   "author": "Panates",
   "license": "MIT",
@@ -19,10 +19,11 @@
     "lint": "eslint . --max-warnings=0",
     "test": "jest",
     "cover": "jest --collect-coverage",
-    "clean": "npm run clean:src && npm run clean:dist && npm run clean:cover",
-    "clean:src": "ts-cleanup -s src --all && ts-cleanup -s test --all",
-    "clean:dist": "rimraf ../../build/sqb",
-    "clean:cover": "rimraf ../../coverage/sqb"
+    "clean": "npm run clean:src && npm run clean:test && npm run clean:dist && npm run clean:cover",
+    "clean:src": "ts-cleanup -s src --all",
+    "clean:test": "ts-cleanup -s test --all",
+    "clean:dist": "rimraf ../../build/client",
+    "clean:cover": "rimraf ../../coverage/client"
   },
   "dependencies": {
     "lodash.isnil": "^4.0.0",
@@ -30,16 +31,16 @@
   },
   "devDependencies": {
     "@faker-js/faker": "^8.3.1",
-    "@sqb/builder": "^4.10.4",
-    "@sqb/connect": "^4.10.4",
-    "@sqb/postgres": "^4.10.4",
+    "@sqb/builder": "^4.10.5",
+    "@sqb/connect": "^4.10.5",
+    "@sqb/postgres": "^4.10.5",
     "@types/lodash.isnil": "^4.0.9",
     "@types/lodash.omitby": "^4.6.9",
     "postgresql-client": "^2.10.1",
     "ts-gems": "^2.5.0"
   },
   "peerDependencies": {
-    "@opra/core": "^0.31.4",
+    "@opra/core": "^0.31.6",
     "@sqb/connect": ">= 4.9.0"
   },
   "type": "module",

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

@@ -22,9 +22,13 @@ 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<Maybe<PartialOutput<T>>>;
     protected _updateMany(data: PartialInput<T>, options?: Repository.UpdateManyOptions): Promise<number>;
-    forContext(context: RequestContext, db?: SqbClient | SqbConnection): this;
+    forContext(source: ApiService): this;
+    forContext(context: RequestContext, attributes?: {
+        db?: SqbClient | SqbConnection;
+    }): this;
     protected _onError(error: unknown): Promise<void>;
     protected getConnection(): SqbConnection | SqbClient | Promise<SqbConnection | SqbClient>;
+    protected _cacheMatch(service: ApiService, context: RequestContext, attributes?: any): boolean;
     protected onError?(error: unknown): void | Promise<void>;
     protected transformData?(row: PartialOutput<T>): PartialOutput<T>;
 }