@opra/core 0.31.5 → 0.31.7

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

@@ -597,8 +597,8 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
             const incoming = context.switchToHttp().incoming;
             const apiUrl = new common_1.OpraURL(incoming.baseUrl, incoming.protocol + '://' + incoming.get('host')).toString();
             const body = new common_1.OperationResult({
-                context: endpoint.getFullPath(false),
-                contextUrl: apiUrl + '/#' + endpoint.getFullPath(true)
+                context: '',
+                contextUrl: ''
             });
             const operationName = endpoint.kind === 'operation' ? endpoint.name : '';
             if (operationName === 'delete' || operationName === 'deleteMany' ||
@@ -628,9 +628,16 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                     }
                     else
                         body.typeUrl = body.contextUrl + '/type';
-                    body.payload = this.i18n.deep(response.value);
+                    if (response.value instanceof common_1.OperationResult) {
+                        Object.assign(body, response.value);
+                    }
+                    else
+                        body.payload = response.value;
+                    body.payload = this.i18n.deep(body.payload);
                 }
             }
+            body.context = endpoint.getFullPath(false);
+            body.contextUrl = apiUrl + '/#' + endpoint.getFullPath(true);
             outgoing.setHeader(common_1.HttpHeaderCodes.Content_Type, 'application/opra+json; charset=utf-8');
             outgoing.send(JSON.stringify(body));
             outgoing.end();

package/cjs/services/api-service.js

@@ -1,18 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiService = void 0;
+const cachedServices = Symbol('cachedServices');
 class ApiService {
     get context() {
         if (!this._context)
             throw new Error(`No context assigned for ${Object.getPrototypeOf(this).constructor.name}`);
         return this._context;
     }
-    forContext(context, options) {
-        if (this._context === context && !options?.newInstance)
-            return this;
+    forContext(arg0, attributes) {
+        let context;
+        if (arg0 instanceof ApiService) {
+            context = arg0.context;
+            attributes = arg0;
+        }
+        else
+            context = arg0;
+        const cacheMap = context[cachedServices] = context[cachedServices] || new WeakMap();
+        const ctor = Object.getPrototypeOf(this).constructor;
+        const cachedInstances = cacheMap.get(ctor) || [];
+        cacheMap.set(ctor, cachedInstances);
+        const newInstance = !this._context || this._context !== context;
+        if (!newInstance) {
+            const instance = cachedInstances
+                .find(service => this._cacheMatch(service, context, attributes));
+            if (instance)
+                return instance;
+        }
         const instance = { context };
         Object.setPrototypeOf(instance, this);
+        cachedInstances.push(instance);
         return instance;
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _cacheMatch(service, context, attributes) {
+        return service.context === context;
+    }
 }
 exports.ApiService = ApiService;

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

@@ -593,8 +593,8 @@ export class HttpAdapterHost extends PlatformAdapterHost {
             const incoming = context.switchToHttp().incoming;
             const apiUrl = new OpraURL(incoming.baseUrl, incoming.protocol + '://' + incoming.get('host')).toString();
             const body = new OperationResult({
-                context: endpoint.getFullPath(false),
-                contextUrl: apiUrl + '/#' + endpoint.getFullPath(true)
+                context: '',
+                contextUrl: ''
             });
             const operationName = endpoint.kind === 'operation' ? endpoint.name : '';
             if (operationName === 'delete' || operationName === 'deleteMany' ||
@@ -624,9 +624,16 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                     }
                     else
                         body.typeUrl = body.contextUrl + '/type';
-                    body.payload = this.i18n.deep(response.value);
+                    if (response.value instanceof OperationResult) {
+                        Object.assign(body, response.value);
+                    }
+                    else
+                        body.payload = response.value;
+                    body.payload = this.i18n.deep(body.payload);
                 }
             }
+            body.context = endpoint.getFullPath(false);
+            body.contextUrl = apiUrl + '/#' + endpoint.getFullPath(true);
             outgoing.setHeader(HttpHeaderCodes.Content_Type, 'application/opra+json; charset=utf-8');
             outgoing.send(JSON.stringify(body));
             outgoing.end();

package/esm/services/api-service.js

@@ -1,14 +1,36 @@
+const cachedServices = Symbol('cachedServices');
 export class ApiService {
     get context() {
         if (!this._context)
             throw new Error(`No context assigned for ${Object.getPrototypeOf(this).constructor.name}`);
         return this._context;
     }
-    forContext(context, options) {
-        if (this._context === context && !options?.newInstance)
-            return this;
+    forContext(arg0, attributes) {
+        let context;
+        if (arg0 instanceof ApiService) {
+            context = arg0.context;
+            attributes = arg0;
+        }
+        else
+            context = arg0;
+        const cacheMap = context[cachedServices] = context[cachedServices] || new WeakMap();
+        const ctor = Object.getPrototypeOf(this).constructor;
+        const cachedInstances = cacheMap.get(ctor) || [];
+        cacheMap.set(ctor, cachedInstances);
+        const newInstance = !this._context || this._context !== context;
+        if (!newInstance) {
+            const instance = cachedInstances
+                .find(service => this._cacheMatch(service, context, attributes));
+            if (instance)
+                return instance;
+        }
         const instance = { context };
         Object.setPrototypeOf(instance, this);
+        cachedInstances.push(instance);
         return instance;
     }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _cacheMatch(service, context, attributes) {
+        return service.context === context;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/core",
-  "version": "0.31.5",
+  "version": "0.31.7",
   "description": "Opra schema package",
   "author": "Panates",
   "license": "MIT",
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@browsery/type-is": "^0.6.3",
-    "@opra/common": "^0.31.5",
+    "@opra/common": "^0.31.7",
     "accepts": "^1.3.8",
     "content-disposition": "^0.5.4",
     "content-type": "^1.0.5",

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

@@ -2,7 +2,7 @@ import { RequestContext } from '../request-context.js';
 export declare abstract class ApiService {
     protected _context: RequestContext;
     get context(): RequestContext;
-    forContext(context: RequestContext, options?: {
-        newInstance?: boolean;
-    }): this;
+    forContext(source: ApiService): this;
+    forContext(context: RequestContext, attributes?: any): this;
+    protected _cacheMatch(service: ApiService, context: RequestContext, attributes?: any): boolean;
 }