@appium/base-driver 9.3.2 → 9.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (105) hide show
  1. package/LICENSE +1 -1
  2. package/build/lib/basedriver/capabilities.d.ts +59 -36
  3. package/build/lib/basedriver/capabilities.d.ts.map +1 -1
  4. package/build/lib/basedriver/capabilities.js +57 -45
  5. package/build/lib/basedriver/capabilities.js.map +1 -1
  6. package/build/lib/basedriver/commands/event.d.ts +5 -9
  7. package/build/lib/basedriver/commands/event.d.ts.map +1 -1
  8. package/build/lib/basedriver/commands/event.js +28 -49
  9. package/build/lib/basedriver/commands/event.js.map +1 -1
  10. package/build/lib/basedriver/commands/execute.d.ts +5 -11
  11. package/build/lib/basedriver/commands/execute.d.ts.map +1 -1
  12. package/build/lib/basedriver/commands/execute.js +15 -39
  13. package/build/lib/basedriver/commands/execute.js.map +1 -1
  14. package/build/lib/basedriver/commands/find.d.ts +5 -12
  15. package/build/lib/basedriver/commands/find.d.ts.map +1 -1
  16. package/build/lib/basedriver/commands/find.js +38 -98
  17. package/build/lib/basedriver/commands/find.js.map +1 -1
  18. package/build/lib/basedriver/commands/index.d.ts +7 -3
  19. package/build/lib/basedriver/commands/index.d.ts.map +1 -1
  20. package/build/lib/basedriver/commands/index.js +7 -28
  21. package/build/lib/basedriver/commands/index.js.map +1 -1
  22. package/build/lib/basedriver/commands/log.d.ts +5 -10
  23. package/build/lib/basedriver/commands/log.d.ts.map +1 -1
  24. package/build/lib/basedriver/commands/log.js +17 -50
  25. package/build/lib/basedriver/commands/log.js.map +1 -1
  26. package/build/lib/basedriver/commands/mixin.d.ts +12 -0
  27. package/build/lib/basedriver/commands/mixin.d.ts.map +1 -0
  28. package/build/lib/basedriver/commands/mixin.js +18 -0
  29. package/build/lib/basedriver/commands/mixin.js.map +1 -0
  30. package/build/lib/basedriver/commands/session.d.ts +5 -11
  31. package/build/lib/basedriver/commands/session.d.ts.map +1 -1
  32. package/build/lib/basedriver/commands/session.js +18 -53
  33. package/build/lib/basedriver/commands/session.js.map +1 -1
  34. package/build/lib/basedriver/commands/settings.d.ts +5 -9
  35. package/build/lib/basedriver/commands/settings.d.ts.map +1 -1
  36. package/build/lib/basedriver/commands/settings.js +14 -34
  37. package/build/lib/basedriver/commands/settings.js.map +1 -1
  38. package/build/lib/basedriver/commands/timeout.d.ts +5 -9
  39. package/build/lib/basedriver/commands/timeout.d.ts.map +1 -1
  40. package/build/lib/basedriver/commands/timeout.js +107 -129
  41. package/build/lib/basedriver/commands/timeout.js.map +1 -1
  42. package/build/lib/basedriver/core.d.ts +14 -20
  43. package/build/lib/basedriver/core.d.ts.map +1 -1
  44. package/build/lib/basedriver/core.js +32 -22
  45. package/build/lib/basedriver/core.js.map +1 -1
  46. package/build/lib/basedriver/device-settings.d.ts +11 -11
  47. package/build/lib/basedriver/device-settings.d.ts.map +1 -1
  48. package/build/lib/basedriver/device-settings.js +7 -8
  49. package/build/lib/basedriver/device-settings.js.map +1 -1
  50. package/build/lib/basedriver/driver.d.ts +23 -108
  51. package/build/lib/basedriver/driver.d.ts.map +1 -1
  52. package/build/lib/basedriver/driver.js +38 -135
  53. package/build/lib/basedriver/driver.js.map +1 -1
  54. package/build/lib/basedriver/helpers.d.ts +21 -98
  55. package/build/lib/basedriver/helpers.d.ts.map +1 -1
  56. package/build/lib/basedriver/helpers.js +178 -182
  57. package/build/lib/basedriver/helpers.js.map +1 -1
  58. package/build/lib/express/server.d.ts +3 -15
  59. package/build/lib/express/server.d.ts.map +1 -1
  60. package/build/lib/express/server.js +4 -2
  61. package/build/lib/express/server.js.map +1 -1
  62. package/build/lib/express/websocket.d.ts +5 -44
  63. package/build/lib/express/websocket.d.ts.map +1 -1
  64. package/build/lib/express/websocket.js +10 -39
  65. package/build/lib/express/websocket.js.map +1 -1
  66. package/build/lib/helpers/capabilities.d.ts +2 -2
  67. package/build/lib/helpers/capabilities.d.ts.map +1 -1
  68. package/build/lib/helpers/capabilities.js +2 -3
  69. package/build/lib/helpers/capabilities.js.map +1 -1
  70. package/build/lib/protocol/protocol.d.ts +1 -1
  71. package/build/lib/protocol/protocol.d.ts.map +1 -1
  72. package/build/lib/protocol/protocol.js +10 -2
  73. package/build/lib/protocol/protocol.js.map +1 -1
  74. package/build/lib/protocol/routes.d.ts +1 -0
  75. package/build/lib/protocol/routes.d.ts.map +1 -1
  76. package/build/lib/protocol/routes.js +12 -10
  77. package/build/lib/protocol/routes.js.map +1 -1
  78. package/lib/basedriver/capabilities.js +70 -56
  79. package/lib/basedriver/commands/event.ts +49 -0
  80. package/lib/basedriver/commands/execute.ts +40 -0
  81. package/lib/basedriver/commands/find.ts +80 -0
  82. package/lib/basedriver/commands/index.ts +7 -0
  83. package/lib/basedriver/commands/log.ts +34 -0
  84. package/lib/basedriver/commands/mixin.ts +15 -0
  85. package/lib/basedriver/commands/session.ts +36 -0
  86. package/lib/basedriver/commands/settings.ts +26 -0
  87. package/lib/basedriver/commands/timeout.ts +155 -0
  88. package/lib/basedriver/core.js +11 -28
  89. package/lib/basedriver/device-settings.js +9 -11
  90. package/lib/basedriver/{driver.js → driver.ts} +71 -180
  91. package/lib/basedriver/helpers.js +214 -212
  92. package/lib/express/server.js +4 -2
  93. package/lib/express/websocket.js +10 -39
  94. package/lib/helpers/capabilities.js +2 -3
  95. package/lib/protocol/protocol.js +11 -2
  96. package/lib/protocol/routes.js +12 -13
  97. package/package.json +11 -7
  98. package/lib/basedriver/commands/event.js +0 -63
  99. package/lib/basedriver/commands/execute.js +0 -45
  100. package/lib/basedriver/commands/find.js +0 -108
  101. package/lib/basedriver/commands/index.js +0 -35
  102. package/lib/basedriver/commands/log.js +0 -64
  103. package/lib/basedriver/commands/session.js +0 -57
  104. package/lib/basedriver/commands/settings.js +0 -38
  105. package/lib/basedriver/commands/timeout.js +0 -168
package/LICENSE CHANGED
@@ -186,7 +186,7 @@
186
186
  same "printed page" as the copyright notice for easier
187
187
  identification within third-party archives.
188
188
 
189
- Copyright JS Foundation and other contributors, https://js.foundation
189
+ Copyright OpenJS Foundation and other contributors, https://openjsf.org/
190
190
 
191
191
  Licensed under the Apache License, Version 2.0 (the "License");
192
192
  you may not use this file except in compliance with the License.
@@ -3,70 +3,93 @@
3
3
  * @see https://www.w3.org/TR/webdriver/#dfn-table-of-standard-capabilities)
4
4
  */
5
5
  export const STANDARD_CAPS: Readonly<Set<keyof import("@appium/types").StandardCapabilities>>;
6
+ /**
7
+ * Returned by {@linkcode parseCaps }
8
+ */
9
+ export type ParsedCaps<C extends import("@appium/types").Constraints> = {
10
+ allFirstMatchCaps: NSCapabilities<C>[];
11
+ validatedFirstMatchCaps: Capabilities<C>[];
12
+ requiredCaps: NSCapabilities<C>;
13
+ matchedCaps: Capabilities<C> | null;
14
+ validationErrors: string[];
15
+ };
6
16
  export type Constraints = import('@appium/types').Constraints;
7
17
  export type Constraint = import('@appium/types').Constraint;
8
18
  export type StringRecord = import('@appium/types').StringRecord;
9
19
  export type BaseDriverCapConstraints = import('@appium/types').BaseDriverCapConstraints;
10
- export type ConstraintsToCaps<C extends Readonly<Record<string, import("@appium/types").Constraint>>> = import('@appium/types').ConstraintsToCaps<C>;
20
+ export type ConstraintsToCaps<C extends import("@appium/types").Constraints> = import('@appium/types').ConstraintsToCaps<C>;
11
21
  export type ValidateCapsOpts = {
12
22
  /**
13
23
  * - if true, skip the presence constraint
14
24
  */
15
25
  skipPresenceConstraint?: boolean | undefined;
16
26
  };
17
- export type NSCapabilities<C extends Readonly<Record<string, import("@appium/types").Constraint>> = typeof import("@appium/types").BASE_DESIRED_CAP_CONSTRAINTS, Extra extends void | import("@appium/types").StringRecord = void> = import('@appium/types').NSCapabilities<C, Extra>;
18
- export type Capabilities<C extends Readonly<Record<string, import("@appium/types").Constraint>> = typeof import("@appium/types").BASE_DESIRED_CAP_CONSTRAINTS, Extra extends void | import("@appium/types").StringRecord = void> = import('@appium/types').Capabilities<C, Extra>;
19
- export type W3CCapabilities<C extends Readonly<Record<string, import("@appium/types").Constraint>> = typeof import("@appium/types").BASE_DESIRED_CAP_CONSTRAINTS, Extra extends void | import("@appium/types").StringRecord = void> = import('@appium/types').W3CCapabilities<C, Extra>;
20
- export type Merge<T, U> = import('type-fest').Merge<T, U>;
27
+ export type NSCapabilities<C extends import("@appium/types").Constraints> = import('@appium/types').NSCapabilities<C>;
28
+ export type Capabilities<C extends import("@appium/types").Constraints> = import('@appium/types').Capabilities<C>;
29
+ export type W3CCapabilities<C extends import("@appium/types").Constraints> = import('@appium/types').W3CCapabilities<C>;
21
30
  export type StringKeyOf<T> = import('type-fest').StringKeyOf<T>;
31
+ /**
32
+ * <T,U>
33
+ */
34
+ export type MergeExclusive<T, U> = import('type-fest').MergeExclusive<T, U>;
35
+ /**
36
+ * Returned by {@linkcode parseCaps}
37
+ * @template {Constraints} C
38
+ * @typedef ParsedCaps
39
+ * @property {NSCapabilities<C>[]} allFirstMatchCaps
40
+ * @property {Capabilities<C>[]} validatedFirstMatchCaps
41
+ * @property {NSCapabilities<C>} requiredCaps
42
+ * @property {Capabilities<C>|null} matchedCaps
43
+ * @property {string[]} validationErrors
44
+ */
22
45
  /**
23
46
  * Parse capabilities
24
- * @template {Constraints} [C={}]
25
- * @param {import('@appium/types').W3CCapabilities<C>} caps
47
+ * @template {Constraints} C
48
+ * @param {W3CCapabilities<C>} caps
26
49
  * @param {C} [constraints]
27
50
  * @param {boolean} [shouldValidateCaps]
28
51
  * @see https://www.w3.org/TR/webdriver/#processing-capabilities
52
+ * @returns {ParsedCaps<C>}
29
53
  */
30
- export function parseCaps<C extends Readonly<Record<string, import("@appium/types").Constraint>> = {}>(caps: import("@appium/types").W3CCapabilities<C, void>, constraints?: C | undefined, shouldValidateCaps?: boolean | undefined): {
31
- requiredCaps: {};
32
- allFirstMatchCaps: Partial<import("@appium/types").CapsToNSCaps<import("@appium/types").ConstraintsToCaps<C> & void, "appium">>[] | {}[];
33
- validatedFirstMatchCaps: Partial<import("@appium/types").ConstraintsToCaps<C> & void>[];
34
- matchedCaps: ((import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>> extends infer T_1 ? { [Key in keyof T_1 as import("type-fest/source/enforce-optional").RequiredFilter<import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>>, Key>]: (import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>>)[Key]; } : never) & (import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>> extends infer T_2 ? { [Key_1 in keyof T_2 as import("type-fest/source/enforce-optional").OptionalFilter<import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>>, Key_1>]?: Exclude<(import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>>)[Key_1], undefined> | undefined; } : never) extends infer T ? { [KeyType in keyof T]: ((import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>> extends infer T_1 ? { [Key in keyof T_1 as import("type-fest/source/enforce-optional").RequiredFilter<import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>>, Key>]: (import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>>)[Key]; } : never) & (import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>> extends infer T_2 ? { [Key_1 in keyof T_2 as import("type-fest/source/enforce-optional").OptionalFilter<import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>>, Key_1>]?: Exclude<(import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<{}> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<C> & void>>>)[Key_1], undefined> | undefined; } : never))[KeyType]; } : never) | null;
35
- validationErrors: string[];
36
- };
54
+ export function parseCaps<C extends import("@appium/types").Constraints>(caps: import("@appium/types").W3CCapabilities<C>, constraints?: C | undefined, shouldValidateCaps?: boolean | undefined): ParsedCaps<C>;
37
55
  /**
56
+ * Calls parseCaps and just returns the matchedCaps variable
38
57
  * @template {Constraints} C
39
- * @param {import('@appium/types').W3CCapabilities<C>} w3cCaps
58
+ * @template {W3CCapabilities<C>} W3CCaps
59
+ * @param {W3CCaps} w3cCaps
40
60
  * @param {C} [constraints]
41
61
  * @param {boolean} [shouldValidateCaps]
42
- * @returns {import('@appium/types').Capabilities<C>}
62
+ * @returns {Capabilities<C>}
43
63
  */
44
- export function processCapabilities<C extends Readonly<Record<string, import("@appium/types").Constraint>>>(w3cCaps: import("@appium/types").W3CCapabilities<C, void>, constraints?: C | undefined, shouldValidateCaps?: boolean | undefined): Partial<import("@appium/types").ConstraintsToCaps<C> & void>;
64
+ export function processCapabilities<C extends import("@appium/types").Constraints, W3CCaps extends import("@appium/types").W3CCapabilities<C>>(w3cCaps: W3CCaps, constraints?: C | undefined, shouldValidateCaps?: boolean | undefined): import("@appium/types").ConstraintsToCaps<C>;
45
65
  /**
46
- * @template {Constraints} [C={}]
66
+ * Validates caps against a set of constraints
67
+ * @template {Constraints} C
47
68
  * @param {Capabilities<C>} caps
48
69
  * @param {C} [constraints]
49
70
  * @param {ValidateCapsOpts} [opts]
50
71
  * @returns {Capabilities<C>}
51
72
  */
52
- export function validateCaps<C extends Readonly<Record<string, import("@appium/types").Constraint>> = {}>(caps: Partial<import("@appium/types").ConstraintsToCaps<C> & void>, constraints?: C | undefined, opts?: ValidateCapsOpts | undefined): Partial<import("@appium/types").ConstraintsToCaps<C> & void>;
73
+ export function validateCaps<C extends import("@appium/types").Constraints>(caps: import("@appium/types").ConstraintsToCaps<C>, constraints?: C | undefined, opts?: ValidateCapsOpts | undefined): import("@appium/types").ConstraintsToCaps<C>;
53
74
  /**
54
75
  * Takes primary caps object and merges it into a secondary caps object.
55
- * @template {Constraints} [T={}]
56
- * @template {Constraints} [U={}]
57
- * @param {Capabilities<T>} [primary]
58
- * @param {Capabilities<U>} [secondary]
59
- * @returns {Merge<Capabilities<T>, Capabilities<U>>}
76
+ * @template {Constraints} T
77
+ * @template {Constraints} U
78
+ * @template {Capabilities<T>} Primary
79
+ * @template {Capabilities<U>} Secondary
80
+ * @param {Primary} [primary]
81
+ * @param {Secondary} [secondary]
82
+ * @returns {MergeExclusive<Primary, Secondary>}
60
83
  * @see https://www.w3.org/TR/webdriver/#dfn-merging-capabilities)
61
84
  */
62
- export function mergeCaps<T extends Readonly<Record<string, import("@appium/types").Constraint>> = {}, U extends Readonly<Record<string, import("@appium/types").Constraint>> = {}>(primary?: Partial<import("@appium/types").ConstraintsToCaps<T> & void> | undefined, secondary?: Partial<import("@appium/types").ConstraintsToCaps<U> & void> | undefined): (import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>> extends infer T_2 ? { [Key in keyof T_2 as import("type-fest/source/enforce-optional").RequiredFilter<import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>>, Key>]: (import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>>)[Key]; } : never) & (import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>> extends infer T_3 ? { [Key_1 in keyof T_3 as import("type-fest/source/enforce-optional").OptionalFilter<import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>>, Key_1>]?: Exclude<(import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>>)[Key_1], undefined> | undefined; } : never) extends infer T_1 ? { [KeyType in keyof T_1]: ((import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>> extends infer T_2 ? { [Key in keyof T_2 as import("type-fest/source/enforce-optional").RequiredFilter<import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>>, Key>]: (import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>>)[Key]; } : never) & (import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>> extends infer T_3 ? { [Key_1 in keyof T_3 as import("type-fest/source/enforce-optional").OptionalFilter<import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>>, Key_1>]?: Exclude<(import("type-fest/source/merge").SimpleMerge<import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").PickIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>> & import("type-fest/source/merge").SimpleMerge<import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<T> & void>>, import("type-fest").OmitIndexSignature<Partial<import("@appium/types").ConstraintsToCaps<U> & void>>>)[Key_1], undefined> | undefined; } : never))[KeyType]; } : never;
85
+ export function mergeCaps<T extends import("@appium/types").Constraints, U extends import("@appium/types").Constraints, Primary extends import("@appium/types").ConstraintsToCaps<T>, Secondary extends import("@appium/types").ConstraintsToCaps<U>>(primary?: Primary | undefined, secondary?: Secondary | undefined): import("type-fest").MergeExclusive<Primary, Secondary>;
63
86
  export const APPIUM_VENDOR_PREFIX: "appium:";
64
87
  /**
65
88
  * Get an array of all the unprefixed caps that are being used in 'alwaysMatch' and all of the 'firstMatch' object
66
- * @template {Constraints} [C={}]
67
- * @param {import('@appium/types').W3CCapabilities<C>} caps A capabilities object
89
+ * @template {Constraints} C
90
+ * @param {W3CCapabilities<C>} caps A capabilities object
68
91
  */
69
- export function findNonPrefixedCaps<C extends Readonly<Record<string, import("@appium/types").Constraint>> = {}>({ alwaysMatch, firstMatch }: import("@appium/types").W3CCapabilities<C, void>): string[];
92
+ export function findNonPrefixedCaps<C extends import("@appium/types").Constraints>({ alwaysMatch, firstMatch }: import("@appium/types").W3CCapabilities<C>): string[];
70
93
  /**
71
94
  * @param {string} cap
72
95
  * @returns {boolean}
@@ -74,22 +97,22 @@ export function findNonPrefixedCaps<C extends Readonly<Record<string, import("@a
74
97
  export function isStandardCap(cap: string): boolean;
75
98
  /**
76
99
  * If the 'appium:' prefix was provided and it's a valid capability, strip out the prefix
77
- * @template {Constraints} [C={}]
78
- * @param {import('@appium/types').NSCapabilities<C>} caps
100
+ * @template {Constraints} C
101
+ * @param {NSCapabilities<C>} caps
79
102
  * @see https://www.w3.org/TR/webdriver/#dfn-extension-capabilities
80
103
  * @internal
81
- * @returns {import('@appium/types').Capabilities<C>}
104
+ * @returns {Capabilities<C>}
82
105
  */
83
- export function stripAppiumPrefixes<C extends Readonly<Record<string, import("@appium/types").Constraint>> = {}>(caps: Partial<import("@appium/types").CapsToNSCaps<import("@appium/types").ConstraintsToCaps<C> & void, "appium">>): Partial<import("@appium/types").ConstraintsToCaps<C> & void>;
106
+ export function stripAppiumPrefixes<C extends import("@appium/types").Constraints>(caps: Partial<import("@appium/types").CapsToNSCaps<import("@appium/types").ConstraintsToCaps<C>, "appium">>): import("@appium/types").ConstraintsToCaps<C>;
84
107
  /**
85
108
  * Return a copy of a capabilities object which has taken everything within the 'options'
86
109
  * capability and promoted it to the top level.
87
110
  *
88
111
  * @template {Constraints} C
89
- * @param {import('@appium/types').W3CCapabilities<C>} originalCaps
90
- * @return {import('@appium/types').W3CCapabilities<C>} the capabilities with 'options' promoted if necessary
112
+ * @param {W3CCapabilities<C>} originalCaps
113
+ * @return {W3CCapabilities<C>} the capabilities with 'options' promoted if necessary
91
114
  */
92
- export function promoteAppiumOptions<C extends Readonly<Record<string, import("@appium/types").Constraint>>>(originalCaps: import("@appium/types").W3CCapabilities<C, void>): import("@appium/types").W3CCapabilities<C, void>;
115
+ export function promoteAppiumOptions<C extends import("@appium/types").Constraints>(originalCaps: import("@appium/types").W3CCapabilities<C>): import("@appium/types").W3CCapabilities<C>;
93
116
  /**
94
117
  * Return a copy of a "bare" (single-level, non-W3C) capabilities object which has taken everything
95
118
  * within the 'appium:options' capability and promoted it to the top level.
@@ -98,6 +121,6 @@ export function promoteAppiumOptions<C extends Readonly<Record<string, import("@
98
121
  * @param {NSCapabilities<C>} obj
99
122
  * @return {NSCapabilities<C>} the capabilities with 'options' promoted if necessary
100
123
  */
101
- export function promoteAppiumOptionsForObject<C extends Readonly<Record<string, import("@appium/types").Constraint>>>(obj: Partial<import("@appium/types").CapsToNSCaps<import("@appium/types").ConstraintsToCaps<C> & void, "appium">>): Partial<import("@appium/types").CapsToNSCaps<import("@appium/types").ConstraintsToCaps<C> & void, "appium">>;
124
+ export function promoteAppiumOptionsForObject<C extends import("@appium/types").Constraints>(obj: Partial<import("@appium/types").CapsToNSCaps<import("@appium/types").ConstraintsToCaps<C>, "appium">>): Partial<import("@appium/types").CapsToNSCaps<import("@appium/types").ConstraintsToCaps<C>, "appium">>;
102
125
  export const PREFIXED_APPIUM_OPTS_CAP: string;
103
126
  //# sourceMappingURL=capabilities.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"capabilities.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/capabilities.js"],"names":[],"mappings":"AA0FA;;;GAGG;AACH,8FAeE;0BAuUW,OAAO,eAAe,EAAE,WAAW;yBACnC,OAAO,eAAe,EAAE,UAAU;2BAClC,OAAO,eAAe,EAAE,YAAY;uCACpC,OAAO,eAAe,EAAE,wBAAwB;wGAKhD,OAAO,eAAe,EAAE,iBAAiB,CAAC,CAAC,CAAC;;;;;;;qOAW5C,OAAO,eAAe,EAAE,cAAc,CAAC,CAAC,EAAE,KAAK,CAAC;mOAMhD,OAAO,eAAe,EAAE,YAAY,CAAC,CAAC,EAAE,KAAK,CAAC;sOAM9C,OAAO,eAAe,EAAE,eAAe,CAAC,CAAC,EAAE,KAAK,CAAC;0BAKjD,OAAO,WAAW,EAAE,KAAK,CAAC,CAAC,EAAC,CAAC,CAAC;6BAI9B,OAAO,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;AA3R/C;;;;;;;GAOG;AACH;;;;;;EAmGC;AAGD;;;;;;GAMG;AACH,4SAuBC;AApSD;;;;;;GAMG;AACH,8SAwCC;AA7ED;;;;;;;;GAQG;AACH,62NAkBC;AA9BD,6CAAuC;AAuKvC;;;;GAIG;AACH,0MAWC;AA9ED;;;GAGG;AACH,mCAHW,MAAM,GACJ,OAAO,CAInB;AAED;;;;;;;GAOG;AACH,mSA4CC;AAgOD;;;;;;;GAOG;AACH,+NAcC;AApFD;;;;;;;GAOG;AACH,uVAoDC;AAlYD,8CAAkE"}
1
+ {"version":3,"file":"capabilities.d.ts","sourceRoot":"","sources":["../../../lib/basedriver/capabilities.js"],"names":[],"mappings":"AA+FA;;;GAGG;AACH,8FAeE;;;;;uBAsFY,eAAe,CAAC,CAAC,EAAE;6BACnB,aAAa,CAAC,CAAC,EAAE;kBACjB,eAAe,CAAC,CAAC;iBACjB,aAAa,CAAC,CAAC,GAAC,IAAI;sBACpB,MAAM,EAAE;;0BAwPT,OAAO,eAAe,EAAE,WAAW;yBACnC,OAAO,eAAe,EAAE,UAAU;2BAClC,OAAO,eAAe,EAAE,YAAY;uCACpC,OAAO,eAAe,EAAE,wBAAwB;+EAKhD,OAAO,eAAe,EAAE,iBAAiB,CAAC,CAAC,CAAC;;;;;;;4EAU5C,OAAO,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC;0EAKzC,OAAO,eAAe,EAAE,YAAY,CAAC,CAAC,CAAC;6EAKvC,OAAO,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC;6BAK1C,OAAO,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;;;;mCAKlC,OAAO,WAAW,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;AAtSrD;;;;;;;;;GASG;AAEH;;;;;;;;GAQG;AACH,iNAmGC;AAED;;;;;;;;GAQG;AACH,sRAuBC;AAhTD;;;;;;;GAOG;AACH,gPAwCC;AAlFD;;;;;;;;;;GAUG;AACH,gXAqBC;AAnCD,6CAAuC;AA0KvC;;;;GAIG;AACH,sKAWC;AA5ED;;;GAGG;AACH,mCAHW,MAAM,GACJ,OAAO,CAInB;AAED;;;;;;;GAOG;AACH,8OA0CC;AA6OD;;;;;;;GAOG;AACH,0LAcC;AApFD;;;;;;;GAOG;AACH,gTAoDC;AAlZD,8CAAkE"}
@@ -16,18 +16,20 @@ const PREFIXED_APPIUM_OPTS_CAP = `${APPIUM_VENDOR_PREFIX}options`;
16
16
  exports.PREFIXED_APPIUM_OPTS_CAP = PREFIXED_APPIUM_OPTS_CAP;
17
17
  /**
18
18
  * Takes primary caps object and merges it into a secondary caps object.
19
- * @template {Constraints} [T={}]
20
- * @template {Constraints} [U={}]
21
- * @param {Capabilities<T>} [primary]
22
- * @param {Capabilities<U>} [secondary]
23
- * @returns {Merge<Capabilities<T>, Capabilities<U>>}
19
+ * @template {Constraints} T
20
+ * @template {Constraints} U
21
+ * @template {Capabilities<T>} Primary
22
+ * @template {Capabilities<U>} Secondary
23
+ * @param {Primary} [primary]
24
+ * @param {Secondary} [secondary]
25
+ * @returns {MergeExclusive<Primary, Secondary>}
24
26
  * @see https://www.w3.org/TR/webdriver/#dfn-merging-capabilities)
25
27
  */
26
- function mergeCaps(primary = {}, secondary = {}) {
27
- let result = /** @type {Merge<Capabilities<T>, Capabilities<U>>} */ ({
28
+ function mergeCaps(primary = /** @type {Primary} */ ({}), secondary = /** @type {Secondary} */ ({})) {
29
+ let result = /** @type {MergeExclusive<Primary, Secondary>} */ ({
28
30
  ...primary,
29
31
  });
30
- for (let [name, value] of /** @type {[keyof typeof secondary, any]} */ (lodash_1.default.toPairs(secondary))) {
32
+ for (let [name, value] of Object.entries(secondary)) {
31
33
  // Overwriting is not allowed. Primary and secondary must have different properties (w3c rule 4.4)
32
34
  if (!lodash_1.default.isUndefined(primary[name])) {
33
35
  throw new errors_1.errors.InvalidArgumentError(`property '${name}' should not exist on both primary (${JSON.stringify(primary)}) and secondary (${JSON.stringify(secondary)}) object`);
@@ -37,9 +39,9 @@ function mergeCaps(primary = {}, secondary = {}) {
37
39
  return result;
38
40
  }
39
41
  exports.mergeCaps = mergeCaps;
40
- // Validates caps against a set of constraints
41
42
  /**
42
- * @template {Constraints} [C={}]
43
+ * Validates caps against a set of constraints
44
+ * @template {Constraints} C
43
45
  * @param {Capabilities<C>} caps
44
46
  * @param {C} [constraints]
45
47
  * @param {ValidateCapsOpts} [opts]
@@ -105,22 +107,22 @@ function isStandardCap(cap) {
105
107
  exports.isStandardCap = isStandardCap;
106
108
  /**
107
109
  * If the 'appium:' prefix was provided and it's a valid capability, strip out the prefix
108
- * @template {Constraints} [C={}]
109
- * @param {import('@appium/types').NSCapabilities<C>} caps
110
+ * @template {Constraints} C
111
+ * @param {NSCapabilities<C>} caps
110
112
  * @see https://www.w3.org/TR/webdriver/#dfn-extension-capabilities
111
113
  * @internal
112
- * @returns {import('@appium/types').Capabilities<C>}
114
+ * @returns {Capabilities<C>}
113
115
  */
114
116
  function stripAppiumPrefixes(caps) {
115
117
  // split into prefixed and non-prefixed.
116
118
  // non-prefixed should be standard caps at this point
117
119
  const [prefixedCaps, nonPrefixedCaps] = lodash_1.default.partition(lodash_1.default.keys(caps), (cap) => String(cap).startsWith(APPIUM_VENDOR_PREFIX));
118
120
  // initialize this with the k/v pairs of the non-prefixed caps
119
- let strippedCaps = /** @type {import('@appium/types').Capabilities<C>} */ (lodash_1.default.pick(caps, nonPrefixedCaps));
121
+ let strippedCaps = /** @type {Capabilities<C>} */ (lodash_1.default.pick(caps, nonPrefixedCaps));
120
122
  const badPrefixedCaps = [];
121
123
  // Strip out the 'appium:' prefix
122
124
  for (let prefixedCap of prefixedCaps) {
123
- const strippedCapName = /** @type {StringKeyOf<import('@appium/types').Capabilities<C>>} */ (prefixedCap.substring(APPIUM_VENDOR_PREFIX.length));
125
+ const strippedCapName = /** @type {StringKeyOf<Capabilities<C>>} */ (prefixedCap.substring(APPIUM_VENDOR_PREFIX.length));
124
126
  // If it's standard capability that was prefixed, add it to an array of incorrectly prefixed capabilities
125
127
  if (isStandardCap(strippedCapName)) {
126
128
  badPrefixedCaps.push(strippedCapName);
@@ -145,8 +147,8 @@ function stripAppiumPrefixes(caps) {
145
147
  exports.stripAppiumPrefixes = stripAppiumPrefixes;
146
148
  /**
147
149
  * Get an array of all the unprefixed caps that are being used in 'alwaysMatch' and all of the 'firstMatch' object
148
- * @template {Constraints} [C={}]
149
- * @param {import('@appium/types').W3CCapabilities<C>} caps A capabilities object
150
+ * @template {Constraints} C
151
+ * @param {W3CCapabilities<C>} caps A capabilities object
150
152
  */
151
153
  function findNonPrefixedCaps({ alwaysMatch = {}, firstMatch = [] }) {
152
154
  return lodash_1.default.chain([alwaysMatch, ...firstMatch])
@@ -158,13 +160,24 @@ function findNonPrefixedCaps({ alwaysMatch = {}, firstMatch = [] }) {
158
160
  .value();
159
161
  }
160
162
  exports.findNonPrefixedCaps = findNonPrefixedCaps;
163
+ /**
164
+ * Returned by {@linkcode parseCaps}
165
+ * @template {Constraints} C
166
+ * @typedef ParsedCaps
167
+ * @property {NSCapabilities<C>[]} allFirstMatchCaps
168
+ * @property {Capabilities<C>[]} validatedFirstMatchCaps
169
+ * @property {NSCapabilities<C>} requiredCaps
170
+ * @property {Capabilities<C>|null} matchedCaps
171
+ * @property {string[]} validationErrors
172
+ */
161
173
  /**
162
174
  * Parse capabilities
163
- * @template {Constraints} [C={}]
164
- * @param {import('@appium/types').W3CCapabilities<C>} caps
175
+ * @template {Constraints} C
176
+ * @param {W3CCapabilities<C>} caps
165
177
  * @param {C} [constraints]
166
178
  * @param {boolean} [shouldValidateCaps]
167
179
  * @see https://www.w3.org/TR/webdriver/#processing-capabilities
180
+ * @returns {ParsedCaps<C>}
168
181
  */
169
182
  function parseCaps(caps, constraints = /** @type {C} */ ({}), shouldValidateCaps = true) {
170
183
  // If capabilities request is not an object, return error (#1.1)
@@ -173,8 +186,8 @@ function parseCaps(caps, constraints = /** @type {C} */ ({}), shouldValidateCaps
173
186
  }
174
187
  // Let 'requiredCaps' be property named 'alwaysMatch' from capabilities request (#2)
175
188
  // and 'allFirstMatchCaps' be property named 'firstMatch' from capabilities request (#3)
176
- let { alwaysMatch: requiredCaps = {}, // If 'requiredCaps' is undefined, set it to an empty JSON object (#2.1)
177
- firstMatch: allFirstMatchCaps = [{}], // If 'firstMatch' is undefined set it to a singleton list with one empty object (#3.1)
189
+ let { alwaysMatch: requiredCaps = /** @type {NSCapabilities<C>} */ ({}), // If 'requiredCaps' is undefined, set it to an empty JSON object (#2.1)
190
+ firstMatch: allFirstMatchCaps = /** @type {NSCapabilities<C>[]} */ ([{}]), // If 'firstMatch' is undefined set it to a singleton list with one empty object (#3.1)
178
191
  } = caps;
179
192
  // Reject 'firstMatch' argument if it's not an array (#3.2)
180
193
  if (!lodash_1.default.isArray(allFirstMatchCaps)) {
@@ -194,6 +207,7 @@ function parseCaps(caps, constraints = /** @type {C} */ ({}), shouldValidateCaps
194
207
  }
195
208
  // Strip out the 'appium:' prefix from all
196
209
  let strippedRequiredCaps = stripAppiumPrefixes(requiredCaps);
210
+ /** @type {Capabilities<C>[]} */
197
211
  let strippedAllFirstMatchCaps = allFirstMatchCaps.map(stripAppiumPrefixes);
198
212
  // Validate the requiredCaps. But don't validate 'presence' because if that constraint fails on 'alwaysMatch' it could still pass on one of the 'firstMatch' keys
199
213
  if (shouldValidateCaps) {
@@ -207,11 +221,7 @@ function parseCaps(caps, constraints = /** @type {C} */ ({}), shouldValidateCaps
207
221
  // Validate all of the first match capabilities and return an array with only the valid caps (see spec #5)
208
222
  /** @type {string[]} */
209
223
  let validationErrors = [];
210
- let validatedFirstMatchCaps = lodash_1.default.compact(strippedAllFirstMatchCaps.map(
211
- /**
212
- * @param {import('@appium/types').Capabilities<C>} firstMatchCaps
213
- */
214
- (firstMatchCaps) => {
224
+ let validatedFirstMatchCaps = lodash_1.default.compact(strippedAllFirstMatchCaps.map((firstMatchCaps) => {
215
225
  try {
216
226
  // Validate firstMatch caps
217
227
  return shouldValidateCaps
@@ -222,7 +232,11 @@ function parseCaps(caps, constraints = /** @type {C} */ ({}), shouldValidateCaps
222
232
  validationErrors.push(e.message);
223
233
  }
224
234
  }));
225
- // Try to merge requiredCaps with first match capabilities, break once it finds its first match (see spec #6)
235
+ /**
236
+ * Try to merge requiredCaps with first match capabilities, break once it finds its first match
237
+ * (see spec #6)
238
+ * @type {ParsedCaps<C>['matchedCaps']}
239
+ */
226
240
  let matchedCaps = null;
227
241
  for (let firstMatchCaps of validatedFirstMatchCaps) {
228
242
  try {
@@ -246,13 +260,14 @@ function parseCaps(caps, constraints = /** @type {C} */ ({}), shouldValidateCaps
246
260
  };
247
261
  }
248
262
  exports.parseCaps = parseCaps;
249
- // Calls parseCaps and just returns the matchedCaps variable
250
263
  /**
264
+ * Calls parseCaps and just returns the matchedCaps variable
251
265
  * @template {Constraints} C
252
- * @param {import('@appium/types').W3CCapabilities<C>} w3cCaps
266
+ * @template {W3CCapabilities<C>} W3CCaps
267
+ * @param {W3CCaps} w3cCaps
253
268
  * @param {C} [constraints]
254
269
  * @param {boolean} [shouldValidateCaps]
255
- * @returns {import('@appium/types').Capabilities<C>}
270
+ * @returns {Capabilities<C>}
256
271
  */
257
272
  function processCapabilities(w3cCaps, constraints = /** @type {C} */ ({}), shouldValidateCaps = true) {
258
273
  const { matchedCaps, validationErrors } = parseCaps(w3cCaps, constraints, shouldValidateCaps);
@@ -324,8 +339,8 @@ exports.promoteAppiumOptionsForObject = promoteAppiumOptionsForObject;
324
339
  * capability and promoted it to the top level.
325
340
  *
326
341
  * @template {Constraints} C
327
- * @param {import('@appium/types').W3CCapabilities<C>} originalCaps
328
- * @return {import('@appium/types').W3CCapabilities<C>} the capabilities with 'options' promoted if necessary
342
+ * @param {W3CCapabilities<C>} originalCaps
343
+ * @return {W3CCapabilities<C>} the capabilities with 'options' promoted if necessary
329
344
  */
330
345
  function promoteAppiumOptions(originalCaps) {
331
346
  const result = {};
@@ -360,26 +375,23 @@ exports.promoteAppiumOptions = promoteAppiumOptions;
360
375
  * @property {boolean} [skipPresenceConstraint] - if true, skip the presence constraint
361
376
  */
362
377
  /**
363
- * @template {Constraints} [C=BaseDriverCapConstraints]
364
- * @template {StringRecord|void} [Extra=void]
365
- * @typedef {import('@appium/types').NSCapabilities<C, Extra>} NSCapabilities
366
- */
367
- /**
368
- * @template {Constraints} [C=BaseDriverCapConstraints]
369
- * @template {StringRecord|void} [Extra=void]
370
- * @typedef {import('@appium/types').Capabilities<C, Extra>} Capabilities
378
+ * @template {Constraints} C
379
+ * @typedef {import('@appium/types').NSCapabilities<C>} NSCapabilities
371
380
  */
372
381
  /**
373
- * @template {Constraints} [C=BaseDriverCapConstraints]
374
- * @template {StringRecord|void} [Extra=void]
375
- * @typedef {import('@appium/types').W3CCapabilities<C, Extra>} W3CCapabilities
382
+ * @template {Constraints} C
383
+ * @typedef {import('@appium/types').Capabilities<C>} Capabilities
376
384
  */
377
385
  /**
378
- * @template T,U
379
- * @typedef {import('type-fest').Merge<T,U>} Merge
386
+ * @template {Constraints} C
387
+ * @typedef {import('@appium/types').W3CCapabilities<C>} W3CCapabilities
380
388
  */
381
389
  /**
382
390
  * @template T
383
391
  * @typedef {import('type-fest').StringKeyOf<T>} StringKeyOf
384
392
  */
393
+ /**
394
+ * @template T,U
395
+ * @typedef {import('type-fest').MergeExclusive<T, U>} MergeExclusive<T,U>
396
+ */
385
397
  //# sourceMappingURL=capabilities.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"capabilities.js","sourceRoot":"","sources":["../../../lib/basedriver/capabilities.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"capabilities.js","sourceRoot":"","sources":["../../../lib/basedriver/capabilities.js"],"names":[],"mappings":"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"}
@@ -1,10 +1,6 @@
1
- /**
2
- * @template {Constraints} C
3
- * @param {import('./timeout').TimeoutBase<C>} Base
4
- * @returns {EventBase<C>}
5
- */
6
- export function EventMixin<C extends Readonly<Record<string, import("@appium/types").Constraint>>>(Base: import("./timeout").TimeoutBase<C>): EventBase<C>;
7
- export type Constraints = import('@appium/types').Constraints;
8
- export type IEventCommands = import('@appium/types').IEventCommands;
9
- export type EventBase<C extends Readonly<Record<string, import("@appium/types").Constraint>>> = import('../driver').BaseDriverBase<C, import('@appium/types').ITimeoutCommands & IEventCommands>;
1
+ import { Constraints, IEventCommands } from '@appium/types';
2
+ declare module '../driver' {
3
+ interface BaseDriver<C extends Constraints> extends IEventCommands {
4
+ }
5
+ }
10
6
  //# sourceMappingURL=event.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/event.js"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,2JA2CC;0BAGY,OAAO,eAAe,EAAE,WAAW;6BACnC,OAAO,eAAe,EAAE,cAAc;gGAKtC,OAAO,WAAW,EAAE,cAAc,CAAC,CAAC,EAAE,OAAO,eAAe,EAAE,gBAAgB,GAAG,cAAc,CAAC"}
1
+ {"version":3,"file":"event.d.ts","sourceRoot":"","sources":["../../../../lib/basedriver/commands/event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAE,cAAc,EAAC,MAAM,eAAe,CAAC;AAK1D,OAAO,QAAQ,WAAW,CAAC;IAEzB,UAAU,UAAU,CAAC,CAAC,SAAS,WAAW,CAAE,SAAQ,cAAc;KAAG;CACtE"}
@@ -3,58 +3,37 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.EventMixin = void 0;
7
- /* eslint-disable require-await */
8
- // @ts-check
9
6
  const lodash_1 = __importDefault(require("lodash"));
10
- /**
11
- * @template {Constraints} C
12
- * @param {import('./timeout').TimeoutBase<C>} Base
13
- * @returns {EventBase<C>}
14
- */
15
- function EventMixin(Base) {
7
+ const mixin_1 = require("./mixin");
8
+ const EventCommands = {
16
9
  /**
17
- * @implements {IEventCommands}
10
+ * Log a user-defined event in the event log.
11
+ *
12
+ * @param vendor - a vendor prefix for the user, to ensure namespace
13
+ * separation
14
+ * @param event - the event name
18
15
  */
19
- class EventCommands extends Base {
20
- /**
21
- * Log a user-defined event in the event log.
22
- *
23
- * @param {string} vendor - a vendor prefix for the user, to ensure namespace
24
- * separation
25
- * @param {string} event - the event name
26
- */
27
- async logCustomEvent(vendor, event) {
28
- this.logEvent(`${vendor}:${event}`);
16
+ async logCustomEvent(vendor, event) {
17
+ this.logEvent(`${vendor}:${event}`);
18
+ },
19
+ /**
20
+ * Get the event log
21
+ * @param type - the event type to filter with.
22
+ * It returns all events if the type is not provided or empty string/array.
23
+ * @returns the event history log object
24
+ */
25
+ async getLogEvents(type) {
26
+ if (lodash_1.default.isEmpty(type)) {
27
+ return this.eventHistory;
29
28
  }
30
- /**
31
- * Get the event log
32
- * @param {string|string[]} [type] - the event type to filter with.
33
- * It returns all events if the type is not provided or empty string/array.
34
- * @returns {Promise<import('@appium/types').EventHistory|Record<string,number>>} - the event history log object
35
- */
36
- async getLogEvents(type) {
37
- if (lodash_1.default.isEmpty(type)) {
38
- return this.eventHistory;
29
+ const typeList = lodash_1.default.castArray(type);
30
+ return lodash_1.default.reduce(this.eventHistory, (acc, eventTimes, eventType) => {
31
+ if (typeList.includes(eventType)) {
32
+ acc[eventType] = eventTimes;
39
33
  }
40
- const typeList = lodash_1.default.castArray(type);
41
- return lodash_1.default.reduce(this.eventHistory, (acc, eventTimes, eventType) => {
42
- if (typeList.includes(eventType)) {
43
- acc[eventType] = eventTimes;
44
- }
45
- return acc;
46
- }, {});
47
- }
48
- }
49
- return EventCommands;
50
- }
51
- exports.EventMixin = EventMixin;
52
- /**
53
- * @typedef {import('@appium/types').Constraints} Constraints
54
- * @typedef {import('@appium/types').IEventCommands} IEventCommands
55
- */
56
- /**
57
- * @template {Constraints} C
58
- * @typedef {import('../driver').BaseDriverBase<C, import('@appium/types').ITimeoutCommands & IEventCommands>} EventBase
59
- */
34
+ return acc;
35
+ }, {});
36
+ },
37
+ };
38
+ (0, mixin_1.mixin)(EventCommands);
60
39
  //# sourceMappingURL=event.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"event.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/event.js"],"names":[],"mappings":";;;;;;AAAA,kCAAkC;AAClC,YAAY;AACZ,oDAAuB;AAEvB;;;;GAIG;AACH,SAAgB,UAAU,CAAC,IAAI;IAC7B;;OAEG;IACH,MAAM,aAAc,SAAQ,IAAI;QAC9B;;;;;;WAMG;QACH,KAAK,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK;YAChC,IAAI,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,KAAK,EAAE,CAAC,CAAC;QACtC,CAAC;QAED;;;;;WAKG;QACH,KAAK,CAAC,YAAY,CAAC,IAAI;YACrB,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACnB,OAAO,IAAI,CAAC,YAAY,CAAC;aAC1B;YAED,MAAM,QAAQ,GAAG,gBAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YAEnC,OAAO,gBAAC,CAAC,MAAM,CACb,IAAI,CAAC,YAAY,EACjB,CAAC,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE;gBAC7B,IAAI,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;oBAChC,GAAG,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC;iBAC7B;gBACD,OAAO,GAAG,CAAC;YACb,CAAC,EACD,EAAE,CACH,CAAC;QACJ,CAAC;KACF;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AA3CD,gCA2CC;AAED;;;GAGG;AAEH;;;GAGG"}
1
+ {"version":3,"file":"event.js","sourceRoot":"","sources":["../../../../lib/basedriver/commands/event.ts"],"names":[],"mappings":";;;;;AACA,oDAAuB;AAEvB,mCAA8B;AAO9B,MAAM,aAAa,GAAmB;IACpC;;;;;;OAMG;IACH,KAAK,CAAC,cAAc,CAA6C,MAAc,EAAE,KAAa;QAC5F,IAAI,CAAC,QAAQ,CAAC,GAAG,MAAM,IAAI,KAAK,EAAE,CAAC,CAAC;IACtC,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,YAAY,CAA6C,IAAuB;QACpF,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACnB,OAAO,IAAI,CAAC,YAAY,CAAC;SAC1B;QAED,MAAM,QAAQ,GAAG,gBAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QAEnC,OAAO,gBAAC,CAAC,MAAM,CACb,IAAI,CAAC,YAAY,EACjB,CAAC,GAAG,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE;YAC7B,IAAI,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gBAChC,GAAG,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC;aAC7B;YACD,OAAO,GAAG,CAAC;QACb,CAAC,EACD,EAAE,CACH,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,IAAA,aAAK,EAAC,aAAa,CAAC,CAAC"}