@rnw-community/wdio 0.18.1 → 0.18.3

package/dist/util/{get-visible-component.util.d.ts → get-visible-component/get-visible-component.d.ts}

@@ -1,5 +1,5 @@
 /// <reference types="webdriverio/async" />
-import { VisibleComponent } from '../component';
+import { VisibleComponent } from '../../component';
 declare type SelectorMethods<T extends string, S extends string> = T extends `${infer Prefix}.${infer Selector}` ? Selector extends `Root` ? never : `${Selector}${S}` : never;
 declare type VisibleComponentWithSelectors<T extends string> = VisibleComponent & {
     [TKey in SelectorMethods<T, 'El'>]: Promise<WebdriverIO.Element>;
@@ -9,4 +9,4 @@ declare type VisibleComponentWithSelectors<T extends string> = VisibleComponent
 declare type VisibleComponentWithSelectorsCtor<T extends string> = new (selectorOrElement?: WebdriverIO.Element | string) => VisibleComponentWithSelectors<T>;
 export declare const getVisibleComponent: <T extends string, E = unknown>(selectors: E) => VisibleComponentWithSelectorsCtor<T>;
 export {};
-//# sourceMappingURL=get-visible-component.util.d.ts.map
+//# sourceMappingURL=get-visible-component.d.ts.map

package/dist/util/get-visible-component/get-visible-component.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-visible-component.d.ts","sourceRoot":"","sources":["../../../src/util/get-visible-component/get-visible-component.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAMnD,aAAK,eAAe,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,GAAG,MAAM,MAAM,IAAI,MAAM,QAAQ,EAAE,GAClG,QAAQ,SAAS,MAAM,GACnB,KAAK,GACL,GAAG,QAAQ,GAAG,CAAC,EAAE,GACrB,KAAK,CAAC;AAEZ,aAAK,6BAA6B,CAAC,CAAC,SAAS,MAAM,IAAI,gBAAgB,GAAG;KACrE,IAAI,IAAI,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;CACnE,GAAG;KAAG,IAAI,IAAI,eAAe,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC;CAAE,CAAC;AAE/E,aAAK,iCAAiC,CAAC,CAAC,SAAS,MAAM,IAAI,KACvD,iBAAiB,CAAC,EAAE,WAAW,CAAC,OAAO,GAAG,MAAM,KAC/C,6BAA6B,CAAC,CAAC,CAAC,CAAC;AAEtC,eAAO,MAAM,mBAAmB,uFA2C3B,CAAC"}

package/dist/util/{get-visible-component.util.js → get-visible-component/get-visible-component.js}

@@ -17,14 +17,14 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVisibleComponent = void 0;
 var shared_1 = require("@rnw-community/shared");
-var component_1 = require("../component");
+var component_1 = require("../../component");
 var getVisibleComponent = function (selectors) {
     // @ts-expect-error We use proxy for dynamic fields
     return /** @class */ (function (_super) {
         __extends(class_1, _super);
         function class_1(selectorOrElement) {
             var _this = this;
-            var selectorKeys = Object.keys(selectors);
+            var selectorKeys = Object.keys(selectors).sort(function (s1, s2) { return s1.length - s2.length; });
             // @ts-expect-error We need better enum types
             var selectorRootKey = selectors[selectorKeys.find(function (key) { return key === 'Root'; })];
             var rootSelector = (0, shared_1.isDefined)(selectorOrElement) ? selectorOrElement : selectorRootKey;
@@ -34,22 +34,23 @@ var getVisibleComponent = function (selectors) {
             _this = _super.call(this, rootSelector) || this;
             // eslint-disable-next-line no-constructor-return
             return new Proxy(_this, {
-                // @ts-expect-error field is required to be string or a symbol, we need it to be keyof TController for proper typings inside
                 get: function (proxyClient, field, receiver) {
                     if (field in proxyClient) {
                         // eslint-disable-next-line @typescript-eslint/no-unsafe-return
                         return Reflect.get(proxyClient, field, receiver);
                     }
-                    if (field in selectorKeys) {
+                    // TODO: This logic need improvement to avoid false positives
+                    var selectorKey = selectorKeys.find(function (key) { return field.includes(key); });
+                    if ((0, shared_1.isDefined)(selectorKey)) {
                         if (field.includes('Els')) {
                             // @ts-expect-error We need to fix types of the enum
                             // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                            return proxyClient.getChildEls(selectors[field]);
+                            return proxyClient.getChildEls(selectors[selectorKey]);
                         }
                         else if (field.includes('El')) {
                             // @ts-expect-error We need to fix types of the enum
                             // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-                            return proxyClient.getChildEl(selectors[field]);
+                            return proxyClient.getChildEl(selectors[selectorKey]);
                         }
                     }
                     return undefined;
@@ -60,4 +61,4 @@ var getVisibleComponent = function (selectors) {
     }(component_1.VisibleComponent));
 };
 exports.getVisibleComponent = getVisibleComponent;
-//# sourceMappingURL=get-visible-component.util.js.map
+//# sourceMappingURL=get-visible-component.js.map

package/dist/util/get-visible-component/get-visible-component.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-visible-component.js","sourceRoot":"","sources":["../../../src/util/get-visible-component/get-visible-component.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,gDAAkD;AAElD,6CAAmD;AAoB5C,IAAM,mBAAmB,GAAG,UAAgC,SAAY;IAC3E,mDAAmD;IACnD;QAAc,2BAAgB;QAC1B,iBAAY,iBAAgD;YAA5D,iBAuCC;YAtCG,IAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,UAAC,EAAE,EAAE,EAAE,IAAK,OAAA,EAAE,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,EAArB,CAAqB,CAAQ,CAAC;YAC3F,6CAA6C;YAC7C,IAAM,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,UAAA,GAAG,IAAI,OAAA,GAAG,KAAK,MAAM,EAAd,CAAc,CAAC,CAAW,CAAC;YAEtF,IAAM,YAAY,GAAG,IAAA,kBAAS,EAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,eAAe,CAAC;YAExF,IAAI,CAAC,IAAA,kBAAS,EAAC,YAAY,CAAC,EAAE;gBAC1B,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;aAC3F;oBAED,kBAAM,YAAY,CAAC;YAEnB,iDAAiD;YACjD,OAAO,IAAI,KAAK,CAAC,KAAI,EAAE;gBACnB,GAAG,EAAH,UAAI,WAAW,EAAE,KAAQ,EAAE,QAAQ;oBAC/B,IAAI,KAAK,IAAI,WAAW,EAAE;wBACtB,+DAA+D;wBAC/D,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;qBACpD;oBAED,6DAA6D;oBAC7D,IAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,UAAA,GAAG,IAAI,OAAA,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAnB,CAAmB,CAAC,CAAC;oBAElE,IAAI,IAAA,kBAAS,EAAC,WAAW,CAAC,EAAE;wBACxB,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;4BACvB,oDAAoD;4BACpD,iEAAiE;4BACjE,OAAO,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;yBAC1D;6BAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;4BAC7B,oDAAoD;4BACpD,iEAAiE;4BACjE,OAAO,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;yBACzD;qBACJ;oBAED,OAAO,SAAS,CAAC;gBACrB,CAAC;aACJ,CAAC,CAAC;QACP,CAAC;QACL,cAAC;IAAD,CAAC,AAzCD,CAAc,4BAAgB;AAA9B,CAyCC,CAAC;AA3CO,QAAA,mBAAmB,uBA2C1B"}

package/dist/util/index.d.ts

@@ -1,5 +1,5 @@
 export * from './set-test-id';
 export * from './get-test-id';
 export * from './set-prop-test-id';
-export * from './get-visible-component.util';
+export * from './get-visible-component/get-visible-component';
 //# sourceMappingURL=index.d.ts.map

package/dist/util/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,+CAA+C,CAAC"}

package/dist/util/index.js

@@ -17,5 +17,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./set-test-id"), exports);
 __exportStar(require("./get-test-id"), exports);
 __exportStar(require("./set-prop-test-id"), exports);
-__exportStar(require("./get-visible-component.util"), exports);
+__exportStar(require("./get-visible-component/get-visible-component"), exports);
 //# sourceMappingURL=index.js.map

package/dist/util/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,gDAA8B;AAC9B,qDAAmC;AACnC,+DAA6C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,gDAA8B;AAC9B,qDAAmC;AACnC,gFAA8D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rnw-community/wdio",
-  "version": "0.18.1",
+  "version": "0.18.3",
   "private": false,
   "description": "WDIO commands, page objects and utils",
   "keywords": [
@@ -35,13 +35,14 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "gitHead": "69cafff561595c908bf0b43bf49b3029b525963c",
+  "gitHead": "cfa446d79c6f101fa0ec4280ea4b51d872217130",
   "dependencies": {
     "@rnw-community/shared": "^0.8.0"
   },
   "devDependencies": {
     "@wdio/types": "^7.20.7",
     "concat": "^1.0.3",
+    "expect-type": "^0.13.0",
     "webdriverio": "^7.20.7"
   },
   "peerDependencies": {

package/dist/util/get-visible-component.util.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"get-visible-component.util.d.ts","sourceRoot":"","sources":["../../src/util/get-visible-component.util.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAMhD,aAAK,eAAe,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,GAAG,MAAM,MAAM,IAAI,MAAM,QAAQ,EAAE,GAClG,QAAQ,SAAS,MAAM,GACnB,KAAK,GACL,GAAG,QAAQ,GAAG,CAAC,EAAE,GACrB,KAAK,CAAC;AAEZ,aAAK,6BAA6B,CAAC,CAAC,SAAS,MAAM,IAAI,gBAAgB,GAAG;KACrE,IAAI,IAAI,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC;CACnE,GAAG;KAAG,IAAI,IAAI,eAAe,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC;CAAE,CAAC;AAE/E,aAAK,iCAAiC,CAAC,CAAC,SAAS,MAAM,IAAI,KACvD,iBAAiB,CAAC,EAAE,WAAW,CAAC,OAAO,GAAG,MAAM,KAC/C,6BAA6B,CAAC,CAAC,CAAC,CAAC;AAEtC,eAAO,MAAM,mBAAmB,uFAyC3B,CAAC"}

package/dist/util/get-visible-component.util.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"get-visible-component.util.js","sourceRoot":"","sources":["../../src/util/get-visible-component.util.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,gDAAkD;AAElD,0CAAgD;AAoBzC,IAAM,mBAAmB,GAAG,UAAgC,SAAY;IAC3E,mDAAmD;IACnD;QAAc,2BAAgB;QAC1B,iBAAY,iBAAgD;YAA5D,iBAqCC;YApCG,IAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAmB,CAAC;YAC9D,6CAA6C;YAC7C,IAAM,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,IAAI,CAAC,UAAA,GAAG,IAAI,OAAA,GAAG,KAAK,MAAM,EAAd,CAAc,CAAC,CAAW,CAAC;YAEtF,IAAM,YAAY,GAAG,IAAA,kBAAS,EAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,eAAe,CAAC;YAExF,IAAI,CAAC,IAAA,kBAAS,EAAC,YAAY,CAAC,EAAE;gBAC1B,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAC;aAC3F;oBAED,kBAAM,YAAY,CAAC;YAEnB,iDAAiD;YACjD,OAAO,IAAI,KAAK,CAAC,KAAI,EAAE;gBACnB,4HAA4H;gBAC5H,GAAG,EAAH,UAAI,WAAW,EAAE,KAAc,EAAE,QAAQ;oBACrC,IAAI,KAAK,IAAI,WAAW,EAAE;wBACtB,+DAA+D;wBAC/D,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;qBACpD;oBAED,IAAI,KAAK,IAAI,YAAY,EAAE;wBACvB,IAAK,KAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;4BACnC,oDAAoD;4BACpD,iEAAiE;4BACjE,OAAO,WAAW,CAAC,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;yBACpD;6BAAM,IAAK,KAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;4BACzC,oDAAoD;4BACpD,iEAAiE;4BACjE,OAAO,WAAW,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;yBACnD;qBACJ;oBAED,OAAO,SAAS,CAAC;gBACrB,CAAC;aACJ,CAAC,CAAC;QACP,CAAC;QACL,cAAC;IAAD,CAAC,AAvCD,CAAc,4BAAgB;AAA9B,CAuCC,CAAC;AAzCO,QAAA,mBAAmB,uBAyC1B"}