@maaxyz/maa-node 4.4.0-alpha.3 → 4.4.0-alpha.3-post.7-ci.15747843275

package/dist/context.d.ts

@@ -1,4 +1,5 @@
 import * as maa from './maa';
+import { DumpTask } from './pipeline';
 import { TaskerBase } from './tasker';
 export declare class Context {
     #private;
@@ -46,11 +47,7 @@ export declare class Context {
     override_pipeline(pipeline_override: Record<string, unknown>): void;
     override_next(node_name: string, next: string[]): void;
     get_node_data(node_name: string): string | null;
-    get_node_data_parsed(node_name: string): ({
-        recognition?: {};
-    } & {
-        action?: {};
-    } & import("./pipeline").General) | null;
+    get_node_data_parsed(node_name: string): DumpTask | null;
     get task_id(): maa.TaskId;
     get tasker(): TaskerBase;
     clone(): Context;

package/dist/pipeline.d.ts

@@ -1,6 +1,7 @@
 import type { FlatRect } from './maa';
 type NodeName = string;
-type MaybeArray<T> = T | T[];
+type OutputRemove<T, Output> = Output extends true ? never : T;
+type MaybeArray<T, Output> = T[] | OutputRemove<T, Output>;
 type FixedArray<T, K extends number, A extends T[] = []> = A['length'] extends K ? A : FixedArray<T, K, [...A, T]>;
 type OrderByMap = {
     TemplateMatch: 'Horizontal' | 'Vertical' | 'Score' | 'Random';
@@ -11,22 +12,22 @@ type OrderByMap = {
     NeuralNetworkDetect: 'Horizontal' | 'Vertical' | 'Score' | 'Area' | 'Random';
 };
 export type RecognitionDirectHit = {};
-export type RecognitionTemplateMatch = {
+export type RecognitionTemplateMatch<Output> = {
     roi?: FlatRect | NodeName;
     roi_offset?: FlatRect;
-    template?: MaybeArray<string>;
-    template_?: MaybeArray<string>;
-    threshold?: MaybeArray<number>;
+    template?: MaybeArray<string, Output>;
+    template_?: MaybeArray<string, Output>;
+    threshold?: MaybeArray<number, Output>;
     order_by?: OrderByMap['TemplateMatch'];
     index?: number;
     method?: 1 | 3 | 5;
     green_mask?: boolean;
 };
-export type RecognitionFeatureMatch = {
+export type RecognitionFeatureMatch<Output> = {
     roi?: FlatRect | NodeName;
     roi_offset?: FlatRect;
-    template?: MaybeArray<string>;
-    template_?: MaybeArray<string>;
+    template?: MaybeArray<string, Output>;
+    template_?: MaybeArray<string, Output>;
     count?: number;
     order_by?: OrderByMap['FeatureMatch'];
     index?: number;
@@ -34,49 +35,49 @@ export type RecognitionFeatureMatch = {
     detector?: 'SIFT' | 'KAZE' | 'AKAZE' | 'BRISK' | 'ORB';
     ratio?: number;
 };
-export type RecognitionColorMatch = {
+export type RecognitionColorMatch<Output> = {
     roi?: FlatRect | NodeName;
     roi_offset?: FlatRect;
 } & ({
     method?: 4 | 40;
-    lower?: MaybeArray<FixedArray<number, 3>>;
-    upper?: MaybeArray<FixedArray<number, 3>>;
+    lower?: MaybeArray<FixedArray<number, 3>, Output>;
+    upper?: MaybeArray<FixedArray<number, 3>, Output>;
 } | {
     method: 6;
-    lower?: MaybeArray<FixedArray<number, 1>>;
-    upper?: MaybeArray<FixedArray<number, 1>>;
+    lower?: MaybeArray<FixedArray<number, 1>, Output>;
+    upper?: MaybeArray<FixedArray<number, 1>, Output>;
 }) & {
     count?: number;
     order_by?: OrderByMap['ColorMatch'];
     index?: number;
     connected?: boolean;
 };
-export type RecognitionOCR = {
+export type RecognitionOCR<Output> = {
     roi?: FlatRect | NodeName;
     roi_offset?: FlatRect;
-    expected?: MaybeArray<string>;
-    threshold?: MaybeArray<number>;
-    replace?: MaybeArray<FixedArray<string, 2>>;
+    expected?: MaybeArray<string, Output>;
+    threshold?: MaybeArray<number, Output>;
+    replace?: MaybeArray<FixedArray<string, 2>, Output>;
     order_by?: OrderByMap['OCR'];
     index?: number;
     only_rec?: boolean;
     model?: string;
 };
-export type RecognitionNeuralNetworkClassify = {
+export type RecognitionNeuralNetworkClassify<Output> = {
     roi?: FlatRect | NodeName;
     roi_offset?: FlatRect;
     labels?: string[];
     model?: string;
-    expected?: MaybeArray<number>;
+    expected?: MaybeArray<number, Output>;
     order_by?: OrderByMap['NeuralNetworkClassify'];
     index?: number;
 };
-export type RecognitionNeuralNetworkDetect = {
+export type RecognitionNeuralNetworkDetect<Output> = {
     roi?: FlatRect | NodeName;
     roi_offset?: FlatRect;
     labels?: string[];
     model?: string;
-    expected?: MaybeArray<number>;
+    expected?: MaybeArray<number, Output>;
     threshold?: number;
     order_by?: OrderByMap['NeuralNetworkDetect'];
     index?: number;
@@ -87,17 +88,20 @@ export type RecognitionCustom = {
     custom_recognition?: string;
     custom_recognition_param?: unknown;
 };
-type MixReco<Type extends string, Param> = ({
-    recognition: Type;
-} & Param) | {
+type MixReco<Type extends string, Param, Output> = {
     recognition: {
         type: Type;
         param?: Param;
     };
-};
-export type Recognition = {
-    recognition?: {};
-} | MixReco<'DirectHit', RecognitionDirectHit> | MixReco<'TemplateMatch', RecognitionTemplateMatch> | MixReco<'FeatureMatch', RecognitionFeatureMatch> | MixReco<'ColorMatch', RecognitionColorMatch> | MixReco<'OCR', RecognitionOCR> | MixReco<'NeuralNetworkClassify', RecognitionNeuralNetworkClassify> | MixReco<'NeuralNetworkDetect', RecognitionNeuralNetworkDetect> | MixReco<'Custom', RecognitionCustom>;
+} | OutputRemove<{
+    recognition: Type;
+} & Param, Output>;
+export type Recognition<Output> = OutputRemove<{
+    recognition?: {
+        type?: never;
+        param?: never;
+    };
+}, Output> | MixReco<'DirectHit', RecognitionDirectHit, Output> | MixReco<'TemplateMatch', RecognitionTemplateMatch<Output>, Output> | MixReco<'FeatureMatch', RecognitionFeatureMatch<Output>, Output> | MixReco<'ColorMatch', RecognitionColorMatch<Output>, Output> | MixReco<'OCR', RecognitionOCR<Output>, Output> | MixReco<'NeuralNetworkClassify', RecognitionNeuralNetworkClassify<Output>, Output> | MixReco<'NeuralNetworkDetect', RecognitionNeuralNetworkDetect<Output>, Output> | MixReco<'Custom', RecognitionCustom, Output>;
 export type ActionDoNothing = {};
 export type ActionClick = {
     target?: true | NodeName | FlatRect;
@@ -125,8 +129,8 @@ export type ActionMultiSwipe = {
         duration?: number;
     }[];
 };
-export type ActionKey = {
-    key?: MaybeArray<number>;
+export type ActionKey<Output> = {
+    key?: MaybeArray<number, Output>;
 };
 export type ActionInputText = {
     input_text?: string;
@@ -149,17 +153,20 @@ export type ActionCustom = {
     custom_action?: string;
     custom_action_param?: unknown;
 };
-type MixAct<Type extends string, Param> = ({
+type MixAct<Type extends string, Param, Output> = OutputRemove<{
     action: Type;
-} & Param) | {
+} & Param, Output> | {
     action: {
         type: Type;
         param?: Param;
     };
 };
-export type Action = {
-    action?: {};
-} | MixAct<'DoNothing', ActionDoNothing> | MixAct<'Click', ActionClick> | MixAct<'LongPress', ActionLongPress> | MixAct<'Swipe', ActionSwipe> | MixAct<'MultiSwipe', ActionMultiSwipe> | MixAct<'Key', ActionKey> | MixAct<'InputText', ActionInputText> | MixAct<'StartApp', ActionStartApp> | MixAct<'StopApp', ActionStopApp> | MixAct<'StopTask', ActionStopTask> | MixAct<'Command', ActionCommand> | MixAct<'Custom', ActionCustom>;
+export type Action<Output> = OutputRemove<{
+    action?: {
+        type?: never;
+        param?: never;
+    };
+}, Output> | MixAct<'DoNothing', ActionDoNothing, Output> | MixAct<'Click', ActionClick, Output> | MixAct<'LongPress', ActionLongPress, Output> | MixAct<'Swipe', ActionSwipe, Output> | MixAct<'MultiSwipe', ActionMultiSwipe, Output> | MixAct<'Key', ActionKey<Output>, Output> | MixAct<'InputText', ActionInputText, Output> | MixAct<'StartApp', ActionStartApp, Output> | MixAct<'StopApp', ActionStopApp, Output> | MixAct<'StopTask', ActionStopTask, Output> | MixAct<'Command', ActionCommand, Output> | MixAct<'Custom', ActionCustom, Output>;
 export type WaitFreeze = {
     time?: number;
     target?: true | NodeName | FlatRect;
@@ -169,20 +176,24 @@ export type WaitFreeze = {
     rate_limit?: number;
     timeout?: number;
 };
-export type General = {
-    next?: MaybeArray<NodeName>;
-    interrupt?: MaybeArray<NodeName>;
+export type General<Output> = {
+    next?: MaybeArray<NodeName, Output>;
+    interrupt?: MaybeArray<NodeName, Output>;
     is_sub?: boolean;
     rate_limit?: number;
     timeout?: number;
-    on_error?: MaybeArray<string>;
+    on_error?: MaybeArray<string, Output>;
     inverse?: boolean;
     enabled?: boolean;
     pre_delay?: boolean;
     post_delay?: boolean;
-    pre_wait_freezes?: number | WaitFreeze;
-    post_wait_freezes?: number | WaitFreeze;
+    pre_wait_freezes?: OutputRemove<number, Output> | WaitFreeze;
+    post_wait_freezes?: OutputRemove<number, Output> | WaitFreeze;
     focus?: unknown;
 };
-export type Task = Recognition & Action & General;
+export type Task = Recognition<false> & Action<false> & General<false>;
+type RecursiveRequired<T> = T extends Record<string, unknown> ? {
+    [key in keyof T]-?: RecursiveRequired<T[key]>;
+} : T;
+export type DumpTask = RecursiveRequired<Recognition<true> & Action<true> & General<true>>;
 export {};

package/dist/resource.d.ts

@@ -1,5 +1,6 @@
 import { Job, JobSource } from './job';
 import maa from './maa';
+import { DumpTask } from './pipeline';
 import { CustomActionCallback, CustomRecognizerCallback } from './types';
 export type ResourceNotify = {
     res_id: maa.ResId;
@@ -29,11 +30,7 @@ export declare class ResourceBase {
     override_pipeline(pipeline_override: string): void;
     override_next(node_name: string, next_list: string[]): void;
     get_node_data(node_name: string): string | null;
-    get_node_data_parsed(node_name: string): ({
-        recognition?: {};
-    } & {
-        action?: {};
-    } & import("./pipeline").General) | null;
+    get_node_data_parsed(node_name: string): DumpTask | null;
     clear(): void;
     get loaded(): boolean;
     get hash(): string | null;

package/package.json

@@ -25,13 +25,13 @@
         "prettier": "^3.5.2",
         "typescript": "^5.8.2"
     },
-    "version": "4.4.0-alpha.3",
+    "version": "4.4.0-alpha.3-post.7-ci.15747843275",
     "optionalDependencies": {
-        "@maaxyz/maa-node-darwin-arm64": "4.4.0-alpha.3",
-        "@maaxyz/maa-node-darwin-x64": "4.4.0-alpha.3",
-        "@maaxyz/maa-node-linux-arm64": "4.4.0-alpha.3",
-        "@maaxyz/maa-node-linux-x64": "4.4.0-alpha.3",
-        "@maaxyz/maa-node-win32-arm64": "4.4.0-alpha.3",
-        "@maaxyz/maa-node-win32-x64": "4.4.0-alpha.3"
+        "@maaxyz/maa-node-darwin-arm64": "4.4.0-alpha.3-post.7-ci.15747843275",
+        "@maaxyz/maa-node-darwin-x64": "4.4.0-alpha.3-post.7-ci.15747843275",
+        "@maaxyz/maa-node-linux-arm64": "4.4.0-alpha.3-post.7-ci.15747843275",
+        "@maaxyz/maa-node-linux-x64": "4.4.0-alpha.3-post.7-ci.15747843275",
+        "@maaxyz/maa-node-win32-arm64": "4.4.0-alpha.3-post.7-ci.15747843275",
+        "@maaxyz/maa-node-win32-x64": "4.4.0-alpha.3-post.7-ci.15747843275"
     }
 }

package/src/context.ts

@@ -1,5 +1,5 @@
 import * as maa from './maa'
-import { Task } from './pipeline'
+import { DumpTask } from './pipeline'
 import { TaskerBase } from './tasker'
 
 export class Context {
@@ -68,7 +68,7 @@ export class Context {
     get_node_data_parsed(node_name: string) {
         const content = this.get_node_data(node_name)
         if (content) {
-            return JSON.parse(content) as Task
+            return JSON.parse(content) as DumpTask
         } else {
             return null
         }

package/src/pipeline.ts

@@ -2,7 +2,8 @@ import type { FlatRect } from './maa'
 
 type NodeName = string
 
-type MaybeArray<T> = T | T[]
+type OutputRemove<T, Output> = Output extends true ? never : T
+type MaybeArray<T, Output> = T[] | OutputRemove<T, Output>
 type FixedArray<T, K extends number, A extends T[] = []> = A['length'] extends K
     ? A
     : FixedArray<T, K, [...A, T]>
@@ -18,23 +19,23 @@ type OrderByMap = {
 
 export type RecognitionDirectHit = {}
 
-export type RecognitionTemplateMatch = {
+export type RecognitionTemplateMatch<Output> = {
     roi?: FlatRect | NodeName
     roi_offset?: FlatRect
-    template?: MaybeArray<string>
-    template_?: MaybeArray<string> // 玛丽玛不想写, 所以多了个键
-    threshold?: MaybeArray<number>
+    template?: MaybeArray<string, Output>
+    template_?: MaybeArray<string, Output> // 玛丽玛不想写, 所以多了个键
+    threshold?: MaybeArray<number, Output>
     order_by?: OrderByMap['TemplateMatch']
     index?: number
     method?: 1 | 3 | 5
     green_mask?: boolean
 }
 
-export type RecognitionFeatureMatch = {
+export type RecognitionFeatureMatch<Output> = {
     roi?: FlatRect | NodeName
     roi_offset?: FlatRect
-    template?: MaybeArray<string>
-    template_?: MaybeArray<string>
+    template?: MaybeArray<string, Output>
+    template_?: MaybeArray<string, Output>
     count?: number
     order_by?: OrderByMap['FeatureMatch']
     index?: number
@@ -43,19 +44,19 @@ export type RecognitionFeatureMatch = {
     ratio?: number
 }
 
-export type RecognitionColorMatch = {
+export type RecognitionColorMatch<Output> = {
     roi?: FlatRect | NodeName
     roi_offset?: FlatRect
 } & (
     | {
           method?: 4 | 40
-          lower?: MaybeArray<FixedArray<number, 3>>
-          upper?: MaybeArray<FixedArray<number, 3>>
+          lower?: MaybeArray<FixedArray<number, 3>, Output>
+          upper?: MaybeArray<FixedArray<number, 3>, Output>
       }
     | {
           method: 6
-          lower?: MaybeArray<FixedArray<number, 1>>
-          upper?: MaybeArray<FixedArray<number, 1>>
+          lower?: MaybeArray<FixedArray<number, 1>, Output>
+          upper?: MaybeArray<FixedArray<number, 1>, Output>
       }
 ) & {
         count?: number
@@ -64,34 +65,34 @@ export type RecognitionColorMatch = {
         connected?: boolean
     }
 
-export type RecognitionOCR = {
+export type RecognitionOCR<Output> = {
     roi?: FlatRect | NodeName
     roi_offset?: FlatRect
-    expected?: MaybeArray<string>
-    threshold?: MaybeArray<number>
-    replace?: MaybeArray<FixedArray<string, 2>>
+    expected?: MaybeArray<string, Output>
+    threshold?: MaybeArray<number, Output>
+    replace?: MaybeArray<FixedArray<string, 2>, Output>
     order_by?: OrderByMap['OCR']
     index?: number
     only_rec?: boolean
     model?: string
 }
 
-export type RecognitionNeuralNetworkClassify = {
+export type RecognitionNeuralNetworkClassify<Output> = {
     roi?: FlatRect | NodeName
     roi_offset?: FlatRect
     labels?: string[]
     model?: string
-    expected?: MaybeArray<number>
+    expected?: MaybeArray<number, Output>
     order_by?: OrderByMap['NeuralNetworkClassify']
     index?: number
 }
 
-export type RecognitionNeuralNetworkDetect = {
+export type RecognitionNeuralNetworkDetect<Output> = {
     roi?: FlatRect | NodeName
     roi_offset?: FlatRect
     labels?: string[]
     model?: string
-    expected?: MaybeArray<number>
+    expected?: MaybeArray<number, Output>
     threshold?: number
     order_by?: OrderByMap['NeuralNetworkDetect']
     index?: number
@@ -104,29 +105,38 @@ export type RecognitionCustom = {
     custom_recognition_param?: unknown
 }
 
-type MixReco<Type extends string, Param> =
-    | ({
-          recognition: Type
-      } & Param)
+type MixReco<Type extends string, Param, Output> =
     | {
           recognition: {
               type: Type
               param?: Param
           }
       }
+    | OutputRemove<
+          {
+              recognition: Type
+          } & Param,
+          Output
+      >
 
-export type Recognition =
-    | {
-          recognition?: {}
-      }
-    | MixReco<'DirectHit', RecognitionDirectHit>
-    | MixReco<'TemplateMatch', RecognitionTemplateMatch>
-    | MixReco<'FeatureMatch', RecognitionFeatureMatch>
-    | MixReco<'ColorMatch', RecognitionColorMatch>
-    | MixReco<'OCR', RecognitionOCR>
-    | MixReco<'NeuralNetworkClassify', RecognitionNeuralNetworkClassify>
-    | MixReco<'NeuralNetworkDetect', RecognitionNeuralNetworkDetect>
-    | MixReco<'Custom', RecognitionCustom>
+export type Recognition<Output> =
+    | OutputRemove<
+          {
+              recognition?: {
+                  type?: never
+                  param?: never
+              }
+          },
+          Output
+      >
+    | MixReco<'DirectHit', RecognitionDirectHit, Output>
+    | MixReco<'TemplateMatch', RecognitionTemplateMatch<Output>, Output>
+    | MixReco<'FeatureMatch', RecognitionFeatureMatch<Output>, Output>
+    | MixReco<'ColorMatch', RecognitionColorMatch<Output>, Output>
+    | MixReco<'OCR', RecognitionOCR<Output>, Output>
+    | MixReco<'NeuralNetworkClassify', RecognitionNeuralNetworkClassify<Output>, Output>
+    | MixReco<'NeuralNetworkDetect', RecognitionNeuralNetworkDetect<Output>, Output>
+    | MixReco<'Custom', RecognitionCustom, Output>
 
 export type ActionDoNothing = {}
 
@@ -160,8 +170,8 @@ export type ActionMultiSwipe = {
     }[]
 }
 
-export type ActionKey = {
-    key?: MaybeArray<number>
+export type ActionKey<Output> = {
+    key?: MaybeArray<number, Output>
 }
 
 export type ActionInputText = {
@@ -191,10 +201,13 @@ export type ActionCustom = {
     custom_action_param?: unknown
 }
 
-type MixAct<Type extends string, Param> =
-    | ({
-          action: Type
-      } & Param)
+type MixAct<Type extends string, Param, Output> =
+    | OutputRemove<
+          {
+              action: Type
+          } & Param,
+          Output
+      >
     | {
           action: {
               type: Type
@@ -202,22 +215,28 @@ type MixAct<Type extends string, Param> =
           }
       }
 
-export type Action =
-    | {
-          action?: {}
-      }
-    | MixAct<'DoNothing', ActionDoNothing>
-    | MixAct<'Click', ActionClick>
-    | MixAct<'LongPress', ActionLongPress>
-    | MixAct<'Swipe', ActionSwipe>
-    | MixAct<'MultiSwipe', ActionMultiSwipe>
-    | MixAct<'Key', ActionKey>
-    | MixAct<'InputText', ActionInputText>
-    | MixAct<'StartApp', ActionStartApp>
-    | MixAct<'StopApp', ActionStopApp>
-    | MixAct<'StopTask', ActionStopTask>
-    | MixAct<'Command', ActionCommand>
-    | MixAct<'Custom', ActionCustom>
+export type Action<Output> =
+    | OutputRemove<
+          {
+              action?: {
+                  type?: never
+                  param?: never
+              }
+          },
+          Output
+      >
+    | MixAct<'DoNothing', ActionDoNothing, Output>
+    | MixAct<'Click', ActionClick, Output>
+    | MixAct<'LongPress', ActionLongPress, Output>
+    | MixAct<'Swipe', ActionSwipe, Output>
+    | MixAct<'MultiSwipe', ActionMultiSwipe, Output>
+    | MixAct<'Key', ActionKey<Output>, Output>
+    | MixAct<'InputText', ActionInputText, Output>
+    | MixAct<'StartApp', ActionStartApp, Output>
+    | MixAct<'StopApp', ActionStopApp, Output>
+    | MixAct<'StopTask', ActionStopTask, Output>
+    | MixAct<'Command', ActionCommand, Output>
+    | MixAct<'Custom', ActionCustom, Output>
 
 export type WaitFreeze = {
     time?: number
@@ -229,20 +248,29 @@ export type WaitFreeze = {
     timeout?: number
 }
 
-export type General = {
-    next?: MaybeArray<NodeName>
-    interrupt?: MaybeArray<NodeName>
+export type General<Output> = {
+    next?: MaybeArray<NodeName, Output>
+    interrupt?: MaybeArray<NodeName, Output>
     is_sub?: boolean
     rate_limit?: number
     timeout?: number
-    on_error?: MaybeArray<string>
+    on_error?: MaybeArray<string, Output>
     inverse?: boolean
     enabled?: boolean
     pre_delay?: boolean
     post_delay?: boolean
-    pre_wait_freezes?: number | WaitFreeze
-    post_wait_freezes?: number | WaitFreeze
+    pre_wait_freezes?: OutputRemove<number, Output> | WaitFreeze
+    post_wait_freezes?: OutputRemove<number, Output> | WaitFreeze
     focus?: unknown
 }
 
-export type Task = Recognition & Action & General
+export type Task = Recognition<false> & Action<false> & General<false>
+
+type RecursiveRequired<T> =
+    T extends Record<string, unknown>
+        ? {
+              [key in keyof T]-?: RecursiveRequired<T[key]>
+          }
+        : T
+
+export type DumpTask = RecursiveRequired<Recognition<true> & Action<true> & General<true>>

package/src/resource.ts

@@ -1,7 +1,7 @@
 import { Context } from './context'
 import { Job, JobSource } from './job'
 import maa from './maa'
-import { Task } from './pipeline'
+import { DumpTask } from './pipeline'
 import {
     CustomActionCallback,
     CustomActionSelf,
@@ -159,7 +159,7 @@ export class ResourceBase {
     get_node_data_parsed(node_name: string) {
         const content = this.get_node_data(node_name)
         if (content) {
-            return JSON.parse(content) as Task
+            return JSON.parse(content) as DumpTask
         } else {
             return null
         }