@opra/sqb 0.32.2 → 0.32.4

package/cjs/sqb-adapter.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQBAdapter = void 0;
 const tslib_1 = require("tslib");
-const lodash_isnil_1 = tslib_1.__importDefault(require("lodash.isnil"));
-const lodash_omitby_1 = tslib_1.__importDefault(require("lodash.omitby"));
 const common_1 = require("@opra/common");
 const connect_1 = require("@sqb/connect");
 const transform_filter_js_1 = tslib_1.__importDefault(require("./transform-filter.js"));
@@ -44,7 +42,7 @@ var SQBAdapter;
                 options.distinct = params?.distinct;
                 options.count = params?.count;
             }
-            options = (0, lodash_omitby_1.default)(options, lodash_isnil_1.default);
+            options = (0, common_1.omitNullish)(options);
             if (operation === 'create') {
                 return {
                     method: 'create',

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

@@ -152,8 +152,8 @@ class SqbEntityServiceBase extends core_1.ApiService {
             throw e;
         }
     }
-    forContext(arg0, attributes) {
-        return super.forContext(arg0, attributes);
+    for(arg0, attributes) {
+        return super.for(arg0, attributes);
     }
     async _onError(error) {
         if (this.onError)
@@ -166,8 +166,8 @@ 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) &&
+    _instanceCompare(service, context, attributes) {
+        return super._instanceCompare(service, context, attributes) &&
             (!attributes?.db || service.db === attributes.db);
     }
 }

package/esm/sqb-adapter.js

@@ -1,6 +1,4 @@
-import isNil from 'lodash.isnil';
-import omitBy from 'lodash.omitby';
-import { Collection, Singleton } from '@opra/common';
+import { Collection, omitNullish, Singleton } from '@opra/common';
 import { EntityMetadata } from '@sqb/connect';
 import _transformFilter from './transform-filter.js';
 import _transformKeyValues from './transform-key-values.js';
@@ -40,7 +38,7 @@ export var SQBAdapter;
                 options.distinct = params?.distinct;
                 options.count = params?.count;
             }
-            options = omitBy(options, isNil);
+            options = omitNullish(options);
             if (operation === 'create') {
                 return {
                     method: 'create',

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

@@ -149,8 +149,8 @@ export class SqbEntityServiceBase extends ApiService {
             throw e;
         }
     }
-    forContext(arg0, attributes) {
-        return super.forContext(arg0, attributes);
+    for(arg0, attributes) {
+        return super.for(arg0, attributes);
     }
     async _onError(error) {
         if (this.onError)
@@ -163,8 +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) &&
+    _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.2",
+  "version": "0.32.4",
   "description": "Opra SQB adapter package",
   "author": "Panates",
   "license": "MIT",
@@ -25,22 +25,16 @@
     "clean:dist": "rimraf ../../build/client",
     "clean:cover": "rimraf ../../coverage/client"
   },
-  "dependencies": {
-    "lodash.isnil": "^4.0.0",
-    "lodash.omitby": "^4.6.0"
-  },
   "devDependencies": {
     "@faker-js/faker": "^8.3.1",
     "@sqb/builder": "^4.10.6",
     "@sqb/connect": "^4.10.6",
     "@sqb/postgres": "^4.10.6",
-    "@types/lodash.isnil": "^4.0.9",
-    "@types/lodash.omitby": "^4.6.9",
     "postgresql-client": "^2.10.1",
-    "ts-gems": "^2.7.1"
+    "ts-gems": "^2.8.0"
   },
   "peerDependencies": {
-    "@opra/core": "^0.32.2",
+    "@opra/core": "^0.32.4",
     "@sqb/connect": ">= 4.10.6"
   },
   "type": "module",

package/types/sqb-collection.d.ts

@@ -1,5 +1,5 @@
 import { Maybe } from 'ts-gems';
-import { ICollection, PartialOutput } from '@opra/common';
+import { ICollection, PartialDTO } from '@opra/common';
 import { RequestContext } from '@opra/core';
 import { SQBAdapter } from './sqb-adapter.js';
 import { SqbEntityService } from './sqb-entity-service.js';
@@ -11,20 +11,20 @@ export declare namespace SqbCollection {
 export declare abstract class SqbCollection<T> implements ICollection<T> {
     defaultLimit?: number;
     constructor(options?: SqbCollection.Options);
-    create?(ctx: RequestContext): Promise<PartialOutput<T>>;
+    create?(ctx: RequestContext): Promise<PartialDTO<T>>;
     delete?(ctx: RequestContext): Promise<number>;
     deleteMany?(ctx: RequestContext): Promise<number>;
-    get?(ctx: RequestContext): Promise<Maybe<PartialOutput<T>>>;
-    update?(ctx: RequestContext): Promise<Maybe<PartialOutput<T>>>;
+    get?(ctx: RequestContext): Promise<Maybe<PartialDTO<T>>>;
+    update?(ctx: RequestContext): Promise<Maybe<PartialDTO<T>>>;
     updateMany?(ctx: RequestContext): Promise<number>;
-    findMany?(ctx: RequestContext): Promise<PartialOutput<T>[]>;
-    protected _create(ctx: RequestContext, prepared: SQBAdapter.TransformedRequest): Promise<PartialOutput<T>>;
+    findMany?(ctx: RequestContext): Promise<PartialDTO<T>[]>;
+    protected _create(ctx: RequestContext, prepared: SQBAdapter.TransformedRequest): Promise<PartialDTO<T>>;
     protected _delete(ctx: RequestContext, prepared: SQBAdapter.TransformedRequest): Promise<number>;
     protected _deleteMany(ctx: RequestContext, prepared: SQBAdapter.TransformedRequest): Promise<number>;
-    protected _get(ctx: RequestContext, prepared: SQBAdapter.TransformedRequest): Promise<Maybe<PartialOutput<T>>>;
-    protected _update(ctx: RequestContext, prepared: SQBAdapter.TransformedRequest): Promise<Maybe<PartialOutput<T>>>;
+    protected _get(ctx: RequestContext, prepared: SQBAdapter.TransformedRequest): Promise<Maybe<PartialDTO<T>>>;
+    protected _update(ctx: RequestContext, prepared: SQBAdapter.TransformedRequest): Promise<Maybe<PartialDTO<T>>>;
     protected _updateMany(ctx: RequestContext, prepared: SQBAdapter.TransformedRequest): Promise<number>;
-    protected _findMany(ctx: RequestContext, prepared: SQBAdapter.TransformedRequest): Promise<PartialOutput<T>[]>;
+    protected _findMany(ctx: RequestContext, prepared: SQBAdapter.TransformedRequest): Promise<PartialDTO<T>[]>;
     protected _prepare(ctx: RequestContext): Promise<SQBAdapter.TransformedRequest>;
     onPrepare?(ctx: RequestContext, prepared: SQBAdapter.TransformedRequest): SQBAdapter.TransformedRequest | Promise<SQBAdapter.TransformedRequest>;
     protected abstract getService(ctx: RequestContext): SqbEntityService<T> | Promise<SqbEntityService<T>>;

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

@@ -1,34 +1,37 @@
-import { Maybe, Type } from 'ts-gems';
-import { ApiService, PartialInput, PartialOutput, RequestContext } from '@opra/core';
+import { 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';
-export declare namespace SqbEntityServiceBase {
-    interface Options {
-        db?: SqbClient | SqbConnection;
-        defaultLimit?: number;
-    }
-}
 export declare class SqbEntityServiceBase<T> extends ApiService {
     readonly typeClass: Type<T>;
     defaultLimit: number;
     db?: SqbClient | SqbConnection;
     constructor(typeClass: Type<T>, options?: SqbEntityServiceBase.Options);
     protected _count(options?: Repository.CountOptions): Promise<number>;
-    protected _create(data: PartialInput<T>, options?: Repository.CreateOptions): Promise<PartialOutput<T>>;
+    protected _create(data: DTO<T>, options?: Repository.CreateOptions): Promise<PartialDTO<T>>;
     protected _delete(keyValue: any, options?: Repository.DeleteOptions): Promise<number>;
     protected _deleteMany(options?: Repository.DeleteManyOptions): Promise<number>;
-    protected _find(keyValue: any, options?: Repository.FindOptions): Promise<Maybe<PartialOutput<T>>>;
-    protected _findOne(options?: Repository.FindOneOptions): Promise<Maybe<PartialOutput<T>>>;
-    protected _findMany(options?: Repository.FindManyOptions): Promise<PartialOutput<T>[]>;
+    protected _find(keyValue: any, options?: Repository.FindOptions): Promise<PartialDTO<T> | undefined>;
+    protected _findOne(options?: Repository.FindOneOptions): Promise<PartialDTO<T> | undefined>;
+    protected _findMany(options?: Repository.FindManyOptions): Promise<PartialDTO<T>[]>;
     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(source: ApiService): this;
-    forContext(context: RequestContext, attributes?: {
-        db?: SqbClient | SqbConnection;
-    }): this;
+    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;
     protected _onError(error: unknown): Promise<void>;
     protected getConnection(): SqbConnection | SqbClient | Promise<SqbConnection | SqbClient>;
-    protected _cacheMatch(service: ApiService, context: RequestContext, attributes?: any): boolean;
+    protected _instanceCompare(service: ApiService, context: RequestContext, attributes?: any): boolean;
     protected onError?(error: unknown): void | Promise<void>;
-    protected transformData?(row: PartialOutput<T>): PartialOutput<T>;
+    protected transformData?(row: PartialDTO<T>): PartialDTO<T>;
+}
+export declare namespace SqbEntityServiceBase {
+    interface Options {
+        db?: SqbClient | SqbConnection;
+        defaultLimit?: number;
+    }
+    interface ExtendOptions extends Options, ApiService.ExtendOptions {
+        db?: SqbClient | SqbConnection;
+    }
 }

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

@@ -1,5 +1,5 @@
-import { Maybe, Type } from 'ts-gems';
-import { PartialInput, PartialOutput } from '@opra/core';
+import { Type } from 'ts-gems';
+import { DTO, PartialDTO, PatchDTO } from '@opra/common';
 import { EntityInput, Repository } from '@sqb/connect';
 import { SqbEntityServiceBase } from './sqb-entity-service-base.js';
 export declare namespace SqbEntityService {
@@ -10,13 +10,13 @@ export declare class SqbEntityService<T> extends SqbEntityServiceBase<T> {
     readonly typeClass: Type<T>;
     constructor(typeClass: Type<T>, options?: SqbEntityService.Options);
     count(options?: Repository.CountOptions): Promise<number>;
-    create(data: PartialInput<T>, options?: Repository.CreateOptions): Promise<PartialOutput<T>>;
+    create(data: DTO<T>, options?: Repository.CreateOptions): Promise<PartialDTO<T>>;
     delete(keyValue: any, options?: Repository.DeleteOptions): Promise<number>;
     deleteMany(options?: Repository.DeleteManyOptions): Promise<number>;
-    find(keyValue: any, options?: Repository.FindOptions): Promise<Maybe<PartialOutput<T>>>;
-    findOne(options?: Repository.FindOneOptions): Promise<Maybe<PartialOutput<T>>>;
-    findMany(options?: Repository.FindManyOptions): Promise<PartialOutput<T>[]>;
+    find(keyValue: any, options?: Repository.FindOptions): Promise<PartialDTO<T> | undefined>;
+    findOne(options?: Repository.FindOneOptions): Promise<PartialDTO<T> | undefined>;
+    findMany(options?: Repository.FindManyOptions): Promise<PartialDTO<T>[]>;
     exists(options?: Repository.ExistsOptions): Promise<boolean>;
-    update(keyValue: any, data: EntityInput<T>, options?: Repository.UpdateOptions): Promise<Maybe<PartialOutput<T>>>;
-    updateMany(data: PartialInput<T>, options?: Repository.UpdateManyOptions): Promise<number>;
+    update(keyValue: any, data: EntityInput<T>, options?: Repository.UpdateOptions): Promise<PartialDTO<T> | undefined>;
+    updateMany(data: PatchDTO<T>, options?: Repository.UpdateManyOptions): Promise<number>;
 }

package/types/sqb-singleton.d.ts

@@ -1,17 +1,17 @@
 import { Maybe } from 'ts-gems';
-import { ISingleton, PartialOutput } from '@opra/common';
+import { ISingleton, PartialDTO } from '@opra/common';
 import { RequestContext } from '@opra/core';
 import { SQBAdapter } from './sqb-adapter.js';
 import { SqbEntityService } from './sqb-entity-service.js';
 export declare abstract class SqbSingleton<T> implements ISingleton<T> {
-    create?(ctx: RequestContext): Promise<PartialOutput<T>>;
+    create?(ctx: RequestContext): Promise<PartialDTO<T>>;
     delete?(ctx: RequestContext): Promise<number>;
-    get?(ctx: RequestContext): Promise<Maybe<PartialOutput<T>>>;
-    update?(ctx: RequestContext): Promise<Maybe<PartialOutput<T>>>;
-    protected _create(ctx: RequestContext, prepared: SQBAdapter.TransformedRequest): Promise<PartialOutput<T>>;
+    get?(ctx: RequestContext): Promise<Maybe<PartialDTO<T>>>;
+    update?(ctx: RequestContext): Promise<Maybe<PartialDTO<T>>>;
+    protected _create(ctx: RequestContext, prepared: SQBAdapter.TransformedRequest): Promise<PartialDTO<T>>;
     protected _delete(ctx: RequestContext, prepared: SQBAdapter.TransformedRequest): Promise<number>;
-    protected _get(ctx: RequestContext, prepared: SQBAdapter.TransformedRequest): Promise<Maybe<PartialOutput<T>>>;
-    protected _update(ctx: RequestContext, prepared: SQBAdapter.TransformedRequest): Promise<Maybe<PartialOutput<T>>>;
+    protected _get(ctx: RequestContext, prepared: SQBAdapter.TransformedRequest): Promise<Maybe<PartialDTO<T>>>;
+    protected _update(ctx: RequestContext, prepared: SQBAdapter.TransformedRequest): Promise<Maybe<PartialDTO<T>>>;
     protected _prepare(ctx: RequestContext): Promise<SQBAdapter.TransformedRequest>;
     onPrepare?(ctx: RequestContext, prepared: SQBAdapter.TransformedRequest): SQBAdapter.TransformedRequest | Promise<SQBAdapter.TransformedRequest>;
     protected abstract getService(ctx: RequestContext): SqbEntityService<T> | Promise<SqbEntityService<T>>;