Generation: Add Android Matchers to generated code

detox/src/android/espressoapi/DetoxMatcher.js

@@ -0,0 +1,67 @@
+/**
+
+	This code is generated.
+	For more information see generation/README.md.
+*/
+
+
+
+class DetoxMatcher {
+  static matcherForSufficientlyVisible() {
+    return {
+      target: {
+        type: "Class",
+        value: "com.wix.detox.espresso.DetoxMatcher"
+      },
+      method: "matcherForSufficientlyVisible",
+      args: []
+    };
+  }
+
+  static matcherForNotVisible() {
+    return {
+      target: {
+        type: "Class",
+        value: "com.wix.detox.espresso.DetoxMatcher"
+      },
+      method: "matcherForNotVisible",
+      args: []
+    };
+  }
+
+  static matcherForNotNull() {
+    return {
+      target: {
+        type: "Class",
+        value: "com.wix.detox.espresso.DetoxMatcher"
+      },
+      method: "matcherForNotNull",
+      args: []
+    };
+  }
+
+  static matcherForNull() {
+    return {
+      target: {
+        type: "Class",
+        value: "com.wix.detox.espresso.DetoxMatcher"
+      },
+      method: "matcherForNull",
+      args: []
+    };
+  }
+
+  static matcherForAnything() {
+    return {
+      target: {
+        type: "Class",
+        value: "com.wix.detox.espresso.DetoxMatcher"
+      },
+      method: "matcherForAnything",
+      args: []
+    };
+  }
+
+}
+
+module.exports = DetoxMatcher;

detox/src/android/matcher.js

@@ -1,4 +1,5 @@
 const invoke = require('../invoke');
+const DetoxMatcherApi = require('./espressoapi/DetoxMatcher');
 
 const DetoxMatcher = 'com.wix.detox.espresso.DetoxMatcher';
 
@@ -77,28 +78,28 @@ class TypeMatcher extends Matcher {
 class VisibleMatcher extends Matcher {
   constructor() {
     super();
-    this._call = invoke.call(invoke.Android.Class(DetoxMatcher), 'matcherForSufficientlyVisible');
+    this._call = invoke.callDirectly(DetoxMatcherApi.matcherForSufficientlyVisible());
   }
 }
 
 class NotVisibleMatcher extends Matcher {
   constructor() {
     super();
-    this._call = invoke.call(invoke.Android.Class(DetoxMatcher), 'matcherForNotVisible');
+    this._call = invoke.callDirectly(DetoxMatcherApi.matcherForNotVisible());
   }
 }
 
 class ExistsMatcher extends Matcher {
   constructor() {
     super();
-    this._call = invoke.call(invoke.Android.Class(DetoxMatcher), 'matcherForNotNull');
+    this._call = invoke.callDirectly(DetoxMatcherApi.matcherForNotNull());
   }
 }
 
 class NotExistsMatcher extends Matcher {
   constructor() {
     super();
-    this._call = invoke.call(invoke.Android.Class(DetoxMatcher), 'matcherForNull');
+    this._call = invoke.callDirectly(DetoxMatcherApi.matcherForNull());
   }
 }
 
@@ -124,8 +125,8 @@ class TraitsMatcher extends Matcher {
   constructor(value) {
     super();
     if ((typeof value !== 'object') || (!value instanceof Array)) throw new Error(`TraitsMatcher ctor argument must be an array, got ${typeof value}`);
-    
-    this._call = invoke.call(invoke.Android.Class(DetoxMatcher), 'matcherForAnything');
+
+    this._call = invoke.callDirectly(DetoxMatcherApi.matcherForAnything());
   }
 }
 

generation/index.js

@@ -1,15 +1,21 @@
 #!/usr/bin/env node
 const generateIOSAdapters = require("./adapters/ios");
 const iosFiles = {
-  "../detox/ios/EarlGrey/EarlGrey/Action/GREYActions.h": "../detox/src/ios/earlgreyapi/GREYActions.js",
-  "../detox/ios/Detox/GREYMatchers+Detox.h": "../detox/src/ios/earlgreyapi/GREYMatchers+Detox.js",
-  "../detox/ios/EarlGrey/EarlGrey/Matcher/GREYMatchers.h": "../detox/src/ios/earlgreyapi/GREYMatchers.js",
+	"../detox/ios/EarlGrey/EarlGrey/Action/GREYActions.h":
+		"../detox/src/ios/earlgreyapi/GREYActions.js",
+	"../detox/ios/Detox/GREYMatchers+Detox.h":
+		"../detox/src/ios/earlgreyapi/GREYMatchers+Detox.js",
+	"../detox/ios/EarlGrey/EarlGrey/Matcher/GREYMatchers.h":
+		"../detox/src/ios/earlgreyapi/GREYMatchers.js"
 };
 
 generateIOSAdapters(iosFiles);
 
 const generateAndroidAdapters = require("./adapters/android");
 const androidFiles = {
-  "../detox/android/detox/src/main/java/com/wix/detox/espresso/DetoxAction.java": "../detox/src/android/espressoapi/DetoxAction.js"
+	"../detox/android/detox/src/main/java/com/wix/detox/espresso/DetoxAction.java":
+		"../detox/src/android/espressoapi/DetoxAction.js",
+	"../detox/android/detox/src/main/java/com/wix/detox/espresso/DetoxMatcher.java":
+		"../detox/src/android/espressoapi/DetoxMatcher.js"
 };
-generateAndroidAdapters(androidFiles); 
+generateAndroidAdapters(androidFiles);

generation/package.json

@@ -42,6 +42,6 @@
 	"dependencies": {
 		"babel-generate-guard-clauses": "^2.0.0",
 		"babel-template": "^6.26.0",
-		"java-method-parser": "^0.4.0"
+		"java-method-parser": "^0.4.5"
 	}
 }