@opra/core 0.32.2 → 0.32.4

package/cjs/execution-context.js

@@ -1,2 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExecutionContext = void 0;
+const execution_context_host_js_1 = require("./execution-context.host.js");
+var ExecutionContext;
+(function (ExecutionContext) {
+    function is(v) {
+        return v instanceof execution_context_host_js_1.ExecutionContextHost ||
+            (typeof v.protocol === 'string' &&
+                typeof v.platform === 'string' &&
+                typeof v.switchToHttp === 'function' &&
+                typeof v.switchToWs === 'function' &&
+                typeof v.switchToRpc === 'function');
+    }
+    ExecutionContext.is = is;
+})(ExecutionContext || (exports.ExecutionContext = ExecutionContext = {}));

package/cjs/index.js

@@ -17,7 +17,6 @@ tslib_1.__exportStar(require("./request.host.js"), exports);
 tslib_1.__exportStar(require("./request-context.js"), exports);
 tslib_1.__exportStar(require("./response.js"), exports);
 tslib_1.__exportStar(require("./response.host.js"), exports);
-tslib_1.__exportStar(require("./types.js"), exports);
 tslib_1.__exportStar(require("./http/adapters/express-adapter.js"), exports);
 tslib_1.__exportStar(require("./http/adapters/express-adapter.host.js"), exports);
 tslib_1.__exportStar(require("./http/adapters/node-http-adapter.js"), exports);

package/cjs/request-context.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequestContext = void 0;
+const common_1 = require("@opra/common");
+const execution_context_js_1 = require("./execution-context.js");
 var RequestContext;
 (function (RequestContext) {
     function from(executionContext, api, request, response) {
@@ -13,4 +15,11 @@ var RequestContext;
         return out;
     }
     RequestContext.from = from;
+    function is(v) {
+        return execution_context_js_1.ExecutionContext.is(v) &&
+            v.api instanceof common_1.ApiDocument &&
+            v.request &&
+            v.response;
+    }
+    RequestContext.is = is;
 })(RequestContext || (exports.RequestContext = RequestContext = {}));

package/cjs/services/api-service.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiService = void 0;
+const request_context_js_1 = require("../request-context.js");
 const cachedServices = Symbol('cachedServices');
 class ApiService {
     get context() {
@@ -8,32 +9,36 @@ class ApiService {
             throw new Error(`No context assigned for ${Object.getPrototypeOf(this).constructor.name}`);
         return this._context;
     }
-    forContext(arg0, attributes) {
-        let context;
-        if (arg0 instanceof ApiService) {
+    for(arg0, attributes) {
+        let context = this._context;
+        if (request_context_js_1.RequestContext.is(arg0))
+            context = arg0;
+        else if (arg0 instanceof ApiService) {
             context = arg0.context;
-            attributes = arg0;
         }
         else
-            context = arg0;
+            attributes = attributes || arg0;
+        // Create cache map and instance array
         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 };
+        // Find cached instance that matches given arguments
+        let instance = cachedInstances.find((service) => this._instanceCompare(service, context, attributes));
+        if (instance)
+            return instance;
+        // Create new instance
+        instance = { context };
+        if (attributes)
+            Object.assign(instance, attributes);
         Object.setPrototypeOf(instance, this);
         cachedInstances.push(instance);
         return instance;
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    _cacheMatch(service, context, attributes) {
+    _instanceCompare(service, context, attributes) {
+        if (attributes && Object.keys(attributes).find(k => attributes[k] !== service[k]))
+            return false;
         return service.context === context;
     }
 }

package/esm/execution-context.js

@@ -1 +1,13 @@
-export {};
+import { ExecutionContextHost } from './execution-context.host.js';
+export var ExecutionContext;
+(function (ExecutionContext) {
+    function is(v) {
+        return v instanceof ExecutionContextHost ||
+            (typeof v.protocol === 'string' &&
+                typeof v.platform === 'string' &&
+                typeof v.switchToHttp === 'function' &&
+                typeof v.switchToWs === 'function' &&
+                typeof v.switchToRpc === 'function');
+    }
+    ExecutionContext.is = is;
+})(ExecutionContext || (ExecutionContext = {}));

package/esm/index.js

@@ -14,7 +14,6 @@ export * from './request.host.js';
 export * from './request-context.js';
 export * from './response.js';
 export * from './response.host.js';
-export * from './types.js';
 export * from './http/adapters/express-adapter.js';
 export * from './http/adapters/express-adapter.host.js';
 export * from './http/adapters/node-http-adapter.js';

package/esm/request-context.js

@@ -1,3 +1,5 @@
+import { ApiDocument } from '@opra/common';
+import { ExecutionContext } from './execution-context.js';
 export var RequestContext;
 (function (RequestContext) {
     function from(executionContext, api, request, response) {
@@ -10,4 +12,11 @@ export var RequestContext;
         return out;
     }
     RequestContext.from = from;
+    function is(v) {
+        return ExecutionContext.is(v) &&
+            v.api instanceof ApiDocument &&
+            v.request &&
+            v.response;
+    }
+    RequestContext.is = is;
 })(RequestContext || (RequestContext = {}));

package/esm/services/api-service.js

@@ -1,3 +1,4 @@
+import { RequestContext } from '../request-context.js';
 const cachedServices = Symbol('cachedServices');
 export class ApiService {
     get context() {
@@ -5,32 +6,36 @@ export class ApiService {
             throw new Error(`No context assigned for ${Object.getPrototypeOf(this).constructor.name}`);
         return this._context;
     }
-    forContext(arg0, attributes) {
-        let context;
-        if (arg0 instanceof ApiService) {
+    for(arg0, attributes) {
+        let context = this._context;
+        if (RequestContext.is(arg0))
+            context = arg0;
+        else if (arg0 instanceof ApiService) {
             context = arg0.context;
-            attributes = arg0;
         }
         else
-            context = arg0;
+            attributes = attributes || arg0;
+        // Create cache map and instance array
         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 };
+        // Find cached instance that matches given arguments
+        let instance = cachedInstances.find((service) => this._instanceCompare(service, context, attributes));
+        if (instance)
+            return instance;
+        // Create new instance
+        instance = { context };
+        if (attributes)
+            Object.assign(instance, attributes);
         Object.setPrototypeOf(instance, this);
         cachedInstances.push(instance);
         return instance;
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    _cacheMatch(service, context, attributes) {
+    _instanceCompare(service, context, attributes) {
+        if (attributes && Object.keys(attributes).find(k => attributes[k] !== service[k]))
+            return false;
         return service.context === context;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/core",
-  "version": "0.32.2",
+  "version": "0.32.4",
   "description": "Opra schema package",
   "author": "Panates",
   "license": "MIT",
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@browsery/type-is": "^0.6.3",
-    "@opra/common": "^0.32.2",
+    "@opra/common": "^0.32.4",
     "accepts": "^1.3.8",
     "content-disposition": "^0.5.4",
     "content-type": "^1.0.5",
@@ -66,7 +66,7 @@
     "@types/vary": "^1.1.3",
     "crypto-browserify": "^3.12.0",
     "path-browserify": "^1.0.1",
-    "ts-gems": "^2.7.1"
+    "ts-gems": "^2.8.0"
   },
   "type": "module",
   "module": "./esm/index.js",

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

@@ -1,5 +1,5 @@
 import { StrictOmit } from 'ts-gems';
-import type { Action as _Action, CrudOperation as _Operation, PartialOutput } from '@opra/common';
+import type { Action as _Action, CrudOperation as _Operation, PartialDTO } from '@opra/common';
 import type { Request as _Request } from '../request.js';
 import type { RequestContext } from '../request-context';
 declare module "@opra/common" {
@@ -133,12 +133,12 @@ declare module "@opra/common" {
         }
     }
     interface ICollection<T> {
-        create?(context: Collection.Create.Context): Promise<PartialOutput<T>>;
+        create?(context: Collection.Create.Context): Promise<PartialDTO<T>>;
         delete?(context: Collection.Delete.Context): Promise<number> | undefined;
         deleteMany?(context: Collection.DeleteMany.Context): Promise<number> | undefined;
-        findMany?(context: Collection.FindMany.Context): Promise<PartialOutput<T>[] | undefined>;
-        get?(context: Collection.Get.Context): Promise<PartialOutput<T> | undefined>;
-        update?(context: Collection.Update.Context): Promise<PartialOutput<T> | undefined>;
+        findMany?(context: Collection.FindMany.Context): Promise<PartialDTO<T>[] | undefined>;
+        get?(context: Collection.Get.Context): Promise<PartialDTO<T> | undefined>;
+        update?(context: Collection.Update.Context): Promise<PartialDTO<T> | undefined>;
         updateMany?(context: Collection.UpdateMany.Context): Promise<number> | undefined;
         onInit?(): Promise<void>;
         onShutdown?(): Promise<void>;

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

@@ -1,5 +1,5 @@
 import { StrictOmit } from 'ts-gems';
-import type { Action as _Action, CrudOperation as _Operation, PartialOutput } from '@opra/common';
+import type { Action as _Action, CrudOperation as _Operation, PartialDTO } from '@opra/common';
 import type { Request as _Request } from '../request.js';
 import type { RequestContext } from '../request-context.js';
 declare module "@opra/common" {
@@ -73,10 +73,10 @@ declare module "@opra/common" {
         }
     }
     interface ISingleton<T> {
-        create?(context: Singleton.Create.Context): Promise<PartialOutput<T>>;
+        create?(context: Singleton.Create.Context): Promise<PartialDTO<T>>;
         delete?(context: Singleton.Delete.Context): Promise<number> | undefined;
-        get?(context: Singleton.Get.Context): Promise<PartialOutput<T> | undefined>;
-        update?(context: Singleton.Update.Context): Promise<PartialOutput<T> | undefined>;
+        get?(context: Singleton.Get.Context): Promise<PartialDTO<T> | undefined>;
+        update?(context: Singleton.Update.Context): Promise<PartialDTO<T> | undefined>;
         onInit?(): Promise<void>;
         onShutdown?(): Promise<void>;
     }

package/types/execution-context.d.ts

@@ -14,6 +14,7 @@ export declare namespace ExecutionContext {
         context: ExecutionContext;
         failed: boolean;
     };
+    function is(v: any): boolean;
 }
 export interface HttpMessageContext {
     readonly platform: string;

package/types/index.d.ts

@@ -14,7 +14,6 @@ export * from './request.host.js';
 export * from './request-context.js';
 export * from './response.js';
 export * from './response.host.js';
-export * from './types.js';
 export * from './http/adapters/express-adapter.js';
 export * from './http/adapters/express-adapter.host.js';
 export * from './http/adapters/node-http-adapter.js';

package/types/request-context.d.ts

@@ -1,5 +1,5 @@
 import { ApiDocument } from '@opra/common';
-import type { ExecutionContext } from './execution-context.js';
+import { ExecutionContext } from './execution-context.js';
 import type { Request } from './request.js';
 import type { Response } from './response.js';
 export interface RequestContext extends ExecutionContext {
@@ -9,4 +9,5 @@ export interface RequestContext extends ExecutionContext {
 }
 export declare namespace RequestContext {
     function from(executionContext: ExecutionContext, api: ApiDocument, request: Request, response: Response): RequestContext;
+    function is(v: any): v is RequestContext;
 }

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

@@ -1,8 +1,14 @@
 import { RequestContext } from '../request-context.js';
+export declare namespace ApiService {
+    interface ExtendOptions {
+        [key: string | symbol]: any;
+    }
+}
 export declare abstract class ApiService {
     protected _context: RequestContext;
     get context(): RequestContext;
-    forContext(source: ApiService): this;
-    forContext(context: RequestContext, attributes?: any): this;
-    protected _cacheMatch(service: ApiService, context: RequestContext, attributes?: any): boolean;
+    for(context: RequestContext | ApiService): this;
+    for<O extends (ApiService.ExtendOptions & Partial<this>)>(context: RequestContext | ApiService, attributes: O): this & O;
+    for<O extends ApiService.ExtendOptions & Partial<this>>(attributes: O): this & O;
+    protected _instanceCompare(service: ApiService, context: RequestContext, attributes?: Object): boolean;
 }

package/cjs/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/esm/types.js

@@ -1 +0,0 @@
-export {};

package/types/types.d.ts

@@ -1,2 +0,0 @@
-import { PartialInput, PartialOutput } from '@opra/common';
-export { PartialInput, PartialOutput };