@opra/core 0.32.5 → 0.33.0

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

@@ -4,7 +4,7 @@ exports.HttpAdapterHost = void 0;
 const tslib_1 = require("tslib");
 const promises_1 = tslib_1.__importDefault(require("fs/promises"));
 const os_1 = tslib_1.__importDefault(require("os"));
-const vg = tslib_1.__importStar(require("valgen"));
+const valgen_1 = require("valgen");
 const type_is_1 = tslib_1.__importDefault(require("@browsery/type-is"));
 const common_1 = require("@opra/common");
 const execution_context_host_js_1 = require("../execution-context.host.js");
@@ -108,7 +108,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
         catch (e) {
             if (e instanceof common_1.OpraException)
                 throw e;
-            if (e instanceof vg.ValidationError) {
+            if (e instanceof valgen_1.ValidationError) {
                 throw new common_1.InternalServerError({
                     message: (0, common_1.translate)('error:RESPONSE_VALIDATION,'),
                     code: 'RESPONSE_VALIDATION',
@@ -559,7 +559,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                         return;
                     // "get" and "update" endpoints must return the entity instance, otherwise it means resource not found
                     if (value == null && (operationName === 'get' || operationName === 'update'))
-                        throw new common_1.ResourceNotFoundError(resource.name, request.key);
+                        throw new common_1.ResourceNotAvailableError(resource.name, request.key);
                     // "findMany" endpoint should return array of entity instances
                     if (operationName === 'findMany')
                         value = (value == null ? [] : Array.isArray(value) ? value : [value]);

package/cjs/services/api-service.js

@@ -1,45 +1,29 @@
 "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() {
         if (!this._context)
             throw new Error(`No context assigned for ${Object.getPrototypeOf(this).constructor.name}`);
         return this._context;
     }
-    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;
-        }
-        else
-            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);
-        // 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);
+    for(context, overwriteProperties, overwriteContext) {
+        // Create new context instance
+        const ctx = {};
+        Object.setPrototypeOf(ctx, context);
+        if (overwriteContext)
+            Object.assign(ctx, overwriteContext);
+        // Create new service instance
+        const instance = { _context: ctx };
         Object.setPrototypeOf(instance, this);
-        cachedInstances.push(instance);
+        if (overwriteProperties)
+            Object.assign(instance, overwriteProperties);
+        if (this[ApiService.extendSymbol])
+            this[ApiService.extendSymbol](instance);
         return instance;
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    _instanceCompare(service, context, attributes) {
-        if (attributes && Object.keys(attributes).find(k => attributes[k] !== service[k]))
-            return false;
-        return service.context === context;
-    }
 }
 exports.ApiService = ApiService;
+(function (ApiService) {
+    ApiService.extendSymbol = Symbol('extend');
+})(ApiService || (exports.ApiService = ApiService = {}));

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

@@ -1,8 +1,8 @@
 import fs from 'fs/promises';
 import os from 'os';
-import * as vg from 'valgen';
+import { ValidationError } from 'valgen';
 import typeIs from '@browsery/type-is';
-import { BadRequestError, Collection, Container, HttpHeaderCodes, HttpStatusCodes, InternalServerError, isReadable, IssueSeverity, MethodNotAllowedError, OperationResult, OpraException, OpraSchema, OpraURL, ResourceNotFoundError, Singleton, Storage, translate, uid, wrapException } from '@opra/common';
+import { BadRequestError, Collection, Container, HttpHeaderCodes, HttpStatusCodes, InternalServerError, isReadable, IssueSeverity, MethodNotAllowedError, OperationResult, OpraException, OpraSchema, OpraURL, ResourceNotAvailableError, Singleton, Storage, translate, uid, wrapException } from '@opra/common';
 import { ExecutionContextHost } from '../execution-context.host.js';
 import { PlatformAdapterHost } from '../platform-adapter.host.js';
 import { RequestHost } from '../request.host.js';
@@ -104,7 +104,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
         catch (e) {
             if (e instanceof OpraException)
                 throw e;
-            if (e instanceof vg.ValidationError) {
+            if (e instanceof ValidationError) {
                 throw new InternalServerError({
                     message: translate('error:RESPONSE_VALIDATION,'),
                     code: 'RESPONSE_VALIDATION',
@@ -555,7 +555,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                         return;
                     // "get" and "update" endpoints must return the entity instance, otherwise it means resource not found
                     if (value == null && (operationName === 'get' || operationName === 'update'))
-                        throw new ResourceNotFoundError(resource.name, request.key);
+                        throw new ResourceNotAvailableError(resource.name, request.key);
                     // "findMany" endpoint should return array of entity instances
                     if (operationName === 'findMany')
                         value = (value == null ? [] : Array.isArray(value) ? value : [value]);

package/esm/services/api-service.js

@@ -1,41 +1,25 @@
-import { RequestContext } from '../request-context.js';
-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;
     }
-    for(arg0, attributes) {
-        let context = this._context;
-        if (RequestContext.is(arg0))
-            context = arg0;
-        else if (arg0 instanceof ApiService) {
-            context = arg0.context;
-        }
-        else
-            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);
-        // 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);
+    for(context, overwriteProperties, overwriteContext) {
+        // Create new context instance
+        const ctx = {};
+        Object.setPrototypeOf(ctx, context);
+        if (overwriteContext)
+            Object.assign(ctx, overwriteContext);
+        // Create new service instance
+        const instance = { _context: ctx };
         Object.setPrototypeOf(instance, this);
-        cachedInstances.push(instance);
+        if (overwriteProperties)
+            Object.assign(instance, overwriteProperties);
+        if (this[ApiService.extendSymbol])
+            this[ApiService.extendSymbol](instance);
         return instance;
     }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    _instanceCompare(service, context, attributes) {
-        if (attributes && Object.keys(attributes).find(k => attributes[k] !== service[k]))
-            return false;
-        return service.context === context;
-    }
 }
+(function (ApiService) {
+    ApiService.extendSymbol = Symbol('extend');
+})(ApiService || (ApiService = {}));

package/i18n/en/error.json

@@ -10,7 +10,7 @@
   "UNPROCESSABLE_ENTITY": "Unprocessable entity",
   "REQUEST_VALIDATION": "Request validation failed",
   "RESPONSE_VALIDATION": "Response validation failed",
-  "RESOURCE_NOT_FOUND": "Resource not found",
+  "RESOURCE_NOT_AVAILABLE": "Resource is not available or you dont have access",
   "RESOURCE_CONFLICT": "There is already an other {{resource}} resource with same field values ({{fields}})",
   "OPERATION_FORBIDDEN": "The {{resource}} resource does not accept '{{operation}}' operations",
   "ACTION_NOT_FOUND": "The {{resource}} resource doesn't have an action named '{{action}}'",

package/i18n/i18n/en/error.json

@@ -10,7 +10,7 @@
   "UNPROCESSABLE_ENTITY": "Unprocessable entity",
   "REQUEST_VALIDATION": "Request validation failed",
   "RESPONSE_VALIDATION": "Response validation failed",
-  "RESOURCE_NOT_FOUND": "Resource not found",
+  "RESOURCE_NOT_AVAILABLE": "Resource is not available or you dont have access",
   "RESOURCE_CONFLICT": "There is already an other {{resource}} resource with same field values ({{fields}})",
   "OPERATION_FORBIDDEN": "The {{resource}} resource does not accept '{{operation}}' operations",
   "ACTION_NOT_FOUND": "The {{resource}} resource doesn't have an action named '{{action}}'",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/core",
-  "version": "0.32.5",
+  "version": "0.33.0",
   "description": "Opra schema package",
   "author": "Panates",
   "license": "MIT",
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@browsery/type-is": "^0.6.3",
-    "@opra/common": "^0.32.5",
+    "@opra/common": "^0.33.0",
     "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.9.2"
+    "ts-gems": "^3.1.0"
   },
   "type": "module",
   "module": "./esm/index.js",

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

@@ -1,14 +1,10 @@
+import { Nullish } from 'ts-gems';
 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;
-    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;
+    for<C extends RequestContext, P extends Partial<this>>(context: C, overwriteProperties?: Nullish<P>, overwriteContext?: Partial<C>): this & Required<P>;
+}
+export declare namespace ApiService {
+    const extendSymbol: unique symbol;
 }