@opra/core 0.26.1 → 0.26.4

package/cjs/execution-context.host.js

@@ -8,7 +8,6 @@ class ExecutionContextHost extends strict_typed_events_1.AsyncEventEmitter {
         this.api = api;
         this.platform = platform;
         this.errors = [];
-        this.session = {};
         this.ws = protocol.ws;
         this.rpc = protocol.rpc;
         if (protocol.http) {

package/cjs/http/http-adapter-host.js

@@ -120,7 +120,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
         let resource = this.api.root;
         let request;
         // Walk through container
-        while (resource instanceof common_1.Container) {
+        while (resource instanceof common_1.Container && i < parsedUrl.path.length) {
             p = parsedUrl.path[i];
             const r = resource.resources.get(p.resource);
             if (r) {
@@ -174,7 +174,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
         return new request_host_js_1.RequestHost({
             endpoint,
             operation: 'action',
-            action: p.resource,
+            action: endpoint.name,
             controller,
             handler,
             http: incoming,

package/cjs/index.js

@@ -24,3 +24,4 @@ tslib_1.__exportStar(require("./interfaces/interceptor.interface.js"), exports);
 tslib_1.__exportStar(require("./interfaces/logger.interface.js"), exports);
 tslib_1.__exportStar(require("./interfaces/request-handler.interface.js"), exports);
 tslib_1.__exportStar(require("./services/logger.js"), exports);
+tslib_1.__exportStar(require("./services/api-service.js"), exports);

package/cjs/platform-adapter.host.js

@@ -110,7 +110,7 @@ class PlatformAdapterHost extends strict_typed_events_1.AsyncEventEmitter {
         const endpoint = (resource instanceof common_1.CrudResource && resource.operations.get(operationOrAction)) ||
             resource.actions.get(operationOrAction);
         if (endpoint) {
-            const handler = typeof controller[operationOrAction] === 'function' ? controller[operationOrAction] : undefined;
+            const handler = typeof controller[endpoint.name] === 'function' ? controller[endpoint.name] : undefined;
             if (handler)
                 return { controller, endpoint, handler };
         }

package/cjs/request-context.js

@@ -7,7 +7,6 @@ var RequestContext;
         const out = {
             request,
             response,
-            session: {}
         };
         Object.setPrototypeOf(out, executionContext);
         return out;

package/cjs/services/api-service.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ApiService = void 0;
+class ApiService {
+    get context() {
+        if (!this._context)
+            throw new Error(`No context assigned for ${Object.getPrototypeOf(this).name}`);
+        return this._context;
+    }
+    forContext(context) {
+        const instance = { context };
+        Object.setPrototypeOf(instance, this);
+        return instance;
+    }
+}
+exports.ApiService = ApiService;

package/esm/execution-context.host.js

@@ -5,7 +5,6 @@ export class ExecutionContextHost extends AsyncEventEmitter {
         this.api = api;
         this.platform = platform;
         this.errors = [];
-        this.session = {};
         this.ws = protocol.ws;
         this.rpc = protocol.rpc;
         if (protocol.http) {

package/esm/http/http-adapter-host.js

@@ -116,7 +116,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
         let resource = this.api.root;
         let request;
         // Walk through container
-        while (resource instanceof Container) {
+        while (resource instanceof Container && i < parsedUrl.path.length) {
             p = parsedUrl.path[i];
             const r = resource.resources.get(p.resource);
             if (r) {
@@ -170,7 +170,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
         return new RequestHost({
             endpoint,
             operation: 'action',
-            action: p.resource,
+            action: endpoint.name,
             controller,
             handler,
             http: incoming,

package/esm/index.js

@@ -21,3 +21,4 @@ export * from './interfaces/interceptor.interface.js';
 export * from './interfaces/logger.interface.js';
 export * from './interfaces/request-handler.interface.js';
 export * from './services/logger.js';
+export * from './services/api-service.js';

package/esm/platform-adapter.host.js

@@ -106,7 +106,7 @@ export class PlatformAdapterHost extends AsyncEventEmitter {
         const endpoint = (resource instanceof CrudResource && resource.operations.get(operationOrAction)) ||
             resource.actions.get(operationOrAction);
         if (endpoint) {
-            const handler = typeof controller[operationOrAction] === 'function' ? controller[operationOrAction] : undefined;
+            const handler = typeof controller[endpoint.name] === 'function' ? controller[endpoint.name] : undefined;
             if (handler)
                 return { controller, endpoint, handler };
         }

package/esm/request-context.js

@@ -4,7 +4,6 @@ export var RequestContext;
         const out = {
             request,
             response,
-            session: {}
         };
         Object.setPrototypeOf(out, executionContext);
         return out;

package/esm/services/api-service.js

@@ -0,0 +1,12 @@
+export class ApiService {
+    get context() {
+        if (!this._context)
+            throw new Error(`No context assigned for ${Object.getPrototypeOf(this).name}`);
+        return this._context;
+    }
+    forContext(context) {
+        const instance = { context };
+        Object.setPrototypeOf(instance, this);
+        return instance;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/core",
-  "version": "0.26.1",
+  "version": "0.26.4",
   "description": "Opra schema package",
   "author": "Panates",
   "license": "MIT",
@@ -27,7 +27,7 @@
     "clean:cover": "rimraf ../../coverage/core"
   },
   "dependencies": {
-    "@opra/common": "^0.26.1",
+    "@opra/common": "^0.26.4",
     "accepts": "^1.3.8",
     "content-disposition": "^0.5.4",
     "content-type": "^1.0.5",

package/types/augmentation/collection.augmentation.d.ts

@@ -8,7 +8,7 @@ declare module "@opra/common" {
                 operation: 'action';
                 action: string;
             }
-            interface Context<TSession extends {} = {}> extends Resource.Context<TSession> {
+            interface Context extends Resource.Context {
             }
         }
         namespace Create {
@@ -22,7 +22,7 @@ declare module "@opra/common" {
                     [key: string]: any;
                 };
             }
-            interface Context<TSession extends {} = {}> extends RequestContext<TSession> {
+            interface Context extends RequestContext {
                 request: Request;
             }
         }
@@ -31,7 +31,7 @@ declare module "@opra/common" {
                 operation: 'delete';
                 key: any;
             }
-            interface Context<TSession extends {} = {}> extends RequestContext<TSession> {
+            interface Context extends RequestContext {
                 request: Request;
             }
         }
@@ -43,7 +43,7 @@ declare module "@opra/common" {
                     [key: string]: any;
                 };
             }
-            interface Context<TSession extends {} = {}> extends RequestContext<TSession> {
+            interface Context extends RequestContext {
                 request: Request;
             }
         }
@@ -63,7 +63,7 @@ declare module "@opra/common" {
                     [key: string]: any;
                 };
             }
-            interface Context<TSession extends {} = {}> extends RequestContext<TSession> {
+            interface Context extends RequestContext {
                 request: Request;
             }
         }
@@ -78,7 +78,7 @@ declare module "@opra/common" {
                     [key: string]: any;
                 };
             }
-            interface Context<TSession extends {} = {}> extends RequestContext<TSession> {
+            interface Context extends RequestContext {
                 request: Request;
             }
         }
@@ -94,7 +94,7 @@ declare module "@opra/common" {
                     [key: string]: any;
                 };
             }
-            interface Context<TSession extends {} = {}> extends RequestContext<TSession> {
+            interface Context extends RequestContext {
                 request: Request;
             }
         }
@@ -107,7 +107,7 @@ declare module "@opra/common" {
                     [key: string]: any;
                 };
             }
-            interface Context<TSession extends {} = {}> extends RequestContext<TSession> {
+            interface Context extends RequestContext {
                 request: Request;
             }
         }

package/types/augmentation/container.augmentation.d.ts

@@ -6,7 +6,7 @@ declare module "@opra/common" {
                 operation: 'action';
                 action: string;
             }
-            interface Context<TSession extends {} = {}> extends Resource.Context<TSession> {
+            interface Context extends Resource.Context {
             }
         }
     }

package/types/augmentation/resource.augmentation.d.ts

@@ -9,7 +9,7 @@ declare module "@opra/common" {
         OnShutdown(): any;
     }
     namespace Resource {
-        interface Context<TSession extends {} = {}> extends RequestContext<TSession> {
+        interface Context extends RequestContext {
             params: Record<string, any>;
         }
     }

package/types/augmentation/singleton.augmentation.d.ts

@@ -8,7 +8,7 @@ declare module "@opra/common" {
                 operation: 'action';
                 action: string;
             }
-            interface Context<TSession extends {} = {}> extends Resource.Context<TSession> {
+            interface Context extends Resource.Context {
             }
         }
         namespace Create {
@@ -21,7 +21,7 @@ declare module "@opra/common" {
                     include?: string[];
                 };
             }
-            interface Context<TSession extends {} = {}> extends RequestContext<TSession> {
+            interface Context extends RequestContext {
                 request: Request;
             }
         }
@@ -29,7 +29,7 @@ declare module "@opra/common" {
             interface Request extends _Request {
                 operation: 'delete';
             }
-            interface Context<TSession extends {} = {}> extends RequestContext<TSession> {
+            interface Context extends RequestContext {
                 request: Request;
             }
         }
@@ -42,7 +42,7 @@ declare module "@opra/common" {
                     include?: string[];
                 };
             }
-            interface Context<TSession extends {} = {}> extends RequestContext<TSession> {
+            interface Context extends RequestContext {
                 request: Request;
             }
         }
@@ -56,7 +56,7 @@ declare module "@opra/common" {
                     include?: string[];
                 };
             }
-            interface Context<TSession extends {} = {}> extends RequestContext<TSession> {
+            interface Context extends RequestContext {
                 request: Request;
             }
         }

package/types/augmentation/storage.augmentation.d.ts

@@ -8,7 +8,7 @@ declare module "@opra/common" {
                 operation: 'action';
                 action: string;
             }
-            interface Context<TSession extends {} = {}> extends Resource.Context<TSession> {
+            interface Context extends Resource.Context {
             }
         }
         namespace Delete {
@@ -16,7 +16,7 @@ declare module "@opra/common" {
                 operation: 'delete';
                 path?: string;
             }
-            interface Context<TSession extends {} = {}> extends RequestContext<TSession> {
+            interface Context extends RequestContext {
                 request: Request;
             }
         }
@@ -25,7 +25,7 @@ declare module "@opra/common" {
                 operation: 'get';
                 path?: string;
             }
-            interface Context<TSession extends {} = {}> extends RequestContext<TSession> {
+            interface Context extends RequestContext {
                 request: Request;
             }
         }
@@ -35,7 +35,7 @@ declare module "@opra/common" {
                 path?: string;
                 parts: MultipartIterator;
             }
-            interface Context<TSession extends {} = {}> extends RequestContext<TSession> {
+            interface Context extends RequestContext {
                 request: Request;
             }
         }

package/types/execution-context.d.ts

@@ -1,10 +1,9 @@
 import type { HttpServerRequest } from './http/http-server-request.js';
 import type { HttpServerResponse } from './http/http-server-response.js';
 import type { Protocol } from './platform-adapter.js';
-export interface ExecutionContext<TSession extends {} = {}> {
+export interface ExecutionContext {
     readonly protocol: Protocol;
     readonly platform: string;
-    session: TSession;
     errors: Error[];
     switchToHttp(): HttpMessageContext;
     switchToWs(): WsMessageContext;

package/types/execution-context.host.d.ts

@@ -4,7 +4,7 @@ import type { ExecutionContext, HttpMessageContext, RpcMessageContext, WsMessage
 import type { HttpServerRequest } from './http/http-server-request.js';
 import type { HttpServerResponse } from './http/http-server-response.js';
 import { Protocol } from './platform-adapter.js';
-export declare class ExecutionContextHost<TSession extends {} = {}> extends AsyncEventEmitter implements ExecutionContext<TSession> {
+export declare class ExecutionContextHost extends AsyncEventEmitter implements ExecutionContext {
     readonly api: ApiDocument;
     readonly platform: string;
     readonly protocol: Protocol;
@@ -12,7 +12,6 @@ export declare class ExecutionContextHost<TSession extends {} = {}> extends Asyn
     readonly ws?: WsMessageContext;
     readonly rpc?: RpcMessageContext;
     errors: Error[];
-    session: TSession;
     constructor(api: ApiDocument, platform: string, protocol: {
         http?: {
             incoming: HttpServerRequest;

package/types/index.d.ts

@@ -21,3 +21,4 @@ export * from './interfaces/interceptor.interface.js';
 export * from './interfaces/logger.interface.js';
 export * from './interfaces/request-handler.interface.js';
 export * from './services/logger.js';
+export * from './services/api-service.js';

package/types/request-context.d.ts

@@ -1,7 +1,7 @@
 import type { ExecutionContext } from './execution-context.js';
 import type { Request } from './request.js';
 import type { Response } from './response.js';
-export interface RequestContext<TSession extends {} = {}> extends ExecutionContext<TSession> {
+export interface RequestContext extends ExecutionContext {
     request: Request;
     response: Response;
 }

package/types/services/api-service.d.ts

@@ -0,0 +1,6 @@
+import { RequestContext } from '../request-context.js';
+export declare abstract class ApiService {
+    protected _context: RequestContext;
+    get context(): RequestContext;
+    forContext(context: RequestContext): typeof this;
+}