npm - @opra/sqb - Versions diffs - 0.25.4 → 0.26.0 - Mend

@opra/sqb 0.25.4 → 0.26.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/cjs/augmentation/api-document-factory.augmentation.js +20 -0
package/cjs/augmentation/type-document-factory.augmentation.js +99 -0
package/cjs/index.js +2 -1
package/cjs/sqb-adapter.js +12 -12
package/esm/augmentation/api-document-factory.augmentation.js +18 -0
package/esm/augmentation/type-document-factory.augmentation.js +97 -0
package/esm/index.js +2 -1
package/esm/sqb-adapter.js +12 -12
package/package.json +3 -3
package/types/augmentation/type-document-factory.augmentation.d.ts +1 -0
package/types/index.d.ts +2 -1
package/types/sqb-collection.d.ts +9 -9
package/types/sqb-entity-service.d.ts +3 -3
package/types/sqb-singleton.d.ts +6 -6
package/cjs/augmentation/document-factory.augmentation.js +0 -116
package/esm/augmentation/document-factory.augmentation.js +0 -114
/package/types/augmentation/{document-factory.augmentation.d.ts → api-document-factory.augmentation.d.ts} +0 -0

package/cjs/augmentation/api-document-factory.augmentation.js ADDED Viewed

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const common_1 = require("@opra/common");
+const connect_1 = require("@sqb/connect");
+// @ts-ignore
+const _createResource = common_1.ApiDocumentFactory.prototype.createResource;
+// @ts-ignore
+common_1.ApiDocumentFactory.prototype.createResource = function (container, initArguments) {
+    // Determine primaryKey if not defined
+    if (initArguments.kind === 'Collection' && !initArguments.primaryKey && initArguments.type.ctor) {
+        const entityMetadata = connect_1.EntityMetadata.get(initArguments.type.ctor);
+        if (entityMetadata?.indexes) {
+            const primaryIndex = entityMetadata.indexes.find(x => x.primary);
+            if (primaryIndex) {
+                initArguments.primaryKey = primaryIndex.columns;
+            }
+        }
+    }
+    return _createResource.call(this, container, initArguments);
+};

package/cjs/augmentation/type-document-factory.augmentation.js ADDED Viewed

@@ -0,0 +1,99 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const common_1 = require("@opra/common");
+const connect_1 = require("@sqb/connect");
+// @ts-ignore
+const _prepareDataTypeInitArguments = common_1.TypeDocumentFactory.prototype.prepareDataTypeInitArguments;
+// @ts-ignore
+common_1.TypeDocumentFactory.prototype.prepareDataTypeInitArguments = async function (schema, ctor) {
+    if (ctor && schema.kind === 'ComplexType' && schema.fields) {
+        const sqbMeta = connect_1.EntityMetadata.get(ctor);
+        for (const [fieldName, fieldSchema] of Object.entries(schema.fields)) {
+            const sqbField = sqbMeta && connect_1.EntityMetadata.getField(sqbMeta, fieldName);
+            if (!sqbField)
+                continue;
+            const detectType = !fieldSchema.type;
+            if ((0, connect_1.isAssociationField)(sqbField)) {
+                if (!fieldSchema.type) {
+                    const trg = await sqbField.association.resolveTarget();
+                    if (trg) {
+                        fieldSchema.type = await this.importDataType(trg.ctor);
+                    }
+                }
+            }
+            else if (sqbField.kind === 'column') {
+                if (typeof sqbField.enum === 'object')
+                    fieldSchema.enum = sqbField.enum;
+                if (fieldSchema.required == null && sqbField.notNull)
+                    fieldSchema.required = true;
+                if (sqbField.type && Reflect.hasMetadata(common_1.DATATYPE_METADATA, sqbField.type)) {
+                    fieldSchema.type = sqbField.type;
+                }
+                switch (sqbField.dataType) {
+                    case connect_1.DataType.GUID:
+                        if (!fieldSchema.type || (detectType && fieldSchema.type === 'string'))
+                            fieldSchema.type = 'uuid';
+                        break;
+                    case connect_1.DataType.JSON:
+                        if (!fieldSchema.type || (detectType && fieldSchema.type === 'any'))
+                            fieldSchema.type = 'object';
+                        break;
+                    case connect_1.DataType.INTEGER:
+                    case connect_1.DataType.SMALLINT:
+                        if (!fieldSchema.type || (detectType && fieldSchema.type === 'number'))
+                            fieldSchema.type = 'integer';
+                        break;
+                    case connect_1.DataType.BIGINT:
+                        if (!fieldSchema.type || (detectType && fieldSchema.type === 'number'))
+                            fieldSchema.type = 'bigint';
+                        break;
+                    case connect_1.DataType.DATE:
+                        if (!fieldSchema.type || (detectType && (fieldSchema.type === 'timestamp' || fieldSchema.type === 'string')))
+                            fieldSchema.type = 'date';
+                        break;
+                    case connect_1.DataType.TIMESTAMPTZ:
+                        if (!fieldSchema.type || (detectType && (fieldSchema.type === 'timestamp' || fieldSchema.type === 'string')))
+                            fieldSchema.type = 'timestamptz';
+                        break;
+                    case connect_1.DataType.TIME:
+                        if (!fieldSchema.type || (detectType && (fieldSchema.type === 'timestamp' || fieldSchema.type === 'string')))
+                            fieldSchema.type = 'time';
+                        break;
+                    case connect_1.DataType.BINARY:
+                        if (!fieldSchema.type || (detectType && fieldSchema.type === 'string'))
+                            fieldSchema.type = 'base64';
+                        break;
+                }
+                if (!fieldSchema.type) {
+                    switch (sqbField.dataType) {
+                        case connect_1.DataType.BOOL:
+                            fieldSchema.type = 'boolean';
+                            break;
+                        case connect_1.DataType.CHAR:
+                        case connect_1.DataType.VARCHAR:
+                        case connect_1.DataType.TEXT:
+                            fieldSchema.type = 'string';
+                            break;
+                        case connect_1.DataType.FLOAT:
+                        case connect_1.DataType.DOUBLE:
+                        case connect_1.DataType.NUMBER:
+                            fieldSchema.type = 'number';
+                            break;
+                        case connect_1.DataType.TIMESTAMP:
+                            fieldSchema.type = 'timestamp';
+                            break;
+                    }
+                }
+                if (sqbField.notNull && fieldSchema.required === undefined)
+                    fieldSchema.required = sqbField.notNull;
+                if (sqbField.exclusive && fieldSchema.exclusive === undefined)
+                    fieldSchema.exclusive = sqbField.exclusive;
+                if (sqbField.default !== undefined && fieldSchema.default === undefined)
+                    fieldSchema.default = sqbField.default;
+            }
+            if (sqbField.exclusive && fieldSchema.exclusive === undefined)
+                fieldSchema.exclusive = sqbField.exclusive;
+        }
+    }
+    return await _prepareDataTypeInitArguments.call(this, schema, ctor);
+};

package/cjs/index.js CHANGED Viewed

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-require("./augmentation/document-factory.augmentation.js");
+require("./augmentation/type-document-factory.augmentation.js");
+require("./augmentation/api-document-factory.augmentation.js");
 require("./augmentation/mapped-type.augmentation.js");
 require("./augmentation/union-type.augmentation.js");
 tslib_1.__exportStar(require("./sqb-adapter.js"), exports);

package/cjs/sqb-adapter.js CHANGED Viewed

@@ -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, endpoint } = request;
+            const { params, operation } = 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 (endpoint === 'create' || endpoint === 'update' ||
-                endpoint === 'get' || endpoint === 'findMany') {
+            if (operation === 'create' || operation === 'update' ||
+                operation === 'get' || operation === '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 (endpoint === 'findMany') {
+            if (operation === '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 (endpoint === 'create') {
+            if (operation === 'create') {
                 return {
                     method: 'create',
                     data: request.data,
@@ -52,14 +52,14 @@ var SQBAdapter;
                     args: [request.data, options]
                 };
             }
-            if (endpoint === 'deleteMany' || (endpoint === 'delete' && resource instanceof common_1.Singleton)) {
+            if (operation === 'deleteMany' || (operation === 'delete' && resource instanceof common_1.Singleton)) {
                 return {
                     method: 'deleteMany',
                     options,
                     args: [options]
                 };
             }
-            if (endpoint === 'delete') {
+            if (operation === 'delete') {
                 return {
                     method: 'delete',
                     key: request.key,
@@ -67,7 +67,7 @@ var SQBAdapter;
                     args: [request.key, options]
                 };
             }
-            if (endpoint === 'get') {
+            if (operation === 'get') {
                 if (resource instanceof common_1.Singleton)
                     return {
                         method: 'findOne',
@@ -81,7 +81,7 @@ var SQBAdapter;
                     args: [request.key, options]
                 };
             }
-            if (endpoint === 'findMany') {
+            if (operation === 'findMany') {
                 const out = {
                     method: 'findMany',
                     options,
@@ -90,7 +90,7 @@ var SQBAdapter;
                 out.count = params?.count;
                 return out;
             }
-            if (endpoint === 'updateMany' || (endpoint === 'update' && resource instanceof common_1.Singleton)) {
+            if (operation === 'updateMany' || (operation === 'update' && resource instanceof common_1.Singleton)) {
                 return {
                     method: 'updateMany',
                     data: request.data,
@@ -98,7 +98,7 @@ var SQBAdapter;
                     args: [request.data, options]
                 };
             }
-            if (endpoint === 'update') {
+            if (operation === 'update') {
                 return {
                     method: 'update',
                     key: request.key,
@@ -108,7 +108,7 @@ var SQBAdapter;
                 };
             }
         }
-        throw new Error(`Unimplemented request method "${request.endpoint}"`);
+        throw new Error(`Unimplemented request method "${request.operation}"`);
     }
     SQBAdapter.transformRequest = transformRequest;
 })(SQBAdapter || (exports.SQBAdapter = SQBAdapter = {}));

package/esm/augmentation/api-document-factory.augmentation.js ADDED Viewed

@@ -0,0 +1,18 @@
+import { ApiDocumentFactory } from '@opra/common';
+import { EntityMetadata } from '@sqb/connect';
+// @ts-ignore
+const _createResource = ApiDocumentFactory.prototype.createResource;
+// @ts-ignore
+ApiDocumentFactory.prototype.createResource = function (container, initArguments) {
+    // Determine primaryKey if not defined
+    if (initArguments.kind === 'Collection' && !initArguments.primaryKey && initArguments.type.ctor) {
+        const entityMetadata = EntityMetadata.get(initArguments.type.ctor);
+        if (entityMetadata?.indexes) {
+            const primaryIndex = entityMetadata.indexes.find(x => x.primary);
+            if (primaryIndex) {
+                initArguments.primaryKey = primaryIndex.columns;
+            }
+        }
+    }
+    return _createResource.call(this, container, initArguments);
+};

package/esm/augmentation/type-document-factory.augmentation.js ADDED Viewed

@@ -0,0 +1,97 @@
+import { DATATYPE_METADATA, TypeDocumentFactory } from "@opra/common";
+import { DataType as SqbDataType, EntityMetadata, isAssociationField } from '@sqb/connect';
+// @ts-ignore
+const _prepareDataTypeInitArguments = TypeDocumentFactory.prototype.prepareDataTypeInitArguments;
+// @ts-ignore
+TypeDocumentFactory.prototype.prepareDataTypeInitArguments = async function (schema, ctor) {
+    if (ctor && schema.kind === 'ComplexType' && schema.fields) {
+        const sqbMeta = EntityMetadata.get(ctor);
+        for (const [fieldName, fieldSchema] of Object.entries(schema.fields)) {
+            const sqbField = sqbMeta && EntityMetadata.getField(sqbMeta, fieldName);
+            if (!sqbField)
+                continue;
+            const detectType = !fieldSchema.type;
+            if (isAssociationField(sqbField)) {
+                if (!fieldSchema.type) {
+                    const trg = await sqbField.association.resolveTarget();
+                    if (trg) {
+                        fieldSchema.type = await this.importDataType(trg.ctor);
+                    }
+                }
+            }
+            else if (sqbField.kind === 'column') {
+                if (typeof sqbField.enum === 'object')
+                    fieldSchema.enum = sqbField.enum;
+                if (fieldSchema.required == null && sqbField.notNull)
+                    fieldSchema.required = true;
+                if (sqbField.type && Reflect.hasMetadata(DATATYPE_METADATA, sqbField.type)) {
+                    fieldSchema.type = sqbField.type;
+                }
+                switch (sqbField.dataType) {
+                    case SqbDataType.GUID:
+                        if (!fieldSchema.type || (detectType && fieldSchema.type === 'string'))
+                            fieldSchema.type = 'uuid';
+                        break;
+                    case SqbDataType.JSON:
+                        if (!fieldSchema.type || (detectType && fieldSchema.type === 'any'))
+                            fieldSchema.type = 'object';
+                        break;
+                    case SqbDataType.INTEGER:
+                    case SqbDataType.SMALLINT:
+                        if (!fieldSchema.type || (detectType && fieldSchema.type === 'number'))
+                            fieldSchema.type = 'integer';
+                        break;
+                    case SqbDataType.BIGINT:
+                        if (!fieldSchema.type || (detectType && fieldSchema.type === 'number'))
+                            fieldSchema.type = 'bigint';
+                        break;
+                    case SqbDataType.DATE:
+                        if (!fieldSchema.type || (detectType && (fieldSchema.type === 'timestamp' || fieldSchema.type === 'string')))
+                            fieldSchema.type = 'date';
+                        break;
+                    case SqbDataType.TIMESTAMPTZ:
+                        if (!fieldSchema.type || (detectType && (fieldSchema.type === 'timestamp' || fieldSchema.type === 'string')))
+                            fieldSchema.type = 'timestamptz';
+                        break;
+                    case SqbDataType.TIME:
+                        if (!fieldSchema.type || (detectType && (fieldSchema.type === 'timestamp' || fieldSchema.type === 'string')))
+                            fieldSchema.type = 'time';
+                        break;
+                    case SqbDataType.BINARY:
+                        if (!fieldSchema.type || (detectType && fieldSchema.type === 'string'))
+                            fieldSchema.type = 'base64';
+                        break;
+                }
+                if (!fieldSchema.type) {
+                    switch (sqbField.dataType) {
+                        case SqbDataType.BOOL:
+                            fieldSchema.type = 'boolean';
+                            break;
+                        case SqbDataType.CHAR:
+                        case SqbDataType.VARCHAR:
+                        case SqbDataType.TEXT:
+                            fieldSchema.type = 'string';
+                            break;
+                        case SqbDataType.FLOAT:
+                        case SqbDataType.DOUBLE:
+                        case SqbDataType.NUMBER:
+                            fieldSchema.type = 'number';
+                            break;
+                        case SqbDataType.TIMESTAMP:
+                            fieldSchema.type = 'timestamp';
+                            break;
+                    }
+                }
+                if (sqbField.notNull && fieldSchema.required === undefined)
+                    fieldSchema.required = sqbField.notNull;
+                if (sqbField.exclusive && fieldSchema.exclusive === undefined)
+                    fieldSchema.exclusive = sqbField.exclusive;
+                if (sqbField.default !== undefined && fieldSchema.default === undefined)
+                    fieldSchema.default = sqbField.default;
+            }
+            if (sqbField.exclusive && fieldSchema.exclusive === undefined)
+                fieldSchema.exclusive = sqbField.exclusive;
+        }
+    }
+    return await _prepareDataTypeInitArguments.call(this, schema, ctor);
+};

package/esm/index.js CHANGED Viewed

@@ -1,4 +1,5 @@
-import './augmentation/document-factory.augmentation.js';
+import './augmentation/type-document-factory.augmentation.js';
+import './augmentation/api-document-factory.augmentation.js';
 import './augmentation/mapped-type.augmentation.js';
 import './augmentation/union-type.augmentation.js';
 export * from './sqb-adapter.js';

package/esm/sqb-adapter.js CHANGED Viewed

@@ -11,7 +11,7 @@ export var SQBAdapter;
     function transformRequest(request) {
         const { resource } = request;
         if (resource instanceof Collection || resource instanceof Singleton) {
-            const { params, endpoint } = request;
+            const { params, operation } = 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 (endpoint === 'create' || endpoint === 'update' ||
-                endpoint === 'get' || endpoint === 'findMany') {
+            if (operation === 'create' || operation === 'update' ||
+                operation === 'get' || operation === '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 (endpoint === 'findMany') {
+            if (operation === '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 (endpoint === 'create') {
+            if (operation === 'create') {
                 return {
                     method: 'create',
                     data: request.data,
@@ -48,14 +48,14 @@ export var SQBAdapter;
                     args: [request.data, options]
                 };
             }
-            if (endpoint === 'deleteMany' || (endpoint === 'delete' && resource instanceof Singleton)) {
+            if (operation === 'deleteMany' || (operation === 'delete' && resource instanceof Singleton)) {
                 return {
                     method: 'deleteMany',
                     options,
                     args: [options]
                 };
             }
-            if (endpoint === 'delete') {
+            if (operation === 'delete') {
                 return {
                     method: 'delete',
                     key: request.key,
@@ -63,7 +63,7 @@ export var SQBAdapter;
                     args: [request.key, options]
                 };
             }
-            if (endpoint === 'get') {
+            if (operation === 'get') {
                 if (resource instanceof Singleton)
                     return {
                         method: 'findOne',
@@ -77,7 +77,7 @@ export var SQBAdapter;
                     args: [request.key, options]
                 };
             }
-            if (endpoint === 'findMany') {
+            if (operation === 'findMany') {
                 const out = {
                     method: 'findMany',
                     options,
@@ -86,7 +86,7 @@ export var SQBAdapter;
                 out.count = params?.count;
                 return out;
             }
-            if (endpoint === 'updateMany' || (endpoint === 'update' && resource instanceof Singleton)) {
+            if (operation === 'updateMany' || (operation === 'update' && resource instanceof Singleton)) {
                 return {
                     method: 'updateMany',
                     data: request.data,
@@ -94,7 +94,7 @@ export var SQBAdapter;
                     args: [request.data, options]
                 };
             }
-            if (endpoint === 'update') {
+            if (operation === 'update') {
                 return {
                     method: 'update',
                     key: request.key,
@@ -104,7 +104,7 @@ export var SQBAdapter;
                 };
             }
         }
-        throw new Error(`Unimplemented request method "${request.endpoint}"`);
+        throw new Error(`Unimplemented request method "${request.operation}"`);
     }
     SQBAdapter.transformRequest = transformRequest;
 })(SQBAdapter || (SQBAdapter = {}));

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@opra/sqb",
-  "version": "0.25.4",
+  "version": "0.26.0",
   "description": "Opra SQB adapter package",
   "author": "Panates",
   "license": "MIT",
@@ -34,10 +34,10 @@
     "@sqb/connect": "^4.9.1",
     "@sqb/postgres": "^4.9.1",
     "postgresql-client": "^2.7.1",
-    "ts-gems": "^2.4.1"
+    "ts-gems": "^2.5.0"
   },
   "peerDependencies": {
-    "@opra/core": "^0.25.4",
+    "@opra/core": "^0.26.0",
     "@sqb/connect": ">= 4.9.0"
   },
   "type": "module",

package/types/augmentation/type-document-factory.augmentation.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export {};

package/types/index.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
-import './augmentation/document-factory.augmentation.js';
+import './augmentation/type-document-factory.augmentation.js';
+import './augmentation/api-document-factory.augmentation.js';
 import './augmentation/mapped-type.augmentation.js';
 import './augmentation/union-type.augmentation.js';
 export * from './sqb-adapter.js';

package/types/sqb-collection.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { Maybe } from 'ts-gems';
 import { PartialOutput } from '@opra/common';
-import { EndpointContext } from '@opra/core';
+import { RequestContext } from '@opra/core';
 import { SqbEntityService } from './sqb-entity-service.js';
 export declare namespace SqbCollection {
     interface Options {
@@ -10,12 +10,12 @@ export declare namespace SqbCollection {
 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>>;
+    create(ctx: RequestContext): Promise<TOutput>;
+    delete(ctx: RequestContext): Promise<boolean>;
+    deleteMany(ctx: RequestContext): Promise<number>;
+    get(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>>;
 }

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

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

@@ -1,11 +1,11 @@
 import { Maybe } from 'ts-gems';
 import { PartialOutput } from '@opra/common';
-import { EndpointContext } from '@opra/core';
+import { RequestContext } 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>>;
+    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>>;
 }

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

@@ -1,116 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const common_1 = require("@opra/common");
-const connect_1 = require("@sqb/connect");
-// @ts-ignore
-const _extractFieldSchema = common_1.DocumentFactory.prototype.extractFieldSchema;
-// @ts-ignore
-common_1.DocumentFactory.prototype.extractFieldSchema = async function (target, ctor, metadata, name) {
-    await _extractFieldSchema.call(this, target, ctor, metadata, name);
-    const sqbMeta = connect_1.EntityMetadata.get(ctor);
-    const sqbField = sqbMeta && connect_1.EntityMetadata.getField(sqbMeta, name);
-    if (!sqbField)
-        return;
-    const detectType = !metadata.type;
-    if ((0, connect_1.isAssociationField)(sqbField)) {
-        if (!sqbField.association.returnsMany())
-            delete target.isArray;
-        if (!target.type) {
-            const trg = await sqbField.association.resolveTarget();
-            if (trg) {
-                // @ts-ignore
-                target.type = await this.importTypeClass(trg.ctor);
-            }
-        }
-    }
-    else if (sqbField.kind === 'column') {
-        if (typeof sqbField.enum === 'object')
-            metadata.enum = sqbField.enum;
-        if (target.required == null && sqbField.notNull)
-            target.required = true;
-        if (sqbField.type && Reflect.hasMetadata(common_1.DATATYPE_METADATA, sqbField.type)) {
-            target.type = sqbField.type;
-        }
-        switch (sqbField.dataType) {
-            case connect_1.DataType.GUID:
-                if (!target.type || (detectType && target.type === 'string'))
-                    target.type = 'uuid';
-                break;
-            case connect_1.DataType.JSON:
-                if (!target.type || (detectType && target.type === 'any'))
-                    target.type = 'object';
-                break;
-            case connect_1.DataType.INTEGER:
-            case connect_1.DataType.SMALLINT:
-                if (!target.type || (detectType && target.type === 'number'))
-                    target.type = 'integer';
-                break;
-            case connect_1.DataType.BIGINT:
-                if (!target.type || (detectType && target.type === 'number'))
-                    target.type = 'bigint';
-                break;
-            case connect_1.DataType.DATE:
-                if (!target.type || (detectType && (target.type === 'timestamp' || target.type === 'string')))
-                    target.type = 'date';
-                break;
-            case connect_1.DataType.TIMESTAMPTZ:
-                if (!target.type || (detectType && (target.type === 'timestamp' || target.type === 'string')))
-                    target.type = 'timestamptz';
-                break;
-            case connect_1.DataType.TIME:
-                if (!target.type || (detectType && (target.type === 'timestamp' || target.type === 'string')))
-                    target.type = 'time';
-                break;
-            case connect_1.DataType.BINARY:
-                if (!target.type || (detectType && target.type === 'string'))
-                    target.type = 'base64';
-                break;
-        }
-        if (!target.type) {
-            switch (sqbField.dataType) {
-                case connect_1.DataType.BOOL:
-                    target.type = 'boolean';
-                    break;
-                case connect_1.DataType.CHAR:
-                case connect_1.DataType.VARCHAR:
-                case connect_1.DataType.TEXT:
-                    target.type = 'string';
-                    break;
-                case connect_1.DataType.FLOAT:
-                case connect_1.DataType.DOUBLE:
-                case connect_1.DataType.NUMBER:
-                    target.type = 'number';
-                    break;
-                case connect_1.DataType.TIMESTAMP:
-                    target.type = 'timestamp';
-                    break;
-            }
-        }
-        if (sqbField.notNull && target.required === undefined)
-            target.required = sqbField.notNull;
-        if (sqbField.exclusive && target.exclusive === undefined)
-            target.exclusive = sqbField.exclusive;
-        if (sqbField.default !== undefined && target.default === undefined)
-            target.default = sqbField.default;
-    }
-    if (sqbField.exclusive && target.exclusive === undefined)
-        target.exclusive = sqbField.exclusive;
-};
-// @ts-ignore
-const _extractCollectionSchema = common_1.DocumentFactory.prototype.extractCollectionSchema;
-// @ts-ignore
-common_1.DocumentFactory.prototype.extractCollectionSchema = async function (schema, ctor, metadata, controller) {
-    const { document } = this;
-    const dataType = document.getComplexType(schema.type);
-    // Determine primaryKey if not defined
-    if (!schema.primaryKey && dataType.ctor) {
-        const entityMetadata = connect_1.EntityMetadata.get(dataType.ctor);
-        if (entityMetadata?.indexes) {
-            const primaryIndex = entityMetadata.indexes.find(x => x.primary);
-            if (primaryIndex) {
-                schema.primaryKey = primaryIndex.columns;
-            }
-        }
-    }
-    return await _extractCollectionSchema.call(this, schema, ctor, metadata, controller);
-};

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

@@ -1,114 +0,0 @@
-import { DATATYPE_METADATA, DocumentFactory } from "@opra/common";
-import { DataType as SqbDataType, EntityMetadata, isAssociationField } from '@sqb/connect';
-// @ts-ignore
-const _extractFieldSchema = DocumentFactory.prototype.extractFieldSchema;
-// @ts-ignore
-DocumentFactory.prototype.extractFieldSchema = async function (target, ctor, metadata, name) {
-    await _extractFieldSchema.call(this, target, ctor, metadata, name);
-    const sqbMeta = EntityMetadata.get(ctor);
-    const sqbField = sqbMeta && EntityMetadata.getField(sqbMeta, name);
-    if (!sqbField)
-        return;
-    const detectType = !metadata.type;
-    if (isAssociationField(sqbField)) {
-        if (!sqbField.association.returnsMany())
-            delete target.isArray;
-        if (!target.type) {
-            const trg = await sqbField.association.resolveTarget();
-            if (trg) {
-                // @ts-ignore
-                target.type = await this.importTypeClass(trg.ctor);
-            }
-        }
-    }
-    else if (sqbField.kind === 'column') {
-        if (typeof sqbField.enum === 'object')
-            metadata.enum = sqbField.enum;
-        if (target.required == null && sqbField.notNull)
-            target.required = true;
-        if (sqbField.type && Reflect.hasMetadata(DATATYPE_METADATA, sqbField.type)) {
-            target.type = sqbField.type;
-        }
-        switch (sqbField.dataType) {
-            case SqbDataType.GUID:
-                if (!target.type || (detectType && target.type === 'string'))
-                    target.type = 'uuid';
-                break;
-            case SqbDataType.JSON:
-                if (!target.type || (detectType && target.type === 'any'))
-                    target.type = 'object';
-                break;
-            case SqbDataType.INTEGER:
-            case SqbDataType.SMALLINT:
-                if (!target.type || (detectType && target.type === 'number'))
-                    target.type = 'integer';
-                break;
-            case SqbDataType.BIGINT:
-                if (!target.type || (detectType && target.type === 'number'))
-                    target.type = 'bigint';
-                break;
-            case SqbDataType.DATE:
-                if (!target.type || (detectType && (target.type === 'timestamp' || target.type === 'string')))
-                    target.type = 'date';
-                break;
-            case SqbDataType.TIMESTAMPTZ:
-                if (!target.type || (detectType && (target.type === 'timestamp' || target.type === 'string')))
-                    target.type = 'timestamptz';
-                break;
-            case SqbDataType.TIME:
-                if (!target.type || (detectType && (target.type === 'timestamp' || target.type === 'string')))
-                    target.type = 'time';
-                break;
-            case SqbDataType.BINARY:
-                if (!target.type || (detectType && target.type === 'string'))
-                    target.type = 'base64';
-                break;
-        }
-        if (!target.type) {
-            switch (sqbField.dataType) {
-                case SqbDataType.BOOL:
-                    target.type = 'boolean';
-                    break;
-                case SqbDataType.CHAR:
-                case SqbDataType.VARCHAR:
-                case SqbDataType.TEXT:
-                    target.type = 'string';
-                    break;
-                case SqbDataType.FLOAT:
-                case SqbDataType.DOUBLE:
-                case SqbDataType.NUMBER:
-                    target.type = 'number';
-                    break;
-                case SqbDataType.TIMESTAMP:
-                    target.type = 'timestamp';
-                    break;
-            }
-        }
-        if (sqbField.notNull && target.required === undefined)
-            target.required = sqbField.notNull;
-        if (sqbField.exclusive && target.exclusive === undefined)
-            target.exclusive = sqbField.exclusive;
-        if (sqbField.default !== undefined && target.default === undefined)
-            target.default = sqbField.default;
-    }
-    if (sqbField.exclusive && target.exclusive === undefined)
-        target.exclusive = sqbField.exclusive;
-};
-// @ts-ignore
-const _extractCollectionSchema = DocumentFactory.prototype.extractCollectionSchema;
-// @ts-ignore
-DocumentFactory.prototype.extractCollectionSchema = async function (schema, ctor, metadata, controller) {
-    const { document } = this;
-    const dataType = document.getComplexType(schema.type);
-    // Determine primaryKey if not defined
-    if (!schema.primaryKey && dataType.ctor) {
-        const entityMetadata = EntityMetadata.get(dataType.ctor);
-        if (entityMetadata?.indexes) {
-            const primaryIndex = entityMetadata.indexes.find(x => x.primary);
-            if (primaryIndex) {
-                schema.primaryKey = primaryIndex.columns;
-            }
-        }
-    }
-    return await _extractCollectionSchema.call(this, schema, ctor, metadata, controller);
-};

/package/types/augmentation/{document-factory.augmentation.d.ts → api-document-factory.augmentation.d.ts} RENAMED Viewed

File without changes