@opra/common 0.24.2 → 0.25.0

package/browser.js

@@ -1009,14 +1009,25 @@ __name(isContainer, "isContainer");
 
 // ../../build/common/esm/document/data-type/complex-type.js
 import "reflect-metadata";
-import omit2 from "lodash.omit";
-import merge3 from "putil-merge";
+import merge4 from "putil-merge";
 
-// ../../build/common/esm/document/data-type/enum-type.js
-import "reflect-metadata";
+// ../../build/common/esm/document/decorators/complex-type.decorator.js
 import omit from "lodash.omit";
-import merge2 from "putil-merge";
-import * as vg from "valgen";
+function ComplexTypeDecorator(options) {
+  return function(target) {
+    const name = options?.name || target.name.match(TYPENAME_PATTERN)?.[1] || target.name;
+    let metadata = Reflect.getOwnMetadata(DATATYPE_METADATA, target);
+    if (!metadata) {
+      metadata = {};
+      Reflect.defineMetadata(DATATYPE_METADATA, metadata, target);
+    }
+    metadata.kind = opra_schema_ns_exports.ComplexType.Kind;
+    metadata.name = name;
+    if (options)
+      Object.assign(metadata, omit(options, ["kind", "name", "base", "fields"]));
+  };
+}
+__name(ComplexTypeDecorator, "ComplexTypeDecorator");
 
 // ../../build/common/esm/document/utils/inspect.util.js
 var nodeInspectCustom = Symbol.for("nodejs.util.inspect.custom");
@@ -1060,7 +1071,50 @@ var DataType = class _DataType {
   }
 };
 
+// ../../build/common/esm/document/data-type/field.js
+import merge3 from "putil-merge";
+
+// ../../build/common/esm/document/data-type/field-class.js
+var FieldClass = class {
+  static {
+    __name(this, "FieldClass");
+  }
+  constructor(owner, init) {
+    this.owner = owner;
+    this.name = init.name;
+    this.origin = init.origin || owner;
+    this.type = init.type;
+    this.description = init.description;
+    this.isArray = init.isArray;
+    this.default = init.default;
+    this.fixed = init.fixed;
+    this.required = init.required;
+    this.exclusive = init.exclusive;
+    this.deprecated = init.deprecated;
+    this.examples = init.examples;
+  }
+  exportSchema() {
+    return omitUndefined({
+      type: this.type.name ? this.type.name : this.type.exportSchema(),
+      description: this.description,
+      isArray: this.isArray,
+      default: this.default,
+      fixed: this.fixed,
+      required: this.required,
+      exclusive: this.exclusive,
+      deprecated: this.deprecated,
+      examples: this.examples
+    });
+  }
+};
+
 // ../../build/common/esm/document/data-type/enum-type.js
+import "reflect-metadata";
+import omit2 from "lodash.omit";
+import merge2 from "putil-merge";
+
+// ../../build/common/esm/document/data-type/enum-type-class.js
+import * as vg from "valgen";
 var EnumTypeClass = class extends DataType {
   static {
     __name(this, "EnumTypeClass");
@@ -1086,101 +1140,83 @@ var EnumTypeClass = class extends DataType {
     return out;
   }
 };
+
+// ../../build/common/esm/document/data-type/enum-type.js
 var EnumType2 = /* @__PURE__ */ __name(function(...args) {
-  if (this) {
-    const [document, init] = args;
-    merge2(this, new EnumTypeClass(document, init), { descriptor: true });
-    return;
+  if (!this) {
+    const [enumSource, options] = args;
+    const values = Array.isArray(enumSource) ? enumSource.reduce((obj, v) => {
+      obj[v] = v;
+      return obj;
+    }, {}) : enumSource;
+    const metadata = {
+      kind: opra_schema_ns_exports.EnumType.Kind,
+      values
+    };
+    if (options)
+      Object.assign(metadata, omit2(options, ["kind", "values"]));
+    Reflect.defineMetadata(DATATYPE_METADATA, metadata, enumSource);
+    return values;
   }
-  const [enumSource, options] = args;
-  const values = Array.isArray(enumSource) ? enumSource.reduce((obj, v) => {
-    obj[v] = v;
-    return obj;
-  }, {}) : enumSource;
-  const metadata = {
-    kind: opra_schema_ns_exports.EnumType.Kind,
-    values
-  };
-  if (options)
-    Object.assign(metadata, omit(options, ["kind", "values"]));
-  Reflect.defineMetadata(DATATYPE_METADATA, metadata, enumSource);
-  return values;
+  const [document, init] = args;
+  merge2(this, new EnumTypeClass(document, init), { descriptor: true });
+  return;
 }, "EnumType");
 EnumType2.prototype = EnumTypeClass.prototype;
 
-// ../../build/common/esm/document/data-type/api-field.js
+// ../../build/common/esm/document/data-type/field-decorator.js
+function FieldDecorator(options) {
+  return function(target, propertyKey) {
+    if (typeof propertyKey !== "string")
+      throw new TypeError(`Symbol properties can't be used as a field`);
+    const metadata = Reflect.getOwnMetadata(DATATYPE_METADATA, target.constructor) || {};
+    metadata.kind = opra_schema_ns_exports.ComplexType.Kind;
+    metadata.fields = metadata.fields || {};
+    const designType = Reflect.getMetadata("design:type", target, propertyKey);
+    const elemMeta = metadata.fields[propertyKey] = {
+      ...options,
+      enum: void 0,
+      designType
+    };
+    if (designType === Array) {
+      elemMeta.isArray = true;
+      delete elemMeta.designType;
+    }
+    if (options?.enum) {
+      elemMeta.type = void 0;
+      if (Array.isArray(options.enum)) {
+        const enumObj = options.enum.reduce((o, v) => {
+          o[v] = v;
+          return o;
+        }, {});
+        EnumType2(enumObj);
+        elemMeta.enum = enumObj;
+      } else {
+        const m = Reflect.getOwnMetadata(DATATYPE_METADATA, options?.enum);
+        if (!opra_schema_ns_exports.isEnumType(m))
+          throw new TypeError(`Invalid "enum" value. Did you forget to set metadata using EnumType() method?`);
+        elemMeta.enum = options.enum;
+      }
+    }
+    Reflect.defineMetadata(DATATYPE_METADATA, omitUndefined(metadata), target.constructor);
+  };
+}
+__name(FieldDecorator, "FieldDecorator");
+
+// ../../build/common/esm/document/data-type/field.js
 var ApiField = /* @__PURE__ */ __name(function(...args) {
   if (!this) {
     const [options] = args;
-    return function(target, propertyKey) {
-      if (typeof propertyKey !== "string")
-        throw new TypeError(`Symbol properties can't be used as a field`);
-      const metadata = Reflect.getOwnMetadata(DATATYPE_METADATA, target.constructor) || {};
-      metadata.kind = opra_schema_ns_exports.ComplexType.Kind;
-      metadata.fields = metadata.fields || {};
-      const designType = Reflect.getMetadata("design:type", target, propertyKey);
-      const elemMeta = metadata.fields[propertyKey] = {
-        ...options,
-        enum: void 0,
-        designType
-      };
-      if (designType === Array) {
-        elemMeta.isArray = true;
-        delete elemMeta.designType;
-      }
-      if (options?.enum) {
-        elemMeta.type = void 0;
-        if (Array.isArray(options.enum)) {
-          const enumObj = options.enum.reduce((o, v) => {
-            o[v] = v;
-            return o;
-          }, {});
-          EnumType2(enumObj);
-          elemMeta.enum = enumObj;
-        } else {
-          const m = Reflect.getOwnMetadata(DATATYPE_METADATA, options?.enum);
-          if (!opra_schema_ns_exports.isEnumType(m))
-            throw new TypeError(`Invalid "enum" value. Did you forget to set metadata using EnumType() method?`);
-          elemMeta.enum = options.enum;
-        }
-      }
-      Reflect.defineMetadata(DATATYPE_METADATA, omitUndefined(metadata), target.constructor);
-    };
+    return ApiField[DECORATOR](options);
   }
   const [owner, init] = args;
-  const _this = this;
-  _this.owner = owner;
-  _this.name = init.name;
-  _this.origin = init.origin || owner;
-  _this.type = init.type;
-  if (init?.description)
-    this.description = init?.description;
-  if (init?.isArray != null)
-    this.isArray = init?.isArray;
-  this.default = init?.default;
-  this.fixed = init?.fixed;
-  if (init?.deprecated != null)
-    this.deprecated = init?.deprecated;
-  if (init?.exclusive != null)
-    this.exclusive = init?.exclusive;
-  if (init?.required != null)
-    this.required = init?.required;
+  merge3(this, new FieldClass(owner, init), { descriptor: true });
 }, "ApiField");
-var proto = {
-  exportSchema() {
-    return omitUndefined({
-      type: this.type.name ? this.type.name : this.type.exportSchema(),
-      description: this.description,
-      isArray: this.isArray,
-      default: this.default,
-      fixed: this.fixed,
-      required: this.required
-    });
-  }
-};
-Object.assign(ApiField.prototype, proto);
+ApiField.prototype = FieldClass.prototype;
+Object.assign(ApiField, FieldDecorator);
+ApiField[DECORATOR] = FieldDecorator;
 
-// ../../build/common/esm/document/data-type/complex-type.js
+// ../../build/common/esm/document/data-type/complex-type-class.js
 var ComplexTypeClass = class extends DataType {
   static {
     __name(this, "ComplexTypeClass");
@@ -1247,6 +1283,7 @@ var ComplexTypeClass = class extends DataType {
     let curPath = "";
     let s;
     let i = -1;
+    const ComplexType3 = Object.getPrototypeOf(this).constructor;
     return {
       [Symbol.iterator]() {
         return this;
@@ -1255,7 +1292,7 @@ var ComplexTypeClass = class extends DataType {
         i++;
         if (i < len) {
           s = arr[i];
-          if (dataType && !(dataType instanceof ComplexType2)) {
+          if (dataType && !(dataType instanceof ComplexType3)) {
             if (silent)
               return { done: true, value: [] };
             throw new TypeError(`"${curPath}" field is not a complex type and has no child fields`);
@@ -1318,27 +1355,19 @@ var ComplexTypeClass = class extends DataType {
     return false;
   }
 };
+
+// ../../build/common/esm/document/data-type/complex-type.js
 var ComplexType2 = /* @__PURE__ */ __name(function(...args) {
-  if (this) {
-    const [document, init] = args;
-    merge3(this, new ComplexTypeClass(document, init), { descriptor: true });
-    return;
+  if (!this) {
+    const [options] = args;
+    return ComplexType2[DECORATOR](options);
   }
-  const [options] = args;
-  return function(target) {
-    const name = options?.name || target.name.match(TYPENAME_PATTERN)?.[1] || target.name;
-    let metadata = Reflect.getOwnMetadata(DATATYPE_METADATA, target);
-    if (!metadata) {
-      metadata = {};
-      Reflect.defineMetadata(DATATYPE_METADATA, metadata, target);
-    }
-    metadata.kind = opra_schema_ns_exports.ComplexType.Kind;
-    metadata.name = name;
-    if (options)
-      Object.assign(metadata, omit2(options, ["kind", "name", "base", "fields"]));
-  };
+  const [document, init] = args;
+  merge4(this, new ComplexTypeClass(document, init), { descriptor: true });
 }, "ComplexType");
 ComplexType2.prototype = ComplexTypeClass.prototype;
+Object.assign(ComplexType2, ComplexTypeDecorator);
+ComplexType2[DECORATOR] = ComplexTypeDecorator;
 
 // ../../build/common/esm/document/api-document.js
 var ApiDocument = class {
@@ -1592,8 +1621,25 @@ __name(__decorate, "__decorate");
 
 // ../../build/common/esm/document/data-type/simple-type.js
 import "reflect-metadata";
+import merge5 from "putil-merge";
+
+// ../../build/common/esm/document/decorators/simple-type.decorator.js
 import omit3 from "lodash.omit";
-import merge4 from "putil-merge";
+function SimpleTypeDecorator(options) {
+  return function(target) {
+    let name = options?.name || target.name.match(TYPENAME_PATTERN)?.[1] || target.name;
+    name = name.charAt(0).toLowerCase() + name.substring(1);
+    const metadata = Reflect.getOwnMetadata(DATATYPE_METADATA, target) || {};
+    metadata.kind = opra_schema_ns_exports.SimpleType.Kind;
+    metadata.name = name;
+    if (options)
+      Object.assign(metadata, omit3(options, ["kind", "name"]));
+    Reflect.defineMetadata(DATATYPE_METADATA, metadata, target);
+  };
+}
+__name(SimpleTypeDecorator, "SimpleTypeDecorator");
+
+// ../../build/common/esm/document/data-type/simple-type-class.js
 import * as vg2 from "valgen";
 var SimpleTypeClass = class extends DataType {
   static {
@@ -1611,25 +1657,19 @@ var SimpleTypeClass = class extends DataType {
     return out;
   }
 };
+
+// ../../build/common/esm/document/data-type/simple-type.js
 var SimpleType2 = /* @__PURE__ */ __name(function(...args) {
-  if (this) {
-    const [document, init] = args;
-    merge4(this, new SimpleTypeClass(document, init), { descriptor: true });
-    return;
+  if (!this) {
+    const [options] = args;
+    return SimpleType2[DECORATOR](options);
   }
-  const [options] = args;
-  return function(target) {
-    let name = options?.name || target.name.match(TYPENAME_PATTERN)?.[1] || target.name;
-    name = name.charAt(0).toLowerCase() + name.substring(1);
-    const metadata = Reflect.getOwnMetadata(DATATYPE_METADATA, target) || {};
-    metadata.kind = opra_schema_ns_exports.SimpleType.Kind;
-    metadata.name = name;
-    if (options)
-      Object.assign(metadata, omit3(options, ["kind", "name"]));
-    Reflect.defineMetadata(DATATYPE_METADATA, metadata, target);
-  };
+  const [document, init] = args;
+  merge5(this, new SimpleTypeClass(document, init), { descriptor: true });
 }, "SimpleType");
 SimpleType2.prototype = SimpleTypeClass.prototype;
+Object.assign(SimpleType2, SimpleTypeDecorator);
+SimpleType2[DECORATOR] = SimpleTypeDecorator;
 
 // ../../build/common/esm/document/data-type/builtin/any.type.js
 var AnyType = class AnyType2 {
@@ -2102,7 +2142,77 @@ async function extractFieldSchema(target, ctor, metadata, name) {
 __name(extractFieldSchema, "extractFieldSchema");
 
 // ../../build/common/esm/document/resource/collection.js
-import merge8 from "putil-merge";
+import merge9 from "putil-merge";
+
+// ../../build/common/esm/document/decorators/resource.decorator.js
+import omit4 from "lodash.omit";
+import merge6 from "putil-merge";
+function ResourceDecorator(kind, options) {
+  const namePattern = new RegExp(`^(.*)(${kind}|Resource|Controller)$`);
+  return function(target) {
+    const name = options?.name || namePattern.exec(target.name)?.[1] || target.name;
+    const metadata = { kind, name };
+    const baseMetadata = Reflect.getOwnMetadata(RESOURCE_METADATA, Object.getPrototypeOf(target));
+    if (baseMetadata)
+      merge6(metadata, baseMetadata, { deep: true });
+    const oldMetadata = Reflect.getOwnMetadata(RESOURCE_METADATA, target);
+    if (oldMetadata)
+      merge6(metadata, oldMetadata, { deep: true });
+    merge6(metadata, {
+      kind,
+      name,
+      ...omit4(options, ["kind", "name", "controller"])
+    }, { deep: true });
+    Reflect.defineMetadata(RESOURCE_METADATA, metadata, target);
+  };
+}
+__name(ResourceDecorator, "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(RESOURCE_METADATA, target.constructor) || {};
+    resourceMetadata.actions = resourceMetadata.actions || {};
+    resourceMetadata.actions[propertyKey] = actionMeta;
+    Reflect.defineMetadata(RESOURCE_METADATA, resourceMetadata, target.constructor);
+  };
+};
+
+// ../../build/common/esm/document/decorators/collection-decorator.js
+var operationProperties = ["create", "delete", "deleteMany", "get", "findMany", "update", "updateMany"];
+function CollectionDecorator(type, options) {
+  return ResourceDecorator(opra_schema_ns_exports.Collection.Kind, { ...options, type });
+}
+__name(CollectionDecorator, "CollectionDecorator");
+Object.assign(CollectionDecorator, ResourceDecorator);
+CollectionDecorator.Create = createOperationDecorator("create");
+CollectionDecorator.Delete = createOperationDecorator("delete");
+CollectionDecorator.DeleteMany = createOperationDecorator("deleteMany");
+CollectionDecorator.Get = createOperationDecorator("get");
+CollectionDecorator.FindMany = createOperationDecorator("findMany");
+CollectionDecorator.Update = createOperationDecorator("update");
+CollectionDecorator.UpdateMany = createOperationDecorator("updateMany");
+CollectionDecorator.Action = function(options) {
+  const oldDecorator = ResourceDecorator.Action(options);
+  return (target, propertyKey) => {
+    if (typeof propertyKey === "string" && operationProperties.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(RESOURCE_METADATA, target.constructor) || {};
+    sourceMetadata.operations = sourceMetadata.operations || {};
+    sourceMetadata.operations[operation] = operationMeta;
+    Reflect.defineMetadata(RESOURCE_METADATA, sourceMetadata, target.constructor);
+  };
+}
+__name(createOperationDecorator, "createOperationDecorator");
 
 // ../../build/common/esm/document/resource/collection-class.js
 import * as vg4 from "valgen";
@@ -9623,7 +9733,9 @@ import * as vg3 from "valgen";
 
 // ../../build/common/esm/document/data-type/mapped-type.js
 import "reflect-metadata";
-import merge5 from "putil-merge";
+import merge7 from "putil-merge";
+
+// ../../build/common/esm/document/data-type/mapped-type-class.js
 var MappedTypeClass = class extends DataType {
   static {
     __name(this, "MappedTypeClass");
@@ -9656,10 +9768,32 @@ var MappedTypeClass = class extends DataType {
     return out;
   }
 };
+function getIsInheritedPredicateFn(pick, omit5) {
+  const pickKeys = pick?.map((x) => String(x).toLowerCase());
+  const omitKeys = omit5?.map((x) => String(x).toLowerCase());
+  return (propertyName) => {
+    if (omitKeys && omitKeys.includes(propertyName.toLowerCase()))
+      return false;
+    if (pickKeys)
+      return pickKeys.includes(propertyName.toLowerCase());
+    return true;
+  };
+}
+__name(getIsInheritedPredicateFn, "getIsInheritedPredicateFn");
+
+// ../../build/common/esm/document/data-type/mapped-type.js
+function PickType(classRef, keys) {
+  return MappedType2(classRef, { pick: keys });
+}
+__name(PickType, "PickType");
+function OmitType(classRef, keys) {
+  return MappedType2(classRef, { omit: keys });
+}
+__name(OmitType, "OmitType");
 var MappedType2 = /* @__PURE__ */ __name(function(...args) {
   if (this) {
     const [document, init] = args;
-    merge5(this, new MappedTypeClass(document, init), { descriptor: true });
+    merge7(this, new MappedTypeClass(document, init), { descriptor: true });
     return;
   }
   const [mappedSource, options] = args;
@@ -9695,30 +9829,12 @@ var MappedType2 = /* @__PURE__ */ __name(function(...args) {
 }, "MappedType");
 MappedType2.prototype = MappedTypeClass.prototype;
 MappedType2._applyMixin = () => void 0;
-function getIsInheritedPredicateFn(pick, omit7) {
-  const pickKeys = pick?.map((x) => String(x).toLowerCase());
-  const omitKeys = omit7?.map((x) => String(x).toLowerCase());
-  return (propertyName) => {
-    if (omitKeys && omitKeys.includes(propertyName.toLowerCase()))
-      return false;
-    if (pickKeys)
-      return pickKeys.includes(propertyName.toLowerCase());
-    return true;
-  };
-}
-__name(getIsInheritedPredicateFn, "getIsInheritedPredicateFn");
-function PickType(classRef, keys) {
-  return MappedType2(classRef, { pick: keys });
-}
-__name(PickType, "PickType");
-function OmitType(classRef, keys) {
-  return MappedType2(classRef, { omit: keys });
-}
-__name(OmitType, "OmitType");
 
 // ../../build/common/esm/document/data-type/union-type.js
 import "reflect-metadata";
-import merge6 from "putil-merge";
+import merge8 from "putil-merge";
+
+// ../../build/common/esm/document/data-type/union-type-class.js
 var UnionTypeClass = class extends DataType {
   static {
     __name(this, "UnionTypeClass");
@@ -9729,8 +9845,9 @@ var UnionTypeClass = class extends DataType {
     this.fields = new ResponsiveMap();
     const own = this.own;
     own.types = [];
+    const UnionType3 = Object.getPrototypeOf(this).constructor;
     for (const base of init.types) {
-      if (!(base instanceof ComplexType2 || base instanceof UnionType2 || base instanceof MappedType2))
+      if (!(base instanceof ComplexType2 || base instanceof UnionType3 || base instanceof MappedType2))
         throw new TypeError(`${opra_schema_ns_exports.UnionType.Kind} shall contain ${opra_schema_ns_exports.ComplexType.Kind}, ${opra_schema_ns_exports.UnionType.Kind} of ${opra_schema_ns_exports.MappedType.Kind} types.`);
       own.types.push(base);
       if (base.additionalFields)
@@ -9747,10 +9864,12 @@ var UnionTypeClass = class extends DataType {
     return out;
   }
 };
+
+// ../../build/common/esm/document/data-type/union-type.js
 var UnionType2 = /* @__PURE__ */ __name(function(...args) {
   if (this) {
     const [document, init] = args;
-    merge6(this, new UnionTypeClass(document, init), { descriptor: true });
+    merge8(this, new UnionTypeClass(document, init), { descriptor: true });
     return;
   }
   const clasRefs = [...args].filter((x) => !!x);
@@ -9814,18 +9933,52 @@ function _generateCodec(type, codec, options) {
 }
 __name(_generateCodec, "_generateCodec");
 
-// ../../build/common/esm/document/resource/action.js
-var Action = class {
+// ../../build/common/esm/document/resource/endpoint.js
+var Endpoint = class _Endpoint {
   static {
-    __name(this, "Action");
+    __name(this, "Endpoint");
   }
   constructor(init) {
+    this.parameters = new ResponsiveMap();
     this.name = init.name;
+    this.description = init.description;
+    if (init.parameters) {
+      for (const [n, p] of Object.entries(init.parameters)) {
+        this.parameters.set(n, new _Endpoint.Parameter(p));
+      }
+    }
   }
   exportSchema() {
-    return {};
+    const schema = omitUndefined({
+      description: this.description
+    });
+    if (this.parameters.size) {
+      schema.parameters = {};
+      for (const [name, param] of this.parameters.entries()) {
+        schema.parameters[name] = param.exportSchema();
+      }
+    }
+    return schema;
   }
 };
+(function(Endpoint2) {
+  class Parameter {
+    static {
+      __name(this, "Parameter");
+    }
+    constructor(init) {
+      Object.assign(this, init);
+    }
+    exportSchema() {
+      return omitUndefined({
+        type: typeof this.type === "string" ? this.type : this.type.exportSchema(),
+        description: this.description,
+        isArray: this.isArray
+      });
+    }
+  }
+  Endpoint2.Parameter = Parameter;
+})(Endpoint || (Endpoint = {}));
 
 // ../../build/common/esm/document/resource/resource.js
 var Resource = class {
@@ -9833,14 +9986,14 @@ var Resource = class {
     __name(this, "Resource");
   }
   constructor(document, init) {
-    this.actions = {};
+    this.actions = new ResponsiveMap();
     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 });
+        this.actions.set(name, new Endpoint({ ...meta, name }));
       }
     }
   }
@@ -9849,14 +10002,12 @@ var Resource = class {
       kind: this.kind,
       description: this.description
     });
-    const actions = {};
-    let i = 0;
-    for (const action of Object.values(this.actions)) {
-      actions[action.name] = action.exportSchema();
-      i++;
+    if (this.actions.size) {
+      schema.actions = {};
+      for (const action of this.actions.values()) {
+        schema.actions[action.name] = action.exportSchema();
+      }
     }
-    if (i)
-      schema.actions = actions;
     return schema;
   }
   toString() {
@@ -10021,64 +10172,42 @@ var CollectionClass = class extends Resource {
   }
 };
 
-// ../../build/common/esm/document/resource/collection-decorator.js
-import omit4 from "lodash.omit";
-import merge7 from "putil-merge";
+// ../../build/common/esm/document/resource/collection.js
+var Collection2 = /* @__PURE__ */ __name(function(...args) {
+  if (!this) {
+    const [type, options] = args;
+    return Collection2[DECORATOR].call(void 0, type, options);
+  }
+  const [document, init] = args;
+  merge9(this, new CollectionClass(document, init), { descriptor: true });
+}, "Collection");
+Collection2.prototype = CollectionClass.prototype;
+Object.assign(Collection2, CollectionDecorator);
+Collection2[DECORATOR] = CollectionDecorator;
 
-// ../../build/common/esm/document/resource/resource-decorator.js
-var 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(RESOURCE_METADATA, target.constructor) || {};
-    resourceMetadata.actions = resourceMetadata.actions || {};
-    resourceMetadata.actions[propertyKey] = actionMeta;
-    Reflect.defineMetadata(RESOURCE_METADATA, resourceMetadata, target.constructor);
-  };
-};
+// ../../build/common/esm/document/resource/singleton.js
+import merge10 from "putil-merge";
 
-// ../../build/common/esm/document/resource/collection-decorator.js
-var NAME_PATTERN = /^(.*)(Resource|Collection|Controller)$/;
-var operationProperties = ["create", "delete", "deleteMany", "get", "findMany", "update", "updateMany"];
-function CollectionDecorator(type, options) {
-  return function(target) {
-    const name = options?.name || target.name.match(NAME_PATTERN)?.[1] || target.name;
-    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(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(RESOURCE_METADATA, metadata, target);
-  };
+// ../../build/common/esm/document/decorators/singleton.decorator.js
+function SingletonDecorator(type, options) {
+  return ResourceDecorator(opra_schema_ns_exports.Singleton.Kind, { ...options, type });
 }
-__name(CollectionDecorator, "CollectionDecorator");
-Object.assign(CollectionDecorator, ResourceDecorator);
-CollectionDecorator.Create = createOperationDecorator("create");
-CollectionDecorator.Delete = createOperationDecorator("delete");
-CollectionDecorator.DeleteMany = createOperationDecorator("deleteMany");
-CollectionDecorator.Get = createOperationDecorator("get");
-CollectionDecorator.FindMany = createOperationDecorator("findMany");
-CollectionDecorator.Update = createOperationDecorator("update");
-CollectionDecorator.UpdateMany = createOperationDecorator("updateMany");
-CollectionDecorator.Action = function(options) {
+__name(SingletonDecorator, "SingletonDecorator");
+Object.assign(SingletonDecorator, ResourceDecorator);
+SingletonDecorator.Create = createOperationDecorator2("create");
+SingletonDecorator.Get = createOperationDecorator2("get");
+SingletonDecorator.Delete = createOperationDecorator2("delete");
+SingletonDecorator.Update = createOperationDecorator2("update");
+SingletonDecorator.Action = function(options) {
   const oldDecorator = ResourceDecorator.Action(options);
+  const operators = ["create", "delete", "get", "update"];
   return (target, propertyKey) => {
-    if (typeof propertyKey === "string" && operationProperties.includes(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) {
+function createOperationDecorator2(operation) {
   return (options) => (target, propertyKey) => {
     if (propertyKey !== operation)
       throw new TypeError(`Name of the handler name should be '${operation}'`);
@@ -10089,23 +10218,7 @@ function createOperationDecorator(operation) {
     Reflect.defineMetadata(RESOURCE_METADATA, sourceMetadata, target.constructor);
   };
 }
-__name(createOperationDecorator, "createOperationDecorator");
-
-// ../../build/common/esm/document/resource/collection.js
-var Collection2 = /* @__PURE__ */ __name(function(...args) {
-  if (!this) {
-    const [type, options] = args;
-    return Collection2[DECORATOR].call(void 0, type, options);
-  }
-  const [document, init] = args;
-  merge8(this, new CollectionClass(document, init), { descriptor: true });
-}, "Collection");
-Collection2.prototype = CollectionClass.prototype;
-Object.assign(Collection2, CollectionDecorator);
-Collection2[DECORATOR] = CollectionDecorator;
-
-// ../../build/common/esm/document/resource/singleton.js
-import merge9 from "putil-merge";
+__name(createOperationDecorator2, "createOperationDecorator");
 
 // ../../build/common/esm/document/resource/singleton-class.js
 var SingletonClass = class extends Resource {
@@ -10157,52 +10270,6 @@ var SingletonClass = class extends Resource {
   }
 };
 
-// ../../build/common/esm/document/resource/singleton-decorator.js
-import omit5 from "lodash.omit";
-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(RESOURCE_METADATA, target) || {};
-    metadata.kind = opra_schema_ns_exports.Singleton.Kind;
-    metadata.name = name;
-    metadata.type = type;
-    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(RESOURCE_METADATA, metadata, target);
-  };
-}
-__name(SingletonDecorator, "SingletonDecorator");
-Object.assign(SingletonDecorator, ResourceDecorator);
-SingletonDecorator.Create = createOperationDecorator2("create");
-SingletonDecorator.Get = createOperationDecorator2("get");
-SingletonDecorator.Delete = createOperationDecorator2("delete");
-SingletonDecorator.Update = createOperationDecorator2("update");
-SingletonDecorator.Action = function(options) {
-  const oldDecorator = 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 createOperationDecorator2(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(RESOURCE_METADATA, target.constructor) || {};
-    sourceMetadata.operations = sourceMetadata.operations || {};
-    sourceMetadata.operations[operation] = operationMeta;
-    Reflect.defineMetadata(RESOURCE_METADATA, sourceMetadata, target.constructor);
-  };
-}
-__name(createOperationDecorator2, "createOperationDecorator");
-
 // ../../build/common/esm/document/resource/singleton.js
 var Singleton2 = /* @__PURE__ */ __name(function(...args) {
   if (!this) {
@@ -10210,53 +10277,18 @@ var Singleton2 = /* @__PURE__ */ __name(function(...args) {
     return Singleton2[DECORATOR].call(void 0, type, options);
   }
   const [document, init] = args;
-  merge9(this, new SingletonClass(document, init), { descriptor: true });
+  merge10(this, new SingletonClass(document, init), { descriptor: true });
 }, "Singleton");
 Singleton2.prototype = SingletonClass.prototype;
 Object.assign(Singleton2, SingletonDecorator);
 Singleton2[DECORATOR] = SingletonDecorator;
 
 // ../../build/common/esm/document/resource/storage.js
-import merge10 from "putil-merge";
-
-// ../../build/common/esm/document/resource/storage-class.js
-var StorageClass = class extends Resource {
-  static {
-    __name(this, "StorageClass");
-  }
-  constructor(document, init) {
-    super(document, init);
-    this.kind = opra_schema_ns_exports.Storage.Kind;
-    this.controller = init.controller;
-    this.operations = { ...init.operations };
-  }
-  exportSchema() {
-    return {
-      ...super.exportSchema(),
-      ...omitUndefined({
-        kind: opra_schema_ns_exports.Storage.Kind,
-        operations: this.operations
-      })
-    };
-  }
-};
+import merge11 from "putil-merge";
 
-// ../../build/common/esm/document/resource/storage-decorator.js
-import omit6 from "lodash.omit";
-var NAME_PATTERN3 = /^(.*)(Resource|Storage|Controller)$/;
+// ../../build/common/esm/document/decorators/storage.decorator.js
 function StorageDecorator(options) {
-  return function(target) {
-    const name = options?.name || target.name.match(NAME_PATTERN3)?.[1] || target.name;
-    const metadata = Reflect.getOwnMetadata(RESOURCE_METADATA, target) || {};
-    metadata.kind = opra_schema_ns_exports.Storage.Kind;
-    metadata.name = name;
-    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(RESOURCE_METADATA, metadata, target);
-  };
+  return ResourceDecorator(opra_schema_ns_exports.Storage.Kind, options);
 }
 __name(StorageDecorator, "StorageDecorator");
 Object.assign(StorageDecorator, ResourceDecorator);
@@ -10285,6 +10317,28 @@ function createOperationDecorator3(operation) {
 }
 __name(createOperationDecorator3, "createOperationDecorator");
 
+// ../../build/common/esm/document/resource/storage-class.js
+var StorageClass = class extends Resource {
+  static {
+    __name(this, "StorageClass");
+  }
+  constructor(document, init) {
+    super(document, init);
+    this.kind = opra_schema_ns_exports.Storage.Kind;
+    this.controller = init.controller;
+    this.operations = { ...init.operations };
+  }
+  exportSchema() {
+    return {
+      ...super.exportSchema(),
+      ...omitUndefined({
+        kind: opra_schema_ns_exports.Storage.Kind,
+        operations: this.operations
+      })
+    };
+  }
+};
+
 // ../../build/common/esm/document/resource/storage.js
 var Storage2 = /* @__PURE__ */ __name(function(...args) {
   if (!this) {
@@ -10292,7 +10346,7 @@ var Storage2 = /* @__PURE__ */ __name(function(...args) {
     return Storage2[DECORATOR].call(void 0, options);
   }
   const [document, init] = args;
-  merge10(this, new StorageClass(document, init), { descriptor: true });
+  merge11(this, new StorageClass(document, init), { descriptor: true });
 }, "Storage");
 Storage2.prototype = StorageClass.prototype;
 Object.assign(Storage2, StorageDecorator);