@opra/sqb 0.23.2 → 0.24.0

package/cjs/augmentation/document-factory.augmentation.js

@@ -28,7 +28,7 @@ common_1.DocumentFactory.prototype.extractFieldSchema = async function (target,
             metadata.enum = sqbField.enum;
         if (target.required == null && sqbField.notNull)
             target.required = true;
-        if (sqbField.type && Reflect.hasMetadata(common_1.METADATA_KEY, sqbField.type)) {
+        if (sqbField.type && Reflect.hasMetadata(common_1.DATATYPE_METADATA, sqbField.type)) {
             target.type = sqbField.type;
         }
         switch (sqbField.dataType) {

package/cjs/augmentation/mapped-type.augmentation.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const common_1 = require("@opra/common");
 const connect_1 = require("@sqb/connect");
 const _applyMixin = common_1.MappedType._applyMixin;
-common_1.MappedType._applyMixin = function (target, source, options) {
-    _applyMixin.call(null, target, source, options);
-    const srcMeta = connect_1.Entity.getMetadata(source);
+common_1.MappedType._applyMixin = function (targetType, sourceType, options) {
+    _applyMixin.call(null, targetType, sourceType, options);
+    const srcMeta = connect_1.Entity.getMetadata(sourceType);
     if (srcMeta) {
-        const trgMeta = connect_1.EntityMetadata.define(target);
+        const trgMeta = connect_1.EntityMetadata.define(targetType);
         const { isInheritedPredicate } = options;
         connect_1.EntityMetadata.mixin(trgMeta, srcMeta, k => isInheritedPredicate(k));
     }

package/cjs/index.js

@@ -5,6 +5,6 @@ require("./augmentation/document-factory.augmentation.js");
 require("./augmentation/mapped-type.augmentation.js");
 require("./augmentation/union-type.augmentation.js");
 tslib_1.__exportStar(require("./sqb-adapter.js"), exports);
-tslib_1.__exportStar(require("./sqb-collection-resource.js"), exports);
+tslib_1.__exportStar(require("./sqb-collection.js"), exports);
 tslib_1.__exportStar(require("./sqb-entity-service.js"), exports);
-tslib_1.__exportStar(require("./sqb-singleton-resource.js"), exports);
+tslib_1.__exportStar(require("./sqb-singleton.js"), exports);

package/cjs/sqb-adapter.js

@@ -15,7 +15,7 @@ var SQBAdapter;
     function transformRequest(request) {
         const { resource } = request;
         if (resource instanceof common_1.Collection || resource instanceof common_1.Singleton) {
-            const { params, operation } = request;
+            const { params, endpoint } = request;
             let options = {};
             const entityMetadata = connect_1.EntityMetadata.get(resource.type.ctor);
             if (!entityMetadata)
@@ -27,8 +27,8 @@ var SQBAdapter;
                 if (primaryKeys.sort().join() !== [...resource.primaryKey].sort().join())
                     throw new Error('Resource primaryKey definition differs from SQB Entity primaryKey definition');
             }
-            if (operation === 'create' || operation === 'update' ||
-                operation === 'get' || operation === 'findMany') {
+            if (endpoint === 'create' || endpoint === 'update' ||
+                endpoint === 'get' || endpoint === 'findMany') {
                 options.pick = params?.pick;
                 options.omit = params?.omit;
                 options.include = params?.include;
@@ -36,7 +36,7 @@ var SQBAdapter;
             if (resource instanceof common_1.Collection && params?.filter) {
                 options.filter = (0, transform_filter_js_1.default)(params.filter);
             }
-            if (operation === 'findMany') {
+            if (endpoint === 'findMany') {
                 options.sort = params?.sort;
                 options.limit = params?.limit;
                 options.offset = params?.skip;
@@ -44,7 +44,7 @@ var SQBAdapter;
                 options.count = params?.count;
             }
             options = (0, lodash_omitby_1.default)(options, lodash_isnil_1.default);
-            if (operation === 'create') {
+            if (endpoint === 'create') {
                 return {
                     method: 'create',
                     data: request.data,
@@ -52,14 +52,14 @@ var SQBAdapter;
                     args: [request.data, options]
                 };
             }
-            if (operation === 'deleteMany' || (operation === 'delete' && resource instanceof common_1.Singleton)) {
+            if (endpoint === 'deleteMany' || (endpoint === 'delete' && resource instanceof common_1.Singleton)) {
                 return {
                     method: 'deleteMany',
                     options,
                     args: [options]
                 };
             }
-            if (operation === 'delete') {
+            if (endpoint === 'delete') {
                 return {
                     method: 'delete',
                     key: request.key,
@@ -67,7 +67,7 @@ var SQBAdapter;
                     args: [request.key, options]
                 };
             }
-            if (operation === 'get') {
+            if (endpoint === 'get') {
                 if (resource instanceof common_1.Singleton)
                     return {
                         method: 'findOne',
@@ -81,7 +81,7 @@ var SQBAdapter;
                     args: [request.key, options]
                 };
             }
-            if (operation === 'findMany') {
+            if (endpoint === 'findMany') {
                 const out = {
                     method: 'findMany',
                     options,
@@ -90,7 +90,7 @@ var SQBAdapter;
                 out.count = params?.count;
                 return out;
             }
-            if (operation === 'updateMany' || (operation === 'update' && resource instanceof common_1.Singleton)) {
+            if (endpoint === 'updateMany' || (endpoint === 'update' && resource instanceof common_1.Singleton)) {
                 return {
                     method: 'updateMany',
                     data: request.data,
@@ -98,7 +98,7 @@ var SQBAdapter;
                     args: [request.data, options]
                 };
             }
-            if (operation === 'update') {
+            if (endpoint === 'update') {
                 return {
                     method: 'update',
                     key: request.key,
@@ -108,7 +108,7 @@ var SQBAdapter;
                 };
             }
         }
-        throw new Error(`Unimplemented request method "${request.operation}"`);
+        throw new Error(`Unimplemented request method "${request.endpoint}"`);
     }
     SQBAdapter.transformRequest = transformRequest;
 })(SQBAdapter || (exports.SQBAdapter = SQBAdapter = {}));

package/cjs/{sqb-collection-resource.js → sqb-collection.js}

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SqbCollectionResource = void 0;
+exports.SqbCollection = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@opra/common");
-const core_1 = require("@opra/core");
 const sqb_adapter_js_1 = require("./sqb-adapter.js");
 // noinspection TypeScriptAbstractClassConstructorCanBeMadeProtected
-class SqbCollectionResource {
+class SqbCollection {
     constructor(options) {
         this.defaultLimit = options?.defaultLimit || 100;
     }
@@ -55,46 +54,25 @@ class SqbCollectionResource {
             return service.with(ctx).findMany(prepared.options);
     }
 }
-exports.SqbCollectionResource = SqbCollectionResource;
+exports.SqbCollection = SqbCollection;
 tslib_1.__decorate([
-    common_1.Collection.Create(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], SqbCollectionResource.prototype, "create", null);
+    common_1.Collection.Create()
+], SqbCollection.prototype, "create", null);
 tslib_1.__decorate([
-    common_1.Collection.Delete(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], SqbCollectionResource.prototype, "delete", null);
+    common_1.Collection.Delete()
+], SqbCollection.prototype, "delete", null);
 tslib_1.__decorate([
-    common_1.Collection.DeleteMany(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], SqbCollectionResource.prototype, "deleteMany", null);
+    common_1.Collection.DeleteMany()
+], SqbCollection.prototype, "deleteMany", null);
 tslib_1.__decorate([
-    common_1.Collection.Get(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], SqbCollectionResource.prototype, "get", null);
+    common_1.Collection.Get()
+], SqbCollection.prototype, "get", null);
 tslib_1.__decorate([
-    common_1.Collection.Update(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], SqbCollectionResource.prototype, "update", null);
+    common_1.Collection.Update()
+], SqbCollection.prototype, "update", null);
 tslib_1.__decorate([
-    common_1.Collection.UpdateMany(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], SqbCollectionResource.prototype, "updateMany", null);
+    common_1.Collection.UpdateMany()
+], SqbCollection.prototype, "updateMany", null);
 tslib_1.__decorate([
-    common_1.Collection.FindMany(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], SqbCollectionResource.prototype, "findMany", null);
+    common_1.Collection.FindMany()
+], SqbCollection.prototype, "findMany", null);

package/cjs/sqb-entity-service.js

@@ -36,7 +36,7 @@ class SqbEntityService {
         if (out && this.transformData)
             out = this.transformData(out);
         if (!out)
-            throw new Error('"create" operation returned no result!');
+            throw new Error('"create" endpoint returned no result!');
         return out;
     }
     async delete(keyValue, options) {

package/cjs/{sqb-singleton-resource.js → sqb-singleton.js}

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SqbSingletonResource = void 0;
+exports.SqbSingleton = void 0;
 const tslib_1 = require("tslib");
 const common_1 = require("@opra/common");
-const core_1 = require("@opra/core");
 const sqb_adapter_js_1 = require("./sqb-adapter.js");
-class SqbSingletonResource {
+class SqbSingleton {
     async create(ctx) {
         const prepared = sqb_adapter_js_1.SQBAdapter.transformRequest(ctx.request);
         const service = await this.getService(ctx);
@@ -28,28 +27,16 @@ class SqbSingletonResource {
         return service.with(ctx).findOne(prepared.options);
     }
 }
-exports.SqbSingletonResource = SqbSingletonResource;
+exports.SqbSingleton = SqbSingleton;
 tslib_1.__decorate([
-    common_1.Singleton.Create(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], SqbSingletonResource.prototype, "create", null);
+    common_1.Singleton.Create()
+], SqbSingleton.prototype, "create", null);
 tslib_1.__decorate([
-    common_1.Singleton.Delete(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], SqbSingletonResource.prototype, "delete", null);
+    common_1.Singleton.Delete()
+], SqbSingleton.prototype, "delete", null);
 tslib_1.__decorate([
-    common_1.Singleton.Get(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], SqbSingletonResource.prototype, "get", null);
+    common_1.Singleton.Get()
+], SqbSingleton.prototype, "get", null);
 tslib_1.__decorate([
-    common_1.Singleton.Update(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], SqbSingletonResource.prototype, "update", null);
+    common_1.Singleton.Update()
+], SqbSingleton.prototype, "update", null);

package/esm/augmentation/document-factory.augmentation.js

@@ -1,4 +1,4 @@
-import { DocumentFactory, METADATA_KEY } from "@opra/common";
+import { DATATYPE_METADATA, DocumentFactory } from "@opra/common";
 import { DataType as SqbDataType, EntityMetadata, isAssociationField } from '@sqb/connect';
 // @ts-ignore
 const _extractFieldSchema = DocumentFactory.prototype.extractFieldSchema;
@@ -26,7 +26,7 @@ DocumentFactory.prototype.extractFieldSchema = async function (target, ctor, met
             metadata.enum = sqbField.enum;
         if (target.required == null && sqbField.notNull)
             target.required = true;
-        if (sqbField.type && Reflect.hasMetadata(METADATA_KEY, sqbField.type)) {
+        if (sqbField.type && Reflect.hasMetadata(DATATYPE_METADATA, sqbField.type)) {
             target.type = sqbField.type;
         }
         switch (sqbField.dataType) {

package/esm/augmentation/mapped-type.augmentation.js

@@ -1,11 +1,11 @@
 import { MappedType } from "@opra/common";
 import { Entity, EntityMetadata } from '@sqb/connect';
 const _applyMixin = MappedType._applyMixin;
-MappedType._applyMixin = function (target, source, options) {
-    _applyMixin.call(null, target, source, options);
-    const srcMeta = Entity.getMetadata(source);
+MappedType._applyMixin = function (targetType, sourceType, options) {
+    _applyMixin.call(null, targetType, sourceType, options);
+    const srcMeta = Entity.getMetadata(sourceType);
     if (srcMeta) {
-        const trgMeta = EntityMetadata.define(target);
+        const trgMeta = EntityMetadata.define(targetType);
         const { isInheritedPredicate } = options;
         EntityMetadata.mixin(trgMeta, srcMeta, k => isInheritedPredicate(k));
     }

package/esm/index.js

@@ -2,6 +2,6 @@ import './augmentation/document-factory.augmentation.js';
 import './augmentation/mapped-type.augmentation.js';
 import './augmentation/union-type.augmentation.js';
 export * from './sqb-adapter.js';
-export * from './sqb-collection-resource.js';
+export * from './sqb-collection.js';
 export * from './sqb-entity-service.js';
-export * from './sqb-singleton-resource.js';
+export * from './sqb-singleton.js';

package/esm/sqb-adapter.js

@@ -11,7 +11,7 @@ export var SQBAdapter;
     function transformRequest(request) {
         const { resource } = request;
         if (resource instanceof Collection || resource instanceof Singleton) {
-            const { params, operation } = request;
+            const { params, endpoint } = request;
             let options = {};
             const entityMetadata = EntityMetadata.get(resource.type.ctor);
             if (!entityMetadata)
@@ -23,8 +23,8 @@ export var SQBAdapter;
                 if (primaryKeys.sort().join() !== [...resource.primaryKey].sort().join())
                     throw new Error('Resource primaryKey definition differs from SQB Entity primaryKey definition');
             }
-            if (operation === 'create' || operation === 'update' ||
-                operation === 'get' || operation === 'findMany') {
+            if (endpoint === 'create' || endpoint === 'update' ||
+                endpoint === 'get' || endpoint === 'findMany') {
                 options.pick = params?.pick;
                 options.omit = params?.omit;
                 options.include = params?.include;
@@ -32,7 +32,7 @@ export var SQBAdapter;
             if (resource instanceof Collection && params?.filter) {
                 options.filter = _transformFilter(params.filter);
             }
-            if (operation === 'findMany') {
+            if (endpoint === 'findMany') {
                 options.sort = params?.sort;
                 options.limit = params?.limit;
                 options.offset = params?.skip;
@@ -40,7 +40,7 @@ export var SQBAdapter;
                 options.count = params?.count;
             }
             options = omitBy(options, isNil);
-            if (operation === 'create') {
+            if (endpoint === 'create') {
                 return {
                     method: 'create',
                     data: request.data,
@@ -48,14 +48,14 @@ export var SQBAdapter;
                     args: [request.data, options]
                 };
             }
-            if (operation === 'deleteMany' || (operation === 'delete' && resource instanceof Singleton)) {
+            if (endpoint === 'deleteMany' || (endpoint === 'delete' && resource instanceof Singleton)) {
                 return {
                     method: 'deleteMany',
                     options,
                     args: [options]
                 };
             }
-            if (operation === 'delete') {
+            if (endpoint === 'delete') {
                 return {
                     method: 'delete',
                     key: request.key,
@@ -63,7 +63,7 @@ export var SQBAdapter;
                     args: [request.key, options]
                 };
             }
-            if (operation === 'get') {
+            if (endpoint === 'get') {
                 if (resource instanceof Singleton)
                     return {
                         method: 'findOne',
@@ -77,7 +77,7 @@ export var SQBAdapter;
                     args: [request.key, options]
                 };
             }
-            if (operation === 'findMany') {
+            if (endpoint === 'findMany') {
                 const out = {
                     method: 'findMany',
                     options,
@@ -86,7 +86,7 @@ export var SQBAdapter;
                 out.count = params?.count;
                 return out;
             }
-            if (operation === 'updateMany' || (operation === 'update' && resource instanceof Singleton)) {
+            if (endpoint === 'updateMany' || (endpoint === 'update' && resource instanceof Singleton)) {
                 return {
                     method: 'updateMany',
                     data: request.data,
@@ -94,7 +94,7 @@ export var SQBAdapter;
                     args: [request.data, options]
                 };
             }
-            if (operation === 'update') {
+            if (endpoint === 'update') {
                 return {
                     method: 'update',
                     key: request.key,
@@ -104,7 +104,7 @@ export var SQBAdapter;
                 };
             }
         }
-        throw new Error(`Unimplemented request method "${request.operation}"`);
+        throw new Error(`Unimplemented request method "${request.endpoint}"`);
     }
     SQBAdapter.transformRequest = transformRequest;
 })(SQBAdapter || (SQBAdapter = {}));

package/esm/{sqb-collection-resource.js → sqb-collection.js}

@@ -1,9 +1,8 @@
-import { __decorate, __metadata } from "tslib";
+import { __decorate } from "tslib";
 import { Collection } from '@opra/common';
-import { OperationContext } from '@opra/core';
 import { SQBAdapter } from './sqb-adapter.js';
 // noinspection TypeScriptAbstractClassConstructorCanBeMadeProtected
-export class SqbCollectionResource {
+export class SqbCollection {
     constructor(options) {
         this.defaultLimit = options?.defaultLimit || 100;
     }
@@ -53,44 +52,23 @@ export class SqbCollectionResource {
     }
 }
 __decorate([
-    Collection.Create(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], SqbCollectionResource.prototype, "create", null);
+    Collection.Create()
+], SqbCollection.prototype, "create", null);
 __decorate([
-    Collection.Delete(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], SqbCollectionResource.prototype, "delete", null);
+    Collection.Delete()
+], SqbCollection.prototype, "delete", null);
 __decorate([
-    Collection.DeleteMany(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], SqbCollectionResource.prototype, "deleteMany", null);
+    Collection.DeleteMany()
+], SqbCollection.prototype, "deleteMany", null);
 __decorate([
-    Collection.Get(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], SqbCollectionResource.prototype, "get", null);
+    Collection.Get()
+], SqbCollection.prototype, "get", null);
 __decorate([
-    Collection.Update(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], SqbCollectionResource.prototype, "update", null);
+    Collection.Update()
+], SqbCollection.prototype, "update", null);
 __decorate([
-    Collection.UpdateMany(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], SqbCollectionResource.prototype, "updateMany", null);
+    Collection.UpdateMany()
+], SqbCollection.prototype, "updateMany", null);
 __decorate([
-    Collection.FindMany(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], SqbCollectionResource.prototype, "findMany", null);
+    Collection.FindMany()
+], SqbCollection.prototype, "findMany", null);

package/esm/sqb-entity-service.js

@@ -33,7 +33,7 @@ export class SqbEntityService {
         if (out && this.transformData)
             out = this.transformData(out);
         if (!out)
-            throw new Error('"create" operation returned no result!');
+            throw new Error('"create" endpoint returned no result!');
         return out;
     }
     async delete(keyValue, options) {

package/esm/{sqb-singleton-resource.js → sqb-singleton.js}

@@ -1,8 +1,7 @@
-import { __decorate, __metadata } from "tslib";
+import { __decorate } from "tslib";
 import { Singleton } from '@opra/common';
-import { OperationContext } from '@opra/core';
 import { SQBAdapter } from './sqb-adapter.js';
-export class SqbSingletonResource {
+export class SqbSingleton {
     async create(ctx) {
         const prepared = SQBAdapter.transformRequest(ctx.request);
         const service = await this.getService(ctx);
@@ -26,26 +25,14 @@ export class SqbSingletonResource {
     }
 }
 __decorate([
-    Singleton.Create(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], SqbSingletonResource.prototype, "create", null);
+    Singleton.Create()
+], SqbSingleton.prototype, "create", null);
 __decorate([
-    Singleton.Delete(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], SqbSingletonResource.prototype, "delete", null);
+    Singleton.Delete()
+], SqbSingleton.prototype, "delete", null);
 __decorate([
-    Singleton.Get(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], SqbSingletonResource.prototype, "get", null);
+    Singleton.Get()
+], SqbSingleton.prototype, "get", null);
 __decorate([
-    Singleton.Update(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Object]),
-    __metadata("design:returntype", Promise)
-], SqbSingletonResource.prototype, "update", null);
+    Singleton.Update()
+], SqbSingleton.prototype, "update", null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/sqb",
-  "version": "0.23.2",
+  "version": "0.24.0",
   "description": "Opra SQB adapter package",
   "author": "Panates",
   "license": "MIT",
@@ -37,7 +37,7 @@
     "ts-gems": "^2.4.1"
   },
   "peerDependencies": {
-    "@opra/core": "^0.23.2",
+    "@opra/core": "^0.24.0",
     "@sqb/connect": ">= 4.9.0"
   },
   "type": "module",

package/types/index.d.ts

@@ -2,6 +2,6 @@ import './augmentation/document-factory.augmentation.js';
 import './augmentation/mapped-type.augmentation.js';
 import './augmentation/union-type.augmentation.js';
 export * from './sqb-adapter.js';
-export * from './sqb-collection-resource.js';
+export * from './sqb-collection.js';
 export * from './sqb-entity-service.js';
-export * from './sqb-singleton-resource.js';
+export * from './sqb-singleton.js';

package/types/sqb-collection.d.ts

@@ -0,0 +1,21 @@
+import { Maybe } from 'ts-gems';
+import { PartialOutput } from '@opra/common';
+import { EndpointContext } from '@opra/core';
+import { SqbEntityService } from './sqb-entity-service.js';
+export declare namespace SqbCollection {
+    interface Options {
+        defaultLimit?: number;
+    }
+}
+export declare abstract class SqbCollection<T, TOutput = PartialOutput<T>> {
+    defaultLimit?: number;
+    constructor(options?: SqbCollection.Options);
+    create(ctx: EndpointContext): Promise<TOutput>;
+    delete(ctx: EndpointContext): Promise<boolean>;
+    deleteMany(ctx: EndpointContext): Promise<number>;
+    get(ctx: EndpointContext): Promise<Maybe<TOutput>>;
+    update(ctx: EndpointContext): Promise<Maybe<TOutput>>;
+    updateMany(ctx: EndpointContext): Promise<number>;
+    findMany(ctx: EndpointContext): Promise<TOutput[]>;
+    abstract getService(ctx: EndpointContext): SqbEntityService<T, TOutput> | Promise<SqbEntityService<T, TOutput>>;
+}

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

@@ -1,5 +1,5 @@
 import { Maybe, Type } from 'ts-gems';
-import { OperationContext, PartialInput, PartialOutput } from '@opra/core';
+import { EndpointContext, PartialInput, PartialOutput } from '@opra/core';
 import { EntityInput, Repository, SqbClient, SqbConnection } from '@sqb/connect';
 export declare namespace SqbEntityService {
     interface Options {
@@ -9,7 +9,7 @@ export declare namespace SqbEntityService {
 }
 export declare class SqbEntityService<T, TOutput = PartialOutput<T>> {
     readonly typeClass: Type<T>;
-    context: OperationContext;
+    context: EndpointContext;
     defaultLimit: number;
     db?: SqbClient | SqbConnection;
     constructor(typeClass: Type<T>, options?: SqbEntityService.Options);
@@ -23,7 +23,7 @@ export declare class SqbEntityService<T, TOutput = PartialOutput<T>> {
     exists(options?: Repository.ExistsOptions): Promise<boolean>;
     update(keyValue: any, data: EntityInput<T>, options?: Repository.UpdateOptions): Promise<Maybe<TOutput>>;
     updateMany(data: PartialInput<T>, options?: Repository.UpdateManyOptions): Promise<number>;
-    with(context: OperationContext, db?: SqbClient | SqbConnection): SqbEntityService<T, TOutput>;
+    with(context: EndpointContext, db?: SqbClient | SqbConnection): SqbEntityService<T, TOutput>;
     protected _onError(error: unknown): Promise<void>;
     protected getConnection(): SqbConnection | SqbClient | Promise<SqbConnection | SqbClient>;
     protected onError?(error: unknown): void | Promise<void>;

package/types/sqb-singleton.d.ts

@@ -0,0 +1,11 @@
+import { Maybe } from 'ts-gems';
+import { PartialOutput } from '@opra/common';
+import { EndpointContext } from '@opra/core';
+import { SqbEntityService } from './sqb-entity-service.js';
+export declare abstract class SqbSingleton<T> {
+    create(ctx: EndpointContext): Promise<PartialOutput<T>>;
+    delete(ctx: EndpointContext): Promise<boolean>;
+    get(ctx: EndpointContext): Promise<Maybe<PartialOutput<T>>>;
+    update(ctx: EndpointContext): Promise<Maybe<PartialOutput<T>>>;
+    abstract getService(req: EndpointContext): SqbEntityService<T> | Promise<SqbEntityService<T>>;
+}

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

@@ -1,21 +0,0 @@
-import { Maybe } from 'ts-gems';
-import { PartialOutput } from '@opra/common';
-import { OperationContext } from '@opra/core';
-import { SqbEntityService } from './sqb-entity-service.js';
-export declare namespace SqbCollectionResource {
-    interface Options {
-        defaultLimit?: number;
-    }
-}
-export declare abstract class SqbCollectionResource<T, TOutput = PartialOutput<T>> {
-    defaultLimit?: number;
-    constructor(options?: SqbCollectionResource.Options);
-    create(ctx: OperationContext): Promise<TOutput>;
-    delete(ctx: OperationContext): Promise<boolean>;
-    deleteMany(ctx: OperationContext): Promise<number>;
-    get(ctx: OperationContext): Promise<Maybe<TOutput>>;
-    update(ctx: OperationContext): Promise<Maybe<TOutput>>;
-    updateMany(ctx: OperationContext): Promise<number>;
-    findMany(ctx: OperationContext): Promise<TOutput[]>;
-    abstract getService(ctx: OperationContext): SqbEntityService<T, TOutput> | Promise<SqbEntityService<T, TOutput>>;
-}

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

@@ -1,11 +0,0 @@
-import { Maybe } from 'ts-gems';
-import { PartialOutput } from '@opra/common';
-import { OperationContext } from '@opra/core';
-import { SqbEntityService } from './sqb-entity-service.js';
-export declare abstract class SqbSingletonResource<T> {
-    create(ctx: OperationContext): Promise<PartialOutput<T>>;
-    delete(ctx: OperationContext): Promise<boolean>;
-    get(ctx: OperationContext): Promise<Maybe<PartialOutput<T>>>;
-    update(ctx: OperationContext): Promise<Maybe<PartialOutput<T>>>;
-    abstract getService(req: OperationContext): SqbEntityService<T> | Promise<SqbEntityService<T>>;
-}