@opra/core 1.0.0-alpha.37 → 1.0.0-alpha.39

package/cjs/augmentation/18n.augmentation.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const common_1 = require("@opra/common");
-const fs_1 = tslib_1.__importDefault(require("fs"));
-const path_1 = tslib_1.__importDefault(require("path"));
 common_1.I18n.load = async function (options) {
     const opts = {
         ...options,
@@ -11,7 +11,7 @@ common_1.I18n.load = async function (options) {
     delete opts.resourceDirs;
     const instance = common_1.I18n.createInstance(opts);
     await instance.init();
-    await instance.loadResourceDir(path_1.default.resolve((0, common_1.getStackFileName)(), '../../../i18n'));
+    await instance.loadResourceDir(node_path_1.default.resolve((0, common_1.getStackFileName)(), '../../../i18n'));
     if (options?.resourceDirs)
         for (const dir of options.resourceDirs)
             await instance.loadResourceDir(dir);
@@ -23,7 +23,7 @@ common_1.I18n.prototype.loadResourceBundle = async function (lang, ns, filePath,
         obj = (await fetch(filePath, { headers: { accept: 'application/json' } })).json();
     }
     else {
-        const content = fs_1.default.readFileSync(filePath, 'utf8');
+        const content = node_fs_1.default.readFileSync(filePath, 'utf8');
         obj = JSON.parse(content);
     }
     this.addResourceBundle(lang, ns, obj, deep, overwrite);
@@ -31,18 +31,18 @@ common_1.I18n.prototype.loadResourceBundle = async function (lang, ns, filePath,
 common_1.I18n.prototype.loadResourceDir = async function (dirnames, deep, overwrite) {
     for (const dirname of Array.isArray(dirnames) ? dirnames : [dirnames]) {
         /* istanbul ignore next */
-        if (!fs_1.default.existsSync(dirname))
+        if (!node_fs_1.default.existsSync(dirname))
             continue;
-        const languageDirs = fs_1.default.readdirSync(dirname);
+        const languageDirs = node_fs_1.default.readdirSync(dirname);
         for (const lang of languageDirs) {
-            const langDir = path_1.default.join(dirname, lang);
-            if (fs_1.default.statSync(langDir).isDirectory()) {
-                const nsDirs = fs_1.default.readdirSync(langDir);
+            const langDir = node_path_1.default.join(dirname, lang);
+            if (node_fs_1.default.statSync(langDir).isDirectory()) {
+                const nsDirs = node_fs_1.default.readdirSync(langDir);
                 for (const nsfile of nsDirs) {
-                    const nsFilePath = path_1.default.join(langDir, nsfile);
-                    const ext = path_1.default.extname(nsfile);
-                    if (ext === '.json' && fs_1.default.statSync(nsFilePath).isFile()) {
-                        const ns = path_1.default.basename(nsfile, ext);
+                    const nsFilePath = node_path_1.default.join(langDir, nsfile);
+                    const ext = node_path_1.default.extname(nsfile);
+                    if (ext === '.json' && node_fs_1.default.statSync(nsFilePath).isFile()) {
+                        const ns = node_path_1.default.basename(nsfile, ext);
                         await this.loadResourceBundle(lang, ns, nsFilePath, deep, overwrite);
                     }
                 }

package/cjs/http/express-adapter.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExpressAdapter = void 0;
 const tslib_1 = require("tslib");
+const nodePath = tslib_1.__importStar(require("node:path"));
 const common_1 = require("@opra/common");
 const express_1 = require("express");
-const nodePath = tslib_1.__importStar(require("path"));
 const http_adapter_js_1 = require("./http-adapter.js");
 const http_context_js_1 = require("./http-context.js");
 const http_incoming_interface_js_1 = require("./interfaces/http-incoming.interface.js");

package/cjs/http/http-handler.js

@@ -7,6 +7,7 @@ const type_is_1 = tslib_1.__importDefault(require("@browsery/type-is"));
 const common_1 = require("@opra/common");
 const content_type_1 = require("content-type");
 const fast_tokenizer_1 = require("fast-tokenizer");
+const super_fast_md5_1 = require("super-fast-md5");
 const ts_gems_1 = require("ts-gems");
 const valgen_1 = require("valgen");
 const constants_js_1 = require("../constants.js");
@@ -305,11 +306,13 @@ class HttpHandler {
             if (operationResponse?.type) {
                 if (!(body == null && statusCode === common_1.HttpStatusCode.NO_CONTENT)) {
                     /** Generate encoder */
-                    let encode = this[constants_js_1.kAssetCache].get(operationResponse, 'encode');
+                    const projection = responseArgs.projection || '*';
+                    const assetKey = (0, super_fast_md5_1.md5)(String(projection));
+                    let encode = this[constants_js_1.kAssetCache].get(operationResponse, 'encode:' + assetKey);
                     if (!encode) {
                         encode = operationResponse.type.generateCodec('encode', {
                             partial: operationResponse.partial,
-                            projection: responseArgs.projection || '*',
+                            projection,
                             ignoreWriteonlyFields: true,
                             ignoreHiddenFields: true,
                             onFail: issue => `Response body validation failed: ` + issue.message,
@@ -317,7 +320,7 @@ class HttpHandler {
                         if (operationResponse) {
                             if (operationResponse.isArray)
                                 encode = valgen_1.vg.isArray(encode);
-                            this[constants_js_1.kAssetCache].set(operationResponse, 'encode', encode);
+                            this[constants_js_1.kAssetCache].set(operationResponse, 'encode:' + assetKey, encode);
                         }
                     }
                     /** Encode body */
@@ -416,13 +419,13 @@ class HttpHandler {
             encode = dt.generateCodec('encode', { ignoreWriteonlyFields: true });
             this[constants_js_1.kAssetCache].set(dt, 'encode', encode);
         }
-        const { i18n } = this.adapter;
+        // const { i18n } = this.adapter;
         const bodyObject = new common_1.OperationResult({
             errors: errors.map(x => {
                 const o = x.toJSON();
                 if (!(process.env.NODE_ENV === 'dev' || process.env.NODE_ENV === 'development'))
                     delete o.stack;
-                return i18n.deep(o);
+                return o; // i18n.deep(o);
             }),
         });
         const body = encode(bodyObject);
@@ -431,7 +434,7 @@ class HttpHandler {
         response.setHeader(common_1.HttpHeaderCodes.Pragma, 'no-cache');
         response.setHeader(common_1.HttpHeaderCodes.Expires, '-1');
         response.setHeader(common_1.HttpHeaderCodes.X_Opra_Version, common_1.OpraSchema.SpecVersion);
-        response.send(JSON.stringify(body));
+        response.send((0, common_1.safeJsonStringify)(body));
         response.end();
     }
     async sendDocumentSchema(context) {

package/cjs/http/impl/http-outgoing.host.js

@@ -6,6 +6,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpOutgoingHost = void 0;
 const tslib_1 = require("tslib");
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const common_1 = require("@opra/common");
 const content_disposition_1 = tslib_1.__importDefault(require("content-disposition"));
 const content_type_1 = tslib_1.__importDefault(require("content-type"));
@@ -13,14 +14,13 @@ const cookie_1 = tslib_1.__importDefault(require("cookie"));
 const cookie_signature_1 = tslib_1.__importDefault(require("cookie-signature"));
 const encodeurl_1 = tslib_1.__importDefault(require("encodeurl"));
 const mime_types_1 = tslib_1.__importDefault(require("mime-types"));
-const path_1 = tslib_1.__importDefault(require("path"));
 const putil_varhelpers_1 = require("putil-varhelpers");
 const vary_1 = tslib_1.__importDefault(require("vary"));
 const charsetRegExp = /;\s*charset\s*=/;
 class HttpOutgoingHost {
     attachment(filename) {
         if (filename)
-            this.contentType(path_1.default.extname(filename));
+            this.contentType(node_path_1.default.extname(filename));
         this.setHeader('Content-Disposition', (0, content_disposition_1.default)(filename));
         return this;
     }

package/esm/augmentation/18n.augmentation.js

@@ -1,6 +1,6 @@
+import fs from 'node:fs';
+import path from 'node:path';
 import { getStackFileName, I18n as I18n_ } from '@opra/common';
-import fs from 'fs';
-import path from 'path';
 I18n_.load = async function (options) {
     const opts = {
         ...options,

package/esm/http/express-adapter.js

@@ -1,6 +1,6 @@
+import * as nodePath from 'node:path';
 import { HttpApi, NotFoundError } from '@opra/common';
 import { Router } from 'express';
-import * as nodePath from 'path';
 import { HttpAdapter } from './http-adapter.js';
 import { HttpContext } from './http-context.js';
 import { HttpIncoming } from './interfaces/http-incoming.interface.js';

package/esm/http/http-handler.js

@@ -1,8 +1,9 @@
 import * as process from 'node:process';
 import typeIs from '@browsery/type-is';
-import { BadRequestError, HttpHeaderCodes, HttpStatusCode, InternalServerError, isBlob, isReadableStream, IssueSeverity, MethodNotAllowedError, MimeTypes, OperationResult, OpraException, OpraSchema, } from '@opra/common';
+import { BadRequestError, HttpHeaderCodes, HttpStatusCode, InternalServerError, isBlob, isReadableStream, IssueSeverity, MethodNotAllowedError, MimeTypes, OperationResult, OpraException, OpraSchema, safeJsonStringify, } from '@opra/common';
 import { parse as parseContentType } from 'content-type';
 import { splitString } from 'fast-tokenizer';
+import { md5 } from 'super-fast-md5';
 import { asMutable } from 'ts-gems';
 import { toArray, ValidationError, vg } from 'valgen';
 import { kAssetCache } from '../constants.js';
@@ -301,11 +302,13 @@ export class HttpHandler {
             if (operationResponse?.type) {
                 if (!(body == null && statusCode === HttpStatusCode.NO_CONTENT)) {
                     /** Generate encoder */
-                    let encode = this[kAssetCache].get(operationResponse, 'encode');
+                    const projection = responseArgs.projection || '*';
+                    const assetKey = md5(String(projection));
+                    let encode = this[kAssetCache].get(operationResponse, 'encode:' + assetKey);
                     if (!encode) {
                         encode = operationResponse.type.generateCodec('encode', {
                             partial: operationResponse.partial,
-                            projection: responseArgs.projection || '*',
+                            projection,
                             ignoreWriteonlyFields: true,
                             ignoreHiddenFields: true,
                             onFail: issue => `Response body validation failed: ` + issue.message,
@@ -313,7 +316,7 @@ export class HttpHandler {
                         if (operationResponse) {
                             if (operationResponse.isArray)
                                 encode = vg.isArray(encode);
-                            this[kAssetCache].set(operationResponse, 'encode', encode);
+                            this[kAssetCache].set(operationResponse, 'encode:' + assetKey, encode);
                         }
                     }
                     /** Encode body */
@@ -412,13 +415,13 @@ export class HttpHandler {
             encode = dt.generateCodec('encode', { ignoreWriteonlyFields: true });
             this[kAssetCache].set(dt, 'encode', encode);
         }
-        const { i18n } = this.adapter;
+        // const { i18n } = this.adapter;
         const bodyObject = new OperationResult({
             errors: errors.map(x => {
                 const o = x.toJSON();
                 if (!(process.env.NODE_ENV === 'dev' || process.env.NODE_ENV === 'development'))
                     delete o.stack;
-                return i18n.deep(o);
+                return o; // i18n.deep(o);
             }),
         });
         const body = encode(bodyObject);
@@ -427,7 +430,7 @@ export class HttpHandler {
         response.setHeader(HttpHeaderCodes.Pragma, 'no-cache');
         response.setHeader(HttpHeaderCodes.Expires, '-1');
         response.setHeader(HttpHeaderCodes.X_Opra_Version, OpraSchema.SpecVersion);
-        response.send(JSON.stringify(body));
+        response.send(safeJsonStringify(body));
         response.end();
     }
     async sendDocumentSchema(context) {

package/esm/http/impl/http-outgoing.host.js

@@ -2,6 +2,7 @@
   Some parts of this file contains codes from open source express library
   https://github.com/expressjs
  */
+import path from 'node:path';
 import { HttpStatusCode } from '@opra/common';
 import contentDisposition from 'content-disposition';
 import contentType from 'content-type';
@@ -9,7 +10,6 @@ import cookie from 'cookie';
 import cookieSignature from 'cookie-signature';
 import encodeUrl from 'encodeurl';
 import mime from 'mime-types';
-import path from 'path';
 import { toString } from 'putil-varhelpers';
 import vary from 'vary';
 const charsetRegExp = /;\s*charset\s*=/;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/core",
-  "version": "1.0.0-alpha.37",
+  "version": "1.0.0-alpha.39",
   "description": "Opra schema package",
   "author": "Panates",
   "license": "MIT",
@@ -8,7 +8,7 @@
     "@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.37",
+    "@opra/common": "^1.0.0-alpha.39",
     "accepts": "^1.3.8",
     "base64-stream": "^1.0.0",
     "busboy": "^1.6.0",
@@ -31,7 +31,8 @@
     "raw-body": "^3.0.0",
     "reflect-metadata": "^0.2.2",
     "strict-typed-events": "^2.8.0",
-    "tslib": "^2.6.3",
+    "super-fast-md5": "^1.0.3",
+    "tslib": "^2.7.0",
     "valgen": "^5.9.0",
     "vary": "^1.1.2"
   },

package/types/helpers/service-base.d.ts

@@ -1,4 +1,4 @@
-import { Nullish } from 'ts-gems';
+import type { Nullish } from 'ts-gems';
 import type { HttpContext } from '../http/http-context';
 export declare abstract class ServiceBase {
     protected _context: HttpContext;

package/types/http/express-adapter.d.ts

@@ -1,5 +1,5 @@
 import { ApiDocument, HttpController } from '@opra/common';
-import { Application } from 'express';
+import { type Application } from 'express';
 import { HttpAdapter } from './http-adapter.js';
 export declare class ExpressAdapter extends HttpAdapter {
     readonly app: Application;

package/types/http/impl/multipart-reader.d.ts

@@ -1,7 +1,7 @@
 import { HttpMediaType } from '@opra/common';
 import busboy from 'busboy';
 import { EventEmitter } from 'events';
-import { StrictOmit } from 'ts-gems';
+import type { StrictOmit } from 'ts-gems';
 import { HttpContext } from '../http-context.js';
 export declare namespace MultipartReader {
     interface Options extends StrictOmit<busboy.BusboyConfig, 'headers'> {

package/types/http/impl/node-incoming-message.host.d.ts

@@ -1,5 +1,5 @@
-import { HTTPParserJS } from '@browsery/http-parser';
-import { IncomingHttpHeaders } from 'http';
+import { type HTTPParserJS } from '@browsery/http-parser';
+import type { IncomingHttpHeaders } from 'http';
 import { Duplex, Readable } from 'stream';
 import type { NodeIncomingMessage } from '../interfaces/node-incoming-message.interface.js';
 export declare const CRLF: Buffer;

package/types/http/impl/node-outgoing-message.host.d.ts

@@ -1,4 +1,4 @@
-import { OutgoingHttpHeaders } from 'http';
+import type { OutgoingHttpHeaders } from 'http';
 import { Duplex } from 'stream';
 import type { NodeIncomingMessage } from '../interfaces/node-incoming-message.interface.js';
 import type { NodeOutgoingMessage } from '../interfaces/node-outgoing-message.interface.js';

package/types/http/interfaces/http-incoming.interface.d.ts

@@ -1,4 +1,4 @@
-import { Options as RangeParserOptions, Ranges as RangeParserRanges, Result as RangeParserResult } from 'range-parser';
+import type { Options as RangeParserOptions, Ranges as RangeParserRanges, Result as RangeParserResult } from 'range-parser';
 import { BodyReader } from '../utils/body-reader.js';
 import type { HttpOutgoing } from './http-outgoing.interface.js';
 import { NodeIncomingMessage } from './node-incoming-message.interface.js';

package/types/http/interfaces/http-outgoing.interface.d.ts

@@ -1,4 +1,4 @@
-import { StrictOmit } from 'ts-gems';
+import { type StrictOmit } from 'ts-gems';
 import type { HttpIncoming } from './http-incoming.interface.js';
 import { NodeOutgoingMessage } from './node-outgoing-message.interface.js';
 export interface HttpOutgoing extends StrictOmit<NodeOutgoingMessage, 'req' | 'appendHeader' | 'setHeader'> {

package/types/http/interfaces/node-outgoing-message.interface.d.ts

@@ -1,4 +1,4 @@
-import http, { OutgoingHttpHeaders } from 'http';
+import http, { type OutgoingHttpHeaders } from 'http';
 import { Writable } from 'stream';
 import { NodeIncomingMessage } from './node-incoming-message.interface.js';
 export interface NodeOutgoingMessage extends Writable, Pick<http.ServerResponse, 'addTrailers' | 'getHeader' | 'getHeaders' | 'getHeaderNames' | 'flushHeaders' | 'removeHeader' | 'hasHeader' | 'headersSent' | 'statusCode' | 'statusMessage' | 'sendDate'> {

package/types/http/utils/convert-to-raw-headers.d.ts

@@ -1,2 +1,2 @@
-import { IncomingHttpHeaders } from 'http';
+import type { IncomingHttpHeaders } from 'http';
 export declare function convertToRawHeaders(src: IncomingHttpHeaders | Record<string, any>): string[];