a_mock 2.0.4 → 2.0.5

package/README.md

@@ -94,24 +94,26 @@ mock(['a','b']); //throws unexpected arguments
 mock(['foo', 'bar']); //throws unexpected arguments
 ```
 
-__Expecting struct__
-
-```js
-var mock = require('a_mock').mock();
-var obj = {};
+__Expecting struct__
+
+```js
+var mock = require('a_mock').mock();
+var obj = {};
 mock.expect({a : 1}).return('fake1');
 mock.expect({a : 2}).return('fake2');
 mock.expect({a : 2, b : {c : 'foo', d : ['me', 'too']}}).return('fake3');
 mock.expect(obj).return('fake4');
 mock.expect({}).return('will never happen');
 
-mock({a : 'x'}); //throws unexpected arguments
-mock({a : 1}); //returns 'fake1'
-mock({a : 2}); //returns 'fake2'
-mock({a : 2, b : {c : 'foo', d : ['me', 'too']}}); //returns 'fake3'
-mock(obj);  //returns 'fake4'
-mock({});  //throws unexpected arguments
-```
+mock({a : 'x'}); //throws unexpected arguments
+mock({a : 1}); //returns 'fake1'
+mock({a : 2}); //returns 'fake2'
+mock({a : 2, b : {c : 'foo', d : ['me', 'too']}}); //returns 'fake3'
+mock(obj);  //returns 'fake4'
+mock({});  //throws unexpected arguments cause leaf properties are not equal
+```
+
+Note: Struct matching is strict on leaf properties. All leaf property values must be equal to match, and an empty object does not match a non-empty expected struct.
 
 __Repeats__
 
@@ -447,4 +449,4 @@ function success(arg) {
 function error(e) {
 	console.log(e.stack);//will happen
 }
-```
+```

package/index.d.ts

@@ -1,5 +1,3 @@
-import type { AxiosInstance, AxiosResponse } from 'axios';
-
 type AnyFunction = (...args: any[]) => any;
 type Tail<T extends any[]> = T extends [any, ...infer R] ? R : [];
 type OverloadedParameters<T> = T extends {
@@ -26,9 +24,7 @@ type FunctionProps<T> = T extends (...args: any[]) => any
   : {};
 type MockedFunction<T extends AnyFunction> = MockFunction<
   OverloadedParameters<T>,
-  T extends AxiosInstance
-    ? Promise<AxiosResponse<any, any, {}>>
-    : OverloadedReturnType<T>
+  OverloadedReturnType<T>
 > &
   T &
   FunctionProps<T>;
@@ -40,7 +36,7 @@ interface RepeatControl {
 
 interface ExpectationTerminal<R, TArgs extends any[], TOrigArgs extends any[] = TArgs> {
   return(value: R): RepeatControl;
-  returnLoose(value?: any): RepeatControl;
+  returnLoose(value?: any): RepeatControl;
   whenCalled(callback: CallbackFor<TOrigArgs>): ExpectationTerminal<R, TArgs, TOrigArgs>;
   repeat(times: number): RepeatControl;
   repeatAny(): RepeatControl;
@@ -55,25 +51,25 @@ interface ExpectationChain<TArgs extends any[], R, TOrigArgs extends any[] = TAr
   expect(arg?: TArgs[0]): ExpectationChain<Tail<TArgs>, R, TOrigArgs>;
   /** @deprecated Use ignoreAll() instead. */
   expectAnything(): ExpectationChain<any[], R, TOrigArgs>;
-  ignoreAll(): ExpectationChain<any[], R, TOrigArgs>;
-  expectLoose(...args: any[]): ExpectationChain<any[], any, TOrigArgs>;
-  ignore(): ExpectationChain<Tail<TArgs>, R, TOrigArgs>;
-  /** @deprecated Use expect() instead. */
-  expectArray(
-    value?: TArgs[0] extends any[] ? TArgs[0] : any[]
-  ): ExpectationChain<Tail<TArgs>, R, TOrigArgs>;
+  ignoreAll(): ExpectationChain<any[], R, TOrigArgs>;
+  expectLoose(...args: any[]): ExpectationChain<any[], any, TOrigArgs>;
+  ignore(): ExpectationChain<Tail<TArgs>, R, TOrigArgs>;
+  /** @deprecated Use expect() instead. */
+  expectArray(
+    value?: TArgs[0] extends any[] ? TArgs[0] : any[]
+  ): ExpectationChain<Tail<TArgs>, R, TOrigArgs>;
 }
 
 interface MockFunction<TArgs extends any[], R> {
   (...args: TArgs): R;
-  // Allow any-args calls in addition to the original signature.
-  (...args: any[]): any;
-  expect(...args: OptionalTuple<TArgs>): ExpectationChain<Tail<TArgs>, R, TArgs>;
-  ignore(): ExpectationChain<Tail<TArgs>, R, TArgs>;
-  /** @deprecated Use expect() instead. */
-  expectArray(
-    value?: TArgs[0] extends any[] ? TArgs[0] : any[]
-  ): ExpectationChain<Tail<TArgs>, R, TArgs>;
+  // Allow any-args calls in addition to the original signature.
+  (...args: any[]): any;
+  expect(...args: OptionalTuple<TArgs>): ExpectationChain<Tail<TArgs>, R, TArgs>;
+  ignore(): ExpectationChain<Tail<TArgs>, R, TArgs>;
+  /** @deprecated Use expect() instead. */
+  expectArray(
+    value?: TArgs[0] extends any[] ? TArgs[0] : any[]
+  ): ExpectationChain<Tail<TArgs>, R, TArgs>;
   /** @deprecated Use ignoreAll() instead. */
   expectAnything(): ExpectationChain<any[], R, TArgs>;
   ignoreAll(): ExpectationChain<any[], R, TArgs>;

package/package.json

@@ -1,18 +1,29 @@
 {
   "name": "a_mock",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "main": "index.js",
   "types": "index.d.ts",
   "title": "a_mock",
   "description": "Sub package of a. Mocking framework",
-  "keywords": ["mock","mocking","partial mock","strict mock","tdd","stub","stubbing","mock require","verify"],
+  "keywords": [
+    "mock",
+    "mocking",
+    "partial mock",
+    "strict mock",
+    "tdd",
+    "stub",
+    "stubbing",
+    "mock require",
+    "verify"
+  ],
   "scripts": {
     "test": "node --test **/*Spec/test*.js"
-    
   },
-  "dependencies": {  },
-  "repository" : {
-    "type" : "git",
-    "url"  : "git@github.com:alfateam/a_mock.git"
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:alfateam/a_mock.git"
+  },
+  "devDependencies": {
+    "axios": "^1.13.2"
   }
 }