@opra/common 0.24.0 → 0.24.2

package/browser.js

@@ -15,7 +15,7 @@ import "reflect-metadata";
 
 // ../../build/common/esm/document/constants.js
 var DATATYPE_METADATA = Symbol("DATATYPE_METADATA");
-var SOURCE_METADATA = Symbol("SOURCE_METADATA");
+var RESOURCE_METADATA = Symbol("RESOURCE_METADATA");
 var DECORATOR = Symbol("DECORATOR");
 var NAMESPACE_PATTERN = /([A-Z$_]\w+)(?::.+)?/i;
 var TYPENAME_PATTERN = /^(.*)Type(\d*)$/;
@@ -987,7 +987,7 @@ function isEnumType(obj) {
 }
 __name(isEnumType, "isEnumType");
 function isSource(obj) {
-  return obj && typeof obj === "object" && (obj.kind === Container.Kind || obj.kind === Collection.Kind || obj.kind === Singleton.Kind);
+  return obj && typeof obj === "object" && (obj.kind === Container.Kind || obj.kind === Collection.Kind || obj.kind === Singleton.Kind || obj.kind === Storage.Kind);
 }
 __name(isSource, "isSource");
 function isCollection(obj) {
@@ -1949,7 +1949,7 @@ async function importResourceClass(thunk) {
   if (cached)
     return cached;
   const ctor = typeof thunk === "function" ? thunk : Object.getPrototypeOf(thunk).constructor;
-  let metadata = Reflect.getMetadata(SOURCE_METADATA, ctor);
+  let metadata = Reflect.getMetadata(RESOURCE_METADATA, ctor);
   if (!metadata && opra_schema_ns_exports.isSource(metadata))
     throw new TypeError(`Class "${ctor.name}" doesn't have a valid Resource metadata`);
   metadata = cloneObject(metadata);
@@ -9814,29 +9814,49 @@ function _generateCodec(type, codec, options) {
 }
 __name(_generateCodec, "_generateCodec");
 
+// ../../build/common/esm/document/resource/action.js
+var Action = class {
+  static {
+    __name(this, "Action");
+  }
+  constructor(init) {
+    this.name = init.name;
+  }
+  exportSchema() {
+    return {};
+  }
+};
+
 // ../../build/common/esm/document/resource/resource.js
 var Resource = class {
   static {
     __name(this, "Resource");
   }
   constructor(document, init) {
-    this.actions = new ResponsiveMap();
+    this.actions = {};
     this.document = document;
     this.name = init.name;
     this.description = init.description;
     this.controller = init.controller;
+    if (init.actions) {
+      for (const [name, meta] of Object.entries(init.actions)) {
+        this.actions[name.toLowerCase()] = new Action({ ...meta, name });
+      }
+    }
   }
   exportSchema() {
     const schema = omitUndefined({
       kind: this.kind,
       description: this.description
     });
-    if (this.actions.size) {
-      const actions = schema.actions = {};
-      for (const [name, r] of this.actions.entries()) {
-        actions[name] = r.exportSchema();
-      }
+    const actions = {};
+    let i = 0;
+    for (const action of Object.values(this.actions)) {
+      actions[action.name] = action.exportSchema();
+      i++;
     }
+    if (i)
+      schema.actions = actions;
     return schema;
   }
   toString() {
@@ -10012,10 +10032,10 @@ ResourceDecorator.Action = function(options) {
     if (typeof propertyKey !== "string")
       throw new TypeError(`This decorator can't be used for Symbol keys'`);
     const actionMeta = { ...options };
-    const resourceMetadata = Reflect.getOwnMetadata(SOURCE_METADATA, target.constructor) || {};
+    const resourceMetadata = Reflect.getOwnMetadata(RESOURCE_METADATA, target.constructor) || {};
     resourceMetadata.actions = resourceMetadata.actions || {};
     resourceMetadata.actions[propertyKey] = actionMeta;
-    Reflect.defineMetadata(SOURCE_METADATA, resourceMetadata, target.constructor);
+    Reflect.defineMetadata(RESOURCE_METADATA, resourceMetadata, target.constructor);
   };
 };
 
@@ -10025,20 +10045,20 @@ var operationProperties = ["create", "delete", "deleteMany", "get", "findMany",
 function CollectionDecorator(type, options) {
   return function(target) {
     const name = options?.name || target.name.match(NAME_PATTERN)?.[1] || target.name;
-    const metadata = Reflect.getOwnMetadata(SOURCE_METADATA, target) || {};
-    const baseMetadata = Reflect.getOwnMetadata(SOURCE_METADATA, Object.getPrototypeOf(target));
+    const metadata = Reflect.getOwnMetadata(RESOURCE_METADATA, target) || {};
+    const baseMetadata = Reflect.getOwnMetadata(RESOURCE_METADATA, Object.getPrototypeOf(target));
     if (baseMetadata) {
       merge7(metadata, baseMetadata, { deep: true });
     }
     metadata.kind = opra_schema_ns_exports.Collection.Kind;
     metadata.name = name;
     metadata.type = type;
-    const m = Reflect.getMetadata(SOURCE_METADATA, target);
+    const m = Reflect.getMetadata(RESOURCE_METADATA, target);
     if (m && metadata !== m)
       Object.assign(metadata, omit4(m), Object.keys(metadata));
     if (options)
       Object.assign(metadata, omit4(options, ["kind", "name", "type", "controller"]));
-    Reflect.defineMetadata(SOURCE_METADATA, metadata, target);
+    Reflect.defineMetadata(RESOURCE_METADATA, metadata, target);
   };
 }
 __name(CollectionDecorator, "CollectionDecorator");
@@ -10063,10 +10083,10 @@ function createOperationDecorator(operation) {
     if (propertyKey !== operation)
       throw new TypeError(`Name of the handler name should be '${operation}'`);
     const operationMeta = { ...options };
-    const sourceMetadata = Reflect.getOwnMetadata(SOURCE_METADATA, target.constructor) || {};
+    const sourceMetadata = Reflect.getOwnMetadata(RESOURCE_METADATA, target.constructor) || {};
     sourceMetadata.operations = sourceMetadata.operations || {};
     sourceMetadata.operations[operation] = operationMeta;
-    Reflect.defineMetadata(SOURCE_METADATA, sourceMetadata, target.constructor);
+    Reflect.defineMetadata(RESOURCE_METADATA, sourceMetadata, target.constructor);
   };
 }
 __name(createOperationDecorator, "createOperationDecorator");
@@ -10143,16 +10163,16 @@ var NAME_PATTERN2 = /^(.*)(Resource|Singleton|Controller)$/;
 function SingletonDecorator(type, options) {
   return function(target) {
     const name = options?.name || target.name.match(NAME_PATTERN2)?.[1] || target.name;
-    const metadata = Reflect.getOwnMetadata(SOURCE_METADATA, target) || {};
+    const metadata = Reflect.getOwnMetadata(RESOURCE_METADATA, target) || {};
     metadata.kind = opra_schema_ns_exports.Singleton.Kind;
     metadata.name = name;
     metadata.type = type;
-    const m = Reflect.getMetadata(SOURCE_METADATA, target);
+    const m = Reflect.getMetadata(RESOURCE_METADATA, target);
     if (m && metadata !== m)
       Object.assign(metadata, omit5(m), Object.keys(metadata));
     if (options)
       Object.assign(metadata, omit5(options, ["kind", "name", "type", "controller"]));
-    Reflect.defineMetadata(SOURCE_METADATA, metadata, target);
+    Reflect.defineMetadata(RESOURCE_METADATA, metadata, target);
   };
 }
 __name(SingletonDecorator, "SingletonDecorator");
@@ -10175,10 +10195,10 @@ function createOperationDecorator2(operation) {
     if (propertyKey !== operation)
       throw new TypeError(`Name of the handler name should be '${operation}'`);
     const operationMeta = { ...options };
-    const sourceMetadata = Reflect.getOwnMetadata(SOURCE_METADATA, target.constructor) || {};
+    const sourceMetadata = Reflect.getOwnMetadata(RESOURCE_METADATA, target.constructor) || {};
     sourceMetadata.operations = sourceMetadata.operations || {};
     sourceMetadata.operations[operation] = operationMeta;
-    Reflect.defineMetadata(SOURCE_METADATA, sourceMetadata, target.constructor);
+    Reflect.defineMetadata(RESOURCE_METADATA, sourceMetadata, target.constructor);
   };
 }
 __name(createOperationDecorator2, "createOperationDecorator");
@@ -10227,15 +10247,15 @@ var NAME_PATTERN3 = /^(.*)(Resource|Storage|Controller)$/;
 function StorageDecorator(options) {
   return function(target) {
     const name = options?.name || target.name.match(NAME_PATTERN3)?.[1] || target.name;
-    const metadata = Reflect.getOwnMetadata(SOURCE_METADATA, target) || {};
+    const metadata = Reflect.getOwnMetadata(RESOURCE_METADATA, target) || {};
     metadata.kind = opra_schema_ns_exports.Storage.Kind;
     metadata.name = name;
-    const m = Reflect.getMetadata(SOURCE_METADATA, target);
+    const m = Reflect.getMetadata(RESOURCE_METADATA, target);
     if (m && metadata !== m)
       Object.assign(metadata, omit6(m), Object.keys(metadata));
     if (options)
       Object.assign(metadata, omit6(options, ["kind", "name", "type", "controller"]));
-    Reflect.defineMetadata(SOURCE_METADATA, metadata, target);
+    Reflect.defineMetadata(RESOURCE_METADATA, metadata, target);
   };
 }
 __name(StorageDecorator, "StorageDecorator");
@@ -10257,10 +10277,10 @@ function createOperationDecorator3(operation) {
     if (propertyKey !== operation)
       throw new TypeError(`Name of the handler name should be '${operation}'`);
     const operationMeta = { ...options };
-    const sourceMetadata = Reflect.getOwnMetadata(SOURCE_METADATA, target.constructor) || {};
+    const sourceMetadata = Reflect.getOwnMetadata(RESOURCE_METADATA, target.constructor) || {};
     sourceMetadata.operations = sourceMetadata.operations || {};
     sourceMetadata.operations[operation] = operationMeta;
-    Reflect.defineMetadata(SOURCE_METADATA, sourceMetadata, target.constructor);
+    Reflect.defineMetadata(RESOURCE_METADATA, sourceMetadata, target.constructor);
   };
 }
 __name(createOperationDecorator3, "createOperationDecorator");
@@ -11304,11 +11324,11 @@ export {
   OpraURL,
   OpraURLPath,
   PickType,
+  RESOURCE_METADATA,
   Resource,
   ResourceConflictError,
   ResourceNotFoundError,
   ResponsiveMap,
-  SOURCE_METADATA,
   SimpleType2 as SimpleType,
   Singleton2 as Singleton,
   Storage2 as Storage,

package/cjs/document/constants.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TYPENAME_PATTERN = exports.NAMESPACE_PATTERN = exports.DECORATOR = exports.SOURCE_METADATA = exports.DATATYPE_METADATA = void 0;
+exports.TYPENAME_PATTERN = exports.NAMESPACE_PATTERN = exports.DECORATOR = exports.RESOURCE_METADATA = exports.DATATYPE_METADATA = void 0;
 exports.DATATYPE_METADATA = Symbol('DATATYPE_METADATA');
-exports.SOURCE_METADATA = Symbol('SOURCE_METADATA');
+exports.RESOURCE_METADATA = Symbol('RESOURCE_METADATA');
 exports.DECORATOR = Symbol('DECORATOR');
 exports.NAMESPACE_PATTERN = /([A-Z$_]\w+)(?::.+)?/i;
 exports.TYPENAME_PATTERN = /^(.*)Type(\d*)$/;

package/cjs/document/factory/import-resource-class.js

@@ -12,7 +12,7 @@ async function importResourceClass(thunk) {
     if (cached)
         return cached;
     const ctor = typeof thunk === 'function' ? thunk : Object.getPrototypeOf(thunk).constructor;
-    let metadata = Reflect.getMetadata(constants_js_1.SOURCE_METADATA, ctor);
+    let metadata = Reflect.getMetadata(constants_js_1.RESOURCE_METADATA, ctor);
     if (!metadata && index_js_2.OpraSchema.isSource(metadata))
         throw new TypeError(`Class "${ctor.name}" doesn't have a valid Resource metadata`);
     // const controller = typeof thunk === 'function' ? new ctor() : thunk;

package/cjs/document/resource/action.js

@@ -2,6 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Action = void 0;
 class Action {
+    constructor(init) {
+        this.name = init.name;
+    }
     exportSchema() {
         return {};
     }

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

@@ -12,8 +12,8 @@ const operationProperties = ['create', 'delete', 'deleteMany', 'get', 'findMany'
 function CollectionDecorator(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) || {};
-        const baseMetadata = Reflect.getOwnMetadata(constants_js_1.SOURCE_METADATA, Object.getPrototypeOf(target));
+        const metadata = Reflect.getOwnMetadata(constants_js_1.RESOURCE_METADATA, target) || {};
+        const baseMetadata = Reflect.getOwnMetadata(constants_js_1.RESOURCE_METADATA, Object.getPrototypeOf(target));
         if (baseMetadata) {
             (0, putil_merge_1.default)(metadata, baseMetadata, { deep: true });
         }
@@ -21,13 +21,13 @@ function CollectionDecorator(type, options) {
         metadata.name = name;
         metadata.type = type;
         // Merge with previous metadata object
-        const m = Reflect.getMetadata(constants_js_1.SOURCE_METADATA, target);
+        const m = Reflect.getMetadata(constants_js_1.RESOURCE_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);
+        Reflect.defineMetadata(constants_js_1.RESOURCE_METADATA, metadata, target);
     };
 }
 exports.CollectionDecorator = CollectionDecorator;
@@ -52,9 +52,9 @@ function createOperationDecorator(operation) {
         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) || {});
+        const sourceMetadata = (Reflect.getOwnMetadata(constants_js_1.RESOURCE_METADATA, target.constructor) || {});
         sourceMetadata.operations = sourceMetadata.operations || {};
         sourceMetadata.operations[operation] = operationMeta;
-        Reflect.defineMetadata(constants_js_1.SOURCE_METADATA, sourceMetadata, target.constructor);
+        Reflect.defineMetadata(constants_js_1.RESOURCE_METADATA, sourceMetadata, target.constructor);
     });
 }

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

@@ -8,9 +8,9 @@ exports.ResourceDecorator.Action = function (options) {
         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) || {});
+        const resourceMetadata = (Reflect.getOwnMetadata(constants_js_1.RESOURCE_METADATA, target.constructor) || {});
         resourceMetadata.actions = resourceMetadata.actions || {};
         resourceMetadata.actions[propertyKey] = actionMeta;
-        Reflect.defineMetadata(constants_js_1.SOURCE_METADATA, resourceMetadata, target.constructor);
+        Reflect.defineMetadata(constants_js_1.RESOURCE_METADATA, resourceMetadata, target.constructor);
     };
 };

package/cjs/document/resource/resource.js

@@ -1,28 +1,35 @@
 "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");
+const action_js_1 = require("./action.js");
 class Resource {
     constructor(document, init) {
-        this.actions = new index_js_1.ResponsiveMap();
+        this.actions = {};
         this.document = document;
         this.name = init.name;
         this.description = init.description;
         this.controller = init.controller;
+        if (init.actions) {
+            for (const [name, meta] of Object.entries(init.actions)) {
+                this.actions[name.toLowerCase()] = new action_js_1.Action({ ...meta, name });
+            }
+        }
     }
     exportSchema() {
         const schema = (0, object_utils_js_1.omitUndefined)({
             kind: this.kind,
             description: this.description,
         });
-        if (this.actions.size) {
-            const actions = schema.actions = {};
-            for (const [name, r] of this.actions.entries()) {
-                actions[name] = r.exportSchema();
-            }
+        const actions = {};
+        let i = 0;
+        for (const action of Object.values(this.actions)) {
+            actions[action.name] = action.exportSchema();
+            i++;
         }
+        if (i)
+            schema.actions = actions;
         return schema;
     }
     toString() {

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

@@ -11,18 +11,18 @@ 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) || {};
+        const metadata = Reflect.getOwnMetadata(constants_js_1.RESOURCE_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);
+        const m = Reflect.getMetadata(constants_js_1.RESOURCE_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);
+        Reflect.defineMetadata(constants_js_1.RESOURCE_METADATA, metadata, target);
     };
 }
 exports.SingletonDecorator = SingletonDecorator;
@@ -45,9 +45,9 @@ function createOperationDecorator(operation) {
         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) || {});
+        const sourceMetadata = (Reflect.getOwnMetadata(constants_js_1.RESOURCE_METADATA, target.constructor) || {});
         sourceMetadata.operations = sourceMetadata.operations || {};
         sourceMetadata.operations[operation] = operationMeta;
-        Reflect.defineMetadata(constants_js_1.SOURCE_METADATA, sourceMetadata, target.constructor);
+        Reflect.defineMetadata(constants_js_1.RESOURCE_METADATA, sourceMetadata, target.constructor);
     });
 }

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

@@ -11,17 +11,17 @@ 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) || {};
+        const metadata = Reflect.getOwnMetadata(constants_js_1.RESOURCE_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);
+        const m = Reflect.getMetadata(constants_js_1.RESOURCE_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);
+        Reflect.defineMetadata(constants_js_1.RESOURCE_METADATA, metadata, target);
     };
 }
 exports.StorageDecorator = StorageDecorator;
@@ -43,9 +43,9 @@ function createOperationDecorator(operation) {
         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) || {});
+        const sourceMetadata = (Reflect.getOwnMetadata(constants_js_1.RESOURCE_METADATA, target.constructor) || {});
         sourceMetadata.operations = sourceMetadata.operations || {};
         sourceMetadata.operations[operation] = operationMeta;
-        Reflect.defineMetadata(constants_js_1.SOURCE_METADATA, sourceMetadata, target.constructor);
+        Reflect.defineMetadata(constants_js_1.RESOURCE_METADATA, sourceMetadata, target.constructor);
     });
 }

package/cjs/schema/type-guards.js

@@ -43,7 +43,8 @@ function isSource(obj) {
     return obj && typeof obj === 'object' &&
         (obj.kind === container_interface_js_1.Container.Kind ||
             obj.kind === collection_interface_js_1.Collection.Kind ||
-            obj.kind === singleton_interface_js_1.Singleton.Kind);
+            obj.kind === singleton_interface_js_1.Singleton.Kind ||
+            obj.kind === storage_interface_js_1.Storage.Kind);
 }
 exports.isSource = isSource;
 function isCollection(obj) {

package/esm/document/constants.js

@@ -1,5 +1,5 @@
 export const DATATYPE_METADATA = Symbol('DATATYPE_METADATA');
-export const SOURCE_METADATA = Symbol('SOURCE_METADATA');
+export const RESOURCE_METADATA = Symbol('RESOURCE_METADATA');
 export const DECORATOR = Symbol('DECORATOR');
 export const NAMESPACE_PATTERN = /([A-Z$_]\w+)(?::.+)?/i;
 export const TYPENAME_PATTERN = /^(.*)Type(\d*)$/;

package/esm/document/factory/import-resource-class.js

@@ -1,7 +1,7 @@
 import 'reflect-metadata';
 import { cloneObject, resolveClass, resolveThunk } from '../../helpers/index.js';
 import { OpraSchema } from '../../schema/index.js';
-import { SOURCE_METADATA } from '../constants.js';
+import { RESOURCE_METADATA } from '../constants.js';
 export async function importResourceClass(thunk) {
     const { document, sourceQueue, cache } = this;
     const controller = await resolveThunk(thunk);
@@ -9,7 +9,7 @@ export async function importResourceClass(thunk) {
     if (cached)
         return cached;
     const ctor = typeof thunk === 'function' ? thunk : Object.getPrototypeOf(thunk).constructor;
-    let metadata = Reflect.getMetadata(SOURCE_METADATA, ctor);
+    let metadata = Reflect.getMetadata(RESOURCE_METADATA, ctor);
     if (!metadata && OpraSchema.isSource(metadata))
         throw new TypeError(`Class "${ctor.name}" doesn't have a valid Resource metadata`);
     // const controller = typeof thunk === 'function' ? new ctor() : thunk;

package/esm/document/resource/action.js

@@ -1,4 +1,7 @@
 export class Action {
+    constructor(init) {
+        this.name = init.name;
+    }
     exportSchema() {
         return {};
     }

package/esm/document/resource/collection-decorator.js

@@ -1,15 +1,15 @@
 import omit from 'lodash.omit';
 import merge from 'putil-merge';
 import { OpraSchema } from '../../schema/index.js';
-import { SOURCE_METADATA } from '../constants.js';
+import { RESOURCE_METADATA } from '../constants.js';
 import { ResourceDecorator } from './resource-decorator.js';
 const NAME_PATTERN = /^(.*)(Resource|Collection|Controller)$/;
 const operationProperties = ['create', 'delete', 'deleteMany', 'get', 'findMany', 'update', 'updateMany'];
 export function CollectionDecorator(type, options) {
     return function (target) {
         const name = options?.name || target.name.match(NAME_PATTERN)?.[1] || target.name;
-        const metadata = Reflect.getOwnMetadata(SOURCE_METADATA, target) || {};
-        const baseMetadata = Reflect.getOwnMetadata(SOURCE_METADATA, Object.getPrototypeOf(target));
+        const metadata = Reflect.getOwnMetadata(RESOURCE_METADATA, target) || {};
+        const baseMetadata = Reflect.getOwnMetadata(RESOURCE_METADATA, Object.getPrototypeOf(target));
         if (baseMetadata) {
             merge(metadata, baseMetadata, { deep: true });
         }
@@ -17,13 +17,13 @@ export function CollectionDecorator(type, options) {
         metadata.name = name;
         metadata.type = type;
         // Merge with previous metadata object
-        const m = Reflect.getMetadata(SOURCE_METADATA, target);
+        const m = Reflect.getMetadata(RESOURCE_METADATA, target);
         if (m && metadata !== m)
             Object.assign(metadata, omit(m), Object.keys(metadata));
         // Merge options
         if (options)
             Object.assign(metadata, omit(options, ['kind', 'name', 'type', 'controller']));
-        Reflect.defineMetadata(SOURCE_METADATA, metadata, target);
+        Reflect.defineMetadata(RESOURCE_METADATA, metadata, target);
     };
 }
 Object.assign(CollectionDecorator, ResourceDecorator);
@@ -47,9 +47,9 @@ function createOperationDecorator(operation) {
         if (propertyKey !== operation)
             throw new TypeError(`Name of the handler name should be '${operation}'`);
         const operationMeta = { ...options };
-        const sourceMetadata = (Reflect.getOwnMetadata(SOURCE_METADATA, target.constructor) || {});
+        const sourceMetadata = (Reflect.getOwnMetadata(RESOURCE_METADATA, target.constructor) || {});
         sourceMetadata.operations = sourceMetadata.operations || {};
         sourceMetadata.operations[operation] = operationMeta;
-        Reflect.defineMetadata(SOURCE_METADATA, sourceMetadata, target.constructor);
+        Reflect.defineMetadata(RESOURCE_METADATA, sourceMetadata, target.constructor);
     });
 }

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

@@ -1,13 +1,13 @@
-import { SOURCE_METADATA } from '../constants.js';
+import { RESOURCE_METADATA } from '../constants.js';
 export const ResourceDecorator = {};
 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(SOURCE_METADATA, target.constructor) || {});
+        const resourceMetadata = (Reflect.getOwnMetadata(RESOURCE_METADATA, target.constructor) || {});
         resourceMetadata.actions = resourceMetadata.actions || {};
         resourceMetadata.actions[propertyKey] = actionMeta;
-        Reflect.defineMetadata(SOURCE_METADATA, resourceMetadata, target.constructor);
+        Reflect.defineMetadata(RESOURCE_METADATA, resourceMetadata, target.constructor);
     };
 };

package/esm/document/resource/resource.js

@@ -1,25 +1,32 @@
-import { ResponsiveMap } from '../../helpers/index.js';
 import { omitUndefined } from '../../helpers/object-utils.js';
 import { colorFgMagenta, colorFgYellow, colorReset, nodeInspectCustom } from '../utils/inspect.util.js';
+import { Action } from './action.js';
 export class Resource {
     constructor(document, init) {
-        this.actions = new ResponsiveMap();
+        this.actions = {};
         this.document = document;
         this.name = init.name;
         this.description = init.description;
         this.controller = init.controller;
+        if (init.actions) {
+            for (const [name, meta] of Object.entries(init.actions)) {
+                this.actions[name.toLowerCase()] = new Action({ ...meta, name });
+            }
+        }
     }
     exportSchema() {
         const schema = omitUndefined({
             kind: this.kind,
             description: this.description,
         });
-        if (this.actions.size) {
-            const actions = schema.actions = {};
-            for (const [name, r] of this.actions.entries()) {
-                actions[name] = r.exportSchema();
-            }
+        const actions = {};
+        let i = 0;
+        for (const action of Object.values(this.actions)) {
+            actions[action.name] = action.exportSchema();
+            i++;
         }
+        if (i)
+            schema.actions = actions;
         return schema;
     }
     toString() {

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

@@ -1,24 +1,24 @@
 import omit from 'lodash.omit';
 import { OpraSchema } from '../../schema/index.js';
-import { SOURCE_METADATA } from '../constants.js';
+import { RESOURCE_METADATA } from '../constants.js';
 import { ResourceDecorator } from './resource-decorator.js';
 const NAME_PATTERN = /^(.*)(Resource|Singleton|Controller)$/;
 const operationProperties = ['create', 'delete', 'get', 'update'];
 export function SingletonDecorator(type, options) {
     return function (target) {
         const name = options?.name || target.name.match(NAME_PATTERN)?.[1] || target.name;
-        const metadata = Reflect.getOwnMetadata(SOURCE_METADATA, target) || {};
+        const metadata = Reflect.getOwnMetadata(RESOURCE_METADATA, target) || {};
         metadata.kind = OpraSchema.Singleton.Kind;
         metadata.name = name;
         metadata.type = type;
         // Merge with previous metadata object
-        const m = Reflect.getMetadata(SOURCE_METADATA, target);
+        const m = Reflect.getMetadata(RESOURCE_METADATA, target);
         if (m && metadata !== m)
             Object.assign(metadata, omit(m), Object.keys(metadata));
         // Merge options
         if (options)
             Object.assign(metadata, omit(options, ['kind', 'name', 'type', 'controller']));
-        Reflect.defineMetadata(SOURCE_METADATA, metadata, target);
+        Reflect.defineMetadata(RESOURCE_METADATA, metadata, target);
     };
 }
 Object.assign(SingletonDecorator, ResourceDecorator);
@@ -40,9 +40,9 @@ function createOperationDecorator(operation) {
         if (propertyKey !== operation)
             throw new TypeError(`Name of the handler name should be '${operation}'`);
         const operationMeta = { ...options };
-        const sourceMetadata = (Reflect.getOwnMetadata(SOURCE_METADATA, target.constructor) || {});
+        const sourceMetadata = (Reflect.getOwnMetadata(RESOURCE_METADATA, target.constructor) || {});
         sourceMetadata.operations = sourceMetadata.operations || {};
         sourceMetadata.operations[operation] = operationMeta;
-        Reflect.defineMetadata(SOURCE_METADATA, sourceMetadata, target.constructor);
+        Reflect.defineMetadata(RESOURCE_METADATA, sourceMetadata, target.constructor);
     });
 }

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

@@ -1,23 +1,23 @@
 import omit from 'lodash.omit';
 import { OpraSchema } from '../../schema/index.js';
-import { SOURCE_METADATA } from '../constants.js';
+import { RESOURCE_METADATA } from '../constants.js';
 import { ResourceDecorator } from './resource-decorator.js';
 const NAME_PATTERN = /^(.*)(Resource|Storage|Controller)$/;
 const operationProperties = ['delete', 'get', 'post'];
 export function StorageDecorator(options) {
     return function (target) {
         const name = options?.name || target.name.match(NAME_PATTERN)?.[1] || target.name;
-        const metadata = Reflect.getOwnMetadata(SOURCE_METADATA, target) || {};
+        const metadata = Reflect.getOwnMetadata(RESOURCE_METADATA, target) || {};
         metadata.kind = OpraSchema.Storage.Kind;
         metadata.name = name;
         // Merge with previous metadata object
-        const m = Reflect.getMetadata(SOURCE_METADATA, target);
+        const m = Reflect.getMetadata(RESOURCE_METADATA, target);
         if (m && metadata !== m)
             Object.assign(metadata, omit(m), Object.keys(metadata));
         // Merge options
         if (options)
             Object.assign(metadata, omit(options, ['kind', 'name', 'type', 'controller']));
-        Reflect.defineMetadata(SOURCE_METADATA, metadata, target);
+        Reflect.defineMetadata(RESOURCE_METADATA, metadata, target);
     };
 }
 Object.assign(StorageDecorator, ResourceDecorator);
@@ -38,9 +38,9 @@ function createOperationDecorator(operation) {
         if (propertyKey !== operation)
             throw new TypeError(`Name of the handler name should be '${operation}'`);
         const operationMeta = { ...options };
-        const sourceMetadata = (Reflect.getOwnMetadata(SOURCE_METADATA, target.constructor) || {});
+        const sourceMetadata = (Reflect.getOwnMetadata(RESOURCE_METADATA, target.constructor) || {});
         sourceMetadata.operations = sourceMetadata.operations || {};
         sourceMetadata.operations[operation] = operationMeta;
-        Reflect.defineMetadata(SOURCE_METADATA, sourceMetadata, target.constructor);
+        Reflect.defineMetadata(RESOURCE_METADATA, sourceMetadata, target.constructor);
     });
 }

package/esm/schema/type-guards.js

@@ -34,7 +34,8 @@ export function isSource(obj) {
     return obj && typeof obj === 'object' &&
         (obj.kind === Container.Kind ||
             obj.kind === Collection.Kind ||
-            obj.kind === Singleton.Kind);
+            obj.kind === Singleton.Kind ||
+            obj.kind === Storage.Kind);
 }
 export function isCollection(obj) {
     return obj && typeof obj === 'object' && obj.kind === Collection.Kind;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/common",
-  "version": "0.24.0",
+  "version": "0.24.2",
   "description": "Opra common package",
   "author": "Panates",
   "license": "MIT",

package/types/document/constants.d.ts

@@ -1,5 +1,5 @@
 export declare const DATATYPE_METADATA: unique symbol;
-export declare const SOURCE_METADATA: unique symbol;
+export declare const RESOURCE_METADATA: unique symbol;
 export declare const DECORATOR: unique symbol;
 export declare const NAMESPACE_PATTERN: RegExp;
 export declare const TYPENAME_PATTERN: RegExp;

package/types/document/resource/action.d.ts

@@ -1,4 +1,11 @@
 import { OpraSchema } from '../../schema/index.js';
+export declare namespace Action {
+    interface InitArguments extends OpraSchema.Action {
+        name: string;
+    }
+}
 export declare class Action {
+    readonly name: string;
+    constructor(init: Action.InitArguments);
     exportSchema(): OpraSchema.Action;
 }

package/types/document/resource/resource.d.ts

@@ -1,5 +1,4 @@
 import { StrictOmit, Type } from 'ts-gems';
-import { ResponsiveMap } from '../../helpers/index.js';
 import { OpraSchema } from '../../schema/index.js';
 import type { ApiDocument } from '../api-document.js';
 import { nodeInspectCustom } from '../utils/inspect.util.js';
@@ -24,7 +23,7 @@ export declare abstract class Resource {
     readonly description?: string;
     readonly controller?: object | Type;
     abstract readonly operations: Record<string, any>;
-    readonly actions: ResponsiveMap<Action>;
+    readonly actions: Record<string, Action>;
     protected constructor(document: ApiDocument, init: Resource.InitArguments);
     exportSchema(): OpraSchema.ResourceBase;
     toString(): string;