fix:更新d.ts到4.1.0

Author: guomingliang

other/hbuilderx-autotest/common/git.d.ts

@@ -1,4 +1,7 @@
 import { SimpleGit } from 'simple-git';
+/**
+ * 基于simple-git封装的git操作
+*/
 export default class Git {
     private options;
     private localDir;

other/hbuilderx-autotest/common/utils.d.ts

@@ -4,6 +4,8 @@ export declare const getInitTestFile: (fileOrProjectKey: string) => string;
 export declare const sleep: (time?: number) => Promise<unknown>;
 export declare const getTmpdir: (time?: number) => string;
 export declare const isWin: () => boolean;
+export declare const isMac: () => boolean;
+export declare const getTaskPlatform: () => string;
 export declare const getPlatform: () => string;
 export declare const generateCode: (file: any, recordOpt: any) => string;
 export declare const requireFunc: any;

other/hbuilderx-autotest/core/autotest.d.ts

@@ -47,12 +47,14 @@ export interface AutoTestAutoEditCase extends AutoTestCase<AutoEditExpect> {
     input: string;
 }
 export interface DefinitionExpect {
+    continueAfterjumping: any;
     uri: string;
     line: string | RegExp;
     cursor?: number;
 }
 export interface AutoTestDefinitionCase extends AutoTestCase<DefinitionExpect> {
     kind: 'definition';
+    continueAfterjumping?: boolean;
     range: Range;
 }
 export interface HoverExpect {
@@ -82,6 +84,22 @@ export interface AutoTestOutlineCase extends AutoTestCase<OutlineExpect> {
     programData: string;
     programPlugin: string;
 }
+export interface FoldExpect {
+    filePath: string;
+}
+export interface AutoTestFoldCase extends AutoTestCase<FoldExpect> {
+    kind: 'fold';
+    needCreate?: boolean;
+    project: string;
+    lsDir: string;
+    programData: string;
+    programPlugin: string;
+}
+export interface OpenFileExpect {
+    uri: string;
+}
+export interface AutoTestOpenFileCase extends AutoTestCase<OpenFileExpect> {
+}
 export interface ReferencesExpect {
     filePath: string;
 }

other/hbuilderx-autotest/core/caseHandler.d.ts

@@ -1,4 +1,4 @@
-import { AutoTestCheckEditorCase, AutoTestCompletionCase, AutoTestDbClickCase, AutoTestDefinitionCase, AutoTestHoverCase, AutoTestKeybindCase, AutoTestOutlineCase, AutoTestPerformanceCase, AutoTestReferencesCase } from './autotest';
+import { AutoTestCheckEditorCase, AutoTestCompletionCase, AutoTestDbClickCase, AutoTestDefinitionCase, AutoTestFoldCase, AutoTestHoverCase, AutoTestKeybindCase, AutoTestOpenFileCase, AutoTestOutlineCase, AutoTestPerformanceCase, AutoTestReferencesCase } from './autotest';
 import { Editor } from './editor';
 declare function runDbClickCase(test: AutoTestDbClickCase, editor: Editor): Promise<({
     casename: string;
@@ -11,7 +11,7 @@ declare function runDbClickCase(test: AutoTestDbClickCase, editor: Editor): Prom
 })[]>;
 declare function runCompletionCase(test: AutoTestCompletionCase, editor: Editor, config?: any): Promise<any[]>;
 declare function runKeybindCase(test: AutoTestKeybindCase, editor: Editor): Promise<any[]>;
-declare function runDefinitionCase(test: AutoTestDefinitionCase, editor: Editor): Promise<({
+declare function runDefinitionCase(test: AutoTestDefinitionCase, editor: Editor, config?: any): Promise<({
     casename: string;
     passed: boolean;
     message: string;
@@ -41,5 +41,18 @@ declare function runPerformanceCase(test: AutoTestPerformanceCase, editor: Edito
     timer?: undefined;
 })[]>;
 declare function runOutlineCase(test: AutoTestOutlineCase, editor: Editor): Promise<any[]>;
+declare function runFoldCase(test: AutoTestFoldCase, editor: Editor): Promise<any[]>;
 declare function runReferencesCase(test: AutoTestReferencesCase, editor: Editor): Promise<any[]>;
-export { runCheckEditor, runCompletionCase, runDbClickCase, runDefinitionCase, runErrorCase, runHoverCase, runKeybindCase, runNoErrorCase, runOutlineCase, runPerformanceCase, runReferencesCase };
+declare function runTypeAheadCase(test: AutoTestCompletionCase, editor: Editor): Promise<void>;
+declare function runOpenFileCase(test: AutoTestOpenFileCase, config?: any): Promise<({
+    casename: string;
+    passed: boolean;
+    message: string;
+    context: any;
+} | {
+    casename: string;
+    passed: boolean;
+    context: any;
+    message?: undefined;
+})[]>;
+export { runCheckEditor, runCompletionCase, runDbClickCase, runDefinitionCase, runErrorCase, runFoldCase, runHoverCase, runKeybindCase, runNoErrorCase, runOpenFileCase, runOutlineCase, runPerformanceCase, runReferencesCase, runTypeAheadCase };

other/hbuilderx-autotest/core/caseHandler/fold.d.ts

@@ -0,0 +1,23 @@
+import { AutoTestFoldCase } from '../autotest';
+import { Editor, FoldData } from '../editor';
+import { HBuilderX } from '../hxdriver';
+import { TreeItem } from '../treeItem';
+declare class Fold {
+    readonly hx: HBuilderX;
+    protected treeItem: TreeItem;
+    constructor(hx: HBuilderX);
+    private getFilePath;
+    /**
+     * 获取折叠文件数据
+     */
+    private getFoldFileData;
+    /**
+     * 对比结果
+     */
+    comparativeData(mainData: FoldData, targetData: FoldData): Promise<string>;
+    /**
+     * 执行测试用例
+     */
+    runFoldCase(test: AutoTestFoldCase, editor: Editor): Promise<any[]>;
+}
+export { Fold };

other/hbuilderx-autotest/core/caseHandler/outline.d.ts

@@ -18,7 +18,7 @@ declare class Outline {
     /**
      * 处理点击跳转
      */
-    doTreeItemJump(test: AutoTestOutlineCase, jsonData: TreeItemInfo, filePath: string, title: string, result: any[]): Promise<void>;
+    doTreeItemJump(test: AutoTestOutlineCase, jsonData: TreeItemInfo, filePath: string, title: string, needCreate: boolean, result: any[]): Promise<void>;
     /**
      * 执行大纲测试用例
      */

other/hbuilderx-autotest/core/caseHandler/references.d.ts

@@ -18,7 +18,7 @@ declare class References {
     /**
      * 处理点击跳转
      */
-    doTreeItemJump(test: AutoTestReferencesCase, jsonData: TreeItemInfo, filePath: string, title: string, result: any[]): Promise<void>;
+    doTreeItemJump(test: AutoTestReferencesCase, jsonData: TreeItemInfo, filePath: string, title: string, needCreate: boolean, result: any[]): Promise<void>;
     /**
      * 执行查找引用测试用例
      * @param test

other/hbuilderx-autotest/core/editor.d.ts

@@ -12,6 +12,9 @@ export interface DefinitionResult {
     range: Range;
     editor: Editor;
 }
+export interface FoldData {
+    [line: string]: number;
+}
 export interface TextDocument extends FullTextDocument {
     lineAt(line: number): TextDocumentLine;
     getText(range?: Range): string;
@@ -38,14 +41,15 @@ export declare class Editor {
     applyCompletion(index: number): Promise<void>;
     functionSignatures(range: Range): Promise<string>;
     hxSleep(ms: number): Promise<unknown>;
-    hover(range: Range): Promise<string>;
+    hover(range: Range, content?: string): Promise<string>;
     grammarRrror(range: Range): Promise<string>;
     gotoDefinition(range: Range): Promise<DefinitionResult>;
     /**
      * 触发大纲, 获取大纲结果
      */
     outline(): Promise<TreeItemInfo | undefined>;
     closeOutline(): Promise<void>;
+    getFoldData(): Promise<FoldData | undefined>;
     /**
      * 获取查找引用结果
      * @param range

other/hbuilderx-autotest/core/expect.d.ts

@@ -1,3 +1,10 @@
+/**
+ * 断言目标数据包含在源数据中
+ * @param {string} casename
+ * @param {string[]} targetArray
+ * @param {string[]} includeArray
+ * @return
+*/
 declare function expectArrayIncludes(casename: string, targetArray: string[], includeArray: string[]): {
     casename: string;
     passed: boolean;
@@ -7,6 +14,13 @@ declare function expectArrayIncludes(casename: string, targetArray: string[], in
     passed: boolean;
     message?: undefined;
 };
+/**
+ * 断言目标数据不包含在源数据中
+ * @param {string} casename
+ * @param {string[]} targetArray
+ * @param {string[]} excludeArray
+ * @return
+*/
 declare function expectArrayExcludes(casename: string, targetArray: string[], excludeArray: string[]): {
     casename: string;
     passed: boolean;
@@ -16,6 +30,13 @@ declare function expectArrayExcludes(casename: string, targetArray: string[], ex
     passed: boolean;
     message?: undefined;
 };
+/**
+ * 断言两个值是否相等
+ * @param {string} casename
+ * @param {any} target
+ * @param {any} expect
+ * @return
+*/
 declare function expectEquals(casename: string, target: any, expect: any): {
     casename: string;
     passed: boolean;
@@ -25,6 +46,13 @@ declare function expectEquals(casename: string, target: any, expect: any): {
     passed: boolean;
     message?: undefined;
 };
+/**
+ * 断言是否匹配，通过正则匹配值
+ * @param {string} casename
+ * @param {string} target
+ * @param {RegExp} expect
+ * @return
+*/
 declare function expectMatches(casename: string, target: string, expect: RegExp): {
     casename: string;
     passed: boolean;
@@ -34,6 +62,13 @@ declare function expectMatches(casename: string, target: string, expect: RegExp)
     passed: boolean;
     message?: undefined;
 };
+/**
+ * 断言值是否为真
+ * @param {string} casename
+ * @param {boolean} value
+ * @param {any} context
+ * @return
+*/
 declare function expectTrue(casename: string, value: boolean, context?: any): {
     casename: string;
     passed: boolean;

other/hbuilderx-autotest/core/hxdriver.d.ts

@@ -24,6 +24,7 @@ interface SelectorItem {
 interface HBuilderOption {
     program: string;
     args: string[];
+    platform?: string;
     env?: any;
 }
 /**
@@ -44,59 +45,148 @@ export declare class HBuilderX {
     private program;
     private fakeDriver;
     private peocess;
+    private platform;
     applicationActive: boolean;
     constructor(option: HBuilderOption);
+    /**
+     * 获取当前启动程序
+    */
     getProgram(): string;
+    /**
+     * 获取当前启动程序的cli
+    */
+    getCliProgram(): string;
+    /**
+     * 获取当前启动程序的env
+    */
     getEnv(): any;
+    /**
+     * 检验通讯链接状态
+    */
     private checkConnection;
+    /**
+     * 执行command
+    */
     executeCommand(command: string, commandArgs?: any): Promise<unknown>;
+    /**
+     * 发送request
+    */
     request(key: string, params: Record<string, any>): Promise<unknown>;
+    /**
+     * 关闭测试实例
+    */
     waitForClose(): Promise<void>;
+    /**
+     * delay方法
+    */
     delay<T>(delay: number, fn?: () => Promise<T>): Promise<T>;
+    /**
+     * 关闭测试实例,和waitForClose类似
+    */
     hxClose(): void;
+    /**
+     * 判断测试实例是否已关闭
+    */
     hxClosed(): boolean;
+    /**
+     * 等待测试实例启动并建立通讯完成
+    */
     waitForStartAndConnect(): Promise<void>;
+    /**
+     * 获取当前Windows的列表
+    */
     getWindowsIds(): Promise<number[]>;
+    /**
+     * 获取当前激活的Windows
+    */
     getActiveWindowId(): Promise<number>;
+    /**
+     * 对当前界面做截图
+    */
     capturePage(output: string, selector: string, windowId?: number): Promise<string>;
+    /**
+     * 执行指定的快捷键
+    */
     dispatchKeybinding(keybinding: string, selector?: string, windowId?: number, useCommandOnWindows?: boolean): Promise<void>;
     /**
-     * xy不传，默认是选中控件的中心
+     * 等待点击（点击）操作完成，不等待点击的后续任务是否执行，xy不传，默认是选中控件的中心
      */
     waitAndClick(selector: string, xy?: {
         x: number;
         y: number;
     }, tryCount?: number): Promise<void>;
     /**
-     * xy不传，默认是选中控件的中心
+     * 等待点击（双击）操作完成，不等待点击的后续任务是否执行，xy不传，默认是选中控件的中心
      */
     waitAndDbClick(selector: string, xy?: {
         x: number;
         y: number;
     }): Promise<void | undefined>;
     /**
-    * xy不传，默认是选中控件的中心
+    * 等待点击（右键单击）操作完成，不等待点击的后续任务是否执行，xy不传，默认是选中控件的中心
     */
     waitAndRightClick(selector: string, xy?: {
         x: number;
         y: number;
     }, keyModifier?: string): Promise<void | undefined>;
+    /**
+    * 移动鼠标到指定位置，xy不传，默认是选中控件的中心
+    */
     waitForMouseMove(selector: string, xy: {
         x: number;
         y: number;
     }): Promise<void | undefined>;
+    /**
+    * 在指定的元素上输入指定的内容
+    */
     waitForTypeInElement(selector: string, input: string): Promise<void | undefined>;
+    /**
+    * 获取指定元素上的Content属性的值
+    */
     waitForTextContent(selector: string, acceptFn?: (text: string) => boolean, tryCount?: number): Promise<string>;
+    /**
+    * 获取指定选择器的第一个元素，必须是激活的状态
+    */
     waitForActiveElement(selector: string, tryCount?: number): Promise<IElement>;
+    /**
+    * 获取指定选择器的第全部元素
+    */
     waitForElements(selector: string, tryCount?: number): Promise<IElement[]>;
+    /**
+    * 获取指定选择器的第一个元素
+    */
     waitForElement(selector: string, tryCount?: number): Promise<IElement | undefined>;
+    /**
+    * 获取指定选择器指定属性，返回的是全部元素
+    */
     waitForElementsWithAttrs(selector: string, containAttributes?: string[], tryCount?: number): Promise<IElement[]>;
+    /**
+    * 获取指定选择器指定属性，返回的是第一个元素
+    */
     waitForElementWithAttrs(selector: string, containAttributes?: string[], tryCount?: number): Promise<IElement | undefined>;
+    /**
+    * 指定元素设置属性值
+    */
     waitForSetValue(selector: string, property: string, value: any): Promise<void | undefined>;
+    /**
+    * 指定元素获取属性值
+    */
     waitForGetValue(selector: string, property: string, tryCount?: number): Promise<any>;
+    /**
+    * 启动录制
+    */
     startRecording(path?: string, detail?: boolean): Promise<void | undefined>;
+    /**
+    * 停止录制
+    */
     stopRecording(): Promise<any>;
-    importPlugins(name: string): Promise<void>;
+    /**
+    * 通过插件名称，导入插件市场的插件
+    */
+    importPlugins(name: string, installed: boolean | undefined, dirName: string): Promise<boolean>;
+    /**
+    * 等待重启hx
+    */
     withRestart(call: Function): Promise<void>;
 }
 export {};