@opra/testing 0.13.0 → 0.15.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");

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/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.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/api-expect/api-expect-collection.js

@@ -1,3 +1,4 @@
+import '../jest-extend/index.js';
 import isNil from 'lodash.isnil';
 import omitBy from 'lodash.omitby';
 import ruleJudgmentLib from 'rule-judgment';

package/esm/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/api-expect/api-expect-error.js

@@ -1,3 +1,4 @@
+import '../jest-extend/index.js';
 import matcherUtils from 'jest-matcher-utils';
 import { objectMatches } from '../utils/object-matches.util.js';
 import { ApiExpectObject } from './api-expect-object.js';

package/esm/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/api-expect/api-expect-object.js

@@ -1,3 +1,4 @@
+import '../jest-extend/index.js';
 import isNil from 'lodash.isnil';
 import omitBy from 'lodash.omitby';
 export class ApiExpectObject {

package/esm/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/api-expect/api-expect-operation-result.js

@@ -1,3 +1,4 @@
+import '../jest-extend/index.js';
 export class ApiExpectOperationResult {
     constructor(response, _isNot = false) {
         this.response = response;

package/esm/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/esm/api-expect/api-expect.js

@@ -1,3 +1,4 @@
+import '../jest-extend/index.js';
 import { ApiExpectCollection } from './api-expect-collection.js';
 import { ApiExpectError } from './api-expect-error.js';
 import { ApiExpectObject } from './api-expect-object.js';

package/esm/index.d.ts

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

package/esm/index.js

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

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

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

package/esm/jest-extend/index.js

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

package/esm/test-client.d.ts

@@ -1,16 +1,18 @@
 /// <reference types="node" />
 import { IncomingMessage, Server, ServerResponse } from 'http';
-import { HttpResponse, HttpResponseInit } from '@opra/common';
-import { OpraHttpClientBase, OpraHttpClientOptions } from '@opra/node-client';
+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 OpraHttpClientBase<ResponseExt> {
+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?: HttpResponseInit): HttpResponse;
+    protected _createResponse(init?: HttpResponse.Initiator): HttpResponse;
 }
 export {};

package/esm/test-client.js

@@ -3,14 +3,20 @@ import { URL } from 'url';
 import { joinPath } from '@opra/common';
 import { 
 // BatchRequest,
-OpraHttpClientBase, } from '@opra/node-client';
+OpraHttpClient, } 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 {
+export class OpraTestClient extends OpraHttpClient {
     constructor(app, options) {
         super('/', options);
         this._server = app instanceof Server ? app : 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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/testing",
-  "version": "0.13.0",
+  "version": "0.15.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.13.0",
-    "@opra/node-client": "^0.13.0",
+    "@opra/common": "^0.15.0",
+    "@opra/node-client": "^0.15.0",
     "ansi-colors": "^4.1.3",
     "lodash.isnil": "^4.0.0",
     "lodash.omitby": "^4.6.0",