@opra/sqb 0.13.0 → 0.15.0

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

@@ -0,0 +1,112 @@
+"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 (sqbField.type && Reflect.hasMetadata(common_1.METADATA_KEY, sqbField.type)) {
+            target.type = sqbField.type;
+        }
+        switch (sqbField.dataType) {
+            case connect_1.DataType.GUID:
+                if (!target.type || (detectType && target.type === 'string'))
+                    target.type = 'guid';
+                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 _createCollection = common_1.DocumentFactory.prototype.createCollection;
+// @ts-ignore
+common_1.DocumentFactory.prototype.createCollection = async function (name, schema) {
+    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 _createCollection.call(this, name, schema);
+};

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

@@ -0,0 +1,14 @@
+"use strict";
+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);
+    if (srcMeta) {
+        const trgMeta = connect_1.EntityMetadata.define(target);
+        const { isInheritedPredicate } = options;
+        connect_1.EntityMetadata.mixin(trgMeta, srcMeta, k => isInheritedPredicate(k));
+    }
+};

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

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const common_1 = require("@opra/common");
+const connect_1 = require("@sqb/connect");
+const _applyMixin = common_1.UnionType._applyMixin;
+common_1.UnionType._applyMixin = function (target, ...sources) {
+    _applyMixin.call(null, target, ...sources);
+    connect_1.Entity.mixin(target, ...sources);
+};

package/cjs/convert-filter.js

@@ -10,7 +10,8 @@ function convertFilter(str) {
         return;
     if (ast instanceof common_1.ComparisonExpression) {
         const left = ast.left instanceof common_1.QualifiedIdentifier
-            ? ast.left.value : convertFilter(ast.left);
+            ? sqb.Field(ast.left.value)
+            : convertFilter(ast.left);
         const right = convertFilter(ast.right);
         switch (ast.op) {
             case '=':
@@ -42,7 +43,7 @@ function convertFilter(str) {
         }
     }
     if (ast instanceof common_1.QualifiedIdentifier) {
-        return sqb.Field(ast.value);
+        return ast.value;
     }
     if (ast instanceof common_1.NumberLiteral ||
         ast instanceof common_1.StringLiteral ||

package/cjs/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const _SqbConnect = tslib_1.__importStar(require("@sqb/connect"));
+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("./base-entity-resource.js"), exports);
-tslib_1.__exportStar(require("./base-entity-service.js"), exports);
-const optionalsSymbol = Symbol.for('opra.optional-lib.sqb-connect');
-globalThis[optionalsSymbol] = globalThis[optionalsSymbol] || {};
-globalThis[optionalsSymbol].SqbConnect = _SqbConnect;
+tslib_1.__exportStar(require("./sqb-collection-resource.js"), exports);
+tslib_1.__exportStar(require("./sqb-entity-service.js"), exports);
+tslib_1.__exportStar(require("./sqb-singleton-resource.js"), exports);

package/cjs/sqb-adapter.js

@@ -7,117 +7,206 @@ const lodash_omitby_1 = tslib_1.__importDefault(require("lodash.omitby"));
 const convert_filter_js_1 = require("./convert-filter.js");
 var SQBAdapter;
 (function (SQBAdapter) {
-    function prepare(query) {
-        switch (query.method) {
-            case 'create': {
-                const options = (0, lodash_omitby_1.default)({
-                    pick: query.pick?.length ? query.pick : undefined,
-                    omit: query.omit?.length ? query.omit : undefined,
-                    include: query.include?.length ? query.include : undefined,
-                }, lodash_isnil_1.default);
-                const { data } = query;
-                return {
-                    method: 'create',
-                    values: data,
-                    options,
-                    args: [data, options]
-                };
-            }
-            case 'count': {
-                const options = (0, lodash_omitby_1.default)({
-                    filter: (0, convert_filter_js_1.convertFilter)(query.filter)
-                }, lodash_isnil_1.default);
-                return {
-                    method: 'count',
-                    options,
-                    args: [options]
-                };
-            }
-            case 'get': {
-                if (query.kind === 'CollectionGetQuery') {
-                    const options = (0, lodash_omitby_1.default)({
-                        pick: query.pick?.length ? query.pick : undefined,
-                        omit: query.omit?.length ? query.omit : undefined,
-                        include: query.include?.length ? query.include : undefined,
-                    }, lodash_isnil_1.default);
-                    const keyValue = query.keyValue;
-                    return {
-                        method: 'findByPk',
-                        keyValue,
-                        options,
-                        args: [keyValue, options]
-                    };
-                }
-                break;
-            }
-            case 'search': {
-                const options = (0, lodash_omitby_1.default)({
-                    pick: query.pick?.length ? query.pick : undefined,
-                    omit: query.omit?.length ? query.omit : undefined,
-                    include: query.include?.length ? query.include : undefined,
-                    sort: query.sort?.length ? query.sort : undefined,
-                    limit: query.limit,
-                    offset: query.skip,
-                    distinct: query.distinct,
-                    total: query.count,
-                    filter: (0, convert_filter_js_1.convertFilter)(query.filter)
-                }, lodash_isnil_1.default);
-                return {
-                    method: 'findAll',
-                    options,
-                    args: [options]
-                };
-            }
-            case 'update': {
-                const options = (0, lodash_omitby_1.default)({
-                    pick: query.pick?.length ? query.pick : undefined,
-                    omit: query.omit?.length ? query.omit : undefined,
-                    include: query.include?.length ? query.include : undefined,
-                }, lodash_isnil_1.default);
-                const { data } = query;
-                const keyValue = query.keyValue;
-                return {
-                    method: 'update',
-                    keyValue: query.keyValue,
-                    values: data,
-                    options,
-                    args: [keyValue, data, options]
-                };
-            }
-            case 'updateMany': {
-                const options = (0, lodash_omitby_1.default)({
-                    filter: (0, convert_filter_js_1.convertFilter)(query.filter)
-                }, lodash_isnil_1.default);
-                const { data } = query;
-                return {
-                    method: 'updateAll',
-                    values: data,
-                    options,
-                    args: [data, options]
-                };
-            }
-            case 'delete': {
-                const options = {};
-                const keyValue = query.keyValue;
-                return {
-                    method: 'destroy',
-                    keyValue,
-                    options,
-                    args: [keyValue, options]
-                };
+    SQBAdapter.parseFilter = convert_filter_js_1.convertFilter;
+    function parseCollectionCreateRequest(request) {
+        /* istanbul ignore next */
+        if (!(request.resourceKind === 'Collection' && request.operation === 'create'))
+            throw new TypeError('"Request" is not a "CollectionCreateRequest"');
+        const { args } = request;
+        return {
+            method: 'create',
+            data: args.data,
+            options: (0, lodash_omitby_1.default)({
+                pick: args.pick?.length ? args.pick : undefined,
+                omit: args.omit?.length ? args.omit : undefined,
+                include: args.include?.length ? args.include : undefined,
+            }, lodash_isnil_1.default)
+        };
+    }
+    SQBAdapter.parseCollectionCreateRequest = parseCollectionCreateRequest;
+    function parseCollectionDeleteRequest(request) {
+        /* istanbul ignore next */
+        if (!(request.resourceKind === 'Collection' && request.operation === 'delete'))
+            throw new TypeError('"Request" is not a "CollectionDeleteRequest"');
+        const { args } = request;
+        return {
+            method: 'destroy',
+            key: args.key,
+            options: {}
+        };
+    }
+    SQBAdapter.parseCollectionDeleteRequest = parseCollectionDeleteRequest;
+    function parseCollectionDeleteManyRequest(request) {
+        /* istanbul ignore next */
+        if (!(request.resourceKind === 'Collection' && request.operation === 'deleteMany'))
+            throw new TypeError('"Request" is not a "CollectionDeleteManyRequest"');
+        const { args } = request;
+        return {
+            method: 'destroyAll',
+            options: (0, lodash_omitby_1.default)({
+                filter: SQBAdapter.parseFilter(args.filter)
+            }, lodash_isnil_1.default)
+        };
+    }
+    SQBAdapter.parseCollectionDeleteManyRequest = parseCollectionDeleteManyRequest;
+    function parseCollectionGetRequest(request) {
+        /* istanbul ignore next */
+        if (!(request.resourceKind === 'Collection' && request.operation === 'get'))
+            throw new TypeError('"Request" is not a "CollectionGetRequest"');
+        const { args } = request;
+        return {
+            method: 'findByPk',
+            key: args.key,
+            options: (0, lodash_omitby_1.default)({
+                pick: args.pick?.length ? args.pick : undefined,
+                omit: args.omit?.length ? args.omit : undefined,
+                include: args.include?.length ? args.include : undefined,
+            }, lodash_isnil_1.default)
+        };
+    }
+    SQBAdapter.parseCollectionGetRequest = parseCollectionGetRequest;
+    function parseCollectionUpdateRequest(request) {
+        /* istanbul ignore next */
+        if (!(request.resourceKind === 'Collection' && request.operation === 'update'))
+            throw new TypeError('"Request" is not a "CollectionUpdateRequest"');
+        const { args } = request;
+        return {
+            method: 'update',
+            key: args.key,
+            data: args.data,
+            options: (0, lodash_omitby_1.default)({
+                pick: args.pick?.length ? args.pick : undefined,
+                omit: args.omit?.length ? args.omit : undefined,
+                include: args.include?.length ? args.include : undefined,
+            }, lodash_isnil_1.default)
+        };
+    }
+    SQBAdapter.parseCollectionUpdateRequest = parseCollectionUpdateRequest;
+    function parseCollectionUpdateManyRequest(request) {
+        /* istanbul ignore next */
+        if (!(request.resourceKind === 'Collection' && request.operation === 'updateMany'))
+            throw new TypeError('"Request" is not a "CollectionUpdateManyRequest"');
+        const { args } = request;
+        return {
+            method: 'updateAll',
+            data: args.data,
+            options: (0, lodash_omitby_1.default)({
+                filter: SQBAdapter.parseFilter(args.filter)
+            }, lodash_isnil_1.default)
+        };
+    }
+    SQBAdapter.parseCollectionUpdateManyRequest = parseCollectionUpdateManyRequest;
+    function parseCollectionSearchRequest(request) {
+        /* istanbul ignore next */
+        if (!(request.resourceKind === 'Collection' && request.operation === 'search'))
+            throw new TypeError('"Request" is not a "CollectionSearchRequest"');
+        const { args } = request;
+        return {
+            method: 'findAll',
+            options: (0, lodash_omitby_1.default)({
+                pick: args.pick?.length ? args.pick : undefined,
+                omit: args.omit?.length ? args.omit : undefined,
+                include: args.include?.length ? args.include : undefined,
+                sort: args.sort?.length ? args.sort : undefined,
+                limit: args.limit,
+                offset: args.skip,
+                distinct: args.distinct,
+                count: args.count,
+                filter: SQBAdapter.parseFilter(args.filter)
+            }, lodash_isnil_1.default)
+        };
+    }
+    SQBAdapter.parseCollectionSearchRequest = parseCollectionSearchRequest;
+    function parseSingletonGetRequest(request) {
+        /* istanbul ignore next */
+        if (!(request.resourceKind === 'Singleton' && request.operation === 'get'))
+            throw new TypeError('"Request" is not a "SingletonGetRequest"');
+        const { args } = request;
+        return {
+            method: 'findOne',
+            options: (0, lodash_omitby_1.default)({
+                pick: args.pick?.length ? args.pick : undefined,
+                omit: args.omit?.length ? args.omit : undefined,
+                include: args.include?.length ? args.include : undefined,
+            }, lodash_isnil_1.default)
+        };
+    }
+    SQBAdapter.parseSingletonGetRequest = parseSingletonGetRequest;
+    function parseSingletonCreateRequest(request) {
+        /* istanbul ignore next */
+        if (!(request.resourceKind === 'Singleton' && request.operation === 'create'))
+            throw new TypeError('"Request" is not a "SingletonCreateRequest"');
+        const { args } = request;
+        return {
+            method: 'create',
+            data: args.data,
+            options: (0, lodash_omitby_1.default)({
+                pick: args.pick?.length ? args.pick : undefined,
+                omit: args.omit?.length ? args.omit : undefined,
+                include: args.include?.length ? args.include : undefined,
+            }, lodash_isnil_1.default)
+        };
+    }
+    SQBAdapter.parseSingletonCreateRequest = parseSingletonCreateRequest;
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    function parseSingletonDeleteRequest(request) {
+        /* istanbul ignore next */
+        if (!(request.resourceKind === 'Singleton' && request.operation === 'delete'))
+            throw new TypeError('"Request" is not a "SingletonDeleteRequest"');
+        return {
+            method: 'destroyAll',
+            options: {},
+        };
+    }
+    SQBAdapter.parseSingletonDeleteRequest = parseSingletonDeleteRequest;
+    function parseSingletonUpdateRequest(request) {
+        /* istanbul ignore next */
+        if (!(request.resourceKind === 'Singleton' && request.operation === 'update'))
+            throw new TypeError('"Request" is not a "SingletonUpdateRequest"');
+        const { args } = request;
+        return {
+            method: 'updateAll',
+            data: args.data,
+            options: (0, lodash_omitby_1.default)({
+                pick: args.pick?.length ? args.pick : undefined,
+                omit: args.omit?.length ? args.omit : undefined,
+                include: args.include?.length ? args.include : undefined,
+            }, lodash_isnil_1.default)
+        };
+    }
+    SQBAdapter.parseSingletonUpdateRequest = parseSingletonUpdateRequest;
+    function parseRequest(request) {
+        if (request.resourceKind === 'Collection') {
+            switch (request.operation) {
+                case 'create':
+                    return parseCollectionCreateRequest(request);
+                case 'get':
+                    return parseCollectionGetRequest(request);
+                case 'delete':
+                    return parseCollectionDeleteRequest(request);
+                case 'deleteMany':
+                    return parseCollectionDeleteManyRequest(request);
+                case 'update':
+                    return parseCollectionUpdateRequest(request);
+                case 'updateMany':
+                    return parseCollectionUpdateManyRequest(request);
+                case 'search':
+                    return parseCollectionSearchRequest(request);
             }
-            case 'deleteMany': {
-                const options = (0, lodash_omitby_1.default)({
-                    filter: (0, convert_filter_js_1.convertFilter)(query.filter)
-                }, lodash_isnil_1.default);
-                return {
-                    method: 'destroyAll',
-                    options,
-                    args: [options]
-                };
+        }
+        else if (request.resourceKind === 'Singleton') {
+            switch (request.operation) {
+                case 'create':
+                    return parseSingletonCreateRequest(request);
+                case 'delete':
+                    return parseSingletonDeleteRequest(request);
+                case 'get':
+                    return parseSingletonGetRequest(request);
+                case 'update':
+                    return parseSingletonUpdateRequest(request);
             }
         }
-        throw new Error(`Unimplemented query method "${query.method}"`);
+        throw new Error(`Unimplemented request method "${request.method}"`);
     }
-    SQBAdapter.prepare = prepare;
+    SQBAdapter.parseRequest = parseRequest;
 })(SQBAdapter = exports.SQBAdapter || (exports.SQBAdapter = {}));

package/cjs/sqb-collection-resource.js

@@ -0,0 +1,95 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SqbCollectionResource = void 0;
+const tslib_1 = require("tslib");
+const common_1 = require("@opra/common");
+const sqb_adapter_js_1 = require("./sqb-adapter.js");
+class SqbCollectionResource {
+    async create(ctx) {
+        const prepared = sqb_adapter_js_1.SQBAdapter.parseCollectionCreateRequest(ctx.request);
+        const service = await this.getService(ctx);
+        return service.create(ctx, prepared.data, prepared.options);
+    }
+    async delete(ctx) {
+        const prepared = sqb_adapter_js_1.SQBAdapter.parseCollectionDeleteRequest(ctx.request);
+        const service = await this.getService(ctx);
+        return service.destroy(ctx, prepared.key, prepared.options);
+    }
+    async deleteMany(ctx) {
+        const prepared = sqb_adapter_js_1.SQBAdapter.parseCollectionDeleteManyRequest(ctx.request);
+        const service = await this.getService(ctx);
+        return service.destroyAll(ctx, prepared.options);
+    }
+    async get(ctx) {
+        const prepared = sqb_adapter_js_1.SQBAdapter.parseCollectionGetRequest(ctx.request);
+        const service = await this.getService(ctx);
+        return service.findByPk(ctx, prepared.key, prepared.options);
+    }
+    async update(ctx) {
+        const prepared = sqb_adapter_js_1.SQBAdapter.parseCollectionUpdateRequest(ctx.request);
+        const service = await this.getService(ctx);
+        return service.update(ctx, prepared.key, prepared.data, prepared.options);
+    }
+    async updateMany(ctx) {
+        const prepared = sqb_adapter_js_1.SQBAdapter.parseCollectionUpdateManyRequest(ctx.request);
+        const service = await this.getService(ctx);
+        return service.updateAll(ctx, prepared.data, prepared.options);
+    }
+    async search(ctx) {
+        const prepared = sqb_adapter_js_1.SQBAdapter.parseCollectionSearchRequest(ctx.request);
+        const service = await this.getService(ctx);
+        if (prepared.options.count) {
+            const [items, count] = await Promise.all([
+                service.findAll(prepared.options),
+                service.count(prepared.options)
+            ]);
+            ctx.response.count = count;
+            return items;
+        }
+        else
+            return service.findAll(ctx, prepared.options);
+    }
+}
+tslib_1.__decorate([
+    common_1.Collection.CreateOperation(),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], SqbCollectionResource.prototype, "create", null);
+tslib_1.__decorate([
+    common_1.Collection.DeleteOperation(),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], SqbCollectionResource.prototype, "delete", null);
+tslib_1.__decorate([
+    common_1.Collection.DeleteManyOperation(),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], SqbCollectionResource.prototype, "deleteMany", null);
+tslib_1.__decorate([
+    common_1.Collection.GetOperation(),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], SqbCollectionResource.prototype, "get", null);
+tslib_1.__decorate([
+    common_1.Collection.UpdateOperation(),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], SqbCollectionResource.prototype, "update", null);
+tslib_1.__decorate([
+    common_1.Collection.UpdateManyOperation(),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], SqbCollectionResource.prototype, "updateMany", null);
+tslib_1.__decorate([
+    common_1.Collection.SearchOperation(),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], SqbCollectionResource.prototype, "search", null);
+exports.SqbCollectionResource = SqbCollectionResource;