@opra/testing 0.14.0 → 0.16.0

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertFilter = exports.ApiExpectCollection = void 0;
 const tslib_1 = require("tslib");
+require("../jest-extend/index.js");
 const lodash_isnil_1 = tslib_1.__importDefault(require("lodash.isnil"));
 const lodash_omitby_1 = tslib_1.__importDefault(require("lodash.omitby"));
 const rule_judgment_1 = tslib_1.__importDefault(require("rule-judgment"));

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiExpectError = void 0;
 const tslib_1 = require("tslib");
+require("../jest-extend/index.js");
 const jest_matcher_utils_1 = tslib_1.__importDefault(require("jest-matcher-utils"));
 const object_matches_util_js_1 = require("../utils/object-matches.util.js");
 const api_expect_object_js_1 = require("./api-expect-object.js");

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiExpectObject = void 0;
 const tslib_1 = require("tslib");
+require("../jest-extend/index.js");
 const lodash_isnil_1 = tslib_1.__importDefault(require("lodash.isnil"));
 const lodash_omitby_1 = tslib_1.__importDefault(require("lodash.omitby"));
 class ApiExpectObject {

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiExpectOperationResult = void 0;
+require("../jest-extend/index.js");
 class ApiExpectOperationResult {
     constructor(response, _isNot = false) {
         this.response = response;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiExpect = void 0;
+require("../jest-extend/index.js");
 const api_expect_collection_js_1 = require("./api-expect-collection.js");
 const api_expect_error_js_1 = require("./api-expect-error.js");
 const api_expect_object_js_1 = require("./api-expect-object.js");
@@ -20,8 +21,10 @@ class ApiExpect {
             this._expect(this.response.status).toStrictEqual(status);
         }
         catch (e) {
+            const issues = this.response.body?.errors;
+            const issue = issues?.[0]?.message;
             if (msg)
-                e.message = msg + '\n\n' + e.message;
+                e.message = msg + '\n\n' + (issue || e.message);
             Error.captureStackTrace(e, this.toSuccess);
             throw e;
         }

package/cjs/index.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-require("./jest-extend/common.extend.js");
+require("./jest-extend/index.js");
 tslib_1.__exportStar(require("./test-client.js"), exports);

package/cjs/jest-extend/common.extend.js

@@ -10,7 +10,7 @@ expect.extend({
         const filteredKeys = expectedKeys.filter(x => !objectKeys.includes(x));
         const pass = !filteredKeys.length === !this.isNot;
         if (!pass) {
-            const message = () => `Expects keys to${this.isNot ? ' not' : ''} contain: ${ansi_colors_1.default.yellow('' + expectedKeys)}\n` +
+            const message = () => `Expects keys ${this.isNot ? 'not ' : ''}to contain: ${ansi_colors_1.default.yellow('' + expectedKeys)}\n` +
                 `${this.isNot ? 'Unsolicited' : 'Missing'} fields: ${ansi_colors_1.default.yellow('' + filteredKeys)}\n`;
             return { message, pass: !!this.isNot };
         }

package/cjs/jest-extend/index.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./common.extend.js"), exports);

package/cjs/test-client.js

@@ -7,11 +7,17 @@ const common_1 = require("@opra/common");
 const node_client_1 = require("@opra/node-client");
 const api_expect_js_1 = require("./api-expect/api-expect.js");
 const is_absolute_url_util_js_1 = require("./utils/is-absolute-url.util.js");
-class OpraTestClient extends node_client_1.OpraHttpClientBase {
+class OpraTestClient extends node_client_1.OpraHttpClient {
     constructor(app, options) {
         super('/', options);
         this._server = app instanceof http_1.Server ? app : (0, http_1.createServer)(app);
     }
+    collection(resourceName) {
+        return super.collection(resourceName);
+    }
+    singleton(resourceName) {
+        return super.singleton(resourceName);
+    }
     async _fetch(urlString, req = {}) {
         return new Promise((resolve, reject) => {
             urlString = (0, is_absolute_url_util_js_1.isAbsoluteUrl)(urlString) ? urlString : (0, common_1.joinPath)('http://opra.test', urlString);

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

@@ -1,10 +1,15 @@
-import isNil from 'lodash.isnil';
-import omitBy from 'lodash.omitby';
-import ruleJudgmentLib from 'rule-judgment';
-import { ArrayExpression, BooleanLiteral, ComparisonExpression, DateLiteral, LogicalExpression, NullLiteral, NumberLiteral, ParenthesesExpression, parseFilter, QualifiedIdentifier, StringLiteral, TimeLiteral } from '@opra/common';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertFilter = exports.ApiExpectCollection = void 0;
+const tslib_1 = require("tslib");
+require("../jest-extend/index.js");
+const lodash_isnil_1 = tslib_1.__importDefault(require("lodash.isnil"));
+const lodash_omitby_1 = tslib_1.__importDefault(require("lodash.omitby"));
+const rule_judgment_1 = tslib_1.__importDefault(require("rule-judgment"));
+const common_1 = require("@opra/common");
 // @ts-ignore
-const ruleJudgment = typeof ruleJudgmentLib === 'object' ? ruleJudgmentLib.default : ruleJudgmentLib;
-export class ApiExpectCollection {
+const ruleJudgment = typeof rule_judgment_1.default === 'object' ? rule_judgment_1.default.default : rule_judgment_1.default;
+class ApiExpectCollection {
     constructor(response, _isNot = false) {
         this.response = response;
         this._isNot = _isNot;
@@ -18,7 +23,7 @@ export class ApiExpectCollection {
     }
     toMatch(expected) {
         try {
-            const v = omitBy(expected, isNil);
+            const v = (0, lodash_omitby_1.default)(expected, lodash_isnil_1.default);
             for (const item of this.response.body) {
                 this._expect(item).toMatchObject(v);
             }
@@ -128,11 +133,12 @@ export class ApiExpectCollection {
         return out;
     }
 }
-export function convertFilter(str) {
-    const ast = typeof str === 'string' ? parseFilter(str) : str;
+exports.ApiExpectCollection = ApiExpectCollection;
+function convertFilter(str) {
+    const ast = typeof str === 'string' ? (0, common_1.parseFilter)(str) : str;
     if (!ast)
         return;
-    if (ast instanceof ComparisonExpression) {
+    if (ast instanceof common_1.ComparisonExpression) {
         const left = convertFilter(ast.left);
         const right = convertFilter(ast.right);
         switch (ast.op) {
@@ -156,30 +162,31 @@ export function convertFilter(str) {
                 throw new Error(`ComparisonExpression operator (${ast.op}) not implemented yet`);
         }
     }
-    if (ast instanceof QualifiedIdentifier) {
+    if (ast instanceof common_1.QualifiedIdentifier) {
         return ast.value;
     }
-    if (ast instanceof NumberLiteral ||
-        ast instanceof StringLiteral ||
-        ast instanceof BooleanLiteral ||
-        ast instanceof NullLiteral ||
-        ast instanceof DateLiteral ||
-        ast instanceof 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 ArrayExpression) {
+    if (ast instanceof common_1.ArrayExpression) {
         return ast.items.map(convertFilter);
     }
-    if (ast instanceof 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 ArrayExpression) {
+    if (ast instanceof common_1.ArrayExpression) {
         return ast.items.map(convertFilter);
     }
-    if (ast instanceof ParenthesesExpression) {
+    if (ast instanceof common_1.ParenthesesExpression) {
         return convertFilter(ast.expression);
     }
     throw new Error(`${ast.kind} is not implemented yet`);
 }
+exports.convertFilter = convertFilter;

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

@@ -1,7 +1,12 @@
-import matcherUtils from 'jest-matcher-utils';
-import { objectMatches } from '../utils/object-matches.util.js';
-import { ApiExpectObject } from './api-expect-object.js';
-export class ApiExpectError extends ApiExpectObject {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ApiExpectError = void 0;
+const tslib_1 = require("tslib");
+require("../jest-extend/index.js");
+const jest_matcher_utils_1 = tslib_1.__importDefault(require("jest-matcher-utils"));
+const object_matches_util_js_1 = require("../utils/object-matches.util.js");
+const api_expect_object_js_1 = require("./api-expect-object.js");
+class ApiExpectError extends api_expect_object_js_1.ApiExpectObject {
     constructor(response) {
         super(response);
         this.response = response;
@@ -18,6 +23,7 @@ export class ApiExpectError extends ApiExpectObject {
         }
     }
 }
+exports.ApiExpectError = ApiExpectError;
 expect.extend({
     apiErrorDetailToContain(received, issues) {
         try {
@@ -35,7 +41,7 @@ expect.extend({
             for (const detail of received) {
                 if (typeof m === 'object') {
                     try {
-                        objectMatches(detail, m);
+                        (0, object_matches_util_js_1.objectMatches)(detail, m);
                         matched = true;
                         break;
                     }
@@ -47,7 +53,7 @@ expect.extend({
             if (!matched) {
                 return {
                     pass: false,
-                    message: () => `Object does not match: \n` + matcherUtils.stringify(m)
+                    message: () => `Object does not match: \n` + jest_matcher_utils_1.default.stringify(m)
                 };
             }
         }

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

@@ -1,6 +1,11 @@
-import isNil from 'lodash.isnil';
-import omitBy from 'lodash.omitby';
-export class ApiExpectObject {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ApiExpectObject = void 0;
+const tslib_1 = require("tslib");
+require("../jest-extend/index.js");
+const lodash_isnil_1 = tslib_1.__importDefault(require("lodash.isnil"));
+const lodash_omitby_1 = tslib_1.__importDefault(require("lodash.omitby"));
+class ApiExpectObject {
     constructor(response, _isNot = false) {
         this.response = response;
         this._isNot = _isNot;
@@ -10,7 +15,7 @@ export class ApiExpectObject {
     }
     toMatch(expected) {
         try {
-            const v = omitBy(expected, isNil);
+            const v = (0, lodash_omitby_1.default)(expected, lodash_isnil_1.default);
             this._expect(this.response.body).toMatchObject(v);
         }
         catch (e) {
@@ -46,3 +51,4 @@ export class ApiExpectObject {
         return out;
     }
 }
+exports.ApiExpectObject = ApiExpectObject;

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

@@ -1,4 +1,8 @@
-export class ApiExpectOperationResult {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ApiExpectOperationResult = void 0;
+require("../jest-extend/index.js");
+class ApiExpectOperationResult {
     constructor(response, _isNot = false) {
         this.response = response;
         this._isNot = _isNot;
@@ -43,3 +47,4 @@ export class ApiExpectOperationResult {
         return out;
     }
 }
+exports.ApiExpectOperationResult = ApiExpectOperationResult;

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

@@ -1,8 +1,12 @@
-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 class ApiExpect {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ApiExpect = void 0;
+require("../jest-extend/index.js");
+const api_expect_collection_js_1 = require("./api-expect-collection.js");
+const api_expect_error_js_1 = require("./api-expect-error.js");
+const api_expect_object_js_1 = require("./api-expect-object.js");
+const api_expect_operation_result_js_1 = require("./api-expect-operation-result.js");
+class ApiExpect {
     constructor(response, _isNot = false) {
         this.response = response;
         this._isNot = _isNot;
@@ -17,8 +21,10 @@ export class ApiExpect {
             this._expect(this.response.status).toStrictEqual(status);
         }
         catch (e) {
+            const issues = this.response.body?.errors;
+            const issue = issues?.[0]?.message;
             if (msg)
-                e.message = msg + '\n\n' + e.message;
+                e.message = msg + '\n\n' + (issue || e.message);
             Error.captureStackTrace(e, this.toSuccess);
             throw e;
         }
@@ -45,7 +51,7 @@ export class ApiExpect {
             Error.captureStackTrace(e, this.toFail);
             throw e;
         }
-        return new ApiExpectError(this.response);
+        return new api_expect_error_js_1.ApiExpectError(this.response);
     }
     toReturnOperationResult() {
         let msg = '';
@@ -61,7 +67,7 @@ export class ApiExpect {
             Error.captureStackTrace(e, this.toReturnOperationResult);
             throw e;
         }
-        return new ApiExpectOperationResult(this.response);
+        return new api_expect_operation_result_js_1.ApiExpectOperationResult(this.response);
     }
     toReturnObject() {
         let msg = '';
@@ -76,7 +82,7 @@ export class ApiExpect {
             Error.captureStackTrace(e, this.toReturnObject);
             throw e;
         }
-        return new ApiExpectObject(this.response);
+        return new api_expect_object_js_1.ApiExpectObject(this.response);
     }
     toReturnCollection() {
         let msg = '';
@@ -92,7 +98,7 @@ export class ApiExpect {
             Error.captureStackTrace(e, this.toReturnCollection);
             throw e;
         }
-        return new ApiExpectCollection(this.response);
+        return new api_expect_collection_js_1.ApiExpectCollection(this.response);
     }
     _expect(expected) {
         const out = expect(expected);
@@ -101,3 +107,4 @@ export class ApiExpect {
         return out;
     }
 }
+exports.ApiExpect = ApiExpect;

package/esm/index.js

@@ -1,2 +1,5 @@
-import './jest-extend/common.extend.js';
-export * from './test-client.js';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+require("./jest-extend/index.js");
+tslib_1.__exportStar(require("./test-client.js"), exports);

package/esm/jest-extend/common.extend.js

@@ -1,5 +1,8 @@
-import colors from "ansi-colors";
-import { matcherHint, printExpected, printReceived } from 'jest-matcher-utils';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const ansi_colors_1 = tslib_1.__importDefault(require("ansi-colors"));
+const jest_matcher_utils_1 = require("jest-matcher-utils");
 expect.extend({
     toHaveFields(received, expected) {
         const expectedKeys = (Array.isArray(expected) ? expected : Object.keys(expected)).map(x => x.toLowerCase());
@@ -7,8 +10,8 @@ expect.extend({
         const filteredKeys = expectedKeys.filter(x => !objectKeys.includes(x));
         const pass = !filteredKeys.length === !this.isNot;
         if (!pass) {
-            const message = () => `Expects keys to${this.isNot ? ' not' : ''} contain: ${colors.yellow('' + expectedKeys)}\n` +
-                `${this.isNot ? 'Unsolicited' : 'Missing'} fields: ${colors.yellow('' + filteredKeys)}\n`;
+            const message = () => `Expects keys ${this.isNot ? 'not ' : ''}to contain: ${ansi_colors_1.default.yellow('' + expectedKeys)}\n` +
+                `${this.isNot ? 'Unsolicited' : 'Missing'} fields: ${ansi_colors_1.default.yellow('' + filteredKeys)}\n`;
             return { message, pass: !!this.isNot };
         }
         return { actual: received, pass: !this.isNot, message: () => '' };
@@ -19,8 +22,8 @@ expect.extend({
         const filteredKeys = objectKeys.filter(x => !expectedKeys.includes(x));
         const pass = !filteredKeys.length === !this.isNot;
         if (!pass) {
-            const message = () => `${!this.isNot ? 'Do not expects' : 'Expects'} additional keys other than: ${colors.yellow('' + expectedKeys)}\n` +
-                (filteredKeys ? `Additional keys received: ${colors.yellow('' + filteredKeys)}\n` :
+            const message = () => `${!this.isNot ? 'Do not expects' : 'Expects'} additional keys other than: ${ansi_colors_1.default.yellow('' + expectedKeys)}\n` +
+                (filteredKeys ? `Additional keys received: ${ansi_colors_1.default.yellow('' + filteredKeys)}\n` :
                     'No additional keys received\n');
             return { message, pass };
         }
@@ -121,9 +124,9 @@ expect.extend({
 });
 function compare(matcherName, options, received, expected, operator, fn) {
     const pass = fn(received, expected);
-    const message = () => matcherHint(matcherName, undefined, undefined, options) +
+    const message = () => (0, jest_matcher_utils_1.matcherHint)(matcherName, undefined, undefined, options) +
         '\n\n' +
-        `Expected:${options.isNot ? ' not' : ''} ${operator} ${printExpected(expected)}\n` +
-        `Received:${options.isNot ? '    ' : ''}   ${printReceived(received)}`;
+        `Expected:${options.isNot ? ' not' : ''} ${operator} ${(0, jest_matcher_utils_1.printExpected)(expected)}\n` +
+        `Received:${options.isNot ? '    ' : ''}   ${(0, jest_matcher_utils_1.printReceived)(received)}`;
     return { message, pass };
 }

package/esm/jest-extend/index.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./common.extend.js"), exports);

package/esm/test-client.js

@@ -1,20 +1,27 @@
-import { createServer, Server } from 'http';
-import { URL } from 'url';
-import { joinPath } from '@opra/common';
-import { 
-// BatchRequest,
-OpraHttpClientBase, } from '@opra/node-client';
-import { ApiExpect } from './api-expect/api-expect.js';
-import { isAbsoluteUrl } from './utils/is-absolute-url.util.js';
-export class OpraTestClient extends OpraHttpClientBase {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OpraTestClient = void 0;
+const http_1 = require("http");
+const url_1 = require("url");
+const common_1 = require("@opra/common");
+const node_client_1 = require("@opra/node-client");
+const api_expect_js_1 = require("./api-expect/api-expect.js");
+const is_absolute_url_util_js_1 = require("./utils/is-absolute-url.util.js");
+class OpraTestClient extends node_client_1.OpraHttpClient {
     constructor(app, options) {
         super('/', options);
-        this._server = app instanceof Server ? app : createServer(app);
+        this._server = app instanceof http_1.Server ? app : (0, http_1.createServer)(app);
+    }
+    collection(resourceName) {
+        return super.collection(resourceName);
+    }
+    singleton(resourceName) {
+        return super.singleton(resourceName);
     }
     async _fetch(urlString, req = {}) {
         return new Promise((resolve, reject) => {
-            urlString = isAbsoluteUrl(urlString) ? urlString : joinPath('http://opra.test', urlString);
-            const url = new URL(urlString);
+            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
@@ -49,7 +56,8 @@ export class OpraTestClient extends OpraHttpClientBase {
     }
     _createResponse(init) {
         const resp = super._createResponse(init);
-        resp.expect = new ApiExpect(resp);
+        resp.expect = new api_expect_js_1.ApiExpect(resp);
         return resp;
     }
 }
+exports.OpraTestClient = OpraTestClient;

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

@@ -1,5 +1,9 @@
-import { URL } from 'url';
-export const isAbsoluteUrl = (urlString) => {
-    const url = new URL(urlString, 'http://opra.test/');
+"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/utils/object-matches.util.js

@@ -1,6 +1,10 @@
-export function objectMatches(received, expected) {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.objectMatches = void 0;
+function objectMatches(received, expected) {
     _objectMatches(received, expected, '');
 }
+exports.objectMatches = objectMatches;
 function _objectMatches(received, expected, path) {
     if (typeof received !== typeof expected)
         expect(typeof received).toStrictEqual('object');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/testing",
-  "version": "0.14.0",
+  "version": "0.16.0",
   "description": "Opra testing package",
   "author": "Panates",
   "license": "MIT",
@@ -17,16 +17,16 @@
     "build:esm": "tsc -b tsconfig-build-esm.json",
     "postbuild": "cp README.md package.json ../../LICENSE ../../build/testing && cp ../../package.cjs.json ../../build/testing/cjs/package.json",
     "lint": "eslint .",
-    "test": "NODE_OPTIONS=--experimental-vm-modules npx jest",
-    "cover": "NODE_OPTIONS=--experimental-vm-modules npx jest --collect-coverage",
+    "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/testing",
     "clean:cover": "rimraf ../../coverage/testing"
   },
   "dependencies": {
-    "@opra/common": "^0.14.0",
-    "@opra/node-client": "^0.14.0",
+    "@opra/common": "^0.16.0",
+    "@opra/node-client": "^0.16.0",
     "ansi-colors": "^4.1.3",
     "lodash.isnil": "^4.0.0",
     "lodash.omitby": "^4.6.0",
@@ -36,7 +36,7 @@
     "@types/supertest": "^2.0.12"
   },
   "type": "module",
-  "types": "esm/index.d.ts",
+  "types": "types/index.d.ts",
   "exports": {
     ".": {
       "require": "./cjs/index.js",
@@ -53,6 +53,7 @@
     "bin/",
     "cjs/",
     "esm/",
+    "types/",
     "LICENSE",
     "README.md"
   ],

package/{esm → types}/api-expect/api-expect-collection.d.ts

@@ -1,4 +1,6 @@
-import { Expression, HttpResponse } from '@opra/common';
+import '../jest-extend/index.js';
+import { Expression } from '@opra/common';
+import { HttpResponse } from '@opra/node-client';
 export declare class ApiExpectCollection {
     readonly response: HttpResponse;
     protected _isNot: boolean;

package/{esm → types}/api-expect/api-expect-error.d.ts

@@ -1,4 +1,5 @@
-import { HttpResponse } from '@opra/common';
+import '../jest-extend/index.js';
+import { HttpResponse } from '@opra/node-client';
 import { ApiExpectObject } from './api-expect-object.js';
 export declare class ApiExpectError extends ApiExpectObject {
     readonly response: HttpResponse;

package/{esm → types}/api-expect/api-expect-object.d.ts

@@ -1,4 +1,5 @@
-import { HttpResponse } from '@opra/common';
+import '../jest-extend/index.js';
+import { HttpResponse } from '@opra/node-client';
 export declare class ApiExpectObject {
     readonly response: HttpResponse;
     protected _isNot: boolean;

package/{esm → types}/api-expect/api-expect-operation-result.d.ts

@@ -1,4 +1,5 @@
-import { HttpResponse } from '@opra/common';
+import '../jest-extend/index.js';
+import { HttpResponse } from '@opra/node-client';
 export declare class ApiExpectOperationResult {
     readonly response: HttpResponse;
     protected _isNot: boolean;

package/{esm → types}/api-expect/api-expect.d.ts

@@ -1,4 +1,5 @@
-import { HttpResponse } from '@opra/common';
+import '../jest-extend/index.js';
+import { HttpResponse } from '@opra/node-client';
 import { ApiExpectCollection } from './api-expect-collection.js';
 import { ApiExpectError } from './api-expect-error.js';
 import { ApiExpectObject } from './api-expect-object.js';

package/types/index.d.ts

@@ -0,0 +1,2 @@
+import './jest-extend/index.js';
+export * from './test-client.js';

package/types/jest-extend/index.d.ts

@@ -0,0 +1 @@
+export * from './common.extend.js';

package/types/test-client.d.ts

@@ -0,0 +1,18 @@
+/// <reference types="node" />
+import { IncomingMessage, Server, ServerResponse } from 'http';
+import { Type } from 'ts-gems';
+import { HttpCollectionNode, HttpResponse, HttpSingletonNode, OpraHttpClient, OpraHttpClientOptions } from '@opra/node-client';
+import { ApiExpect } from './api-expect/api-expect.js';
+declare type RequestListener = (req: IncomingMessage, res: ServerResponse) => void;
+export type ResponseExt = {
+    expect: ApiExpect;
+};
+export declare class OpraTestClient extends OpraHttpClient {
+    protected _server: Server;
+    constructor(app: Server | RequestListener, options?: OpraHttpClientOptions);
+    collection<TType = any>(resourceName: string | Type<TType>): HttpCollectionNode<TType, ResponseExt>;
+    singleton<TType = any>(resourceName: string | Type<TType>): HttpSingletonNode<TType, ResponseExt>;
+    protected _fetch(urlString: string, req?: RequestInit): Promise<Response>;
+    protected _createResponse(init?: HttpResponse.Initiator): HttpResponse;
+}
+export {};

package/esm/index.d.ts

@@ -1,2 +0,0 @@
-import './jest-extend/common.extend.js';
-export * from './test-client.js';

package/esm/test-client.d.ts

@@ -1,16 +0,0 @@
-/// <reference types="node" />
-import { IncomingMessage, Server, ServerResponse } from 'http';
-import { HttpResponse, HttpResponseInit } from '@opra/common';
-import { OpraHttpClientBase, OpraHttpClientOptions } from '@opra/node-client';
-import { ApiExpect } from './api-expect/api-expect.js';
-declare type RequestListener = (req: IncomingMessage, res: ServerResponse) => void;
-export type ResponseExt = {
-    expect: ApiExpect;
-};
-export declare class OpraTestClient extends OpraHttpClientBase<ResponseExt> {
-    protected _server: Server;
-    constructor(app: Server | RequestListener, options?: OpraHttpClientOptions);
-    protected _fetch(urlString: string, req?: RequestInit): Promise<Response>;
-    protected _createResponse(init?: HttpResponseInit): HttpResponse;
-}
-export {};