@opra/common 0.23.2 → 0.24.0

package/cjs/document/resource/collection.js

@@ -2,179 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Collection = void 0;
 const tslib_1 = require("tslib");
-const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
 const putil_merge_1 = tslib_1.__importDefault(require("putil-merge"));
-const vg = tslib_1.__importStar(require("valgen"));
-const index_js_1 = require("../../exception/index.js");
-const index_js_2 = require("../../filter/index.js");
-const index_js_3 = require("../../helpers/index.js");
-const index_js_4 = require("../../i18n/index.js");
-const index_js_5 = require("../../schema/index.js");
 const constants_js_1 = require("../constants.js");
-const simple_type_js_1 = require("../data-type/simple-type.js");
-const generate_codec_js_1 = require("../utils/generate-codec.js");
-const resource_js_1 = require("./resource.js");
-const NESTJS_INJECTABLE_WATERMARK = '__injectable__'; // todo, put this in nextjs package wia augmentation
-const NAME_PATTERN = /^(.*)(Resource|Collection)$/;
-class CollectionClass extends resource_js_1.Resource {
-    constructor(document, init) {
-        super(document, init);
-        this._decoders = {};
-        this._encoders = {};
-        this.kind = index_js_5.OpraSchema.Collection.Kind;
-        this.controller = init.controller;
-        this.operations = { ...init.operations };
-        const dataType = this.type = init.type;
-        // Validate key fields
-        this.primaryKey = init.primaryKey
-            ? (Array.isArray(init.primaryKey) ? init.primaryKey : [init.primaryKey])
-            : [];
-        if (!this.primaryKey.length)
-            throw new TypeError(`You must provide primaryKey for Collection resource ("${this.name}")`);
-        this.primaryKey.forEach(f => {
-            const field = dataType.getField(f);
-            if (!(field?.type instanceof simple_type_js_1.SimpleType))
-                throw new TypeError(`Only Simple type allowed for primary keys but "${f}" is a ${field.type.kind}`);
-        });
-    }
-    exportSchema() {
-        const out = resource_js_1.Resource.prototype.exportSchema.call(this);
-        Object.assign(out, (0, index_js_3.omitUndefined)({
-            type: this.type.name,
-            operations: this.operations,
-            primaryKey: this.primaryKey
-        }));
-        return out;
-    }
-    parseKeyValue(value) {
-        if (!this.primaryKey?.length)
-            return;
-        const dataType = this.type;
-        if (this.primaryKey.length > 1) {
-            // Build primary key/value mapped object
-            const obj = Array.isArray(value)
-                ? this.primaryKey.reduce((o, k, i) => {
-                    o[k] = value[i];
-                    return obj;
-                }, {})
-                : value;
-            // decode values
-            for (const [k, v] of Object.entries(obj)) {
-                const el = dataType.getField(k);
-                if (el.type instanceof simple_type_js_1.SimpleType)
-                    obj[k] = el.type.decode(v);
-                if (obj[k] == null)
-                    throw new TypeError(`You must provide value of primary field(s) (${k})`);
-            }
-        }
-        else {
-            const primaryKey = this.primaryKey[0];
-            if (typeof value === 'object')
-                value = value[primaryKey];
-            const el = dataType.getField(primaryKey);
-            let result;
-            if (el.type instanceof simple_type_js_1.SimpleType)
-                result = el.type.decode(value);
-            if (result == null)
-                throw new TypeError(`You must provide value of primary field(s) (${primaryKey})`);
-            return result;
-        }
-    }
-    normalizeFieldPath(path) {
-        return this.type.normalizeFieldPath(path);
-    }
-    normalizeSortFields(fields) {
-        const normalized = this.type.normalizeFieldPath(fields);
-        if (!normalized)
-            return;
-        const findManyOp = this.operations.findMany;
-        const sortFields = findManyOp && findManyOp.sortFields;
-        (Array.isArray(normalized) ? normalized : [normalized]).forEach(field => {
-            if (!sortFields?.find(x => x === field))
-                throw new index_js_1.BadRequestError({
-                    message: (0, index_js_4.translate)('error:UNACCEPTED_SORT_FIELD', { field }),
-                });
-        });
-        return normalized;
-    }
-    normalizeFilter(filter) {
-        if (!filter)
-            return;
-        const ast = typeof filter === 'string' ? index_js_2.OpraFilter.parse(filter) : filter;
-        if (ast instanceof index_js_2.OpraFilter.ComparisonExpression) {
-            this.normalizeFilter(ast.left);
-            if (!(ast.left instanceof index_js_2.OpraFilter.QualifiedIdentifier && ast.left.field))
-                throw new TypeError(`Invalid filter query. Left side should be a data field.`);
-            // Check if filtering accepted for given field
-            const findManyOp = this.operations.findMany;
-            const fieldLower = ast.left.value.toLowerCase();
-            const filterDef = (findManyOp && findManyOp.filters || [])
-                .find(f => f.field.toLowerCase() === fieldLower);
-            if (!filterDef) {
-                throw new index_js_1.BadRequestError({
-                    message: (0, index_js_4.translate)('error:UNACCEPTED_FILTER_FIELD', { field: ast.left.value }),
-                });
-            }
-            // Check if filtering operation accepted for given field
-            if (!filterDef.operators?.includes(ast.op))
-                throw new index_js_1.BadRequestError({
-                    message: (0, index_js_4.translate)('error:UNACCEPTED_FILTER_OPERATION', { field: ast.left.value }),
-                });
-            this.normalizeFilter(ast.right);
-            return ast;
-        }
-        if (ast instanceof index_js_2.OpraFilter.LogicalExpression) {
-            ast.items.forEach(item => this.normalizeFilter(item));
-            return ast;
-        }
-        if (ast instanceof index_js_2.OpraFilter.ArithmeticExpression) {
-            ast.items.forEach(item => this.normalizeFilter(item.expression));
-            return ast;
-        }
-        if (ast instanceof index_js_2.OpraFilter.ArrayExpression) {
-            ast.items.forEach(item => this.normalizeFilter(item));
-            return ast;
-        }
-        if (ast instanceof index_js_2.OpraFilter.ParenthesizedExpression) {
-            this.normalizeFilter(ast.expression);
-            return ast;
-        }
-        if (ast instanceof index_js_2.OpraFilter.QualifiedIdentifier) {
-            const normalizedFieldPath = this.type.normalizeFieldPath(ast.value)?.join('.');
-            ast.field = this.type.getField(normalizedFieldPath);
-            ast.dataType = ast.field?.type || this.document.getDataType('any');
-            ast.value = normalizedFieldPath;
-            return ast;
-        }
-        return ast;
-    }
-    getDecoder(operation) {
-        let decoder = this._decoders[operation];
-        if (decoder)
-            return decoder;
-        const options = {
-            partial: operation !== 'create'
-        };
-        if (operation !== 'create')
-            options.omit = [...this.primaryKey];
-        decoder = (0, generate_codec_js_1.generateCodec)(this.type, 'decode', options);
-        this._decoders[operation] = decoder;
-        return decoder;
-    }
-    getEncoder(operation) {
-        let encoder = this._encoders[operation];
-        if (encoder)
-            return encoder;
-        const options = {
-            partial: true
-        };
-        encoder = (0, generate_codec_js_1.generateCodec)(this.type, 'encode', options);
-        if (operation === 'findMany')
-            return vg.isArray(encoder);
-        this._encoders[operation] = encoder;
-        return encoder;
-    }
-}
+const collection_class_js_1 = require("./collection-class.js");
+const collection_decorator_js_1 = require("./collection-decorator.js");
 /**
  *
  */
@@ -182,48 +13,12 @@ exports.Collection = function (...args) {
     // ClassDecorator
     if (!this) {
         const [type, options] = args;
-        return function (target) {
-            const name = options?.name || target.name.match(NAME_PATTERN)?.[1] || target.name;
-            const metadata = Reflect.getOwnMetadata(constants_js_1.METADATA_KEY, target) || {};
-            const baseMetadata = Reflect.getOwnMetadata(constants_js_1.METADATA_KEY, Object.getPrototypeOf(target));
-            if (baseMetadata) {
-                (0, putil_merge_1.default)(metadata, baseMetadata, { deep: true });
-            }
-            metadata.kind = index_js_5.OpraSchema.Collection.Kind;
-            metadata.name = name;
-            metadata.type = type;
-            // Merge with previous metadata object
-            const m = Reflect.getMetadata(constants_js_1.METADATA_KEY, target);
-            if (m && metadata !== m)
-                Object.assign(metadata, (0, lodash_omit_1.default)(m), Object.keys(metadata));
-            // Merge options
-            if (options)
-                Object.assign(metadata, (0, lodash_omit_1.default)(options, ['kind', 'name', 'type', 'controller']));
-            Reflect.defineMetadata(constants_js_1.METADATA_KEY, metadata, target);
-            /* Define Injectable metadata for NestJS support*/
-            Reflect.defineMetadata(NESTJS_INJECTABLE_WATERMARK, true, target);
-        };
+        return exports.Collection[constants_js_1.DECORATOR].call(undefined, type, options);
     }
     // Constructor
     const [document, init] = args;
-    (0, putil_merge_1.default)(this, new CollectionClass(document, init), { descriptor: true });
+    (0, putil_merge_1.default)(this, new collection_class_js_1.CollectionClass(document, init), { descriptor: true });
 };
-exports.Collection.prototype = CollectionClass.prototype;
-function createOperationDecorator(operation) {
-    return (options) => ((target, propertyKey) => {
-        if (propertyKey !== operation)
-            throw new TypeError(`Name of the handler name should be '${operation}'`);
-        const operationMeta = { ...options };
-        const resourceMetadata = (Reflect.getOwnMetadata(constants_js_1.METADATA_KEY, target.constructor) || {});
-        resourceMetadata.operations = resourceMetadata.operations || {};
-        resourceMetadata.operations[operation] = operationMeta;
-        Reflect.defineMetadata(constants_js_1.METADATA_KEY, resourceMetadata, target.constructor);
-    });
-}
-exports.Collection.Create = createOperationDecorator('create');
-exports.Collection.Delete = createOperationDecorator('delete');
-exports.Collection.DeleteMany = createOperationDecorator('deleteMany');
-exports.Collection.Get = createOperationDecorator('get');
-exports.Collection.FindMany = createOperationDecorator('findMany');
-exports.Collection.Update = createOperationDecorator('update');
-exports.Collection.UpdateMany = createOperationDecorator('updateMany');
+exports.Collection.prototype = collection_class_js_1.CollectionClass.prototype;
+Object.assign(exports.Collection, collection_decorator_js_1.CollectionDecorator);
+exports.Collection[constants_js_1.DECORATOR] = collection_decorator_js_1.CollectionDecorator;

package/cjs/document/resource/resource-decorator.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ResourceDecorator = void 0;
+const constants_js_1 = require("../constants.js");
+exports.ResourceDecorator = {};
+exports.ResourceDecorator.Action = function (options) {
+    return (target, propertyKey) => {
+        if (typeof propertyKey !== 'string')
+            throw new TypeError(`This decorator can't be used for Symbol keys'`);
+        const actionMeta = { ...options };
+        const resourceMetadata = (Reflect.getOwnMetadata(constants_js_1.SOURCE_METADATA, target.constructor) || {});
+        resourceMetadata.actions = resourceMetadata.actions || {};
+        resourceMetadata.actions[propertyKey] = actionMeta;
+        Reflect.defineMetadata(constants_js_1.SOURCE_METADATA, resourceMetadata, target.constructor);
+    };
+};

package/cjs/document/resource/resource.js

@@ -1,20 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Resource = void 0;
+const index_js_1 = require("../../helpers/index.js");
 const object_utils_js_1 = require("../../helpers/object-utils.js");
 const inspect_util_js_1 = require("../utils/inspect.util.js");
 class Resource {
     constructor(document, init) {
+        this.actions = new index_js_1.ResponsiveMap();
         this.document = document;
         this.name = init.name;
         this.description = init.description;
         this.controller = init.controller;
     }
     exportSchema() {
-        return (0, object_utils_js_1.omitUndefined)({
+        const schema = (0, object_utils_js_1.omitUndefined)({
             kind: this.kind,
-            description: this.description
+            description: this.description,
         });
+        if (this.actions.size) {
+            const actions = schema.actions = {};
+            for (const [name, r] of this.actions.entries()) {
+                actions[name] = r.exportSchema();
+            }
+        }
+        return schema;
     }
     toString() {
         return `[${Object.getPrototypeOf(this).constructor.name} ${this.name || '#anonymous'}]`;

package/cjs/document/resource/singleton-class.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SingletonClass = void 0;
+const index_js_1 = require("../../helpers/index.js");
+const index_js_2 = require("../../schema/index.js");
+const generate_codec_js_1 = require("../utils/generate-codec.js");
+const resource_js_1 = require("./resource.js");
+class SingletonClass extends resource_js_1.Resource {
+    constructor(document, init) {
+        super(document, init);
+        this._decoders = {};
+        this._encoders = {};
+        this.kind = index_js_2.OpraSchema.Singleton.Kind;
+        this.controller = init.controller;
+        this.operations = { ...init.operations };
+        this.type = init.type;
+    }
+    exportSchema() {
+        return {
+            ...super.exportSchema(),
+            ...(0, index_js_1.omitUndefined)({
+                type: this.type.name || 'any',
+                operations: this.operations
+            })
+        };
+    }
+    normalizeFieldPath(path) {
+        return this.type.normalizeFieldPath(path);
+    }
+    getDecoder(endpoint) {
+        let decoder = this._decoders[endpoint];
+        if (decoder)
+            return decoder;
+        const options = {
+            partial: endpoint !== 'create'
+        };
+        decoder = (0, generate_codec_js_1.generateCodec)(this.type, 'decode', options);
+        this._decoders[endpoint] = decoder;
+        return decoder;
+    }
+    getEncoder(endpoint) {
+        let encoder = this._encoders[endpoint];
+        if (encoder)
+            return encoder;
+        const options = {
+            partial: true
+        };
+        encoder = (0, generate_codec_js_1.generateCodec)(this.type, 'encode', options);
+        this._encoders[endpoint] = encoder;
+        return encoder;
+    }
+}
+exports.SingletonClass = SingletonClass;

package/cjs/document/resource/singleton-decorator.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SingletonDecorator = void 0;
+const tslib_1 = require("tslib");
+const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
+const index_js_1 = require("../../schema/index.js");
+const constants_js_1 = require("../constants.js");
+const resource_decorator_js_1 = require("./resource-decorator.js");
+const NAME_PATTERN = /^(.*)(Resource|Singleton|Controller)$/;
+const operationProperties = ['create', 'delete', 'get', 'update'];
+function SingletonDecorator(type, options) {
+    return function (target) {
+        const name = options?.name || target.name.match(NAME_PATTERN)?.[1] || target.name;
+        const metadata = Reflect.getOwnMetadata(constants_js_1.SOURCE_METADATA, target) || {};
+        metadata.kind = index_js_1.OpraSchema.Singleton.Kind;
+        metadata.name = name;
+        metadata.type = type;
+        // Merge with previous metadata object
+        const m = Reflect.getMetadata(constants_js_1.SOURCE_METADATA, target);
+        if (m && metadata !== m)
+            Object.assign(metadata, (0, lodash_omit_1.default)(m), Object.keys(metadata));
+        // Merge options
+        if (options)
+            Object.assign(metadata, (0, lodash_omit_1.default)(options, ['kind', 'name', 'type', 'controller']));
+        Reflect.defineMetadata(constants_js_1.SOURCE_METADATA, metadata, target);
+    };
+}
+exports.SingletonDecorator = SingletonDecorator;
+Object.assign(SingletonDecorator, resource_decorator_js_1.ResourceDecorator);
+SingletonDecorator.Create = createOperationDecorator('create');
+SingletonDecorator.Get = createOperationDecorator('get');
+SingletonDecorator.Delete = createOperationDecorator('delete');
+SingletonDecorator.Update = createOperationDecorator('update');
+SingletonDecorator.Action = function (options) {
+    const oldDecorator = resource_decorator_js_1.ResourceDecorator.Action(options);
+    const operators = ['create', 'delete', 'get', 'update'];
+    return (target, propertyKey) => {
+        if (typeof propertyKey === 'string' && operators.includes(propertyKey))
+            throw new TypeError(`The "${propertyKey}" property is reserved for "${propertyKey}" operations and cannot be used as an action'`);
+        return oldDecorator(target, propertyKey);
+    };
+};
+function createOperationDecorator(operation) {
+    return (options) => ((target, propertyKey) => {
+        if (propertyKey !== operation)
+            throw new TypeError(`Name of the handler name should be '${operation}'`);
+        const operationMeta = { ...options };
+        const sourceMetadata = (Reflect.getOwnMetadata(constants_js_1.SOURCE_METADATA, target.constructor) || {});
+        sourceMetadata.operations = sourceMetadata.operations || {};
+        sourceMetadata.operations[operation] = operationMeta;
+        Reflect.defineMetadata(constants_js_1.SOURCE_METADATA, sourceMetadata, target.constructor);
+    });
+}

package/cjs/document/resource/singleton.js

@@ -2,98 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Singleton = void 0;
 const tslib_1 = require("tslib");
-const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
 const putil_merge_1 = tslib_1.__importDefault(require("putil-merge"));
-const index_js_1 = require("../../helpers/index.js");
-const index_js_2 = require("../../schema/index.js");
 const constants_js_1 = require("../constants.js");
-const generate_codec_js_1 = require("../utils/generate-codec.js");
-const resource_js_1 = require("./resource.js");
-const NESTJS_INJECTABLE_WATERMARK = '__injectable__'; // todo, put this in nextjs package wia augmentation
-const NAME_PATTERN = /^(.*)(Resource|Singleton)$/;
-class SingletonClass extends resource_js_1.Resource {
-    constructor(document, init) {
-        super(document, init);
-        this._decoders = {};
-        this._encoders = {};
-        this.kind = index_js_2.OpraSchema.Singleton.Kind;
-        this.controller = init.controller;
-        this.operations = { ...init.operations };
-        this.type = init.type;
-    }
-    exportSchema() {
-        const out = resource_js_1.Resource.prototype.exportSchema.call(this);
-        Object.assign(out, (0, index_js_1.omitUndefined)({
-            type: this.type.name,
-            operations: this.operations
-        }));
-        return out;
-    }
-    normalizeFieldPath(path) {
-        return this.type.normalizeFieldPath(path);
-    }
-    getDecoder(operation) {
-        let decoder = this._decoders[operation];
-        if (decoder)
-            return decoder;
-        const options = {
-            partial: operation !== 'create'
-        };
-        decoder = (0, generate_codec_js_1.generateCodec)(this.type, 'decode', options);
-        this._decoders[operation] = decoder;
-        return decoder;
-    }
-    getEncoder(operation) {
-        let encoder = this._encoders[operation];
-        if (encoder)
-            return encoder;
-        const options = {
-            partial: true
-        };
-        encoder = (0, generate_codec_js_1.generateCodec)(this.type, 'encode', options);
-        this._encoders[operation] = encoder;
-        return encoder;
-    }
-}
+const singleton_class_js_1 = require("./singleton-class.js");
+const singleton_decorator_js_1 = require("./singleton-decorator.js");
 exports.Singleton = function (...args) {
     // ClassDecorator
     if (!this) {
         const [type, options] = args;
-        return function (target) {
-            const name = options?.name || target.name.match(NAME_PATTERN)?.[1] || target.name;
-            const metadata = Reflect.getOwnMetadata(constants_js_1.METADATA_KEY, target) || {};
-            metadata.kind = index_js_2.OpraSchema.Singleton.Kind;
-            metadata.name = name;
-            metadata.type = type;
-            // Merge with previous metadata object
-            const m = Reflect.getMetadata(constants_js_1.METADATA_KEY, target);
-            if (m && metadata !== m)
-                Object.assign(metadata, (0, lodash_omit_1.default)(m), Object.keys(metadata));
-            // Merge options
-            if (options)
-                Object.assign(metadata, (0, lodash_omit_1.default)(options, ['kind', 'name', 'type', 'controller']));
-            Reflect.defineMetadata(constants_js_1.METADATA_KEY, metadata, target);
-            /* Define Injectable metadata for NestJS support*/
-            Reflect.defineMetadata(NESTJS_INJECTABLE_WATERMARK, true, target);
-        };
+        return exports.Singleton[constants_js_1.DECORATOR].call(undefined, type, options);
     }
     // Constructor
     const [document, init] = args;
-    (0, putil_merge_1.default)(this, new SingletonClass(document, init), { descriptor: true });
+    (0, putil_merge_1.default)(this, new singleton_class_js_1.SingletonClass(document, init), { descriptor: true });
 };
-exports.Singleton.prototype = SingletonClass.prototype;
-function createOperationDecorator(operation) {
-    return (options) => ((target, propertyKey) => {
-        if (propertyKey !== operation)
-            throw new TypeError(`Name of the handler name should be '${operation}'`);
-        const operationMeta = { ...options };
-        const resourceMetadata = (Reflect.getOwnMetadata(constants_js_1.METADATA_KEY, target.constructor) || {});
-        resourceMetadata.operations = resourceMetadata.operations || {};
-        resourceMetadata.operations[operation] = operationMeta;
-        Reflect.defineMetadata(constants_js_1.METADATA_KEY, resourceMetadata, target.constructor);
-    });
-}
-exports.Singleton.Create = createOperationDecorator('create');
-exports.Singleton.Get = createOperationDecorator('get');
-exports.Singleton.Delete = createOperationDecorator('delete');
-exports.Singleton.Update = createOperationDecorator('update');
+exports.Singleton.prototype = singleton_class_js_1.SingletonClass.prototype;
+Object.assign(exports.Singleton, singleton_decorator_js_1.SingletonDecorator);
+exports.Singleton[constants_js_1.DECORATOR] = singleton_decorator_js_1.SingletonDecorator;

package/cjs/document/resource/storage-class.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StorageClass = void 0;
+const index_js_1 = require("../../helpers/index.js");
+const index_js_2 = require("../../schema/index.js");
+const resource_js_1 = require("./resource.js");
+class StorageClass extends resource_js_1.Resource {
+    constructor(document, init) {
+        super(document, init);
+        this.kind = index_js_2.OpraSchema.Storage.Kind;
+        this.controller = init.controller;
+        this.operations = { ...init.operations };
+    }
+    exportSchema() {
+        return {
+            ...super.exportSchema(),
+            ...(0, index_js_1.omitUndefined)({
+                kind: index_js_2.OpraSchema.Storage.Kind,
+                operations: this.operations
+            })
+        };
+    }
+}
+exports.StorageClass = StorageClass;

package/cjs/document/resource/storage-decorator.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.StorageDecorator = void 0;
+const tslib_1 = require("tslib");
+const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
+const index_js_1 = require("../../schema/index.js");
+const constants_js_1 = require("../constants.js");
+const resource_decorator_js_1 = require("./resource-decorator.js");
+const NAME_PATTERN = /^(.*)(Resource|Storage|Controller)$/;
+const operationProperties = ['delete', 'get', 'post'];
+function StorageDecorator(options) {
+    return function (target) {
+        const name = options?.name || target.name.match(NAME_PATTERN)?.[1] || target.name;
+        const metadata = Reflect.getOwnMetadata(constants_js_1.SOURCE_METADATA, target) || {};
+        metadata.kind = index_js_1.OpraSchema.Storage.Kind;
+        metadata.name = name;
+        // Merge with previous metadata object
+        const m = Reflect.getMetadata(constants_js_1.SOURCE_METADATA, target);
+        if (m && metadata !== m)
+            Object.assign(metadata, (0, lodash_omit_1.default)(m), Object.keys(metadata));
+        // Merge options
+        if (options)
+            Object.assign(metadata, (0, lodash_omit_1.default)(options, ['kind', 'name', 'type', 'controller']));
+        Reflect.defineMetadata(constants_js_1.SOURCE_METADATA, metadata, target);
+    };
+}
+exports.StorageDecorator = StorageDecorator;
+Object.assign(StorageDecorator, resource_decorator_js_1.ResourceDecorator);
+StorageDecorator.Delete = createOperationDecorator('delete');
+StorageDecorator.Get = createOperationDecorator('get');
+StorageDecorator.Post = createOperationDecorator('post');
+StorageDecorator.Action = function (options) {
+    const oldDecorator = resource_decorator_js_1.ResourceDecorator.Action(options);
+    const operators = ['delete', 'get', 'post'];
+    return (target, propertyKey) => {
+        if (typeof propertyKey === 'string' && operators.includes(propertyKey))
+            throw new TypeError(`The "${propertyKey}" property is reserved for "${propertyKey}" operations and cannot be used as an action'`);
+        return oldDecorator(target, propertyKey);
+    };
+};
+function createOperationDecorator(operation) {
+    return (options) => ((target, propertyKey) => {
+        if (propertyKey !== operation)
+            throw new TypeError(`Name of the handler name should be '${operation}'`);
+        const operationMeta = { ...options };
+        const sourceMetadata = (Reflect.getOwnMetadata(constants_js_1.SOURCE_METADATA, target.constructor) || {});
+        sourceMetadata.operations = sourceMetadata.operations || {};
+        sourceMetadata.operations[operation] = operationMeta;
+        Reflect.defineMetadata(constants_js_1.SOURCE_METADATA, sourceMetadata, target.constructor);
+    });
+}

package/cjs/document/resource/storage.js

@@ -2,66 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Storage = void 0;
 const tslib_1 = require("tslib");
-const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
 const putil_merge_1 = tslib_1.__importDefault(require("putil-merge"));
-const index_js_1 = require("../../helpers/index.js");
-const index_js_2 = require("../../schema/index.js");
 const constants_js_1 = require("../constants.js");
-const resource_js_1 = require("./resource.js");
-const NESTJS_INJECTABLE_WATERMARK = '__injectable__';
-const NAME_PATTERN = /^(.*)(Resource)$/;
-class StorageClass extends resource_js_1.Resource {
-    constructor(document, init) {
-        super(document, init);
-        this.kind = index_js_2.OpraSchema.Storage.Kind;
-        this.controller = init.controller;
-        this.operations = { ...init.operations };
-    }
-    exportSchema() {
-        const out = resource_js_1.Resource.prototype.exportSchema.call(this);
-        Object.assign(out, (0, index_js_1.omitUndefined)({
-            operations: this.operations
-        }));
-        return out;
-    }
-}
+const storage_class_js_1 = require("./storage-class.js");
+const storage_decorator_js_1 = require("./storage-decorator.js");
 exports.Storage = function (...args) {
     // ClassDecorator
     if (!this) {
         const [options] = args;
-        return function (target) {
-            const name = options?.name || target.name.match(NAME_PATTERN)?.[1] || target.name;
-            const metadata = Reflect.getOwnMetadata(constants_js_1.METADATA_KEY, target) || {};
-            metadata.kind = index_js_2.OpraSchema.Storage.Kind;
-            metadata.name = name;
-            // Merge with previous metadata object
-            const m = Reflect.getMetadata(constants_js_1.METADATA_KEY, target);
-            if (m && metadata !== m)
-                Object.assign(metadata, (0, lodash_omit_1.default)(m), Object.keys(metadata));
-            // Merge options
-            if (options)
-                Object.assign(metadata, (0, lodash_omit_1.default)(options, ['kind', 'name', 'type', 'controller']));
-            Reflect.defineMetadata(constants_js_1.METADATA_KEY, metadata, target);
-            /* Define Injectable metadata for NestJS support*/
-            Reflect.defineMetadata(NESTJS_INJECTABLE_WATERMARK, true, target);
-        };
+        return exports.Storage[constants_js_1.DECORATOR].call(undefined, options);
     }
     // Constructor
     const [document, init] = args;
-    (0, putil_merge_1.default)(this, new StorageClass(document, init), { descriptor: true });
+    (0, putil_merge_1.default)(this, new storage_class_js_1.StorageClass(document, init), { descriptor: true });
 };
-exports.Storage.prototype = StorageClass.prototype;
-function createOperationDecorator(operation) {
-    return (options) => ((target, propertyKey) => {
-        if (propertyKey !== operation)
-            throw new TypeError(`Name of the handler name should be '${operation}'`);
-        const operationMeta = { ...options };
-        const resourceMetadata = (Reflect.getOwnMetadata(constants_js_1.METADATA_KEY, target.constructor) || {});
-        resourceMetadata.operations = resourceMetadata.operations || {};
-        resourceMetadata.operations[operation] = operationMeta;
-        Reflect.defineMetadata(constants_js_1.METADATA_KEY, resourceMetadata, target.constructor);
-    });
-}
-exports.Storage.Delete = createOperationDecorator('delete');
-exports.Storage.Get = createOperationDecorator('get');
-exports.Storage.Post = createOperationDecorator('post');
+exports.Storage.prototype = storage_class_js_1.StorageClass.prototype;
+Object.assign(exports.Storage, storage_decorator_js_1.StorageDecorator);
+exports.Storage[constants_js_1.DECORATOR] = storage_decorator_js_1.StorageDecorator;