@opra/common 0.20.3 → 0.21.0

package/cjs/document/api-document.js

@@ -185,6 +185,14 @@ class ApiDocument {
             return t;
         throw new index_js_1.NotAcceptableError(`Resource type "${t.name}" is not a Singleton`);
     }
+    getStorage(path, silent) {
+        const t = this.getResource(path);
+        if (!t && silent)
+            return;
+        if (t && t.kind === index_js_3.OpraSchema.Storage.Kind)
+            return t;
+        throw new index_js_1.NotAcceptableError(`Resource type "${t.name}" is not a Storage`);
+    }
     /**
      * Export as Opra schema definition object
      */

package/cjs/document/data-type/mapped-type.js

@@ -91,7 +91,7 @@ exports.MappedType = function (...args) {
             (0, index_js_1.inheritPropertyInitializers)(this, source, isInheritedPredicate);
         }
     }
-    (0, index_js_1.applyMixins)(MappedClass, source);
+    (0, index_js_1.mergePrototype)(MappedClass.prototype, source.prototype);
     // const mappedTypeMetadata: MappedType.TypeMapping[] = [];
     const m = Reflect.getOwnMetadata(constants_js_1.METADATA_KEY, source);
     if (!m)

package/cjs/document/data-type/union-type.js

@@ -106,7 +106,7 @@ exports.UnionType = function (...args) {
             itemMeta.kind === index_js_2.OpraSchema.MappedType.Kind)))
             throw new TypeError(`Class "${c.name}" is not a ${index_js_2.OpraSchema.ComplexType.Kind}, ${index_js_2.OpraSchema.UnionType.Kind} or ${index_js_2.OpraSchema.MappedType.Kind}`);
         metadata.types.push(c);
-        (0, index_js_1.applyMixins)(UnionClass, c);
+        (0, index_js_1.mergePrototype)(UnionClass.prototype, c.prototype);
     }
     exports.UnionType._applyMixin(UnionClass, ...clasRefs);
     return UnionClass;

package/cjs/document/factory/factory.js

@@ -60,6 +60,7 @@ DocumentFactory.designTypeMap = new Map();
     _a.prototype.extractSingletonSchema = import_resource_class_js_1.extractSingletonSchema;
     _a.prototype.extractCollectionSchema = import_resource_class_js_1.extractCollectionSchema;
     _a.prototype.processResourceQueue = process_resources_js_1.processResourceQueue;
-    _a.prototype.createCollection = process_resources_js_1.createCollection;
-    _a.prototype.createSingleton = process_resources_js_1.createSingleton;
+    _a.prototype.createCollectionResource = process_resources_js_1.createCollectionResource;
+    _a.prototype.createSingletonResource = process_resources_js_1.createSingletonResource;
+    _a.prototype.createFileResource = process_resources_js_1.createFileResource;
 })();

package/cjs/document/factory/process-resources.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createSingleton = exports.createCollection = exports.processResourceQueue = void 0;
+exports.createFileResource = exports.createSingletonResource = exports.createCollectionResource = exports.processResourceQueue = void 0;
 const index_js_1 = require("../../schema/index.js");
 const collection_js_1 = require("../resource/collection.js");
 const singleton_js_1 = require("../resource/singleton.js");
+const storage_js_1 = require("../resource/storage.js");
 async function processResourceQueue() {
     const { document, resourceQueue } = this;
     const resourceNames = Array.from(resourceQueue.keys());
@@ -13,12 +14,17 @@ async function processResourceQueue() {
             continue;
         try {
             if (index_js_1.OpraSchema.isCollection(schema)) {
-                const resource = await this.createCollection(name, schema);
+                const resource = await this.createCollectionResource(name, schema);
                 document.resources.set(name, resource);
                 continue;
             }
             if (index_js_1.OpraSchema.isSingleton(schema)) {
-                const resource = await this.createSingleton(name, schema);
+                const resource = await this.createSingletonResource(name, schema);
+                document.resources.set(name, resource);
+                continue;
+            }
+            if (index_js_1.OpraSchema.isStorage(schema)) {
+                const resource = await this.createFileResource(name, schema);
                 document.resources.set(name, resource);
                 continue;
             }
@@ -31,7 +37,7 @@ async function processResourceQueue() {
     }
 }
 exports.processResourceQueue = processResourceQueue;
-async function createCollection(name, schema) {
+async function createCollectionResource(name, schema) {
     const { document } = this;
     const dataType = document.getComplexType(schema.type);
     const initArgs = {
@@ -41,8 +47,8 @@ async function createCollection(name, schema) {
     };
     return new collection_js_1.Collection(document, initArgs);
 }
-exports.createCollection = createCollection;
-async function createSingleton(name, schema) {
+exports.createCollectionResource = createCollectionResource;
+async function createSingletonResource(name, schema) {
     const { document } = this;
     const dataType = document.getComplexType(schema.type);
     const initArgs = {
@@ -52,4 +58,13 @@ async function createSingleton(name, schema) {
     };
     return new singleton_js_1.Singleton(document, initArgs);
 }
-exports.createSingleton = createSingleton;
+exports.createSingletonResource = createSingletonResource;
+async function createFileResource(name, schema) {
+    const { document } = this;
+    const initArgs = {
+        ...schema,
+        name
+    };
+    return new storage_js_1.Storage(document, initArgs);
+}
+exports.createFileResource = createFileResource;

package/cjs/document/index.js

@@ -15,3 +15,4 @@ tslib_1.__exportStar(require("./data-type/union-type.js"), exports);
 tslib_1.__exportStar(require("./resource/resource.js"), exports);
 tslib_1.__exportStar(require("./resource/collection.js"), exports);
 tslib_1.__exportStar(require("./resource/singleton.js"), exports);
+tslib_1.__exportStar(require("./resource/storage.js"), exports);

package/cjs/document/resource/storage.js

@@ -0,0 +1,81 @@
+"use strict";
+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;
+        const operations = this.operations = init.operations || {};
+        if (this.controller) {
+            const instance = typeof this.controller == 'function'
+                ? new this.controller()
+                : this.controller;
+            for (const operation of Object.values(operations)) {
+                if (!operation.handler && operation.handlerName) {
+                    const fn = instance[operation.handlerName];
+                    if (!fn)
+                        throw new TypeError(`No such operation handler (${operation.handlerName}) found`);
+                    operation.handler = fn.bind(instance);
+                }
+            }
+        }
+    }
+    exportSchema() {
+        const out = resource_js_1.Resource.prototype.exportSchema.call(this);
+        Object.assign(out, (0, index_js_1.omitUndefined)({
+            operations: this.operations
+        }));
+        return out;
+    }
+}
+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);
+        };
+    }
+    // Constructor
+    const [document, init] = args;
+    (0, putil_merge_1.default)(this, new StorageClass(document, init), { descriptor: true });
+};
+exports.Storage.prototype = StorageClass.prototype;
+function createOperationDecorator(operation) {
+    return (options) => ((target, propertyKey) => {
+        const metadata = {
+            ...options,
+            handlerName: propertyKey
+        };
+        const resourceMetadata = (Reflect.getOwnMetadata(constants_js_1.METADATA_KEY, target.constructor) || {});
+        resourceMetadata.operations = resourceMetadata.operations || {};
+        resourceMetadata.operations[operation] = metadata;
+        Reflect.defineMetadata(constants_js_1.METADATA_KEY, resourceMetadata, target.constructor);
+    });
+}
+exports.Storage.Delete = createOperationDecorator('delete');
+exports.Storage.Get = createOperationDecorator('get');
+exports.Storage.Put = createOperationDecorator('put');

package/cjs/helpers/mixin-utils.js

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.inheritPropertyInitializers = exports.applyMixins = void 0;
-function applyMixins(derivedCtor, baseCtor, filter) {
-    for (const k of Object.getOwnPropertyNames(baseCtor.prototype)) {
+exports.inheritPropertyInitializers = exports.mergePrototype = void 0;
+function mergePrototype(targetProto, baseProto, filter) {
+    for (const k of Object.getOwnPropertyNames(baseProto)) {
         if ((k === 'constructor' || k === '__proto__' || k === 'toJSON' || k === 'toString') ||
             filter && !filter(k))
             continue;
-        Object.defineProperty(derivedCtor.prototype, k, Object.getOwnPropertyDescriptor(baseCtor.prototype, k) ||
+        Object.defineProperty(targetProto, k, Object.getOwnPropertyDescriptor(baseProto, k) ||
             Object.create(null));
     }
 }
-exports.applyMixins = applyMixins;
+exports.mergePrototype = mergePrototype;
+// noinspection JSUnusedLocalSymbols
 function inheritPropertyInitializers(target, sourceClass, 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 isPropertyInherited = (key) => true) {

package/cjs/helpers/responsive-map.js

@@ -98,7 +98,12 @@ class ResponsiveMap extends Map {
         return super.delete(orgKey);
     }
     sort(compareFn) {
-        this[kKeyOrder].sort(compareFn);
+        if (compareFn)
+            this[kKeyOrder].sort(compareFn);
+        else if (this[kOptions].caseSensitive)
+            this[kKeyOrder].sort();
+        else
+            this[kKeyOrder].sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()));
         return this;
     }
     getProxy(handler) {

package/cjs/http/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./http-headers.js"), exports);
 tslib_1.__exportStar(require("./http-params.js"), exports);
 tslib_1.__exportStar(require("./enums/http-headers-codes.enum.js"), exports);
 tslib_1.__exportStar(require("./enums/http-status-codes.enum.js"), exports);

package/cjs/schema/opra-schema.ns.js

@@ -13,6 +13,7 @@ tslib_1.__exportStar(require("./resource/container.interface.js"), exports);
 tslib_1.__exportStar(require("./resource/endpoint.interface.js"), exports);
 tslib_1.__exportStar(require("./resource/resource.interface.js"), exports);
 tslib_1.__exportStar(require("./resource/singleton.interface.js"), exports);
+tslib_1.__exportStar(require("./resource/storage.interface.js"), exports);
 tslib_1.__exportStar(require("./constants.js"), exports);
 tslib_1.__exportStar(require("./document.interface.js"), exports);
 tslib_1.__exportStar(require("./type-guards.js"), exports);

package/cjs/schema/resource/storage.interface.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Storage = void 0;
+var Storage;
+(function (Storage) {
+    Storage.Kind = 'Storage';
+})(Storage || (exports.Storage = Storage = {}));

package/cjs/schema/type-guards.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isContainer = exports.isSingleton = exports.isCollection = exports.isResource = exports.isEnumType = exports.isMappedType = exports.isUnionType = exports.isSimpleType = exports.isComplexType = exports.isDataType = void 0;
+exports.isContainer = exports.isStorage = exports.isSingleton = exports.isCollection = exports.isResource = exports.isEnumType = exports.isMappedType = exports.isUnionType = exports.isSimpleType = exports.isComplexType = exports.isDataType = void 0;
 const complex_type_interface_js_1 = require("./data-type/complex-type.interface.js");
 const enum_type_interface_js_1 = require("./data-type/enum-type.interface.js");
 const mapped_type_interface_js_1 = require("./data-type/mapped-type.interface.js");
@@ -9,6 +9,7 @@ const union_type_interface_js_1 = require("./data-type/union-type.interface.js")
 const collection_interface_js_1 = require("./resource/collection.interface.js");
 const container_interface_js_1 = require("./resource/container.interface.js");
 const singleton_interface_js_1 = require("./resource/singleton.interface.js");
+const storage_interface_js_1 = require("./resource/storage.interface.js");
 function isDataType(obj) {
     return obj && typeof obj === 'object' &&
         (obj.kind === complex_type_interface_js_1.ComplexType.Kind ||
@@ -53,6 +54,10 @@ function isSingleton(obj) {
     return obj && typeof obj === 'object' && obj.kind === singleton_interface_js_1.Singleton.Kind;
 }
 exports.isSingleton = isSingleton;
+function isStorage(obj) {
+    return obj && typeof obj === 'object' && obj.kind === storage_interface_js_1.Storage.Kind;
+}
+exports.isStorage = isStorage;
 function isContainer(obj) {
     return obj && typeof obj === 'object' && obj.kind === container_interface_js_1.Container.Kind;
 }

package/esm/document/api-document.js

@@ -182,6 +182,14 @@ export class ApiDocument {
             return t;
         throw new NotAcceptableError(`Resource type "${t.name}" is not a Singleton`);
     }
+    getStorage(path, silent) {
+        const t = this.getResource(path);
+        if (!t && silent)
+            return;
+        if (t && t.kind === OpraSchema.Storage.Kind)
+            return t;
+        throw new NotAcceptableError(`Resource type "${t.name}" is not a Storage`);
+    }
     /**
      * Export as Opra schema definition object
      */

package/esm/document/data-type/mapped-type.js

@@ -1,7 +1,7 @@
 import 'reflect-metadata';
 import merge from 'putil-merge';
 import * as vg from 'valgen';
-import { applyMixins, inheritPropertyInitializers, omitUndefined, ResponsiveMap } from '../../helpers/index.js';
+import { inheritPropertyInitializers, mergePrototype, omitUndefined, ResponsiveMap } from '../../helpers/index.js';
 import { OpraSchema } from '../../schema/index.js';
 import { METADATA_KEY } from '../constants.js';
 import { DataType } from './data-type.js';
@@ -87,7 +87,7 @@ export const MappedType = function (...args) {
             inheritPropertyInitializers(this, source, isInheritedPredicate);
         }
     }
-    applyMixins(MappedClass, source);
+    mergePrototype(MappedClass.prototype, source.prototype);
     // const mappedTypeMetadata: MappedType.TypeMapping[] = [];
     const m = Reflect.getOwnMetadata(METADATA_KEY, source);
     if (!m)

package/esm/document/data-type/union-type.js

@@ -1,7 +1,7 @@
 import 'reflect-metadata';
 import merge from 'putil-merge';
 import * as vg from 'valgen';
-import { applyMixins, inheritPropertyInitializers, omitUndefined, ResponsiveMap } from '../../helpers/index.js';
+import { inheritPropertyInitializers, mergePrototype, omitUndefined, ResponsiveMap } from '../../helpers/index.js';
 import { OpraSchema } from '../../schema/index.js';
 import { METADATA_KEY } from '../constants.js';
 import { ComplexType } from './complex-type.js';
@@ -102,7 +102,7 @@ export const UnionType = function (...args) {
             itemMeta.kind === OpraSchema.MappedType.Kind)))
             throw new TypeError(`Class "${c.name}" is not a ${OpraSchema.ComplexType.Kind}, ${OpraSchema.UnionType.Kind} or ${OpraSchema.MappedType.Kind}`);
         metadata.types.push(c);
-        applyMixins(UnionClass, c);
+        mergePrototype(UnionClass.prototype, c.prototype);
     }
     UnionType._applyMixin(UnionClass, ...clasRefs);
     return UnionClass;

package/esm/document/factory/factory.js

@@ -5,7 +5,7 @@ import { addReferences } from './add-references.js';
 import { createBuiltinTypeDocument, createDocument, createDocumentFromUrl } from './create-document.js';
 import { extractCollectionSchema, extractSingletonSchema, importResourceClass } from './import-resource-class.js';
 import { extractComplexTypeSchema, extractEnumTypeSchema, extractFieldSchema, extractMappedTypeSchema, extractSimpleTypeSchema, extractUnionTypeSchema, importTypeClass } from './import-type-class.js';
-import { createCollection, createSingleton, processResourceQueue } from './process-resources.js';
+import { createCollectionResource, createFileResource, createSingletonResource, processResourceQueue } from './process-resources.js';
 import { addDataType, createDataTypeInstance, processTypes } from './process-types.js';
 /**
  * @class DocumentFactory
@@ -56,6 +56,7 @@ DocumentFactory.designTypeMap = new Map();
     _a.prototype.extractSingletonSchema = extractSingletonSchema;
     _a.prototype.extractCollectionSchema = extractCollectionSchema;
     _a.prototype.processResourceQueue = processResourceQueue;
-    _a.prototype.createCollection = createCollection;
-    _a.prototype.createSingleton = createSingleton;
+    _a.prototype.createCollectionResource = createCollectionResource;
+    _a.prototype.createSingletonResource = createSingletonResource;
+    _a.prototype.createFileResource = createFileResource;
 })();

package/esm/document/factory/process-resources.js

@@ -1,6 +1,7 @@
 import { OpraSchema } from '../../schema/index.js';
 import { Collection } from '../resource/collection.js';
 import { Singleton } from '../resource/singleton.js';
+import { Storage } from '../resource/storage.js';
 export async function processResourceQueue() {
     const { document, resourceQueue } = this;
     const resourceNames = Array.from(resourceQueue.keys());
@@ -10,12 +11,17 @@ export async function processResourceQueue() {
             continue;
         try {
             if (OpraSchema.isCollection(schema)) {
-                const resource = await this.createCollection(name, schema);
+                const resource = await this.createCollectionResource(name, schema);
                 document.resources.set(name, resource);
                 continue;
             }
             if (OpraSchema.isSingleton(schema)) {
-                const resource = await this.createSingleton(name, schema);
+                const resource = await this.createSingletonResource(name, schema);
+                document.resources.set(name, resource);
+                continue;
+            }
+            if (OpraSchema.isStorage(schema)) {
+                const resource = await this.createFileResource(name, schema);
                 document.resources.set(name, resource);
                 continue;
             }
@@ -27,7 +33,7 @@ export async function processResourceQueue() {
         throw new TypeError(`Invalid Resource schema: ${JSON.stringify(schema).substring(0, 20)}...`);
     }
 }
-export async function createCollection(name, schema) {
+export async function createCollectionResource(name, schema) {
     const { document } = this;
     const dataType = document.getComplexType(schema.type);
     const initArgs = {
@@ -37,7 +43,7 @@ export async function createCollection(name, schema) {
     };
     return new Collection(document, initArgs);
 }
-export async function createSingleton(name, schema) {
+export async function createSingletonResource(name, schema) {
     const { document } = this;
     const dataType = document.getComplexType(schema.type);
     const initArgs = {
@@ -47,3 +53,11 @@ export async function createSingleton(name, schema) {
     };
     return new Singleton(document, initArgs);
 }
+export async function createFileResource(name, schema) {
+    const { document } = this;
+    const initArgs = {
+        ...schema,
+        name
+    };
+    return new Storage(document, initArgs);
+}

package/esm/document/index.js

@@ -12,3 +12,4 @@ export * from './data-type/union-type.js';
 export * from './resource/resource.js';
 export * from './resource/collection.js';
 export * from './resource/singleton.js';
+export * from './resource/storage.js';

package/esm/document/resource/storage.js

@@ -0,0 +1,77 @@
+import omit from 'lodash.omit';
+import merge from 'putil-merge';
+import { omitUndefined } from '../../helpers/index.js';
+import { OpraSchema } from '../../schema/index.js';
+import { METADATA_KEY } from '../constants.js';
+import { Resource } from './resource.js';
+const NESTJS_INJECTABLE_WATERMARK = '__injectable__';
+const NAME_PATTERN = /^(.*)(Resource)$/;
+class StorageClass extends Resource {
+    constructor(document, init) {
+        super(document, init);
+        this.kind = OpraSchema.Storage.Kind;
+        this.controller = init.controller;
+        const operations = this.operations = init.operations || {};
+        if (this.controller) {
+            const instance = typeof this.controller == 'function'
+                ? new this.controller()
+                : this.controller;
+            for (const operation of Object.values(operations)) {
+                if (!operation.handler && operation.handlerName) {
+                    const fn = instance[operation.handlerName];
+                    if (!fn)
+                        throw new TypeError(`No such operation handler (${operation.handlerName}) found`);
+                    operation.handler = fn.bind(instance);
+                }
+            }
+        }
+    }
+    exportSchema() {
+        const out = Resource.prototype.exportSchema.call(this);
+        Object.assign(out, omitUndefined({
+            operations: this.operations
+        }));
+        return out;
+    }
+}
+export const 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(METADATA_KEY, target) || {};
+            metadata.kind = OpraSchema.Storage.Kind;
+            metadata.name = name;
+            // Merge with previous metadata object
+            const m = Reflect.getMetadata(METADATA_KEY, 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(METADATA_KEY, metadata, target);
+            /* Define Injectable metadata for NestJS support*/
+            Reflect.defineMetadata(NESTJS_INJECTABLE_WATERMARK, true, target);
+        };
+    }
+    // Constructor
+    const [document, init] = args;
+    merge(this, new StorageClass(document, init), { descriptor: true });
+};
+Storage.prototype = StorageClass.prototype;
+function createOperationDecorator(operation) {
+    return (options) => ((target, propertyKey) => {
+        const metadata = {
+            ...options,
+            handlerName: propertyKey
+        };
+        const resourceMetadata = (Reflect.getOwnMetadata(METADATA_KEY, target.constructor) || {});
+        resourceMetadata.operations = resourceMetadata.operations || {};
+        resourceMetadata.operations[operation] = metadata;
+        Reflect.defineMetadata(METADATA_KEY, resourceMetadata, target.constructor);
+    });
+}
+Storage.Delete = createOperationDecorator('delete');
+Storage.Get = createOperationDecorator('get');
+Storage.Put = createOperationDecorator('put');

package/esm/helpers/mixin-utils.js

@@ -1,12 +1,13 @@
-export function applyMixins(derivedCtor, baseCtor, filter) {
-    for (const k of Object.getOwnPropertyNames(baseCtor.prototype)) {
+export function mergePrototype(targetProto, baseProto, filter) {
+    for (const k of Object.getOwnPropertyNames(baseProto)) {
         if ((k === 'constructor' || k === '__proto__' || k === 'toJSON' || k === 'toString') ||
             filter && !filter(k))
             continue;
-        Object.defineProperty(derivedCtor.prototype, k, Object.getOwnPropertyDescriptor(baseCtor.prototype, k) ||
+        Object.defineProperty(targetProto, k, Object.getOwnPropertyDescriptor(baseProto, k) ||
             Object.create(null));
     }
 }
+// noinspection JSUnusedLocalSymbols
 export function inheritPropertyInitializers(target, sourceClass, 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 isPropertyInherited = (key) => true) {

package/esm/helpers/responsive-map.js

@@ -95,7 +95,12 @@ export class ResponsiveMap extends Map {
         return super.delete(orgKey);
     }
     sort(compareFn) {
-        this[kKeyOrder].sort(compareFn);
+        if (compareFn)
+            this[kKeyOrder].sort(compareFn);
+        else if (this[kOptions].caseSensitive)
+            this[kKeyOrder].sort();
+        else
+            this[kKeyOrder].sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()));
         return this;
     }
     getProxy(handler) {

package/esm/http/index.js

@@ -1,4 +1,3 @@
-export * from './http-headers.js';
 export * from './http-params.js';
 export * from './enums/http-headers-codes.enum.js';
 export * from './enums/http-status-codes.enum.js';

package/esm/schema/opra-schema.ns.js

@@ -10,6 +10,7 @@ export * from './resource/container.interface.js';
 export * from './resource/endpoint.interface.js';
 export * from './resource/resource.interface.js';
 export * from './resource/singleton.interface.js';
+export * from './resource/storage.interface.js';
 export * from './constants.js';
 export * from './document.interface.js';
 export * from './type-guards.js';

package/esm/schema/resource/storage.interface.js

@@ -0,0 +1,4 @@
+export var Storage;
+(function (Storage) {
+    Storage.Kind = 'Storage';
+})(Storage || (Storage = {}));

package/esm/schema/type-guards.js

@@ -6,6 +6,7 @@ import { UnionType } from './data-type/union-type.interface.js';
 import { Collection } from './resource/collection.interface.js';
 import { Container } from './resource/container.interface.js';
 import { Singleton } from './resource/singleton.interface.js';
+import { Storage } from './resource/storage.interface.js';
 export function isDataType(obj) {
     return obj && typeof obj === 'object' &&
         (obj.kind === ComplexType.Kind ||
@@ -41,6 +42,9 @@ export function isCollection(obj) {
 export function isSingleton(obj) {
     return obj && typeof obj === 'object' && obj.kind === Singleton.Kind;
 }
+export function isStorage(obj) {
+    return obj && typeof obj === 'object' && obj.kind === Storage.Kind;
+}
 export function isContainer(obj) {
     return obj && typeof obj === 'object' && obj.kind === Container.Kind;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/common",
-  "version": "0.20.3",
+  "version": "0.21.0",
   "description": "Opra common package",
   "author": "Panates",
   "license": "MIT",
@@ -47,7 +47,6 @@
     "@browsery/i18next": "^0.6.0",
     "fast-tokenizer": "^1.2.2",
     "lodash.omit": "^4.5.0",
-    "path-browserify": "^1.0.1",
     "putil-isplainobject": "^1.1.5",
     "putil-merge": "^3.10.3",
     "putil-promisify": "^1.10.0",
@@ -62,6 +61,7 @@
     "@browsery/util": "^0.4.0",
     "@types/encodeurl": "^1.0.0",
     "@types/validator": "^13.7.17",
+    "path-browserify": "^1.0.1",
     "ts-gems": "^2.4.0"
   },
   "engines": {

package/types/document/api-document.d.ts

@@ -7,6 +7,7 @@ import { SimpleType } from './data-type/simple-type.js';
 import type { Collection } from './resource/collection.js';
 import { Resource } from './resource/resource.js';
 import { Singleton } from './resource/singleton.js';
+import { Storage } from './resource/storage.js';
 export declare class ApiDocument {
     protected _designCtorMap: Map<Function | Type<any>, string>;
     protected _typeCache: ResponsiveMap<DataType>;
@@ -75,11 +76,6 @@ export declare class ApiDocument {
      * @param silent
      */
     getCollection(path: string, silent: true): Collection | undefined;
-    /**
-     * Returns ComplexType instance by name or Constructor.
-     * Throws error undefined if not found or data type is not a ComplexType
-     * @param path
-     */
     getCollection(path: string): Collection;
     /**
      * Returns Singleton resource instance by path
@@ -89,12 +85,9 @@ export declare class ApiDocument {
      * @param silent
      */
     getSingleton(path: string, silent: true): Singleton | undefined;
-    /**
-     * Returns ComplexType instance by name or Constructor.
-     * Throws error undefined if not found or data type is not a ComplexType
-     * @param path
-     */
     getSingleton(path: string): Singleton;
+    getStorage(path: string, silent: true): Storage | undefined;
+    getStorage(path: string): Storage;
     /**
      * Export as Opra schema definition object
      */