@opra/core 1.0.0-alpha.32 → 1.0.0-alpha.33

package/cjs/http/http-handler.js

@@ -9,15 +9,15 @@ const content_type_1 = require("content-type");
 const fast_tokenizer_1 = require("fast-tokenizer");
 const ts_gems_1 = require("ts-gems");
 const valgen_1 = require("valgen");
-const constants_1 = require("../constants");
-const wrap_exception_1 = require("./utils/wrap-exception");
+const constants_js_1 = require("../constants.js");
+const wrap_exception_js_1 = require("./utils/wrap-exception.js");
 /**
  * @class HttpHandler
  */
 class HttpHandler {
     constructor(adapter) {
         this.adapter = adapter;
-        this[constants_1.kAssetCache] = adapter[constants_1.kAssetCache];
+        this[constants_js_1.kAssetCache] = adapter[constants_js_1.kAssetCache];
     }
     /**
      * Main http request handler
@@ -77,7 +77,7 @@ class HttpHandler {
                 }, e);
             }
             else
-                e = (0, wrap_exception_1.wrapException)(e);
+                e = (0, wrap_exception_js_1.wrapException)(e);
             if (this.onError)
                 await this.onError(context, error);
             context.errors.push(e);
@@ -124,10 +124,10 @@ class HttpHandler {
             };
             /** prepare decoders */
             const getDecoder = (prm) => {
-                let decode = this[constants_1.kAssetCache].get(prm, 'decode');
+                let decode = this[constants_js_1.kAssetCache].get(prm, 'decode');
                 if (!decode) {
                     decode = prm.type?.generateCodec('decode', { ignoreReadonlyFields: true }) || valgen_1.vg.isAny();
-                    this[constants_1.kAssetCache].set(prm, 'decode', decode);
+                    this[constants_js_1.kAssetCache].set(prm, 'decode', decode);
                 }
                 return decode;
             };
@@ -293,19 +293,19 @@ class HttpHandler {
             const { operationResponse, statusCode } = responseArgs;
             let { contentType, body } = responseArgs;
             const operationResultType = document.node.getDataType(common_1.OperationResult);
-            let operationResultEncoder = this[constants_1.kAssetCache].get(operationResultType, 'encode');
+            let operationResultEncoder = this[constants_js_1.kAssetCache].get(operationResultType, 'encode');
             if (!operationResultEncoder) {
                 operationResultEncoder = operationResultType.generateCodec('encode', {
                     ignoreWriteonlyFields: true,
                     ignoreHiddenFields: true,
                 });
-                this[constants_1.kAssetCache].set(operationResultType, 'encode', operationResultEncoder);
+                this[constants_js_1.kAssetCache].set(operationResultType, 'encode', operationResultEncoder);
             }
             /** Validate response */
             if (operationResponse?.type) {
                 if (!(body == null && statusCode === common_1.HttpStatusCode.NO_CONTENT)) {
                     /** Generate encoder */
-                    let encode = this[constants_1.kAssetCache].get(operationResponse, 'encode');
+                    let encode = this[constants_js_1.kAssetCache].get(operationResponse, 'encode');
                     if (!encode) {
                         encode = operationResponse.type.generateCodec('encode', {
                             partial: operationResponse.partial,
@@ -317,7 +317,7 @@ class HttpHandler {
                         if (operationResponse) {
                             if (operationResponse.isArray)
                                 encode = valgen_1.vg.isArray(encode);
-                            this[constants_1.kAssetCache].set(operationResponse, 'encode', encode);
+                            this[constants_js_1.kAssetCache].set(operationResponse, 'encode', encode);
                         }
                     }
                     /** Encode body */
@@ -411,10 +411,10 @@ class HttpHandler {
         response.statusCode = status;
         const { document } = this.adapter;
         const dt = document.node.getComplexType('OperationResult');
-        let encode = this[constants_1.kAssetCache].get(dt, 'encode');
+        let encode = this[constants_js_1.kAssetCache].get(dt, 'encode');
         if (!encode) {
             encode = dt.generateCodec('encode', { ignoreWriteonlyFields: true });
-            this[constants_1.kAssetCache].set(dt, 'encode', encode);
+            this[constants_js_1.kAssetCache].set(dt, 'encode', encode);
         }
         const { i18n } = this.adapter;
         const bodyObject = new common_1.OperationResult({
@@ -449,12 +449,12 @@ class HttpHandler {
             return this.sendResponse(context);
         }
         /** Check if response cache exists */
-        let responseBody = this[constants_1.kAssetCache].get(doc, `$schema`);
+        let responseBody = this[constants_js_1.kAssetCache].get(doc, `$schema`);
         /** Create response if response cache does not exists */
         if (!responseBody) {
             const schema = doc.export();
             responseBody = JSON.stringify(schema);
-            this[constants_1.kAssetCache].set(doc, `$schema`, responseBody);
+            this[constants_js_1.kAssetCache].set(doc, `$schema`, responseBody);
         }
         response.end(responseBody);
     }
@@ -480,7 +480,7 @@ class HttpHandler {
         }
         let operationResponse;
         const cacheKey = `HttpOperationResponse:${statusCode}${contentType ? ':' + contentType : ''}`;
-        let responseArgs = this[constants_1.kAssetCache].get(response, cacheKey);
+        let responseArgs = this[constants_js_1.kAssetCache].get(response, cacheKey);
         if (!responseArgs) {
             responseArgs = { statusCode, contentType };
             if (operation?.responses.length) {
@@ -532,7 +532,7 @@ class HttpHandler {
                 if (context.queryParams.projection)
                     responseArgs.projection = context.queryParams.projection;
             }
-            this[constants_1.kAssetCache].set(response, cacheKey, { ...responseArgs });
+            this[constants_js_1.kAssetCache].set(response, cacheKey, { ...responseArgs });
         }
         /** Fix response value according to composition */
         const composition = operationResponse?.owner.composition;
@@ -590,7 +590,7 @@ class HttpHandler {
         return responseArgs;
     }
     _wrapExceptions(exceptions) {
-        const wrappedErrors = exceptions.map(wrap_exception_1.wrapException);
+        const wrappedErrors = exceptions.map(wrap_exception_js_1.wrapException);
         if (!wrappedErrors.length)
             wrappedErrors.push(new common_1.InternalServerError());
         // Sort errors from fatal to info

package/esm/http/http-handler.js

@@ -5,8 +5,8 @@ import { parse as parseContentType } from 'content-type';
 import { splitString } from 'fast-tokenizer';
 import { asMutable } from 'ts-gems';
 import { toArray, ValidationError, vg } from 'valgen';
-import { kAssetCache } from '../constants';
-import { wrapException } from './utils/wrap-exception';
+import { kAssetCache } from '../constants.js';
+import { wrapException } from './utils/wrap-exception.js';
 /**
  * @class HttpHandler
  */

package/esm/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

package/package.json

@@ -1,39 +1,14 @@
 {
   "name": "@opra/core",
-  "version": "1.0.0-alpha.32",
+  "version": "1.0.0-alpha.33",
   "description": "Opra schema package",
   "author": "Panates",
   "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/panates/opra.git",
-    "directory": "packages/core"
-  },
-  "scripts": {
-    "compile": "tsc",
-    "prebuild": "npm run lint && npm run clean",
-    "build": "npm run build:cjs && npm run build:esm",
-    "build:cjs": "tsc -b tsconfig-build-cjs.json",
-    "build:esm": "tsc -b tsconfig-build-esm.json",
-    "postbuild": "npm run postbuild:copy_1 && npm run postbuild:copy_2",
-    "postbuild:copy_1": "cp README.md package.json ../../LICENSE ../../build/core && cp ../../package.cjs.json ../../build/core/cjs/package.json",
-    "postbuild:copy_2": "cp -R i18n ../../build/core/i18n",
-    "lint": "eslint . --max-warnings=0",
-    "lint:fix": "eslint . --max-warnings=0 --fix",
-    "format": "prettier . --write --log-level=warn",
-    "check": "madge --circular src/**",
-    "test": "jest --passWithNoTests",
-    "cover": "jest --passWithNoTests --collect-coverage",
-    "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/http-parser": "^0.5.8",
-    "@browsery/type-is": "^1.6.18-r2",
-    "@opra/common": "^1.0.0-alpha.32",
+    "@browsery/antlr4": "^4.13.3-r1",
+    "@browsery/http-parser": "^0.5.9-r1",
+    "@browsery/type-is": "^1.6.18-r5",
+    "@opra/common": "^1.0.0-alpha.33",
     "accepts": "^1.3.8",
     "base64-stream": "^1.0.0",
     "busboy": "^1.6.0",
@@ -44,59 +19,54 @@
     "cookie-signature": "^1.2.1",
     "cppzst": "^2.0.12",
     "encodeurl": "^2.0.0",
+    "fast-tokenizer": "^1.6.1",
     "fresh": "^0.5.2",
     "iconv-lite": "^0.6.3",
     "mime-types": "^2.1.35",
-    "power-tasks": "^1.7.7",
+    "power-tasks": "^1.10.1",
     "putil-isplainobject": "^1.1.5",
     "putil-merge": "^3.13.0",
     "putil-varhelpers": "^1.6.5",
     "range-parser": "^1.2.1",
     "raw-body": "^3.0.0",
     "reflect-metadata": "^0.2.2",
-    "strict-typed-events": "^2.4.0",
+    "strict-typed-events": "^2.7.2",
     "tslib": "^2.6.3",
+    "valgen": "^5.8.2",
     "vary": "^1.1.2"
   },
   "optionalDependencies": {
     "express": "^4.x.x || ^5.x.x",
     "fastify": "^4.x.x"
   },
-  "devDependencies": {
-    "@faker-js/faker": "^8.4.1",
-    "@types/accepts": "^1.3.7",
-    "@types/base64-stream": "^1.0.5",
-    "@types/busboy": "^1.5.4",
-    "@types/bytes": "^3.1.4",
-    "@types/content-disposition": "^0.5.8",
-    "@types/content-type": "^1.1.8",
-    "@types/cookie": "^0.6.0",
-    "@types/cookie-parser": "^1.4.7",
-    "@types/cookie-signature": "^1.1.2",
-    "@types/encodeurl": "^1.0.2",
-    "@types/express": "^4.17.21",
-    "@types/fresh": "^0.5.2",
-    "@types/mime-types": "^2.1.4",
-    "@types/range-parser": "^1.2.7",
-    "@types/vary": "^1.1.3",
-    "cookie-parser": "^1.4.6",
-    "crypto-browserify": "^3.12.0",
-    "express": "^4.19.2",
-    "fastify": "^4.28.1",
-    "path-browserify": "^1.0.1",
-    "supertest": "^7.0.0",
-    "ts-gems": "^3.4.0"
-  },
   "type": "module",
-  "module": "./esm/index.js",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./types/index.d.ts",
+        "default": "./esm/index.js"
+      },
+      "require": {
+        "types": "./types/index.d.ts",
+        "default": "./cjs/index.js"
+      },
+      "default": "./esm/index.js"
+    },
+    "./package.json": "./package.json"
+  },
   "main": "./cjs/index.js",
+  "module": "./esm/index.js",
   "types": "./types/index.d.ts",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/panates/opra.git",
+    "directory": "packages/core"
+  },
   "engines": {
     "node": ">=16.0",
     "npm": ">=7.0.0"
   },
   "files": [
-    "bin/",
     "cjs/",
     "esm/",
     "i18n/",
@@ -114,4 +84,4 @@
     "swagger",
     "raml"
   ]
-}
+}

package/types/http/http-handler.d.ts

@@ -1,8 +1,8 @@
 import { HttpOperationResponse, OpraException, OpraHttpError } from '@opra/common';
-import { kAssetCache } from '../constants';
-import type { HttpAdapter } from './http-adapter';
-import { HttpContext } from './http-context';
-import { AssetCache } from './impl/asset-cache';
+import { kAssetCache } from '../constants.js';
+import type { HttpAdapter } from './http-adapter.js';
+import { HttpContext } from './http-context.js';
+import { AssetCache } from './impl/asset-cache.js';
 /**
  * @namespace
  */

package/i18n/i18n/en/error.json

@@ -1,21 +0,0 @@
-{
-  "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_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}}'",
-  "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"
-}