@opra/testing 0.4.0 → 0.6.0

package/cjs/api-expect/api-expect-collection.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertFilter = exports.ApiExpectCollection = void 0;
 const tslib_1 = require("tslib");
-const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const lodash_1 = require("lodash");
 const rule_judgment_1 = tslib_1.__importDefault(require("rule-judgment"));
-const url_1 = require("@opra/url");
+const common_1 = require("@opra/common");
 class ApiExpectCollection {
     response;
     _isNot;
@@ -21,7 +21,7 @@ class ApiExpectCollection {
     }
     toMatch(expected) {
         try {
-            const v = lodash_1.default.omitBy(expected, lodash_1.default.isNil);
+            const v = (0, lodash_1.omitBy)(expected, lodash_1.isNil);
             for (const item of this.response.data) {
                 this._expect(item).toMatchObject(v);
             }
@@ -133,10 +133,10 @@ class ApiExpectCollection {
 }
 exports.ApiExpectCollection = ApiExpectCollection;
 function convertFilter(str) {
-    const ast = typeof str === 'string' ? (0, url_1.$parse)(str) : str;
+    const ast = typeof str === 'string' ? (0, common_1.parseFilter)(str) : str;
     if (!ast)
         return;
-    if (ast instanceof url_1.ComparisonExpression) {
+    if (ast instanceof common_1.ComparisonExpression) {
         const left = convertFilter(ast.left);
         const right = convertFilter(ast.right);
         switch (ast.op) {
@@ -160,29 +160,29 @@ function convertFilter(str) {
                 throw new Error(`ComparisonExpression operator (${ast.op}) not implemented yet`);
         }
     }
-    if (ast instanceof url_1.QualifiedIdentifier) {
+    if (ast instanceof common_1.QualifiedIdentifier) {
         return ast.value;
     }
-    if (ast instanceof url_1.NumberLiteral ||
-        ast instanceof url_1.StringLiteral ||
-        ast instanceof url_1.BooleanLiteral ||
-        ast instanceof url_1.NullLiteral ||
-        ast instanceof url_1.DateLiteral ||
-        ast instanceof url_1.TimeLiteral) {
+    if (ast instanceof common_1.NumberLiteral ||
+        ast instanceof common_1.StringLiteral ||
+        ast instanceof common_1.BooleanLiteral ||
+        ast instanceof common_1.NullLiteral ||
+        ast instanceof common_1.DateLiteral ||
+        ast instanceof common_1.TimeLiteral) {
         return ast.value;
     }
-    if (ast instanceof url_1.ArrayExpression) {
+    if (ast instanceof common_1.ArrayExpression) {
         return ast.items.map(convertFilter);
     }
-    if (ast instanceof url_1.LogicalExpression) {
+    if (ast instanceof common_1.LogicalExpression) {
         if (ast.op === 'or')
             return { $or: ast.items.map(convertFilter) };
         return { $and: ast.items.map(convertFilter) };
     }
-    if (ast instanceof url_1.ArrayExpression) {
+    if (ast instanceof common_1.ArrayExpression) {
         return ast.items.map(convertFilter);
     }
-    if (ast instanceof url_1.ParenthesesExpression) {
+    if (ast instanceof common_1.ParenthesesExpression) {
         return convertFilter(ast.expression);
     }
     throw new Error(`${ast.kind} is not implemented yet`);

package/cjs/api-expect/api-expect-object.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiExpectObject = void 0;
-const tslib_1 = require("tslib");
-const lodash_1 = tslib_1.__importDefault(require("lodash"));
+const lodash_1 = require("lodash");
 class ApiExpectObject {
     response;
     _isNot;
@@ -15,7 +14,7 @@ class ApiExpectObject {
     }
     toMatch(expected) {
         try {
-            const v = lodash_1.default.omitBy(expected, lodash_1.default.isNil);
+            const v = (0, lodash_1.omitBy)(expected, lodash_1.isNil);
             this._expect(this.response.data).toMatchObject(v);
         }
         catch (e) {

package/cjs/api-expect/api-expect.js

@@ -73,6 +73,7 @@ class ApiExpect {
         try {
             msg = '"body" is empty';
             expect(this.response.data).toBeDefined();
+            expect(typeof this.response.data).toStrictEqual('object');
         }
         catch (e) {
             if (msg)

package/cjs/test-client.js

@@ -1,32 +1,57 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpraTestClient = void 0;
-const tslib_1 = require("tslib");
-const axiosist = tslib_1.__importStar(require("axiosist"));
+const http_1 = require("http");
+const url_1 = require("url");
 const client_1 = require("@opra/client");
+const common_1 = require("@opra/common");
 const api_expect_js_1 = require("./api-expect/api-expect.js");
-class OpraTestClient extends client_1.OpraClient {
-    // @ts-ignore
-    collection(name) {
-        return super.collection(name);
+const is_absolute_url_util_js_1 = require("./utils/is-absolute-url.util.js");
+class OpraTestClient extends client_1.OpraHttpClient {
+    _server;
+    constructor(app, options) {
+        super('/', options);
+        this._server = app instanceof http_1.Server ? app : (0, http_1.createServer)(app);
     }
     // @ts-ignore
-    singleton(name) {
-        return super.singleton(name);
-    }
-    async _send(req, options) {
-        const resp = (await super._send(req, options));
+    async _fetch(urlString, req) {
+        const resp = await new Promise((resolve, reject) => {
+            urlString = (0, is_absolute_url_util_js_1.isAbsoluteUrl)(urlString) ? urlString : (0, common_1.joinPath)('http://opra.test', urlString);
+            const url = new url_1.URL(urlString);
+            // Set protocol to HTTP
+            url.protocol = 'http';
+            // Apply original host to request header
+            const headers = req.headers = (req.headers || {});
+            if (url.host !== 'opra.test' && headers?.host == null)
+                headers.host = url.host;
+            new Promise((subResolve) => {
+                if (this._server.listening)
+                    subResolve();
+                else
+                    this._server.listen(0, '127.0.0.1', () => subResolve());
+            }).then(() => {
+                const address = this._server.address();
+                url.host = '127.0.0.1';
+                url.port = address.port.toString();
+                return super._fetch(url.toString(), req);
+            }).then(res => {
+                if (!this._server.listening)
+                    return resolve(res);
+                this._server.close(() => resolve(res));
+            }).then()
+                .catch(error => {
+                if (!this._server.listening)
+                    return reject(error);
+                this._server.close(() => reject(error));
+            });
+        });
         resp.expect = new api_expect_js_1.ApiExpect(resp);
         return resp;
     }
     static async create(app, options) {
-        const instance = await super.create('/', {
-            validateStatus: false,
-            ...options,
-            adapter: axiosist.createAdapter(app)
-        });
-        Object.setPrototypeOf(instance, OpraTestClient.prototype);
-        return instance;
+        const client = new this(app, options);
+        await client.init();
+        return client;
     }
 }
 exports.OpraTestClient = OpraTestClient;

package/cjs/utils/is-absolute-url.util.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isAbsoluteUrl = void 0;
+const url_1 = require("url");
+const isAbsoluteUrl = (urlString) => {
+    const url = new url_1.URL(urlString, 'http://opra.test/');
+    return url.host !== 'opra.test';
+};
+exports.isAbsoluteUrl = isAbsoluteUrl;

package/esm/api-expect/api-expect-collection.d.ts

@@ -1,9 +1,9 @@
-import { OpraResponse } from '@opra/client';
-import { Expression } from '@opra/url';
+import { HttpResponse } from '@opra/client';
+import { Expression } from '@opra/common';
 export declare class ApiExpectCollection {
-    readonly response: OpraResponse;
+    readonly response: HttpResponse;
     protected _isNot: boolean;
-    constructor(response: OpraResponse, _isNot?: boolean);
+    constructor(response: HttpResponse, _isNot?: boolean);
     get not(): ApiExpectCollection;
     forEach(callbackfn: (v: any) => void): this;
     toMatch<T extends {}>(expected: T): this;

package/esm/api-expect/api-expect-collection.js

@@ -1,6 +1,6 @@
-import _ from 'lodash';
+import { isNil, omitBy } from 'lodash';
 import ruleJudgment from 'rule-judgment';
-import { $parse, ArrayExpression, BooleanLiteral, ComparisonExpression, DateLiteral, LogicalExpression, NullLiteral, NumberLiteral, ParenthesesExpression, QualifiedIdentifier, StringLiteral, TimeLiteral } from '@opra/url';
+import { ArrayExpression, BooleanLiteral, ComparisonExpression, DateLiteral, LogicalExpression, NullLiteral, NumberLiteral, ParenthesesExpression, parseFilter, QualifiedIdentifier, StringLiteral, TimeLiteral } from '@opra/common';
 export class ApiExpectCollection {
     response;
     _isNot;
@@ -17,7 +17,7 @@ export class ApiExpectCollection {
     }
     toMatch(expected) {
         try {
-            const v = _.omitBy(expected, _.isNil);
+            const v = omitBy(expected, isNil);
             for (const item of this.response.data) {
                 this._expect(item).toMatchObject(v);
             }
@@ -128,7 +128,7 @@ export class ApiExpectCollection {
     }
 }
 export function convertFilter(str) {
-    const ast = typeof str === 'string' ? $parse(str) : str;
+    const ast = typeof str === 'string' ? parseFilter(str) : str;
     if (!ast)
         return;
     if (ast instanceof ComparisonExpression) {

package/esm/api-expect/api-expect-error.d.ts

@@ -1,8 +1,8 @@
-import { OpraResponse } from '@opra/client';
+import { HttpResponse } from '@opra/client';
 import { ApiExpectObject } from './api-expect-object.js';
 export declare class ApiExpectError extends ApiExpectObject {
-    readonly response: OpraResponse;
-    constructor(response: OpraResponse);
+    readonly response: HttpResponse;
+    constructor(response: HttpResponse);
     toContainDetail(...matching: any[]): void;
 }
 declare global {

package/esm/api-expect/api-expect-object.d.ts

@@ -1,8 +1,8 @@
-import { OpraResponse } from '@opra/client';
+import { HttpResponse } from '@opra/client';
 export declare class ApiExpectObject {
-    readonly response: OpraResponse;
+    readonly response: HttpResponse;
     protected _isNot: boolean;
-    constructor(response: OpraResponse, _isNot?: boolean);
+    constructor(response: HttpResponse, _isNot?: boolean);
     get not(): ApiExpectObject;
     toMatch<T extends {}>(expected: T): this;
     toHaveFields(fields: string[]): this;

package/esm/api-expect/api-expect-object.js

@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import { isNil, omitBy } from 'lodash';
 export class ApiExpectObject {
     response;
     _isNot;
@@ -11,7 +11,7 @@ export class ApiExpectObject {
     }
     toMatch(expected) {
         try {
-            const v = _.omitBy(expected, _.isNil);
+            const v = omitBy(expected, isNil);
             this._expect(this.response.data).toMatchObject(v);
         }
         catch (e) {

package/esm/api-expect/api-expect-operation-result.d.ts

@@ -1,8 +1,8 @@
-import { OpraResponse } from '@opra/client';
+import { HttpResponse } from '@opra/client';
 export declare class ApiExpectOperationResult {
-    readonly response: OpraResponse;
+    readonly response: HttpResponse;
     protected _isNot: boolean;
-    constructor(response: OpraResponse, _isNot?: boolean);
+    constructor(response: HttpResponse, _isNot?: boolean);
     get not(): ApiExpectOperationResult;
     toBeAffectedExact(expected: number): this;
     toBeAffectedMin(expected: number): this;

package/esm/api-expect/api-expect.d.ts

@@ -1,12 +1,12 @@
-import { OpraResponse } from '@opra/client';
+import { HttpResponse } from '@opra/client';
 import { ApiExpectCollection } from './api-expect-collection.js';
 import { ApiExpectError } from './api-expect-error.js';
 import { ApiExpectObject } from './api-expect-object.js';
 import { ApiExpectOperationResult } from './api-expect-operation-result.js';
 export declare class ApiExpect {
-    readonly response: OpraResponse;
+    readonly response: HttpResponse;
     protected _isNot: boolean;
-    constructor(response: OpraResponse, _isNot?: boolean);
+    constructor(response: HttpResponse, _isNot?: boolean);
     get not(): ApiExpect;
     toSuccess(status?: number): this;
     toFail(status?: number): ApiExpectError;

package/esm/api-expect/api-expect.js

@@ -70,6 +70,7 @@ export class ApiExpect {
         try {
             msg = '"body" is empty';
             expect(this.response.data).toBeDefined();
+            expect(typeof this.response.data).toStrictEqual('object');
         }
         catch (e) {
             if (msg)

package/esm/test-client.d.ts

@@ -1,18 +1,20 @@
 /// <reference types="node" />
-import { AxiosRequestConfig } from 'axios';
 import { IncomingMessage, Server, ServerResponse } from 'http';
-import { CollectionService, CommonRequestOptions, OpraClient, OpraClientOptions, OpraResponse } from '@opra/client';
-import { SingletonService } from '@opra/client/src/services/singleton-service';
+import { Type } from 'ts-gems';
+import { BatchRequest, HttpCollectionService, HttpRequest, HttpResponse, HttpSingletonService, OpraHttpClient, OpraHttpClientOptions } from '@opra/client';
 import { ApiExpect } from './api-expect/api-expect.js';
 declare type RequestListener = (req: IncomingMessage, res: ServerResponse) => void;
 declare type Handler = RequestListener | Server;
-declare type OpraTestResponse<T = any> = OpraResponse<T> & {
+export declare type TestHttpResponse<T = any> = HttpResponse<T> & {
     expect: ApiExpect;
 };
-export declare class OpraTestClient extends OpraClient {
-    collection<T = any, TResponse extends OpraTestResponse<T> = OpraTestResponse<T>>(name: string): CollectionService<T, TResponse>;
-    singleton<T = any, TResponse extends OpraTestResponse<T> = OpraTestResponse<T>>(name: string): SingletonService<T, TResponse>;
-    protected _send(req: AxiosRequestConfig, options: CommonRequestOptions): Promise<OpraTestResponse>;
-    static create(app: Handler, options?: OpraClientOptions): Promise<OpraTestClient>;
+export declare class OpraTestClient extends OpraHttpClient {
+    protected _server: Server;
+    constructor(app: Server | RequestListener, options?: OpraHttpClientOptions);
+    batch<TResponse extends TestHttpResponse = TestHttpResponse>(requests: HttpRequest[]): BatchRequest<TResponse>;
+    collection<T = any, TResponse extends TestHttpResponse<T> = TestHttpResponse<T>>(name: string): HttpCollectionService<T, TResponse>;
+    singleton<T = any, TResponse extends TestHttpResponse<T> = TestHttpResponse<T>>(name: string): HttpSingletonService<T, TResponse>;
+    protected _fetch<TResponse extends TestHttpResponse = TestHttpResponse>(urlString: string, req: RequestInit): Promise<TResponse>;
+    static create<T extends OpraTestClient>(this: Type<T>, app: Handler, options?: OpraHttpClientOptions): Promise<T>;
 }
 export {};

package/esm/test-client.js

@@ -1,27 +1,53 @@
-import * as axiosist from 'axiosist';
-import { OpraClient } from '@opra/client';
+import { createServer, Server } from 'http';
+import { URL } from 'url';
+import { OpraHttpClient, } from '@opra/client';
+import { joinPath } from '@opra/common';
 import { ApiExpect } from './api-expect/api-expect.js';
-export class OpraTestClient extends OpraClient {
-    // @ts-ignore
-    collection(name) {
-        return super.collection(name);
+import { isAbsoluteUrl } from './utils/is-absolute-url.util.js';
+export class OpraTestClient extends OpraHttpClient {
+    _server;
+    constructor(app, options) {
+        super('/', options);
+        this._server = app instanceof Server ? app : createServer(app);
     }
     // @ts-ignore
-    singleton(name) {
-        return super.singleton(name);
-    }
-    async _send(req, options) {
-        const resp = (await super._send(req, options));
+    async _fetch(urlString, req) {
+        const resp = await new Promise((resolve, reject) => {
+            urlString = isAbsoluteUrl(urlString) ? urlString : joinPath('http://opra.test', urlString);
+            const url = new URL(urlString);
+            // Set protocol to HTTP
+            url.protocol = 'http';
+            // Apply original host to request header
+            const headers = req.headers = (req.headers || {});
+            if (url.host !== 'opra.test' && headers?.host == null)
+                headers.host = url.host;
+            new Promise((subResolve) => {
+                if (this._server.listening)
+                    subResolve();
+                else
+                    this._server.listen(0, '127.0.0.1', () => subResolve());
+            }).then(() => {
+                const address = this._server.address();
+                url.host = '127.0.0.1';
+                url.port = address.port.toString();
+                return super._fetch(url.toString(), req);
+            }).then(res => {
+                if (!this._server.listening)
+                    return resolve(res);
+                this._server.close(() => resolve(res));
+            }).then()
+                .catch(error => {
+                if (!this._server.listening)
+                    return reject(error);
+                this._server.close(() => reject(error));
+            });
+        });
         resp.expect = new ApiExpect(resp);
         return resp;
     }
     static async create(app, options) {
-        const instance = await super.create('/', {
-            validateStatus: false,
-            ...options,
-            adapter: axiosist.createAdapter(app)
-        });
-        Object.setPrototypeOf(instance, OpraTestClient.prototype);
-        return instance;
+        const client = new this(app, options);
+        await client.init();
+        return client;
     }
 }

package/esm/utils/is-absolute-url.util.d.ts

@@ -0,0 +1 @@
+export declare const isAbsoluteUrl: (urlString: string) => boolean;

package/esm/utils/is-absolute-url.util.js

@@ -0,0 +1,5 @@
+import { URL } from 'url';
+export const isAbsoluteUrl = (urlString) => {
+    const url = new URL(urlString, 'http://opra.test/');
+    return url.host !== 'opra.test';
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/testing",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "Opra testing package",
   "author": "Panates",
   "license": "MIT",
@@ -25,17 +25,18 @@
     "clean:cover": "rimraf ../../coverage/testing"
   },
   "dependencies": {
-    "@opra/schema": "^0.4.0",
-    "@opra/url": "^0.4.0",
-    "@opra/client": "^0.4.0",
+    "@opra/client": "^0.6.0",
+    "@opra/common": "^0.6.0",
     "ansi-colors": "^4.1.3",
     "lodash": "^4.17.21",
-    "rule-judgment": "^1.1.5",
-    "supertest": "^6.3.0"
+    "rule-judgment": "^1.1.5"
   },
   "devDependencies": {
     "@types/supertest": "^2.0.12"
   },
+  "peerDependencies": {
+    "axios": "^1.2.1"
+  },
   "type": "module",
   "types": "esm/index.d.ts",
   "exports": {

package/cjs/constants.js

@@ -1,4 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.expectSymbolTag = void 0;
-exports.expectSymbolTag = Symbol('opra.test.expect');

package/esm/constants.d.ts

@@ -1 +0,0 @@
-export declare const expectSymbolTag: unique symbol;

package/esm/constants.js

@@ -1 +0,0 @@
-export const expectSymbolTag = Symbol('opra.test.expect');