@opra/testing 0.17.0 → 0.17.2

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

@@ -135,10 +135,10 @@ class ApiExpectCollection {
 }
 exports.ApiExpectCollection = ApiExpectCollection;
 function convertFilter(str) {
-    const ast = typeof str === 'string' ? (0, common_1.parseFilter)(str) : str;
+    const ast = typeof str === 'string' ? common_1.OpraFilter.parse(str) : str;
     if (!ast)
         return;
-    if (ast instanceof common_1.ComparisonExpression) {
+    if (ast instanceof common_1.OpraFilter.ComparisonExpression) {
         const left = convertFilter(ast.left);
         const right = convertFilter(ast.right);
         switch (ast.op) {
@@ -162,29 +162,29 @@ function convertFilter(str) {
                 throw new Error(`ComparisonExpression operator (${ast.op}) not implemented yet`);
         }
     }
-    if (ast instanceof common_1.QualifiedIdentifier) {
+    if (ast instanceof common_1.OpraFilter.QualifiedIdentifier) {
         return ast.value;
     }
-    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) {
+    if (ast instanceof common_1.OpraFilter.NumberLiteral ||
+        ast instanceof common_1.OpraFilter.StringLiteral ||
+        ast instanceof common_1.OpraFilter.BooleanLiteral ||
+        ast instanceof common_1.OpraFilter.NullLiteral ||
+        ast instanceof common_1.OpraFilter.DateLiteral ||
+        ast instanceof common_1.OpraFilter.TimeLiteral) {
         return ast.value;
     }
-    if (ast instanceof common_1.ArrayExpression) {
+    if (ast instanceof common_1.OpraFilter.ArrayExpression) {
         return ast.items.map(convertFilter);
     }
-    if (ast instanceof common_1.LogicalExpression) {
+    if (ast instanceof common_1.OpraFilter.LogicalExpression) {
         if (ast.op === 'or')
             return { $or: ast.items.map(convertFilter) };
         return { $and: ast.items.map(convertFilter) };
     }
-    if (ast instanceof common_1.ArrayExpression) {
+    if (ast instanceof common_1.OpraFilter.ArrayExpression) {
         return ast.items.map(convertFilter);
     }
-    if (ast instanceof common_1.ParenthesesExpression) {
+    if (ast instanceof common_1.OpraFilter.ParenthesizedExpression) {
         return convertFilter(ast.expression);
     }
     throw new Error(`${ast.kind} is not implemented yet`);

package/cjs/test-client.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpraTestClient = void 0;
 const http_1 = require("http");
 const url_1 = require("url");
+const client_1 = require("@opra/client");
 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 {
+class OpraTestClient extends client_1.OpraHttpClient {
     constructor(app, options) {
         super('/', options);
         this._server = app instanceof http_1.Server ? app : (0, http_1.createServer)(app);

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

@@ -2,7 +2,7 @@ import '../jest-extend/index.js';
 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';
+import { OpraFilter } from '@opra/common';
 // @ts-ignore
 const ruleJudgment = typeof ruleJudgmentLib === 'object' ? ruleJudgmentLib.default : ruleJudgmentLib;
 export class ApiExpectCollection {
@@ -130,10 +130,10 @@ export class ApiExpectCollection {
     }
 }
 export function convertFilter(str) {
-    const ast = typeof str === 'string' ? parseFilter(str) : str;
+    const ast = typeof str === 'string' ? OpraFilter.parse(str) : str;
     if (!ast)
         return;
-    if (ast instanceof ComparisonExpression) {
+    if (ast instanceof OpraFilter.ComparisonExpression) {
         const left = convertFilter(ast.left);
         const right = convertFilter(ast.right);
         switch (ast.op) {
@@ -157,29 +157,29 @@ export function convertFilter(str) {
                 throw new Error(`ComparisonExpression operator (${ast.op}) not implemented yet`);
         }
     }
-    if (ast instanceof QualifiedIdentifier) {
+    if (ast instanceof OpraFilter.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 OpraFilter.NumberLiteral ||
+        ast instanceof OpraFilter.StringLiteral ||
+        ast instanceof OpraFilter.BooleanLiteral ||
+        ast instanceof OpraFilter.NullLiteral ||
+        ast instanceof OpraFilter.DateLiteral ||
+        ast instanceof OpraFilter.TimeLiteral) {
         return ast.value;
     }
-    if (ast instanceof ArrayExpression) {
+    if (ast instanceof OpraFilter.ArrayExpression) {
         return ast.items.map(convertFilter);
     }
-    if (ast instanceof LogicalExpression) {
+    if (ast instanceof OpraFilter.LogicalExpression) {
         if (ast.op === 'or')
             return { $or: ast.items.map(convertFilter) };
         return { $and: ast.items.map(convertFilter) };
     }
-    if (ast instanceof ArrayExpression) {
+    if (ast instanceof OpraFilter.ArrayExpression) {
         return ast.items.map(convertFilter);
     }
-    if (ast instanceof ParenthesesExpression) {
+    if (ast instanceof OpraFilter.ParenthesizedExpression) {
         return convertFilter(ast.expression);
     }
     throw new Error(`${ast.kind} is not implemented yet`);

package/esm/test-client.js

@@ -1,9 +1,9 @@
 import { createServer, Server } from 'http';
 import { URL } from 'url';
-import { joinPath } from '@opra/common';
 import { 
 // BatchRequest,
-OpraHttpClient, } from '@opra/node-client';
+OpraHttpClient, } from '@opra/client';
+import { joinPath } from '@opra/common';
 import { ApiExpect } from './api-expect/api-expect.js';
 import { isAbsoluteUrl } from './utils/is-absolute-url.util.js';
 export class OpraTestClient extends OpraHttpClient {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/testing",
-  "version": "0.17.0",
+  "version": "0.17.2",
   "description": "Opra testing package",
   "author": "Panates",
   "license": "MIT",
@@ -25,8 +25,8 @@
     "clean:cover": "rimraf ../../coverage/testing"
   },
   "dependencies": {
-    "@opra/common": "^0.17.0",
-    "@opra/node-client": "^0.17.0",
+    "@opra/common": "^0.17.2",
+    "@opra/client": "^0.17.2",
     "ansi-colors": "^4.1.3",
     "lodash.isnil": "^4.0.0",
     "lodash.omitby": "^4.6.0",

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

@@ -1,6 +1,6 @@
 import '../jest-extend/index.js';
-import { Expression } from '@opra/common';
-import { HttpResponse } from '@opra/node-client';
+import { HttpResponse } from '@opra/client';
+import { OpraFilter } from '@opra/common';
 export declare class ApiExpectCollection {
     readonly response: HttpResponse;
     protected _isNot: boolean;
@@ -11,10 +11,10 @@ export declare class ApiExpectCollection {
     toHaveFields(keys: string[]): this;
     toHaveFieldsOnly(keys: string[]): this;
     toBeSortedBy(...fields: string[]): this;
-    toBeFilteredBy(filter: string | Expression): this;
+    toBeFilteredBy(filter: string | OpraFilter.Expression): this;
     toHaveExactItems(expected: number): this;
     toHaveMaxItems(expected: number): this;
     toHaveMinItems(expected: number): this;
     protected _expect(expected: any): jest.Matchers<any>;
 }
-export declare function convertFilter(str: string | Expression | undefined): any;
+export declare function convertFilter(str: string | OpraFilter.Expression | undefined): any;

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 import '../jest-extend/index.js';
-import { HttpResponse } from '@opra/node-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';

package/types/test-client.d.ts

@@ -1,7 +1,7 @@
 /// <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 { HttpCollectionNode, HttpResponse, HttpSingletonNode, OpraHttpClient, OpraHttpClientOptions } from '@opra/client';
 import { ApiExpect } from './api-expect/api-expect.js';
 declare type RequestListener = (req: IncomingMessage, res: ServerResponse) => void;
 export type ResponseExt = {