@opra/core 0.31.2 → 0.31.5

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

@@ -100,7 +100,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
         try {
             const { outgoing } = executionContext.switchToHttp();
             const response = new response_host_js_1.ResponseHost({ http: outgoing });
-            const context = request_context_js_1.RequestContext.from(executionContext, request, response);
+            const context = request_context_js_1.RequestContext.from(executionContext, this.api, request, response);
             await this.executeRequest(context);
             await this.sendResponse(context);
         }
@@ -617,7 +617,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                 if (returnType) {
                     if (response.value == null)
                         throw new common_1.InternalServerError(`"${request.endpoint.name}" endpoint should return value`);
-                    if (returnType.name) {
+                    if (!returnType.isAnonymous) {
                         const ns = this.api.getDataTypeNs(returnType);
                         // const isOpraSpec = returnType.document.url?.startsWith('https://oprajs.com/spec/v1.0')
                         body.type = (ns ? ns + ':' : '') + returnType.name;

package/cjs/request-context.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequestContext = void 0;
 var RequestContext;
 (function (RequestContext) {
-    function from(executionContext, request, response) {
+    function from(executionContext, api, request, response) {
         const out = {
+            api,
             request,
             response
         };

package/cjs/services/api-service.js

@@ -7,7 +7,9 @@ class ApiService {
             throw new Error(`No context assigned for ${Object.getPrototypeOf(this).constructor.name}`);
         return this._context;
     }
-    forContext(context) {
+    forContext(context, options) {
+        if (this._context === context && !options?.newInstance)
+            return this;
         const instance = { context };
         Object.setPrototypeOf(instance, this);
         return instance;

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

@@ -96,7 +96,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
         try {
             const { outgoing } = executionContext.switchToHttp();
             const response = new ResponseHost({ http: outgoing });
-            const context = RequestContext.from(executionContext, request, response);
+            const context = RequestContext.from(executionContext, this.api, request, response);
             await this.executeRequest(context);
             await this.sendResponse(context);
         }
@@ -613,7 +613,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                 if (returnType) {
                     if (response.value == null)
                         throw new InternalServerError(`"${request.endpoint.name}" endpoint should return value`);
-                    if (returnType.name) {
+                    if (!returnType.isAnonymous) {
                         const ns = this.api.getDataTypeNs(returnType);
                         // const isOpraSpec = returnType.document.url?.startsWith('https://oprajs.com/spec/v1.0')
                         body.type = (ns ? ns + ':' : '') + returnType.name;

package/esm/request-context.js

@@ -1,7 +1,8 @@
 export var RequestContext;
 (function (RequestContext) {
-    function from(executionContext, request, response) {
+    function from(executionContext, api, request, response) {
         const out = {
+            api,
             request,
             response
         };

package/esm/services/api-service.js

@@ -4,7 +4,9 @@ export class ApiService {
             throw new Error(`No context assigned for ${Object.getPrototypeOf(this).constructor.name}`);
         return this._context;
     }
-    forContext(context) {
+    forContext(context, options) {
+        if (this._context === context && !options?.newInstance)
+            return this;
         const instance = { context };
         Object.setPrototypeOf(instance, this);
         return instance;

package/i18n/i18n/en/error.json

@@ -0,0 +1,21 @@
+{
+  "BAD_REQUEST": "Bad request",
+  "FAILED_DEPENDENCY": "The request failed due to failure of a previous request",
+  "FORBIDDEN": "You are not authorized to perform this action",
+  "INTERNAL_SERVER_ERROR": "Internal server error",
+  "METHOD_NOT_ALLOWED": "Method not allowed",
+  "NOT_ACCEPTABLE": "Not acceptable",
+  "NOT_FOUND": "Not found",
+  "UNAUTHORIZED": "You have not been authenticated to perform this action",
+  "UNPROCESSABLE_ENTITY": "Unprocessable entity",
+  "REQUEST_VALIDATION": "Request validation failed",
+  "RESPONSE_VALIDATION": "Response validation failed",
+  "RESOURCE_NOT_FOUND": "Resource not found",
+  "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}}'",
+  "UNKNOWN_FIELD": "Unknown field '{{field}}'",
+  "UNACCEPTED_SORT_FIELD": "Field '{{field}}' is not available for sort operation",
+  "UNACCEPTED_FILTER_FIELD": "Field '{{field}}' is not available for filter operation",
+  "UNACCEPTED_FILTER_OPERATION": "'{{operation}}' for field '{{field}}' is not available for filter operation"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/core",
-  "version": "0.31.2",
+  "version": "0.31.5",
   "description": "Opra schema package",
   "author": "Panates",
   "license": "MIT",
@@ -21,18 +21,19 @@
     "lint": "eslint . --max-warnings=0",
     "test": "jest",
     "cover": "jest --collect-coverage",
-    "clean": "npm run clean:src && npm run clean:dist && npm run clean:cover",
-    "clean:src": "ts-cleanup -s src --all && ts-cleanup -s test --all",
-    "clean:dist": "rimraf ../../build/core",
-    "clean:cover": "rimraf ../../coverage/core"
+    "clean": "npm run clean:src && npm run clean:test && npm run clean:dist && npm run clean:cover",
+    "clean:src": "ts-cleanup -s src --all",
+    "clean:test": "ts-cleanup -s test --all",
+    "clean:dist": "rimraf ../../build/client",
+    "clean:cover": "rimraf ../../coverage/client"
   },
   "dependencies": {
     "@browsery/type-is": "^0.6.3",
-    "@opra/common": "^0.31.2",
+    "@opra/common": "^0.31.5",
     "accepts": "^1.3.8",
     "content-disposition": "^0.5.4",
     "content-type": "^1.0.5",
-    "cookie": "^0.5.0",
+    "cookie": "^0.6.0",
     "cookie-signature": "^1.2.1",
     "encodeurl": "^1.0.2",
     "formidable": "^3.5.1",
@@ -49,20 +50,20 @@
     "express": "^4.x.x || ^5.x.x"
   },
   "devDependencies": {
-    "@faker-js/faker": "^8.2.0",
-    "@types/accepts": "^1.3.5",
-    "@types/content-disposition": "^0.5.6",
-    "@types/content-type": "^1.1.6",
-    "@types/cookie": "^0.5.2",
-    "@types/cookie-signature": "^1.1.0",
-    "@types/encodeurl": "^1.0.0",
-    "@types/express": "^4.17.19",
-    "@types/formidable": "^3.4.3",
-    "@types/fresh": "^0.5.0",
-    "@types/mime-types": "^2.1.2",
-    "@types/range-parser": "^1.2.5",
-    "@types/type-is": "^1.6.4",
-    "@types/vary": "^1.1.1",
+    "@faker-js/faker": "^8.3.1",
+    "@types/accepts": "^1.3.7",
+    "@types/content-disposition": "^0.5.8",
+    "@types/content-type": "^1.1.8",
+    "@types/cookie": "^0.5.4",
+    "@types/cookie-signature": "^1.1.2",
+    "@types/encodeurl": "^1.0.2",
+    "@types/express": "^4.17.21",
+    "@types/formidable": "^3.4.5",
+    "@types/fresh": "^0.5.2",
+    "@types/mime-types": "^2.1.4",
+    "@types/range-parser": "^1.2.7",
+    "@types/type-is": "^1.6.6",
+    "@types/vary": "^1.1.3",
     "crypto-browserify": "^3.12.0",
     "path-browserify": "^1.0.1",
     "ts-gems": "^2.5.0"

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

@@ -7,6 +7,9 @@ declare module "@opra/common" {
         namespace Action {
             interface Request extends StrictOmit<_Request, 'endpoint'> {
                 endpoint: _Action;
+                params: {
+                    [key: string]: any;
+                };
             }
             interface Context extends Resource.Context {
             }
@@ -34,6 +37,9 @@ declare module "@opra/common" {
                     name: 'delete';
                 };
                 key: any;
+                params: {
+                    [key: string]: any;
+                };
             }
             interface Context extends RequestContext {
                 request: Request;

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

@@ -21,6 +21,7 @@ declare module "@opra/common" {
                     pick?: string[];
                     omit?: string[];
                     include?: string[];
+                    [key: string]: any;
                 };
             }
             interface Context extends RequestContext {
@@ -46,6 +47,7 @@ declare module "@opra/common" {
                     pick?: string[];
                     omit?: string[];
                     include?: string[];
+                    [key: string]: any;
                 };
             }
             interface Context extends RequestContext {
@@ -62,6 +64,7 @@ declare module "@opra/common" {
                     pick?: string[];
                     omit?: string[];
                     include?: string[];
+                    [key: string]: any;
                 };
             }
             interface Context extends RequestContext {

package/types/request-context.d.ts

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

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

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