@opra/sqb 0.22.0 → 0.23.0

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

@@ -26,7 +26,7 @@ common_1.DocumentFactory.prototype.extractFieldSchema = async function (target,
     else if (sqbField.kind === 'column') {
         if (typeof sqbField.enum === 'object')
             metadata.enum = sqbField.enum;
-        if (sqbField.notNull)
+        if (target.required == null && sqbField.notNull)
             target.required = true;
         if (sqbField.type && Reflect.hasMetadata(common_1.METADATA_KEY, sqbField.type)) {
             target.type = sqbField.type;

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 { args, operation } = request;
+            const { params, operation } = request;
             let options = {};
             const entityMetadata = connect_1.EntityMetadata.get(resource.type.ctor);
             if (!entityMetadata)
@@ -29,27 +29,27 @@ var SQBAdapter;
             }
             if (operation === 'create' || operation === 'update' ||
                 operation === 'get' || operation === 'findMany') {
-                options.pick = args.pick?.length ? args.pick : undefined;
-                options.omit = args.omit?.length ? args.omit : undefined;
-                options.include = args.include?.length ? args.include : undefined;
+                options.pick = params?.pick;
+                options.omit = params?.omit;
+                options.include = params?.include;
             }
-            if (resource instanceof common_1.Collection && args.filter) {
-                options.filter = (0, transform_filter_js_1.default)(args.filter);
+            if (resource instanceof common_1.Collection && params?.filter) {
+                options.filter = (0, transform_filter_js_1.default)(params.filter);
             }
             if (operation === 'findMany') {
-                options.sort = args.sort?.length ? args.sort : undefined;
-                options.limit = args.limit;
-                options.offset = args.skip;
-                options.distinct = args.distinct;
-                options.count = args.count;
+                options.sort = params?.sort;
+                options.limit = params?.limit;
+                options.offset = params?.skip;
+                options.distinct = params?.distinct;
+                options.count = params?.count;
             }
             options = (0, lodash_omitby_1.default)(options, lodash_isnil_1.default);
             if (operation === 'create') {
                 return {
                     method: 'create',
-                    data: args.data,
+                    data: request.data,
                     options,
-                    args: [args.data, options]
+                    args: [request.data, options]
                 };
             }
             if (operation === 'deleteMany' || (operation === 'delete' && resource instanceof common_1.Singleton)) {
@@ -62,9 +62,9 @@ var SQBAdapter;
             if (operation === 'delete') {
                 return {
                     method: 'delete',
-                    key: args.key,
+                    key: request.key,
                     options,
-                    args: [args.key, options]
+                    args: [request.key, options]
                 };
             }
             if (operation === 'get') {
@@ -76,9 +76,9 @@ var SQBAdapter;
                     };
                 return {
                     method: 'find',
-                    key: args.key,
+                    key: request.key,
                     options,
-                    args: [args.key, options]
+                    args: [request.key, options]
                 };
             }
             if (operation === 'findMany') {
@@ -87,25 +87,24 @@ var SQBAdapter;
                     options,
                     args: [options]
                 };
-                if (args.count)
-                    out.count = args.count;
+                out.count = params?.count;
                 return out;
             }
             if (operation === 'updateMany' || (operation === 'update' && resource instanceof common_1.Singleton)) {
                 return {
                     method: 'updateMany',
-                    data: args.data,
+                    data: request.data,
                     options,
-                    args: [args.data, options]
+                    args: [request.data, options]
                 };
             }
             if (operation === 'update') {
                 return {
                     method: 'update',
-                    key: args.key,
-                    data: args.data,
+                    key: request.key,
+                    data: request.data,
                     options,
-                    args: [args.key, args.data, options]
+                    args: [request.key, request.data, options]
                 };
             }
         }

package/cjs/sqb-collection-resource.js

@@ -6,9 +6,9 @@ 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 extends core_1.CollectionResourceBase {
+class SqbCollectionResource {
     constructor(options) {
-        super(options);
+        this.defaultLimit = options?.defaultLimit || 100;
     }
     async create(ctx) {
         const prepared = sqb_adapter_js_1.SQBAdapter.transformRequest(ctx.request);
@@ -25,7 +25,7 @@ class SqbCollectionResource extends core_1.CollectionResourceBase {
         const service = await this.getService(ctx);
         return service.with(ctx).deleteMany(prepared.options);
     }
-    async find(ctx) {
+    async get(ctx) {
         const prepared = sqb_adapter_js_1.SQBAdapter.transformRequest(ctx.request);
         const service = await this.getService(ctx);
         return service.with(ctx).find(prepared.key, prepared.options);
@@ -79,7 +79,7 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object]),
     tslib_1.__metadata("design:returntype", Promise)
-], SqbCollectionResource.prototype, "find", null);
+], SqbCollectionResource.prototype, "get", null);
 tslib_1.__decorate([
     common_1.Collection.Update(),
     tslib_1.__metadata("design:type", Function),

package/cjs/sqb-singleton-resource.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqbSingletonResource = 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 {
     async create(ctx) {

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

@@ -24,7 +24,7 @@ DocumentFactory.prototype.extractFieldSchema = async function (target, ctor, met
     else if (sqbField.kind === 'column') {
         if (typeof sqbField.enum === 'object')
             metadata.enum = sqbField.enum;
-        if (sqbField.notNull)
+        if (target.required == null && sqbField.notNull)
             target.required = true;
         if (sqbField.type && Reflect.hasMetadata(METADATA_KEY, sqbField.type)) {
             target.type = sqbField.type;

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 { args, operation } = request;
+            const { params, operation } = request;
             let options = {};
             const entityMetadata = EntityMetadata.get(resource.type.ctor);
             if (!entityMetadata)
@@ -25,27 +25,27 @@ export var SQBAdapter;
             }
             if (operation === 'create' || operation === 'update' ||
                 operation === 'get' || operation === 'findMany') {
-                options.pick = args.pick?.length ? args.pick : undefined;
-                options.omit = args.omit?.length ? args.omit : undefined;
-                options.include = args.include?.length ? args.include : undefined;
+                options.pick = params?.pick;
+                options.omit = params?.omit;
+                options.include = params?.include;
             }
-            if (resource instanceof Collection && args.filter) {
-                options.filter = _transformFilter(args.filter);
+            if (resource instanceof Collection && params?.filter) {
+                options.filter = _transformFilter(params.filter);
             }
             if (operation === 'findMany') {
-                options.sort = args.sort?.length ? args.sort : undefined;
-                options.limit = args.limit;
-                options.offset = args.skip;
-                options.distinct = args.distinct;
-                options.count = args.count;
+                options.sort = params?.sort;
+                options.limit = params?.limit;
+                options.offset = params?.skip;
+                options.distinct = params?.distinct;
+                options.count = params?.count;
             }
             options = omitBy(options, isNil);
             if (operation === 'create') {
                 return {
                     method: 'create',
-                    data: args.data,
+                    data: request.data,
                     options,
-                    args: [args.data, options]
+                    args: [request.data, options]
                 };
             }
             if (operation === 'deleteMany' || (operation === 'delete' && resource instanceof Singleton)) {
@@ -58,9 +58,9 @@ export var SQBAdapter;
             if (operation === 'delete') {
                 return {
                     method: 'delete',
-                    key: args.key,
+                    key: request.key,
                     options,
-                    args: [args.key, options]
+                    args: [request.key, options]
                 };
             }
             if (operation === 'get') {
@@ -72,9 +72,9 @@ export var SQBAdapter;
                     };
                 return {
                     method: 'find',
-                    key: args.key,
+                    key: request.key,
                     options,
-                    args: [args.key, options]
+                    args: [request.key, options]
                 };
             }
             if (operation === 'findMany') {
@@ -83,25 +83,24 @@ export var SQBAdapter;
                     options,
                     args: [options]
                 };
-                if (args.count)
-                    out.count = args.count;
+                out.count = params?.count;
                 return out;
             }
             if (operation === 'updateMany' || (operation === 'update' && resource instanceof Singleton)) {
                 return {
                     method: 'updateMany',
-                    data: args.data,
+                    data: request.data,
                     options,
-                    args: [args.data, options]
+                    args: [request.data, options]
                 };
             }
             if (operation === 'update') {
                 return {
                     method: 'update',
-                    key: args.key,
-                    data: args.data,
+                    key: request.key,
+                    data: request.data,
                     options,
-                    args: [args.key, args.data, options]
+                    args: [request.key, request.data, options]
                 };
             }
         }

package/esm/sqb-collection-resource.js

@@ -1,11 +1,11 @@
 import { __decorate, __metadata } from "tslib";
 import { Collection } from '@opra/common';
-import { CollectionResourceBase } from '@opra/core';
+import { OperationContext } from '@opra/core';
 import { SQBAdapter } from './sqb-adapter.js';
 // noinspection TypeScriptAbstractClassConstructorCanBeMadeProtected
-export class SqbCollectionResource extends CollectionResourceBase {
+export class SqbCollectionResource {
     constructor(options) {
-        super(options);
+        this.defaultLimit = options?.defaultLimit || 100;
     }
     async create(ctx) {
         const prepared = SQBAdapter.transformRequest(ctx.request);
@@ -22,7 +22,7 @@ export class SqbCollectionResource extends CollectionResourceBase {
         const service = await this.getService(ctx);
         return service.with(ctx).deleteMany(prepared.options);
     }
-    async find(ctx) {
+    async get(ctx) {
         const prepared = SQBAdapter.transformRequest(ctx.request);
         const service = await this.getService(ctx);
         return service.with(ctx).find(prepared.key, prepared.options);
@@ -75,7 +75,7 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", Promise)
-], SqbCollectionResource.prototype, "find", null);
+], SqbCollectionResource.prototype, "get", null);
 __decorate([
     Collection.Update(),
     __metadata("design:type", Function),

package/esm/sqb-singleton-resource.js

@@ -1,5 +1,6 @@
 import { __decorate, __metadata } from "tslib";
 import { Singleton } from '@opra/common';
+import { OperationContext } from '@opra/core';
 import { SQBAdapter } from './sqb-adapter.js';
 export class SqbSingletonResource {
     async create(ctx) {

package/package.json

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

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

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

@@ -1,5 +1,5 @@
 import { Maybe, Type } from 'ts-gems';
-import { PartialInput, PartialOutput, RequestContext } from '@opra/core';
+import { OperationContext, 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: RequestContext;
+    context: OperationContext;
     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: RequestContext, db?: SqbClient | SqbConnection): SqbEntityService<T, TOutput>;
+    with(context: OperationContext, 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-resource.d.ts

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