@opra/sqb 1.0.0-alpha.32 → 1.0.0-alpha.34

package/cjs/sqb-entity-service.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqbEntityService = void 0;
 const common_1 = require("@opra/common");
 const core_1 = require("@opra/core");
+const builder_1 = require("@sqb/builder");
 const connect_1 = require("@sqb/connect");
 const valgen_1 = require("valgen");
 const sqb_adapter_js_1 = require("./sqb-adapter.js");
@@ -63,6 +64,17 @@ class SqbEntityService extends core_1.ServiceBase {
         }
         return this._entityMetadata;
     }
+    for(context, overwriteProperties, overwriteContext) {
+        if (overwriteProperties?.commonFilter && this.commonFilter) {
+            overwriteProperties.commonFilter = [
+                ...(Array.isArray(this.commonFilter) ? this.commonFilter : [this.commonFilter]),
+                ...(Array.isArray(overwriteProperties?.commonFilter)
+                    ? overwriteProperties?.commonFilter
+                    : [overwriteProperties?.commonFilter]),
+            ];
+        }
+        return super.for(context, overwriteProperties, overwriteContext);
+    }
     /**
      * Retrieves the resource name.
      *
@@ -444,8 +456,10 @@ class SqbEntityService extends core_1.ServiceBase {
      * @returns {FilterInput | Promise<FilterInput> | undefined} The common filter or a Promise
      * that resolves to the common filter, or undefined if not available.
      */
-    _getCommonFilter(args) {
-        return typeof this.commonFilter === 'function' ? this.commonFilter(args, this) : this.commonFilter;
+    _getCommonFilter(command) {
+        const commonFilter = Array.isArray(this.commonFilter) ? this.commonFilter : [this.commonFilter];
+        const mapped = commonFilter.map(f => (typeof f === 'function' ? f(command, this) : f));
+        return mapped.length > 1 ? builder_1.op.and(...mapped) : mapped[0];
     }
     async _executeCommand(command, commandFn) {
         let proto;

package/esm/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

package/esm/sqb-entity-service.js

@@ -1,5 +1,6 @@
 import { InternalServerError } from '@opra/common';
 import { ServiceBase } from '@opra/core';
+import { op } from '@sqb/builder';
 import { EntityMetadata } from '@sqb/connect';
 import { isNotNullish } from 'valgen';
 import { SQBAdapter } from './sqb-adapter.js';
@@ -60,6 +61,17 @@ export class SqbEntityService extends ServiceBase {
         }
         return this._entityMetadata;
     }
+    for(context, overwriteProperties, overwriteContext) {
+        if (overwriteProperties?.commonFilter && this.commonFilter) {
+            overwriteProperties.commonFilter = [
+                ...(Array.isArray(this.commonFilter) ? this.commonFilter : [this.commonFilter]),
+                ...(Array.isArray(overwriteProperties?.commonFilter)
+                    ? overwriteProperties?.commonFilter
+                    : [overwriteProperties?.commonFilter]),
+            ];
+        }
+        return super.for(context, overwriteProperties, overwriteContext);
+    }
     /**
      * Retrieves the resource name.
      *
@@ -441,8 +453,10 @@ export class SqbEntityService extends ServiceBase {
      * @returns {FilterInput | Promise<FilterInput> | undefined} The common filter or a Promise
      * that resolves to the common filter, or undefined if not available.
      */
-    _getCommonFilter(args) {
-        return typeof this.commonFilter === 'function' ? this.commonFilter(args, this) : this.commonFilter;
+    _getCommonFilter(command) {
+        const commonFilter = Array.isArray(this.commonFilter) ? 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];
     }
     async _executeCommand(command, commandFn) {
         let proto;

package/package.json

@@ -1,52 +1,41 @@
 {
   "name": "@opra/sqb",
-  "version": "1.0.0-alpha.32",
+  "version": "1.0.0-alpha.34",
   "description": "Opra SQB adapter package",
   "author": "Panates",
   "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/panates/opra.git",
-    "directory": "packages/sqb"
-  },
-  "scripts": {
-    "compile": "tsc",
-    "prebuild": "npm run lint && npm run clean",
-    "build": "npm run build:cjs && npm run build:esm",
-    "build:cjs": "tsc -b tsconfig-build-cjs.json",
-    "build:esm": "tsc -b tsconfig-build-esm.json",
-    "postbuild": "cp README.md package.json ../../LICENSE ../../build/sqb && cp ../../package.cjs.json ../../build/sqb/cjs/package.json",
-    "lint": "eslint . --max-warnings=0",
-    "lint:fix": "eslint . --max-warnings=0 --fix",
-    "format": "prettier . --write --log-level=warn",
-    "test": "jest --passWithNoTests",
-    "cover": "jest --passWithNoTests --collect-coverage",
-    "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": {
     "reflect-metadata": "^0.2.2",
-    "tslib": "^2.6.3"
-  },
-  "devDependencies": {
-    "@faker-js/faker": "^8.4.1",
-    "@sqb/builder": "^4.14.1",
-    "@sqb/connect": "^4.14.1",
-    "@sqb/postgres": "^4.14.1",
-    "postgrejs": "^2.15.4",
-    "ts-gems": "^3.4.0"
+    "tslib": "^2.6.3",
+    "valgen": "^5.8.2"
   },
   "peerDependencies": {
-    "@opra/core": "^1.0.0-alpha.32",
+    "@opra/core": "^1.0.0-alpha.34",
     "@sqb/connect": ">= 4.10.6"
   },
   "type": "module",
-  "module": "./esm/index.js",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./types/index.d.ts",
+        "default": "./esm/index.js"
+      },
+      "require": {
+        "types": "./types/index.d.ts",
+        "default": "./cjs/index.js"
+      },
+      "default": "./esm/index.js"
+    },
+    "./package.json": "./package.json"
+  },
   "main": "./cjs/index.js",
+  "module": "./esm/index.js",
   "types": "./types/index.d.ts",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/panates/opra.git",
+    "directory": "packages/sqb"
+  },
   "engines": {
     "node": ">=16.0",
     "npm": ">=7.0.0"
@@ -64,4 +53,4 @@
     "sqb",
     "adapter"
   ]
-}
+}

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

@@ -1,7 +1,7 @@
 import { ComplexType } from '@opra/common';
-import { ServiceBase } from '@opra/core';
+import { HttpContext, ServiceBase } from '@opra/core';
 import { EntityMetadata, Repository, SqbClient, SqbConnection } from '@sqb/connect';
-import { PartialDTO, PatchDTO, RequiredSome, StrictOmit, Type } from 'ts-gems';
+import { Nullish, PartialDTO, PatchDTO, RequiredSome, StrictOmit, Type } from 'ts-gems';
 import { IsObject } from 'valgen';
 import { SQBAdapter } from './sqb-adapter.js';
 /**
@@ -24,6 +24,7 @@ export declare namespace SqbEntityService {
         input?: Record<string, any>;
         options?: Record<string, any>;
     }
+    type CommonFilter = SQBAdapter.FilterInput | ((args: SqbEntityService.CommandInfo, _this: SqbEntityService<any>) => SQBAdapter.FilterInput | Promise<SQBAdapter.FilterInput> | undefined);
     /**
      * Represents options for "create" operation
      *
@@ -158,18 +159,18 @@ export declare class SqbEntityService<T extends object = object> extends Service
     /**
      * Represents a SqbClient or SqbConnection object
      */
-    db?: (SqbClient | SqbConnection) | ((_this: any) => SqbClient | SqbConnection);
+    db?: (SqbClient | SqbConnection) | ((_this: this) => SqbClient | SqbConnection);
     /**
      * Represents the name of a resource.
      * @type {string}
      */
-    resourceName?: string | ((_this: any) => string);
+    resourceName?: string | ((_this: this) => string);
     /**
      * Represents a common filter function for a service.
      *
      * @type {SqbEntityService.Filter | Function}
      */
-    commonFilter?: SQBAdapter.FilterInput | ((args: SqbEntityService.CommandInfo, _this: this) => SQBAdapter.FilterInput | Promise<SQBAdapter.FilterInput> | undefined);
+    commonFilter?: SqbEntityService.CommonFilter | SqbEntityService.CommonFilter[];
     /**
      * Callback function for handling errors.
      *
@@ -203,6 +204,7 @@ export declare class SqbEntityService<T extends object = object> extends Service
      * @throws {TypeError} If metadata is not available
      */
     get entityMetadata(): EntityMetadata;
+    for<C extends HttpContext, P extends Partial<this>>(context: C, overwriteProperties?: Nullish<P>, overwriteContext?: Partial<C>): this & Required<P>;
     /**
      * Retrieves the resource name.
      *
@@ -424,13 +426,6 @@ export declare class SqbEntityService<T extends object = object> extends Service
      * @returns {FilterInput | Promise<FilterInput> | undefined} The common filter or a Promise
      * that resolves to the common filter, or undefined if not available.
      */
-    protected _getCommonFilter(args: {
-        crud: SqbEntityService.CrudOp;
-        method: string;
-        byId: boolean;
-        documentId?: SQBAdapter.IdOrIds;
-        input?: Object;
-        options?: Record<string, any>;
-    }): SQBAdapter.FilterInput | Promise<SQBAdapter.FilterInput> | undefined;
+    protected _getCommonFilter(command: SqbEntityService.CommandInfo): SQBAdapter.FilterInput | Promise<SQBAdapter.FilterInput> | undefined;
     protected _executeCommand(command: SqbEntityService.CommandInfo, commandFn: () => any): Promise<any>;
 }