@opra/core 1.0.0-beta.2 → 1.0.0-beta.3

package/cjs/execution-context.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExecutionContext = void 0;
-const strict_typed_events_1 = require("strict-typed-events");
+const node_events_async_1 = require("node-events-async");
 /**
  * @class ExecutionContext
  */
-class ExecutionContext extends strict_typed_events_1.AsyncEventEmitter {
+class ExecutionContext extends node_events_async_1.AsyncEventEmitter {
     constructor(init) {
         super();
         this.errors = [];
@@ -13,17 +13,5 @@ class ExecutionContext extends strict_typed_events_1.AsyncEventEmitter {
         this.protocol = init.protocol;
         this.platform = init.platform;
     }
-    addListener(event, listener) {
-        return super.addListener(event, listener);
-    }
-    removeListener(event, listener) {
-        return super.removeListener(event, listener);
-    }
-    on(event, listener) {
-        return super.on(event, listener);
-    }
-    off(event, listener) {
-        return super.off(event, listener);
-    }
 }
 exports.ExecutionContext = ExecutionContext;

package/cjs/index.js

@@ -1,33 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.classes = void 0;
 const tslib_1 = require("tslib");
 require("reflect-metadata");
 require("./augmentation/18n.augmentation.js");
-require("./augmentation/http-controller.augmentation.js");
-const HttpIncomingHost_ = tslib_1.__importStar(require("./http/impl/http-incoming.host.js"));
-const HttpOutgoingHost_ = tslib_1.__importStar(require("./http/impl/http-outgoing.host.js"));
-const NodeIncomingMessageHost_ = tslib_1.__importStar(require("./http/impl/node-incoming-message.host.js"));
-const NodeOutgoingMessageHost_ = tslib_1.__importStar(require("./http/impl/node-outgoing-message.host.js"));
+tslib_1.__exportStar(require("./asset-cache.js"), exports);
+tslib_1.__exportStar(require("./constants.js"), exports);
 tslib_1.__exportStar(require("./execution-context.js"), exports);
-tslib_1.__exportStar(require("./helpers/service-base.js"), exports);
-tslib_1.__exportStar(require("./http/express-adapter.js"), exports);
-tslib_1.__exportStar(require("./http/http-adapter.js"), exports);
-tslib_1.__exportStar(require("./http/http-context.js"), exports);
-tslib_1.__exportStar(require("./http/http-handler.js"), exports);
-tslib_1.__exportStar(require("./http/impl/multipart-reader.js"), exports);
-tslib_1.__exportStar(require("./http/interfaces/http-incoming.interface.js"), exports);
-tslib_1.__exportStar(require("./http/interfaces/http-outgoing.interface.js"), exports);
-tslib_1.__exportStar(require("./http/interfaces/node-incoming-message.interface.js"), exports);
-tslib_1.__exportStar(require("./http/interfaces/node-outgoing-message.interface.js"), exports);
-tslib_1.__exportStar(require("./http/utils/wrap-exception.js"), exports);
 tslib_1.__exportStar(require("./interfaces/logger.interface.js"), exports);
 tslib_1.__exportStar(require("./platform-adapter.js"), exports);
-tslib_1.__exportStar(require("./type-guards.js"), exports);
-var classes;
-(function (classes) {
-    classes.HttpIncomingHost = HttpIncomingHost_.HttpIncomingHost;
-    classes.HttpOutgoingHost = HttpOutgoingHost_.HttpOutgoingHost;
-    classes.NodeIncomingMessageHost = NodeIncomingMessageHost_.NodeIncomingMessageHost;
-    classes.NodeOutgoingMessageHost = NodeOutgoingMessageHost_.NodeOutgoingMessageHost;
-})(classes || (exports.classes = classes = {}));
+tslib_1.__exportStar(require("./service-base.js"), exports);

package/cjs/platform-adapter.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlatformAdapter = void 0;
 require("./augmentation/18n.augmentation.js");
 const common_1 = require("@opra/common");
-const strict_typed_events_1 = require("strict-typed-events");
+const node_events_async_1 = require("node-events-async");
+const asset_cache_js_1 = require("./asset-cache.js");
 const constants_js_1 = require("./constants.js");
-const asset_cache_js_1 = require("./http/impl/asset-cache.js");
 /**
  * @class PlatformAdapter
  */
-class PlatformAdapter extends strict_typed_events_1.AsyncEventEmitter {
+class PlatformAdapter extends node_events_async_1.AsyncEventEmitter {
     constructor(document, options) {
         super();
         this[constants_js_1.kAssetCache] = new asset_cache_js_1.AssetCache();

package/esm/execution-context.js

@@ -1,4 +1,4 @@
-import { AsyncEventEmitter } from 'strict-typed-events';
+import { AsyncEventEmitter } from 'node-events-async';
 /**
  * @class ExecutionContext
  */
@@ -10,16 +10,4 @@ export class ExecutionContext extends AsyncEventEmitter {
         this.protocol = init.protocol;
         this.platform = init.platform;
     }
-    addListener(event, listener) {
-        return super.addListener(event, listener);
-    }
-    removeListener(event, listener) {
-        return super.removeListener(event, listener);
-    }
-    on(event, listener) {
-        return super.on(event, listener);
-    }
-    off(event, listener) {
-        return super.off(event, listener);
-    }
 }

package/esm/index.js

@@ -1,29 +1,8 @@
 import 'reflect-metadata';
 import './augmentation/18n.augmentation.js';
-import './augmentation/http-controller.augmentation.js';
-import * as HttpIncomingHost_ from './http/impl/http-incoming.host.js';
-import * as HttpOutgoingHost_ from './http/impl/http-outgoing.host.js';
-import * as NodeIncomingMessageHost_ from './http/impl/node-incoming-message.host.js';
-import * as NodeOutgoingMessageHost_ from './http/impl/node-outgoing-message.host.js';
+export * from './asset-cache.js';
+export * from './constants.js';
 export * from './execution-context.js';
-export * from './helpers/service-base.js';
-export * from './http/express-adapter.js';
-export * from './http/http-adapter.js';
-export * from './http/http-context.js';
-export * from './http/http-handler.js';
-export * from './http/impl/multipart-reader.js';
-export * from './http/interfaces/http-incoming.interface.js';
-export * from './http/interfaces/http-outgoing.interface.js';
-export * from './http/interfaces/node-incoming-message.interface.js';
-export * from './http/interfaces/node-outgoing-message.interface.js';
-export * from './http/utils/wrap-exception.js';
 export * from './interfaces/logger.interface.js';
 export * from './platform-adapter.js';
-export * from './type-guards.js';
-export var classes;
-(function (classes) {
-    classes.HttpIncomingHost = HttpIncomingHost_.HttpIncomingHost;
-    classes.HttpOutgoingHost = HttpOutgoingHost_.HttpOutgoingHost;
-    classes.NodeIncomingMessageHost = NodeIncomingMessageHost_.NodeIncomingMessageHost;
-    classes.NodeOutgoingMessageHost = NodeOutgoingMessageHost_.NodeOutgoingMessageHost;
-})(classes || (classes = {}));
+export * from './service-base.js';

package/esm/platform-adapter.js

@@ -1,8 +1,8 @@
 import './augmentation/18n.augmentation.js';
 import { I18n } from '@opra/common';
-import { AsyncEventEmitter } from 'strict-typed-events';
+import { AsyncEventEmitter } from 'node-events-async';
+import { AssetCache } from './asset-cache.js';
 import { kAssetCache } from './constants.js';
-import { AssetCache } from './http/impl/asset-cache.js';
 /**
  * @class PlatformAdapter
  */

package/package.json

@@ -1,44 +1,14 @@
 {
   "name": "@opra/core",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.3",
   "description": "Opra schema package",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
-    "@browsery/antlr4": "^4.13.3-r1",
-    "@browsery/http-parser": "^0.5.9-r1",
-    "@browsery/type-is": "^1.6.18-r5",
-    "@opra/common": "^1.0.0-beta.2",
-    "accepts": "^1.3.8",
-    "base64-stream": "^1.0.0",
-    "busboy": "^1.6.0",
-    "bytes": "^3.1.2",
-    "content-disposition": "^0.5.4",
-    "content-type": "^1.0.5",
-    "cookie": "^0.6.0",
-    "cookie-signature": "^1.2.1",
-    "cppzst": "^2.0.12",
-    "encodeurl": "^2.0.0",
-    "fast-tokenizer": "^1.7.0",
-    "fresh": "^0.5.2",
-    "iconv-lite": "^0.6.3",
-    "mime-types": "^2.1.35",
-    "power-tasks": "^1.11.0",
-    "putil-isplainobject": "^1.1.5",
-    "putil-merge": "^3.13.0",
-    "putil-varhelpers": "^1.6.5",
-    "range-parser": "^1.2.1",
-    "raw-body": "^3.0.0",
+    "@opra/common": "^1.0.0-beta.3",
+    "node-events-async": "^1.0.0",
     "reflect-metadata": "^0.2.2",
-    "strict-typed-events": "^2.8.0",
-    "super-fast-md5": "^1.0.3",
-    "tslib": "^2.7.0",
-    "valgen": "^5.9.0",
-    "vary": "^1.1.2"
-  },
-  "optionalDependencies": {
-    "express": "^4.x.x || ^5.x.x",
-    "fastify": "^4.x.x"
+    "tslib": "^2.7.0"
   },
   "type": "module",
   "exports": {
@@ -79,10 +49,6 @@
     "opra",
     "rest",
     "api",
-    "openapi",
-    "http",
-    "web",
-    "swagger",
-    "raml"
+    "core"
   ]
 }

package/types/execution-context.d.ts

@@ -1,27 +1,22 @@
 import { ApiDocument, OpraHttpError, OpraSchema } from '@opra/common';
-import { AsyncEventEmitter } from 'strict-typed-events';
+import { AsyncEventEmitter } from 'node-events-async';
 /**
  * @namespace ExecutionContext
  */
 export declare namespace ExecutionContext {
     interface Initiator {
         document: ApiDocument;
-        protocol: OpraSchema.Protocol;
+        protocol: OpraSchema.Transport;
         platform: string;
     }
-    type OnFinishListener = (error: Error | undefined, context: ExecutionContext) => void | Promise<void>;
 }
 /**
  * @class ExecutionContext
  */
 export declare abstract class ExecutionContext extends AsyncEventEmitter {
     readonly document: ApiDocument;
-    readonly protocol: OpraSchema.Protocol;
+    readonly protocol: OpraSchema.Transport;
     readonly platform: string;
     errors: OpraHttpError[];
     protected constructor(init: ExecutionContext.Initiator);
-    addListener(event: 'finish', listener: ExecutionContext.OnFinishListener): this;
-    removeListener(event: 'finish', listener: ExecutionContext.OnFinishListener): this;
-    on(event: 'finish', listener: ExecutionContext.OnFinishListener): this;
-    off(event: 'finish', listener: ExecutionContext.OnFinishListener): this;
 }

package/types/index.d.cts

@@ -1,28 +1,8 @@
 import 'reflect-metadata';
 import './augmentation/18n.augmentation.js';
-import './augmentation/http-controller.augmentation.js';
-import * as HttpIncomingHost_ from './http/impl/http-incoming.host.js';
-import * as HttpOutgoingHost_ from './http/impl/http-outgoing.host.js';
-import * as NodeIncomingMessageHost_ from './http/impl/node-incoming-message.host.js';
-import * as NodeOutgoingMessageHost_ from './http/impl/node-outgoing-message.host.js';
+export * from './asset-cache.js';
+export * from './constants.js';
 export * from './execution-context.js';
-export * from './helpers/service-base.js';
-export * from './http/express-adapter.js';
-export * from './http/http-adapter.js';
-export * from './http/http-context.js';
-export * from './http/http-handler.js';
-export * from './http/impl/multipart-reader.js';
-export * from './http/interfaces/http-incoming.interface.js';
-export * from './http/interfaces/http-outgoing.interface.js';
-export * from './http/interfaces/node-incoming-message.interface.js';
-export * from './http/interfaces/node-outgoing-message.interface.js';
-export * from './http/utils/wrap-exception.js';
 export * from './interfaces/logger.interface.js';
 export * from './platform-adapter.js';
-export * from './type-guards.js';
-export declare namespace classes {
-    export import HttpIncomingHost = HttpIncomingHost_.HttpIncomingHost;
-    export import HttpOutgoingHost = HttpOutgoingHost_.HttpOutgoingHost;
-    export import NodeIncomingMessageHost = NodeIncomingMessageHost_.NodeIncomingMessageHost;
-    export import NodeOutgoingMessageHost = NodeOutgoingMessageHost_.NodeOutgoingMessageHost;
-}
+export * from './service-base.js';

package/types/index.d.ts

@@ -1,28 +1,8 @@
 import 'reflect-metadata';
 import './augmentation/18n.augmentation.js';
-import './augmentation/http-controller.augmentation.js';
-import * as HttpIncomingHost_ from './http/impl/http-incoming.host.js';
-import * as HttpOutgoingHost_ from './http/impl/http-outgoing.host.js';
-import * as NodeIncomingMessageHost_ from './http/impl/node-incoming-message.host.js';
-import * as NodeOutgoingMessageHost_ from './http/impl/node-outgoing-message.host.js';
+export * from './asset-cache.js';
+export * from './constants.js';
 export * from './execution-context.js';
-export * from './helpers/service-base.js';
-export * from './http/express-adapter.js';
-export * from './http/http-adapter.js';
-export * from './http/http-context.js';
-export * from './http/http-handler.js';
-export * from './http/impl/multipart-reader.js';
-export * from './http/interfaces/http-incoming.interface.js';
-export * from './http/interfaces/http-outgoing.interface.js';
-export * from './http/interfaces/node-incoming-message.interface.js';
-export * from './http/interfaces/node-outgoing-message.interface.js';
-export * from './http/utils/wrap-exception.js';
 export * from './interfaces/logger.interface.js';
 export * from './platform-adapter.js';
-export * from './type-guards.js';
-export declare namespace classes {
-    export import HttpIncomingHost = HttpIncomingHost_.HttpIncomingHost;
-    export import HttpOutgoingHost = HttpOutgoingHost_.HttpOutgoingHost;
-    export import NodeIncomingMessageHost = NodeIncomingMessageHost_.NodeIncomingMessageHost;
-    export import NodeOutgoingMessageHost = NodeOutgoingMessageHost_.NodeOutgoingMessageHost;
-}
+export * from './service-base.js';

package/types/interfaces/logger.interface.d.ts

@@ -1,8 +1,8 @@
 export interface ILogger {
+    error(message: any, ...optionalParams: any[]): void;
     log?(message: any, ...optionalParams: any[]): void;
     info?(message: any, ...optionalParams: any[]): void;
     warn?(message: any, ...optionalParams: any[]): void;
-    error?(message: any, ...optionalParams: any[]): void;
     fatal?(message: any, ...optionalParams: any[]): void;
     debug?(message: any, ...optionalParams: any[]): void;
     verbose?(message: any, ...optionalParams: any[]): void;

package/types/platform-adapter.d.ts

@@ -1,8 +1,8 @@
 import './augmentation/18n.augmentation.js';
 import { ApiDocument, I18n, OpraSchema } from '@opra/common';
-import { AsyncEventEmitter } from 'strict-typed-events';
+import { AsyncEventEmitter } from 'node-events-async';
+import { AssetCache } from './asset-cache.js';
 import { kAssetCache } from './constants.js';
-import { AssetCache } from './http/impl/asset-cache.js';
 /**
  * @namespace PlatformAdapter
  */
@@ -17,7 +17,7 @@ export declare namespace PlatformAdapter {
 export declare abstract class PlatformAdapter extends AsyncEventEmitter {
     protected [kAssetCache]: AssetCache;
     readonly document: ApiDocument;
-    abstract readonly protocol: OpraSchema.Protocol;
+    abstract readonly protocol: OpraSchema.Transport;
     i18n: I18n;
     protected constructor(document: ApiDocument, options?: PlatformAdapter.Options);
     abstract close(): Promise<void>;

package/types/service-base.d.ts

@@ -0,0 +1,10 @@
+import type { Nullish } from 'ts-gems';
+import type { ExecutionContext } from './execution-context.js';
+export declare abstract class ServiceBase {
+    protected _context: ExecutionContext;
+    get context(): ExecutionContext;
+    for<C extends ExecutionContext, P extends Partial<this>>(context: C, overwriteProperties?: Nullish<P>, overwriteContext?: Partial<C>): this & Required<P>;
+}
+export declare namespace ServiceBase {
+    const extendSymbol: unique symbol;
+}

package/cjs/augmentation/http-controller.augmentation.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const common_1 = require("@opra/common");
-// @ts-ignore
-const oldInitialize = common_1.HttpController.prototype._initialize;
-// @ts-ignore
-common_1.HttpController.prototype._initialize = function (initArgs) {
-    oldInitialize?.call(this, initArgs);
-    this.onInit = initArgs.onInit;
-    this.onShutdown = initArgs.onShutdown;
-};
-common_1.HttpController.OnInit = function () {
-    return (target, propertyKey) => {
-        const sourceMetadata = (Reflect.getOwnMetadata(common_1.HTTP_CONTROLLER_METADATA, target.constructor) || {});
-        sourceMetadata.onInit = target[propertyKey];
-        Reflect.defineMetadata(common_1.HTTP_CONTROLLER_METADATA, target.constructor, sourceMetadata);
-    };
-};
-common_1.HttpController.OnShutdown = function () {
-    return (target, propertyKey) => {
-        const sourceMetadata = (Reflect.getOwnMetadata(common_1.HTTP_CONTROLLER_METADATA, target.constructor) || {});
-        sourceMetadata.onShutdown = target[propertyKey];
-        Reflect.defineMetadata(common_1.HTTP_CONTROLLER_METADATA, target.constructor, sourceMetadata);
-    };
-};

package/cjs/http/express-adapter.js

@@ -1,155 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExpressAdapter = void 0;
-const tslib_1 = require("tslib");
-const nodePath = tslib_1.__importStar(require("node:path"));
-const common_1 = require("@opra/common");
-const express_1 = require("express");
-const http_adapter_js_1 = require("./http-adapter.js");
-const http_context_js_1 = require("./http-context.js");
-const http_incoming_interface_js_1 = require("./interfaces/http-incoming.interface.js");
-const http_outgoing_interface_js_1 = require("./interfaces/http-outgoing.interface.js");
-const wrap_exception_js_1 = require("./utils/wrap-exception.js");
-class ExpressAdapter extends http_adapter_js_1.HttpAdapter {
-    constructor(app, document, options) {
-        super(document, options);
-        this._controllerInstances = new Map();
-        this.app = app;
-        if (!(this.document.api instanceof common_1.HttpApi))
-            throw new TypeError('document.api must be instance of HttpApi');
-        for (const c of this.api.controllers.values())
-            this._createControllers(c);
-        this._initRouter(options?.basePath);
-    }
-    get platform() {
-        return 'express';
-    }
-    async close() {
-        const processResource = async (resource) => {
-            if (resource.controllers.size) {
-                const subResources = Array.from(resource.controllers.values());
-                subResources.reverse();
-                for (const subResource of subResources) {
-                    await processResource(subResource);
-                }
-            }
-            if (resource.onShutdown) {
-                const instance = this._controllerInstances.get(resource) || resource.instance;
-                if (instance) {
-                    try {
-                        await resource.onShutdown.call(instance, resource);
-                    }
-                    catch (e) {
-                        if (this.listenerCount('error'))
-                            this.emit('error', (0, wrap_exception_js_1.wrapException)(e));
-                    }
-                }
-            }
-        };
-        for (const c of this.api.controllers.values())
-            await processResource(c);
-        this._controllerInstances.clear();
-    }
-    getControllerInstance(controllerPath) {
-        const controller = this.api.findController(controllerPath);
-        return controller && this._controllerInstances.get(controller);
-    }
-    _initRouter(basePath) {
-        const router = (0, express_1.Router)();
-        if (basePath) {
-            if (!basePath.startsWith('/'))
-                basePath = '/' + basePath;
-            if (basePath)
-                this.app.use(basePath, router);
-        }
-        else
-            this.app.use(router);
-        const createContext = async (_req, _res, args) => {
-            const request = http_incoming_interface_js_1.HttpIncoming.from(_req);
-            const response = http_outgoing_interface_js_1.HttpOutgoing.from(_res);
-            const ctx = new http_context_js_1.HttpContext({
-                adapter: this,
-                platform: this.platform,
-                request,
-                response,
-                controller: args?.controller,
-                controllerInstance: args?.controllerInstance,
-                operation: args?.operation,
-                operationHandler: args?.operationHandler,
-            });
-            await this.emitAsync('createContext', ctx);
-            return ctx;
-        };
-        /** Add an endpoint that returns document schema */
-        router.get('/\\$schema', (_req, _res, next) => {
-            createContext(_req, _res)
-                .then(ctx => this.handler.sendDocumentSchema(ctx).catch(next))
-                .catch(next);
-        });
-        /** Add operation endpoints */
-        if (this.api.controllers.size) {
-            const processResource = (controller, currentPath) => {
-                currentPath = nodePath.join(currentPath, controller.path);
-                for (const operation of controller.operations.values()) {
-                    const routePath = currentPath + (operation.path || '');
-                    const controllerInstance = this._controllerInstances.get(controller);
-                    const operationHandler = controllerInstance[operation.name];
-                    if (!operationHandler)
-                        continue;
-                    /** Define router callback */
-                    router[operation.method.toLowerCase()](routePath, (_req, _res, _next) => {
-                        createContext(_req, _res, {
-                            controller,
-                            controllerInstance,
-                            operation,
-                            operationHandler,
-                        })
-                            .then(ctx => this.handler.handleRequest(ctx))
-                            .then(() => {
-                            if (!_res.headersSent)
-                                _next();
-                        })
-                            .catch((e) => this.emit('error', e));
-                    });
-                }
-                if (controller.controllers.size) {
-                    for (const child of controller.controllers.values())
-                        processResource(child, currentPath);
-                }
-            };
-            for (const c of this.api.controllers.values())
-                processResource(c, '/');
-        }
-        /** Add an endpoint that returns 404 error at last */
-        router.use('*', (_req, _res, next) => {
-            createContext(_req, _res)
-                .then(ctx => {
-                ctx.errors.push(new common_1.NotFoundError({
-                    message: `No endpoint found at [${_req.method}]${_req.baseUrl}`,
-                    details: {
-                        path: _req.baseUrl,
-                        method: _req.method,
-                    },
-                }));
-                this.handler.sendResponse(ctx).catch(next);
-            })
-                .catch(next);
-        });
-    }
-    _createControllers(controller) {
-        let instance = controller.instance;
-        if (!instance && controller.ctor)
-            instance = new controller.ctor();
-        if (instance) {
-            if (typeof instance.onInit === 'function')
-                instance.onInit.call(instance, this);
-            this._controllerInstances.set(controller, instance);
-            // Initialize sub resources
-            for (const r of controller.controllers.values()) {
-                this._createControllers(r);
-            }
-        }
-        return instance;
-    }
-}
-exports.ExpressAdapter = ExpressAdapter;

package/cjs/http/http-adapter.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpAdapter = void 0;
-const common_1 = require("@opra/common");
-const platform_adapter_js_1 = require("../platform-adapter.js");
-const http_handler_js_1 = require("./http-handler.js");
-/**
- *
- * @class HttpAdapter
- */
-class HttpAdapter extends platform_adapter_js_1.PlatformAdapter {
-    constructor(document, options) {
-        super(document, options);
-        this.protocol = 'http';
-        if (!(document.api instanceof common_1.HttpApi))
-            throw new TypeError(`The document does not expose an HTTP Api`);
-        this.handler = new http_handler_js_1.HttpHandler(this);
-        this.interceptors = [...(options?.interceptors || [])];
-    }
-    get api() {
-        return this.document.api;
-    }
-}
-exports.HttpAdapter = HttpAdapter;