@opra/core 1.0.0-alpha.2 → 1.0.0-alpha.21

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

@@ -2,10 +2,10 @@
   Some parts of this file contains codes from open source express library
   https://github.com/expressjs
  */
+import typeIs from '@browsery/type-is';
 import accepts from 'accepts';
 import fresh from 'fresh';
 import parseRange from 'range-parser';
-import typeIs from '@browsery/type-is';
 import { BodyReader } from '../utils/body-reader.js';
 export class HttpIncomingHost {
     get protocol() {
@@ -37,11 +37,11 @@ export class HttpIncomingHost {
     get fresh() {
         const method = this.method;
         // GET or HEAD for weak freshness validation only
-        if ('GET' !== method && 'HEAD' !== method)
+        if (method !== 'GET' && method !== 'HEAD')
             return false;
         const status = this.res?.statusCode;
         // 2xx or 304 as per rfc2616 14.26
-        if ((status >= 200 && status < 300) || 304 === status) {
+        if ((status >= 200 && status < 300) || status === 304) {
             return fresh(this.headers, {
                 etag: this.res.getHeader('ETag'),
                 'last-modified': this.res.getHeader('Last-Modified'),

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 { HttpStatusCode } from '@opra/common';
 import contentDisposition from 'content-disposition';
 import contentType from 'content-type';
 import cookie from 'cookie';
@@ -11,7 +12,6 @@ import mime from 'mime-types';
 import path from 'path';
 import { toString } from 'putil-varhelpers';
 import vary from 'vary';
-import { HttpStatusCode } from '@opra/common';
 const charsetRegExp = /;\s*charset\s*=/;
 export class HttpOutgoingHost {
     attachment(filename) {
@@ -160,7 +160,7 @@ export class HttpOutgoingHost {
         if (req?.fresh)
             this.statusCode = 304;
         // strip irrelevant headers
-        if (204 === this.statusCode || 304 === this.statusCode) {
+        if (this.statusCode === 204 || this.statusCode === 304) {
             this.removeHeader('Content-Type');
             this.removeHeader('Content-Length');
             this.removeHeader('Transfer-Encoding');

package/esm/http/impl/multipart-reader.js

@@ -12,9 +12,7 @@ export class MultipartReader extends EventEmitter {
         this._incoming = incoming;
         const form = (this._form = formidable({
             ...options,
-            filter: (part) => {
-                return !this._cancelled && (!options?.filter || options.filter(part));
-            },
+            filter: (part) => !this._cancelled && (!options?.filter || options.filter(part)),
         }));
         form.once('error', () => {
             this._cancelled = true;
@@ -69,7 +67,7 @@ export class MultipartReader extends EventEmitter {
     }
     resume() {
         if (!this._started)
-            this._form.parse(this._incoming, () => void 0);
+            this._form.parse(this._incoming, () => undefined);
         if (this._form.req)
             this._form.resume();
     }
@@ -88,12 +86,8 @@ export class MultipartReader extends EventEmitter {
                     return resolve();
                 file._writeStream.once('close', resolve);
             })
-                .then(() => {
-                return fs.unlink(file.filepath);
-            })
-                .then(() => {
-                return 0;
-            }));
+                .then(() => fs.unlink(file.filepath))
+                .then(() => 0));
         });
         return Promise.allSettled(promises);
     }

package/esm/http/impl/node-incoming-message.host.js

@@ -1,5 +1,5 @@
-import { Duplex, Readable } from 'stream';
 import { isAsyncIterable, isIterable } from '@opra/common';
+import { Duplex, Readable } from 'stream';
 import { convertToHeaders, convertToHeadersDistinct } from '../utils/convert-to-headers.js';
 import { convertToRawHeaders } from '../utils/convert-to-raw-headers.js';
 export const CRLF = Buffer.from('\r\n');
@@ -33,10 +33,12 @@ export class NodeIncomingMessageHost extends Duplex {
                 else
                     this.body = Buffer.from(JSON.stringify(init.body), 'utf-8');
             }
-            if (init.headers)
+            if (init.headers) {
                 this.rawHeaders = Array.isArray(init.headers) ? init.headers : convertToRawHeaders(init.headers);
-            if (init.trailers)
+            }
+            if (init.trailers) {
                 this.rawTrailers = Array.isArray(init.trailers) ? init.trailers : convertToRawHeaders(init.trailers);
+            }
             this.ip = init.ip || '';
             this.ips = init.ips || (this.ip ? [this.ip] : []);
             if (this.body && !this.headers['content-length'])

package/esm/http/interfaces/node-incoming-message.interface.js

@@ -1,6 +1,6 @@
-import { Readable } from 'stream';
 import { HTTPParser } from '@browsery/http-parser';
 import { isAsyncIterable, isIterable } from '@opra/common';
+import { Readable } from 'stream';
 import { CRLF, kHttpParser, NodeIncomingMessageHost } from '../impl/node-incoming-message.host.js';
 import { concatReadable } from '../utils/concat-readable.js';
 /**
@@ -14,8 +14,9 @@ export var NodeIncomingMessage;
      * @param iterable
      */
     function from(iterable) {
-        if (typeof iterable === 'object' && !(isIterable(iterable) || isAsyncIterable(iterable)))
+        if (typeof iterable === 'object' && !(isIterable(iterable) || isAsyncIterable(iterable))) {
             return new NodeIncomingMessageHost(iterable);
+        }
         const msg = new NodeIncomingMessageHost();
         const parser = (msg[kHttpParser] = new HTTPParser(HTTPParser.REQUEST));
         let bodyChunks;

package/esm/http/utils/body-reader.js

@@ -1,3 +1,5 @@
+import typeIs from '@browsery/type-is';
+import { BadRequestError, InternalServerError, OpraHttpError } from '@opra/common';
 import { Base64Decode } from 'base64-stream';
 import byteParser from 'bytes';
 import { parse as parseContentType } from 'content-type';
@@ -5,8 +7,6 @@ import { EventEmitter } from 'events';
 import iconv from 'iconv-lite';
 import { Writable } from 'stream';
 import * as zlib from 'zlib';
-import typeIs from '@browsery/type-is';
-import { BadRequestError, InternalServerError, OpraHttpError } from '@opra/common';
 /**
  *
  * @class BodyReader
@@ -29,11 +29,12 @@ export class BodyReader extends EventEmitter {
     }
     async read() {
         /* istanbul ignore next */
-        if (this._completed)
+        if (this._completed) {
             throw new InternalServerError({
                 message: 'Stream already read',
                 code: 'STREAM_ALREADY_READ',
             });
+        }
         if (!this.req.readable) {
             throw new InternalServerError({
                 message: 'Stream is not readable',
@@ -57,8 +58,9 @@ export class BodyReader extends EventEmitter {
              * http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.3
              */
             const contentLength = parseInt(this.req.headers['content-length'] || '0', 10);
-            if (this.req.headers['transfer-encoding'] === undefined && !(contentLength && !isNaN(contentLength)))
+            if (this.req.headers['transfer-encoding'] === undefined && !(contentLength && !isNaN(contentLength))) {
                 return this.onEnd();
+            }
             // check the length and limit options.
             // note: we intentionally leave the stream paused,
             // so users should handle the stream themselves.
@@ -143,7 +145,6 @@ export class BodyReader extends EventEmitter {
             message: 'request aborted',
             code: 'ECONNABORTED',
             details: {
-                length,
                 received: this._receivedSize,
             },
         }));

package/esm/http/utils/common.js

@@ -55,6 +55,7 @@ export const validateHeaderValue = hideStackFrames((name, value) => {
     }
 });
 export function validateString(value, name) {
-    if (typeof value !== 'string')
+    if (typeof value !== 'string') {
         throw new TypeError(`Invalid ${name ? name + ' ' : ''}argument. Value must be a string`);
+    }
 }

package/esm/index.js

@@ -6,20 +6,20 @@ import * as HttpOutgoingHost_ from './http/impl/http-outgoing.host.js';
 import * as NodeIncomingMessageHost_ from './http/impl/node-incoming-message.host.js';
 import * as NodeOutgoingMessageHost_ from './http/impl/node-outgoing-message.host.js';
 export * from './execution-context.js';
-export * from './platform-adapter.js';
-export * from './type-guards.js';
 export * from './helpers/logger.js';
 export * from './helpers/service-base.js';
 export * from './http/express-adapter.js';
 export * from './http/http-adapter.js';
 export * from './http/http-context.js';
+export * from './http/impl/multipart-reader.js';
 export * from './http/interfaces/http-incoming.interface.js';
 export * from './http/interfaces/http-outgoing.interface.js';
 export * from './http/interfaces/node-incoming-message.interface.js';
 export * from './http/interfaces/node-outgoing-message.interface.js';
-export * from './http/impl/multipart-reader.js';
 export * from './http/utils/wrap-exception.js';
 export * from './interfaces/logger.interface.js';
+export * from './platform-adapter.js';
+export * from './type-guards.js';
 export var classes;
 (function (classes) {
     classes.HttpIncomingHost = HttpIncomingHost_.HttpIncomingHost;

package/esm/platform-adapter.js

@@ -1,6 +1,6 @@
 import './augmentation/18n.augmentation.js';
-import { AsyncEventEmitter } from 'strict-typed-events';
 import { I18n } from '@opra/common';
+import { AsyncEventEmitter } from 'strict-typed-events';
 import { kAssetCache } from './constants.js';
 import { Logger } from './helpers/logger.js';
 import { AssetCache } from './http/impl/asset-cache.js';

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_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"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/core",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.21",
   "description": "Opra schema package",
   "author": "Panates",
   "license": "MIT",
@@ -19,10 +19,11 @@
     "_copy_pkg_files": "cp README.md package.json ../../LICENSE ../../build/core && cp ../../package.cjs.json ../../build/core/cjs/package.json",
     "_copyi18n": "cp -R i18n ../../build/core/i18n",
     "lint": "eslint . --max-warnings=0",
-    "check": "madge --circular src/**",
+    "lint:fix": "eslint . --max-warnings=0 --fix",
     "format": "prettier . --write --log-level=warn",
-    "test": "jest",
-    "cover": "jest --collect-coverage",
+    "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",
@@ -30,8 +31,9 @@
     "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.2",
+    "@opra/common": "^1.0.0-alpha.21",
     "@types/formidable": "^3.4.5",
     "accepts": "^1.3.8",
     "base64-stream": "^1.0.0",
@@ -44,12 +46,15 @@
     "encodeurl": "^2.0.0",
     "formidable": "^3.5.1",
     "fresh": "^0.5.2",
+    "iconv-lite": "^0.6.3",
     "mime-types": "^2.1.35",
-    "power-tasks": "^1.7.3",
+    "power-tasks": "^1.7.4",
     "putil-isplainobject": "^1.1.5",
+    "putil-merge": "^3.12.1",
     "putil-varhelpers": "^1.6.5",
     "range-parser": "^1.2.1",
     "raw-body": "^2.5.2",
+    "reflect-metadata": "^0.2.2",
     "strict-typed-events": "^2.3.3",
     "vary": "^1.1.2"
   },
@@ -76,8 +81,9 @@
     "cookie-parser": "^1.4.6",
     "crypto-browserify": "^3.12.0",
     "express": "^4.19.2",
-    "fastify": "^4.27.0",
+    "fastify": "^4.28.1",
     "path-browserify": "^1.0.1",
+    "supertest": "^7.0.0",
     "ts-gems": "^3.4.0"
   },
   "type": "module",

package/types/augmentation/18n.augmentation.d.ts

@@ -1,4 +1,3 @@
-import { FallbackLng, LanguageResource } from '@opra/common';
 declare module '@opra/common' {
     interface I18n {
         loadResourceDir(dirnames: string | string[], deep?: boolean, overwrite?: boolean): Promise<void>;
@@ -35,3 +34,4 @@ declare module '@opra/common' {
         }
     }
 }
+export {};

package/types/execution-context.d.ts

@@ -1,5 +1,5 @@
-import { AsyncEventEmitter } from 'strict-typed-events';
 import { ApiDocument, OpraSchema } from '@opra/common';
+import { AsyncEventEmitter } from 'strict-typed-events';
 /**
  * @namespace ExecutionContext
  */
@@ -8,7 +8,6 @@ export declare namespace ExecutionContext {
         document: ApiDocument;
         protocol: OpraSchema.Protocol;
         platform: string;
-        platformArgs: any;
     }
     type OnFinishListener = (error: Error | undefined, context: ExecutionContext) => void | Promise<void>;
 }
@@ -19,7 +18,6 @@ export declare abstract class ExecutionContext extends AsyncEventEmitter {
     readonly document: ApiDocument;
     readonly protocol: OpraSchema.Protocol;
     readonly platform: string;
-    readonly platformArgs: any;
     protected constructor(init: ExecutionContext.Initiator);
     addListener(event: 'finish', listener: ExecutionContext.OnFinishListener): this;
     removeListener(event: 'finish', listener: ExecutionContext.OnFinishListener): this;

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

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

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

@@ -2,8 +2,8 @@ import { HttpController, HttpMediaType, HttpOperation, OpraSchema } from '@opra/
 import { ExecutionContext } from '../execution-context.js';
 import type { HttpAdapter } from './http-adapter';
 import { MultipartReader } from './impl/multipart-reader.js';
-import type { HttpIncoming } from './interfaces/http-incoming.interface';
-import type { HttpOutgoing } from './interfaces/http-outgoing.interface';
+import type { HttpIncoming } from './interfaces/http-incoming.interface.js';
+import type { HttpOutgoing } from './interfaces/http-outgoing.interface.js';
 export declare namespace HttpContext {
     interface Initiator extends Omit<ExecutionContext.Initiator, 'document' | 'protocol'> {
         adapter: HttpAdapter;

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

@@ -1,6 +1,5 @@
-/// <reference types="node" />
 import parseRange from 'range-parser';
-import type { HttpIncoming } from '../interfaces/http-incoming.interface';
+import type { HttpIncoming } from '../interfaces/http-incoming.interface.js';
 import { BodyReader } from '../utils/body-reader.js';
 export interface HttpIncomingHost extends HttpIncoming {
 }

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

@@ -1,4 +1,4 @@
-import type { CookieOptions, HttpOutgoing } from '../interfaces/http-outgoing.interface';
+import type { CookieOptions, HttpOutgoing } from '../interfaces/http-outgoing.interface.js';
 export interface HttpOutgoingHost extends HttpOutgoing {
 }
 export declare class HttpOutgoingHost {

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { EventEmitter } from 'events';
 import formidable from 'formidable';
 import type IncomingForm from 'formidable/Formidable.js';

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

@@ -1,11 +1,7 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
+import { HTTPParserJS } from '@browsery/http-parser';
 import { IncomingHttpHeaders } from 'http';
 import { Duplex, Readable } from 'stream';
-import { HTTPParserJS } from '@browsery/http-parser';
-import type { NodeIncomingMessage } from '../interfaces/node-incoming-message.interface';
+import type { NodeIncomingMessage } from '../interfaces/node-incoming-message.interface.js';
 export declare const CRLF: Buffer;
 export declare const kHeaders: unique symbol;
 export declare const kHeadersDistinct: unique symbol;

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

@@ -1,10 +1,7 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 import { OutgoingHttpHeaders } from 'http';
 import { Duplex } from 'stream';
-import type { NodeIncomingMessage } from '../interfaces/node-incoming-message.interface';
-import type { NodeOutgoingMessage } from '../interfaces/node-outgoing-message.interface';
+import type { NodeIncomingMessage } from '../interfaces/node-incoming-message.interface.js';
+import type { NodeOutgoingMessage } from '../interfaces/node-outgoing-message.interface.js';
 export declare const kOutHeaders: unique symbol;
 export declare const kOutTrailers: unique symbol;
 declare global {

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

@@ -1,7 +1,6 @@
-/// <reference types="node" />
 import { 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';
+import type { HttpOutgoing } from './http-outgoing.interface.js';
 import { NodeIncomingMessage } from './node-incoming-message.interface.js';
 /**
  * @interface HttpIncoming

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

@@ -1,5 +1,5 @@
 import { StrictOmit } from 'ts-gems';
-import type { HttpIncoming } from './http-incoming.interface';
+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'> {
     req: HttpIncoming;

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

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import http from 'http';
 import { Readable } from 'stream';
 /**

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

@@ -1,5 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import http, { OutgoingHttpHeaders } from 'http';
 import { Writable } from 'stream';
 import { NodeIncomingMessage } from './node-incoming-message.interface.js';

package/types/http/utils/body-reader.d.ts

@@ -1,8 +1,5 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-import { EventEmitter } from 'events';
 import nodeStream from 'node:stream';
+import { EventEmitter } from 'events';
 import type { HttpIncoming } from '../interfaces/http-incoming.interface.js';
 /**
  *

package/types/http/utils/concat-readable.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="node" />
 import { Readable } from 'stream';
 export declare function concatReadable(...streams: Readable[]): Readable;

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

@@ -1,3 +1,2 @@
-/// <reference types="node" />
 import { IncomingHttpHeaders } from 'http';
 export declare function convertToRawHeaders(src: IncomingHttpHeaders | Record<string, any>): string[];

package/types/index.d.ts

@@ -6,20 +6,20 @@ import * as HttpOutgoingHost_ from './http/impl/http-outgoing.host.js';
 import * as NodeIncomingMessageHost_ from './http/impl/node-incoming-message.host.js';
 import * as NodeOutgoingMessageHost_ from './http/impl/node-outgoing-message.host.js';
 export * from './execution-context.js';
-export * from './platform-adapter.js';
-export * from './type-guards.js';
 export * from './helpers/logger.js';
 export * from './helpers/service-base.js';
 export * from './http/express-adapter.js';
 export * from './http/http-adapter.js';
 export * from './http/http-context.js';
+export * from './http/impl/multipart-reader.js';
 export * from './http/interfaces/http-incoming.interface.js';
 export * from './http/interfaces/http-outgoing.interface.js';
 export * from './http/interfaces/node-incoming-message.interface.js';
 export * from './http/interfaces/node-outgoing-message.interface.js';
-export * from './http/impl/multipart-reader.js';
 export * from './http/utils/wrap-exception.js';
 export * from './interfaces/logger.interface.js';
+export * from './platform-adapter.js';
+export * from './type-guards.js';
 export declare namespace classes {
     export import HttpIncomingHost = HttpIncomingHost_.HttpIncomingHost;
     export import HttpOutgoingHost = HttpOutgoingHost_.HttpOutgoingHost;

package/types/platform-adapter.d.ts

@@ -1,10 +1,10 @@
 import './augmentation/18n.augmentation.js';
-import { AsyncEventEmitter } from 'strict-typed-events';
 import { ApiDocument, I18n, OpraSchema } from '@opra/common';
+import { AsyncEventEmitter } from 'strict-typed-events';
 import { kAssetCache } from './constants.js';
 import { Logger } from './helpers/logger.js';
 import { AssetCache } from './http/impl/asset-cache.js';
-import type { ILogger } from './interfaces/logger.interface';
+import type { ILogger } from './interfaces/logger.interface.js';
 /**
  * @namespace PlatformAdapter
  */