@opra/core 0.13.0 → 0.15.0

package/esm/adapter/request-context.host.js

@@ -0,0 +1,26 @@
+import { AsyncEventEmitter } from 'strict-typed-events';
+export class RequestContextHost extends AsyncEventEmitter {
+    constructor(protocol, platform, api, _request, _response) {
+        super();
+        this.protocol = protocol;
+        this.platform = platform;
+        this.api = api;
+        this._request = _request;
+        this._response = _response;
+    }
+    get request() {
+        return this._request;
+    }
+    get response() {
+        return this._response;
+    }
+    switchToHttp() {
+        throw new TypeError('Not executing in an "Http" protocol');
+    }
+    switchToWs() {
+        throw new TypeError('Not executing in an "WebSocket" protocol');
+    }
+    switchToRpc() {
+        throw new TypeError('Not executing in an "RPC" protocol');
+    }
+}

package/esm/adapter/request.host.d.ts

@@ -0,0 +1,26 @@
+import type { HttpRequestMessage, Resource } from '@opra/common';
+import { OpraSchema } from '@opra/common';
+import type { Request } from './interfaces/request.interface.js';
+export declare namespace RequestHost {
+    interface Initiator {
+        kind: string;
+        resource: Resource;
+        operation: string;
+        crud: 'create' | 'read' | 'update' | 'delete';
+        many: boolean;
+        args: any;
+    }
+}
+export declare abstract class RequestHost implements Request {
+    readonly kind: string;
+    readonly resource: Resource;
+    readonly resourceKind: OpraSchema.Resource.Kind;
+    readonly operation: string;
+    readonly crud: 'create' | 'read' | 'update' | 'delete';
+    readonly many: boolean;
+    readonly args: any;
+    protected constructor(init: RequestHost.Initiator);
+    switchToHttp(): HttpRequestMessage;
+    switchToWs(): never;
+    switchToRpc(): never;
+}

package/esm/adapter/request.host.js

@@ -0,0 +1,15 @@
+export class RequestHost {
+    constructor(init) {
+        Object.assign(this, init);
+        this.resourceKind = this.resource.kind;
+    }
+    switchToHttp() {
+        throw new TypeError('Not executing in an "Http" protocol');
+    }
+    switchToWs() {
+        throw new TypeError('Not executing in an "WebSocket" protocol');
+    }
+    switchToRpc() {
+        throw new TypeError('Not executing in an "RPC" protocol');
+    }
+}

package/esm/adapter/response.host.d.ts

@@ -0,0 +1,20 @@
+import { HttpResponseMessage } from '@opra/common';
+import { Response } from './interfaces/response.interface.js';
+export declare namespace ResponseHost {
+    interface Initiator {
+        value?: any;
+        errors?: Error[];
+        continueOnError?: boolean;
+        count?: number;
+    }
+}
+export declare abstract class ResponseHost implements Response {
+    value?: any;
+    errors: Error[];
+    continueOnError?: boolean;
+    count?: number;
+    protected constructor(init: ResponseHost.Initiator);
+    switchToHttp(): HttpResponseMessage;
+    switchToWs(): never;
+    switchToRpc(): never;
+}

package/esm/adapter/response.host.js

@@ -0,0 +1,16 @@
+export class ResponseHost {
+    constructor(init) {
+        if (init)
+            Object.assign(this, init);
+        this.errors = this.errors || [];
+    }
+    switchToHttp() {
+        throw new TypeError('Not executing in an "Http" protocol');
+    }
+    switchToWs() {
+        throw new TypeError('Not executing in an "WebSocket" protocol');
+    }
+    switchToRpc() {
+        throw new TypeError('Not executing in an "RPC" protocol');
+    }
+}

package/esm/augmentation/resource.augmentation.d.ts

@@ -0,0 +1,33 @@
+declare module "@opra/common" {
+    interface CollectionConstructor {
+        OnInit(): any;
+        OnShutdown(): any;
+    }
+    interface SingletonConstructor {
+        OnInit(): any;
+        OnShutdown(): any;
+    }
+    interface Resource {
+        onInit?: (resource: Resource) => void | Promise<void>;
+        onShutdown?: (resource: Resource) => void | Promise<void>;
+    }
+    namespace Resource {
+        interface InitArguments {
+            onInit?: (resource: Resource) => void | Promise<void>;
+            onShutdown?: (resource: Resource) => void | Promise<void>;
+        }
+    }
+    namespace Collection {
+        interface Metadata {
+            onInit?: (resource: Collection) => void | Promise<void>;
+            onShutdown?: (resource: Collection) => void | Promise<void>;
+        }
+    }
+    namespace Singleton {
+        interface Metadata {
+            onInit?: (resource: Singleton) => void | Promise<void>;
+            onShutdown?: (resource: Singleton) => void | Promise<void>;
+        }
+    }
+}
+export {};

package/esm/augmentation/resource.augmentation.js

@@ -0,0 +1,24 @@
+import { Collection, METADATA_KEY, Resource, Singleton } from "@opra/common";
+// @ts-ignore
+const oldConstruct = Resource.prototype._construct;
+// @ts-ignore
+Resource.prototype._construct = function (init) {
+    oldConstruct.call(this, init);
+    const _this = this;
+    _this.onInit = init.onInit;
+    _this.onShutdown = init.onShutdown;
+};
+Collection.OnInit = Singleton.OnInit = function () {
+    return (target, propertyKey) => {
+        const resourceMetadata = (Reflect.getOwnMetadata(METADATA_KEY, target.constructor) || {});
+        resourceMetadata.onInit = target[propertyKey];
+        Reflect.defineMetadata(METADATA_KEY, target.constructor, resourceMetadata);
+    };
+};
+Collection.OnShutdown = Singleton.OnShutdown = function () {
+    return (target, propertyKey) => {
+        const resourceMetadata = (Reflect.getOwnMetadata(METADATA_KEY, target.constructor) || {});
+        resourceMetadata.onShutdown = target[propertyKey];
+        Reflect.defineMetadata(METADATA_KEY, target.constructor, resourceMetadata);
+    };
+};

package/esm/index.d.ts

@@ -1,11 +1,10 @@
 import "reflect-metadata";
+import './augmentation/resource.augmentation.js';
 export * from './types.js';
-export * from './interfaces/execution-context.interface.js';
-export * from './interfaces/resource.interface.js';
-export * from './interfaces/i18n-options.interface.js';
-export * from './adapter/request-contexts/single-request-context.js';
 export * from './adapter/adapter.js';
-export * from './adapter/http-adapter.js';
-export * from './adapter/express-adapter.js';
-export * from './services/data-service.js';
-export * from './services/json-singleton-service.js';
+export * from './adapter/http/express-adapter.js';
+export * from './adapter/http/http-adapter.js';
+export * from './adapter/interfaces/request-context.interface.js';
+export * from './adapter/interfaces/logger.interface.js';
+export * from './adapter/interfaces/request.interface.js';
+export * from './adapter/interfaces/response.interface.js';

package/esm/index.js

@@ -1,11 +1,10 @@
 import "reflect-metadata";
+import './augmentation/resource.augmentation.js';
 export * from './types.js';
-export * from './interfaces/execution-context.interface.js';
-export * from './interfaces/resource.interface.js';
-export * from './interfaces/i18n-options.interface.js';
-export * from './adapter/request-contexts/single-request-context.js';
 export * from './adapter/adapter.js';
-export * from './adapter/http-adapter.js';
-export * from './adapter/express-adapter.js';
-export * from './services/data-service.js';
-export * from './services/json-singleton-service.js';
+export * from './adapter/http/express-adapter.js';
+export * from './adapter/http/http-adapter.js';
+export * from './adapter/interfaces/request-context.interface.js';
+export * from './adapter/interfaces/logger.interface.js';
+export * from './adapter/interfaces/request.interface.js';
+export * from './adapter/interfaces/response.interface.js';

package/i18n/en/error.json

@@ -10,6 +10,6 @@
   "UNPROCESSABLE_ENTITY": "Unprocessable entity",
   "RESOURCE_NOT_FOUND": "The resource '{{resource}}' could not be found",
   "RESOURCE_CONFLICT": "There is already an other {{resource}} resource with same field values ({{fields}})",
-  "RESOLVER_FORBIDDEN": "The resource endpoint does not accept '{{method}}' operations",
+  "RESOLVER_FORBIDDEN": "The resource endpoint does not accept '{{operation}}' operations",
   "UNACCEPTED_SORT_FIELD": "Field '{{field}}' is not available for sort operation"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/core",
-  "version": "0.13.0",
+  "version": "0.15.0",
   "description": "Opra schema package",
   "author": "Panates",
   "license": "MIT",
@@ -19,31 +19,33 @@
     "_copy_pkg_files": "cp README.md package.json ../../LICENSE ../../build/core && cp ../../package.cjs.json ../../build/core/cjs/package.json",
     "_copyi18n": "cp -R i18n ../../build/core/i18n",
     "lint": "eslint . --max-warnings=0",
-    "test": "NODE_OPTIONS=--experimental-vm-modules npx jest",
-    "cover": "NODE_OPTIONS=--experimental-vm-modules npx jest --collect-coverage",
+    "test": "jest",
+    "cover": "jest --collect-coverage",
     "clean": "npm run clean:src && npm run clean:dist && npm run clean:cover",
     "clean:src": "ts-cleanup -s src --all && ts-cleanup -s test --all",
     "clean:dist": "rimraf ../../build/core",
     "clean:cover": "rimraf ../../coverage/core"
   },
   "dependencies": {
-    "@opra/common": "^0.13.0",
+    "@opra/common": "^0.15.0",
+    "content-type": "^1.0.5",
     "lodash.isnil": "^4.0.0",
     "lodash.omitby": "^4.6.0",
     "power-tasks": "^1.6.4",
     "putil-isplainobject": "^1.1.5",
-    "putil-merge": "^3.10.1",
+    "putil-merge": "^3.10.3",
     "putil-varhelpers": "^1.6.5",
     "strict-typed-events": "^2.3.1"
   },
   "peerDependencies": {
-    "body-parser": ">= 1.0.0",
+    "body-parser": "^1.20.2",
     "express": "^4.x.x || ^5.x.x"
   },
   "devDependencies": {
     "@faker-js/faker": "^7.6.0",
     "@types/dicer": "^0.2.2",
-    "@types/express": "^4.17.16",
+    "@types/express": "^4.17.17",
+    "@types/content-type": "^1.1.5",
     "cors": "^2.8.5",
     "ts-gems": "^2.3.0"
   },

package/cjs/adapter/classes/execution-context.host.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExecutionContextHost = void 0;
-const strict_typed_events_1 = require("strict-typed-events");
-class ExecutionContextHost extends strict_typed_events_1.AsyncEventEmitter {
-    constructor() {
-        super();
-    }
-    switchToHttp() {
-        throw new Error(`This is not an http context`);
-    }
-    onFinish(fn) {
-        this.on('finish', fn);
-    }
-}
-exports.ExecutionContextHost = ExecutionContextHost;

package/cjs/adapter/classes/express-request-wrapper.host.js

@@ -1,36 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExpressRequestWrapperHost = void 0;
-class ExpressRequestWrapperHost {
-    constructor(instance) {
-        this.instance = instance;
-    }
-    getInstance() {
-        return this.instance;
-    }
-    getMethod() {
-        return this.instance.method;
-    }
-    getUrl() {
-        return this.instance.url;
-    }
-    getHeaderNames() {
-        return Object.keys(this.instance.headers);
-    }
-    getHeader(name) {
-        return this.instance.get(name);
-    }
-    getHeaders() {
-        return this.instance.headers;
-    }
-    getBody() {
-        return this.instance.body;
-    }
-    isCompleted() {
-        return this.instance.complete;
-    }
-    getStream() {
-        return this.instance;
-    }
-}
-exports.ExpressRequestWrapperHost = ExpressRequestWrapperHost;

package/cjs/adapter/classes/express-response-wrapper.host.js

@@ -1,55 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExpressResponseWrapperHost = void 0;
-class ExpressResponseWrapperHost {
-    constructor(instance) {
-        this.instance = instance;
-    }
-    getInstance() {
-        return this.instance;
-    }
-    getHeader(name) {
-        return this.instance.get(name);
-    }
-    getHeaders() {
-        return this.instance.getHeaders();
-    }
-    getHeaderNames() {
-        return this.instance.getHeaderNames();
-    }
-    hasHeader(name) {
-        return this.instance.hasHeader(name);
-    }
-    removeHeader(name) {
-        return this.instance.removeHeader(name);
-    }
-    setHeader(name, value) {
-        this.instance.setHeader(name, value);
-        return this;
-    }
-    getStatus() {
-        return this.instance.statusCode;
-    }
-    setStatus(value) {
-        // noinspection SuspiciousTypeOfGuard
-        this.instance.status(typeof value === 'number'
-            ? value
-            : parseInt(value, 10) || 500);
-        return this;
-    }
-    getStream() {
-        return this.instance;
-    }
-    send(body) {
-        if (typeof body === 'string' || Buffer.isBuffer(body))
-            this.instance.send(body);
-        else
-            this.instance.json(body);
-        return this;
-    }
-    end() {
-        this.instance.end();
-        return this;
-    }
-}
-exports.ExpressResponseWrapperHost = ExpressResponseWrapperHost;

package/cjs/adapter/classes/http-execution-context.host.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpExecutionContextHost = void 0;
-const execution_context_host_js_1 = require("./execution-context.host.js");
-class HttpExecutionContextHost extends execution_context_host_js_1.ExecutionContextHost {
-    constructor(_platform, _request, _response) {
-        super();
-        this._platform = _platform;
-        this._request = _request;
-        this._response = _response;
-    }
-    getType() {
-        return 'http';
-    }
-    getPlatform() {
-        return this._platform;
-    }
-    getRequest() {
-        return this._request;
-    }
-    getResponse() {
-        return this._response;
-    }
-    switchToHttp() {
-        return this;
-    }
-}
-exports.HttpExecutionContextHost = HttpExecutionContextHost;

package/cjs/adapter/classes/metadata.resource.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MetadataResource = void 0;
-const tslib_1 = require("tslib");
-const common_1 = require("@opra/common");
-const json_singleton_service_js_1 = require("../../services/json-singleton-service.js");
-let MetadataResource = class MetadataResource {
-    init(resource) {
-        this.service = new json_singleton_service_js_1.JsonSingletonService(resource.dataType, {
-            data: resource.document.getMetadata(true)
-        });
-    }
-    get() {
-        return this.service.get();
-    }
-};
-MetadataResource = tslib_1.__decorate([
-    (0, common_1.OprSingletonResource)(Object, {
-        name: '$metadata'
-    })
-], MetadataResource);
-exports.MetadataResource = MetadataResource;

package/cjs/adapter/express-adapter.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OpraExpressAdapter = void 0;
-const tslib_1 = require("tslib");
-const body_parser_1 = tslib_1.__importDefault(require("body-parser"));
-const common_1 = require("@opra/common");
-const express_request_wrapper_host_js_1 = require("./classes/express-request-wrapper.host.js");
-const express_response_wrapper_host_js_1 = require("./classes/express-response-wrapper.host.js");
-const http_execution_context_host_js_1 = require("./classes/http-execution-context.host.js");
-const http_adapter_js_1 = require("./http-adapter.js");
-class OpraExpressAdapter extends http_adapter_js_1.OpraHttpAdapter {
-    static async init(app, document, options) {
-        const adapter = new OpraExpressAdapter(document);
-        await adapter._init(options);
-        const prefix = '/' + (0, common_1.normalizePath)(options?.prefix, true);
-        app.use(prefix, body_parser_1.default.json());
-        app.use(prefix, (request, response, next) => {
-            (async () => {
-                const executionContext = new http_execution_context_host_js_1.HttpExecutionContextHost('express', new express_request_wrapper_host_js_1.ExpressRequestWrapperHost(request), new express_response_wrapper_host_js_1.ExpressResponseWrapperHost(response));
-                await adapter.handler(executionContext);
-            })().catch(e => next(e));
-        });
-        return adapter;
-    }
-}
-exports.OpraExpressAdapter = OpraExpressAdapter;