add support for the TEXT descriptor

Author: schubev

__tests__/index_test.ml

@@ -2,20 +2,21 @@ open Jest
 open Expect
 open Index
 
-let d ?title ?className ?regexpTitle ?regexpClassName ?last ?active ?x ?y ?w ?h
-    ?instance () =
+let d ?title ?className ?regexpTitle ?regexpClassName ?text ?last ?active ?x ?y
+    ?w ?h ?instance () =
   let title = title |. Js.Nullable.fromOption in
   let className = className |. Js.Nullable.fromOption in
   let regexpTitle = regexpTitle |. Js.Nullable.fromOption in
   let regexpClassName = regexpClassName |. Js.Nullable.fromOption in
+  let text = text |. Js.Nullable.fromOption in
   let last = last |. Js.Nullable.fromOption in
   let active = active |. Js.Nullable.fromOption in
   let x = x |. Js.Nullable.fromOption in
   let y = y |. Js.Nullable.fromOption in
   let w = w |. Js.Nullable.fromOption in
   let h = h |. Js.Nullable.fromOption in
   let instance = instance |. Js.Nullable.fromOption in
-  descriptorTagged ~title ~className ~regexpTitle ~regexpClassName ~last
+  descriptorTagged ~title ~className ~regexpTitle ~regexpClassName ~text ~last
     ~active ~x ~y ~w ~h ~instance
 
 let cases =
@@ -35,7 +36,8 @@ let cases =
   ; ( "[TITLE:toto; CLASS:ta;;ta]"
     , fun () -> d ~title:"toto" ~className:"ta;ta" () )
   ; ( "[TITLE:to;;to; CLASS:ta;;ta]"
-    , fun () -> d ~title:"to;to" ~className:"ta;ta" () ) ]
+    , fun () -> d ~title:"to;to" ~className:"ta;ta" () )
+  ; ("[TEXT:text text text]", fun () -> d ~text:"text text text" ()) ]
 
 let makeTest (expected, case) =
   test expected (fun () -> expect (case ()) |> toEqual expected)

lib/js/__tests__/index_test.js

@@ -1,6 +1,6 @@
 {
   "name": "autoit-advanced-descriptor",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Generate AutoIT advanced window descriptions according to https://www.autoitscript.com/autoit3/docs/intro/windowsadvanced.htm",
   "main": "lib/js/src/index.js",
   "types": "src/index.d.ts",

lib/js/src/index.js

@@ -3,6 +3,7 @@ export interface WindowDescription {
   readonly className?: string
   readonly regexpTitle?: string
   readonly regexpClassName?: string
+  readonly text?: string
   readonly instance?: number
   readonly active?: boolean
   readonly last?: boolean

package.json

@@ -3,6 +3,7 @@ type windowDescription =
   ; className: string Js.Nullable.t
   ; regexpTitle: string Js.Nullable.t
   ; regexpClassName: string Js.Nullable.t
+  ; text: string Js.Nullable.t
   ; last: bool Js.Nullable.t
   ; active: bool Js.Nullable.t
   ; x: int Js.Nullable.t
@@ -38,13 +39,14 @@ let addBooleanDescriptor acc key value =
   | Some false | None ->
       ()
 
-let descriptorTagged ~title ~className ~regexpTitle ~regexpClassName ~last
-    ~active ~x ~y ~w ~h ~instance =
+let descriptorTagged ~title ~className ~regexpTitle ~regexpClassName ~text
+    ~last ~active ~x ~y ~w ~h ~instance =
   let descriptors = [||] in
   addStringDescriptor descriptors "TITLE" title ;
   addStringDescriptor descriptors "CLASS" className ;
   addStringDescriptor descriptors "REGEXPTITLE" regexpTitle ;
   addStringDescriptor descriptors "REGEXPCLASS" regexpClassName ;
+  addStringDescriptor descriptors "TEXT" text ;
   addIntegerDescriptor descriptors "INSTANCE" instance ;
   addBooleanDescriptor descriptors "ACTIVE" active ;
   addBooleanDescriptor descriptors "LAST" last ;
@@ -60,12 +62,13 @@ let descriptor windowDescription =
   let className = windowDescription |. classNameGet in
   let regexpTitle = windowDescription |. regexpTitleGet in
   let regexpClassName = windowDescription |. regexpClassNameGet in
+  let text = windowDescription |. textGet in
   let instance = windowDescription |. instanceGet in
   let active = windowDescription |. activeGet in
   let last = windowDescription |. lastGet in
   let x = windowDescription |. xGet in
   let y = windowDescription |. yGet in
   let w = windowDescription |. wGet in
   let h = windowDescription |. hGet in
-  descriptorTagged ~title ~className ~regexpTitle ~regexpClassName ~instance
-    ~active ~last ~x ~y ~w ~h
+  descriptorTagged ~title ~className ~regexpTitle ~regexpClassName ~text
+    ~instance ~active ~last ~x ~y ~w ~h

src/index.d.ts

@@ -3,6 +3,7 @@ type windowDescription =
   ; className: string Js.Nullable.t
   ; regexpTitle: string Js.Nullable.t
   ; regexpClassName: string Js.Nullable.t
+  ; text: string Js.Nullable.t
   ; last: bool Js.Nullable.t
   ; active: bool Js.Nullable.t
   ; x: int Js.Nullable.t
@@ -17,6 +18,7 @@ val descriptorTagged :
   -> className:string Js.Nullable.t
   -> regexpTitle:string Js.Nullable.t
   -> regexpClassName:string Js.Nullable.t
+  -> text:string Js.Nullable.t
   -> last:bool Js.Nullable.t
   -> active:bool Js.Nullable.t
   -> x:int Js.Nullable.t