@opra/sqb 1.0.0-alpha.37 → 1.0.0-alpha.39

package/cjs/sqb-entity-service.js

@@ -473,13 +473,14 @@ class SqbEntityService extends core_1.ServiceBase {
                 if (!(proto instanceof SqbEntityService))
                     break;
             }
+            /** Call before[X] hooks */
             if (command.crud === 'create')
                 await this._beforeCreate(command);
             else if (command.crud === 'update' && command.byId) {
                 await this._beforeUpdate(command);
             }
             else if (command.crud === 'update' && !command.byId) {
-                await this._beforeUpdate(command);
+                await this._beforeUpdateMany(command);
             }
             else if (command.crud === 'delete' && command.byId) {
                 await this._beforeDelete(command);
@@ -487,14 +488,19 @@ class SqbEntityService extends core_1.ServiceBase {
             else if (command.crud === 'delete' && !command.byId) {
                 await this._beforeDeleteMany(command);
             }
-            const result = await commandFn();
+            /** Call command function */
+            return commandFn();
+        };
+        try {
+            const result = await next();
+            /** Call after[X] hooks */
             if (command.crud === 'create')
                 await this._afterCreate(command, result);
             else if (command.crud === 'update' && command.byId) {
                 await this._afterUpdate(command, result);
             }
             else if (command.crud === 'update' && !command.byId) {
-                await this._afterUpdate(command, result);
+                await this._afterUpdateMany(command, result);
             }
             else if (command.crud === 'delete' && command.byId) {
                 await this._afterDelete(command, result);
@@ -503,9 +509,6 @@ class SqbEntityService extends core_1.ServiceBase {
                 await this._afterDeleteMany(command, result);
             }
             return result;
-        };
-        try {
-            return await next();
         }
         catch (e) {
             Error.captureStackTrace(e, this._executeCommand);

package/esm/sqb-entity-service.js

@@ -470,13 +470,14 @@ export class SqbEntityService extends ServiceBase {
                 if (!(proto instanceof SqbEntityService))
                     break;
             }
+            /** Call before[X] hooks */
             if (command.crud === 'create')
                 await this._beforeCreate(command);
             else if (command.crud === 'update' && command.byId) {
                 await this._beforeUpdate(command);
             }
             else if (command.crud === 'update' && !command.byId) {
-                await this._beforeUpdate(command);
+                await this._beforeUpdateMany(command);
             }
             else if (command.crud === 'delete' && command.byId) {
                 await this._beforeDelete(command);
@@ -484,14 +485,19 @@ export class SqbEntityService extends ServiceBase {
             else if (command.crud === 'delete' && !command.byId) {
                 await this._beforeDeleteMany(command);
             }
-            const result = await commandFn();
+            /** Call command function */
+            return commandFn();
+        };
+        try {
+            const result = await next();
+            /** Call after[X] hooks */
             if (command.crud === 'create')
                 await this._afterCreate(command, result);
             else if (command.crud === 'update' && command.byId) {
                 await this._afterUpdate(command, result);
             }
             else if (command.crud === 'update' && !command.byId) {
-                await this._afterUpdate(command, result);
+                await this._afterUpdateMany(command, result);
             }
             else if (command.crud === 'delete' && command.byId) {
                 await this._afterDelete(command, result);
@@ -500,9 +506,6 @@ export class SqbEntityService extends ServiceBase {
                 await this._afterDeleteMany(command, result);
             }
             return result;
-        };
-        try {
-            return await next();
         }
         catch (e) {
             Error.captureStackTrace(e, this._executeCommand);

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@opra/sqb",
-  "version": "1.0.0-alpha.37",
+  "version": "1.0.0-alpha.39",
   "description": "Opra SQB adapter package",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
     "reflect-metadata": "^0.2.2",
-    "tslib": "^2.6.3",
+    "tslib": "^2.7.0",
     "valgen": "^5.9.0"
   },
   "peerDependencies": {
-    "@opra/core": "^1.0.0-alpha.37",
+    "@opra/core": "^1.0.0-alpha.39",
     "@sqb/connect": ">= 4.10.6"
   },
   "type": "module",

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

@@ -1,4 +1,4 @@
-import { PartialDTO, PatchDTO, RequiredSome, Type } from 'ts-gems';
+import type { PartialDTO, PatchDTO, RequiredSome, Type } from 'ts-gems';
 import { SQBAdapter } from './sqb-adapter.js';
 import { SqbEntityService } from './sqb-entity-service.js';
 /**

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

@@ -1,8 +1,8 @@
 import { ComplexType } from '@opra/common';
 import { HttpContext, ServiceBase } from '@opra/core';
 import { EntityMetadata, Repository, SqbClient, SqbConnection } from '@sqb/connect';
-import { Nullish, PartialDTO, PatchDTO, RequiredSome, StrictOmit, Type } from 'ts-gems';
-import { IsObject } from 'valgen';
+import type { Nullish, PartialDTO, PatchDTO, RequiredSome, StrictOmit, Type } from 'ts-gems';
+import { type IsObject } from 'valgen';
 import { SQBAdapter } from './sqb-adapter.js';
 /**
  * @namespace SqbEntityService
@@ -95,8 +95,9 @@ export declare namespace SqbEntityService {
      */
     interface UpdateManyOptions extends Repository.UpdateManyOptions {
     }
-    interface CreateCommand extends StrictOmit<RequiredSome<CommandInfo, 'input'>, 'documentId'> {
+    interface CreateCommand<T> extends StrictOmit<RequiredSome<CommandInfo, 'input'>, 'documentId'> {
         crud: 'create';
+        input: PatchDTO<T>;
         options?: CreateOptions;
     }
     interface CountCommand extends StrictOmit<CommandInfo, 'documentId' | 'input'> {
@@ -229,7 +230,7 @@ export declare class SqbEntityService<T extends object = object> extends Service
      * @returns - A promise that resolves to the created resource
      * @protected
      */
-    protected _create(command: SqbEntityService.CreateCommand): Promise<PartialDTO<T>>;
+    protected _create(command: SqbEntityService.CreateCommand<T>): Promise<PartialDTO<T>>;
     /**
      * Returns the count of records based on the provided options
      *
@@ -428,12 +429,12 @@ export declare class SqbEntityService<T extends object = object> extends Service
      */
     protected _getCommonFilter(command: SqbEntityService.CommandInfo): SQBAdapter.FilterInput | Promise<SQBAdapter.FilterInput> | undefined;
     protected _executeCommand(command: SqbEntityService.CommandInfo, commandFn: () => any): Promise<any>;
-    protected _beforeCreate(command: SqbEntityService.CreateCommand): Promise<void>;
+    protected _beforeCreate(command: SqbEntityService.CreateCommand<T>): Promise<void>;
     protected _beforeUpdate(command: SqbEntityService.UpdateOneCommand<T>): Promise<void>;
     protected _beforeUpdateMany(command: SqbEntityService.UpdateManyCommand<T>): Promise<void>;
     protected _beforeDelete(command: SqbEntityService.DeleteOneCommand): Promise<void>;
     protected _beforeDeleteMany(command: SqbEntityService.DeleteManyCommand): Promise<void>;
-    protected _afterCreate(command: SqbEntityService.CreateCommand, result: PartialDTO<T>): Promise<void>;
+    protected _afterCreate(command: SqbEntityService.CreateCommand<T>, result: PartialDTO<T>): Promise<void>;
     protected _afterUpdate(command: SqbEntityService.UpdateOneCommand<T>, result?: PartialDTO<T>): Promise<void>;
     protected _afterUpdateMany(command: SqbEntityService.UpdateManyCommand<T>, affected: number): Promise<void>;
     protected _afterDelete(command: SqbEntityService.DeleteOneCommand, affected: number): Promise<void>;

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

@@ -1,4 +1,4 @@
-import { PartialDTO, PatchDTO, RequiredSome, Type } from 'ts-gems';
+import type { PartialDTO, PatchDTO, RequiredSome, Type } from 'ts-gems';
 import { SQBAdapter } from './sqb-adapter.js';
 import { SqbEntityService } from './sqb-entity-service.js';
 /**